Fix Merc Roach training-related bugs

Ziktofel · Dec 6, 2024 · 8aeb809 · 8aeb809
1 parent 21330be
commit 8aeb809
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 9 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -11388,7 +11388,7 @@
             <Button DefaultButtonFace="AP_SummonYggdrasil" State="Restricted" Requirements="AP_ZergMercCompoundBroodWar"/>
             <Unit value="AP_Yggdrasil"/>
         </InfoArray>
-        <InfoArray index="Train11" Effect="AP_MercGroundDrop">
+        <InfoArray index="Train10" Effect="AP_MercGroundDrop">
             <Resource index="Minerals" value="50"/>
             <Resource index="Vespene" value="25"/>
             <Charge>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -42258,6 +42258,9 @@
     <CActorUnit id="AP_BanelingLaunchAmmo" parent="GenericUnitMinimal" unitName="AP_BanelingLaunchAmmo">
         <Model value="Invisible"/>
     </CActorUnit>
+    <CActorModel id="AP_MercRoachDropModel" parent="AP_ZergMercDropModelBase">
+<!--        <On Terms="ActorCreation" Send="SetScale 1"/>-->
+    </CActorModel>
     <CActorUnit id="AP_MercRoach" parent="AP_RoachBase" unitName="AP_MercRoach">
         <On Terms="WeaponStart.AP_MercRoachMelee.AttackStart" Send="AnimBracketStart AttackCover Attack,Cover"/>
         <On Terms="WeaponStop.AP_MercRoachMelee.AttackStop" Send="AnimBracketStop AttackCover"/>
@@ -42279,6 +42282,7 @@
         <On Terms="WeaponStop.AP_MercRoachAcidSalivaAir.AttackStop" Send="AnimBracketStop Attack"/>
         <On Terms="WeaponStart.AP_MercRoachVileAcidSalivaAir.AttackStart" Send="AnimBracketStart Attack Attack"/>
         <On Terms="WeaponStop.AP_MercRoachVileAcidSalivaAir.AttackStop" Send="AnimBracketStop Attack"/>
+        <On Terms="Behavior.AP_MercGroundDrop.Create" Send="Create AP_MercRoachDropModel"/>
         <On Terms="ActorCreation; ValidatePlayer AP_HaveRoachVile; !IsInEditor" Send="Create AP_MercRoachVile"/>
         <On Terms="ActorCreation; ValidatePlayer AP_HaveRoachVile; !IsInEditor" Send="Destroy"/>
         <On Terms="Upgrade.AP_RoachVile.Add" Send="Create AP_MercRoachVile"/>
@@ -42325,6 +42329,7 @@
         <On Terms="WeaponStop.AP_MercRoachAcidSalivaAir.AttackStop" Send="AnimBracketStop Attack"/>
         <On Terms="WeaponStart.AP_MercRoachVileAcidSalivaAir.AttackStart" Send="AnimBracketStart Attack Attack"/>
         <On Terms="WeaponStop.AP_MercRoachVileAcidSalivaAir.AttackStop" Send="AnimBracketStop Attack"/>
+        <On Terms="Behavior.AP_MercGroundDrop.Create" Send="Create AP_MercRoachDropModel"/>
         <On Terms="Upgrade.AP_RoachCorpser.Add" Send="Create AP_MercRoachCorpserAttachment"/>
         <!--On Terms="Upgrade.AP_RoachVileCorpser.Add" Send="Create AP_MercRoachCorpserAttachment"/-->
         <Model value="AP_MercRoachVile"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26198,7 +26198,7 @@
             <LayoutButtons Face="AP_SummonYggdrasil" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train9" Row="0" Column="3"/>
             <!-- SC2 Units -->
             <LayoutButtons Face="AP_HunterlingSummon" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train7" Row="0" Column="0"/>
-            <LayoutButtons Face="AP_SummonRoachMerc" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train11" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_SummonMercRoach" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train10" Row="0" Column="1"/>
             <!-- Infested -->
             <LayoutButtons Face="AP_InfestedMedic" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train1" Row="0" Column="0"/>
             <LayoutButtons Face="AP_InfestedSiegeBreaker" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train2" Row="0" Column="1"/>
