Repairs to Dream Triggers for BGT

Variablize dream variable and numerical trigger to account for differences between TuTu and BGT
cmorganbg · Nov 26, 2011 · 6bfbbdc · 6bfbbdc
1 parent 205b22a
commit 6bfbbdc
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/bg1npc/lib/g3_bgt_cpmvars.tpa b/bg1npc/lib/g3_bgt_cpmvars.tpa
@@ -3,6 +3,12 @@ ACTION_IF FILE_EXISTS_IN_GAME ~AR7200.are~ THEN BEGIN
     /* tp2, d, and baf parsing variables */
     OUTER_SPRINT "tutuorbgt" "BGT"
     OUTER_SPRINT "bgdreams" "BG1Dream"
+    OUTER_SPRINT "bgdream1" "1"
+    OUTER_SPRINT "bgdream2" "2"
+    OUTER_SPRINT "bgdream3" "3"
+    OUTER_SPRINT "bgdream4" "4"
+    OUTER_SPRINT "bgdream5" "5"
+    OUTER_SPRINT "bgdream6" "6"
     OUTER_SPRINT "tutu_var" ""
     OUTER_SPRINT "tutu_scripta" "A"
     OUTER_SPRINT "tutu_scriptb" "B"

diff --git a/bg1npc/lib/g3_tutu_cpmvars.tpa b/bg1npc/lib/g3_tutu_cpmvars.tpa
@@ -3,6 +3,12 @@
     /* tp2, d, and baf parsing variables based on conversion */
     OUTER_SPRINT "tutuorbgt" "Tutu"
     OUTER_SPRINT "bgdreams" "DREAM"
+    OUTER_SPRINT "bgdream1" "2"
+    OUTER_SPRINT "bgdream2" "3"
+    OUTER_SPRINT "bgdream3" "4"
+    OUTER_SPRINT "bgdream4" "5"
+    OUTER_SPRINT "bgdream5" "6"
+    OUTER_SPRINT "bgdream6" "7"
     OUTER_SPRINT "tutu_var" "_"
     OUTER_SPRINT "tutu_scripta" "_"
     OUTER_SPRINT "tutu_scriptb" "_"

diff --git a/bg1npc/phase1/baf/x#imoen1.baf b/bg1npc/phase1/baf/x#imoen1.baf
@@ -152,7 +152,7 @@ END
 /* Dream talks */
 ///* Dream 1 */
 IF %BGT_VAR%
-Global("%bgdreams%","GLOBAL",2)
+Global("%bgdreams%","GLOBAL",%bgdream1%)
 Global("X#ImoenDreamResponse2","GLOBAL",0)
 Global("Chapter","GLOBAL",%tutu_chapter_2%)
 InParty(Myself)
@@ -181,7 +181,7 @@ END
 
 ///* Dream 2 */
 IF %BGT_VAR%
-Global("%bgdreams%","GLOBAL",4)
+Global("%bgdreams%","GLOBAL",%bgdream3%)
 Global("X#ImoenDreamResponse4","GLOBAL",0)
 Global("Chapter","GLOBAL",%tutu_chapter_4%)
 InParty(Myself)

diff --git a/bg1npc/phase3/ajrom/baf/x#ajrom.baf b/bg1npc/phase3/ajrom/baf/x#ajrom.baf
@@ -710,7 +710,7 @@ END
 
 IF %BGT_VAR%
  !InParty(Myself)
- Global("%bgdreams%","GLOBAL",3)
+ Global("%bgdreams%","GLOBAL",%bgdream2%)
  Global("X#AjantisDream1Without","GLOBAL",0)
  Global("X#AjantisRomanceMatch","GLOBAL",1)
 THEN
@@ -720,7 +720,7 @@ END
 
 IF %BGT_VAR%
  !InParty(Myself)
- Global("%bgdreams%","GLOBAL",4)
+ Global("%bgdreams%","GLOBAL",%bgdream3%)
  Global("X#AjantisDream2Without","GLOBAL",0)
  Global("X#AjantisRomanceMatch","GLOBAL",1)
 THEN
@@ -730,7 +730,7 @@ END
 
 IF %BGT_VAR%
  !InParty(Myself)
- Global("%bgdreams%","GLOBAL",6)
+ Global("%bgdreams%","GLOBAL",%bgdream5%)
  Global("X#AjantisDream4Without","GLOBAL",0)
  Global("X#AjantisRomanceMatch","GLOBAL",1)
 THEN
