Fixes

Add Save Penalties for Spells Cast by High-Level Casters: would misindex spells under certain circumstances because it did not correctly set the effect index for some headers it added. It would also not deal correctly with 7th-level priest spells because it set the wrong variable.
FredrikLindgren · May 14, 2012 · c8945ea · c8945ea
1 parent dfd2167
commit c8945ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changes.html b/changes.html
@@ -9,6 +9,8 @@
 <body>
 <ul>
 
+<li><a href="http://forums.gibberlings3.net/index.php?showtopic=24356&amp;view=findpost&amp;p=201339">Fix bugs in "Add Save Penalties for Spells Cast by High-Level Casters (BETA)" component.</a> (Add Save Penalties for Spells Cast by High-Level Casters (BETA))</li>
+
 <!--v9.02 - integrated the following fixes:-->
 <li><a href="http://forums.gibberlings3.net/index.php?s=32922f3321d97114bcd094d1ea6c68f3&showtopic=24332&st=0&p=200940&#entry200940">Updated the "Restore SoA Load Screen Logo" component to use MOVE instead of system commands</a> (Restore SoA Load Screen Logo)</li>
 <li><a href="http://forums.gibberlings3.net/index.php?s=32922f3321d97114bcd094d1ea6c68f3&showtopic=24234">The "Triple-Class HLA Tables" component was relying on code from the BG2 Fixpack and wouldn't work if it wasn't installed. The relevant code is now mirrored in BG2 Tweaks</a> (Triple-Class HLA Tables)</li>

diff --git a/lib/saves_macro.tpa b/lib/saves_macro.tpa
@@ -8,7 +8,7 @@ DEFINE_PATCH_MACRO ~save_via_level~ BEGIN
   SET "save_bonus" = 0
   SET "step" = 5
   PATCH_IF (("%spell_type%" = 2) AND ("%level%" = 7)) BEGIN // priest l7 spells only exception
-    SET "target" = 14 + "%step%"
+    SET "target_level" = 14 + "%step%"
   END ELSE BEGIN
     SET "target_level" = ((("%level%" * 2) - 1) + "%step%")
   END
@@ -56,6 +56,7 @@ DEFINE_PATCH_MACRO ~save_via_level~ BEGIN
       INSERT_BYTES            ("%abil_off%" +        ("%index%" * 0x28)) 0x28
         WRITE_EVALUATED_ASCII ("%abil_off%" +        ("%index%" * 0x28)) "%abil_clone%"   // clones last ability
         WRITE_SHORT           ("%abil_off%" + 0x10 + ("%index%" * 0x28)) "%target_level%" // min level
+        WRITE_SHORT              abil_off   + 0x20 +    index   * 0x28   THIS + abil_fx_num //update fx idx
       SET "fx_delta" = ("%fx_delta%" + "%abil_fx_num%")
       SET "abil_num" = "%abil_num%" + 1
       SET "fx_off" = ("%fx_off%" + 0x28)