Missing names for Babaus (and related fix); properly compile scripts …

…for the Five
InfinityMods · Jun 3, 2019 · db11b4b · db11b4b · RoxanneSHS · Jun 3, 2019
1 parent f052b2f
commit db11b4b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 6 deletions.
diff --git a/ascension/Ascension.tp2 b/ascension/Ascension.tp2
@@ -5,7 +5,7 @@ BACKUP ~weidu_external/backup/ascension~
 SUPPORT "https://forums.beamdog.com/discussion/66702/ascension-for-bg2-ee"
 
 // use Semantic Versioning - http://semver.org
-VERSION ~2.0.2~
+VERSION ~2.0.3~
 
 AUTO_EVAL_STRINGS
 README "ascension/doc/readme-ascension.html"

diff --git a/ascension/ascensionmain/ascension_demons.tpa b/ascension/ascensionmain/ascension_demons.tpa
@@ -48,6 +48,7 @@ COPY "%demon_loc%/scripts/finaluf.baf" "override/finaluf.bcs"
 
 COPY "%demon_loc%/finbabau.cre" override
    SAY NAME1 @500 // 'Babau' is the only demon name not present in vBG2
+   SAY NAME2 @500 // 'Babau' is the only demon name not present in vBG2
    LPF poison_immunity INT_VAR value=0 END
    LPF CRE_patch INT_VAR regeneration=2 END
 // BUT_ONLY

diff --git a/ascension/ascensionmain/ascension_imoen_powers.tpa b/ascension/ascensionmain/ascension_imoen_powers.tpa
@@ -157,7 +157,7 @@ DEFINE_ACTION_FUNCTION ascension_imoen_powers BEGIN
    ///////////////////////////////////////////////////////////////////////////
 
    COPY_EXISTING "%WIZARD_IMPROVED_INVISIBILITY%.spl" "override/imoeth.spl"
-         WRITE_LONG 0x8 23359
+         WRITE_LONG NAME1 23359
          SAY 0x50 @1
          LPF SPL_patch INT_VAR spell_type=4 casting_animation=0 END
          FOR (i=2;i<50;i+=1) BEGIN

diff --git a/ascension/ascensionmain/ascension_shared.tpa b/ascension/ascensionmain/ascension_shared.tpa
@@ -92,7 +92,7 @@ BEGIN
      // set up the original spell
 
     COPY "%MOD_FOLDER%/ascensionmain/player/ctrldem.spl" "override/%outer_filename%.spl"
-         SAY 0x8 @1013
+         SAY NAME1 @1013
          LPF DELETE_EFFECT INT_VAR match_opcode=177 END // remove existing payload effects
          LPF DELETE_EFFECT INT_VAR match_opcode=309 END // remove existing payload effects
          LPF ALTER_EFFECT INT_VAR match_duration=6 duration=control_duration END // adjust duration of stun

diff --git a/ascension/ascensionmain/ascension_the_five.tpa b/ascension/ascensionmain/ascension_the_five.tpa
@@ -236,6 +236,7 @@ BEGIN
    ACTION_IF "%bhaalspawn_final%" STRING_COMPARE_CASE finbalth BEGIN
       COPY "%MOD_FOLDER%/ascensionmain/thefive/scripts/%bhaalspawn_final%.baf" "override/%bhaalspawn_final%.bcs"
           LPF handle_awkward_ds END
+          COMPILE_BAF_TO_BCS
    END
 
 

diff --git a/ascension/doc/readme-ascension.html b/ascension/doc/readme-ascension.html
@@ -385,6 +385,12 @@ <h3>Version 2.0 changelog</h3>
 <ul>
 <li>Slightly tweaked pool dialog, to more robustly give Imoen powers and to allow for compatibility with Turnabout</li>
 </ul>
+<p>3 June 2019: 2.0.3</p>
+<ul>
+<li>Fixed critical bug whereby some of the Five weren't getting their scripts</li>
+<li>Babau now have the correct names</li>
+</ul>
+
 </div>
 <div class="ribbon_rectangle_h3">
 <h3>Previous versions</h3>

diff --git a/ascension/lib/always.tpa b/ascension/lib/always.tpa
@@ -1,7 +1,7 @@
 
 	// initialise
 
-        OUTER_SPRINT MOD_VERSION "2.0.2" // in due course WEIDU will do this automatically
+        OUTER_SPRINT MOD_VERSION "2.0.3" // in due course WEIDU will do this automatically
         OUTER_SET always_initialised=1
 
         // include function libraries (note that 'sfo_lite' also builds and sets a few SFO files/variables)

diff --git a/ascension/tougher/yagashura.tpa b/ascension/tougher/yagashura.tpa
@@ -40,7 +40,7 @@ DEFINE_ACTION_FUNCTION yagashura_army BEGIN
   ////////////////////////////////////////////////
 
   /// fix for all
-  
+
   ACTION_FOR_EACH creature IN yssold01 yssold02 yssold03 yssold04 ysfire01 ysfire02 BEGIN
      COPY_EXISTING "%creature%.cre" override
           LPF CRE_patch
@@ -560,7 +560,6 @@ DEFINE_ACTION_FUNCTION yagashura_resources BEGIN
 
    COPY "%MOD_FOLDER%/tougher/yagashura/yaga01.spl" override
       SAY NAME1 @8
-      SAY NAME2 @8
       PATCH_IF enhanced_edition BEGIN
          LPF DELETE_EFFECT INT_VAR match_opcode=12 match_dicenumber=4 match_save_vs_breath=0 END
          LPF ALTER_EFFECT INT_VAR match_opcode=12 match_dicenumber=4 dicenumber=8 save_for_half=1 END