@@ -747,7 +747,7 @@ IF %BGT_VAR%
  !StateCheck(Player1,CD_STATE_NOTVALID)
  !StateCheck(Myself,CD_STATE_NOTVALID)
  See(Player1)
- Global("%bgdreams%","GLOBAL",3)
+ Global("%bgdreams%","GLOBAL",%bgdream2%)
  Global("X#AjantisRomanceDream1","GLOBAL",0)
  !Global("X#AjantisRomanceActive","GLOBAL",3)
  Global("X#AjantisRomanceMatch","GLOBAL",1)
@@ -776,7 +776,7 @@ IF %BGT_VAR%
  !StateCheck(Player1,CD_STATE_NOTVALID)
  !StateCheck(Myself,CD_STATE_NOTVALID)
  See(Player1)
- Global("%bgdreams%","GLOBAL",4)
+ Global("%bgdreams%","GLOBAL",%bgdream3%)
  Global("X#AjantisRomanceDream2","GLOBAL",0)
  !Global("X#AjantisRomanceActive","GLOBAL",3)
  Global("X#AjantisRomanceMatch","GLOBAL",1)
@@ -806,7 +806,7 @@ IF %BGT_VAR%
  !StateCheck(Player1,CD_STATE_NOTVALID)
  !StateCheck(Myself,CD_STATE_NOTVALID)
  See(Player1)
- Global("%bgdreams%","GLOBAL",6)
+ Global("%bgdreams%","GLOBAL",%bgdream5%)
  Global("X#AjantisRomanceDream4","GLOBAL",0)
  !Global("X#AjantisRomanceActive","GLOBAL",3)
  Global("X#AjantisRomanceMatch","GLOBAL",1)

diff --git a/bg1npc/phase3/dyrom/baf/p#dyrom.baf b/bg1npc/phase3/dyrom/baf/p#dyrom.baf
@@ -446,7 +446,7 @@ END
 /* Dynaheir Initiated Flirts */
 IF %BGT_VAR%
 Global("Chapter","GLOBAL",%tutu_chapter_3%)
-Global("%bgdreams%","GLOBAL",3)
+Global("%bgdreams%","GLOBAL",%bgdream2%)
 Global("X#DyFlirt1","GLOBAL",0)
 Global("X#DynahMatch","GLOBAL",1)
 !Global("X#DynaheirRomanceInactive","GLOBAL",1)
@@ -477,7 +477,7 @@ IF %BGT_VAR%
 Global("X#DynahMatch","GLOBAL",1)
 !Global("X#DynaheirRomanceInactive","GLOBAL",1)
 Global("Chapter","GLOBAL",%tutu_chapter_4%)
-Global("%bgdreams%","GLOBAL",4)
+Global("%bgdreams%","GLOBAL",%bgdream3%)
 Global("X#DyFlirt2","GLOBAL",0)
 InParty(Myself)
 !StateCheck(Player1,CD_STATE_NOTVALID)
@@ -506,7 +506,7 @@ IF %BGT_VAR%
 Global("X#DynahMatch","GLOBAL",1)
 !Global("X#DynaheirRomanceInactive","GLOBAL",1)
 Global("Chapter","GLOBAL",%tutu_chapter_5%)
-Global("%bgdreams%","GLOBAL",5)
+Global("%bgdreams%","GLOBAL",%bgdream4%)
 Global("X#DyFlirt3","GLOBAL",0)
 InParty(Myself)
 !StateCheck(Player1,CD_STATE_NOTVALID)
@@ -535,7 +535,7 @@ IF %BGT_VAR%
 Global("X#DynahMatch","GLOBAL",1)
 !Global("X#DynaheirRomanceInactive","GLOBAL",1)
 Global("Chapter","GLOBAL",%tutu_chapter_6%)
-Global("%bgdreams%","GLOBAL",6)
+Global("%bgdreams%","GLOBAL",%bgdream5%)
 Global("X#DyFlirt4","GLOBAL",0)
 InParty(Myself)
 !StateCheck(Player1,CD_STATE_NOTVALID)
@@ -565,7 +565,7 @@ Global("Chapter","GLOBAL",%tutu_chapter_7%)
 Global("X#DyFlirt5","GLOBAL",0)
 Global("X#DynahMatch","GLOBAL",1)
 !Global("X#DynaheirRomanceInactive","GLOBAL",1)
-Global("%bgdreams%","GLOBAL",7)
+Global("%bgdreams%","GLOBAL",%bgdream6%)
 InParty(Myself)
 !StateCheck(Player1,CD_STATE_NOTVALID)
 !StateCheck(Myself,CD_STATE_NOTVALID)