Permalink
Browse files

Updates for extended work

Bringing github up to test-install changes
  • Loading branch information...
1 parent fffd61e commit b3340738693d9dcf951565b439d9bfaac46b4bd7 @cmorganbg committed Mar 27, 2013
Showing with 4,586 additions and 4,210 deletions.
  1. +47 −0 aranw/baf/c-aran.baf
  2. +1 −1 aranw/baf/c-arand.baf
  3. +80 −66 aranw/baf/c-arn25.baf
  4. +2,685 −2,030 aranw/dialog/c-arandialog.d
  5. +1,303 −910 aranw/dialog/c-arantobdialog.d
  6. +467 −10 aranw/dialog/numbers_in_use.txt
  7. +3 −1,193 aranw/setup-aranw.tp2
View
@@ -3185,6 +3185,25 @@ THEN
StartDialogueNoSet(Player1)
END
+/* Harpers are Not Always Good For Business : Activate */
+/* LUSETTE 11 ~Begone, and hopefully your next dealings with the Harpers will be more pleasant.~ */
+IF
+ InParty(Myself)
+ !StateCheck(Myself,CD_STATE_NOTVALID)
+ !StateCheck(Player1,CD_STATE_NOTVALID)
+ !See([ENEMY])
+ !ActuallyInCombat()
+ Global("LyrosJob","GLOBAL",3)
+ Global("c-aranlyrosjob","LOCALS",0)
+THEN RESPONSE #100
+ SetGlobal("c-aranlyrosjob","LOCALS",1)
+END
+
+IF
+ Global("c-aranlyrosjob","LOCALS",1)
+THEN RESPONSE #100
+ StartDialogNoSet(Player1)
+END
/* FRIEND TALKS
* OK let's start with the Friend Talks. The idea here is to set the friendtalks up on a BCS <> DLG "bounce", so
@@ -4512,6 +4531,34 @@ THEN
SetGlobal("c-arlettertaken","GLOBAL",2)
StartDialogueNoSet(Player1)
END
+
+/* Scenery Dialog : Stronghold Gains and Losses */
+IF
+ Global("c-aranextort","LOCALS",1)
+ GlobalTimerExpired("c-aranextorttalk","GLOBAL")
+ InParty(Myself)
+ !StateCheck(Myself,CD_STATE_NOTVALID)
+ !StateCheck(Player1,CD_STATE_NOTVALID)
+THEN
+ RESPONSE #100
+ SetGlobal("c-aranextort","GLOBAL",2)
+ StartDialogueNoSet(Player1)
+END
+
+/* Scenery Dialog : Aran Apologizes */
+IF
+ GlobalTimerExpired("c-aranismad","GLOBAL")
+ Global("c-aranfight","GLOBAL",1)
+ InParty(Myself)
+ !StateCheck(Myself,CD_STATE_NOTVALID)
+ !StateCheck(Player1,CD_STATE_NOTVALID)
+THEN
+ RESPONSE #100
+ SetGlobal("c-aranfight","GLOBAL",0)
+ SetGlobal("c-aranapology","GLOBAL",1)
+ StartDialogueNoSet(Player1)
+END
+
/* Night Talk Reset: something else fired and blocked it */
IF
Global("c-arannightvisit","GLOBAL",2)
View
@@ -166,7 +166,7 @@ IF
AreaCheck("AR2800")
THEN
RESPONSE #100
- SetGlobal("c-arandreamstar","GLOBAL",1)
+ SetGlobal("c-arandreamstar","LOCALS",1)
RealSetGlobalTimer("c-arandreamtalk","GLOBAL",300)
PlaySong(0)
PlaySound("c-arnfti")
View
@@ -2465,8 +2465,8 @@ IF
Global("c-aranfriendtob","GLOBAL",2) // set up ToB_FT_2
Global("c-aranfriendtob","GLOBAL",4) // set up ToB_FT_3
Global("c-aranfriendtob","GLOBAL",6) // set up ToB_FT_4
- Global("c-aranfriendtob","GLOBAL",8) // set up ToB_FT_5
- Global("c-aranfriendtob","GLOBAL",10) // set up ToB_FT_6
+ // Global("c-aranfriendtob","GLOBAL",8) // set up ToB_FT_5
+ // Global("c-aranfriendtob","GLOBAL",10) // set up ToB_FT_6
// Global("c-aranfriendtob","GLOBAL",12) // set up ToB_FT_7
// Global("c-aranfriendtob","GLOBAL",14) // set up ToB_FT_8
// Global("c-aranfriendtob","GLOBAL",16) // set up ToB_FT_9
@@ -2498,8 +2498,8 @@ IF
Global("c-aranfriendtob","GLOBAL",3) // fire ToB_FT_2
Global("c-aranfriendtob","GLOBAL",5) // fire ToB_FT_3
Global("c-aranfriendtob","GLOBAL",7) // fire ToB_FT_4
- Global("c-aranfriendtob","GLOBAL",9) // fire ToB_FT_5
- Global("c-aranfriendtob","GLOBAL",11) // fire ToB_FT_6
+ // Global("c-aranfriendtob","GLOBAL",9) // fire ToB_FT_5
+ // Global("c-aranfriendtob","GLOBAL",11) // fire ToB_FT_6
// Global("c-aranfriendtob","GLOBAL",13) // fire ToB_FT_7
// Global("c-aranfriendtob","GLOBAL",15) // fire ToB_FT_8
// Global("c-aranfriendtob","GLOBAL",17) // fire ToB_FT_9
@@ -2530,65 +2530,65 @@ END
/* Berelinde: Please consider staggering your flirts and your dialogues. Flirts are nice when they break up long stretches between LTs.
* cmorgan: OK, great idea - let's make it really complicated, and base the first timer on the player's choice of overall speed of progress...
*/
+/* Love Talk Initial Check */
+IF
+ Global("c-aranmatch","GLOBAL",0) // Not evaluated
+ Global("c-arantobrom","GLOBAL",0) // no other LTs have played
+ InParty(Myself) // Aran is here
+ !StateCheck(Myself,CD_STATE_NOTVALID) // Aran is ok
+ !StateCheck(Player1,CD_STATE_NOTVALID) // Player1 is ok
+ Gender(Player1,FEMALE) // Player1 is female
+ !HasItemEquiped("belt05",Player1) // Girdle of sex change not on Player1
+THEN
+ RESPONSE #100 // 100% of the time
+ SetGlobal("c-aranmatch","GLOBAL",1) // Matched
+ SetGlobal("c-arantobrom","GLOBAL",1) // Tee up ToB_LT_1
+ RealSetGlobalTimer("c-aranromtimer","GLOBAL",%choseninitialrom% ) // Minimum Real Time until first LT
+ RealSetGlobalTimer("c-aranflirttimer","GLOBAL",%choseninitialflirt% ) // Tee up flirt timer
+END
-// IF
- // Global("c-aranmatch","GLOBAL",0) // Not evaluated
- // Global("c-arantobrom","GLOBAL",0) // no other LTs have played
- // InParty(Myself) // Aran is here
- // !StateCheck(Myself,CD_STATE_NOTVALID) // Aran is ok
- // !StateCheck(Player1,CD_STATE_NOTVALID) // Player1 is ok
- // Gender(Player1,FEMALE) // Player1 is female
- // !HasItemEquiped("belt05",Player1) // Girdle of sex change not on Player1
-// THEN
- // RESPONSE #100 // 100% of the time
- // SetGlobal("c-aranmatch","GLOBAL",1) // Matched
- // SetGlobal("c-arantobrom","GLOBAL",1) // Tee up ToB_LT_1
- // RealSetGlobalTimer("c-aranromtimer","GLOBAL",%choseninitialrom% ) // Minimum Real Time until first LT
- // RealSetGlobalTimer("c-aranflirttimer","GLOBAL",%choseninitialflirt% ) // Tee up flirt timer
-// END
-
-// /* LOVE TALKS */
-// /* Romance Talks Sequence */
+/* LOVE TALKS */
+/* Romance Talks Sequence */
-// /* Aran's Romance LoveTalks Aim, c-arantobrom, ARAN_LTT */
-// /* This block takes the even variables set in dialog, and advances them to the odd */
-// IF
- // GlobalLT("c-arantobrom","GLOBAL",32) // shuts down sequence when finished
- // RealGlobalTimerExpired("c-aranromtimer","GLOBAL") // Timer Expired
- // !HasItemEquiped("belt05",Player1) // Not using Girdle of sex change
- // OR(15)
- // Global("c-arantobrom","GLOBAL",2) // set up ToB_LT_2
- // Global("c-arantobrom","GLOBAL",4) // set up ToB_LT_3
+/* Aran's Romance LoveTalks Aim, c-arantobrom, ARAN_LTT */
+/* This block takes the even variables set in dialog, and advances them to the odd */
+IF
+ GlobalLT("c-arantobrom","GLOBAL",32) // shuts down sequence when finished
+ RealGlobalTimerExpired("c-aranromtimer","GLOBAL") // Timer Expired
+ !HasItemEquiped("belt05",Player1) // Not using Girdle of sex change
+ OR(15)
+ Global("c-arantobrom","GLOBAL",2) // set up ToB_LT_2
+ Global("c-arantobrom","GLOBAL",4) // set up ToB_LT_3
// Global("c-arantobrom","GLOBAL",6) // set up ToB_LT_4
// Global("c-arantobrom","GLOBAL",8) // set up ToB_LT_5
- // Global("c-arantobrom","GLOBAL",10) // set up ToB_LT_6
- // Global("c-arantobrom","GLOBAL",12) // set up ToB_LT_7
- // Global("c-arantobrom","GLOBAL",14) // set up ToB_LT_8
- // Global("c-arantobrom","GLOBAL",16) // set up ToB_LT_9
- // Global("c-arantobrom","GLOBAL",18) // set up ToB_LT_10
- // Global("c-arantobrom","GLOBAL",20) // set up ToB_LT_11
- // Global("c-arantobrom","GLOBAL",22) // set up ToB_LT_12
- // Global("c-arantobrom","GLOBAL",24) // set up ToB_LT_13
- // Global("c-arantobrom","GLOBAL",26) // set up ToB_LT_14
- // Global("c-arantobrom","GLOBAL",28) // set up ToB_LT_15
- // Global("c-arantobrom","GLOBAL",30) // set up ToB_LT_16
-// THEN
- // RESPONSE #100
- // IncrementGlobal("c-arantobrom","GLOBAL",1)
-// END
+ // Global("c-arantobrom","GLOBAL",10) // set up ToB_LT_6
+ // Global("c-arantobrom","GLOBAL",12) // set up ToB_LT_7
+ // Global("c-arantobrom","GLOBAL",14) // set up ToB_LT_8
+ // Global("c-arantobrom","GLOBAL",16) // set up ToB_LT_9
+ // Global("c-arantobrom","GLOBAL",18) // set up ToB_LT_10
+ // Global("c-arantobrom","GLOBAL",20) // set up ToB_LT_11
+ // Global("c-arantobrom","GLOBAL",22) // set up ToB_LT_12
+ // Global("c-arantobrom","GLOBAL",24) // set up ToB_LT_13
+ // Global("c-arantobrom","GLOBAL",26) // set up ToB_LT_14
+ // Global("c-arantobrom","GLOBAL",28) // set up ToB_LT_15
+ // Global("c-arantobrom","GLOBAL",30) // set up ToB_LT_16
+THEN
+ RESPONSE #100
+ IncrementGlobal("c-arantobrom","GLOBAL",1)
+END
-// /* Aran's Romance LoveTalks Fire, c-aranbg2rom, ARAN_LTT */
-// /* This block takes the odd variables set by the last block, and tries to fire them off. */
-// IF
- // GlobalLT("c-arantobrom","GLOBAL",32) // shuts down sequence when finished
- // RealGlobalTimerExpired("c-aranromtimer","GLOBAL") // Timer Expired
- // !HasItemEquiped("belt05",Player1) // Not using Girdle of sex change
- // CombatCounter(0) // Not in combat
- // !See([ENEMY]) // Can't see any enemies
- // OR(16)
- // Global("c-arantobrom","GLOBAL",1) // fire ToB_LT_1
- // Global("c-arantobrom","GLOBAL",3) // fire ToB_LT_2
- // Global("c-arantobrom","GLOBAL",5) // fire ToB_LT_3
+/* Aran's Romance LoveTalks Fire, c-aranbg2rom, ARAN_LTT */
+/* This block takes the odd variables set by the last block, and tries to fire them off. */
+IF
+ GlobalLT("c-arantobrom","GLOBAL",32) // shuts down sequence when finished
+ RealGlobalTimerExpired("c-aranromtimer","GLOBAL") // Timer Expired
+ !HasItemEquiped("belt05",Player1) // Not using Girdle of sex change
+ CombatCounter(0) // Not in combat
+ !See([ENEMY]) // Can't see any enemies
+ OR(16)
+ Global("c-arantobrom","GLOBAL",1) // fire ToB_LT_1
+ Global("c-arantobrom","GLOBAL",3) // fire ToB_LT_2
+ Global("c-arantobrom","GLOBAL",5) // fire ToB_LT_3
// Global("c-arantobrom","GLOBAL",7) // fire ToB_LT_4
// Global("c-arantobrom","GLOBAL",9) // fire ToB_LT_5
// Global("c-arantobrom","GLOBAL",11) // fire ToB_LT_6
@@ -2602,12 +2602,12 @@ END
// Global("c-arantobrom","GLOBAL",27) // fire ToB_LT_14
// Global("c-arantobrom","GLOBAL",29) // fire ToB_LT_15
// Global("c-arantobrom","GLOBAL",31) // fire ToB_LT_16
-// THEN
- // RESPONSE #100
- // PlaySong(0)
- // PlaySound("c-arnltl")
- // StartDialogueNoSet(Player1)
-// END
+THEN
+ RESPONSE #100
+ PlaySong(0)
+ PlaySound("c-arnltl")
+ StartDialogueNoSet(Player1)
+END
/* NPC-Initiated Flirts: */
@@ -2616,8 +2616,8 @@ IF
Global("c-aranpcflirtstart","GLOBAL",0)
Gender(Player1,FEMALE)
OR(2)
- Global("c-aranrom","GLOBAL",1)
- Global("c-aranrom","GLOBAL",2)
+ Global("c-aranrom","GLOBAL",1)
+ Global("c-aranrom","GLOBAL",2)
THEN
RESPONSE #100
SetGlobal("c-aranpcflirtstart","GLOBAL",1)
@@ -2740,6 +2740,20 @@ RESPONSE #100
StartDialogNoSet(Player1)
END
+/* Scenery Dialog : Aran Apologizes */
+IF
+ GlobalTimerExpired("c-aranismad","GLOBAL")
+ Global("c-aranfight","GLOBAL",1)
+ InParty(Myself)
+ !StateCheck(Myself,CD_STATE_NOTVALID)
+ !StateCheck(Player1,CD_STATE_NOTVALID)
+THEN
+ RESPONSE #100
+ SetGlobal("c-aranfight","GLOBAL",0)
+ SetGlobal("c-aranapology","GLOBAL",1)
+ StartDialogueNoSet(Player1)
+END
+
IF
Allegiance(Myself,ENEMY)
!InParty(Myself)
Oops, something went wrong.

0 comments on commit b334073

Please sign in to comment.