[bg] Mulahey stutter fix

https://www.gibberlings3.net/forums/topic/35178-scripting-bugs/#comment-308786
CamDawg · Oct 31, 2022 · 28022c6 · 28022c6
1 parent ccd6c60
commit 28022c6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/eefixpack/files/d/bgee_core_fixes.d b/eefixpack/files/d/bgee_core_fixes.d
@@ -8,6 +8,17 @@ REPLACE_TRIGGER_TEXT ~mtowbez~ ~Dead("bassil")~ ~Dead("bassilus")~
 // broken DV check for bassilus
 REPLACE_TRIGGER_TEXT ~ftowbe~  ~Dead("FLAMHUSB")~ ~Dead("FlamingE")~ 
 
+// tbd, cam
+// mulahey stutter fix (see also mulahey.bcs) https://www.gibberlings3.net/forums/topic/35178-scripting-bugs/#comment-308786
+ADD_STATE_TRIGGER mulahe 3 ~Global("TalkedToMulahey","GLOBAL",0)~  
+SET_WEIGHT mulahe 7 #0 
+SET_WEIGHT mulahe 3 #1 
+SET_WEIGHT mulahe 0 #2 
+SET_WEIGHT mulahe 1 #3 
+SET_WEIGHT mulahe 5 #4 
+SET_WEIGHT mulahe 6 #5 
+SET_WEIGHT mulahe 8 #6
+
 //tbd, cam
 // tiax's broken charm dialogue, NVLOR for x2 talk
 ALTER_TRANS tiax BEGIN 8 END BEGIN 0 END BEGIN ~REPLY~ ~~ END // blank dialogue text prevents exiting

diff --git a/eefixpack/files/tph/bgee.tph b/eefixpack/files/tph/bgee.tph
@@ -593,6 +593,15 @@ COPY_EXISTING ~bddefai.bcs~  ~override~
 // make gretek and friends go hostile more reliably (see also arlin.cre et al, gretek.dlg)
 COMPILE ~eefixpack/files/baf/gretek.baf~
 
+// tbd, cam
+// mulahey stutter fix (see also mulahe.dlg) https://www.gibberlings3.net/forums/topic/35178-scripting-bugs/#comment-308786
+COPY_EXISTING ~mulahey.bcs~ ~override~
+  DECOMPILE_AND_PATCH BEGIN
+    REPLACE_TEXTUALLY ~\(Global("\(CDMulahey\|TalkedToMulahey\)","\(AR5405\|GLOBAL\)",0)\)~ ~\1 !StateCheck(Myself,STATE_CHARMED)~
+    REPLACE_TEXTUALLY ~\(Allegiance(Myself,NEUTRAL)\)~ ~\1 !StateCheck(Myself,STATE_CHARMED)~
+  END
+  BUT_ONLY  
+
 // tbd, cam
 // region/container scripts can't use LOCALS-scoped variables
 // https://www.gibberlings3.net/forums/topic/35914-scripting-using-locals-in-non-sprite-triggers/