From 2c05b0a1a52770d31feffe5bae2477c958e9283a Mon Sep 17 00:00:00 2001
From: SirChuckOfTheChuckles <cfnesi1023@gmail.com>
Date: Fri, 9 Aug 2024 01:02:48 -0400
Subject: [PATCH] Undo other branch commits

---
 .../Base.SC2Data/GameData/AbilData.xml         | 15 ++-------------
 .../Base.SC2Data/GameData/ActorData.xml        |  1 -
 .../Base.SC2Data/GameData/ButtonData.xml       |  7 -------
 .../Base.SC2Data/GameData/ModelData.xml        |  2 ++
 .../Base.SC2Data/GameData/UnitData.xml         | 18 +++++++-----------
 .../Base.SC2Data/GameData/UpgradeData.xml      |  1 -
 .../enUS.SC2Data/LocalizedData/GameHotkeys.txt |  1 -
 .../enUS.SC2Data/LocalizedData/GameStrings.txt |  7 ++-----
 Mods/ArchipelagoTriggers.SC2Mod/Triggers       |  2 +-
 9 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 3be5c5124..8d24a713b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -66,8 +66,7 @@
     </CAbilEffectTarget>
     <CAbilBuild id="AP_BuildOmegaWorm">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
-        <FlagArray index="Cancelable" value="1"/>
-        <FlagArray index="PeonMaintained" value="0"/>
+        <FlagArray index="Cancelable" value="0"/>
         <InfoArray index="Build1" Unit="AP_OmegaWorm" Time="20">
             <Cooldown TimeUse="60"/>
             <Button DefaultButtonFace="AP_OmegaWorm" State="Restricted" Requirements="AP_HaveNydusNetwork"/>
@@ -78,8 +77,7 @@
     <CAbilBuild id="AP_OmegaCreepBuild">
         <TargetMessage value="Abil/TargetMessage/CreepTumorBuild"/>
         <SharedFlags index="RegisterChargeEvent" value="1"/>
-        <SharedFlags index="RegisterCooldownEvent" value="1"/>
-        <Flags index="Transient" value="1"/>
+        <SharedFlags index="RegisterCooldownEvent" value="1"/>z 
         <Alert value="BuildComplete_Zerg"/>
         <InfoArray index="Build1" Unit="AP_CreepTumor" Time="3">
             <Charge Location="Unit"/>
@@ -88,8 +86,6 @@
         </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"/>
@@ -113,11 +109,6 @@
             <Unit value="AP_Zergling"/>
             <Unit value="AP_Zergling"/>
         </InfoArray>
-        <InfoArray index="Train4" Time="6" 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"/>
@@ -220,8 +211,6 @@
     </CAbilMorph>
     <CAbilBuild id="AP_BuildNydusWorm">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
-        <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
index a582fec6a..191e35450 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -1064,7 +1064,6 @@
         <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
index a747f29e5..9020129bd 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4026,13 +4026,6 @@
         <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/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index 1a4aa539e..906e62454 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -3247,6 +3247,8 @@
         <Model value="Assets\Units\Terran\SiegeTank_BlackOps\SiegeTank_BlackOps.m3"/>
         <RequiredAnims value="Assets\Units\Terran\SiegeTank_SwarmAnims\SiegeTank_SwarmAnims.m3a"/>
         <RequiredAnims value="AP\Assets\Custom\Units\Terran\SiegeTankVoidAnimsBlackOps\SiegeTankVoidAnimsBlackOps.m3a"/>
+        <ScaleMax value="0.800000,0.800000,0.800000"/>
+        <ScaleMin value="0.800000,0.800000,0.800000"/>
     </CModel>
     <CModel id="AP_Merc_SiegeTank_BlackOps" parent="SiegeTankBase">
         <Model value="Assets\Units\Terran\SiegeTank_BlackOps\SiegeTank_BlackOps.m3"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 3d9a7b572..53fef861d 100644
--- 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="0"/>
+        <FlagArray index="ArmorDisabledWhileConstructing" value="1"/>
         <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="BuildInProgress"/>
+        <AbilArray Link="BuildinProgressNydusCanal"/>
         <AbilArray Link="AP_NydusWormTransport"/>
         <AbilArray Link="stop"/>
         <AbilArray Link="AP_SalvageNydus"/>
@@ -9525,7 +9525,6 @@
             <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"/>
@@ -9555,7 +9554,7 @@
         <FlagArray index="TownAlert" value="1"/>
         <FlagArray index="NoPortraitTalk" value="1"/>
         <FlagArray index="AIDefense" value="1"/>
-        <FlagArray index="ArmorDisabledWhileConstructing" value="0"/>
+        <FlagArray index="ArmorDisabledWhileConstructing" value="1"/>
         <ResourceDropOff index="Minerals" value="1"/>
         <ResourceDropOff index="Vespene" value="1"/>
         <ResourceDropOff index="Terrazine" value="1"/>
