Omega Worm Quality of Life Changes

SirChuckOfTheChuckles · Aug 5, 2024 · ef7bc8a · ef7bc8a
1 parent 594c894
commit ef7bc8a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 10 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -66,7 +66,8 @@
     </CAbilEffectTarget>
     <CAbilBuild id="AP_BuildOmegaWorm">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
-        <FlagArray index="Cancelable" value="0"/>
+        <FlagArray index="Cancelable" value="1"/>
+        <FlagArray index="PeonMaintained" value="0"/>
         <InfoArray index="Build1" Unit="AP_OmegaWorm" Time="20">
             <Cooldown TimeUse="60"/>
             <Button DefaultButtonFace="AP_OmegaWorm" State="Restricted" Requirements="AP_HaveNydusNetwork"/>
@@ -78,6 +79,7 @@
         <TargetMessage value="Abil/TargetMessage/CreepTumorBuild"/>
         <SharedFlags index="RegisterChargeEvent" value="1"/>
         <SharedFlags index="RegisterCooldownEvent" value="1"/>
+        <Flags index="Transient" value="1"/>
         <Alert value="BuildComplete_Zerg"/>
         <InfoArray index="Build1" Unit="AP_CreepTumor" Time="3">
             <Charge Location="Unit"/>
@@ -86,6 +88,8 @@
         </InfoArray>
         <Range value="10"/>
         <EffectArray index="Start" value="AP_CreepTumorLaunchMissileSet"/>
+        <FlagArray index="Cancelable" value="0"/>
+        <FlagArray index="PeonMaintained" value="0"/>
     </CAbilBuild>
     <CAbilTrain id="AP_OmegaTrain">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
@@ -109,6 +113,11 @@
             <Unit value="AP_Zergling"/>
             <Unit value="AP_Zergling"/>
         </InfoArray>
+        <InfoArray index="Train4" Time="5" Rotation="Source">
+            <Button DefaultButtonFace="AP_BirthDrone" State="Restricted"/>
+            <Unit value="AP_Drone"/>
+            <Unit value=""/>
+        </InfoArray>
         <InfoArray index="Train5" Time="11" Rotation="Source">
             <Resource index="Minerals" value="-8"/>
             <Resource index="Vespene" value="-3"/>
@@ -211,7 +220,8 @@
     </CAbilMorph>
     <CAbilBuild id="AP_BuildNydusWorm">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
-        <FlagArray index="Cancelable" value="0"/>
+        <FlagArray index="Cancelable" value="1"/>
+        <FlagArray index="PeonMaintained" value="0"/>
         <InfoArray index="Build1" Unit="AP_NydusWorm" Time="20">
             <Cooldown TimeUse="30"/>
             <Button DefaultButtonFace="AP_NydusWorm" State="Restricted" Requirements="AP_HaveNydusNetwork"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -1063,6 +1063,7 @@
         <SoundArray index="Construction" value="Zerg_BuildingMorphWhat"/>
         <UnitFlags index="ShowBlobShadow" value="0"/>
         <UnitIcon value="AP\Assets\Textures\OmegaNydusDDSIcon.dds"/>
+        <StatusHarvesterData Text="UI/HarvesterCountMinerals" SearchFilters="-;Player,Ally,Enemy" SearchRadius="8"/>
         <Wireframe>
             <Image value="AP\Assets\Textures\OmegaNydusArmyPanelIcon.dds"/>
         </Wireframe>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4000,6 +4000,13 @@
         <EditorCategories value="Race:Zerg"/>
         <HotkeyAlias value="Zergling"/>
     </CButton>
+    <CButton id="AP_BirthDrone">
+        <Icon value="Assets\Textures\btn-unit-zerg-drone.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-zerg-drone.dds"/>
+        <Hotkey value="Button/Hotkey/AP_Drone"/>
+        <EditorCategories value="Race:Zerg"/>
+        <HotkeyAlias value="Drone"/>
+    </CButton>
     <CButton id="AP_BirthCorpser">
         <Icon value="Assets\Textures\btn-unit-zerg-roach-corpser.dds"/>
         <AlertIcon value="Assets\Textures\btn-unit-zerg-roach-corpser.dds"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -9487,7 +9487,7 @@
         <FlagArray index="AIThreatAir" value="1"/>
         <FlagArray index="AIHighPrioTarget" value="1"/>
         <FlagArray index="AIDefense" value="1"/>
