sc2: Adding larva command card submenu for advanced strains; moving p…

…ygalisks to larva
Ziktofel · Dec 4, 2024 · 419ce69 · 419ce69
1 parent 95fdf06
commit 419ce69
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -7859,6 +7859,10 @@
             <Button DefaultButtonFace="AP_Morphling" Requirements="AP_MorphlingEnabled"/>
             <Unit value="AP_Morphling"/>
         </InfoArray>
+        <InfoArray index="Train17" Time="24">
+            <Button DefaultButtonFace="AP_Pygalisk" Requirements="AP_HaveSpawningPool"/>
+            <Unit value="AP_Pygalisk"/>
+        </InfoArray>
     </CAbilTrain>
     <CAbilTrain id="AP_LarvaTrainSwarm">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
@@ -11384,21 +11388,6 @@
             <Button DefaultButtonFace="AP_SummonYggdrasil" State="Restricted" Requirements="AP_ZergMercCompoundBroodWar"/>
             <Unit value="AP_Yggdrasil"/>
         </InfoArray>
-        <InfoArray index="Train10" Effect="AP_MercGroundDrop">
-            <Cooldown>
-                <Link value="AP_Pygalisk"/>
-                <Location value="Unit"/>
-                <TimeStart value="30"/>
-                <TimeUse value="30"/>
-            </Cooldown>
-            <Button DefaultButtonFace="AP_PygaliskSummon" State="Restricted" Requirements="AP_ZergMercCompoundSC2"/>
-            <Unit value="AP_Pygalisk"/>
-            <Unit value="AP_Pygalisk"/>
-            <Unit value="AP_Pygalisk"/>
-            <Unit value="AP_Pygalisk"/>
-            <Unit value="AP_Pygalisk"/>
-            <Unit value="AP_Pygalisk"/>
-        </InfoArray>
     </CAbilTrain>
     <CAbilEffectTarget id="AP_DarkTemplarShadowDash">
         <AbilSetId value="Blnk"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -1576,6 +1576,16 @@
         <EditorCategories value="Race:Terran"/>
         <HotkeyAlias value="TerranVehicleWeaponsLevel1"/>
     </CButton>
+    <CButton id="AP_LarvaAdvancedMorphs">
+        <Icon value="assets\textures\btn-tips-sellzergbiosamples.dds"/>
+        <AlertIcon value="assets\textures\btn-tips-sellzergbiosamples.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
+    <CButton id="AP_LarvaBasicMorphs">
+        <Icon value="assets\textures\btn-unit-zerg-larva.dds"/>
+        <AlertIcon value="assets\textures\btn-unit-zerg-larva.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
     <CButton id="AP_RapidRegeneration">
         <Icon value="Assets\Textures\BTN-ability-zerg-rapidregeneration-color.dds"/>
         <EditorCategories value="Race:Zerg"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -7950,9 +7950,8 @@
             <LayoutButtons Face="AP_MorphToRaptor" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarmling,Train2" Row="0" Column="2"/>
             <LayoutButtons Face="AP_MorphToSwarmling" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarmling,Train1" Row="0" Column="2"/>
             <LayoutButtons Face="AP_MorphToRaptor" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,6" Row="0" Column="2"/>
-            <LayoutButtons Face="AP_Aberration" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,27" Row="0" Column="3"/>
-            <LayoutButtons Face="AP_DefilerSCBW" Type="AbilCmd" AbilCmd="AP_LarvaTrain,13" Row="0" Column="4"/>
             <LayoutButtons Face="AP_Zergling" Type="AbilCmd" AbilCmd="AP_LarvaTrain,1" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_Aberration" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,27" Row="0" Column="3"/>
             <LayoutButtons Face="AP_MorphToCorpser" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,22" Row="1" Column="0"/>
             <LayoutButtons Face="AP_MorphToVile" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,0" Row="1" Column="0"/>
             <LayoutButtons Face="AP_Roach" Type="AbilCmd" AbilCmd="AP_LarvaTrain,9" Row="1" Column="0"/>
