Fix Pride of Augustgrad energy bar spawning

Ziktofel · Sep 4, 2024 · 489a9d5 · 489a9d5
1 parent 0533cba
commit 489a9d5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -2970,20 +2970,21 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserProgressiveMissilePods
     // Implementation
     if ((lp_level >= 1)) {
         libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_HurricaneMissiles", 1);
+        libABFE498B_gf_AP_Triggers_Terran_prideOfAugustgradSpellcasterSetup(lp_player);
         if ((lp_level >= 2)) {
             libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_BattlecruiserAdvancedMissilePods", 1);
         }
 
     }
 
-    libABFE498B_gf_AP_Triggers_Terran_prideOfAugustgradSpellcasterSetup(lp_player);
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserProgressiveDefensiveMatrix (int lp_player, int lp_level) {
     // Automatic Variable Declarations
     // Implementation
     if ((lp_level >= 1)) {
         libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DefensiveMatrix", 1);
+        libABFE498B_gf_AP_Triggers_Terran_prideOfAugustgradSpellcasterSetup(lp_player);
         if ((TechTreeUpgradeCount(lp_player, "AP_BattlecruiserMengskSpellcaster", c_techCountQueuedOrBetter) == 1)) {
             libNtve_gf_SetUpgradeLevelForPlayer(1, "AP_BattlecruiserMengskStatusBarES", 1);
         }
@@ -2994,7 +2995,6 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserProgressiveDefensiveMa
 
     }
 
-    libABFE498B_gf_AP_Triggers_Terran_prideOfAugustgradSpellcasterSetup(lp_player);
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserTacticalJump (int lp_player) {

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -20713,7 +20713,6 @@
             <Parameter Type="ParamDef" Library="ABFE498B" Id="A1D5274F"/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="B17272DC"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="20E17033"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="5F154776"/>
         </Element>
         <Element Type="ParamDef" Id="A1D5274F">
             <ParameterType>
@@ -20738,6 +20737,7 @@
         <Element Type="FunctionCall" Id="20E17033">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="ACEFBF3C"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="5F154776"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6CF8CA55"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F6B3476D"/>
         </Element>
@@ -20763,6 +20763,15 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionCall" Id="5F154776">
+            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="330AA365"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="203E96AD"/>
+        </Element>
+        <Element Type="Param" Id="203E96AD">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="137AF07A"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="A1D5274F"/>
+        </Element>
         <Element Type="FunctionCall" Id="6CF8CA55">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
             <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
@@ -20831,20 +20840,11 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
-        <Element Type="FunctionCall" Id="5F154776">
-            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="330AA365"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="203E96AD"/>
-        </Element>
-        <Element Type="Param" Id="203E96AD">
-            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="137AF07A"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="A1D5274F"/>
-        </Element>
         <Element Type="FunctionDef" Id="872A7796">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="268EF1DB"/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="A1C9043A"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D6D74679"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1CA186DE"/>
         </Element>
         <Element Type="ParamDef" Id="268EF1DB">
             <ParameterType>
@@ -20869,6 +20869,7 @@
         <Element Type="FunctionCall" Id="D6D74679">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="EEC0855F"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1CA186DE"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B63DA887"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="5AFD92F1"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="CB473B2D"/>
@@ -20895,6 +20896,15 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionCall" Id="1CA186DE">
+            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="330AA365"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="32582EC9"/>
+        </Element>
+        <Element Type="Param" Id="32582EC9">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="137AF07A"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="268EF1DB"/>
+        </Element>
         <Element Type="FunctionCall" Id="B63DA887">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
             <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
@@ -21032,14 +21042,6 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
-        <Element Type="FunctionCall" Id="1CA186DE">
-            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="330AA365"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="32582EC9"/>
-        </Element>
-        <Element Type="Param" Id="32582EC9">
-            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="137AF07A"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="268EF1DB"/>
-        </Element>
         <Element Type="FunctionDef" Id="8B9C98A7">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="099D5849"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version