-        <FlagArray index="ArmorDisabledWhileConstructing" value="1"/>
+        <FlagArray index="ArmorDisabledWhileConstructing" value="0"/>
         <FogVisibility value="Snapshot"/>
         <PlaneArray index="Ground" value="1"/>
         <Collide index="Burrow" value="1"/>
@@ -9512,7 +9512,7 @@
         <CostResource index="Vespene" value="100"/>
         <AttackTargetPriority value="11"/>
         <AbilArray Link="Rally"/>
-        <AbilArray Link="BuildinProgressNydusCanal"/>
+        <AbilArray Link="BuildInProgress"/>
         <AbilArray Link="AP_NydusWormTransport"/>
         <AbilArray Link="stop"/>
         <AbilArray Link="AP_SalvageNydus"/>
@@ -9525,6 +9525,7 @@
             <LayoutButtons Face="AP_NydusWormRavenousAppetite" Type="Passive" Requirements="AP_HaveNydusWormRavenousAppetite" Row="1" Column="1"/>
             <LayoutButtons Face="AP_NydusWormJormungandrStrain" Type="Passive" Requirements="AP_HaveNydusWormJormungandrStrain" Row="1" Column="2"/>
             <LayoutButtons Face="AP_NydusRecall" Type="AbilCmd" AbilCmd="AP_SalvageNydus,On" Row="1" Column="3"/>
+            <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
@@ -9554,7 +9555,7 @@
         <FlagArray index="TownAlert" value="1"/>
         <FlagArray index="NoPortraitTalk" value="1"/>
         <FlagArray index="AIDefense" value="1"/>
-        <FlagArray index="ArmorDisabledWhileConstructing" value="1"/>
+        <FlagArray index="ArmorDisabledWhileConstructing" value="0"/>
         <ResourceDropOff index="Minerals" value="1"/>
         <ResourceDropOff index="Vespene" value="1"/>
         <ResourceDropOff index="Terrazine" value="1"/>
@@ -9579,14 +9580,14 @@
         <StationaryTurningRate value="719.4726"/>
         <TurningRate value="719.4726"/>
         <Sight value="10"/>
-        <CostCategory value="Technology"/>
+        <CostCategory value="Economy"/>
         <CostResource index="Minerals" value="150"/>
         <CostResource index="Vespene" value="75"/>
         <AttackTargetPriority value="11"/>
-        <AbilArray Link="BuildinProgressNydusCanal"/>
+        <AbilArray Link="BuildInProgress"/>
         <AbilArray Link="AP_OmegaCreepBuild"/>
         <AbilArray Link="AP_OmegaTrain"/>
-        <AbilArray Link="Rally"/>
+        <AbilArray Link="AP_RallyHatchery"/>
         <AbilArray Link="AP_que7"/>
         <AbilArray Link="AP_SalvageNydus"/>
         <AbilArray Link="AP_OmegaTrainSwarmling"/>
@@ -9599,6 +9600,7 @@
             <LayoutButtons Face="AP_BirthRaptor" Type="AbilCmd" AbilCmd="AP_OmegaTrain,Train3" Row="0" Column="0"/>
             <LayoutButtons Face="AP_BirthSwarmling" Type="AbilCmd" AbilCmd="AP_OmegaTrain,Train2" Row="0" Column="0"/>
             <LayoutButtons Face="AP_BirthZergling" Type="AbilCmd" AbilCmd="AP_OmegaTrain,Train1" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_BirthDrone" Type="AbilCmd" AbilCmd="AP_OmegaTrain,Train4" Row="2" Column="1"/>
             <LayoutButtons Face="AP_BirthCorpser" Type="AbilCmd" AbilCmd="AP_OmegaTrain,Train6" Row="0" Column="1"/>
             <LayoutButtons Face="AP_BirthVile" Type="AbilCmd" AbilCmd="AP_OmegaTrain,Train7" Row="0" Column="1"/>
             <LayoutButtons Face="AP_BirthRoach" Type="AbilCmd" AbilCmd="AP_OmegaTrain,Train5" Row="0" Column="1"/>