@@ -9580,14 +9579,14 @@
         <StationaryTurningRate value="719.4726"/>
         <TurningRate value="719.4726"/>
         <Sight value="10"/>
-        <CostCategory value="Economy"/>
+        <CostCategory value="Technology"/>
         <CostResource index="Minerals" value="150"/>
         <CostResource index="Vespene" value="75"/>
         <AttackTargetPriority value="11"/>
-        <AbilArray Link="BuildInProgress"/>
+        <AbilArray Link="BuildinProgressNydusCanal"/>
         <AbilArray Link="AP_OmegaCreepBuild"/>
         <AbilArray Link="AP_OmegaTrain"/>
-        <AbilArray Link="AP_RallyHatchery"/>
+        <AbilArray Link="Rally"/>
         <AbilArray Link="AP_que7"/>
         <AbilArray Link="AP_SalvageNydus"/>
         <AbilArray Link="AP_OmegaTrainSwarmling"/>
@@ -9600,7 +9599,6 @@
             <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"/>
@@ -9611,10 +9609,8 @@
             <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="2" Column="3"/>
-            <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_NydusRecall" Type="AbilCmd" AbilCmd="AP_SalvageNydus,On" Row="1" Column="3"/>
         </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
index 4ed8ffb37..223407949 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -8946,7 +8946,6 @@
     </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
index 26baa0b4c..16f765573 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -29,7 +29,6 @@ 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
index 8b61bd68a..85e821029 100644
--- 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=Omega Train - Swarmling
+Abil/Name/AP_OmegaTrainSwarmling=Oemga Train - Swarmling
 Abil/Name/AP_OracleRevelation=Oracle Revelation
 Abil/Name/AP_OracleStasisTrap=Oracle Stasis Ward
 Abil/Name/AP_OracleStasisTrapActivate=Activate
@@ -882,7 +882,6 @@ 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
@@ -1963,7 +1962,6 @@ 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>
@@ -2517,8 +2515,7 @@ Button/Tooltip/AP_Obliterate=Deals 200 damage to a single target.
 Button/Tooltip/AP_Observer=Flying spy. Cloak renders the unit invisible to enemies without detection.<n/><n/><c val="FFE303">Detector</c>
 Button/Tooltip/AP_ObserverSensorArray=Increases Observer sight range.
 Button/Tooltip/AP_OcularImplants=Increases Ghost weapon range by 2. Increases sight radius by 3.
-Button/Tooltip/AP_OmegaWorm=Grows Creep used to feed nearby Zerg structures and can create Creep Tumors. Allows resources to be dropped off and can create Drones. Can NOT transport troops through the Nydus Network. <n/><n/><c val="#ColorAttackInfo">Bonus: Zerg move faster on creep.</c>
-Button/Tooltip/AP_OmegaWormOuroborosStrain=Allows Omega Worms to train a limited assortment of combat units, if unlocked (Zerglings, Roaches, Hydralisks, and Aberrations).<n/>These units are trained directly from the Omega Worm, train quicker than morphing from larva, and have a reduced cost.
+Button/Tooltip/AP_OmegaWorm=Grows creep used to feed nearby Zerg structures and can create Creep Tumors. Allows resources to be dropped off, like a Hatchery. Can NOT transport troops through the Nydus Network. <n/><n/><c val="#ColorAttackInfo">Bonus: Zerg move faster on creep.</c>Button/Tooltip/AP_OmegaWormOuroborosStrain=Allows Omega Worms to train a limited assortment of combat units, if unlocked (Zerglings, Roaches, Hydralisks, and Aberrations).<n/>These units are trained directly from the Omega Worm, train quicker than morphing from larva, and have a reduced cost.
 Button/Tooltip/AP_Oracle=Flying Caster.<n/><n/><c val="ffff8a">Can attack ground units.</c><n/><c val="FFE303">Detector</c>
 Button/Tooltip/AP_OracleBuildStasisTrap=Places a cloaked Stasis Ward at the target location. Once activated by an enemy ground unit, the ward traps nearby enemies in stasis for <d ref="Behavior,AP_OracleStasisTrapTarget,Duration"/> seconds. Trapped units cannot be attacked or affected by abilities.
 Button/Tooltip/AP_OracleBuildStasisTrapUpgraded=Places a cloaked Stasis Ward at the target location. Once activated by an enemy ground unit, the ward stuns them for <d ref="Behavior,AP_OracleStasisTrapTarget,Duration"/> seconds.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index f70edd748..00fab5589 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4507,7 +4507,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters, //22
                     libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower, //23
                     libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction, //24
-                    ap_triggers_PlayerConsumer_sig, //25                    
+                    ap_triggers_PlayerConsumer_sig, //25
                     ap_triggers_PlayerConsumer_sig, //26
                     ap_triggers_PlayerConsumer_sig, //27
                     ap_triggers_PlayerConsumer_sig, //28