@@ -7963,17 +7962,23 @@
             <LayoutButtons Face="AP_MorphToHotSTorrasque" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,16" Row="1" Column="3"/>
             <LayoutButtons Face="AP_MorphToHotSNoxious" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,17" Row="1" Column="3"/>
             <LayoutButtons Face="AP_Ultralisk" Type="AbilCmd" AbilCmd="AP_LarvaTrain,6" Row="1" Column="3"/>
-            <!--            <LayoutButtons Face="AP_MorphtoDefiler" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,2" Row="1" Column="2"/>-->
             <LayoutButtons Face="AP_MorphToSwarmHostSplitA" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,25" Row="1" Column="4"/>
             <LayoutButtons Face="AP_MorphToSwarmHostSplitB" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,26" Row="1" Column="4"/>
             <LayoutButtons Face="AP_SwarmHostMP" Type="AbilCmd" AbilCmd="AP_LarvaTrain,14" Row="1" Column="4"/>
             <LayoutButtons Face="AP_MorphToMutaliskBroodlord" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,23" Row="2" Column="0"/>
             <LayoutButtons Face="AP_MorphToMutaliskViper" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,24" Row="2" Column="0"/>
             <LayoutButtons Face="AP_Mutalisk" Type="AbilCmd" AbilCmd="AP_LarvaTrain,4" Row="2" Column="0"/>
             <LayoutButtons Face="AP_Corruptor" Type="AbilCmd" AbilCmd="AP_LarvaTrain,11" Row="2" Column="1"/>
-            <LayoutButtons Face="AP_Scourge" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,Train30" Row="2" Column="2"/>
-            <LayoutButtons Face="AP_SIQueen" Type="AbilCmd" AbilCmd="AP_LarvaTrain,12" Row="2" Column="3"/>
-            <LayoutButtons Face="AP_Morphling" Type="AbilCmd" AbilCmd="AP_LarvaTrain,15" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_Morphling" Type="AbilCmd" AbilCmd="AP_LarvaTrain,15" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_LarvaAdvancedMorphs" Type="Submenu" SubmenuCardId="advm" SubmenuIsSticky="1" Row="2" Column="3"/>
+            <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="que1,CancelLast" Row="2" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="advm">
+            <LayoutButtons Face="AP_Pygalisk" Type="AbilCmd" AbilCmd="AP_LarvaTrain,Train17" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_DefilerSCBW" Type="AbilCmd" AbilCmd="AP_LarvaTrain,13" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_Scourge" Type="AbilCmd" AbilCmd="AP_LarvaTrainSwarm,Train30" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_SIQueen" Type="AbilCmd" AbilCmd="AP_LarvaTrain,12" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_LarvaBasicMorphs" Type="CancelSubmenu" Row="2" Column="3"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="que1,CancelLast" Row="2" Column="4"/>
         </CardLayouts>
         <Radius value="0.125"/>
@@ -26209,7 +26214,6 @@
         <CardLayouts CardId="SC2">
             <!-- Hotkey Editor -->
             <LayoutButtons Face="AP_HunterlingSummon" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train7" Row="0" Column="0"/>
-            <LayoutButtons Face="AP_PygaliskSummon" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train10" Row="0" Column="1"/>
         </CardLayouts>
         <CardLayouts CardId="Infested">
             <!-- Hotkey Editor -->

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -196,6 +196,8 @@ Button/Hotkey/AP_K5Leviathan=V
 Button/Hotkey/AP_KerriganUltimateAbilites=U
 Button/Hotkey/AP_KhaydarinMonolith=D
 Button/Hotkey/AP_Lair=L
+Button/Hotkey/AP_LarvaAdvancedMorphs=X
+Button/Hotkey/AP_LarvaBasicMorphs=B
 Button/Hotkey/AP_Liberator=T
 Button/Hotkey/AP_LiberatorAAMode=F
 Button/Hotkey/AP_LiberatorAGMode=E
@@ -316,6 +318,7 @@ Button/Hotkey/AP_PurificationNova=V
 Button/Hotkey/AP_PurificationNovaTargeted=V
 Button/Hotkey/AP_PurificationNovaEarly=G
 Button/Hotkey/AP_PurifierFaction=U
+Button/Hotkey/AP_Pygalisk=Y
 Button/Hotkey/AP_PygaliskSummon=Y
 Button/Hotkey/AP_Pylon=E
 Button/Hotkey/AP_Queen=Q