@@ -9609,8 +9611,11 @@
             <LayoutButtons Face="AP_OmegaWormOuroborosStrain" Type="Passive" Requirements="AP_HaveOmegaWormOuroborosStrain" Row="1" Column="1"/>
             <LayoutButtons Face="AP_NydusWormJormungandrStrain" Type="Passive" Requirements="AP_HaveNydusWormJormungandrStrain" Row="1" Column="2"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="Rally,Rally1" Row="1" Column="4"/>
+            <LayoutButtons Face="RallyEgg" Type="AbilCmd" AbilCmd="AP_RallyHatchery,Rally2" Row="1" Column="3"/>
+
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_que7,CancelLast" Row="0" Column="4"/>
-            <LayoutButtons Face="AP_NydusRecall" Type="AbilCmd" AbilCmd="AP_SalvageNydus,On" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_NydusRecall" Type="AbilCmd" AbilCmd="AP_SalvageNydus,On" Row="2" Column="3"/>
+            <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -8939,6 +8939,7 @@
     </CUpgrade>
     <CUpgrade id="AP_K5TwoDrones">
         <EffectArray Operation="Set" Reference="Abil,AP_LarvaTrain,InfoArray[Train1].Unit[1]" Value="AP_Drone"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_OmegaTrain,InfoArray[Train4].Unit[1]" Value="AP_Drone"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_Drone,CostResource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_DroneBurrowed,CostResource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_Hatchery,CostResource[Minerals]" Value="25"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -29,6 +29,7 @@ Button/Hotkey/AP_BirthAberration=B
 Button/Hotkey/AP_BirthHydralisk=H
 Button/Hotkey/AP_BirthRoach=R
 Button/Hotkey/AP_BirthZergling=Z
+Button/Hotkey/AP_BirthDrone=D
 Button/Hotkey/AP_Blink=B
 Button/Hotkey/AP_BuildAutoTurret=T
 Button/Hotkey/AP_BuildCreepTumor=C

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -229,7 +229,7 @@ Abil/Name/AP_Obliterate=Obliterate
 Abil/Name/AP_ObserverTargetLock=Target Lock
 Abil/Name/AP_OmegaCreepBuild=Omega Spawn Creep Tumor
 Abil/Name/AP_OmegaTrain=Omega Train
-Abil/Name/AP_OmegaTrainSwarmling=Oemga Train - Swarmling
+Abil/Name/AP_OmegaTrainSwarmling=Omega Train - Swarmling
 Abil/Name/AP_OracleRevelation=Oracle Revelation
 Abil/Name/AP_OracleStasisTrap=Oracle Stasis Ward
 Abil/Name/AP_OracleStasisTrapActivate=Activate
@@ -882,6 +882,7 @@ Button/Name/AP_BirthRaptor=Birth Zergling
 Button/Name/AP_BirthRoach=Birth Roach
 Button/Name/AP_BirthSwarmling=Birth Zergling
 Button/Name/AP_BirthVile=Birth Roach
+Button/Name/AP_BirthDrone=Birth Drone
 Button/Name/AP_BirthZergling=Birth Zergling
 Button/Name/AP_Blink=Blink
 Button/Name/AP_BlinkShieldRestoreUpgrade=Phase Reactor
@@ -1957,6 +1958,7 @@ Button/Tooltip/AP_BattlecruiserCovertOpsEngines=Increases Battlecruiser movement
 Button/Tooltip/AP_BehemothPlating=Increases Battlecruiser armor by 2.
 Button/Tooltip/AP_BioMechanicalHeal=Heals a friendly biological or mechanical unit.<n/><n/><c val="f078ff">Heals <d ref="Effect,AP_HealingDroneHeal,RechargeVitalRate[0]"/> life per second.</c>
 Button/Tooltip/AP_BioMechanicalTransfusionPassive=Rapid Transfusion healing increased by 10 and can now target mechanical units and structures.
+Button/Tooltip/AP_BirthDrone=Basic worker unit. Can harvest minerals and vespene gas. Can mutate into structures.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_BirthAberration=Aberrations are durable units that deal heavy damage to armored targets.<n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_BirthCorpser=Corpser Strain<n/><n/>Assault unit. Regenerates life quickly while burrowed. Can infest the enemy with Roachlings. <n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_BirthHydralisk=High-damage ranged unit.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>