@@ -26221,6 +26221,7 @@
         <CardLayouts CardId="SC2">
             <!-- Hotkey Editor -->
             <LayoutButtons Face="AP_HunterlingSummon" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train7" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_SummonMercRoach" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train10" Row="0" Column="1"/>
         </CardLayouts>
         <CardLayouts CardId="Infested">
             <!-- Hotkey Editor -->

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -14213,6 +14213,9 @@
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train9].Charge.CountUse" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train9].Charge.CountStart" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train9].Charge.CountMax" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train10].Charge.CountUse" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train10].Charge.CountStart" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train10].Charge.CountMax" Value="0"/>
     </CUpgrade>
     <CUpgrade id="AP_ZergFastBaseBuild">
         <!-- For Lab Rat / etc -->
@@ -16247,6 +16250,7 @@
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train7].Cooldown.TimeStart" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Cooldown.TimeStart" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train9].Cooldown.TimeStart" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train10].Cooldown.TimeStart" Value="0"/>
     </CUpgrade>
     <CUpgrade id="AP_RapidReinforcement">
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonMercenaries,InfoArray[Train1].Cooldown.TimeUse" Value="60"/>
@@ -16295,6 +16299,8 @@
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Cooldown.TimeStart" Value="60"/>
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train9].Cooldown.TimeUse" Value="60"/>
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train9].Cooldown.TimeStart" Value="60"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train10].Cooldown.TimeUse" Value="60"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train10].Cooldown.TimeStart" Value="60"/>
     </CUpgrade>
     <CUpgrade id="AP_FusionCoreFusionReactor"/>
     <CUpgrade id="AP_DevastatorTurretPunisherGrenades">

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
@@ -8888,12 +8888,17 @@ bool lib15EF4C78_gt_AP_Player_Merc_ArrayInit_Func (bool testConds, bool runActio
     lib15EF4C78_gv_aP_Player_MercAbilityCommands[21] = AbilityCommand("AP_SummonZergMercs", 8);
     lib15EF4C78_gv_aP_Player_MercAbility[21] = "AP_SummonZergMercs";
     lib15EF4C78_gv_aP_Player_MercType[21] = lib15EF4C78_ge_AP_Player_MercenaryType_BROODWAR;
-    lib15EF4C78_gv_aP_Player_MercAbilityInfoArrayIndex[21] = 7;
+    lib15EF4C78_gv_aP_Player_MercAbilityInfoArrayIndex[21] = 8;
     lib15EF4C78_gv_aP_Player_MercCooldownLinks[22] = "AP_MercRoachSummon";
     lib15EF4C78_gv_aP_Player_MercAbilityCommands[22] = AbilityCommand("AP_SummonZergMercs", 10);
     lib15EF4C78_gv_aP_Player_MercAbility[22] = "AP_SummonZergMercs";
     lib15EF4C78_gv_aP_Player_MercType[22] = lib15EF4C78_ge_AP_Player_MercenaryType_SCTWO;
-    lib15EF4C78_gv_aP_Player_MercAbilityInfoArrayIndex[22] = 8;
+    lib15EF4C78_gv_aP_Player_MercAbilityInfoArrayIndex[22] = 9;
+    lib15EF4C78_gv_aP_Player_MercCooldownLinks[23] = "AP_MercZerglings";
+    lib15EF4C78_gv_aP_Player_MercAbilityCommands[23] = AbilityCommand("AP_SummonZergMercs", 7);
+    lib15EF4C78_gv_aP_Player_MercAbility[23] = "AP_SummonZergMercs";
+    lib15EF4C78_gv_aP_Player_MercType[23] = lib15EF4C78_ge_AP_Player_MercenaryType_BROODWAR;
+    lib15EF4C78_gv_aP_Player_MercAbilityInfoArrayIndex[23] = 7;
     return true;
 }
 

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy
@@ -86,7 +86,7 @@ const int lib15EF4C78_gv_cUC_HEROUIBARWIDTH = 200;
 const fixed lib15EF4C78_gv_zS_SwarmHeroUIUpdateFrequency = 0.25;
 const string lib15EF4C78_gv_zSC_HeroReviveLinkKerrigan = "Abil/AP_KerriganRevive";
 const int lib15EF4C78_gv_zSC_KERRIGANMAXLEVEL = 70;
-const int lib15EF4C78_gv_aP_Player_MERC_COOLDOWN_LINK_SIZE = 22;
+const int lib15EF4C78_gv_aP_Player_MERC_COOLDOWN_LINK_SIZE = 23;
 const string lib15EF4C78_gv_aP_PLAYER_TRANSFORMER_LAND_EVENT = "AP_PLAYER_TRANSFORMER_LAND";
 
 // Variable Declarations

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
@@ -74785,6 +74785,11 @@
             <Action Type="FunctionCall" Library="15EF4C78" Id="10FD8B05"/>
             <Action Type="FunctionCall" Library="15EF4C78" Id="243975D7"/>
             <Action Type="FunctionCall" Library="15EF4C78" Id="CD550464"/>
