Fixing Old Soldiers nuke logic

EnvyDragon · Aug 5, 2024 · c4ec65d · c4ec65d
1 parent d00595a
commit c4ec65d
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 5 deletions.
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/ComponentList.SC2Components
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
-    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="text" Locale="enUS">GameText</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/MapScript.galaxy
@@ -742,7 +742,7 @@ point gf_NextNukeLocationArmy () {
     for (;; auto7F118951_u -= 1) {
         auto7F118951_var = UnitGroupUnitFromEnd(auto7F118951_g, auto7F118951_u);
         if (auto7F118951_var == null) { break; }
-        if (((UnitGetType(auto7F118951_var) == "Larva") || (UnitGetType(auto7F118951_var) == "Egg") || (UnitGetType(auto7F118951_var) == "Overlord"))) {
+        if (((UnitGetType(auto7F118951_var) == "Larva") || (UnitGetType(auto7F118951_var) == "Egg") || (UnitGetType(auto7F118951_var) == "Overlord") || (UnitGetType(auto7F118951_var) == "AP_Larva") || (UnitGetType(auto7F118951_var) == "AP_Overlord") || (UnitGetType(auto7F118951_var) == "AP_Egg") || (UnitGetType(auto7F118951_var) == "AP_K5Kerrigan"))) {
             UnitGroupRemove(lv_army, auto7F118951_var);
         }
 

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/Preload.xml
@@ -230,12 +230,13 @@
 <Unit id="Bulldozer" Variations="1"/>
 <Unit id="WarfieldFortress"/>
 <Unit id="RefineryPipes"/>
+<Unit id="AP_CreepTumor"/>
+<Unit id="AP_Zergling"/>
+<Unit id="AP_InfestedAbomination"/>
 <Unit id="AP_Ravager"/>
 <Unit id="AP_InfestedAbominationBurrowed"/>
-<Unit id="AP_InfestedAbomination"/>
 <Unit id="AP_Baneling"/>
 <Unit id="AP_ZerglingBurrowed"/>
-<Unit id="AP_Zergling"/>
 <Unit id="AP_Extractor"/>
 <Unit id="AP_CreepTumorBurrowed"/>
 <Unit id="AP_SpineCrawler"/>
@@ -245,7 +246,6 @@
 <Unit id="AP_Queen"/>
 <Unit id="AP_Lair"/>
 <Unit id="AP_Hatchery"/>
-<Unit id="AP_CreepTumor"/>
 <Unit id="AP_SpawningPool"/>
 <Unit id="AP_EvolutionChamber"/>
 <Unit id="AP_KerriganReviveCocoon"/>

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/Triggers
@@ -24577,6 +24577,10 @@
         <FunctionCall Type="FunctionCall" Id="1AD08861"/>
         <FunctionCall Type="FunctionCall" Id="62C41AC6"/>
         <FunctionCall Type="FunctionCall" Id="C4AA4D03"/>
+        <FunctionCall Type="FunctionCall" Id="E2F6016D"/>
+        <FunctionCall Type="FunctionCall" Id="81551425"/>
+        <FunctionCall Type="FunctionCall" Id="7367A6B5"/>
+        <FunctionCall Type="FunctionCall" Id="20E416AC"/>
     </Element>
     <Element Type="FunctionCall" Id="1AD08861">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
@@ -24674,6 +24678,134 @@
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Unit"/>
     </Element>
+    <Element Type="FunctionCall" Id="E2F6016D">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000001"/>
+        <Parameter Type="Param" Id="11F9EAE0"/>
+        <Parameter Type="Param" Id="2E3D2577"/>
+        <Parameter Type="Param" Id="3E6643E3"/>
+    </Element>
+    <Element Type="Param" Id="11F9EAE0">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="AAAECFDC"/>
+    </Element>
+    <Element Type="FunctionCall" Id="AAAECFDC">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000079"/>
+        <Parameter Type="Param" Id="53D2F593"/>
+    </Element>
+    <Element Type="Param" Id="53D2F593">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000138"/>
+        <FunctionCall Type="FunctionCall" Id="9298E201"/>
+    </Element>
+    <Element Type="FunctionCall" Id="9298E201">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+    </Element>
+    <Element Type="Param" Id="2E3D2577">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="3E6643E3">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>AP_Larva</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Unit"/>
+    </Element>
+    <Element Type="FunctionCall" Id="81551425">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000001"/>
+        <Parameter Type="Param" Id="4DBDD996"/>
+        <Parameter Type="Param" Id="C0CCBBCC"/>
+        <Parameter Type="Param" Id="BD20BD96"/>
+    </Element>
+    <Element Type="Param" Id="4DBDD996">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="BE4ACC3E"/>
+    </Element>
+    <Element Type="FunctionCall" Id="BE4ACC3E">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000079"/>
+        <Parameter Type="Param" Id="7F2354D7"/>
+    </Element>
+    <Element Type="Param" Id="7F2354D7">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000138"/>
+        <FunctionCall Type="FunctionCall" Id="43AB8FAF"/>
+    </Element>
+    <Element Type="FunctionCall" Id="43AB8FAF">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+    </Element>
+    <Element Type="Param" Id="C0CCBBCC">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="BD20BD96">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>AP_Overlord</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Unit"/>
+    </Element>
+    <Element Type="FunctionCall" Id="7367A6B5">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000001"/>
+        <Parameter Type="Param" Id="A8F063DA"/>
+        <Parameter Type="Param" Id="175F7293"/>
+        <Parameter Type="Param" Id="AB66FACF"/>
+    </Element>
+    <Element Type="Param" Id="A8F063DA">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="06710E55"/>
+    </Element>
+    <Element Type="FunctionCall" Id="06710E55">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000079"/>
+        <Parameter Type="Param" Id="4F122E9F"/>
+    </Element>
+    <Element Type="Param" Id="4F122E9F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000138"/>
+        <FunctionCall Type="FunctionCall" Id="FF24732C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="FF24732C">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+    </Element>
+    <Element Type="Param" Id="175F7293">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="AB66FACF">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>AP_Egg</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Unit"/>
+    </Element>
+    <Element Type="FunctionCall" Id="20E416AC">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000001"/>
+        <Parameter Type="Param" Id="A22AF496"/>
+        <Parameter Type="Param" Id="03F28143"/>
+        <Parameter Type="Param" Id="D9319971"/>
+    </Element>
+    <Element Type="Param" Id="A22AF496">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="C97BA993"/>
+    </Element>
+    <Element Type="FunctionCall" Id="C97BA993">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000079"/>
+        <Parameter Type="Param" Id="9CCEBC50"/>
+    </Element>
+    <Element Type="Param" Id="9CCEBC50">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000138"/>
+        <FunctionCall Type="FunctionCall" Id="0EEB786A"/>
+    </Element>
+    <Element Type="FunctionCall" Id="0EEB786A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+    </Element>
+    <Element Type="Param" Id="03F28143">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="D9319971">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>AP_K5Kerrigan</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Unit"/>
+    </Element>
     <Element Type="FunctionCall" Id="CFD75BDA">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="FunctionCall" Id="26412862"/>

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_old_soldiers.SC2Map/Triggers.version