Browse files

Cleanup from PM

and separation of conditioned friendtalk 12 to fire appropriately
  • Loading branch information...
1 parent fe6520d commit a90b7ba744e5ac09237ec3b40223c8a5fea91738 @cmorganbg committed Nov 10, 2011
Showing with 36 additions and 30 deletions.
  1. +23 −17 aranw/baf/c-aran.baf
  2. +12 −12 aranw/dialog/c-arandialog.d
  3. +1 −1 aranw/dialog/c-arantobdialog.d
View
40 aranw/baf/c-aran.baf
@@ -35,7 +35,6 @@ THEN
RESPONSE #100
SetGlobal("c-aransex","GLOBAL",3) // we went further, but not the big one
END
-
/* look for incrementing relationship to full intimacy */
IF
InParty(Myself)
@@ -48,7 +47,7 @@ THEN
RESPONSE #100
SetGlobal("c-aransex","GLOBAL",4) // shared everything
END
-/* Watcher's Keep */
+/* Watcher's Keep : Activate */
IF
Global("c-aranwatchkeep","GLOBAL",0)
AreaCheck("AR3000")
@@ -63,7 +62,7 @@ THEN
RESPONSE #100
SetGlobal("c-aranwatchkeep","GLOBAL",1)
END
-
+/* Watcher's Keep : Initiate */
IF
Global("c-aranwatchkeep","GLOBAL",1)
CombatCounter(0)
@@ -78,7 +77,6 @@ THEN
PlaySound("c-arnfth")
StartDialogueNoSet(Player1)
END
-
/* Sparring, females ; Morning After talk */
IF
Global("c-aranspar","GLOBAL",7)
@@ -121,7 +119,6 @@ THEN
PlaySound("c-arnltl")
StartDialogNoSet(Player1)
END
-
/* Sparring, females : Morning After : disable if it doesn't fire in the morning - identify by global set to 12 */
IF
Global("c-aranspar","GLOBAL",7)
@@ -159,7 +156,6 @@ THEN
RESPONSE #100
SetGlobal("c-aranspar","GLOBAL",12)
END
-
/* On waking banter, after Underdark : bcs */
IF
@@ -202,13 +198,12 @@ IF
AreaCheck("AR2800")
THEN
RESPONSE #100
- SetGlobal("c-aranwakeup","LOCALS",1)
- SetGlobalTimer("c-aransmalltalk","GLOBAL",300)
- PlaySong(0)
- PlaySound("c-arnfti")
- StartDialogNoSet(Player1)
+ SetGlobal("c-aranwakeup","LOCALS",1)
+ SetGlobalTimer("c-aransmalltalk","GLOBAL",300)
+ PlaySong(0)
+ PlaySound("c-arnfti")
+ StartDialogNoSet(Player1)
END
-
/* If the party visits the Trademeet Bar, */
IF
InParty(Myself)
@@ -222,7 +217,6 @@ THEN
RESPONSE #100
SetGlobal("c-aranmalcer","GLOBAL",1)
END
-
/* then set up a spawn when you go outside into AR2000... */
IF
InParty(Myself)
@@ -3216,9 +3210,10 @@ THEN
RESPONSE #100 // 100% of the time
SetGlobalTimer("c-aransmalltalk","GLOBAL",60)
SetGlobalTimer("c-aranblush","GLOBAL",TEN_DAYS) // set up delay for embarrassment banters
+ SetGlobalTimer("c-aranisdrunk","GLOBAL",10) // initializes drunk talk timer
SetGlobal("c-aranfriendsetup","GLOBAL",1)
RealSetGlobalTimer("c-aranfriendtimer","GLOBAL",160) // Minimum Real Time until SoA_FT_1 is called, unlless the player initiates PID and triggers it
- RealSetGlobalTimer("c-aranstrong","GLOBAL",180) // tee up stronghild spacer timer
+ RealSetGlobalTimer("c-aranstrong","GLOBAL",180) // tee up stronghold spacer timer
END
/* Aran's FriendTalks Aim, c-aranfriendbg2, ARAN_FTT */
@@ -3239,7 +3234,7 @@ IF
Global("c-aranfriendbg2","GLOBAL",16) // set up SoA_FT_9
Global("c-aranfriendbg2","GLOBAL",18) // set up SoA_FT_10
Global("c-aranfriendbg2","GLOBAL",20) // set up SoA_FT_11
- Global("c-aranfriendbg2","GLOBAL",22) // set up SoA_FT_12
+// specially conditioned "soultalk" Global("c-aranfriendbg2","GLOBAL",22) // set up SoA_FT_12
Global("c-aranfriendbg2","GLOBAL",24) // set up SoA_FT_13
Global("c-aranfriendbg2","GLOBAL",26) // set up SoA_FT_14
// Global("c-aranfriendbg2","GLOBAL",28) // set up SoA_FT_15
@@ -3249,6 +3244,17 @@ THEN
IncrementGlobal("c-aranfriendbg2","GLOBAL",1) // move up from even to odd
END
+/* Conditioned Friendtalks (interrupts the series if PC lingers in Chapter 2 */
+IF
+ !Global("Chapter","GLOBAL",5) // Not in Underdark - specialized talks for that
+ RealGlobalTimerExpired("c-aranfriendtimer","GLOBAL") // Timer Expired
+ Global("c-aranfriendbg2","GLOBAL",22) // set up SoA_FT_12
+ GlobalGT("AsylumPlot","GLOBAL",40)
+THEN
+ RESPONSE #100
+ SetGlobal("c-aranfriendbg2","GLOBAL",23) // move up from even to odd
+END
+
/* Aran's FriendTalks Fire, c-aranfriendbg2, ARAN_FTT */
/* This block takes the odd variables set by the last block, and tries to fire them off. */
IF
@@ -3371,7 +3377,7 @@ THEN
RealSetGlobalTimer("c-aranflirttimer","GLOBAL",%choseninitialflirt%) // Tee up flirt timer
END
-/*early flirt triggering */
+/* early flirt triggering */
IF
Global("c-aranmatch","GLOBAL",1) // Matched
Global("c-aransetupromtimers","GLOBAL",0) // Not evaluated
@@ -3726,6 +3732,7 @@ IF
GlobalLT("c-arandrunk","GLOBAL",4) // shuts down sequence when finished
InParty(Myself)
CheckStatGT(Myself,40,INTOXICATION) // Whoot - the room is moving about too much
+ GlobalTimerExpired("c-aranisdrunk","GLOBAL")
OR(13)
AreaCheck("AR0313") // Sea's Bounty
AreaCheck("AR0406") // Copper Coronet
@@ -3755,7 +3762,6 @@ END
IF
GlobalLT("c-arandrunk","GLOBAL",4) // shuts down sequence when finished
- GlobalTimerExpired("c-aransmalltalk","GLOBAL") // Timer (game-time) has expired
InParty(Myself)
!StateCheck(Myself,CD_STATE_NOTVALID)
InMyArea(Player1)
View
24 aranw/dialog/c-arandialog.d
@@ -7400,7 +7400,7 @@ IF ~~ a400
END
IF ~~ a401
- SAY ~[ARAN] I studied everythin' I could, an' checked every source I could, but there's naught I could find to shed light on this havin' no soul business. Is it a good thing, or a bad thing? I mean, it might come in handy. I seen some things on a battlefield what deaden your insides right proper. Might be a kind o' freedom, in combat, not havin' to worry about nothin'.~
+ SAY ~[ARAN] I studied everythin' I could find on short notice, but there's naught I could find to shed light on this havin' no soul business. Is it a good thing, or a bad thing? I mean, it might come in handy. I seen some things on a battlefield what deaden your insides right proper. Might be a kind o' freedom, in combat, not havin' to worry about nothin'.~
++ ~[PC] I really do not want to talk about this. Go away, Aran.~ + a406
++ ~[PC] You are joking, right? I do not see the deadness I feel inside as any sort of freedom.~ + a407
+ ~Gender(Player1,MALE)~ + ~[PC] I feel nothing. That would not change my approach to combat, whether I had my soul or not.~ + a408
@@ -15766,7 +15766,7 @@ IF ~~ a3652 /* ROM_TWO_ACTION_FACE_TO_FACE */
+ ~RandomNum(7,6)~ + ~[PC] This is too intense. You should go, right now.~ + a3516 /* SOLID_STOP3 */
+ ~RandomNum(7,7)~ + ~[PC] This is too intense. You should go, right now.~ + a3518 /* FIGHT_START */
+ ~RandomNum(3,1)~ + ~[PC] (Guide his hand, tracing your thighs, then your hips, making small brushstrokes with his fingers on your breasts.)~ + a3690 /* GUIDE_HAND_UP */
- + ~RandomNum(3,2)~ + ~[PC] (Take one of his fingers as it it were a paintbrush, and gently paint your way down your navel, lower and lower... until you are painting your pleasure in even, slow strokes.)~ + a3691 /* GUIDE_HAND_DOWN */
+ + ~RandomNum(3,2)~ + ~[PC] (Take one of his fingers as it it were a paintbrush, and gently brush your way down your navel, lower and lower... until you are painting your pleasure in even, slow strokes.)~ + a3691 /* GUIDE_HAND_DOWN */
+ ~RandomNum(3,3)~ + ~[PC] (Gently take his palm, guiding his fingers to your most intimate of places, and shift so that his fingertips lie just barely within you.)~ + a3692 /* GUIDE_HAND_IN */
END
@@ -15912,15 +15912,15 @@ END
/* range 2 passthrough/delay */
IF ~~ a3690 /* GUIDE_HAND_UP */
- SAY ~[ARAN] ~
+ SAY ~[ARAN] (Roughened fingers, suprisingly gentle, explore you.)~
++ ~[PC] (Open yourself to his advances, letting his fingers play about and touch you where it most pleases you.)~ + a3698 /* FRONT_TO_ARAN_EXPLORE */
++ ~[PC] W... wait a moment...~ + a3522 /* GO_ON_OR_NOT_ASK_WHAT_WRONG */
++ ~[PC] This is too much. Too fast. Wait.~ + a3522 /* GO_ON_OR_NOT_ASK_WHAT_WRONG */
++ ~[PC] (Grab his wrist and still his motions, holding him away from you.)~ + a3522 /* GO_ON_OR_NOT_ASK_WHAT_WRONG */
END
IF ~~ a3691 /* GUIDE_HAND_DOWN */
- SAY ~[ARAN] ~
+ SAY ~[ARAN] (His breath is a sigh, his touch warm on you.)~
++ ~[PC] (Open yourself to his advances, letting his fingers play about and touch you where it most pleases you.)~ + a3698 /* FRONT_TO_ARAN_EXPLORE */
++ ~[PC] (Sigh, moving against him and stretching with pleasure.)~ + a3584 /* ROM_TWO_6 */
++ ~[PC] W... wait a moment...~ + a3522 /* GO_ON_OR_NOT_ASK_WHAT_WRONG */
@@ -16076,7 +16076,7 @@ END
IF ~~ a3677 /* ROM_TWO_ACTION_HEAT_CLOSE_FACE */
SAY ~[ARAN] (You feel the gentle heat radiating from his body, so close to yours.)~
+ ~RandomNum(3,1)~ + ~[PC] (Guide his hand, tracing your thighs, then your hips, making small brushstrokes with his fingers on your breasts.)~ + a3690 /* GUIDE_HAND_UP */
- + ~RandomNum(3,2)~ + ~[PC] (Take one of his fingers as it it were a paintbrush, and gently paint your way down your navel, lower and lower... until you are painting your pleasure in even, slow strokes.)~ + a3691 /* GUIDE_HAND_DOWN */
+ + ~RandomNum(3,2)~ + ~[PC] (Take one of his fingers as it it were a paintbrush, and gently brush your way down your navel, lower and lower... until you are painting your pleasure in even, slow strokes.)~ + a3691 /* GUIDE_HAND_DOWN */
+ ~RandomNum(3,3)~ + ~[PC] (Gently take his palm, guiding his fingers to your most intimate of places, and shift so that his fingertips lie just barely within you.)~ + a3692 /* GUIDE_HAND_IN */
+ ~Global("c-aranpcbedding","LOCALS",0)~ + ~[PC] Aran... I want you to have me. Take me any way you want. I give you complete control.~ + a3506 /* SEX_SCENE_ONE */
+ ~Global("c-aranpcbedding","LOCALS",1)~ + ~[PC] Aran... I want you to have me. Take me any way you want. I give you complete control.~ + a3507 /* SEX_SCENE_TWO */
@@ -16474,9 +16474,9 @@ IF ~~ a3534 /* BACK_TO_ARAN_ACTION_HAND_STROKES */
+ ~RandomNum(5,4)~ + ~[PC] Wait... I think we have gone too far. You should go.~ DO ~SetGlobal("c-aranintimate","GLOBAL",2)~ + a3517 /* ROM_TWO_HARD_TO_STOP_GENTLEMAN */
+ ~RandomNum(5,5)~ + ~[PC] Wait... I think we have gone too far. You should go.~ DO ~SetGlobal("c-aranintimate","GLOBAL",2)~ + a3518 /* FIGHT_START */
++ ~[PC] (Accept his length into your most intimate place, rocking steadily against him, thighs gripping and releasing as you seek your pleasure.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
- ++ ~[PC] (Move his hand to his hardness. Spread yourself as wide as you can, opening yourself fully to his advances.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3697 /* ROM_CLIMAX_CLIMB_DEEP */
+ ++ ~[PC] (With gentle touches, guide him to your most intimate place, opening yourself fully to his advances.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3697 /* ROM_CLIMAX_CLIMB_DEEP */
++ ~[PC] Look down, Aran. I think I put you in just the right place. Well, part of you is... oh! Yes. Now all of you.~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
- ++ ~[PC] (Silence him with a kiss, moving onto him and against him, building your pleasure.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
+ ++ ~[PC] (Gently place a kiss on your fingertips and brush it across his forehead... and move onto him and against him, building your pleasure.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
IF ~RandomNum(9,9) Global("c-aransecondguess","GLOBAL",0)~ THEN GOTO a3794 /* SECOND_GUESS */
END
@@ -16495,10 +16495,10 @@ IF ~~ a3536 /* BACK_TO_ARAN_ACTION_HAND_INTIMATE */
+ ~RandomNum(5,4)~ + ~[PC] Wait... I think we have gone too far. You should go.~ DO ~SetGlobal("c-aranintimate","GLOBAL",2)~ + a3517 /* ROM_TWO_HARD_TO_STOP_GENTLEMAN */
+ ~RandomNum(5,5)~ + ~[PC] Wait... I think we have gone too far. You should go.~ DO ~SetGlobal("c-aranintimate","GLOBAL",2)~ + a3518 /* FIGHT_START */
++ ~[PC] (Launch yourself at him, attempting to wrestle him onto his back.)~ + a3700 /* KNEES_ABOVE_ARAN_WRESTLE_ONTO_BACK */
- ++ ~[PC] (Accept his advancing thrust, rocking steadily against him, thighs gripping and releasing as you seek your pleasure.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
- ++ ~[PC] (Spread yourself as wide as you can, opening yourself fully to his advances.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3697 /* ROM_CLIMAX_CLIMB_DEEP */
- ++ ~[PC] Look down, Aran. You are inside. Well, part of you is... oh! Yes. Now all of you.~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
- ++ ~[PC] (Silence him with a kiss, moving against him, building your pleasure.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
+// PLACEHOLDER : SHOULD BE TOUCHES ++ ~[PC] (Accept his advancing thrust, rocking steadily against him, thighs gripping and releasing as you seek your pleasure.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
+// PLACEHOLDER : SHOULD BE TOUCHES ++ ~[PC] (Draw your knees apart as wide as you can, opening yourself fully to his advances.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3697 /* ROM_CLIMAX_CLIMB_DEEP */
+// PLACEHOLDER : SHOULD BE TOUCHES ++ ~[PC] Look down, Aran. You are inside. Well, part of you is... oh! Yes. Now all of you.~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
+// PLACEHOLDER : SHOULD BE TOUCHES ++ ~[PC] (Silence him with a kiss, moving against him, building your pleasure.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3639 /* ROM_PULSE_DEEP_GRUNT */
END
IF ~~ a3698 /* FRONT_TO_ARAN_EXPLORE */
@@ -16811,7 +16811,7 @@ IF ~~ a3682 /* ROM_PULSE_DEEP_ABOVE_ONE */
END
IF ~~ a3798 /* ROM_PULSE_DEEP_ABOVE_TWO */
- SAY ~[ARAN] (His hands find purchase on the surface beneath you. His forearms are strong and muscular under each of your armpits and pressing along the sides of your breasts, holding you close as he rises above you. You can look down and see the movement you can feels as his smooth chest barely brushes your nipples, and his manhood thrusts boldly into you.)~
+ SAY ~[ARAN] (His hands find purchase on the surface beneath you. His forearms are strong and muscular under each of your armpits and pressing along the sides of your breasts, holding you close as he rises above you. You can look down and see the movement you can feel as his smooth chest barely brushes your nipples, and his manhood thrusts boldly into you.)~
++ ~[PC] Oh. I feel it. That is... so warm. Faster!~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3695 /* ROM_FINAL_TWO */
++ ~[PC] (Give in to your pleasure, letting the waves crash around you and through you as you find your release.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3695 /* ROM_FINAL_TWO */
++ ~[PC] (Lock your arms around his neck, wordlessly begging for a kiss as he quests inside you.)~ DO ~SetGlobal("c-aranintimate","GLOBAL",4)~ + a3695 /* ROM_FINAL_TWO */
View
2 aranw/dialog/c-arantobdialog.d
@@ -6329,7 +6329,7 @@ IF ~~ a4131 /* ROM_PULSE_DEEP_ABOVE_ONE */
END
IF ~~ a4247 /* ROM_PULSE_DEEP_ABOVE_TWO */
- SAY ~[ARAN] (His hands find purchase on the surface beneath you. His forearms are strong and muscular under each of your armpits and pressing along the sides of your breasts, holding you close as he rises above you. You can look down and see the movement you can feels as his smooth chest barely brushes your nipples, and his manhood thrusts boldly into you.)~
+ SAY ~[ARAN] (His hands find purchase on the surface beneath you. His forearms are strong and muscular under each of your armpits and pressing along the sides of your breasts, holding you close as he rises above you. You can look down and see the movement you can feel as his smooth chest barely brushes your nipples, and his manhood thrusts boldly into you.)~
++ ~[PC] Oh. I feel it. That is... so warm. Faster!~ + a4144 /* ROM_FINAL_TWO */
++ ~[PC] (Give in to your pleasure, letting the waves crash around you and through you as you find your release.)~ + a4144 /* ROM_FINAL_TWO */
++ ~[PC] (Lock your arms around his neck, wordlessly begging for a kiss as he quests inside you.)~ + a4144 /* ROM_FINAL_TWO */

0 comments on commit a90b7ba

Please sign in to comment.