+            <Action Type="FunctionCall" Library="15EF4C78" Id="53C7FC02"/>
+            <Action Type="FunctionCall" Library="15EF4C78" Id="93FF5108"/>
+            <Action Type="FunctionCall" Library="15EF4C78" Id="92EC09EC"/>
+            <Action Type="FunctionCall" Library="15EF4C78" Id="6AFC3F40"/>
+            <Action Type="FunctionCall" Library="15EF4C78" Id="12750A14"/>
         </Element>
         <Element Type="FunctionCall" Id="C58C5B4C">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000120"/>
@@ -76926,7 +76931,7 @@
         </Element>
         <Element Type="Param" Id="217488D0">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
-            <Value>7</Value>
+            <Value>8</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="9DDD297F">
@@ -77022,7 +77027,103 @@
         </Element>
         <Element Type="Param" Id="70EDF7C0">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
-            <Value>8</Value>
+            <Value>9</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="53C7FC02">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="E08CA17B"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="F865BA07"/>
+        </Element>
+        <Element Type="Param" Id="E08CA17B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="15EF4C78" Id="B3BCA7FD"/>
+            <Array Type="Param" Library="15EF4C78" Id="0ED1BAFE"/>
+        </Element>
+        <Element Type="Param" Id="0ED1BAFE">
+            <Value>23</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="F865BA07">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Value>AP_MercZerglings</Value>
+            <ValueType Type="string"/>
+        </Element>
+        <Element Type="FunctionCall" Id="93FF5108">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="C6B292A3"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="9C0EC27A"/>
+        </Element>
+        <Element Type="Param" Id="C6B292A3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="15EF4C78" Id="F10CBCE7"/>
+            <Array Type="Param" Library="15EF4C78" Id="79A9B199"/>
+        </Element>
+        <Element Type="Param" Id="79A9B199">
+            <Value>23</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="9C0EC27A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Value>AP_SummonZergMercs</Value>
+            <ValueType Type="abilcmd"/>
+            <ValueId Id="7"/>
+        </Element>
+        <Element Type="FunctionCall" Id="92EC09EC">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="5ED19397"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="556E436D"/>
+        </Element>
+        <Element Type="Param" Id="5ED19397">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="15EF4C78" Id="8C8B36A7"/>
+            <Array Type="Param" Library="15EF4C78" Id="88F13B56"/>
+        </Element>
+        <Element Type="Param" Id="88F13B56">
+            <Value>23</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="556E436D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Value>AP_SummonZergMercs</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Abil"/>
+        </Element>
+        <Element Type="FunctionCall" Id="6AFC3F40">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="A40BC75A"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="BE8413BD"/>
+        </Element>
+        <Element Type="Param" Id="A40BC75A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="15EF4C78" Id="292A4931"/>
+            <Array Type="Param" Library="15EF4C78" Id="E9556135"/>
+        </Element>
+        <Element Type="Param" Id="E9556135">
+            <Value>23</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="BE8413BD">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Preset Type="PresetValue" Library="15EF4C78" Id="8706BA7E"/>
+        </Element>
+        <Element Type="FunctionCall" Id="12750A14">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="719F19F0"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="303DFC96"/>
+        </Element>
+        <Element Type="Param" Id="719F19F0">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="15EF4C78" Id="BB77C4F2"/>
+            <Array Type="Param" Library="15EF4C78" Id="F511F264"/>
+        </Element>
+        <Element Type="Param" Id="F511F264">
+            <Value>23</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="303DFC96">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Value>7</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="Variable" Id="D3455103">
@@ -77033,7 +77134,7 @@
             <Value Type="Param" Library="15EF4C78" Id="91C45791"/>
         </Element>
         <Element Type="Param" Id="91C45791">
-            <Value>22</Value>
+            <Value>23</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="Variable" Id="B3BCA7FD">

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version b/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -603,4 +603,4 @@ Button/Hotkey/AP_SummonYggdrasil=O
 Button/Hotkey/AP_YggdrasilAssimilate=T
 Button/Hotkey/AP_SILiberatorAAMode=D
 Button/Hotkey/AP_SILiberatorAGMode=E
-Button/Hotkey/AP_SummonRoachMerc=T
+Button/Hotkey/AP_SummonMercRoach=T