From a785d24f4bbedc8a8fea74623651efc621ded56d Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Thu, 10 Oct 2024 23:00:55 -0400
Subject: [PATCH 01/34] hunterling changes

---
 .../Base.SC2Data/GameData/AbilData.xml                       | 5 ++---
 .../Base.SC2Data/GameData/BehaviorData.xml                   | 4 ++++
 .../Base.SC2Data/GameData/UnitData.xml                       | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 7a29ab76b..384322dfa 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -11069,8 +11069,6 @@
             <Unit value="AP_MercUltralisk"/>
         </InfoArray>
         <InfoArray index="Train7" Effect="AP_MercGroundDrop">
-            <Resource index="Minerals" value="200"/>
-            <Resource index="Vespene" value="75"/>
             <Charge>
                 <CountMax value="3"/>
                 <CountStart value="3"/>
@@ -11086,6 +11084,7 @@
             </Cooldown>
             <Button DefaultButtonFace="AP_HunterlingSummon" State="Restricted" Requirements="AP_ZergMercCompoundSC2"/>
             <Unit value="AP_Hunterling"/>
+            <Unit value="AP_Hunterling"/>
         </InfoArray>
         <InfoArray index="Train8" Effect="AP_MercGroundDrop">
             <Charge>
@@ -12276,7 +12275,7 @@
         <Effect index="0" value="AP_HunterlingLeapLaunchMissile"/>
         <Cost>
             <Charge Link=""/>
-            <Cooldown TimeUse="10"/> <!-- increased from 4 vanilla-->
+            <Cooldown TimeUse="12"/> <!-- increased from 4 vanilla-->
         </Cost>
         <Range value="10"/>
         <!--ErrorAlert value="Error/AP_LeapAttackError"/-->
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index a886f1ca3..07bdfff6b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -7924,6 +7924,10 @@
             <StateFlags index="SuppressAttack" value="1"/>
             <AbilClassDisableArray index="CAbilAttack" value="1"/>
         </Modification>
+        <DurationOverride>
+            <Duration value="1"/>
+            <ValidatorArray value="AP_IsHeroic"/>
+        </DurationOverride>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_BattlecruiserMengskYamatoTargetMarker">
         <InfoFlags index="Hidden" value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 1f894cb8f..77fbf8621 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26138,7 +26138,7 @@
         <Sight value="8"/>
         <CargoSize value="2"/>
         <CostCategory value="Army"/>
-        <CostResource index="Minerals" value="200"/>
+        <CostResource index="Minerals" value="150"/>
         <CostResource index="Vespene" value="75"/>
         <AttackTargetPriority value="20"/>
         <DamageDealtXP value="1"/>
@@ -26148,6 +26148,7 @@
         <AbilArray Link="attack"/>
         <AbilArray Link="AP_LeapAttack"/>
         <!--BehaviorArray Link="Detector11"/--> <!-- doesn't need to be a detector-->
+        <BehaviorArray Link="AP_MalignantCreepFix"/>
         <BehaviorArray Link="AP_HunterlingJump"/>
         <CardLayouts>
             <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>

From 57209d0ebe67b79c03ec2959fa43fc593467306b Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Fri, 11 Oct 2024 16:54:12 -0400
Subject: [PATCH 02/34] add heroic to maar

---
 .../Base.SC2Data/GameData/UnitData.xml                        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml
index ef218cba9..2b9407069 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml
+++ b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml
@@ -13,4 +13,8 @@
         <ShieldsStart value="750"/>
         <ShieldsMax value="750"/>
     </CUnit>
+    <CUnit id="Maar">
+    <!--Override-->
+        <Attributes index="Heroic" value="1"/>
+    </CUnit>
 </Catalog>

From dd550ad7c262ec82329f0c878a952864e40659b4 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 08:38:03 -0400
Subject: [PATCH 03/34] rebalance guardian and add upgrades

---
 .../Base.SC2Data/GameData/AbilData.xml        |  19 +++
 .../Base.SC2Data/GameData/ActorData.xml       |  73 ++++++++++++
 .../Base.SC2Data/GameData/BehaviorData.xml    |  39 ++++++
 .../Base.SC2Data/GameData/ButtonData.xml      |  15 +++
 .../Base.SC2Data/GameData/EffectData.xml      | 111 ++++++++++++++++++
 .../Base.SC2Data/GameData/ModelData.xml       |  19 +++
 .../Base.SC2Data/GameData/MoverData.xml       |  42 +++++++
 .../Base.SC2Data/GameData/RequirementData.xml |  12 ++
 .../GameData/RequirementNodeData.xml          |  12 ++
 .../Base.SC2Data/GameData/SoundData.xml       |  60 ++++++++++
 .../Base.SC2Data/GameData/UnitData.xml        |  18 ++-
 .../Base.SC2Data/GameData/UpgradeData.xml     |  16 ++-
 .../Base.SC2Data/GameData/ValidatorData.xml   |  32 ++++-
 .../LocalizedData/GameHotkeys.txt             |   1 +
 .../LocalizedData/GameStrings.txt             |   8 ++
 15 files changed, 472 insertions(+), 5 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 384322dfa..ef15d2ae8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -13602,4 +13602,23 @@
         <TargetFilters index="0" value="Visible;Self,Enemy,Structure,Missile,UnderConstruction,Dead,Hidden"/>
         <CmdButtonArray index="Execute" Requirements="AP_HaveMedicMengskDoubleBeamHealAndMech"/>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_GuardianExplosiveSpores">
+        <Alignment value="Negative"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <Cost>
+            <Cooldown Link="AP_GuardianExplosiveSpores" TimeUse="30"/> <!-- increased from coop's 10-->
+        </Cost>
+        <Range value="9"/>
+        <CastOutroTime value="0.35"/>
+        <TargetFilters value="Ground,Visible;Self,Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_GuardianExplosiveSpores" State="Restricted" Requirements="AP_HaveGuardianExplosiveSpores"/>
+        <Flags index="AutoCast" value="1"/>
+        <Flags index="AutoCastOn" value="1"/>
+        <TargetSorts RequestCount="1">
+            <SortArray value="TSDistance"/>
+        </TargetSorts>
+        <AutoCastFilters value="Ground,Visible;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AutoCastRange value="9"/>
+        <Effect index="0" value="AP_GuardianExplosiveSporesLaunch"/>
+    </CAbilEffectTarget>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index f37863c02..a92301988 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -33422,6 +33422,7 @@
         <On Terms="AbilMorph.*.Finish; MorphTo AP_GuardianSCBW" Send="Create"/>
         <On Terms="ActorCreation" Send="$Birth 0 0.000000 -1.000000 0.000000"/>
         <On Terms="UnitDeathCustomize; ValidateUnit IsHallucination" Send="DeathCustomize Hallucination"/>
+        <On Terms="Abil.AP_GuardianExplosiveSpores.SourceCastStart" Send="AnimBracketStart Attack Attack"/>
         <DeathCustoms ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathLarge" Name="Hallucination"/>
         <HostSiteOps Ops="AP_SOpBankerGuardianMP"/>
         <Baselines index="Stand" BlendIn="1.000000" BlendOut="1.000000"/>
@@ -40757,4 +40758,76 @@
             <Image value="Assets\Textures\wireframe-terran-liberator-aamode.dds"/>
         </Wireframe>
     </CActorUnit>
+    <CActorSimple id="AP_GuardianExplosiveSporesKnockbackAnim">
+        <On Terms="Behavior.AP_GuardianExplosiveSporesKnockback.On; ValidateUnit IsNotConstructing; ValidateUnitType AP_NotSiegedTank" Send="Create"/>
+        <On Terms="Behavior.AP_GuardianExplosiveSporesKnockback.Off" Target="_Unit" Send="AnimClear KnockbackFlail"/>
+        <On Terms="Behavior.AP_GuardianExplosiveSporesKnockback.Off" Send="Destroy"/>
+        <On Terms="ActorCreation" Target="_Unit" Send="AnimClear Attack"/>
+        <On Terms="ActorCreation" Target="_Unit" Send="AnimClear AttackReady"/>
+        <On Terms="ActorCreation" Target="_Unit" Send="AnimClear AttackLeft"/>
+        <On Terms="ActorCreation" Target="_Unit" Send="AnimClear AttackRight"/>
+        <On Terms="ActorCreation" Target="_Unit" Send="AnimPlay KnockbackFlail Flail PlayForever,RandomStartOffset 0.100000 0.100000"/>
+        <On Terms="ActorCreation" Send="TimerSet 3.500000 KnockbackDelay"/>
+        <On Terms="TimerExpired; TimerName KnockbackDelay" Target="_Unit" Send="AnimClear KnockbackFlail"/>
+        <On Terms="TimerExpired; TimerName KnockbackDelay" Send="Destroy"/>
+    </CActorSimple>
+    <CActorUnit id="AP_GuardianExplosiveSpores" parent="GenericUnitSelectableNoAutoSoundLinks" unitName="AP_GuardianExplosiveSpores">
+        <On Terms="AnimDone; AnimName Death" Send="Destroy"/>
+        <BarWidth value="36"/>
+        <BarOffset value="10"/>
+        <UnitIcon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-explosivespores.dds"/>
+        <HeroIcon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-explosivespores.dds"/>
+        <GroupIcon>
+            <Image value="Assets\Textures\Wireframe-Terran-D8Charge.dds"/>
+        </GroupIcon>
+        <Wireframe>
+            <Image value="Assets\Textures\Wireframe-Terran-D8Charge.dds"/>
+        </Wireframe>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-terran-buildingarmor.dds"/>
+        <DeathArray index="Normal" AnimProps="Death" ModelLink="AP_GuardianExplosiveSpores" SoundLink="AP_GuardianExplosiveSporesExplode"/>
+        <StatusBarFlags index="Life" value="0"/>
+    </CActorUnit>
+    <CActorMissile id="AP_GuardianExplosiveSporesMissile" parent="GenericAttackMissile" unitName="AP_GuardianExplosiveSporesWeapon">
+        <Model value="AP_GuardianExplosiveSporesMissile"/>
+        <ModelFlags index="AutomateGlobalLoops" value="1"/>
+    </CActorMissile>
+    <CActorModel id="AP_GuardianExplosiveSporesMissileImpact" parent="ModelAnimationStyleOneShotNoOrphan">
+        <On Terms="Effect.AP_GuardianExplosiveSporesSearchArea.Start" Send="Create"/>
+    </CActorModel>
+    <CActorSound id="AP_GuardianExplosiveSporesMissileImpactAS" parent="SoundOneShot">
+        <On Terms="Effect.AP_GuardianExplosiveSporesSearchArea.Start" Send="Create"/>
+        <EditorCategories value=""/>
+        <Sound value="AP_GuardianExplosiveSporesSpewage"/>
+        <Layers Sound="AP_GuardianExplosiveSporesDetonate">
+            <Chance value="100"/>
+            <Pitch value="0.000000,0.000000"/>
+            <PlayDelay value="0,0"/>
+            <Volume value="0.000000,0.000000"/>
+        </Layers>
+    </CActorSound>
+    <CActorModel id="AP_GuardianExplosiveSporesImpactModel">
+        <Flags index="SuppressCreationErrors" value="1"/>
+        <Flags index="SuppressSaveLoad" value="1"/>
+        <Inherits index="Visibility" value="1"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart BSD IGNORE Stand,A Death ContentPlayOnce,Instant"/>
+        <On Terms="AnimBracketState.*.AfterClosing; AnimName BSD" Send="Destroy"/>
+        <On Terms="Behavior.AP_GuardianExplosiveSporesFate.Off" Send="AnimBracketStop BSD"/>
+        <Model value="GenericAttackModel"/>
+        <ModelFlags index="AllowHitTest" value="0"/>
+        <ModelFlags index="AutomateGlobalLoops" value="1"/>
+    </CActorModel>
+    <CActorAction id="AP_GuardianExplosiveSporesAction" parent="GenericAttack" effectImpact="AP_GuardianExplosiveSporesFateAB" effectLaunch="AP_GuardianExplosiveSporesLM">
+        <LaunchAssets Sound="AP_GuardianExplosiveSporesLaunch"/>
+        <Missile value="AP_GuardianExplosiveSporesMissile"/>
+        <ImpactMap index="None" Model="AP_GuardianExplosiveSporesMissile" AnimProps="Stand,A" Sound="AP_GuardianExplosiveSporesImpact"/>
+        <ImpactModel value="AP_GuardianExplosiveSporesImpactModel"/>
+    </CActorAction>
+    <CActorRange id="AP_GuardianExplosiveSporesRange" parent="RangeAbil" abil="AP_GuardianExplosiveSpores"/>
+    <CActorModel id="AP_GuardianPrimordialFuryBuff" parent="ModelAddition">
+        <Inherits index="TintColor" value="0"/>
+        <On Terms="Behavior.AP_GuardianPrimordialFury.On" Send="Create"/>
+        <On Terms="Behavior.AP_GuardianPrimordialFury.Off" Send="AnimBracketStop BSD"/>
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+        <Model value="AP_GuardianPrimordialFury"/>
+    </CActorModel>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 07bdfff6b..2081f2e7b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -9126,4 +9126,43 @@
         <Name value="Button/Name/AP_LiberatorCompressedRocketFuel"/>
         <Tooltip value="Button/Tooltip/AP_LiberatorCompressedRocketFuel"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_GuardianExplosiveSporesFate">
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <Duration value="2"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <MaxStackCount value="0"/>
+        <FinalEffect value="AP_GuardianExplosiveSporesInitialSet"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_GuardianExplosiveSporesKnockback">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <Duration value="2"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_GuardianExplosiveSporesPrecursorUnitKnockback">
+        <InfoFlags index="Hidden" value="1"/>
+        <Duration value="1.0625"/>
+        <Modification>
+            <ModifyFlags index="DisableAbils" value="1"/>
+            <ModifyFlags index="SuppressMoving" value="1"/>
+            <ModifyFlags index="SuppressTurning" value="1"/>
+            <StateFlags index="Invulnerable" value="1"/>
+            <StateFlags index="SuppressCollision" value="1"/>
+            <StateFlags index="NoDraw" value="1"/>
+            <StateFlags index="Uncommandable" value="1"/>
+            <StateFlags index="Unselectable" value="1"/>
+            <StateFlags index="Untargetable" value="1"/>
+        </Modification>
+        <FinalEffect value="SuicideRemove"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_GuardianPrimordialFury">
+        <Alignment value="Positive"/>
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <InfoIcon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-primordialfury.dds"/>
+        <Duration value="5"/>
+        <BuffFlags index="RefreshStack" value="1"/>
+        <MaxStackCount value="5"/>
+        <PeriodCount value="1"/>
+        <Modification AdditiveAttackSpeedFactor=".1"/>
+        <BehaviorCategories index="Fast" value="1"/>
+    </CBehaviorBuff>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 7336f00ad..f65ed854f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6596,4 +6596,19 @@
         <TooltipAppender Validator="AP_CasterLevelLT4" Text="Button/Tooltip/AP_LiberatorMengskRank3Preview"/>
         <TooltipAppender Validator="AP_CasterLevelGTE4" Text="Button/Tooltip/AP_LiberatorMengskRank3"/>
     </CButton>
+    <CButton id="AP_GuardianPropellantSacs">
+        <Icon value="Assets\Textures\btn-upgrade-zerg-pneumatizedcarapace.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-zerg-pneumatizedcarapace.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
+    <CButton id="AP_GuardianExplosiveSpores">
+        <Icon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-explosivespores.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-explosivespores.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
+    <CButton id="AP_GuardianPrimordialFury">
+        <Icon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-primordialfury.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-primordialfury.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index f65d02156..958a0bcdb 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -16348,6 +16348,7 @@
     <CEffectLaunchMissile id="AP_GuardianSCBWWeapon@LM">
         <EditorCategories value="Race:Zerg"/>
         <ImpactEffect value="AP_GuardianSCBWWeapon@Damage"/>
+        <FinishEffect value="AP_GuardianPrimordialFuryAB"/>
         <AmmoUnit value="AP_GuardianSCBWWeapon@Missile"/>
     </CEffectLaunchMissile>
     <CEffectDamage id="AP_GuardianSCBWWeapon@DamageAir" parent="DU_WEAP_MISSILE">
@@ -16358,6 +16359,7 @@
     <CEffectLaunchMissile id="AP_GuardianSCBWWeapon@LMAir">
         <EditorCategories value="Race:Zerg"/>
         <ImpactEffect value="AP_GuardianSCBWWeapon@DamageAir"/>
+        <FinishEffect value="AP_GuardianPrimordialFuryAB"/>
         <AmmoUnit value="AP_GuardianSCBWWeapon@Missile"/>
     </CEffectLaunchMissile>
     <CEffectLaunchMissile id="AP_ParasiticBombLM">
@@ -21612,4 +21614,113 @@
         <EffectArray value="AP_MengskVeteranMaxedTrigger"/>
         <EffectArray value="AP_LiberatorMengskWeaponChange"/>
     </CEffectSet>
+    <CEffectSet id="AP_GuardianExplosiveSporesLaunch">
+        <EffectArray value="AP_GuardianExplosiveSporesLM"/>
+        <EditorCategories value="Race:Terran"/>
+    </CEffectSet>
+    <CEffectLaunchMissile id="AP_GuardianExplosiveSporesLM">
+        <EditorCategories value="Race:Terran"/>
+        <LaunchLocation Value="CasterUnit"/>
+        <AmmoUnit value="AP_GuardianExplosiveSporesWeapon"/>
+        <Movers Link="AP_GuardianExplosiveSporesWeaponCloseRange" IfRangeLTE="1"/>
+        <Movers Link="AP_GuardianExplosiveSporesWeapon" IfRangeLTE="500"/>
+        <ImpactEffect value="AP_GuardianExplosiveSporesFateAB"/>
+    </CEffectLaunchMissile>
+    <CEffectApplyBehavior id="AP_GuardianExplosiveSporesFateAB">
+        <Behavior value="AP_GuardianExplosiveSporesFate"/>
+    </CEffectApplyBehavior>
+    <CEffectSet id="AP_GuardianExplosiveSporesInitialSet">
+        <EditorCategories value="Race:Terran"/>
+        <EffectArray value="AP_GuardianExplosiveSporesSearchArea"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_GuardianExplosiveSporesSearchArea">
+        <SearchFilters value="Ground;Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_GuardianExplosiveSporesEndSet"/> <!-- reduced from coop's 2-->
+        <AINotifyFlags index="HurtEnemy" value="1"/>
+        <AINotifyFlags index="MinorDanger" value="1"/>
+    </CEffectEnumArea>
+    <CEffectSet id="AP_GuardianExplosiveSporesEndSet">
+        <EditorCategories value="Race:Terran"/>
+        <EffectArray value="AP_GuardianExplosiveSporesExplodeDamage"/>
+        <EffectArray value="AP_GuardianExplosiveSporesKnockback"/>
+    </CEffectSet>
+    <CEffectDamage id="AP_GuardianExplosiveSporesExplodeDamage" parent="DU_WEAP_SPLASH">
+        <EditorCategories value="Race:PrimalZerg"/>
+        <Kind value="Spell"/>
+        <Amount value="20"/> <!-- reduced from coop's 50-->
+        <Death value="Blast"/>
+        <ArmorReduction value="0"/>
+        <ValidatorArray value="IsNotPhasedUnit"/>
+    </CEffectDamage>
+    <CEffectCreateUnit id="AP_GuardianExplosiveSporesKnockback">
+        <ValidatorArray value="AP_NotMassive"/>
+        <ValidatorArray value="NotFrenzied"/>
+        <ValidatorArray value="IsNotBurrowedUnit"/>
+        <ValidatorArray value="NotStructureTarget"/>
+        <ValidatorArray value="IsNotLarva"/>
+        <ValidatorArray value="IsNotEgg"/>
+        <ValidatorArray value="AP_IsNotPhasedUnit"/>
+        <ValidatorArray value="IsNotWarpingIn"/>
+        <ValidatorArray value="IsNotEggUnit"/>
+        <ValidatorArray value="AP_NotAbducted"/>
+        <ValidatorArray value="NoGravitonBeamInProgress"/>
+        <EditorCategories value="Race:Zerg"/>
+        <CreateFlags index="Birth" value="0"/>
+        <CreateFlags index="DropOff" value="0"/>
+        <CreateFlags index="PlacementIgnoreBlockers" value="1"/>
+        <CreateFlags index="Precursor" value="1"/>
+        <CreateFlags index="ProvideFood" value="0"/>
+        <CreateFlags index="TechComplete" value="0"/>
+        <CreateFlags index="UseFood" value="0"/>
+        <CreateFlags index="NormalizeSpawnOffset" value="0"/>
+        <SpawnOwner Value="Neutral"/>
+        <SpawnEffect value="AP_GuardianExplosiveSporesKnockbackCreatePHSet"/>
+        <SpawnRange value="4"/>
+        <SpawnOffset value="0,3"/>
+        <TypeFallbackUnit Value="Target"/>
+        <Origin Value="SourceUnit"/>
+    </CEffectCreateUnit>
+    <CEffectSet id="AP_GuardianExplosiveSporesKnockbackCreatePHSet">
+        <EffectArray value="AP_GuardianExplosiveSporesPrecursorUnitKnockbackAB"/>
+        <EffectArray value="AP_GuardianExplosiveSporesKnockbackAB"/>
+        <EffectArray value="AP_GuardianExplosiveSporesKnockbackPHLM"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_GuardianExplosiveSporesPrecursorUnitKnockbackAB">
+        <Behavior value="AP_GuardianExplosiveSporesPrecursorUnitKnockback"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_GuardianExplosiveSporesKnockbackAB">
+        <WhichUnit Effect="AP_GuardianExplosiveSporesKnockback"/>
+        <Behavior value="AP_GuardianExplosiveSporesKnockback"/>
+    </CEffectApplyBehavior>
+    <CEffectLaunchMissile id="AP_GuardianExplosiveSporesKnockbackPHLM">
+        <LaunchLocation Effect="AP_GuardianExplosiveSporesKnockback" Value="TargetUnit"/>
+        <ImpactEffect value="AP_GuardianExplosiveSporesKnockbackImpactCP"/>
+        <Flags index="2D" value="1"/>
+        <Flags index="TravelValidation" value="1"/>
+        <Flags index="ValidateAbil" value="0"/>
+        <Flags index="ValidateBenign" value="0"/>
+        <Flags index="ValidateTeleport" value="0"/>
+        <Flags index="ValidateWeapon" value="0"/>
+        <Movers Link="UnitKnockbackMover3"/>
+        <DeathType value="Unknown"/>
+        <ValidatorArray index="0" value="AP_GuardianExplosiveSporesRange"/>
+        <ValidatorArray value="AP_GuardianExplosiveSporesTargetNotDead"/>
+    </CEffectLaunchMissile>
+    <CEffectCreatePersistent id="AP_GuardianExplosiveSporesKnockbackImpactCP">
+        <WhichLocation Effect="AP_GuardianExplosiveSporesKnockback" Value="TargetUnit"/>
+        <PeriodCount value="1"/>
+        <PeriodicEffectArray value="AP_GuardianExplosiveSporesKnockbackRB"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectRemoveBehavior id="AP_GuardianExplosiveSporesKnockbackRB">
+        <WhichUnit Effect="AP_GuardianExplosiveSporesKnockback"/>
+        <BehaviorLink value="AP_GuardianExplosiveSporesKnockback"/>
+        <Count value="1"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_GuardianPrimordialFuryAB">
+        <EditorCategories value="Race:Zerg"/>
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_GuardianPrimordialFury"/>
+        <ValidatorArray value="AP_HaveGuardianPrimordialFury"/>
+    </CEffectApplyBehavior>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index cddd21143..fac911328 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -20118,4 +20118,23 @@
     <CModel id="AP_LiberatorMengsk" parent="LiberatorBase">
         <Model value="AP\Assets\Units\Terran\LiberatorMengsk\RoyalGuard_Liberator.m3"/>
     </CModel>
+    <CModel id="AP_GuardianExplosiveSporesMissile" parent="RaceMissileFX" Race="Zerg">
+        <Model value="Assets\Effects\Zerg\Primal_Guardian_Coop_Missile\Primal_Guardian_Coop_Missile.m3"/>
+        <Occlusion value="Show"/>
+        <ScaleMax value="0.500000,0.500000,0.500000"/>
+        <ScaleMin value="0.500000,0.500000,0.500000"/>
+    </CModel>
+    <CModel id="AP_GuardianExplosiveSporesMissileImpact" parent="RaceImpactFX" Race="Zerg">
+        <Model value="Assets\Effects\Zerg\Primal_Guardian_Coop_Missile_Impact\Primal_Guardian_Coop_Missile_Impact.m3"/>
+        <ScaleMax value="0.800000,0.800000,0.800000"/>
+        <ScaleMin value="0.800000,0.800000,0.800000"/>
+    </CModel>
+    <CModel id="AP_GuardianExplosiveSpores" parent="Unit" Race="Terran">
+        <SelectionLayer value="3"/>
+        <Model value="Assets\Units\Terran\MagneticMine\MagneticMine.m3"/>
+        <AnimSpeed value="3.000000"/>
+    </CModel>
+    <CModel id="AP_GuardianPrimordialFury" parent="RacePersistentSpellFX" Race="Zerg">
+        <Model value="Assets\Effects\Zerg\Primal_Guardian_Coop_Fury\Primal_Guardian_Coop_Fury.m3"/>
+    </CModel>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
index 6e1e75270..59bf14aaf 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
@@ -2136,4 +2136,46 @@
             <YawPitchRoll value="719.2968"/>
         </MotionPhases>
     </CMoverMissile>
+    <CMoverMissile id="AP_GuardianExplosiveSpores">
+        <MotionPhases>
+            <Driver value="Guidance"/>
+            <Acceleration value="3200"/>
+            <Speed value="20"/>
+            <MaxSpeed value="20"/>
+            <ClearanceAcceleration value="75"/>
+            <Outro value="-1"/>
+            <YawPitchRoll value="MAX"/>
+        </MotionPhases>
+        <MotionPhases YawPitchRoll="MAX"/>
+        <MotionPhases>
+            <Driver value="Guidance"/>
+            <Speed value="20"/>
+            <MaxSpeed value="20"/>
+            <YawPitchRoll value="MAX"/>
+        </MotionPhases>
+    </CMoverMissile>
+    <CMoverMissile id="AP_GuardianExplosiveSporesWeapon">
+        <MotionPhases>
+            <Driver value="Guidance"/>
+            <Acceleration value="3200"/>
+            <Speed value="12"/>
+            <MaxSpeed value="12"/>
+            <ClearanceAcceleration value="75"/>
+            <Outro value="-1"/>
+            <YawPitchRoll value="719.2968"/>
+        </MotionPhases>
+        <MotionPhases YawPitchRoll="MAX"/>
+    </CMoverMissile>
+    <CMoverMissile id="AP_GuardianExplosiveSporesWeaponCloseRange">
+        <MotionPhases>
+            <Driver value="Guidance"/>
+            <Acceleration value="3200"/>
+            <Speed value="6"/>
+            <MaxSpeed value="6"/>
+            <ClearanceAcceleration value="75"/>
+            <Outro value="-1"/>
+            <YawPitchRoll value="719.2968"/>
+        </MotionPhases>
+        <MotionPhases YawPitchRoll="MAX"/>
+    </CMoverMissile>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index cbc426415..d083a203f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4064,4 +4064,16 @@
     <CRequirement id="AP_ZergMercCompoundBroodWarAndHaveSwarmling">
         <NodeArray index="Show" Link="AP_AndHotSHaveSwarmlingCompleteOnlyZergMercCompoundBroodWarSelectedCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveGuardianPropellantSacs">
+        <EditorCategories value="Race:Zerg,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeGuardianPropellantSacsCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveGuardianExplosiveSpores">
+        <EditorCategories value="Race:Zerg,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeGuardianExplosiveSporesCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveGuardianPrimordialFury">
+        <EditorCategories value="Race:Zerg,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeGuardianPrimordialFuryCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index a32788e12..2938ecefe 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6705,4 +6705,16 @@
         <OperandArray value="AP_NotCountUpgradeAdaptiveMedPacksCompleteOnly"/>
         <OperandArray value="AP_LTCountBehaviorMengskVeterancyMedicMengskCompleteOnlyAtUnit4"/>
     </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradeGuardianPropellantSacsCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_GuardianPropellantSacs" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeGuardianExplosiveSporesCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_GuardianExplosiveSpores" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeGuardianPrimordialFuryCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_GuardianPrimordialFury" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
index 24f24a774..bd704af50 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
@@ -14289,4 +14289,64 @@
         <Pitch value="-1.000000,1.640000"/>
         <Volume value="3.000000,3.000000"/>
     </CSound>
+    <CSound id="AP_GuardianExplosiveSporesExplode" parent="Combat">
+        <AssetArray File="Assets\Sounds\PrimalGuardian_D_Detonate_01.wav" FacialGroup=""/>
+        <Pitch value="-12.000000,-10.000000"/>
+        <Volume value="-7.000000,-7.000000"/>
+        <DupeDestroyCount value="3"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupeMuteCount value="3"/>
+    </CSound>
+    <CSound id="AP_GuardianExplosiveSporesSpewage" parent="Death">
+        <EditorCategories value="Race:Zerg"/>
+        <AssetArray File="Assets\Sounds\SpaceCow_DeathBlow_1.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\SpaceCow_DeathBlow_2.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\SpaceCow_DeathBlow_3.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\SpaceCow_DeathBlow_4.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\SpaceCow_DeathBlow_5.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\SpaceCow_DeathBlow_6.wav" FacialGroup=""/>
+        <DupeDestroyCount value="4"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-4.000000,-1.000000"/>
+        <Spread value="15.000000"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupePrioritization value="Oldest"/>
+        <Volume value="-2.000000,-2.000000"/>
+    </CSound>
+    <CSound id="AP_GuardianExplosiveSporesDetonate" parent="Death">
+        <EditorCategories value="Race:Zerg"/>
+        <AssetArray File="Assets\Sounds\BG_Explosion_08.wav" FacialGroup=""/>
+        <DupeDestroyCount value="3"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-3.000000,1.000000"/>
+        <Spread value="20.000000"/>
+        <Volume value="-7.000000,-7.000000"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupePrioritization value="Oldest"/>
+    </CSound>
+    <CSound id="AP_GuardianExplosiveSporesImpact" parent="Combat">
+        <AssetArray File="Assets\Sounds\BirthingPond_Hatch_3.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\BirthingPond_Hatch_4.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\BirthingPond_Hatch_5.wav" FacialGroup=""/>
+        <Pitch value="-3.000000,-2.000000"/>
+        <Volume value="-5.000000,-5.000000"/>
+        <DupeDestroyCount value="3"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupeMuteCount value="3"/>
+        <DupePrioritization value="Oldest"/>
+    </CSound>
+    <CSound id="AP_GuardianExplosiveSporesLaunch" parent="Combat">
+        <EditorCategories value="Race:Critter"/>
+        <AssetArray File="Assets\Sounds\PrimalGuardian_D_Launch_01.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\PrimalGuardian_D_Launch_02.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\PrimalGuardian_D_Launch_03.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\PrimalGuardian_D_Launch_04.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\PrimalGuardian_D_Launch_05.wav" FacialGroup=""/>
+        <Pitch value="-3.000000,-1.000000"/>
+        <Volume value="-10.000000,-10.000000"/>
+        <DupeDestroyCount value="3"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupeMuteCount value="3"/>
+        <DupePrioritization value="Oldest"/>
+    </CSound>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 77fbf8621..982b26b4d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -24685,7 +24685,7 @@
         <LifeRegenRate value="0.2734"/>
         <LifeArmorName value="Unit/LifeArmorName/ZergAirArmor"/>
         <Mover value="Fly"/>
-        <Speed value="1.4062"/>
+        <Speed value="2.25"/>
         <Acceleration value="1.6875"/>
         <Deceleration value="40"/>
         <Sight value="11"/>
@@ -24699,6 +24699,7 @@
         <AbilArray Link="attack"/>
         <AbilArray Link="move"/>
         <AbilArray Link="stop"/>
+        <AbilArray Link="AP_GuardianExplosiveSpores"/>
         <WeaponArray Link="AP_GuardianSCBWWeapon"/>
         <WeaponArray Link="AP_GuardianSCBWWeaponAir"/>
         <CardLayouts>
@@ -24710,6 +24711,9 @@
             <LayoutButtons Face="AP_GuardianAttackRangeIncrease" Type="Passive" Requirements="AP_HaveGuardianAttackRangeIncrease" Row="1" Column="0"/>
             <LayoutButtons Face="AP_PrimalAdaptation" Type="Passive" Requirements="AP_HaveGuardianAirAttack" Row="1" Column="1"/>
             <LayoutButtons Face="AP_EvolvedAcidSpores" Type="Passive" Requirements="AP_HaveGuardianAttackDamage" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_GuardianPrimordialFury" Type="Passive" Requirements="AP_HaveGuardianPrimordialFury" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_GuardianPropellantSacs" Type="Passive" Requirements="AP_HaveGuardianPropellantSacs" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_GuardianExplosiveSpores" Type="AbilCmd" AbilCmd="AP_GuardianExplosiveSpores,Execute" Row="2" Column="0"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
@@ -28859,4 +28863,16 @@
             <LayoutButtons index="8" Face="AP_LiberatorMengskVeterancy"  Requirements=""/>
         </CardLayouts>
     </CUnit>
+    <CUnit id="AP_GuardianExplosiveSporesWeapon" parent="MISSILE">
+        <Mover value="AP_GuardianExplosiveSpores"/>
+        <EditorCategories value="ObjectType:Projectile,ObjectFamily:Campaign"/>
+    </CUnit>
+    <CUnit id="AP_GuardianExplosiveSpores">
+        <FlagArray index="Unselectable" value="1"/>
+        <FlagArray index="Untargetable" value="1"/>
+        <FlagArray index="Invulnerable" value="1"/>
+        <Attributes index="Structure" value="1"/>
+        <Race value="PZrg"/>
+        <EditorCategories value="ObjectType:Other,ObjectFamily:FactionPrimal"/>
+    </CUnit>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index d2d85fe2c..5f382342b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -14190,6 +14190,8 @@
         <Icon value="Assets\Textures\btn-upgrade-zerg-abathur-prolongeddispersion.dds"/>
         <EffectArray Reference="Weapon,AP_GuardianSCBWWeapon,Range" Value="3"/>
         <EffectArray Reference="Weapon,AP_GuardianSCBWWeaponAir,Range" Value="3"/>
+        <EffectArray Reference="Abil,AP_GuardianExplosiveSpores,Range[0]" Value="3"/>
+        <EffectArray Reference="Abil,AP_GuardianExplosiveSpores,AutoCastRange" Value="3"/>
         <EditorCategories value="Race:Zerg"/>
         <AffectedUnitArray value="AP_GuardianSCBW"/>
     </CUpgrade>
@@ -14316,7 +14318,7 @@
     </CUpgrade>
     <CUpgrade id="AP_KerriganVoidCoopBroodlordSpeed">
         <Icon value="Assets\Textures\btn-upgrade-kerrigan-broodlordspeed.dds"/>
-        <EffectArray Reference="Unit,AP_BroodLord,Speed" Value="1.406200"/>
+        <EffectArray Reference="Unit,AP_BroodLord,Speed" Value="1.121"/>
         <EffectArray Reference="Unit,AP_BroodLord,Acceleration" Value="0.812500"/>
         <EditorCategories value="Race:Zerg,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_BroodLord"/>
@@ -15860,4 +15862,16 @@
         <EffectArray Operation="Set" Reference="Abil,AP_WarpRelocateAssimilator,InfoArray[Build24].Charge.CountStart" Value="0"/>
         <EffectArray Operation="Set" Reference="Button,AP_WarpRelocate,Tooltip" Value="Button/Tooltip/AP_WarpRelocateUpgraded"/>
     </CUpgrade>
+    <CUpgrade id="AP_GuardianPropellantSacs">
+        <EffectArray Reference="Unit,AP_GuardianSCBW,Speed" Value="1.000"/>
+        <EffectArray Reference="Unit,AP_GuardianSCBW,Acceleration" Value="0.812500"/>
+    </CUpgrade>
+    <CUpgrade id="AP_GuardianExplosiveSpores">
+        <Icon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-explosivespores.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CUpgrade>
+    <CUpgrade id="AP_GuardianPrimordialFury">
+        <Icon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-primordialfury.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index 8dfc553b7..3d9425d05 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -3311,10 +3311,17 @@
     </CValidatorUnitBehaviorState>
     <CValidatorCombine id="AP_IsNotPhasedUnit">
         <Type value="And"/>
-        <CombineArray value="AP_Dummy"/>
-        <!--        <CombineArray value="IsNotDisruptorPhased"/>-->
-        <!--        <CombineArray value="IsNotAdeptShade"/>-->
+        <CombineArray value="AP_IsNotAdeptShade"/>
+        <CombineArray value="AP_IsNotDisruptorPhased"/>
     </CValidatorCombine>
+    <CValidatorUnitType id="AP_IsNotAdeptShade">
+        <Value value="AP_AdeptPhaseShift"/>
+        <Find value="0"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsNotDisruptorPhased">
+        <Value value="AP_DisruptorPhased"/>
+        <Find value="0"/>
+    </CValidatorUnitType>
     <CValidatorUnitCompareBehaviorCount id="AP_IsNotDisguisedChangeling">
         <Compare value="NE"/>
         <Value value="1"/>
@@ -6658,4 +6665,23 @@
     <CValidatorUnitType id="AP_IsStarportMengsk">
         <Value value="AP_StarportMengsk"/>
     </CValidatorUnitType>
+    <CValidatorLocationCompareRange id="AP_GuardianExplosiveSporesRange">
+        <WhichLocation Effect="AP_GuardianExplosiveSporesKnockback" Value="TargetUnit"/>
+        <Compare value="LE"/>
+        <Range value="4"/>
+        <Pathing value="1"/>
+        <Value Value="TargetUnit"/>
+    </CValidatorLocationCompareRange>
+    <CValidatorUnitFilters id="AP_GuardianExplosiveSporesTargetNotDead">
+        <Filters value="-;Dead"/>
+        <WhichUnit Effect="AP_GuardianExplosiveSporesKnockback"/>
+    </CValidatorUnitFilters>
+    <CValidatorPlayerRequirement id="AP_HaveGuardianPrimordialFury">
+        <Find value="1"/>
+        <Value value="AP_HaveGuardianPrimordialFury"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorUnitType id="AP_NotSiegedTank">
+        <Value value="SiegeTankSieged"/>
+        <Find value="0"/>
+    </CValidatorUnitType>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 0fd360577..1e930bee4 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -574,3 +574,4 @@ Button/Hotkey/AP_GoliathMengsk=G
 Button/Hotkey/AP_IrradiateMedicMengsk=T
 Button/Hotkey/AP_MedicMengsk=E
 Button/Hotkey/AP_LiberatorMengsk=T
+Button/Hotkey/AP_GuardianExplosiveSpores=Q
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index e49e7f52d..e87cff205 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -501,6 +501,7 @@ Behavior/Name/AP_GhostMengskIrradiate=Pyrokinetic Immolation
 Behavior/Name/AP_GhostMengskSuperCloak=Labyrinth Cloak
 Behavior/Name/AP_GhostSCBWLockdown=Lockdown
 Behavior/Name/AP_GravitonBeam=Graviton Beam
+Behavior/Name/AP_GuardianPrimordialFury=Primordial Fury
 Behavior/Name/AP_GuardianShield=Guardian Shield
 Behavior/Name/AP_HHWraithFury1=Trigger Override
 Behavior/Name/AP_HHWraithFury10=Trigger Override
@@ -710,6 +711,7 @@ Behavior/Tooltip/AP_GhostMengskSuperCloak=This unit is invisible and undetectabl
 Behavior/Tooltip/AP_GhostSCBWLockdown=While Lockdown is active the unit cannot attack or move. Detection is disabled.
 Behavior/Tooltip/AP_GravitonBeam=Target is being lifted in the air and is now vulnerable to air attacks. This unit cannot attack or use abilities until the Graviton Beam ends.
 Behavior/Tooltip/AP_GravitonBeamVoidCampaign=Target is being lifted in the air and is now vulnerable to air attacks. This unit cannot attack or use abilities until the Graviton Beam ends.
+Behavior/Tooltip/AP_GuardianPrimordialFury=This unit has increased attack speed.
 Behavior/Tooltip/AP_GuardianShield=Incoming ranged damage reduced by 2.
 Behavior/Tooltip/AP_HHWraithFury1=Attack Speed increased by 10%
 Behavior/Tooltip/AP_HHWraithFury10=Attack Speed increased by 100%
@@ -1149,6 +1151,9 @@ Button/Name/AP_GreaterSpireBroodlord=Mutate into Greater Spire
 Button/Name/AP_GreaterSpireViper=Mutate into Greater Spire
 Button/Name/AP_GroovedSpines=Grooved Spines
 Button/Name/AP_GuardianAttackRangeIncrease=Prolonged Dispersion
+Button/Name/AP_GuardianPropellantSacs=Propellant Sacs
+Button/Name/AP_GuardianExplosiveSpores=Explosive Spores
+Button/Name/AP_GuardianPrimordialFury=Primordial Fury
 Button/Name/AP_GuardianSCBW=Morph to Guardian
 Button/Name/AP_GuardianShield=Guardian Shield
 Button/Name/AP_HERC=HERC
@@ -2401,6 +2406,9 @@ Button/Tooltip/AP_GreaterSpireBroodlord=<c val="ffff8a">Enables:</c><n/>- Brood
 Button/Tooltip/AP_GreaterSpireViper=<c val="ffff8a">Enables:</c><n/>- Vipers from Mutalisks
 Button/Tooltip/AP_GroovedSpines=Hydralisk gains +1 attack range.
 Button/Tooltip/AP_GuardianAttackRangeIncrease=Increases attack range by 3.
+Button/Tooltip/AP_GuardianPropellantSacs=Increases Guardian movement speed.
+Button/Tooltip/AP_GuardianExplosiveSpores=Fires an Explosive Spore at a ground target, causing the target and all nearby enemy ground units to take <d ref="Effect,AP_GuardianExplosiveSporesExplodeDamage,Amount"/> damage, and applies a knockback.
+Button/Tooltip/AP_GuardianPrimordialFury=Each attack temporarily increases attack speed by 10%. Can stack up to 50% increased attack speed.
 Button/Tooltip/AP_GuardianSCBW=Long-range anti-ground flyer. <n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_GuardianShield=Creates a range 4 aura that reduces all incoming attack damage to friendly units by 2. Lasts <d time="15"/>.
 Button/Tooltip/AP_HERC=Front-line infantry. Can use Grapple.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>

From dd59f60749ee26b2165d87c8e19252499f6d5251 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 08:55:46 -0400
Subject: [PATCH 04/34] guardian upgrade triggers

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  24 +++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   3 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 117 +++++++++++++++++-
 .../LocalizedData/TriggerStrings.txt          |   6 +
 4 files changed, 144 insertions(+), 6 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 6f1d601d6..4c86041bb 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1005,9 +1005,9 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Zerg_Rapid_Hibernation, //22
         libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal, //23
         libABFE498B_gf_AP_Triggers_Zerg_Viral_Contamination, //24
-        ap_triggers_PlayerConsumer_sig, //25
-        ap_triggers_PlayerConsumer_sig, //26
-        ap_triggers_PlayerConsumer_sig, //27
+        libABFE498B_gf_AP_Triggers_Zerg_GuardianPropellantSacs, //25
+        libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores, //26
+        libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury, //27
         ap_triggers_PlayerConsumer_sig, //28
         ap_triggers_PlayerConsumer_sig  //29
     );
@@ -5799,6 +5799,24 @@ void libABFE498B_gf_AP_Triggers_Zerg_GuardianSoronanAcid (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_GuardianAttackDamage", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_GuardianPropellantSacs (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_GuardianPropellantSacs", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_GuardianExplosiveSpores", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_GuardianPrimordialFury", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_ImpalerAdativeTalons (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 4a1926281..832188a11 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -593,6 +593,9 @@ void libABFE498B_gf_AP_Triggers_Zerg_DevourerPrescientSpores (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_GuardianProlongedDispersion (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimalAdaptation (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_GuardianSoronanAcid (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_GuardianPropellantSacs (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ImpalerAdativeTalons (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ImpalerSecretionGlands (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ImpalerHardenedTentacleSpines (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 80ddd2eb6..f7be83524 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -3624,9 +3624,9 @@
                     libABFE498B_gf_AP_Triggers_Zerg_Rapid_Hibernation, //22
                     libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal, //23
                     libABFE498B_gf_AP_Triggers_Zerg_Viral_Contamination, //24
-                    ap_triggers_PlayerConsumer_sig, //25
-                    ap_triggers_PlayerConsumer_sig, //26
-                    ap_triggers_PlayerConsumer_sig, //27
+                    libABFE498B_gf_AP_Triggers_Zerg_GuardianPropellantSacs, //25
+                    libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores, //26
+                    libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury, //27
                     ap_triggers_PlayerConsumer_sig, //28
                     ap_triggers_PlayerConsumer_sig  //29
                 );
@@ -46743,6 +46743,9 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="263F47F6"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="2A36A5FD"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="39F5EF06"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="1C63B5BD"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="0D072F28"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="AAAA4339"/>
         </Element>
         <Element Type="FunctionDef" Id="263F47F6">
             <FlagAction/>
@@ -46852,6 +46855,114 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="1C63B5BD">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="72E167E5"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2F1C4DE1"/>
+        </Element>
+        <Element Type="ParamDef" Id="72E167E5">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="6398372E"/>
+        </Element>
+        <Element Type="Param" Id="6398372E">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="2F1C4DE1">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="94C3ED32"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C64B8076"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="69491857"/>
+        </Element>
+        <Element Type="Param" Id="94C3ED32">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="72E167E5"/>
+        </Element>
+        <Element Type="Param" Id="C64B8076">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="69491857">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_GuardianPropellantSacs</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionDef" Id="0D072F28">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="AC3A827F"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="16E7234A"/>
+        </Element>
+        <Element Type="ParamDef" Id="AC3A827F">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="2F78B0F0"/>
+        </Element>
+        <Element Type="Param" Id="2F78B0F0">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="16E7234A">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4FB4FCD3"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="89D0EA92"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8CC5E152"/>
+        </Element>
+        <Element Type="Param" Id="4FB4FCD3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="AC3A827F"/>
+        </Element>
+        <Element Type="Param" Id="89D0EA92">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="8CC5E152">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_GuardianExplosiveSpores</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionDef" Id="AAAA4339">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="CF4071F4"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="61F97929"/>
+        </Element>
+        <Element Type="ParamDef" Id="CF4071F4">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="35382A16"/>
+        </Element>
+        <Element Type="Param" Id="35382A16">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="61F97929">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A182DD08"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BAC6407F"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="33DDB088"/>
+        </Element>
+        <Element Type="Param" Id="A182DD08">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="CF4071F4"/>
+        </Element>
+        <Element Type="Param" Id="BAC6407F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="33DDB088">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_GuardianPrimordialFury</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="52DEE548">
             <Item Type="FunctionDef" Library="ABFE498B" Id="03390008"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6300A2A1"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 84cc5cf2e..a38fc91aa 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -155,6 +155,7 @@ FunctionDef/Name/lib_ABFE498B_0A88B830=AP_Triggers_Terran_unlockWidowMineResourc
 FunctionDef/Name/lib_ABFE498B_0AB04574=AP_Triggers_Terran_unlockVikingAesirTurbines
 FunctionDef/Name/lib_ABFE498B_0B070864=AP_Triggers_Zerg_unlockPrimalIgniter
 FunctionDef/Name/lib_ABFE498B_0B9FD37F=AP_Triggers_Terran_unlockPredatorCharge
+FunctionDef/Name/lib_ABFE498B_0D072F28=AP_Triggers_Zerg_GuardianExplosiveSpores
 FunctionDef/Name/lib_ABFE498B_0D47683E=AP_Triggers_Zerg_MutaliskSeveringGlave
 FunctionDef/Name/lib_ABFE498B_0D90E500=AP_Triggers_unlockZergKerriganAbilities
 FunctionDef/Name/lib_ABFE498B_0D9964C2=AP_Triggers_Terran_unlockDiamondbackResourceEfficinecy
@@ -196,6 +197,7 @@ FunctionDef/Name/lib_ABFE498B_1B25348F=AP_Triggers_Protoss_unlockAscendantPowerO
 FunctionDef/Name/lib_ABFE498B_1B752B8E=AP_Triggers_Protoss_unlockStalwartStabilizedElectrodes
 FunctionDef/Name/lib_ABFE498B_1C1CE788=AP_Triggers_Zerg_SwarmHostOrganicCarapace
 FunctionDef/Name/lib_ABFE498B_1C3D4AA2=AP_Triggers_Zerg_FrightfulFleshwelder
+FunctionDef/Name/lib_ABFE498B_1C63B5BD=AP_Triggers_Zerg_GuardianPropellantSacs
 FunctionDef/Name/lib_ABFE498B_1C7597C1=AP_Triggers_Terran_unlockDominionTrooperCPO7SalamanderFlamethrower
 FunctionDef/Name/lib_ABFE498B_1ED0A5FF=AP_Triggers_Protoss_unlockDestroyer
 FunctionDef/Name/lib_ABFE498B_1F0E4304=AP_Triggers_Terran_unlockEmperorsShadowSovereignTacticalMissiles
@@ -647,6 +649,7 @@ FunctionDef/Name/lib_ABFE498B_A8DC996F=AP_Triggers_Terran_unlockFirebatInfernalP
 FunctionDef/Name/lib_ABFE498B_A93D603A=AP_Triggers_Protoss_unlockSentinel
 FunctionDef/Name/lib_ABFE498B_A973FAB0=AP_Triggers_Terran_unlockGhostEMPRounds
 FunctionDef/Name/lib_ABFE498B_A9C6E0DA=AP_Triggers_Terran_unlockReaperCombatDrugs
+FunctionDef/Name/lib_ABFE498B_AAAA4339=AP_Triggers_Zerg_GuardianPrimordialFury
 FunctionDef/Name/lib_ABFE498B_AAAC397C=AP_Triggers_Protoss_unlockEnergizerMobileChronoBeam
 FunctionDef/Name/lib_ABFE498B_ABCCCE41=AP_Triggers_Protoss_unlockPhoenixDoubleGravitonBeam
 FunctionDef/Name/lib_ABFE498B_AC4B1D2E=AP_Triggers_Terran_unlockMissileTurretResourceEfficency
@@ -1328,6 +1331,7 @@ ParamDef/Name/lib_ABFE498B_713DBF49=player
 ParamDef/Name/lib_ABFE498B_71A7512E=bitArrayValue
 ParamDef/Name/lib_ABFE498B_71F02FC6=player
 ParamDef/Name/lib_ABFE498B_71FEC2A6=player
+ParamDef/Name/lib_ABFE498B_72E167E5=player
 ParamDef/Name/lib_ABFE498B_7323A6AD=player
 ParamDef/Name/lib_ABFE498B_73DCCF52=player
 ParamDef/Name/lib_ABFE498B_7490E20B=player
@@ -1509,6 +1513,7 @@ ParamDef/Name/lib_ABFE498B_AB7F060F=player
 ParamDef/Name/lib_ABFE498B_AB8CF831=player
 ParamDef/Name/lib_ABFE498B_ABDB6B3F=player
 ParamDef/Name/lib_ABFE498B_ABF9F03A=player
+ParamDef/Name/lib_ABFE498B_AC3A827F=player
 ParamDef/Name/lib_ABFE498B_AC58AA9E=player
 ParamDef/Name/lib_ABFE498B_AC6D5C98=player
 ParamDef/Name/lib_ABFE498B_AC938D14=player
@@ -1620,6 +1625,7 @@ ParamDef/Name/lib_ABFE498B_CDFC2E63=player
 ParamDef/Name/lib_ABFE498B_CEDC33B5=player
 ParamDef/Name/lib_ABFE498B_CF0C4236=player
 ParamDef/Name/lib_ABFE498B_CF29B4F5=player
+ParamDef/Name/lib_ABFE498B_CF4071F4=player
 ParamDef/Name/lib_ABFE498B_CF5BACB9=player
 ParamDef/Name/lib_ABFE498B_D024D572=player
 ParamDef/Name/lib_ABFE498B_D05F0401=player

From 511f4d15a9899bba274ea4565d8afe1e802df5dc Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 09:57:11 -0400
Subject: [PATCH 05/34] Add scv jumpjets

---
 .../Base.SC2Data/GameData/ActorData.xml       | 31 +++++++++++++++++++
 .../Base.SC2Data/GameData/BehaviorData.xml    | 19 ++++++++++++
 .../Base.SC2Data/GameData/ButtonData.xml      |  5 +++
 .../Base.SC2Data/GameData/RequirementData.xml |  4 +++
 .../GameData/RequirementNodeData.xml          |  4 +++
 .../Base.SC2Data/GameData/UnitData.xml        |  2 ++
 .../Base.SC2Data/GameData/UpgradeData.xml     |  5 +++
 7 files changed, 70 insertions(+)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index a92301988..5796560e4 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -9061,6 +9061,12 @@
         <On Terms="Abil.*.WorkerStop" Send="AnimClear Build"/>
         <On Terms="Abil.*.WorkerCancel" Send="TimerKill Build"/>
         <On Terms="Abil.*.WorkerCancel" Send="AnimClear Build"/>
+        <On Terms="Behavior.AP_SCVCliffJump.Launch" Send="AnimBracketStart Jump Stand IGNORE IGNORE"/>
+        <On Terms="Behavior.AP_SCVCliffJump.Launch" Send="AnimBlendTimeApply 0.100000"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandDown" Send="AnimBracketStop Jump"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandDown" Send="AnimBlendTimeApply"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandUp" Send="AnimBracketStop Jump"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandUp" Send="AnimBlendTimeApply"/>
         <On Terms="AnimDone.*.Complete; AnimName Build" Send="TimerSet 0.000000,0.300000 Build"/>
         <On Terms="TimerExpired; TimerName Build" Send="AnimPlay Build Work NonLooping"/>
         <On Terms="TimerExpired; TimerName Build" Send="Create SCVBuildSound"/>
@@ -40830,4 +40836,29 @@
         <HostSiteOps Ops="SOpAttachOrigin"/>
         <Model value="AP_GuardianPrimordialFury"/>
     </CActorModel>
+    <CActorModel id="AP_SCVCliffJumpLandDownModel" parent="ModelAnimationStyleOneShot">
+        <Model value="ReaperJumpLandDownModel"/>
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachCenter SOpShadow"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandDown" Send="Create"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandUp" Send="Create"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandDown" Send="TimerSet 0.300000 TriggerSound"/>
+        <On Terms="TimerExpired; TimerName TriggerSound" Send="Create AP_ReaperJumpLandSound"/>
+        <Inherits index="CloakEffect" value="1"/>
+    </CActorModel>
+    <CActorSound id="AP_SCVCliffJumpLandSound" parent="SoundOneShot">
+        <Sound value="Reaper_JumpLand"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandUp" Send="Create"/>
+    </CActorSound>
+    <CActorModel id="AP_SCVCliffJumpLaunchModel" parent="ModelAnimationStyleOneShot">
+        <Model value="ReaperJumpLaunchModel"/>
+        <On Terms="Behavior.AP_SCVCliffJump.Launch" Send="Create"/>
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachCenter SOpShadow" HoldPosition="1" HoldRotation="1"/>
+        <Inherits index="CloakEffect" value="1"/>
+    </CActorModel>
+    <CActorSound id="AP_SCVCliffJumpLaunchSound" parent="SoundOneShot">
+        <Sound value="Reaper_JumpLaunch"/>
+        <On Terms="Behavior.AP_SCVCliffJump.Launch" Send="Create"/>
+    </CActorSound>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 2081f2e7b..78e8142ec 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -9165,4 +9165,23 @@
         <Modification AdditiveAttackSpeedFactor=".1"/>
         <BehaviorCategories index="Fast" value="1"/>
     </CBehaviorBuff>
+    <CBehaviorJump id="AP_SCVCliffJump">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <TriggerHeightDeltaMin value="1.5"/>
+        <TriggerHeightDeltaMax value="4.5"/>
+        <InitiateRangeUp value="1.5"/>
+        <InitiateRangeDown value="0.5"/>
+        <JumpRangeMax value="12"/>
+        <Mover value="CliffJumper"/>
+        <MoverUp value="ReaperJumpDown"/>
+        <MoverDown value="ReaperJumpDown"/>
+        <DurationPreLaunch value="0.05"/>
+        <DurationPostLand value="0.075"/>
+        <DurationMoveOut value="0.08"/>
+        <Placeholder value="ReaperPlaceholder"/>
+        <LandAdjustmentDown value="1"/>
+        <LandArrivalRange value="0.05"/>
+        <LandCheckRadius value="5"/>
+    </CBehaviorJump>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index f65ed854f..cb0d67699 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6611,4 +6611,9 @@
         <AlertIcon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-primordialfury.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CButton>
+    <CButton id="AP_SCVCliffJumper">
+        <Icon value="Assets\Textures\btn-ability-terran-jetpack-color.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-terran-jetpack-color.dds"/>
+        <EditorCategories value="Race:Terran"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index d083a203f..54c177a0d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4076,4 +4076,8 @@
         <EditorCategories value="Race:Zerg,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeGuardianPrimordialFuryCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveSCVCliffJump">
+        <EditorCategories value="Race:Zerg,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeSCVCliffJumpCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 2938ecefe..1f3150c1b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6717,4 +6717,8 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_GuardianPrimordialFury" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeSCVCliffJumpCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_SCVCliffJump" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 982b26b4d..5e0d9732c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -19328,6 +19328,7 @@
         <AbilArray Link="GatherSpecialObject"/>
         <AbilArray Link="CancelTerrazineHarvest"/>
         <AbilArray Link="AP_TerranBuildDrop"/>
+        <BehaviorArray Link="AP_SCVCliffJump"/>
         <WeaponArray Link="AP_FusionCutter"/>
         <CardLayouts>
             <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
@@ -19343,6 +19344,7 @@
             <LayoutButtons Face="AP_HostileEnvironmentAdaptation" Type="Passive" Requirements="AP_HaveHostileEnvironmentAdaptation" Row="1" Column="4"/>
             <LayoutButtons Face="AP_TerranBuild" Type="Submenu" SubmenuCardId="TBl1" Row="2" Column="0"/>
             <LayoutButtons Face="TerranBuildAdvanced" Type="Submenu" SubmenuCardId="TBl2" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_SCVCliffJump" Type="Passive" Requirements="AP_HaveSCVCliffJump" Row="2" Column="3"/>
             <LayoutButtons Face="Halt" Type="AbilCmd" AbilCmd="AP_TerranBuild,30" Row="2" Column="4"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="CancelTerrazineHarvest,0" Row="2" Column="4"/>
         </CardLayouts>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 5f382342b..db911a11a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15874,4 +15874,9 @@
         <Icon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-primordialfury.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CUpgrade>
+    <CUpgrade id="AP_SCVCliffJump">
+        <EffectArray Operation="Set" Reference="Unit,AP_SCV,Mover" Value="CliffJumper"/>
+        <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_SCV"/>
+    </CUpgrade>
 </Catalog>

From 7263ec8829ed45e3ac10987fbd292894067d1574 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 10:15:14 -0400
Subject: [PATCH 06/34] add trigers for scv jump jets, and fix some button
 issues

---
 .../Base.SC2Data/GameData/ButtonData.xml      |  2 +-
 .../LocalizedData/GameStrings.txt             |  2 +
 .../Base.SC2Data/LibABFE498B.galaxy           |  8 +++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |  1 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 39 ++++++++++++++++++-
 .../LocalizedData/TriggerStrings.txt          |  2 +
 6 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index cb0d67699..d9cd738d1 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6611,7 +6611,7 @@
         <AlertIcon value="Assets\Textures\btn-ability-zerg-dehaka-guardian-primordialfury.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CButton>
-    <CButton id="AP_SCVCliffJumper">
+    <CButton id="AP_SCVCliffJump">
         <Icon value="Assets\Textures\btn-ability-terran-jetpack-color.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-terran-jetpack-color.dds"/>
         <EditorCategories value="Race:Terran"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index e87cff205..918917767 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1596,6 +1596,7 @@ Button/Name/AP_RoboticsBay=Warp In Robotics Bay
 Button/Name/AP_RoboticsFacility=Warp In Robotics Facility
 Button/Name/AP_RoyalGuardMengsk=Royal Guard of the Dominion
 Button/Name/AP_RuptureUpgrade=Rupture
+Button/Name/AP_SCVCliffJump=Construction Jump Jets
 Button/Name/AP_SIArmory=Build Infested Armory
 Button/Name/AP_SIBanshee=Spawn Infested Banshee
 Button/Name/AP_SIBarracks=Build Infested Barracks
@@ -2955,6 +2956,7 @@ Button/Tooltip/AP_RoboticsFacilityWarp=Warps in Protoss robotic units.
 Button/Tooltip/AP_RoyalGuardMengsk=Killing enemy units grants experience to nearby <c val="ffff8a">Royal Guards</c>. If there are no nearby Royal Guards when an enemy is killed, the experience is instead split between all Royal Guards in the mission. Experience allows this unit to gain <c val="ffff8a">Rank</c>, which improves its damage, armor, and health.
 Button/Tooltip/AP_RuptureUpgrade=Blast radius increased by 50%.
 Button/Tooltip/AP_SCV=Basic worker unit. Can gather resources, build Terran structures, and repair.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
+Button/Tooltip/AP_SCVCliffJump=Allows SCVs to jump up and down cliffs.
 Button/Tooltip/AP_SIArmory=Contains upgrades for Infested Factory and Infested Starport units.
 Button/Tooltip/AP_SIBanshee=Tactical-strike aircraft. Can cloak and can be upgraded to burrow.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_SIBarracks=Infantry-production facility.<n/><n/><c val="ffff8a">Enables:</c><n/>- Infested Marines
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 4c86041bb..784a3b66f 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -552,7 +552,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperCPO7SalamanderFlamethrower, // 13
         libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperAdvancedAlloys, // 14
         libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperOptimizedLogistics, // 15
-        ap_triggers_PlayerConsumer_sig, // 16
+        libABFE498B_gf_AP_Triggers_Terran_unlockSCVConstructionJumpJets, // 16
         ap_triggers_PlayerConsumer_sig, // 17
         ap_triggers_PlayerConsumer_sig, // 18
         ap_triggers_PlayerConsumer_sig, // 19
@@ -2297,6 +2297,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockSCVHostileEnvironmentAdaptation (in
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_HostileEnvironmentAdaptation", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockSCVConstructionJumpJets (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SCVCliffJump", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockMarineCombatShield (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 832188a11..aad650f6f 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -221,6 +221,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurret (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockSCVAdvancedConstruction (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockSCVDualFusionWelders (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockSCVHostileEnvironmentAdaptation (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockSCVConstructionJumpJets (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMarineCombatShield (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMarineProgressiveStimpack (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMarineLaserTargetingSystem (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index f7be83524..7acce05c3 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2832,7 +2832,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperCPO7SalamanderFlamethrower, // 13
                     libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperAdvancedAlloys, // 14
                     libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperOptimizedLogistics, // 15
-                    ap_triggers_PlayerConsumer_sig, // 16
+                    libABFE498B_gf_AP_Triggers_Terran_unlockSCVConstructionJumpJets, // 16
                     ap_triggers_PlayerConsumer_sig, // 17
                     ap_triggers_PlayerConsumer_sig, // 18
                     ap_triggers_PlayerConsumer_sig, // 19
@@ -15303,6 +15303,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="EC36AF20"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="2BF54829"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6922BCB5"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="7DF6CBF2"/>
         </Element>
         <Element Type="FunctionDef" Id="EC36AF20">
             <FlagAction/>
@@ -15412,6 +15413,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="7DF6CBF2">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="FE164AAD"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FA30F919"/>
+        </Element>
+        <Element Type="ParamDef" Id="FE164AAD">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="E0BAF832"/>
+        </Element>
+        <Element Type="Param" Id="E0BAF832">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="FA30F919">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C9DCCE04"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8FBF4DAB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C2D6D69D"/>
+        </Element>
+        <Element Type="Param" Id="C9DCCE04">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="FE164AAD"/>
+        </Element>
+        <Element Type="Param" Id="8FBF4DAB">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="C2D6D69D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_SCVCliffJump</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="65B8E6B3">
             <Item Type="FunctionDef" Library="ABFE498B" Id="AD5B5003"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3D9164AE"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index a38fc91aa..4946c41ca 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -511,6 +511,7 @@ FunctionDef/Name/lib_ABFE498B_7CC74863=AP_Triggers_Terran_unlockCommandCenterMUL
 FunctionDef/Name/lib_ABFE498B_7D0E800C=AP_Triggers_Protoss_unlockStalwartStrutEnhancements
 FunctionDef/Name/lib_ABFE498B_7DBC7D9E=AP_Triggers_Terran_unlockVehicleWeapon
 FunctionDef/Name/lib_ABFE498B_7DBE2940=AP_Triggers_Zerg_DefilerPredatoryConsumption
+FunctionDef/Name/lib_ABFE498B_7DF6CBF2=AP_Triggers_Terran_unlockSCVConstructionJumpJets
 FunctionDef/Name/lib_ABFE498B_7E29507E=AP_Triggers_Terran_unlockNovaGhostVisor
 FunctionDef/Name/lib_ABFE498B_7E4E15A7=AP_Triggers_MapConfig_setKerriganOptions
 FunctionDef/Name/lib_ABFE498B_7E79E057=AP_Triggers_Terran_unlockDominionTrooperHailstormLauncher
@@ -1805,6 +1806,7 @@ ParamDef/Name/lib_ABFE498B_FD615B79=player
 ParamDef/Name/lib_ABFE498B_FD83916B=player
 ParamDef/Name/lib_ABFE498B_FDA76D4F=player
 ParamDef/Name/lib_ABFE498B_FDCB7A6E=player
+ParamDef/Name/lib_ABFE498B_FE164AAD=player
 ParamDef/Name/lib_ABFE498B_FE9CCCE5=bitArrayValue
 ParamDef/Name/lib_ABFE498B_FF77CD36=player
 ParamDef/Name/lib_ABFE498B_FFC5A20B=player

From 31577457ce53b041bbbd13e454403097f83b25f8 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 10:17:55 -0400
Subject: [PATCH 07/34] tryannozor low supply message change (for clarity)

---
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 918917767..d30f407fa 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -5100,7 +5100,7 @@ Param/Value/lib_15EF4C78_D80C88E5=<c val="FF9800">Nova's Stasis Shell has been d
 Param/Value/lib_15EF4C78_E11D6511=<k val="HeroSelect0"/>
 Param/Value/lib_15EF4C78_E2AE9BC3=<c val="FF9800">Kerrigan has been revived at your Hatchery.</c>
 Param/Value/lib_15EF4C78_EAFF7887=<c val="FF9800">Dehaka has been revived at your Hatchery.</c>
-RequirementNode/Tooltip/AP_CompareNodeLTTyrannozorMergeSupply=Not Enough Supply
+RequirementNode/Tooltip/AP_CompareNodeLTTyrannozorMergeSupply=Have enough supply
 RequirementNode/Tooltip/AP_CountUnitFactoryCompleteOnly=Factory
 RequirementNode/Tooltip/AP_CountUnitFactoryFlyingCompleteOnly=Flying Factory
 RequirementNode/Tooltip/AP_CountUnitFactoryLandedCompleteOnly=Landed Factory

From 7b08f34f7288a2afc7e66435148ace84d67a96b6 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 11:07:41 -0400
Subject: [PATCH 08/34] fix tychus and stukov icon bugs, and infested siege
 tank description

---
 .../enUS.SC2Data/LocalizedData/GameStrings.txt             | 2 +-
 .../Base.SC2Data/GameData/UpgradeData.xml                  | 7 ++++++-
 .../Base.SC2Data/GameData/UpgradeData.xml                  | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index d30f407fa..2c872f97d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -2993,7 +2993,7 @@ Button/Tooltip/AP_SIQueenFungalGrowth=Immobilizes enemy units and deals <d ref="
 Button/Tooltip/AP_SIRefinery=Built over a Vespene Geyser to allow harvesting of vespene gas.
 Button/Tooltip/AP_SIRoot=Roots the structure at a target location, allowing it to once again produce units, research upgrades, and use abilities.
 Button/Tooltip/AP_SISCV=Basic worker unit. Can gather resources, build Infested structures, and repair.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
-Button/Tooltip/AP_SISiegeTank=Heavy tank. Can root itself to provide long-range artillery support by consuming Infested infantry units. Can use the Deep Tunnel ability to travel quickly to any visible location with creep.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
+Button/Tooltip/AP_SISiegeTank=Heavy tank. Can root itself to provide long-range artillery support by consuming Infested infantry units.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
 Button/Tooltip/AP_SIStarport=Air-unit production facility. <n/><n/><c val="ffff8a">Enables:</c><n/>- Infested Liberators
 Button/Tooltip/AP_SITechLab=Enables additional units and research options. An Infested Tech Lab can fit onto any production structure.
 Button/Tooltip/AP_SITechLabFactory=Vehicle-research structure. A Tech Lab can fit onto any production structure.<n/><n/><c val="ffff8a">Enables:</c><n/>- Infested Siege Tanks
diff --git a/Mods/ArchipelagoPlayerHotS.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayerHotS.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 1c1dba04c..d44e5d27c 100644
--- a/Mods/ArchipelagoPlayerHotS.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayerHotS.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -182,6 +182,7 @@
         <EffectArray Operation="Set" Reference="Weapon,DehakaAir,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,FerociousSpew,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,StukovInfestedTerran,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level1.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,InfestedStukov,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level1.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ZergMissileWeaponsLevel2">
         <!-- Override -->
@@ -199,6 +200,7 @@
         <EffectArray Operation="Set" Reference="Weapon,DehakaAir,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,FerociousSpew,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,StukovInfestedTerran,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level2.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,InfestedStukov,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level2.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ZergMissileWeaponsLevel3">
         <!-- Override -->
@@ -216,6 +218,7 @@
         <EffectArray Operation="Set" Reference="Weapon,DehakaAir,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,FerociousSpew,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,StukovInfestedTerran,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level3.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,InfestedStukov,Icon" Value="Assets\Textures\btn-upgrade-zerg-missileattacks-level3.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ZergMissileWeaponsLevel4">
         <!-- Override -->
@@ -233,6 +236,7 @@
         <EffectArray Operation="Set" Reference="Weapon,DehakaAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,FerociousSpew,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,StukovInfestedTerran,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level4.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,InfestedStukov,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level4.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ZergMissileWeaponsLevel5">
         <!-- Override -->
@@ -250,6 +254,7 @@
         <EffectArray Operation="Set" Reference="Weapon,DehakaAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,FerociousSpew,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,StukovInfestedTerran,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level5.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,InfestedStukov,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level5.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_K5CreepBonuses">
         <!-- Override -->
@@ -280,4 +285,4 @@
         <EffectArray Reference="Unit,HugeSwarmQueenBurrowed,LifeRegenRateCreep" Value="0.820200"/>
         <EffectArray Reference="Unit,Brutalisk,LifeRegenRateCreep" Value="0.820200"/>
     </CUpgrade>
-</Catalog>
\ No newline at end of file
+</Catalog>
diff --git a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index cc31c01a1..0cf092e6f 100644
--- a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -621,7 +621,7 @@
         <EffectArray Operation="Set" Reference="Actor,Raynor01,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,TychusCommando,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,TychusChaingun,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel4.dds"/>
-        <EffectArray Operation="Set" Reference="Actor,TychusChaingun,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,TychusChaingun,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,Dutch,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,Bones,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,Nova,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel4.dds"/>
@@ -654,7 +654,7 @@
         <EffectArray Operation="Set" Reference="Actor,Raynor01,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,TychusCommando,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,TychusChaingun,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel5.dds"/>
-        <EffectArray Operation="Set" Reference="Actor,TychusChaingun,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,TychusChaingun,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,Dutch,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,Bones,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,Nova,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-infantryarmorlevel5.dds"/>
@@ -1687,4 +1687,4 @@
         <EffectArray Reference="Weapon,Odin,RateMultiplier" Value="0.15"/>
         <EffectArray Reference="Weapon,OdinAntiAir,RateMultiplier" Value="0.15"/>
     </CUpgrade>
-</Catalog>
\ No newline at end of file
+</Catalog>

From 082ae117980efb9e50357ba8baf8aec1058d046a Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 11:31:13 -0400
Subject: [PATCH 09/34] fix supreme primal reinforcements being non-ap units

---
 .../HotS/ap_supreme.SC2Map/MapScript.galaxy   | 30 +++++++-------
 .../HotS/ap_supreme.SC2Map/Triggers           | 41 ++++++++++---------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy
index 3dd0ac7fd..d33d76be3 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy
@@ -2196,7 +2196,7 @@ bool gt_DEBUGYagdraBoss_Func (bool testConds, bool runActions) {
     if ((lv_friendlyRoaches >= 6)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true);
     UnitAbilityShow(gv_kerrigan, "PrimalSlash", true);
@@ -2283,12 +2283,12 @@ bool gt_DEBUGKraithBoss_Func (bool testConds, bool runActions) {
     if ((lv_friendlyRoaches >= 6)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     if ((lv_friendlyHydras >= 4)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true);
     UnitAbilityShow(gv_kerrigan, "PrimalSlash", true);
@@ -2409,17 +2409,17 @@ bool gt_DEBUGSlivanBoss_Func (bool testConds, bool runActions) {
     if ((lv_friendlyRoaches >= 6)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     if ((lv_friendlyHydras >= 4)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     if ((lv_friendlyUltras >= 1)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "AP_PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true);
     UnitAbilityShow(gv_kerrigan, "PrimalSlash", true);
@@ -2555,17 +2555,17 @@ bool gt_DEBUGZurvanBoss_Func (bool testConds, bool runActions) {
     if ((lv_friendlyRoaches >= 6)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     if ((lv_friendlyHydras >= 4)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     if ((lv_friendlyUltras >= 1)) {
     }
     else {
-        libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
+        libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "AP_PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan));
     }
     UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true);
     UnitAbilityShow(gv_kerrigan, "PrimalSlash", true);
@@ -12251,13 +12251,13 @@ bool gt_ZurvanIntroSetup_Func (bool testConds, bool runActions) {
         auto169FED01_var = UnitGroupUnitFromEnd(auto169FED01_g, auto169FED01_u);
         if (auto169FED01_var == null) { break; }
         auto38344B2C_val = UnitGetType(auto169FED01_var);
-        if (auto38344B2C_val == "PrimalRoachBurrowed") {
+        if (auto38344B2C_val == "AP_PrimalRoachBurrowed") {
             UnitIssueOrder(auto169FED01_var, Order(AbilityCommand("BurrowPrimalRoachUp", 0)), c_orderQueueReplace);
         }
-        else if (auto38344B2C_val == "PrimalHydraliskBurrowed") {
+        else if (auto38344B2C_val == "AP_PrimalHydraliskBurrowed") {
             UnitIssueOrder(auto169FED01_var, Order(AbilityCommand("BurrowPrimalHydraliskUp", 0)), c_orderQueueReplace);
         }
-        else if (auto38344B2C_val == "PrimalUltraliskBurrowed") {
+        else if (auto38344B2C_val == "AP_PrimalUltraliskBurrowed") {
             UnitIssueOrder(auto169FED01_var, Order(AbilityCommand("BurrowPrimalUltraliskUp", 0)), c_orderQueueReplace);
         }
         else {
@@ -12727,7 +12727,7 @@ bool gt_ZurvanReinforcements_Func (bool testConds, bool runActions) {
     }
     else {
         lv_friendlyHydras = (4 - lv_friendlyHydras);
-        UnitCreate(lv_friendlyHydras, "PrimalHydralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0);
+        UnitCreate(lv_friendlyHydras, "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0);
         auto1F2D5D87_g = UnitLastCreatedGroup();
         auto1F2D5D87_u = UnitGroupCount(auto1F2D5D87_g, c_unitCountAll);
         for (;; auto1F2D5D87_u -= 1) {
@@ -12747,7 +12747,7 @@ bool gt_ZurvanReinforcements_Func (bool testConds, bool runActions) {
     }
     else {
         lv_friendlyRoaches = (6 - lv_friendlyRoaches);
-        UnitCreate(lv_friendlyRoaches, "PrimalRoach", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0);
+        UnitCreate(lv_friendlyRoaches, "AP_PrimalRoach", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0);
         autoB8B38C45_g = UnitLastCreatedGroup();
         autoB8B38C45_u = UnitGroupCount(autoB8B38C45_g, c_unitCountAll);
         for (;; autoB8B38C45_u -= 1) {
@@ -12767,7 +12767,7 @@ bool gt_ZurvanReinforcements_Func (bool testConds, bool runActions) {
     }
     else {
         lv_friendlyUltras = (1 - lv_friendlyUltras);
-        UnitCreate(lv_friendlyUltras, "PrimalUltralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0);
+        UnitCreate(lv_friendlyUltras, "AP_PrimalUltralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0);
         auto48AF143C_g = UnitLastCreatedGroup();
         auto48AF143C_u = UnitGroupCount(auto48AF143C_g, c_unitCountAll);
         for (;; auto48AF143C_u -= 1) {
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers
index e3dac6e52..2b72a7677 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers
@@ -4242,7 +4242,7 @@
     </Element>
     <Element Type="Param" Id="5906B4AA">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalRoach</Value>
+        <Value>AP_PrimalRoach</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Unit"/>
     </Element>
@@ -4844,7 +4844,7 @@
     </Element>
     <Element Type="Param" Id="09410A6F">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalRoach</Value>
+        <Value>AP_PrimalRoach</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Unit"/>
     </Element>
@@ -4928,7 +4928,7 @@
     </Element>
     <Element Type="Param" Id="3C6C2123">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalHydralisk</Value>
+        <Value>AP_PrimalHydralisk</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -5912,7 +5912,7 @@
     </Element>
     <Element Type="Param" Id="3339E701">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalRoach</Value>
+        <Value>AP_PrimalRoach</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Unit"/>
     </Element>
@@ -5996,7 +5996,7 @@
     </Element>
     <Element Type="Param" Id="7968EE59">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalHydralisk</Value>
+        <Value>AP_PrimalHydralisk</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -6081,7 +6081,7 @@
     </Element>
     <Element Type="Param" Id="6AB04ABF">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalUltralisk</Value>
+        <Value>AP_PrimalUltralisk</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -7206,7 +7206,7 @@
     </Element>
     <Element Type="Param" Id="2BF402BA">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalRoach</Value>
+        <Value>AP_PrimalRoach</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Unit"/>
     </Element>
@@ -7290,7 +7290,7 @@
     </Element>
     <Element Type="Param" Id="25C3BE54">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalHydralisk</Value>
+        <Value>AP_PrimalHydralisk</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -7375,7 +7375,7 @@
     </Element>
     <Element Type="Param" Id="A8773257">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
-        <Value>PrimalUltralisk</Value>
+        <Value>AP_PrimalUltralisk</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -20423,20 +20423,16 @@
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="F20A0011"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
         <Parameter Type="Param" Id="3A526238"/>
-        <Parameter Type="Param" Id="5B360650"/>
         <Parameter Type="Param" Id="014B99F4"/>
         <Parameter Type="Param" Id="0C8E8A1E"/>
         <Parameter Type="Param" Id="09FBEBA6"/>
+        <Parameter Type="Param" Id="D3D1F524"/>
     </Element>
     <Element Type="Param" Id="3A526238">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="535CF74C"/>
         <Value>1</Value>
         <ValueType Type="int"/>
     </Element>
-    <Element Type="Param" Id="5B360650">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E0EEA51B"/>
-        <ValueType Type="preset"/>
-    </Element>
     <Element Type="Param" Id="014B99F4">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="83C13034"/>
         <Variable Type="Variable" Id="1CF08657"/>
@@ -20453,6 +20449,11 @@
         <ValueType Type="point"/>
         <ValueId Id="2024"/>
     </Element>
+    <Element Type="Param" Id="D3D1F524">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="E0EEA51B"/>
+        <ValueType Type="preset"/>
+        <ValueElement Type="Preset" Library="Ntve" Id="E85564CA"/>
+    </Element>
     <Element Type="FunctionCall" Id="D88C61FC">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000089"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
@@ -109859,7 +109860,7 @@
     </Element>
     <Element Type="Param" Id="F9009EA9">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="9A8F1093"/>
-        <Value>PrimalRoachBurrowed</Value>
+        <Value>AP_PrimalRoachBurrowed</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Unit"/>
     </Element>
@@ -109903,7 +109904,7 @@
     </Element>
     <Element Type="Param" Id="0CAD763B">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="9A8F1093"/>
-        <Value>PrimalHydraliskBurrowed</Value>
+        <Value>AP_PrimalHydraliskBurrowed</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -109948,7 +109949,7 @@
     </Element>
     <Element Type="Param" Id="AF09AC45">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="9A8F1093"/>
-        <Value>PrimalUltraliskBurrowed</Value>
+        <Value>AP_PrimalUltraliskBurrowed</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -115889,7 +115890,7 @@
     </Element>
     <Element Type="Param" Id="EC368882">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="EF0CF6FF"/>
-        <Value>PrimalHydralisk</Value>
+        <Value>AP_PrimalHydralisk</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>
@@ -116189,7 +116190,7 @@
     </Element>
     <Element Type="Param" Id="E25D3090">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="EF0CF6FF"/>
-        <Value>PrimalRoach</Value>
+        <Value>AP_PrimalRoach</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Unit"/>
     </Element>
@@ -116488,7 +116489,7 @@
     </Element>
     <Element Type="Param" Id="F1A2E1B0">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="EF0CF6FF"/>
-        <Value>PrimalUltralisk</Value>
+        <Value>AP_PrimalUltralisk</Value>
         <ValueType Type="gamelink"/>
         <ValueId Id="4294967295"/>
         <ValueGameType Type="Unit"/>

From 933a26ec19d17788e1be4c052503e115c4833372 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 17:13:43 -0400
Subject: [PATCH 10/34] Add widow mine upgrade to damage structures.

---
 ...btn-ability-terran-widow-mine-building.dds | Bin 0 -> 5904 bytes
 .../Base.SC2Data/GameData/AbilData.xml        |  18 ++++++++++--
 .../Base.SC2Data/GameData/ActorData.xml       |   6 ++--
 .../Base.SC2Data/GameData/BehaviorData.xml    |   4 +++
 .../Base.SC2Data/GameData/ButtonData.xml      |  17 ++++++++++++
 .../Base.SC2Data/GameData/EffectData.xml      |  26 ++++++++++++++++--
 .../Base.SC2Data/GameData/RequirementData.xml |   4 +++
 .../GameData/RequirementNodeData.xml          |   4 +++
 .../Base.SC2Data/GameData/UnitData.xml        |   8 ++++++
 .../Base.SC2Data/GameData/UpgradeData.xml     |   3 ++
 .../Base.SC2Data/GameData/ValidatorData.xml   |  19 +++++++++++++
 .../LocalizedData/GameHotkeys.txt             |   2 ++
 .../LocalizedData/GameStrings.txt             |   6 ++++
 13 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-ability-terran-widow-mine-building.dds

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-ability-terran-widow-mine-building.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-ability-terran-widow-mine-building.dds
new file mode 100644
index 0000000000000000000000000000000000000000..385c7a0e7e874e3d1ba13a740afa9297beb6462d
GIT binary patch
literal 5904
zcmbuDe^6A{6~`~@uLm2FH`AhYGBp=vg~UN{tSNLvo<OH=T04k77M36Tz}QAJZPAYD
ziU<#^nUYK=hPWn!Xr53fW^I~@5z|N<S1{8=%uGkZ-~=<-@S{<Y)CedFySL}=?zy{Q
zV*kjU<;Q2w{rP?8oO|!f&D}t&2_f@jiTn!w@}GV4;TM!B`1yr(U0zCV?uL@+S%L2!
z^oxRVHvHrkZe01T_2m1%H4$rLV)QFITFk(M*A5(^5+SM@+c1w<`@bUl5(8{Irb@(m
ziy^E25bsaK_5r)TZ#v6ihW-NWr`3o49>9&vG~NEyzVLXwzpQ;hyBiAUsnB@HFyB?Y
zf8;E(pCQA18<QHfUC1)m<KW^n<hh)GpPh~@k-JSf%U}C1XI>cBtKn7iM^jv{HVY$n
z9gXn)RbN89I&3nrA6WBG0I&5Cs<LAS`=RyHDc*1Z>N9tM4*+^QLL6t!=k2v73ij&;
zn{UnLtgok%3bSSlf~>7qWR>ZH=^C*64V}dY?Ve=LR}J=~AS>|ffv>VhgB*OG4hQ>j
zkYR{`KKJosGwjeGUk@)_Pgwu0#9gK($kC*Gapw6Pp?5U7+qg92a3>#c2NXt@%jS1v
z^V3sQwzRdiF$Vg==W*t}zNC5dW8@KbWU{iuWJXS5#;B^=N|23V;{K!mpI&6zN9%XF
zpP<MUecp1_;SAe{^dePt+(NsjoMbp^?p;NuYxMY<nkvD1JeA67oPzoM%gU-Juzo-Q
z_!Y?kJwogGPCNPctjx=MGEuJ>0%CQp5PC@@<M2R6GwQXO5fJO0eP(ZqB3q!~cwK(I
zV@_O;ihP{uQ?XCJ_6_nk%roWeua7}~o_R*qUPm>uKBiyt-D$pwtPSfe&#*6qzMgSf
zzio%jhIXaZC@QdTdI{Mm_og{&CjNr#RTSA#1^yOVzsCJfEpQ?We~ZxPfqL=$V{?=;
z0%C>q;+h5Yn&w~cH+RB^_rH1b&=4c<?=!>4a8K7u>7-3rS&weP`Mlw$!wr@NpCga4
zBmR_>_g+VyWV)}+>8(eu_j|8Ddm%<V?}TyXMDer#`2g+OyQF^mFJJlzveN3^mbBmy
zLpI*ki)w31g#YN}Mp|vvgz!&KI+bgxCWOE7cy-j)i0Acf{=~n-{`vZcERTJGdQl$l
zYC++*=ykX&qq!@fS0EmPdg(L#%iB$xj{fxX-Pk`F_q^GVv~U!;i+Ltn8|Gyp``Aa!
z9GfEI*~fBOL1Cqi_PtE$zr6jaW61OdX}Yp~(*<O0NNMbS?4Wo)kXY*-HO?xuD^+xT
zjWetlwQ9*_&I!?<7c#W1Y}qobf1h65pGtQYp<SVb?7sFE<m;e+aW39fQxZ+iufTZZ
zeMFP@o4b}D9_Ih^g8oJ7sbsMn73<Yc7+cKdrH^C(#-Mh>Iw!6dIm)kmmJs`76Y>}<
z_b)sC=3B^&ea%d!S<%QocFtc`ebYeh^c#0ieQ-1EFFwzub^m%;#JB#b=k&9~4I)0h
zO-8xB${F^zB2QY4(<$Q7ppeh*O$a;phm9p=b{tQCfshYBR7HN#k_lPq>UE%ANAjS(
z-JTceUtFJP0?7;Fk^j#N>c#h`$oy5;qFAG2SB~R&o?-2D?;%$svKR8xz$ccK$UkSw
zU6c8d)yRH!jXjdOTIkK#1XK8Uq5Lw*68vR1b-`nhAA1k17JSsN58UxjiFhLyNmW@%
zwTL&Rk7U?-?fKZB0r{+|x?1SR<IAyYRK&yE=Xt(U#e5$+Nq}uS>Scg`R_@$wL%q1(
zj#7sM{A=L=xER-p7u1VnOxMfPMAx*n#r5EP6lS<f)!PdM-!NWIJ?lG(toxKp>HQ62
zzqki_#9CY;-!V1`rwLOE)@SS<(-e=;XNrxoitBE{qpZXC+%t*?>uZDFoz+ffC9-Fm
zC#}L?R)%b(fnHZ{4j`9PB01~}zd-)=Ng{u;{mLEW<dO2Ux}D%}p?Li32UIGt@7@6M
zn6nB#T(4q#aWU?X0kI<V@}^S){&f`l)7E>_%qb~nkd1b&DAPCYL)OPh)fHcO|MZS}
zo03v9Mg6^gI`y;EtX)|D#jkT^tt4>{a>dsP@O;Dmc0Y4}2-^pSvSnXSq0mcPZ&0VR
zM(Cx3e_i;8|2^!VQbMY>9)B3Q>mZeix2@ZYob)1*YuTAN)a&u{L@q4Z$n#gus_qq;
z0lo6`?GofKex8`Amj~h*<Pv((H3nUpdPc;f{(?8%oE5?Edbimo%oZG<UL@O7dK}{X
zQ0~j7rl*QU{;0pL$+1zhg#QeD9z~87+%CZOxqmZBM4eQT_xwGI5Z6H$a>Z?3))ZZ|
z_Y_6RK3}O=zXAe1;eNFg>py>-Caa}~ME+cRlBTV6m0U*qZ!Rk7ab&U<_0lGZR9I+-
z_=Ce&chJA=c84SAUx)A0ON$4+j)u>xMzSI=Jv$zbN2?yc^zE=-Mw2%^mHC98-cDmn
zONvXZ_vw+R;}6VVIS1#LeY<0XxS6o`k5H+A`*$dx^^YhLxRc<H5lUPUJhT0uhqB{u
zZ!FBi_UBt+|8u$Gkbiqpp%ojS`xA0Sr;_~6n;*v_f7zj>*W5X6pk9mN5>jlhsto7_
zTVx=AIqdmdug;9-0q$SH`#|tK!R@h@HnDzwo{4dvW!S$#skHQMUk@@_qk*1by%f0b
zkf*jf(7tF$k)tF0sb$186sgzu<wZk!d}RKsYa&vd?@SVo@AesM3yMclk%xRnx@DzB
z#OKFs&EU0q_c-dcXN>z-Ng3BG6I_hzk)Q9_9htu(_2T;Rg8lRQtS7wxa*jDWF8rev
z^6PkyD&p~t&IIYuf+V45>)@AZ&|SFxV7V1I8~g8^VgG;J8f;(pUG1;=h@3Qkp$+YS
z@Ozvw-U*R!H{H;-NoRX|(SGiRQMYXMtG%dKT^Er`pu~_*MZVuqT*UKzb0@eM*Jh?(
zGw%-%;?3=gBsDHB4#%%(*W}1}+5|TUwX#y==UIbVd^QxUU*Dz0t5H!=$SqxP|Asjs
z*LP8(dORNF&Te>rGp#=K9~&#;tEFrD_@?&7^4|UX_hWlwjIOV>?hwyU>(JIiI!Qsj
zv;nxE+6(jGz76Nq(EeB)I8VTNHF%!*etIQHAeYdqwQp8CaUU1++0;!XkW1*519~Wm
zBJ|4X(rM)SH+3)Wauc^`pVM_N4eBen-W<?xdVR<r5qj<E%kK1S-CB$F7qy#YkW1+0
z86!pGb1Wi0CmHQiU9l$A3j$NNLqG=eeQ<v)Ep?Oz{VTXXejmNo!2a+}#Ccf(R&6OR
zoNt{HMOdvv+$TLsf(*ySVYDkvQL<WaYX>sf5(Vc6Q=8yE0{$D$pL?gE{>GRW(O%aL
z_B_alq5XoodHX4GKRPlHCA(a&XQAE4v@zG5@cul-42^gyO9FZonwEHnsk{*mwERAl
z2`<L-PjSAT?~hH#?;Z}k{|f3A{c<zBzX``Dp~{kjNrLAQYW>~8uzhZjDd^L~-(Sq;
zd?+!XS4sakGXbAEl<3unl+p(Fs34Pa3SEN#k&r!)N>j!?!Fn>0+{dZ}pKBl_H5Kw@
zsQx-1jj!)_2=;=V7_i@Bf2ZLz{6v^9`iT@16J|IaC+ibxp#GLquP4$D$X7O-+CeHW
z@%LB!K9E;n1HHNzue$PzSigxx2i|YNXo37Smn?tna)e&|{p;)qhWCvZVy5w@vmc6J
zi8NCFN)r2vCi@d5VE%m01fEypY$e30XZiDMoE;tFmSX{)yEeq^o~oKjU*HudZ{MD!
zsxjo1*}Q)R`07>8O~UT?bG{U?^ZHfLK8Ac2u=Dxw0`?i)Jy)?F4$PO^A0qmS4CtT#
P&&w?G^GlWxbAS3Ds0=}t

literal 0
HcmV?d00001

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index ef15d2ae8..da32c408e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -1963,17 +1963,19 @@
         <Cost>
             <Cooldown TimeUse="40"/>
         </Cost>
-        <TargetFilters value="Visible;Player,Ally,Neutral,Structure,Missile,Item,Stasis,Dead,Hidden,Invulnerable"/>
+        <TargetFilters value="Visible;Player,Ally,Neutral,Missile,Item,Stasis,Dead,Hidden,Invulnerable"/>
         <Range value="5"/>
         <RangeSlop value="0"/>
         <Arc value="360"/>
-        <AutoCastFilters value="Visible;Player,Ally,Neutral,Structure,Missile,Item,Stasis,Dead,Hidden,Invulnerable,Benign"/>
+        <AutoCastFilters value="Visible;Player,Ally,Neutral,Missile,Item,Stasis,Dead,Hidden,Invulnerable,Benign"/>
         <AutoCastRange value="5"/>
         <AutoCastValidatorArray value="NotLarvaEgg"/>
         <AutoCastValidatorArray value="IsNotNeuralParasited"/>
         <AutoCastValidatorArray value="AP_IsNotDisguisedChangeling"/>
         <AutoCastValidatorArray value="NotHallucinationOrNotDetected"/>
         <AutoCastValidatorArray value="noMarkers"/>
+        <AutoCastValidatorArray value="AP_WidowMineStructureAttackEnabledOrNotStructure"/>
+        <SmartValidatorArray value="AP_HaveWidowMineDemolitionArmamentsOrNotStructure"/>
         <PrepTime value="1.5"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_WidowMineAttack" Requirements="AP_WidowMineArmed">
             <Flags index="ShowInGlossary" value="0"/>
@@ -13621,4 +13623,16 @@
         <AutoCastRange value="9"/>
         <Effect index="0" value="AP_GuardianExplosiveSporesLaunch"/>
     </CAbilEffectTarget>
+    <CAbilBehavior id="AP_WidowMineBuilding">
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <CmdButtonArray index="On" DefaultButtonFace="AP_DisableBuildingAttack" State="Restricted" Requirements="AP_HaveWidowMineDemolitionArmaments">
+            <Flags index="ToSelection" value="1"/>
+        </CmdButtonArray>
+        <CmdButtonArray index="Off" DefaultButtonFace="AP_EnableBuildingAttack" State="Restricted" Requirements="AP_HaveWidowMineDemolitionArmaments">
+            <Flags index="ToSelection" value="1"/>
+        </CmdButtonArray>
+        <Flags index="Toggle" value="1"/>
+        <Flags index="Transient" value="1"/>
+        <BehaviorArray value="AP_WidowMineStructureOn"/>
+    </CAbilBehavior>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 5796560e4..4c4570d14 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -27525,8 +27525,8 @@
         <Radius value="1.750000"/>
     </CActorForceSphere>
     <CActorModel id="AP_WidowMineAttackImpact" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_WidowMineExplodeSplashSearch.Start" Send="Create"/>
-        <On Terms="Effect.AP_HHWidowMineBlossomExplodeSplashSearch.Start" Send="Create"/>
+        <On Terms="Effect.AP_WidowMineExplodeSplashSearchSwitch.Start" Send="Create"/>
+        <On Terms="Effect.AP_HHWidowMineBlossomExplodeSplashSearchSwitch.Start" Send="Create"/>
         <Model value="WidowMineAttackImpact"/>
     </CActorModel>
     <CActorModel id="AP_WidowMineAttackLaunch" parent="ModelAnimationStyleOneShot">
@@ -27629,7 +27629,7 @@
         <On Terms="ActorCreation" Send="Create AP_WidowMineAttackLaunch"/>
         <On Terms="ActorCreation" Send="Create AP_HH_TornadoMissile_LaunchBlossom_AS"/>
     </CActorMissile>
-    <CActorAction id="AP_HHWidowMineBlossomWeaponAttack" parent="GenericAttack" effectImpact="AP_HHWidowMineBlossomExplodeSplashSearch" effectLaunch="AP_HHWidowMineBlossomLM">
+    <CActorAction id="AP_HHWidowMineBlossomWeaponAttack" parent="GenericAttack" effectImpact="AP_HHWidowMineBlossomExplodeSplashSearchSwitch" effectLaunch="AP_HHWidowMineBlossomLM">
         <LaunchSiteOps Ops="SOpForwardPointsUp"/>
         <LaunchAttachQuery Methods="Center"/>
         <ImpactMap index="None" Model="" Sound=""/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 78e8142ec..7b36d5b65 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -9184,4 +9184,8 @@
         <LandArrivalRange value="0.05"/>
         <LandCheckRadius value="5"/>
     </CBehaviorJump>
+    <CBehaviorBuff id="AP_WidowMineStructureOn">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+    </CBehaviorBuff>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index d9cd738d1..a3e45f8dc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6616,4 +6616,21 @@
         <AlertIcon value="Assets\Textures\btn-ability-terran-jetpack-color.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
+    <CButton id="AP_WidowMineDemolitionArmaments">
+        <Icon value="Assets\Textures\btn-ability-terran-ignorearmor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-terran-ignorearmor.dds"/>
+        <EditorCategories value="Race:Terran"/>
+    </CButton>
+    <CButton id="AP_EnableBuildingAttackWidowMine">
+        <Icon value="AP\Assets\Custom\Textures\btn-ability-terran-widow-mine-building.dds"/>
+        <AlertIcon value="AP\Assets\Custom\Textures\btn-ability-terran-widow-mine-building.dds"/>
+        <TooltipFlags index="ShowLevel" value="0"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
+    <CButton id="AP_DisableBuildingAttackWidowMine">
+        <Icon value="Assets\Textures\btn-ability-zerg-yagdra-aoe.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-zerg-yagdra-aoe.dds"/>
+        <TooltipFlags index="ShowLevel" value="0"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 958a0bcdb..0ee694860 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -2794,7 +2794,7 @@
             <MatchFlags index="Id" value="1"/>
         </Marker>
         <EffectArray value="AP_WidowMineExplodeDirect"/>
-        <EffectArray value="AP_WidowMineExplodeSplashSearch"/>
+        <EffectArray value="AP_WidowMineExplodeSplashSearchSwitch"/>
     </CEffectSet>
     <CEffectDamage id="AP_WidowMineExplodeSplash" parent="DU_WEAP">
         <ValidatorArray value="AP_DontDamageOwnedWidowMines"/>
@@ -2806,12 +2806,23 @@
         <Amount value="40"/>
         <Death value="Blast"/>
     </CEffectDamage>
+    <CEffectSwitch id="AP_WidowMineExplodeSplashSearchSwitch">
+        <EditorCategories value="Race:Zerg"/>
+        <CaseArray Validator="AP_HaveWidowMineDemolitionArmaments" Effect="AP_WidowMineExplodeSplashSearchStructure"/>
+        <CaseDefault value="AP_WidowMineExplodeSplashSearch"/>
+    </CEffectSwitch>
     <CEffectEnumArea id="AP_WidowMineExplodeSplashSearch">
         <EditorCategories value="Race:Terran"/>
         <ExcludeArray Value="Target"/>
         <SearchFilters value="-;Player,Ally,Neutral,Structure,Missile,Item,Stasis,Dead,Hidden,Invulnerable"/>
         <AreaArray Radius="1.75" Effect="AP_WidowMineExplodeSplash"/>
     </CEffectEnumArea>
+    <CEffectEnumArea id="AP_WidowMineExplodeSplashSearchStructure">
+        <EditorCategories value="Race:Terran"/>
+        <ExcludeArray Value="Target"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Missile,Item,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.75" Effect="AP_WidowMineExplodeSplash"/>
+    </CEffectEnumArea>
     <CEffectSet id="AP_WidowMineExplodeSplashSet">
         <EditorCategories value="Race:Terran"/>
         <EffectArray value="AP_WidowMineExplodeSplashShields"/>
@@ -12607,16 +12618,27 @@
     </CEffectCreatePersistent>
     <CEffectLaunchMissile id="AP_HHWidowMineBlossomLM">
         <EditorCategories value="Race:Terran"/>
-        <ImpactEffect value="AP_HHWidowMineBlossomExplodeSplashSearch"/>
+        <ImpactEffect value="AP_HHWidowMineBlossomExplodeSplashSearchSwitch"/>
         <AmmoUnit value="AP_HHWidowMineBlossomWeapon"/>
         <ImpactLocation Value="TargetPoint"/>
     </CEffectLaunchMissile>
+    <CEffectSwitch id="AP_HHWidowMineBlossomExplodeSplashSearchSwitch">
+        <EditorCategories value="Race:Terran"/>
+        <CaseArray Validator="AP_HaveWidowMineDemolitionArmaments" Effect="AP_HHWidowMineBlossomExplodeSplashSearchStructure"/>
+        <CaseDefault value="AP_HHWidowMineBlossomExplodeSplashSearch"/>
+    </CEffectSwitch>
     <CEffectEnumArea id="AP_HHWidowMineBlossomExplodeSplashSearch">
         <EditorCategories value="Race:Terran"/>
         <ExcludeArray Value="Target"/>
         <SearchFilters value="Ground;Player,Ally,Structure,Missile,Item,Stasis,Dead,Hidden,Invulnerable"/>
         <AreaArray Radius="2.625" Effect="AP_HHWidowMineBlossomExplodeSplash"/>
     </CEffectEnumArea>
+    <CEffectEnumArea id="AP_HHWidowMineBlossomExplodeSplashSearchStructure">
+        <EditorCategories value="Race:Terran"/>
+        <ExcludeArray Value="Target"/>
+        <SearchFilters value="Ground;Player,Ally,Missile,Item,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="2.625" Effect="AP_HHWidowMineBlossomExplodeSplash"/>
+    </CEffectEnumArea>
     <CEffectDamage id="AP_HHWidowMineBlossomExplodeSplash" parent="DU_WEAP">
         <EditorCategories value="Race:Terran"/>
         <Kind value="Spell"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 54c177a0d..dd396986e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4080,4 +4080,8 @@
         <EditorCategories value="Race:Zerg,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeSCVCliffJumpCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveWidowMineDemolitionArmaments">
+        <EditorCategories value="Race:Terran,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountWidowMineDemolitionArmamentsCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 1f3150c1b..894245822 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6721,4 +6721,8 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_SCVCliffJump" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountWidowMineDemolitionArmamentsCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_WidowMineDemolitionArmaments" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 5e0d9732c..0afa81245 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -3727,6 +3727,7 @@
         <AbilArray Link="stop"/>
         <AbilArray Link="move"/>
         <AbilArray Link="AP_WidowMineAttack"/>
+        <AbilArray Link="AP_WidowMineBuilding"/>
         <AbilArray Link="AP_HHWidowMineBlossom"/>
         <BehaviorArray Link="AP_HHWidowMineBlossom"/>
         <CardLayouts>
@@ -3743,6 +3744,9 @@
             <LayoutButtons Face="AP_WidowMineConcealment" Type="Passive" Requirements="AP_HaveWidowMineImprovedConcealmentUnburrowed" Row="1" Column="1"/>
             <LayoutButtons Face="AP_HHWidowMineRangeAttack" Type="Passive" Requirements="AP_HaveHHWidowMineAttackRangeUnburrowed" Row="1" Column="2"/>
             <LayoutButtons Face="AP_HHWidowMineDeathBlossom" Type="Passive" Requirements="AP_HaveHHWidowMineDeathBlossom" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_WidowMineDemolitionArmaments" Type="Passive" Requirements="AP_HaveWidowMineDemolitionArmaments" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_EnableBuildingAttackWidowMine" Type="AbilCmd" AbilCmd="AP_WidowMineBuilding,On" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_DisableBuildingAttackWidowMine" Type="AbilCmd" AbilCmd="AP_WidowMineBuilding,Off" Row="2" Column="3"/>
         </CardLayouts>
         <CargoSize value="2"/>
         <ScoreMake value="100"/>
@@ -3803,6 +3807,7 @@
         <AbilArray Link="AP_WidowMineUnburrow"/>
         <AbilArray Link="AP_WidowMineAttack"/>
         <AbilArray Link="AP_HHWidowMineBlossom"/>
+        <AbilArray Link="AP_WidowMineBuilding"/>
         <BehaviorArray Link="AP_WidowMineArmed"/>
         <BehaviorArray Link="AP_WidowMineBurrowedCloakingBehavior"/>
         <BehaviorArray Link="AP_WidowMineImprovedConcealmentUpgradeTracker"/>
@@ -3818,6 +3823,9 @@
             <LayoutButtons Face="AP_WidowMineConcealment" Type="Passive" Requirements="AP_HaveWidowMineImprovedConcealment" Row="1" Column="1"/>
             <LayoutButtons Face="AP_HHWidowMineRangeAttack" Type="Passive" Requirements="AP_HaveHHWidowMineAttackRange" Row="1" Column="2"/>
             <LayoutButtons Face="AP_HHWidowMineDeathBlossom" Type="Passive" Requirements="AP_HaveHHWidowMineDeathBlossom" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_WidowMineDemolitionArmaments" Type="Passive" Requirements="AP_HaveWidowMineDemolitionArmaments" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_EnableBuildingAttackWidowMine" Type="AbilCmd" AbilCmd="AP_WidowMineBuilding,On" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_DisableBuildingAttackWidowMine" Type="AbilCmd" AbilCmd="AP_WidowMineBuilding,Off" Row="2" Column="3"/>
         </CardLayouts>
         <ScoreKill value="100"/>
         <SubgroupPriority value="7"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index db911a11a..040b762cf 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15879,4 +15879,7 @@
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_SCV"/>
     </CUpgrade>
+    <CUpgrade id="AP_WidowMineDemolitionArmaments">
+        <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index 3d9425d05..a715a26aa 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -6684,4 +6684,23 @@
         <Value value="SiegeTankSieged"/>
         <Find value="0"/>
     </CValidatorUnitType>
+    <CValidatorCombine id="AP_WidowMineStructureAttackEnabledOrNotStructure">
+        <Type value="Or"/>
+        <CombineArray value="NotStructure"/>
+        <CombineArray value="AP_WidowMineStructureAttackEnabled"/>
+    </CValidatorCombine>
+    <CValidatorUnitCompareBehaviorCount id="AP_WidowMineStructureAttackEnabled">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_WidowMineStructureOn"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorCombine id="AP_HaveWidowMineDemolitionArmamentsOrNotStructure">
+        <Type value="Or"/>
+        <CombineArray value="NotStructure"/>
+        <CombineArray value="AP_HaveWidowMineDemolitionArmaments"/>
+    </CValidatorCombine>
+    <CValidatorPlayerRequirement id="AP_HaveWidowMineDemolitionArmaments">
+        <Find value="1"/>
+        <Value value="AP_HaveWidowMineDemolitionArmaments"/>
+    </CValidatorPlayerRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 1e930bee4..f0fbf7ba6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -575,3 +575,5 @@ Button/Hotkey/AP_IrradiateMedicMengsk=T
 Button/Hotkey/AP_MedicMengsk=E
 Button/Hotkey/AP_LiberatorMengsk=T
 Button/Hotkey/AP_GuardianExplosiveSpores=Q
+Button/Hotkey/AP_EnableBuildingAttackWidowMine=F
+Button/Hotkey/AP_DisableBuildingAttackWidowMine=G
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 2c872f97d..6417c8589 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1079,6 +1079,7 @@ Button/Name/AP_DiamondbackSnailTrail=Caustic Mucus
 Button/Name/AP_DisableBuildingAttack=Disable Structure Attack
 Button/Name/AP_DisableBuildingAttackSplitterling=Disable Structure Attack
 Button/Name/AP_DisableBuildingAttackVolatileInfected=Disable Structure Attack
+Button/Name/AP_DisableBuildingAttackWidowMine=Disable Structure Attack
 Button/Name/AP_DisablingCloud=Disabling Cloud
 Button/Name/AP_DisplacementField=Displacement Field
 Button/Name/AP_Disruptor=Warp in Disruptor
@@ -1097,6 +1098,7 @@ Button/Name/AP_EMP=EMP Round
 Button/Name/AP_EnableBuildingAttack=Enable Structure Attack
 Button/Name/AP_EnableBuildingAttackSplitterling=Enable Structure Attack
 Button/Name/AP_EnableBuildingAttackVolatileInfected=Enable Structure Attack
+Button/Name/AP_EnableBuildingAttackWidowMine=Enable Structure Attack
 Button/Name/AP_EnduringLocusts=Enduring Locusts
 Button/Name/AP_EnergizerForgedChassis=Forged Chassis
 Button/Name/AP_EnergizerReclamation=Reclamation
@@ -1957,6 +1959,7 @@ Button/Name/AP_WidowMineAttack=Attack
 Button/Name/AP_WidowMineBioSplash=Sentinel Missiles
 Button/Name/AP_WidowMineBurrow=Activate Mine
 Button/Name/AP_WidowMineConcealment=Concealment
+Button/Name/AP_WidowMineDemolitionArmaments=Demolition Armaments
 Button/Name/AP_WidowMineUnburrow=Deactivate Mine
 Button/Name/AP_WildMutation=Wild Mutation
 Button/Name/AP_Wraith=Build Wraith
@@ -2320,6 +2323,7 @@ Button/Tooltip/AP_DisableBuildingAttack=Prevents Banelings from automatically ta
 Button/Tooltip/AP_DisableBuildingAttackScourge=Prevents Scourge from automatically targeting structures. Scourge can still be explicitly ordered to attack structures.<n/><n/>Scourge deal <d ref="(Effect,AP_SuicideDamage,Amount) + (Effect,AP_SuicideDamage,AttributeBonus[Structure])"/> damage to structures.
 Button/Tooltip/AP_DisableBuildingAttackSplitterling=Prevents Banelings from automatically targeting structures. Banelings can still be explicitly ordered to attack structures.<n/><n/>Banelings deal <d ref="(Effect,AP_HotSBanelingExplodeSmallDirect,Amount) + (Effect,AP_HotSBanelingExplodeSmallDirect,AttributeBonus[Structure])"/> damage to structures.
 Button/Tooltip/AP_DisableBuildingAttackVolatileInfected=Prevents Volatile Infected from automatically targeting structures. Volatile Infected can still be explicitly ordered to attack structures.<n/><n/>Volatile Infected deal <d ref="(Effect,AP_SIVolatileInfestedExplodeDamageStructureDirect,Amount) + (Effect,AP_SIVolatileInfestedExplodeDamageStructureDirect,AttributeBonus[Armored])"/> damage to structures.
+Button/Tooltip/AP_DisableBuildingAttackWidowMine=Prevents Widow Mine from automatically targeting structures. Widow Mine can still be explicitly ordered to attack structures.
 Button/Tooltip/AP_DisablingCloud=Creates a cloud that slows movement speed and prevents enemy units and structures from attacking and using energy-based abilities. Lasts for <d ref="(Effect,AP_DisablingCloud,PeriodCount + 1) * Effect,AP_DisablingCloud,PeriodicPeriodArray[0]"/> seconds.
 Button/Tooltip/AP_DisplacementField=A detected Wraith evades 20% of incoming attacks while cloaked.
 Button/Tooltip/AP_Disruptor=Robotic disruption unit. Can use Purification Nova to deal heavy area damage.
@@ -2342,6 +2346,7 @@ Button/Tooltip/AP_EnableBuildingAttack=Allows Banelings to automatically target
 Button/Tooltip/AP_EnableBuildingAttackScourge=Allows Scourge to automatically target structures.<n/><n/>Scourge deal <d ref="(Effect,AP_SuicideDamage,Amount) + (Effect,AP_SuicideDamage,AttributeBonus[Structure])"/> damage to structures.
 Button/Tooltip/AP_EnableBuildingAttackSplitterling=Allows Banelings to automatically target structures.<n/><n/>Banelings deal <d ref="(Effect,AP_HotSBanelingExplodeSmallDirect,Amount) + (Effect,AP_HotSBanelingExplodeSmallDirect,AttributeBonus[Structure])"/> damage to structures.
 Button/Tooltip/AP_EnableBuildingAttackVolatileInfected=Allows Voltile Infected to automatically target structures.<n/><n/>Voltile Infected deal <d ref="(Effect,AP_SIVolatileInfestedExplodeDamageStructureDirect,Amount) + (Effect,AP_SIVolatileInfestedExplodeDamageStructureDirect,AttributeBonus[Armored])"/> damage to structures.
+Button/Tooltip/AP_EnableBuildingAttackWidowMine=Allows Widow Mine to automatically target structures.
 Button/Tooltip/AP_EnduringLocusts=Increase Locust lifetime by 10 seconds.
 Button/Tooltip/AP_EnergizerForgedChassis=Increases Energizer Life by 20.
 Button/Tooltip/AP_EnergizerReclamation=Temporarily takes control of target enemy mechanical unit. Reclaimed units self-destruct after <d ref="Behavior,AP_SentryReclamation,Duration"/> seconds.
@@ -3374,6 +3379,7 @@ Button/Tooltip/AP_WidowMineAttack=Attacks any nearby enemy unit.
 Button/Tooltip/AP_WidowMineBioSplash=Attacks air and ground units in proximity dealing <d ref="Effect,AP_WidowMineExplodeDirect,Amount"/> (+<d ref="Effect,AP_WidowMineExplodeDirect,ShieldBonus"/> vs. shields) damage to their primary target and <d ref="Effect,AP_WidowMineExplodeSplash,Amount"/> (+<d ref="Effect,AP_WidowMineExplodeSplash,ShieldBonus"/> vs. shields) splash damage to units nearby. This unit is revealed while reloading.<n/><n/><c val="#ColorAttackInfo">Cooldown: <d ref="Abil,AP_WidowMineAttack,Cost[0].Cooldown[0].TimeUse[0]"/> seconds.</c>
 Button/Tooltip/AP_WidowMineBurrow=Burrows the Widow Mine and readies its weapon. Cannot move while activated.
 Button/Tooltip/AP_WidowMineConcealment=This unit is no longer revealed while reloading.
+Button/Tooltip/AP_WidowMineDemolitionArmaments=Allows Widow Mines to attack buildings.
 Button/Tooltip/AP_WidowMineUnburrow=Unburrows the Widow Mine and deactivates its weapon, allowing it to move.
 Button/Tooltip/AP_WildMutation=Friendly zerg units in the target area gain +<d ref="Behavior,AP_WildMutation,Modification.VitalMaxArray[1]"/> maximum life and <d ref="(Behavior,AP_WildMutation,Modification.AttackSpeedMultiplier - 1) * 100"/>% increased attack speed for <d ref="Behavior,AP_WildMutation,Duration"/> seconds.<n/><n/><c val="ffff8a">Does not affect heroic units.</c>
 Button/Tooltip/AP_Wraith=Highly mobile flying unit. Excellent at surgical strikes.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>

From e61f60b8ce0c47ff60774473336623dd95041bed Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 17:19:47 -0400
Subject: [PATCH 11/34] add widow mine upgrade trigger

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  8 +++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |  1 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 39 ++++++++++++++++++-
 .../LocalizedData/TriggerStrings.txt          |  2 +
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 784a3b66f..9d4610cc8 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -553,7 +553,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperAdvancedAlloys, // 14
         libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperOptimizedLogistics, // 15
         libABFE498B_gf_AP_Triggers_Terran_unlockSCVConstructionJumpJets, // 16
-        ap_triggers_PlayerConsumer_sig, // 17
+        libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDemolitionArmaments, // 17
         ap_triggers_PlayerConsumer_sig, // 18
         ap_triggers_PlayerConsumer_sig, // 19
         ap_triggers_PlayerConsumer_sig, // 20
@@ -3698,6 +3698,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineResourceEfficiency (int lp
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ResourceEfficiencyWidowMine", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDemolitionArmaments (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_WidowMineDemolitionArmaments", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieEnhancedCluserLaunchers (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index aad650f6f..423fa8d1d 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -396,6 +396,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineConcealment (int lp_player
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineBlackMarketLaunchers (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineExecutionerMissiles (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineResourceEfficiency (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDemolitionArmaments (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieEnhancedCluserLaunchers (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieShapedHull (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieFlechetteMissiles (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 7acce05c3..b7dcb9fb2 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2833,7 +2833,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperAdvancedAlloys, // 14
                     libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooperOptimizedLogistics, // 15
                     libABFE498B_gf_AP_Triggers_Terran_unlockSCVConstructionJumpJets, // 16
-                    ap_triggers_PlayerConsumer_sig, // 17
+                    libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDemolitionArmaments, // 17
                     ap_triggers_PlayerConsumer_sig, // 18
                     ap_triggers_PlayerConsumer_sig, // 19
                     ap_triggers_PlayerConsumer_sig, // 20
@@ -25747,6 +25747,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="CD53B9B0"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3D2B8858"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="0A88B830"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="0CC89C9C"/>
         </Element>
         <Element Type="FunctionDef" Id="88A21D71">
             <FlagAction/>
@@ -25928,6 +25929,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="0CC89C9C">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="7A7CE6CA"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2CB635D2"/>
+        </Element>
+        <Element Type="ParamDef" Id="7A7CE6CA">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="36D10C3B"/>
+        </Element>
+        <Element Type="Param" Id="36D10C3B">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="2CB635D2">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6C6EC204"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D6207D4B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DB82A869"/>
+        </Element>
+        <Element Type="Param" Id="6C6EC204">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="7A7CE6CA"/>
+        </Element>
+        <Element Type="Param" Id="D6207D4B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="DB82A869">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_WidowMineDemolitionArmaments</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="242BC660">
             <Item Type="FunctionDef" Library="ABFE498B" Id="9F180882"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="C159FECF"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 4946c41ca..e4e5dd46c 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -155,6 +155,7 @@ FunctionDef/Name/lib_ABFE498B_0A88B830=AP_Triggers_Terran_unlockWidowMineResourc
 FunctionDef/Name/lib_ABFE498B_0AB04574=AP_Triggers_Terran_unlockVikingAesirTurbines
 FunctionDef/Name/lib_ABFE498B_0B070864=AP_Triggers_Zerg_unlockPrimalIgniter
 FunctionDef/Name/lib_ABFE498B_0B9FD37F=AP_Triggers_Terran_unlockPredatorCharge
+FunctionDef/Name/lib_ABFE498B_0CC89C9C=AP_Triggers_Terran_unlockWidowMineDemolitionArmaments
 FunctionDef/Name/lib_ABFE498B_0D072F28=AP_Triggers_Zerg_GuardianExplosiveSpores
 FunctionDef/Name/lib_ABFE498B_0D47683E=AP_Triggers_Zerg_MutaliskSeveringGlave
 FunctionDef/Name/lib_ABFE498B_0D90E500=AP_Triggers_unlockZergKerriganAbilities
@@ -1359,6 +1360,7 @@ ParamDef/Name/lib_ABFE498B_79560C9B=player
 ParamDef/Name/lib_ABFE498B_79C9AABA=player
 ParamDef/Name/lib_ABFE498B_7A28E737=player
 ParamDef/Name/lib_ABFE498B_7A34EFEB=player
+ParamDef/Name/lib_ABFE498B_7A7CE6CA=player
 ParamDef/Name/lib_ABFE498B_7ABEE1FA=player
 ParamDef/Name/lib_ABFE498B_7B0E9955=player
 ParamDef/Name/lib_ABFE498B_7BFE65D1=player

From a073115e75f3f0cf3528c083173f1ec4c3a0a309 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 17:38:36 -0400
Subject: [PATCH 12/34] infested siege tank range upgrade and base range nerf

---
 .../Base.SC2Data/GameData/ButtonData.xml                     | 5 +++++
 .../Base.SC2Data/GameData/RequirementData.xml                | 4 ++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml            | 4 ++++
 .../Base.SC2Data/GameData/UnitData.xml                       | 2 ++
 .../Base.SC2Data/GameData/UpgradeData.xml                    | 5 +++++
 .../Base.SC2Data/GameData/WeaponData.xml                     | 2 +-
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index a3e45f8dc..6efced2f6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6633,4 +6633,9 @@
         <TooltipFlags index="ShowLevel" value="0"/>
         <EditorCategories value="Race:Zerg"/>
     </CButton>
+    <CButton id="AP_InfestedSiegeTankSeismicSonar">
+        <Icon value="Assets\Textures\btn-upgrade-zerg-peristalsis.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-zerg-peristalsis.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index dd396986e..70555a242 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4084,4 +4084,8 @@
         <EditorCategories value="Race:Terran,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountWidowMineDemolitionArmamentsCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveInfestedSiegeTankSeismicSonar">
+        <EditorCategories value="Race:Terran,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountInfestedSiegeTankSeismicSonarCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 894245822..c25f3e0b1 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6725,4 +6725,8 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_WidowMineDemolitionArmaments" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountInfestedSiegeTankSeismicSonarCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_InfestedSiegeTankSeismicSonar" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 0afa81245..0dafc8917 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26731,6 +26731,7 @@
             <LayoutButtons Face="AP_StukovInfestedSiegeTankRoot" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankRoot,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankAmmo" Type="Passive" Row="2" Column="4"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankDeepTunnel" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankDeepTunnel,Execute" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_InfestedSiegeTankSeismicSonar" Type="Passive" Requirements="AP_HaveInfestedSiegeTankSeismicSonar" Row="1" Column="2"/>
             <LayoutButtons Face="AP_AutomatedMitosis" Type="Passive" Requirements="AP_HaveAutomatedMitosis" Row="1" Column="3"/>
             <LayoutButtons Face="AP_AcidicEnzymes" Type="Passive" Requirements="AP_HaveAcidicEnzymes" Row="1" Column="4"/>
         </CardLayouts>
@@ -26809,6 +26810,7 @@
             <LayoutButtons Face="AP_StukovInfestedSiegeTankUproot" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankUproot,Execute" Row="2" Column="1"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankAmmo" Type="Passive" Row="2" Column="4"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankDeepTunnel" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankDeepTunnel,Execute" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_InfestedSiegeTankSeismicSonar" Type="Passive" Requirements="AP_HaveInfestedSiegeTankSeismicSonar" Row="1" Column="2"/>
             <LayoutButtons Face="AP_AutomatedMitosis" Type="Passive" Requirements="AP_HaveAutomatedMitosis" Row="1" Column="3"/>
             <LayoutButtons Face="AP_AcidicEnzymes" Type="Passive" Requirements="AP_HaveAcidicEnzymes" Row="1" Column="4"/>
         </CardLayouts>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 040b762cf..0ff5f3eb5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15882,4 +15882,9 @@
     <CUpgrade id="AP_WidowMineDemolitionArmaments">
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
     </CUpgrade>
+    <CUpgrade id="AP_InfestedSiegeTankSeismicSonar">
+        <EffectArray Reference="Weapon,AP_StukovInfestedSiegeTankImpalerTentacle,Range" Value="1"/>
+        <EffectArray Reference="Weapon,AP_StukovInfestedSiegeTankImpalerTentacle,MinScanRange" Value="1"/>
+        <EffectArray Reference="Weapon,AP_StukovInfestedSiegeTank,Range" Value="3"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index 6a33a5128..27a4524f5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -3502,7 +3502,7 @@
         <Icon value="Assets\Textures\btn-upgrade-zerg-meleeattacks-level0.dds"/>
         <DisplayEffect value="AP_SIVolatileInfestedExplodeDummyLinks"/>
         <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <Range value="18"/>
+        <Range value="12"/>
         <MinimumRange value="2"/>
         <Period value="3"/>
         <Effect value="AP_StukovInfestedSiegeTankHunterVolatileBurstCU"/>

From 385636f689d13e68c6dd532ecaad19ea464f2688 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 17:44:41 -0400
Subject: [PATCH 13/34] add triggers for infested siege tank range upgrade

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  8 +++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |  1 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 39 ++++++++++++++++++-
 .../LocalizedData/TriggerStrings.txt          |  2 +
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 9d4610cc8..40f6456f8 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1008,7 +1008,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Zerg_GuardianPropellantSacs, //25
         libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores, //26
         libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury, //27
-        ap_triggers_PlayerConsumer_sig, //28
+        libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar, //28
         ap_triggers_PlayerConsumer_sig  //29
     );
 }
@@ -6112,6 +6112,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel (int lp_player)
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SISiegeTankDeepTunnel", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedSiegeTankSeismicSonar", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 423fa8d1d..278f5021f 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -644,6 +644,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_SIBunkerCargo (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ProgressiveAutomatedMitosis (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Zerg_AcidicEnzymes (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_CausticMucus (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index b7dcb9fb2..58a010a00 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -3627,7 +3627,7 @@
                     libABFE498B_gf_AP_Triggers_Zerg_GuardianPropellantSacs, //25
                     libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores, //26
                     libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury, //27
-                    ap_triggers_PlayerConsumer_sig, //28
+                    libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar, //28
                     ap_triggers_PlayerConsumer_sig  //29
                 );
             </ScriptCode>
@@ -48660,6 +48660,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="C5881300"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="677B4BD6"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="55DF3B98"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="8DFF7275"/>
         </Element>
         <Element Type="FunctionDef" Id="C5881300">
             <FlagAction/>
@@ -48855,6 +48856,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="8DFF7275">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="C8D22D0E"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C4AB3F30"/>
+        </Element>
+        <Element Type="ParamDef" Id="C8D22D0E">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="E9EFB110"/>
+        </Element>
+        <Element Type="Param" Id="E9EFB110">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="C4AB3F30">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C9BB7706"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1193EB6B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9C378D0D"/>
+        </Element>
+        <Element Type="Param" Id="C9BB7706">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="C8D22D0E"/>
+        </Element>
+        <Element Type="Param" Id="1193EB6B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="9C378D0D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_InfestedSiegeTankSeismicSonar</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="FCEAA835">
             <Item Type="FunctionDef" Library="ABFE498B" Id="8B558240"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="1FC24D9E"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index e4e5dd46c..b376396cd 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -562,6 +562,7 @@ FunctionDef/Name/lib_ABFE498B_8B9C98A7=AP_Triggers_Terran_unlockBattlecruiserTac
 FunctionDef/Name/lib_ABFE498B_8C0E7C5A=AP_Triggers_Terran_unlockHellionHellbatAspect
 FunctionDef/Name/lib_ABFE498B_8C81657A=AP_Triggers_Protoss_unlockTaldarimMothership
 FunctionDef/Name/lib_ABFE498B_8C93D499=AP_Triggers_Zerg_unlockFlyerCarapace
+FunctionDef/Name/lib_ABFE498B_8DFF7275=AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar
 FunctionDef/Name/lib_ABFE498B_8EB825B4=AP_Triggers_Zerg_SwarmQueenBioMechanicalTransfusion
 FunctionDef/Name/lib_ABFE498B_8EC2DB6F=AP_Triggers_unlockTerranArmory2
 FunctionDef/Name/lib_ABFE498B_8F425441=AP_Triggers_Terran_unlockSkibisAngel
@@ -1609,6 +1610,7 @@ ParamDef/Name/lib_ABFE498B_C7A9FA0F=player
 ParamDef/Name/lib_ABFE498B_C7B956EC=player
 ParamDef/Name/lib_ABFE498B_C82FF294=player
 ParamDef/Name/lib_ABFE498B_C8315A2A=player
+ParamDef/Name/lib_ABFE498B_C8D22D0E=player
 ParamDef/Name/lib_ABFE498B_C900B0F6=player
 ParamDef/Name/lib_ABFE498B_C90A9AAB=player
 ParamDef/Name/lib_ABFE498B_C9354091=player

From 4eb99234b60114cc58fe036371ba5323ea22085b Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 17:58:55 -0400
Subject: [PATCH 14/34] for infested banshee, move +2 range while cloaked to
 own upgrade

---
 .../Base.SC2Data/GameData/BehaviorData.xml               | 9 ++++++++-
 .../Base.SC2Data/GameData/ButtonData.xml                 | 4 ++++
 .../Base.SC2Data/GameData/RequirementData.xml            | 4 ++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml        | 4 ++++
 .../Base.SC2Data/GameData/UnitData.xml                   | 2 ++
 .../Base.SC2Data/GameData/UpgradeData.xml                | 3 +++
 .../enUS.SC2Data/LocalizedData/GameStrings.txt           | 2 ++
 7 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 7b36d5b65..158505fba 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -7710,7 +7710,7 @@
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
         <RemoveValidatorArray value="CanSpendEnergy"/>
         <RemoveValidatorArray value="hasEnergy"/>
-        <Modification WeaponRange="2" WeaponScanBonus="2">
+        <Modification>
             <StateFlags index="Cloak" value="1"/>
             <VitalRegenArray index="Energy" value="-1.4765"/>
         </Modification>
@@ -9188,4 +9188,11 @@
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_InfestedBansheeAdvancedOptics">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <Requirements value="AP_HaveInfestedBansheeAdvancedOptics"/>
+        <DisableValidatorArray value="AP_IsCloaked"/>
+        <Modification WeaponRange="2" WeaponScanBonus="2"/>
+    </CBehaviorBuff>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 6efced2f6..e8f776bc7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6638,4 +6638,8 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-zerg-peristalsis.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CButton>
+    <CButton id="AP_InfestedBansheeAdvancedOptics">
+        <Icon value="Assets\Textures\btn-ability-terran-detectionconedebuff.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-terran-detectionconedebuff.dds"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 70555a242..34365b3bc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4088,4 +4088,8 @@
         <EditorCategories value="Race:Terran,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountInfestedSiegeTankSeismicSonarCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveInfestedBansheeAdvancedOptics">
+        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeInfestedBansheeAdvancedOpticsCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index c25f3e0b1..4d9d61695 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6729,4 +6729,8 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_InfestedSiegeTankSeismicSonar" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeInfestedBansheeAdvancedOpticsCompleteOnly">
+        <Count Link="AP_InfestedBansheeAdvancedOptics" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 0dafc8917..05a752b0e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -27169,6 +27169,7 @@
         <AbilArray Link="move"/>
         <AbilArray Link="AP_InfestedBansheeCloakingField"/>
         <AbilArray Link="AP_BurrowStukovInfestedBansheeDown"/>
+        <BehaviorArray Link="AP_InfestedBansheeAdvancedOptics"/>
         <WeaponArray Link="AP_StukovInfestedBacklashRockets"/>
         <CardLayouts>
             <LayoutButtons Face="AP_MoveChampions" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
@@ -27181,6 +27182,7 @@
             <LayoutButtons Face="AP_StukovInfestedBansheeInfestedLife" Type="Passive" Requirements="AP_HaveStukovInfestedBansheeInfestedLife" Row="1" Column="1"/>
             <LayoutButtons Face="AP_CloakOnBanshee_Stukov" Type="AbilCmd" AbilCmd="AP_InfestedBansheeCloakingField,On" Row="2" Column="0"/>
             <LayoutButtons Face="CloakOff" Type="AbilCmd" AbilCmd="AP_InfestedBansheeCloakingField,Off" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_InfestedBansheeAdvancedOptics" Type="Passive" Requirements="AP_HaveInfestedBansheeAdvancedOptics" Row="1" Column="2"/>
         </CardLayouts>
         <Radius value="0.75"/>
         <SeparationRadius value="0.75"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 0ff5f3eb5..347ce50d8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15887,4 +15887,7 @@
         <EffectArray Reference="Weapon,AP_StukovInfestedSiegeTankImpalerTentacle,MinScanRange" Value="1"/>
         <EffectArray Reference="Weapon,AP_StukovInfestedSiegeTank,Range" Value="3"/>
     </CUpgrade>
+    <CUpgrade id="AP_InfestedBansheeAdvancedOptics">
+        <AffectedUnitArray value="AP_StukovInfestedBanshee"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 6417c8589..ebe5ab353 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1267,6 +1267,7 @@ Button/Name/AP_ImprovedSiegeMode=Advanced Siege Tech
 Button/Name/AP_IncineratorNozzles=Incinerator Gauntlets
 Button/Name/AP_InfernalPreIgniter=Thermite Filaments
 Button/Name/AP_InfestationPit=Mutate into Infestation Pit
+Button/Name/AP_InfestedBansheeAdvancedOptics=Advanced Targeting Optics
 Button/Name/AP_InfestedDuskWing=Infested Dusk Wings
 Button/Name/AP_InfestedMedic=Infested Medics
 Button/Name/AP_InfestedSiegeBreaker=Infested Siege Breakers
@@ -2550,6 +2551,7 @@ Button/Tooltip/AP_IncineratorNozzles=Increases the Firebat's damage radius by 40
 Button/Tooltip/AP_InfernalPreIgniter=Hellions do an additional 10 damage to light armor.
 Button/Tooltip/AP_InfestationPit=<c val="ffff8a">Enables:</c><n/>- Infestors from Larvae<n/>- Swarm Hosts from Larvae
 Button/Tooltip/AP_InfestedAbomination=Aberrations are durable units that deal heavy damage.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
+Button/Tooltip/AP_InfestedBansheeAdvancedOptics=Increases Infested Banshee attack range by 2 while cloaked.
 Button/Tooltip/AP_InfestedDuskWing=Request 2 Infested Dusk Wings.<n/><n/>Tactical-strike aircraft.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_InfestedMedic=Request 2 Infested Medics.<n/><n/>Support trooper. Heals nearby biological units.
 Button/Tooltip/AP_InfestedSiegeBreaker=Request 2 Infested Siege Breakers.<n/><n/>Heavy tank. Long-range artillery in Siege Mode.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>

From c0c25f9cf440cfc3e8525c9a49227baa3ed51373 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 18:02:28 -0400
Subject: [PATCH 15/34] remvoe range 2 text on base cloak for infested banshee

---
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index ebe5ab353..5cbfa50c3 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -684,7 +684,7 @@ Behavior/Tooltip/AP_ArbiterMPCloakFieldEffect=This unit is cloaked unless reveal
 Behavior/Tooltip/AP_AscendantSacrificeSelfBuff=This unit has increased shields and its abilities deal increased damage.
 Behavior/Tooltip/AP_BansheeCloak=This unit is cloaked and will only be revealed by detectors or effects.
 Behavior/Tooltip/AP_BansheeCloakCrossSpectrumDampeners=This unit is cloaked and will only be revealed by detectors or effects.
-Behavior/Tooltip/AP_BansheeCloak_Stukov=This unit is cloaked and will only be revealed by detectors or effects. Its weapon range is also increased by 2.
+Behavior/Tooltip/AP_BansheeCloak_Stukov=This unit is cloaked and will only be revealed by detectors or effects.
 Behavior/Tooltip/AP_BattlecruiserBonusRange=+<d ref="Behavior,AP_BattlecruiserBonusRange,Modification.RangedWeaponRange"/> weapon range.
 Behavior/Tooltip/AP_BattlecruiserMengskBehemothReactorIndicator=Battlecruiser special abilities require 25 less energy to cast. Pride of Augustrad cooldown-based ability cooldowns are 20% shorter.
 Behavior/Tooltip/AP_Charging=This Zealot is charging, allowing it to quickly close the distance with its target.

From 088f2bc6e02a635315150bbb44130298385f9bda Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 18:11:03 -0400
Subject: [PATCH 16/34] add bio tags to infested mercs

---
 .../Base.SC2Data/GameData/UnitData.xml                         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 05a752b0e..4af966204 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -4518,6 +4518,7 @@
         <LifeRegenRate value="0.2734"/>
         <LifeArmorName value="Unit/LifeArmorName/ZergGroundArmor"/>
         <ShieldArmorName value="Unit/ShieldArmorName/ZergWildMutation"/>
+        <Attributes index="Biological" value="1"/>
         <AbilArray index="3" Link="AP_InfestedSiegeBreakerSiege"/>
         <!--        <AbilArray index="4" Link="AP_MercSiegeTankJumpJet"/>-->
         <BehaviorArray Link="AP_RegeneratorRegenBioSteelL1L2"/>
@@ -4534,6 +4535,7 @@
         <LifeRegenRate value="0.2734"/>
         <LifeArmorName value="Unit/LifeArmorName/ZergGroundArmor"/>
         <ShieldArmorName value="Unit/ShieldArmorName/ZergWildMutation"/>
+        <Attributes index="Biological" value="1"/>
         <AbilArray index="2" Link="AP_InfestedSiegeBreakerUnsiege"/>
         <!--        <AbilArray index="3" Link="AP_MercSiegeTankSiegedJumpJet"/>-->
         <AbilArray index="5" Link="AP_InfestedSiegeBreakerSiegedTransportableMorph"/>
@@ -4811,6 +4813,7 @@
         <Race value="Zerg"/>
         <LifeRegenRate value="0.2734"/>
         <LifeArmorName value="Unit/LifeArmorName/ZergAirArmor"/>
+        <Attributes index="Biological" value="1"/>
         <ShieldArmorName value="Unit/ShieldArmorName/ZergWildMutation"/>
         <BehaviorArray Link="AP_RegeneratorRegenBioSteelL1L2"/>
         <BehaviorArray Link="AP_RegeneratorRegenBioSteelL3"/>

From 373d7f55722dd983249e870d68ba2ae67b08e2fa Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 18:15:52 -0400
Subject: [PATCH 17/34] for infested siege tank main gun attack, remove
 anti-baneling ai response

---
 Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 4af966204..d8b1b6a8a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26946,7 +26946,6 @@
         <SubgroupPriority value="8"/>
         <MinimapRadius value="0.375"/>
         <EditorCategories value="ObjectType:Unit,ObjectFamily:FactionInfested"/>
-        <TacticalAI value="Baneling"/>
         <LeaderAlias value="AP_InfestedCivilian"/>
         <GlossaryStrongArray value="Marine"/>
         <GlossaryWeakArray value="Bunker"/>

From 84ee9f7b140124c8e452108b2b7e36c38f4d161b Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 18:30:17 -0400
Subject: [PATCH 18/34] update infested units race to zerg

---
 .../Base.SC2Data/GameData/UnitData.xml         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index d8b1b6a8a..7d33e9441 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26681,7 +26681,7 @@
     </CUnit>
     <CUnit id="AP_StukovInfestedSiegeTankUprooted">
         <DeathRevealRadius value="3"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="PreventDestroy" value="1"/>
         <FlagArray index="UseLineOfSight" value="1"/>
@@ -26765,7 +26765,7 @@
     <CUnit id="AP_StukovInfestedSiegeTank">
         <DeathRevealRadius value="3"/>
         <Facing value="45"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="Turnable" value="0"/>
         <FlagArray index="PreventDestroy" value="1"/>
@@ -26877,7 +26877,7 @@
     </CUnit>
     <CUnit id="AP_SIVolatileInfested">
         <DeathRevealRadius value="3"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="UseLineOfSight" value="1"/>
         <PlaneArray index="Ground" value="1"/>
@@ -26956,7 +26956,7 @@
     </CUnit>
     <CUnit id="AP_SIVolatileInfestedBurrowed">
         <DeathRevealRadius value="3"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="UseLineOfSight" value="1"/>
         <FlagArray index="Cloaked" value="1"/>
@@ -27003,7 +27003,7 @@
     </CUnit>
     <CUnit id="AP_StukovInfestedDiamondBack">
         <DeathRevealRadius value="3"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="UseLineOfSight" value="1"/>
         <FlagArray index="ArmySelect" value="1"/>
@@ -27134,7 +27134,7 @@
     </CUnit>
     <CUnit id="AP_StukovInfestedBanshee">
         <DeathRevealRadius value="3"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="PreventDestroy" value="1"/>
         <FlagArray index="UseLineOfSight" value="1"/>
@@ -27205,7 +27205,7 @@
     </CUnit>
     <CUnit id="AP_StukovInfestedBansheeBurrowed">
         <DeathRevealRadius value="3"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="PreventDestroy" value="1"/>
         <FlagArray index="UseLineOfSight" value="1"/>
@@ -27276,7 +27276,7 @@
     </CUnit>
     <CUnit id="AP_SILiberator">
         <DeathRevealRadius value="3"/>
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <Mob value="Campaign"/>
         <FlagArray index="UseLineOfSight" value="1"/>
         <FlagArray index="ArmySelect" value="1"/>
@@ -27342,7 +27342,7 @@
         <EditorCategories value="ObjectType:Projectile,ObjectFamily:Campaign"/>
     </CUnit>
     <CUnit id="AP_SILiberatorCloud">
-        <Race value="InfT"/>
+        <Race value="Zerg"/>
         <FlagArray index="Unselectable" value="1"/>
         <FlagArray index="Untargetable" value="1"/>
         <FlagArray index="Invulnerable" value="1"/>

From 9eb73950c009402d1a28e265fdf05ca42cd02253 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 18:48:07 -0400
Subject: [PATCH 19/34] add infested marines as valid ammo for infested siege
 tanks

---
 .../Base.SC2Data/GameData/EffectData.xml             | 10 +++++-----
 .../Base.SC2Data/GameData/ValidatorData.xml          | 12 ++++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 0ee694860..c00f075e1 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -18711,20 +18711,20 @@
     </CEffectEnumArea>
     <CEffectSet id="AP_StukovInfestedSiegeTankAmmoRestockLMSet">
         <ValidatorArray value="TargetIsGround"/>
-        <ValidatorArray value="AP_IsSIInfestedTrooperCombineOrIsSIInfestedCivilianOrIsAP_InfestorTerranCombine"/>
+        <ValidatorArray value="AP_IsSIInfestedTrooperCombineOrIsSIInfestedCivilianOrIsAP_InfestorTerranOrIsSIInfestedMarineCombineCombine"/>
         <ValidatorArray value="AP_StukovInfestedSiegeTankAmmoLT8"/>
         <!--ValidatorArray value="AP_NoInfestedCivDisableJump"/--> <!--disabled since this unit doesn't exist yet-->
-        <ValidatorArray value="NoYoink"/>
+        <ValidatorArray value="AP_NoYoink"/>
         <EditorCategories value="Race:Zerg"/>
         <EffectArray value="AP_StukovInfestedSiegeTankAmmoRestock"/>
         <EffectArray value="KillMissile"/>
-        <EffectArray value="YoinkMarker"/>
+        <EffectArray value="AP_YoinkMarker"/>
     </CEffectSet>
     <CEffectLaunchMissile id="AP_StukovInfestedSiegeTankAmmoRestock">
         <EditorCategories value="Race:Zerg"/>
-        <ValidatorArray value="AP_IsSIInfestedTrooperCombineOrIsSIInfestedCivilianOrIsAP_InfestorTerranCombine"/>
+        <ValidatorArray value="AP_IsSIInfestedTrooperCombineOrIsSIInfestedCivilianOrIsAP_InfestorTerranOrIsSIInfestedMarineCombineCombine"/>
         <ValidatorArray value="AP_StukovInfestedSiegeTankAmmoLT8"/>
-        <ValidatorArray value="NoYoink"/>
+        <ValidatorArray value="AP_NoYoink"/>
         <FinishEffect value="AP_StukovInfestedSiegeTankAmmoRestockImpact"/>
         <Flags index="ValidateAbil" value="0"/>
         <Flags index="ValidateBenign" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index a715a26aa..4c60ac404 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -5818,6 +5818,9 @@
     <CValidatorUnitType id="AP_IsSIInfestedMarine">
         <Value value="AP_SIInfestedMarine"/>
     </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsSIInfestedMarineBurrowed">
+        <Value value="AP_SIInfestedMarineBurrowed"/>
+    </CValidatorUnitType>
     <CValidatorUnitType id="AP_IsSIInfestedTrooper">
         <Value value="AP_SIInfestedTrooper"/>
     </CValidatorUnitType>
@@ -6201,10 +6204,15 @@
         <Value value="8"/>
         <Behavior value="AP_StukovInfestedSiegeTankAmmo"/>
     </CValidatorUnitCompareBehaviorCount>
-    <CValidatorCombine id="AP_IsSIInfestedTrooperCombineOrIsSIInfestedCivilianOrIsAP_InfestorTerranCombine">
+    <CValidatorCombine id="AP_IsSIInfestedTrooperCombineOrIsSIInfestedCivilianOrIsAP_InfestorTerranOrIsSIInfestedMarineCombineCombine">
         <CombineArray value="AP_IsSIInfestedCivilianCombine"/>
         <CombineArray value="AP_IsSIInfestedTrooperCombine"/>
         <CombineArray value="AP_IsAP_InfestorTerranCombine"/>
+        <CombineArray value="AP_IsSIInfestedMarineCombine"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_IsSIInfestedMarineCombine">
+        <CombineArray value="AP_IsSIInfestedMarine"/>
+        <CombineArray value="AP_IsSIInfestedMarineBurrowed"/>
     </CValidatorCombine>
     <CValidatorCombine id="AP_IsSIInfestedCivilianCombine">
         <CombineArray value="AP_IsSIInfestedCivilian"/>
@@ -6238,7 +6246,7 @@
         <CombineArray value="NotInvulnerable"/>
         <CombineArray value="NotDead"/>
         <CombineArray value="TargetIsGround"/>
-        <CombineArray value="NoYoink"/>
+        <CombineArray value="AP_NoYoink"/>
     </CValidatorCombine>
     <CValidatorUnitCompareSpeed id="AP_InfestedDiamondbackIsMoving">
         <Compare value="GT"/>

From 4971f92143625c71d27eeba30a3a5533d7387111 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 19:01:32 -0400
Subject: [PATCH 20/34] Add upgrade to allow tentacle attack while moving for
 infested siege tank

---
 .../Base.SC2Data/GameData/ButtonData.xml                      | 4 ++++
 .../Base.SC2Data/GameData/RequirementData.xml                 | 4 ++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml             | 4 ++++
 .../Base.SC2Data/GameData/UnitData.xml                        | 1 +
 .../Base.SC2Data/GameData/UpgradeData.xml                     | 3 +++
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                | 2 ++
 6 files changed, 18 insertions(+)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index e8f776bc7..008d84563 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6642,4 +6642,8 @@
         <Icon value="Assets\Textures\btn-ability-terran-detectionconedebuff.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-terran-detectionconedebuff.dds"/>
     </CButton>
+    <CButton id="AP_InfestedSiegeTankBalancedRoots">
+        <Icon value="Assets\Textures\btn-ability-zerg-creepteleport.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-zerg-creepteleport.dds"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 34365b3bc..63f0d4155 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4092,4 +4092,8 @@
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeInfestedBansheeAdvancedOpticsCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveInfestedSiegeTankBalancedRoots">
+        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeInfestedSiegeTankBalancedRootsCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 4d9d61695..c7dc44306 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6733,4 +6733,8 @@
         <Count Link="AP_InfestedBansheeAdvancedOptics" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeInfestedSiegeTankBalancedRootsCompleteOnly">
+        <Count Link="AP_InfestedSiegeTankBalancedRoots" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 7d33e9441..67fad78a8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26734,6 +26734,7 @@
             <LayoutButtons Face="AP_StukovInfestedSiegeTankRoot" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankRoot,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankAmmo" Type="Passive" Row="2" Column="4"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankDeepTunnel" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankDeepTunnel,Execute" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_InfestedSiegeTankBalancedRoots" Type="Passive" Requirements="AP_HaveInfestedSiegeTankBalancedRoots" Row="1" Column="1"/>
             <LayoutButtons Face="AP_InfestedSiegeTankSeismicSonar" Type="Passive" Requirements="AP_HaveInfestedSiegeTankSeismicSonar" Row="1" Column="2"/>
             <LayoutButtons Face="AP_AutomatedMitosis" Type="Passive" Requirements="AP_HaveAutomatedMitosis" Row="1" Column="3"/>
             <LayoutButtons Face="AP_AcidicEnzymes" Type="Passive" Requirements="AP_HaveAcidicEnzymes" Row="1" Column="4"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 347ce50d8..f81892412 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15890,4 +15890,7 @@
     <CUpgrade id="AP_InfestedBansheeAdvancedOptics">
         <AffectedUnitArray value="AP_StukovInfestedBanshee"/>
     </CUpgrade>
+    <CUpgrade id="AP_InfestedSiegeTankBalancedRoots">
+        <EffectArray Operation="Set" Reference="Weapon,AP_StukovInfestedSiegeTankImpalerTentacle,AllowedMovement" Value="Moving"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 5cbfa50c3..2c95d4f3e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1271,6 +1271,7 @@ Button/Name/AP_InfestedBansheeAdvancedOptics=Advanced Targeting Optics
 Button/Name/AP_InfestedDuskWing=Infested Dusk Wings
 Button/Name/AP_InfestedMedic=Infested Medics
 Button/Name/AP_InfestedSiegeBreaker=Infested Siege Breakers
+Button/Name/AP_InfestedSiegeTankBalancedRoots=Balanced Roots
 Button/Name/AP_InfestedTerrans=Infested Terran
 Button/Name/AP_Infestor=Morph to Infestor
 Button/Name/AP_InfestorConsumption=Consumption
@@ -2555,6 +2556,7 @@ Button/Tooltip/AP_InfestedBansheeAdvancedOptics=Increases Infested Banshee attac
 Button/Tooltip/AP_InfestedDuskWing=Request 2 Infested Dusk Wings.<n/><n/>Tactical-strike aircraft.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_InfestedMedic=Request 2 Infested Medics.<n/><n/>Support trooper. Heals nearby biological units.
 Button/Tooltip/AP_InfestedSiegeBreaker=Request 2 Infested Siege Breakers.<n/><n/>Heavy tank. Long-range artillery in Siege Mode.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
+Button/Tooltip/AP_InfestedSiegeTankBalancedRoots=Allows Infested Siege Tanks to attack with their Tentacle while moving.
 Button/Tooltip/AP_InfestedTerrans=Spawn an Infested Terran. Infested Terrans last <d ref="Behavior,AP_InfestedTerranTimedLife,Duration"/> seconds.
 Button/Tooltip/AP_Infestor=Infestation specialist. Can move while burrowed. Can use the Fungal Growth, Parasitic Domination, and Consumption abilities.<n/><n/><c val="ffff8a">Cannot attack.</c>
 Button/Tooltip/AP_InfestorConsumption=Drains up to 75 life from a friendly Zerg unit and gives the Infestor 2 energy for each point of life drained.

From 394594b3bb623fb8b1041c5f165346e8f2832b40 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 19:20:14 -0400
Subject: [PATCH 21/34] add infested siege tank upgrade trigger, for balanced
 roots, and add mutation_5 triggers for zerg

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  50 +++++
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   2 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 175 ++++++++++++++++++
 .../LocalizedData/TriggerStrings.txt          |   8 +-
 4 files changed, 234 insertions(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 40f6456f8..000145ced 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1013,6 +1013,46 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (int lp_player, int lp_bitAr
     );
 }
 
+void libABFE498B_gf_AP_Triggers_unlockZergMutation5 (int lp_player, int lp_bitArrayValue) {
+    // Automatic Variable Declarations
+    // Implementation
+    // Yeah, this must be done in Galaxy
+    ap_triggers_processBitsInBitArray(
+        lp_player,
+        lp_bitArrayValue,
+        libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots, // 0
+        ap_triggers_PlayerConsumer_sig, // 1
+        ap_triggers_PlayerConsumer_sig, // 2
+        ap_triggers_PlayerConsumer_sig, // 3
+        ap_triggers_PlayerConsumer_sig, // 4
+        ap_triggers_PlayerConsumer_sig, // 5
+        ap_triggers_PlayerConsumer_sig, // 6
+        ap_triggers_PlayerConsumer_sig, // 7
+        ap_triggers_PlayerConsumer_sig, // 8
+        ap_triggers_PlayerConsumer_sig, // 9
+        ap_triggers_PlayerConsumer_sig, // 10
+        ap_triggers_PlayerConsumer_sig, // 11
+        ap_triggers_PlayerConsumer_sig, // 12
+        ap_triggers_PlayerConsumer_sig, // 13
+        ap_triggers_PlayerConsumer_sig, // 14
+        ap_triggers_PlayerConsumer_sig, // 15
+        ap_triggers_PlayerConsumer_sig, // 16
+        ap_triggers_PlayerConsumer_sig, // 17
+        ap_triggers_PlayerConsumer_sig, // 18
+        ap_triggers_PlayerConsumer_sig, // 19
+        ap_triggers_PlayerConsumer_sig, // 20
+        ap_triggers_PlayerConsumer_sig, // 21
+        ap_triggers_PlayerConsumer_sig, // 22
+        ap_triggers_PlayerConsumer_sig, // 23
+        ap_triggers_PlayerConsumer_sig, // 24
+        ap_triggers_PlayerConsumer_sig, // 25
+        ap_triggers_PlayerConsumer_sig, // 26
+        ap_triggers_PlayerConsumer_sig, // 27
+        ap_triggers_PlayerConsumer_sig, // 28
+        ap_triggers_PlayerConsumer_sig  // 29
+    );
+}
+
 void libABFE498B_gf_AP_Triggers_unlockZergStrain (int lp_player, int lp_bitArrayValue) {
     // Automatic Variable Declarations
     // Implementation
@@ -6118,6 +6158,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar (int lp_playe
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedSiegeTankSeismicSonar", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedSiegeTankBalancedRoots", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -9072,6 +9118,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
     string lv_mutation2Value;
     string lv_mutation3Value;
     string lv_mutation4Value;
+    string lv_mutation5Value;
     string lv_strainValue;
     string lv_morphValue;
     string lv_upgradeValue;
@@ -9092,6 +9139,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
     lv_mutation2Value = "";
     lv_mutation3Value = "";
     lv_mutation4Value = "";
+    lv_mutation5Value = "";
     lv_strainValue = "";
     lv_morphValue = "";
     lv_upgradeValue = "";
@@ -9119,6 +9167,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
     lv_mutation3Value = StringWord(EventChatMessage(false), 13);
     lv_mutation4Value = StringWord(EventChatMessage(false), 14);
     lv_progressiveValue = StringWord(EventChatMessage(false), 15);
+    lv_mutation5Value = StringWord(EventChatMessage(false), 16);
     auto6CA7C5BB_g = lib5BD4895D_gv_aP_Core_affectedPlayers;
     lv_currentPlayer = -1;
     while (true) {
@@ -9163,6 +9212,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
         libABFE498B_gf_AP_Triggers_unlockZergMutation3(lv_currentPlayer, StringToInt(lv_mutation3Value));
         libABFE498B_gf_AP_Triggers_unlockZergMutation4(lv_currentPlayer, StringToInt(lv_mutation4Value));
         libABFE498B_gf_AP_Triggers_unlockZergProgressiveUpgrades(lv_currentPlayer, StringToInt(lv_progressiveValue));
+        libABFE498B_gf_AP_Triggers_unlockZergMutation5(lv_currentPlayer, StringToInt(lv_mutation5Value));
     }
     return true;
 }
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 278f5021f..6954db45f 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -138,6 +138,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation1 (int lp_player, int lp_bitAr
 void libABFE498B_gf_AP_Triggers_unlockZergMutation2 (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockZergMutation3 (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (int lp_player, int lp_bitArrayValue);
+void libABFE498B_gf_AP_Triggers_unlockZergMutation5 (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockZergStrain (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockZergMorph (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockZergKerriganAbilities (int lp_player, int lp_bitArrayValue);
@@ -645,6 +646,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_ProgressiveAutomatedMitosis (int lp_player,
 void libABFE498B_gf_AP_Triggers_Zerg_AcidicEnzymes (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_CausticMucus (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 58a010a00..22d37b564 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -896,6 +896,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="68320F99"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="8A270922"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="24CA60B3"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="C033C074"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6D87FA8D"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="AEF3E307"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="0D90E500"/>
@@ -3632,6 +3633,73 @@
                 );
             </ScriptCode>
         </Element>
+        <Element Type="FunctionDef" Id="C033C074">
+            <Identifier>AP_Triggers_unlockZergMutation5</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="9261322E"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="791787D9"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D8A06530"/>
+        </Element>
+        <Element Type="ParamDef" Id="9261322E">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="30D5EF86"/>
+        </Element>
+        <Element Type="Param" Id="30D5EF86">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="ParamDef" Id="791787D9">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="09B3F09F"/>
+        </Element>
+        <Element Type="Param" Id="09B3F09F">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="D8A06530">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000123"/>
+            <ScriptCode>
+                // Yeah, this must be done in Galaxy
+                ap_triggers_processBitsInBitArray(
+                    lp_player,
+                    lp_bitArrayValue,
+                    libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots, // 0
+                    ap_triggers_PlayerConsumer_sig, // 1
+                    ap_triggers_PlayerConsumer_sig, // 2
+                    ap_triggers_PlayerConsumer_sig, // 3
+                    ap_triggers_PlayerConsumer_sig, // 4
+                    ap_triggers_PlayerConsumer_sig, // 5
+                    ap_triggers_PlayerConsumer_sig, // 6
+                    ap_triggers_PlayerConsumer_sig, // 7
+                    ap_triggers_PlayerConsumer_sig, // 8
+                    ap_triggers_PlayerConsumer_sig, // 9
+                    ap_triggers_PlayerConsumer_sig, // 10
+                    ap_triggers_PlayerConsumer_sig, // 11
+                    ap_triggers_PlayerConsumer_sig, // 12
+                    ap_triggers_PlayerConsumer_sig, // 13
+                    ap_triggers_PlayerConsumer_sig, // 14
+                    ap_triggers_PlayerConsumer_sig, // 15
+                    ap_triggers_PlayerConsumer_sig, // 16
+                    ap_triggers_PlayerConsumer_sig, // 17
+                    ap_triggers_PlayerConsumer_sig, // 18
+                    ap_triggers_PlayerConsumer_sig, // 19
+                    ap_triggers_PlayerConsumer_sig, // 20
+                    ap_triggers_PlayerConsumer_sig, // 21
+                    ap_triggers_PlayerConsumer_sig, // 22
+                    ap_triggers_PlayerConsumer_sig, // 23
+                    ap_triggers_PlayerConsumer_sig, // 24
+                    ap_triggers_PlayerConsumer_sig, // 25
+                    ap_triggers_PlayerConsumer_sig, // 26
+                    ap_triggers_PlayerConsumer_sig, // 27
+                    ap_triggers_PlayerConsumer_sig, // 28
+                    ap_triggers_PlayerConsumer_sig  // 29
+                );
+            </ScriptCode>
+        </Element>
         <Element Type="FunctionDef" Id="6D87FA8D">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="18CC934D"/>
@@ -7084,6 +7152,7 @@
             <Variable Type="Variable" Library="ABFE498B" Id="B5DBA44D"/>
             <Variable Type="Variable" Library="ABFE498B" Id="4B49FCFE"/>
             <Variable Type="Variable" Library="ABFE498B" Id="441162DC"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="B49B1D86"/>
             <Variable Type="Variable" Library="ABFE498B" Id="6BF49009"/>
             <Variable Type="Variable" Library="ABFE498B" Id="5EAC1AF1"/>
             <Variable Type="Variable" Library="ABFE498B" Id="DF856303"/>
@@ -7106,6 +7175,7 @@
             <Action Type="FunctionCall" Library="ABFE498B" Id="39A1D521"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="5563AF49"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="7DA0DB35"/>
+            <Action Type="FunctionCall" Library="ABFE498B" Id="FF355541"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="6CA7C5BB"/>
         </Element>
         <Element Type="Variable" Id="CF581792">
@@ -7182,6 +7252,16 @@
         <Element Type="Param" Id="EE05F282">
             <ValueType Type="string"/>
         </Element>
+        <Element Type="Variable" Id="B49B1D86">
+            <Identifier>mutation5Value</Identifier>
+            <VariableType>
+                <Type Value="string"/>
+            </VariableType>
+            <Value Type="Param" Library="ABFE498B" Id="4D2A1B8E"/>
+        </Element>
+        <Element Type="Param" Id="4D2A1B8E">
+            <ValueType Type="string"/>
+        </Element>
         <Element Type="Variable" Id="6BF49009">
             <VariableType>
                 <Type Value="string"/>
@@ -7754,6 +7834,41 @@
             <Value>15</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionCall" Id="FF355541">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="3D7A3CC3"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="408DC311"/>
+        </Element>
+        <Element Type="Param" Id="3D7A3CC3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="B49B1D86"/>
+        </Element>
+        <Element Type="Param" Id="408DC311">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="EB6C96C7"/>
+        </Element>
+        <Element Type="FunctionCall" Id="EB6C96C7">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="A078FB65"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6ABB5132"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="87C30CBA"/>
+        </Element>
+        <Element Type="Param" Id="6ABB5132">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="655C865B"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="538B376B"/>
+        </Element>
+        <Element Type="FunctionCall" Id="538B376B">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000122"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="B77613DE"/>
+        </Element>
+        <Element Type="Param" Id="B77613DE">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000194"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000076"/>
+        </Element>
+        <Element Type="Param" Id="87C30CBA">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
+            <Value>16</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionCall" Id="6CA7C5BB">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="B525B112"/>
             <Parameter Type="Param" Library="ABFE498B" Id="708FBA75"/>
@@ -7772,6 +7887,7 @@
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C832F260"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="429FCA3C"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="DE89ACCD"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="BF8F9B5A"/>
         </Element>
         <Element Type="Param" Id="708FBA75">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="A4B226A9"/>
@@ -8336,6 +8452,28 @@
             <ParameterDef Type="ParamDef" Library="Ntve" Id="00000006"/>
             <Variable Type="Variable" Library="ABFE498B" Id="EF2C067D"/>
         </Element>
+        <Element Type="FunctionCall" Id="BF8F9B5A">
+            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="C033C074"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="DF50D5F0"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6CDEADEA"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="0AD8EF63"/>
+        </Element>
+        <Element Type="Param" Id="6CDEADEA">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="9261322E"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="CF581792"/>
+        </Element>
+        <Element Type="Param" Id="0AD8EF63">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="791787D9"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="BC62DA8F"/>
+        </Element>
+        <Element Type="FunctionCall" Id="BC62DA8F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000005"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BAB3087B"/>
+        </Element>
+        <Element Type="Param" Id="BAB3087B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000006"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="B49B1D86"/>
+        </Element>
         <Element Type="Trigger" Id="929D05B5">
             <Variable Type="Variable" Library="ABFE498B" Id="C6027B72"/>
             <Variable Type="Variable" Library="ABFE498B" Id="E337BA13"/>
@@ -48661,6 +48799,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="677B4BD6"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="55DF3B98"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="8DFF7275"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="B858F916"/>
         </Element>
         <Element Type="FunctionDef" Id="C5881300">
             <FlagAction/>
@@ -48892,6 +49031,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="B858F916">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="A83CA872"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="AC9BB941"/>
+        </Element>
+        <Element Type="ParamDef" Id="A83CA872">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="F0500CE1"/>
+        </Element>
+        <Element Type="Param" Id="F0500CE1">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="AC9BB941">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E4D08551"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5939EA44"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="84B296D0"/>
+        </Element>
+        <Element Type="Param" Id="E4D08551">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="A83CA872"/>
+        </Element>
+        <Element Type="Param" Id="5939EA44">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="84B296D0">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_InfestedSiegeTankBalancedRoots</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="FCEAA835">
             <Item Type="FunctionDef" Library="ABFE498B" Id="8B558240"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="1FC24D9E"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index b376396cd..07460b95a 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -692,6 +692,7 @@ FunctionDef/Name/lib_ABFE498B_B75FC8D4=AP_Triggers_Terran_unlockGoliathOptimized
 FunctionDef/Name/lib_ABFE498B_B7CFB995=AP_Triggers_Zerg_unlockHive
 FunctionDef/Name/lib_ABFE498B_B7D3966F=AP_Triggers_Terran_unlockBattlecruiserCloak
 FunctionDef/Name/lib_ABFE498B_B7EB5F27=AP_Triggers_Zerg_BanelingTunnelingJaws
+FunctionDef/Name/lib_ABFE498B_B858F916=AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots
 FunctionDef/Name/lib_ABFE498B_B862B471=AP_Triggers_Zerg_unlockInfestedBanshee
 FunctionDef/Name/lib_ABFE498B_B94226F1=AP_Triggers_Terran_unlockGoliath
 FunctionDef/Name/lib_ABFE498B_B9938D8D=AP_Triggers_Protoss_unlockHighTemplarSignifierUnshackledPisonicStorm
@@ -718,6 +719,7 @@ FunctionDef/Name/lib_ABFE498B_BF94715F=AP_Triggers_Zerg_BroodLordSplitterMitosis
 FunctionDef/Name/lib_ABFE498B_BFFD96F7=AP_Triggers_Protoss_unlockGuardianShell
 FunctionDef/Name/lib_ABFE498B_C015CC91=AP_Triggers_Protoss_unlockTimeStop
 FunctionDef/Name/lib_ABFE498B_C01D4135=AP_Triggers_Protoss_unlockWrathwalkerEyeOfWrath
+FunctionDef/Name/lib_ABFE498B_C033C074=AP_Triggers_unlockZergMutation5
 FunctionDef/Name/lib_ABFE498B_C0A60783=AP_Triggers_Terran_unlockSkyFury
 FunctionDef/Name/lib_ABFE498B_C159FECF=AP_Triggers_Terran_unlockValkyrieShapedHull
 FunctionDef/Name/lib_ABFE498B_C263B8A9=AP_Triggers_Zerg_unlockFlyerAttacks
@@ -1356,6 +1358,7 @@ ParamDef/Name/lib_ABFE498B_78ACF401=player
 ParamDef/Name/lib_ABFE498B_78AF9293=player
 ParamDef/Name/lib_ABFE498B_78BCF32F=player
 ParamDef/Name/lib_ABFE498B_790EC00B=player
+ParamDef/Name/lib_ABFE498B_791787D9=bitArrayValue
 ParamDef/Name/lib_ABFE498B_79557DC7=player
 ParamDef/Name/lib_ABFE498B_79560C9B=player
 ParamDef/Name/lib_ABFE498B_79C9AABA=player
@@ -1446,6 +1449,7 @@ ParamDef/Name/lib_ABFE498B_917844F6=bitArrayValue
 ParamDef/Name/lib_ABFE498B_91F08C0F=player
 ParamDef/Name/lib_ABFE498B_9227C83E=player
 ParamDef/Name/lib_ABFE498B_92406FA7=player
+ParamDef/Name/lib_ABFE498B_9261322E=player
 ParamDef/Name/lib_ABFE498B_92FC3C37=player
 ParamDef/Name/lib_ABFE498B_930C98C2=player
 ParamDef/Name/lib_ABFE498B_934A2B71=player
@@ -1507,6 +1511,7 @@ ParamDef/Name/lib_ABFE498B_A63C9FFD=player
 ParamDef/Name/lib_ABFE498B_A6D0AA33=player
 ParamDef/Name/lib_ABFE498B_A70E77FD=player
 ParamDef/Name/lib_ABFE498B_A81F6927=player
+ParamDef/Name/lib_ABFE498B_A83CA872=player
 ParamDef/Name/lib_ABFE498B_A87063A8=player
 ParamDef/Name/lib_ABFE498B_A8748FC8=player
 ParamDef/Name/lib_ABFE498B_A894C1BA=player
@@ -1873,7 +1878,7 @@ Variable/Name/lib_ABFE498B_42191271=storyLevels
 Variable/Name/lib_ABFE498B_4222AFEB=AP_Triggers_MapConfig_MISSION_NOT_PROTOSS
 Variable/Name/lib_ABFE498B_42A609D9=unit
 Variable/Name/lib_ABFE498B_42FE32E7=armory5Value
-Variable/Name/lib_ABFE498B_441162DC=mutation3Value 2
+Variable/Name/lib_ABFE498B_441162DC=mutation4Value
 Variable/Name/lib_ABFE498B_45C52620=currentUnit
 Variable/Name/lib_ABFE498B_49094D88=AP_Triggers_Protoss_has_Oracle
 Variable/Name/lib_ABFE498B_4941F6D9=warCouncilValue
@@ -1957,6 +1962,7 @@ Variable/Name/lib_ABFE498B_ADBE383E=currentUnit
 Variable/Name/lib_ABFE498B_B07034E6=AP_Triggers_Terran_hasCyclone
 Variable/Name/lib_ABFE498B_B084529D=AP_Triggers_Protoss_has_ColossusPurifier
 Variable/Name/lib_ABFE498B_B4528C5D=gameSpeed
+Variable/Name/lib_ABFE498B_B49B1D86=mutation5Value
 Variable/Name/lib_ABFE498B_B5DBA44D=mutation2Value
 Variable/Name/lib_ABFE498B_B9F3D4F1=index
 Variable/Name/lib_ABFE498B_BAC5A403=AP_Triggers_Protoss_has_Skirmisher

From ebd09f7eba951f9183664716959275564ceb8f30 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 20:42:19 -0400
Subject: [PATCH 22/34] infested diamondback baseline nerfs, and some of the
 power moved to new upgrades

---
 .../btn-upgrade-zerg-concentrated-spew.dds      | Bin 0 -> 5904 bytes
 .../Base.SC2Data/GameData/AbilData.xml          |   6 +++---
 .../Base.SC2Data/GameData/ButtonData.xml        |   8 ++++++++
 .../Base.SC2Data/GameData/EffectData.xml        |   6 +++---
 .../Base.SC2Data/GameData/RequirementData.xml   |  12 ++++++++++++
 .../GameData/RequirementNodeData.xml            |  12 ++++++++++++
 .../Base.SC2Data/GameData/UnitData.xml          |   2 ++
 .../Base.SC2Data/GameData/UpgradeData.xml       |  16 ++++++++++++++--
 .../Base.SC2Data/GameData/WeaponData.xml        |   4 ++--
 .../enUS.SC2Data/LocalizedData/GameStrings.txt  |   6 +++++-
 10 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-upgrade-zerg-concentrated-spew.dds

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-upgrade-zerg-concentrated-spew.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-upgrade-zerg-concentrated-spew.dds
new file mode 100644
index 0000000000000000000000000000000000000000..5d0b3330910a02407051c7fd99981fdb06e1a619
GIT binary patch
literal 5904
zcmaKw3s75EddH6h*b*|~b|!4JeeD&NY{{$^;TbikGmiDZDas~O5&I&Uq3D5~0NKp|
zo=#-hF_JJgg7L;yN}b5wSxJ~y7Ga%<Bd6=y3j+MWusfNxuajx*R06Zh+I7cGM;nF!
zx8Id?j_9;g%?0Mich0%@{?GS1s;k>eA4LdlrbOsf_{;yC{to<tj{tuD%KVx|U01ia
zSzMI;-~acE24gY&)Y<lF|IcyM|NgHKnS*k3kWSMPsjyU1E#^7$yvtdWrmHTku@avD
z^^u^Y!&SppXm4aWC>Olxcj@kblThdEn?!S?3fHe%U*Cs0;P)F^J}aNia;O-+=}Bu^
zZB{047r1m0>2gb+gT*LK`=}l}n_CZ9rt(p2W>mN(d;d*Hpo&QCJ)ULEKFWzKdc7XA
zUgShbC=_F+MKUxHkHyOJ^WS=i5W^<aIToQdmaY*Cz2S1+E?0?r=O+Bk-&`uq+CxQ}
zse6V&hKq+c@%Fck^2%#YSC7Z-79sIZz2eZnC#62Bv}&B=!2W3F?3Sc5Dc!xB<GAO|
zt{^=B4QHk5wXVCX+zVzS&$kCIG$_WN>M$=2L^O{*55B=X(w?MSn;IETnj6pS@vOzl
za^KCdpvFfrAP@J)IqttKt6`Yy67ElOd|&|hUB?9Xr#Y6XlC;g;*~$G`jw4bB<%SRU
zy&Us;iQ&V^a=hiYdJ)46X))J7Yz2Lgm)n}NzxoH+r&iDp^V{nSbL==xuNIlVmLCyr
zn|T^Oms)Cbi_zYlians$N2&d`7Q0o90_S7mP@9iJqSC5M9Jl!wrzLP5Z}3q=6^a`i
z2l~SGa<{PN{*a;!^KE}b+3&L5!)!7;sHyH|E9QvQOF3+fLzo5NFNs~CPkz0bsgwpD
zm+;4nzV@OCH<|w^7&YiSo0{=>UN4ZR33F1a7cDO@docgw`!wjoYB6tTQ_7M+bP4k&
zHsu+Rs1uk!UN2!4+sB?_e)|u@bK%(IV;uUtXct_27Q@|3?iSF;SSf$KQXY0qG<?L_
zIq<I!yl_p@NW?Ns1-B`u*P9-n^xcPNU&QO31TLEFv|*mFrKz8^H#K7RQ4T5^Z(=a>
z`>#-4Bzz#4q}d@Y(fdYR*5G$HvUt47BdGbo=n~PRw>wQAwKHTs@1J3K0X%-@nuB7P
z!g|};uykyGnb`g3Cg}KhLV?E*&lv`_>gqwv{fpjn$h$)JXW?GTlk(UZ4t?3X3$CyS
zHQ69vh|%kn3eZb_#A_Je{hk^8>jN)bMLHy^==)U-SDe!e^r1@v^KQKU@%>Kffwl1b
zPKp-AE^c5cE#fx!k@picz<z^3c>Y4btDHF$`UlKgJzn}$)NRK+*$|PsH>{roy-|F<
z2ixmj_abJfq5|_<51l$eM+?#CjcZ=1b%TEueVU}pAm!un#%tbgZ>pfT{v2wGt@M!l
zJGv*#;h&Eotk;cU)CBPi`5eRo7wa2Ds&3o9&p@wGzxadxk@l#v;^gnIaz#144zxQd
zcS|GDpV!B>uaWqZL8%x0ZTlf3ejWqFGn;w(HRfI)q7s?0BFsi7O--%X$b6rY7P;+K
zqAyM9kud%(B+Oj=^Y;tK3;R*2qD2)<f%gp3)XE0`l7H&Zl?}(@cz$|V-{FOVg4qlH
z5_{}<3A15vV*d*Y3DI*ii+ZiBR)Y0vdzfl?%dxyJLZ+-<!{G0dNgJQPK8T6W$Lhd;
zKALT{V7;8+FX6`>NAUVaK3*$^$om;J0&4o#&&Ylkbs=h~Y^oEFzu-fnR7>Ig3>xsa
zr>6bbZUnvH^&2odMKt36ZD9(tQJ1xAF&`hGDK;UQ#H@IKqJ9eME#|aGzu*6aWih7)
zkSmi=S7DwQ(08c)sjHaZoJ;v3e?Gz7_HaV)Uj~29$KxYUl6Exn@o3s9H|<oUX}zfX
z{@QLa5{JTpQ20W-o@#D{`=gwH`J_m+@>L_rx4d3Zk5zd6;|>9(Et~aVo^GQ>usnHw
zC(IwOR+Hy9@%mJh81Q%_&HF1egt;%s>!Tp~e=+1xDtZg~e<bMDG;i>)l+9avJy95+
z>YAumON2ta-i3Io3-Z4jbIGWF|9G{Z<QK)TPa0k-_}>Ef|Fa%={=8m7m4mv!#(_RL
zy%bGeDlyg@=Ii4`AQa>M>Ba5k?{R{hUIuvI2Y)db#rLao7^OpsnO4FU0ku&d1H{iE
z%f2tLeO?3lYQ>K+*Ex~MZcT_W|2FEAW~vALm=6XW8i%cg%omuwN`@IH@dEm25)vU{
z(<pK>Okur+I5Lk{74$d|f*nsCBm39ubW%$j{5?tQDd*4#iQj3+pRgSjSg#Y^5vjIp
z68Z^nuDv_u2RopjX=E6vkD)NsM`Nu4>W$rv_1XjaFcpel;P*M<Kvdh0I*32@)q@@k
zOX^Qlk3<Qx?FBskWS4+q6}=y0J{TIdeEZoLiI2Wu%HhBI9}a9!TEhCw>SyJcw+7P|
z$hRe!FGN$8gjhI%c_B)J9tHo49(GDM`d<X<={h$~?#I{H%;*lHckBKn4eOJ7UDA=J
z6;n`u^8Ph!PSX5(eE%hf7EA#B47)a7C4&6L>(yrwNaLLS1sspJ-6rKXuYLV@`1y|4
z3#dbXnIif6IOsFk4EvGK&;0=;(w6mlF>i|&X|8bN)tG-558DPOJIQ)mLwdct+jbw@
ziw>iDrb0W5`9Kg+LbOEc*T^S&YGeJ3NNK7W8gM*50_PL<?n4%HS_$uWT}|TAv|pfN
zhE8>3dus!nH$V`~X-%45U59d$*GmTH8=zb~f@B8ZM41rf{43-YePT2xN}rJYCHE&a
zKWb*)!Rt9|4N}Jb6{#<QGqiGOLq2^RKiGD}vrL{}9xz(OO^w9g>Mt7VN6cTx@OrmS
z3+oeADbf#2yOA_?%x=YYpVCP+pB=e~IjMwrS@DK3^XE5iJx=^ZR+E%6nekF=_v@1M
z_3<4fpH&(RH4oM}D8RY;>(a?o&Ff2Ky+`f*`2zagyk3h=SxsiPvpJi;z`tBNLyfJm
zv60sc`ql74yP@`9`13}-pEzzaC~bB-@sAmARFhfz*>-%t{xd>N)h}Df{`bdywk5|J
z*-yzGlOqxEr|@|3#iH7Y&O&}Q>1hh;FX?~z{Q2dT!ui4Eg8X)>mAqf2E={vzqcmPG
zYL=-OwvgYpb~trRh9mKJGd^i%7&XzWI4ILGkNXGke1C&q$5>a7VqR!4)a>ek{mSb#
z1^VvG#v|k}NcmA<CL52r{B^Re&+?zwT*SX_wbki+tjwR|^#T!-e)0GJwT!uK*01N!
zubA&lZfz^~FOmEviqzFYdr17{2GrB>OS2>%dTY`DsHZ-tmu2cg{7gHO%FNmtiFZk+
z(!h>Y{T$yfHtTnKmJ0or@^Z92Awgt+UY+xIO?G~fz~g`SiOcY0!+FhbmesWJ=i9u$
z8Ea&!7{|i<=lXlUPFBOI)#7~qk{@Vt>R9cmBJeLb4~4=v9eo!2OM`w+n5&Ps&-B?U
z6k<}p?%bWWS)rlB>znV&Y-PPEaz49py00GeA^EM(VyYdgE*0VNw;Tq_*0Q1Bh5oiF
z79;T)fqD#bjp6azFQ;kk$QbEgl$VP<BjO!x*nTtaY7eizL*BP;z~xM>f3FYQO9o^*
zKQvI7T?T;)+E+53&qsW^!giTXpkfnHkMeq*@EB@9pJ-MuaIyYDd6WH}>m_`D&-be*
zeK#FL>OnKs>(+<Uw)vj5-FUqpKU!!j*$`iSA0D*8d9DfD&4+JVtWZ!fmmW4K|2g(g
zUtvD3cS`r&UnTo*f_i+oyNUR#(G2x@sL)Ss8;;bLaqxXce*fzRBDLWsM@YVFZBHxX
zJ0!$k5BSnb*M|HpfP9u(FX$7|Bx!ITqSv-=$p0Ja`^(*e8f_r8iqG4D_lM2LhDv(#
z{e&VmnAZ4dFaLc`Hh-Py+T`r|&9%Yxynp@V!JaPguU`DTKfHU(`)rl#!Th*?$_f3*
z5aw5W!}aeiI2@SYs5fYi_IOBq9?(1KH7mCR+oKjEeH|Jq%nOcr{o!LA=|86147Jb?
z&trS94N>2}V<Y|&t%vh0<QHt;TI-~GHk==i>wVBqRXmUFeeDsNNtBa#S?m((0-X;?
z|FRSeOLt4=TR3F%D{R7TZSOl(Vd&Rz|5f}7)CVS$?Z0l%1i%0Gy^~$+E_GnBWajjF
zC?Q+!m4==jh5YwNh&I1*PCgeY?(S^1TDj+eul!U#ckxj>9H$i=mE*w=qZV6p%LA?~
z$12~jp3UqY;3PTT)YYqBjK-pzILA{Kg@yK}R=DSKyyvh`bG3TbhIzV80QK@+J6_KO
z{qKE+mf6Th`14TyesdopQHD(fxGnknwHs-LKQ@Z*FLyen;T@AU%>4Ir{CVx$VnnxJ
z`I&stkd$WDtb4Db&fjeR>!7?+m6Uqd`Tn$Sr@T41JxwQRB&p_vNSytCOFj3)P$cDU
zDgl4vzwbKp$;$&a$cH89$7e18@9`{jz4YtWFD2-F>MZc7i&O0iEz3TKgr8ppelEJ;
z*yeSEeCYElzykqMd*}Hlb_xkCLEw5{pJnBk{Y9|rdF~IGYG0gbvX&z>@%O+7>s|Ef
z_*oY0b^QDjHUrh<c~T1Yx^7@m7xc$$)k--MX6L`+Lx`26xN=0*@$2338R$+cn<+=$
zti8B_7L~f1zbHqiv-U})6I}>+8o{3Bc{mTIxW8e_k-wgwzu6e34uQXJL6ettz)5MC
W+HvX9^<rem>XW1=q&uoc$Nw7;bGVfN

literal 0
HcmV?d00001

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index da32c408e..b8093b5d7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -12753,12 +12753,12 @@
             <Cooldown TimeUse="45"/>
         </Cost>
         <TargetFilters value="Air,Visible;Player,Ally,Neutral,Ground,Structure,Missile,Stasis,Dead,Invulnerable,Unstoppable"/>
-        <Range value="8"/>
-        <AutoCastRange value="8"/>
+        <Range value="6"/>
+        <AutoCastRange value="6"/>
         <AutoCastValidatorArray value="noMarkers"/>
         <AutoCastValidatorArray value="AP_NoDiamondBackSnareTargeted"/>
         <!--PrepTime value="0.5"/-->
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_StukovInfestedDiamondbackSnare"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_StukovInfestedDiamondbackSnare" Requirements="AP_HaveInfestedDiamondbackBasicEnsnare"/>
     </CAbilEffectTarget>
     <CAbilTrain id="AP_SIMorphtoInfestedBanshee">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 008d84563..557dc94d1 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6646,4 +6646,12 @@
         <Icon value="Assets\Textures\btn-ability-zerg-creepteleport.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-zerg-creepteleport.dds"/>
     </CButton>
+    <CButton id="AP_InfestedDiamondbackConcentratedSpew">
+        <Icon value="AP\Assets\Custom\Textures\btn-upgrade-zerg-concentrated-spew.dds"/>
+        <AlertIcon value="AP\Assets\Custom\Textures\btn-upgrade-zerg-concentrated-spew.dds"/>
+    </CButton>
+    <CButton id="AP_InfestedDiamondbackViolentEnzymes">
+        <Icon value="Assets\Textures\btn-ability-mengsk-ghost-pyrokineticimmolation_orange.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-mengsk-ghost-pyrokineticimmolation_orange.dds"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index c00f075e1..e7bc7647a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -18993,11 +18993,11 @@
         <Movers Link="AP_StukovInfestedDiamondBackBileStreamSprayMissile" IfRangeLTE="-1"/>
     </CEffectLaunchMissile>
     <CEffectDamage id="AP_StukovInfestedDiamondBackBileStreamDamage">
-        <Amount value="20"/>
+        <Amount value="10"/>
         <ResponseFlags index="Flee" value="1"/>
         <Flags index="Notification" value="1"/>
         <SearchFlags index="CallForHelp" value="1"/>
-        <AttributeBonus index="Armored" value="10"/>
+        <AttributeBonus index="Armored" value="8"/>
         <ArmorReduction value="1"/>
         <Kind value="Ranged"/>
     </CEffectDamage>
@@ -19052,7 +19052,7 @@
     </CEffectCreatePersistent>
     <CEffectDamage id="AP_StukovInfestedDiamondSlimePuddleDamage">
         <EditorCategories value="Race:Zerg"/>
-        <Amount value="10"/>
+        <Amount value="6"/>
         <Death value="Disintegrate"/>
     </CEffectDamage>
     <CEffectApplyBehavior id="AP_StukovInfestedDiamondSlimePuddleDamageDebuff">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 63f0d4155..623449059 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4096,4 +4096,16 @@
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeInfestedSiegeTankBalancedRootsCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveInfestedDiamondbackConcentratedSpew">
+        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeInfestedDiamondbackConcentratedSpewCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveInfestedDiamondbackViolentEnzymes">
+        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeInfestedDiamondbackViolentEnzymesCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveInfestedDiamondbackBasicEnsnare">
+        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeInfestedDiamondbackBasicEnsnareCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index c7dc44306..5dcdc34b2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6737,4 +6737,16 @@
         <Count Link="AP_InfestedSiegeTankBalancedRoots" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeInfestedDiamondbackConcentratedSpewCompleteOnly">
+        <Count Link="AP_InfestedDiamondbackConcentratedSpew" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeInfestedDiamondbackViolentEnzymesCompleteOnly">
+        <Count Link="AP_InfestedDiamondbackViolentEnzymes" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeInfestedDiamondbackBasicEnsnareCompleteOnly">
+        <Count Link="AP_InfestedDiamondbackBasicEnsnare" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 67fad78a8..424e7ed23 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -27050,6 +27050,8 @@
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="AP_SIDiamondbackImprovedEnsnare" Type="Passive" Requirements="AP_HaveSIDiamondbackImprovedEnsnare" Row="1" Column="0"/>
             <LayoutButtons Face="AP_DiamondbackSnailTrail" Type="Passive" Requirements="AP_HaveSIDiamondbackSnailTrail" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_InfestedDiamondbackConcentratedSpew" Type="Passive" Requirements="AP_HaveInfestedDiamondbackConcentratedSpew" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_InfestedDiamondbackViolentEnzymes" Type="Passive" Requirements="AP_HaveInfestedDiamondbackViolentEnzymes" Row="1" Column="3"/>
             <LayoutButtons Face="AP_StukovInfestedDiamondbackSnare" Type="AbilCmd" AbilCmd="AP_StukovInfestedDiamondbackSnare,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="FireOnTheMove" Type="Passive" Row="2" Column="3"/>
         </CardLayouts>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index f81892412..c88dc8ec5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -2331,8 +2331,7 @@
         <EffectArray Reference="Weapon,AP_SIInfestedTrooper,Level" Value="1"/>
         <EffectArray Reference="Effect,AP_StukovInfestedSiegeTankImpalerTentacleDamage,Amount" Value="3"/>
         <EffectArray Reference="Weapon,AP_StukovInfestedSiegeTankImpalerTentacle,Level" Value="1"/>
-        <EffectArray Reference="Effect,AP_StukovInfestedDiamondBackBileStreamDamage,Amount" Value="3"/>
-        <EffectArray Reference="Effect,AP_StukovInfestedDiamondBackBileStreamDamage,AttributeBonus[Armored]" Value="1"/>
+        <EffectArray Reference="Effect,AP_StukovInfestedDiamondBackBileStreamDamage,Amount" Value="2"/>
         <EffectArray Reference="Weapon,AP_StukovInfestedDiamondBack,Level" Value="1"/>
     </CUpgrade>
     <CUpgrade id="AP_330mmBarrageCannons">
@@ -15893,4 +15892,17 @@
     <CUpgrade id="AP_InfestedSiegeTankBalancedRoots">
         <EffectArray Operation="Set" Reference="Weapon,AP_StukovInfestedSiegeTankImpalerTentacle,AllowedMovement" Value="Moving"/>
     </CUpgrade>
+    <CUpgrade id="AP_InfestedDiamondbackConcentratedSpew">
+        <EffectArray Reference="Weapon,AP_StukovInfestedDiamondBack,Range" Value="2"/>
+        <EffectArray Reference="Weapon,AP_StukovInfestedDiamondBack,MinScanRange" Value="2"/>
+        <EffectArray Reference="Abil,AP_StukovInfestedDiamondbackSnare,AutoCastRange" Value="2"/>
+        <EffectArray Reference="Abil,AP_StukovInfestedDiamondbackSnare,Range" Value="2"/>
+    </CUpgrade>
+    <CUpgrade id="AP_InfestedDiamondbackViolentEnzymes">
+        <EffectArray Reference="Effect,AP_StukovInfestedDiamondBackBileStreamDamage,Amount" Value="8"/>
+    </CUpgrade>
+    <CUpgrade id="AP_InfestedDiamondbackBasicEnsnare">
+        <Icon value="Assets\Textures\btn-ability-zerg-stukov-ensnare.dds"/>
+        <AffectedUnitArray value="AP_StukovInfestedDiamondBack"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index 27a4524f5..ae5e8f0be 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -3562,8 +3562,8 @@
         <Icon value="Assets\Textures\btn-upgrade-zerg-missileattacks-level0.dds"/>
         <DisplayEffect value="AP_StukovInfestedDiamondBackBileStreamDamage"/>
         <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <MinScanRange value="8.5"/>
-        <Range value="8"/>
+        <MinScanRange value="6.5"/>
+        <Range value="6"/>
         <Period value="1"/>
         <DamagePoint value="0"/>
         <Effect value="AP_StukovInfestedDiamondBackBileStreamSprayInitialCP"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 2c95d4f3e..ed76114b9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1268,6 +1268,8 @@ Button/Name/AP_IncineratorNozzles=Incinerator Gauntlets
 Button/Name/AP_InfernalPreIgniter=Thermite Filaments
 Button/Name/AP_InfestationPit=Mutate into Infestation Pit
 Button/Name/AP_InfestedBansheeAdvancedOptics=Advanced Targeting Optics
+Button/Name/AP_InfestedDiamondbackConcentratedSpew=Concentrated Spew
+Button/Name/AP_InfestedDiamondbackViolentEnzymes=Violent Enzymes
 Button/Name/AP_InfestedDuskWing=Infested Dusk Wings
 Button/Name/AP_InfestedMedic=Infested Medics
 Button/Name/AP_InfestedSiegeBreaker=Infested Siege Breakers
@@ -2553,6 +2555,8 @@ Button/Tooltip/AP_InfernalPreIgniter=Hellions do an additional 10 damage to ligh
 Button/Tooltip/AP_InfestationPit=<c val="ffff8a">Enables:</c><n/>- Infestors from Larvae<n/>- Swarm Hosts from Larvae
 Button/Tooltip/AP_InfestedAbomination=Aberrations are durable units that deal heavy damage.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
 Button/Tooltip/AP_InfestedBansheeAdvancedOptics=Increases Infested Banshee attack range by 2 while cloaked.
+Button/Tooltip/AP_InfestedDiamondbackConcentratedSpew=Increases Infested Diamondback attack and snare range by 2.
+Button/Tooltip/AP_InfestedDiamondbackViolentEnzymes=Increases Infested Diamondback attack damage by 8.
 Button/Tooltip/AP_InfestedDuskWing=Request 2 Infested Dusk Wings.<n/><n/>Tactical-strike aircraft.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_InfestedMedic=Request 2 Infested Medics.<n/><n/>Support trooper. Heals nearby biological units.
 Button/Tooltip/AP_InfestedSiegeBreaker=Request 2 Infested Siege Breakers.<n/><n/>Heavy tank. Long-range artillery in Siege Mode.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
@@ -2977,7 +2981,7 @@ Button/Tooltip/AP_SICocoon=Infested units spawn in the safety of these cocoons.
 Button/Tooltip/AP_SICocoonInfestedSCV=Infested units spawn in the safety of these cocoons.
 Button/Tooltip/AP_SICommandCenter=Primary structure. Used to receive gathered resources. Grows creep used to feed nearby Zerg structures. Can use the Uproot ability.<n/><n/><c val="ffff8a">Enables:</c><n/>- Infested SCVs<n/>- Overlords
 Button/Tooltip/AP_SIDiamondBack=Fast, high-damage hovertank. Can attack while moving and can bring flying units to the ground.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
-Button/Tooltip/AP_SIDiamondbackImprovedEnsnare=Reduces the cooldown of the <c val="ffff8a">Infested Diamondback's</c> Fungal Snare by 15 seconds.
+Button/Tooltip/AP_SIDiamondbackImprovedEnsnare=Reduces the cooldown of the <c val="ffff8a">Infested Diamondback's</c> Fungal Snare by 15 seconds, and allows Autocasting.
 Button/Tooltip/AP_SIEngineeringBay=Contains upgrades for Infested infantry and structures. <n/><n/><c val="ffff8a">Enables:</c><n/>- Infested Missile Turrets from Infested SCVs
 Button/Tooltip/AP_SIFactory=Vehicle-production facility. <n/><n/><c val="ffff8a">Enables:</c><n/>- Infested Diamondbacks
 Button/Tooltip/AP_SIInfestedBunker=Defensive structure. Periodically spawns Infested infantry that fight from inside. Acts as a mobile ground transport while uprooted.<n/><n/><c val="#ColorAttackInfo">Bonus: +<d ref="Behavior,AP_SIInfestedBunkerWeaponRangeBonus,Modification.WeaponRange"/> range to units inside.</c>

From 513470bdff7bd66667174225fcba28f6429c2221 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 21:09:24 -0400
Subject: [PATCH 23/34] add infested banshee upgrade trigger, and infested
 diamondback upgrade triggers

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  43 ++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   5 +-
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 269 +++++++++++++++---
 .../LocalizedData/TriggerStrings.txt          |  11 +-
 4 files changed, 280 insertions(+), 48 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 000145ced..aa244c7d8 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -999,8 +999,8 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Zerg_NydusWormRavenousAppetite, // 16
         libABFE498B_gf_AP_Triggers_Zerg_AcidicEnzymes, // 17
         libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel, // 18
-        libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures, // 19
-        libABFE498B_gf_AP_Triggers_Zerg_CausticMucus, // 20
+        libABFE498B_gf_AP_Triggers_Zerg_CausticMucus, // 19
+        libABFE498B_gf_AP_Triggers_Zerg_ViolentEnzymes, // 20
         libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton, //21
         libABFE498B_gf_AP_Triggers_Zerg_Rapid_Hibernation, //22
         libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal, //23
@@ -1009,7 +1009,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores, //26
         libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury, //27
         libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar, //28
-        ap_triggers_PlayerConsumer_sig  //29
+        libABFE498B_gf_AP_Triggers_Zerg_AdvancedTargetingOptics  //29
     );
 }
 
@@ -1021,7 +1021,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation5 (int lp_player, int lp_bitAr
         lp_player,
         lp_bitArrayValue,
         libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots, // 0
-        ap_triggers_PlayerConsumer_sig, // 1
+        libABFE498B_gf_AP_Triggers_Zerg_ConcentratedSpew, // 1
         ap_triggers_PlayerConsumer_sig, // 2
         ap_triggers_PlayerConsumer_sig, // 3
         ap_triggers_PlayerConsumer_sig, // 4
@@ -1261,7 +1261,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergProgressiveUpgrades (int lp_player, in
         lp_player,
         lp_bitArrayValue,
         libABFE498B_gf_AP_Triggers_Zerg_ProgressiveAutomatedMitosis, // 0
-        ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 2
+        libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare, // 2
         ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 4
         ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 6
         ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 8
@@ -6164,16 +6164,35 @@ void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots (int lp_play
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedSiegeTankBalancedRoots", 1);
 }
 
-void libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures (int lp_player) {
+void libABFE498B_gf_AP_Triggers_Zerg_CausticMucus (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SIDiamondbackImprovedEnsnare", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SIDiamondbackSnailTrail", 1);
 }
 
-void libABFE498B_gf_AP_Triggers_Zerg_CausticMucus (int lp_player) {
+void libABFE498B_gf_AP_Triggers_Zerg_ViolentEnzymes (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SIDiamondbackSnailTrail", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedDiamondbackViolentEnzymes", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_ConcentratedSpew (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedDiamondbackConcentratedSpew", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare (int lp_player, int lp_level) {
+    // Automatic Variable Declarations
+    // Implementation
+    if ((lp_level >= 1)) {
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedDiamondbackBasicEnsnare", 1);
+        if ((lp_level >= 2)) {
+            libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SIDiamondbackImprovedEnsnare", 1);
+        }
+
+    }
+
 }
 
 void libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton (int lp_player) {
@@ -6188,6 +6207,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_Rapid_Hibernation (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_StukovInfestedBansheeBurrowRegeneration", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_AdvancedTargetingOptics (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedBansheeAdvancedOptics", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 6954db45f..4becaf38c 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -647,10 +647,13 @@ void libABFE498B_gf_AP_Triggers_Zerg_AcidicEnzymes (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots (int lp_player);
-void libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_CausticMucus (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_ViolentEnzymes (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_ConcentratedSpew (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Rapid_Hibernation (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_AdvancedTargetingOptics (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Viral_Contamination (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_unlockTyrannozor (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 22d37b564..63af47532 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -3619,8 +3619,8 @@
                     libABFE498B_gf_AP_Triggers_Zerg_NydusWormRavenousAppetite, // 16
                     libABFE498B_gf_AP_Triggers_Zerg_AcidicEnzymes, // 17
                     libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel, // 18
-                    libABFE498B_gf_AP_Triggers_Zerg_SaturatedCultures, // 19
-                    libABFE498B_gf_AP_Triggers_Zerg_CausticMucus, // 20
+                    libABFE498B_gf_AP_Triggers_Zerg_CausticMucus, // 19
+                    libABFE498B_gf_AP_Triggers_Zerg_ViolentEnzymes, // 20
                     libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton, //21
                     libABFE498B_gf_AP_Triggers_Zerg_Rapid_Hibernation, //22
                     libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal, //23
@@ -3629,7 +3629,7 @@
                     libABFE498B_gf_AP_Triggers_Zerg_GuardianExplosiveSpores, //26
                     libABFE498B_gf_AP_Triggers_Zerg_GuardianPrimordialFury, //27
                     libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar, //28
-                    ap_triggers_PlayerConsumer_sig  //29
+                    libABFE498B_gf_AP_Triggers_Zerg_AdvancedTargetingOptics  //29
                 );
             </ScriptCode>
         </Element>
@@ -3668,7 +3668,7 @@
                     lp_player,
                     lp_bitArrayValue,
                     libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots, // 0
-                    ap_triggers_PlayerConsumer_sig, // 1
+                    libABFE498B_gf_AP_Triggers_Zerg_ConcentratedSpew, // 1
                     ap_triggers_PlayerConsumer_sig, // 2
                     ap_triggers_PlayerConsumer_sig, // 3
                     ap_triggers_PlayerConsumer_sig, // 4
@@ -4064,7 +4064,7 @@
                     lp_player,
                     lp_bitArrayValue,
                     libABFE498B_gf_AP_Triggers_Zerg_ProgressiveAutomatedMitosis, // 0
-                    ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 2
+                    libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare, // 2
                     ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 4
                     ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 6
                     ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 8
@@ -49068,84 +49068,245 @@
             <ValueGameType Type="Upgrade"/>
         </Element>
         <Element Type="Category" Id="FCEAA835">
-            <Item Type="FunctionDef" Library="ABFE498B" Id="8B558240"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="1FC24D9E"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="7DD83154"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="F412BCCF"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="F085F181"/>
         </Element>
-        <Element Type="FunctionDef" Id="8B558240">
+        <Element Type="FunctionDef" Id="1FC24D9E">
             <FlagAction/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="E3044B1E"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F3562479"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="22632E03"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1B5D34DB"/>
         </Element>
-        <Element Type="ParamDef" Id="E3044B1E">
+        <Element Type="ParamDef" Id="22632E03">
             <ParameterType>
                 <Type Value="int"/>
             </ParameterType>
-            <Default Type="Param" Library="ABFE498B" Id="150CEE69"/>
+            <Default Type="Param" Library="ABFE498B" Id="4EA9592B"/>
         </Element>
-        <Element Type="Param" Id="150CEE69">
+        <Element Type="Param" Id="4EA9592B">
             <Value>0</Value>
             <ValueType Type="int"/>
         </Element>
-        <Element Type="FunctionCall" Id="F3562479">
+        <Element Type="FunctionCall" Id="1B5D34DB">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="EAE35C1B"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="ED7398AB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="6EFDB291"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="84C1A9A4"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="22062FCE"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="02DB5B82"/>
         </Element>
-        <Element Type="Param" Id="EAE35C1B">
+        <Element Type="Param" Id="84C1A9A4">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="E3044B1E"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="22632E03"/>
         </Element>
-        <Element Type="Param" Id="ED7398AB">
+        <Element Type="Param" Id="22062FCE">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
-        <Element Type="Param" Id="6EFDB291">
+        <Element Type="Param" Id="02DB5B82">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_SIDiamondbackImprovedEnsnare</Value>
+            <Value>AP_SIDiamondbackSnailTrail</Value>
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
-        <Element Type="FunctionDef" Id="1FC24D9E">
+        <Element Type="FunctionDef" Id="7DD83154">
             <FlagAction/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="22632E03"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1B5D34DB"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="42132349"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="62DC0F76"/>
         </Element>
-        <Element Type="ParamDef" Id="22632E03">
+        <Element Type="ParamDef" Id="42132349">
             <ParameterType>
                 <Type Value="int"/>
             </ParameterType>
-            <Default Type="Param" Library="ABFE498B" Id="4EA9592B"/>
+            <Default Type="Param" Library="ABFE498B" Id="0D0401C6"/>
         </Element>
-        <Element Type="Param" Id="4EA9592B">
+        <Element Type="Param" Id="0D0401C6">
             <Value>0</Value>
             <ValueType Type="int"/>
         </Element>
-        <Element Type="FunctionCall" Id="1B5D34DB">
+        <Element Type="FunctionCall" Id="62DC0F76">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="84C1A9A4"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="22062FCE"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="02DB5B82"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="43D939E5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="3AFC91E7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C1061DE1"/>
         </Element>
-        <Element Type="Param" Id="84C1A9A4">
+        <Element Type="Param" Id="43D939E5">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="22632E03"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="42132349"/>
         </Element>
-        <Element Type="Param" Id="22062FCE">
+        <Element Type="Param" Id="3AFC91E7">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
-        <Element Type="Param" Id="02DB5B82">
+        <Element Type="Param" Id="C1061DE1">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_SIDiamondbackSnailTrail</Value>
+            <Value>AP_InfestedDiamondbackViolentEnzymes</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionDef" Id="F412BCCF">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="A4159DD0"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="8C553271"/>
+        </Element>
+        <Element Type="ParamDef" Id="A4159DD0">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="6A0FFA64"/>
+        </Element>
+        <Element Type="Param" Id="6A0FFA64">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="8C553271">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="0CE2F59A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FDE33518"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FD244951"/>
+        </Element>
+        <Element Type="Param" Id="0CE2F59A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="A4159DD0"/>
+        </Element>
+        <Element Type="Param" Id="FDE33518">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="FD244951">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_InfestedDiamondbackConcentratedSpew</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionDef" Id="F085F181">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="EFCCD71C"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="6E0CA501"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3A9F5914"/>
+        </Element>
+        <Element Type="ParamDef" Id="EFCCD71C">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="7DAF6738"/>
+        </Element>
+        <Element Type="Param" Id="7DAF6738">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="ParamDef" Id="6E0CA501">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="E4516289"/>
+        </Element>
+        <Element Type="Param" Id="E4516289">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="3A9F5914">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="9BA154E9"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4546F155"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="A1E7A312"/>
+        </Element>
+        <Element Type="FunctionCall" Id="9BA154E9">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E7A73FAA"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BDF0D367"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8E57A140"/>
+        </Element>
+        <Element Type="Param" Id="E7A73FAA">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="EFCCD71C"/>
+        </Element>
+        <Element Type="Param" Id="BDF0D367">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="8E57A140">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_InfestedDiamondbackBasicEnsnare</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionCall" Id="4546F155">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BDEA9833"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8F651E72"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7CD74266"/>
+        </Element>
+        <Element Type="Param" Id="BDEA9833">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="6E0CA501"/>
+        </Element>
+        <Element Type="Param" Id="8F651E72">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="B128CB9A"/>
+        </Element>
+        <Element Type="Param" Id="7CD74266">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="A1E7A312">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C926F594"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="8C27A554"/>
+        </Element>
+        <Element Type="FunctionCall" Id="C926F594">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C4A76435"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="042D9FAD"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="2F1BBB72"/>
+        </Element>
+        <Element Type="Param" Id="C4A76435">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="6E0CA501"/>
+        </Element>
+        <Element Type="Param" Id="042D9FAD">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="B128CB9A"/>
+        </Element>
+        <Element Type="Param" Id="2F1BBB72">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+            <Value>2</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="8C27A554">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="34A31398"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A349A478"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9C8E3E72"/>
+        </Element>
+        <Element Type="Param" Id="34A31398">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="EFCCD71C"/>
+        </Element>
+        <Element Type="Param" Id="A349A478">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="9C8E3E72">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_SIDiamondbackImprovedEnsnare</Value>
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
         <Element Type="Category" Id="1E6E4119">
             <Item Type="FunctionDef" Library="ABFE498B" Id="62F3AD66"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="66487CBD"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="1BAA9376"/>
         </Element>
         <Element Type="FunctionDef" Id="62F3AD66">
             <FlagAction/>
@@ -49219,6 +49380,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="1BAA9376">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="B1AA7C0E"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="ED1F9D83"/>
+        </Element>
+        <Element Type="ParamDef" Id="B1AA7C0E">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="E928C0D9"/>
+        </Element>
+        <Element Type="Param" Id="E928C0D9">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="ED1F9D83">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="2BE5C040"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="3557C9D2"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="49F1F0E7"/>
+        </Element>
+        <Element Type="Param" Id="2BE5C040">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="B1AA7C0E"/>
+        </Element>
+        <Element Type="Param" Id="3557C9D2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="49F1F0E7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_InfestedBansheeAdvancedOptics</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="03D4DBCE">
             <Item Type="FunctionDef" Library="ABFE498B" Id="341415B4"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3A78C1F2"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 07460b95a..39d4bdc9c 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -196,6 +196,7 @@ FunctionDef/Name/lib_ABFE498B_1A332A2C=AP_Triggers_Zerg_BanelingCorrosiveAcid
 FunctionDef/Name/lib_ABFE498B_1A8E04A6=AP_Triggers_Protoss_unlockRoboticsFacility
 FunctionDef/Name/lib_ABFE498B_1B25348F=AP_Triggers_Protoss_unlockAscendantPowerOverwhelming
 FunctionDef/Name/lib_ABFE498B_1B752B8E=AP_Triggers_Protoss_unlockStalwartStabilizedElectrodes
+FunctionDef/Name/lib_ABFE498B_1BAA9376=AP_Triggers_Zerg_AdvancedTargetingOptics
 FunctionDef/Name/lib_ABFE498B_1C1CE788=AP_Triggers_Zerg_SwarmHostOrganicCarapace
 FunctionDef/Name/lib_ABFE498B_1C3D4AA2=AP_Triggers_Zerg_FrightfulFleshwelder
 FunctionDef/Name/lib_ABFE498B_1C63B5BD=AP_Triggers_Zerg_GuardianPropellantSacs
@@ -512,6 +513,7 @@ FunctionDef/Name/lib_ABFE498B_7CC74863=AP_Triggers_Terran_unlockCommandCenterMUL
 FunctionDef/Name/lib_ABFE498B_7D0E800C=AP_Triggers_Protoss_unlockStalwartStrutEnhancements
 FunctionDef/Name/lib_ABFE498B_7DBC7D9E=AP_Triggers_Terran_unlockVehicleWeapon
 FunctionDef/Name/lib_ABFE498B_7DBE2940=AP_Triggers_Zerg_DefilerPredatoryConsumption
+FunctionDef/Name/lib_ABFE498B_7DD83154=AP_Triggers_Zerg_ViolentEnzymes
 FunctionDef/Name/lib_ABFE498B_7DF6CBF2=AP_Triggers_Terran_unlockSCVConstructionJumpJets
 FunctionDef/Name/lib_ABFE498B_7E29507E=AP_Triggers_Terran_unlockNovaGhostVisor
 FunctionDef/Name/lib_ABFE498B_7E4E15A7=AP_Triggers_MapConfig_setKerriganOptions
@@ -556,7 +558,6 @@ FunctionDef/Name/lib_ABFE498B_8A15708E=AP_Triggers_Terran_unlockThorProgressiveH
 FunctionDef/Name/lib_ABFE498B_8A1924D2=AP_Triggers_Terran_unlockBunkerFortifiedBunker
 FunctionDef/Name/lib_ABFE498B_8A270922=AP_Triggers_unlockZergMutation3
 FunctionDef/Name/lib_ABFE498B_8A27A45F=AP_Triggers_Protoss_unlockOptimizedOrdnance
-FunctionDef/Name/lib_ABFE498B_8B558240=AP_Triggers_Zerg_SaturatedCultures
 FunctionDef/Name/lib_ABFE498B_8B9BA7BD=AP_Triggers_Zerg_unlockOmegaWorm
 FunctionDef/Name/lib_ABFE498B_8B9C98A7=AP_Triggers_Terran_unlockBattlecruiserTacticalJump
 FunctionDef/Name/lib_ABFE498B_8C0E7C5A=AP_Triggers_Terran_unlockHellionHellbatAspect
@@ -881,6 +882,7 @@ FunctionDef/Name/lib_ABFE498B_EE4A905F=AP_Triggers_Terran_unlockThor330mmBarrage
 FunctionDef/Name/lib_ABFE498B_EE64D006=AP_Triggers_Terran_unlockVikingRipwaveMissiles
 FunctionDef/Name/lib_ABFE498B_EFBB1950=AP_Triggers_Protoss_unlockArbiterSpacetimeAnchor
 FunctionDef/Name/lib_ABFE498B_F0269CE5=AP_Triggers_Terran_unlockHellionOptimizedLogistics
+FunctionDef/Name/lib_ABFE498B_F085F181=AP_Triggers_Zerg_ProgressiveFungalSnare
 FunctionDef/Name/lib_ABFE498B_F0AE94EE=AP_Triggers_Terran_unlockHiveMindEmulator
 FunctionDef/Name/lib_ABFE498B_F0CA1C82=AP_Triggers_Protoss_unlockTriremeSolarBeam
 FunctionDef/Name/lib_ABFE498B_F126B31E=AP_Triggers_Terran_unlockWarhoundResourceEfficiency
@@ -890,6 +892,7 @@ FunctionDef/Name/lib_ABFE498B_F1EE5A2F=AP_Triggers_Terran_unlockReaperKineticFoa
 FunctionDef/Name/lib_ABFE498B_F2A42013=AP_Triggers_Terran_unlockDominionTrooper
 FunctionDef/Name/lib_ABFE498B_F2E889AB=AP_Triggers_Zerg_CorruptorMonstrousResilience
 FunctionDef/Name/lib_ABFE498B_F3C18F49=AP_Triggers_Protoss_unlockVanguardMatterDispersion
+FunctionDef/Name/lib_ABFE498B_F412BCCF=AP_Triggers_Zerg_ConcentratedSpew
 FunctionDef/Name/lib_ABFE498B_F42EFE8F=AP_Triggers_Terran_unlockHellionThermiteFilaments
 FunctionDef/Name/lib_ABFE498B_F4FD1581=AP_Triggers_Protoss_unlockImmortalAiur
 FunctionDef/Name/lib_ABFE498B_F5833FCD=AP_Triggers_Terran_unlockCyclone
@@ -1155,6 +1158,7 @@ ParamDef/Name/lib_ABFE498B_40DD4852=player
 ParamDef/Name/lib_ABFE498B_414EFF52=player
 ParamDef/Name/lib_ABFE498B_4153495A=player
 ParamDef/Name/lib_ABFE498B_41EFDA20=player
+ParamDef/Name/lib_ABFE498B_42132349=player
 ParamDef/Name/lib_ABFE498B_422B4FD0=player
 ParamDef/Name/lib_ABFE498B_42BC9976=player
 ParamDef/Name/lib_ABFE498B_43492E22=player
@@ -1320,6 +1324,7 @@ ParamDef/Name/lib_ABFE498B_6DB379AF=player
 ParamDef/Name/lib_ABFE498B_6DBC7C97=player
 ParamDef/Name/lib_ABFE498B_6DE56CE3=player
 ParamDef/Name/lib_ABFE498B_6DFD13C5=player
+ParamDef/Name/lib_ABFE498B_6E0CA501=level
 ParamDef/Name/lib_ABFE498B_6E1FF4D2=player
 ParamDef/Name/lib_ABFE498B_6E28AE9D=player
 ParamDef/Name/lib_ABFE498B_6E357A89=player
@@ -1505,6 +1510,7 @@ ParamDef/Name/lib_ABFE498B_A310FF38=player
 ParamDef/Name/lib_ABFE498B_A3896C39=player
 ParamDef/Name/lib_ABFE498B_A3998F43=player
 ParamDef/Name/lib_ABFE498B_A3FE033F=player
+ParamDef/Name/lib_ABFE498B_A4159DD0=player
 ParamDef/Name/lib_ABFE498B_A51B9485=player
 ParamDef/Name/lib_ABFE498B_A582E154=player
 ParamDef/Name/lib_ABFE498B_A63C9FFD=player
@@ -1540,6 +1546,7 @@ ParamDef/Name/lib_ABFE498B_B075EEBE=player
 ParamDef/Name/lib_ABFE498B_B0926DBB=player
 ParamDef/Name/lib_ABFE498B_B0ACEF49=player
 ParamDef/Name/lib_ABFE498B_B17272DC=level
+ParamDef/Name/lib_ABFE498B_B1AA7C0E=player
 ParamDef/Name/lib_ABFE498B_B1B9220B=player
 ParamDef/Name/lib_ABFE498B_B1E8FC02=player
 ParamDef/Name/lib_ABFE498B_B22FAFF8=player
@@ -1719,7 +1726,6 @@ ParamDef/Name/lib_ABFE498B_E14FF809=player
 ParamDef/Name/lib_ABFE498B_E1BBB135=player
 ParamDef/Name/lib_ABFE498B_E20CBDED=player
 ParamDef/Name/lib_ABFE498B_E2A44B95=bitArrayValue
-ParamDef/Name/lib_ABFE498B_E3044B1E=player
 ParamDef/Name/lib_ABFE498B_E309B2BE=kerriganPrimalInVanilla
 ParamDef/Name/lib_ABFE498B_E38B23D4=player
 ParamDef/Name/lib_ABFE498B_E39F4C43=player
@@ -1760,6 +1766,7 @@ ParamDef/Name/lib_ABFE498B_EFA848A7=player
 ParamDef/Name/lib_ABFE498B_EFC96772=bitArrayValue
 ParamDef/Name/lib_ABFE498B_EFCAB576=player
 ParamDef/Name/lib_ABFE498B_EFCB5ECE=player
+ParamDef/Name/lib_ABFE498B_EFCCD71C=player
 ParamDef/Name/lib_ABFE498B_F022FA9B=player
 ParamDef/Name/lib_ABFE498B_F04899D6=player
 ParamDef/Name/lib_ABFE498B_F090A110=player

From b67c43f73239f9bbe54ca6080d0006142b71a38f Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 21:36:50 -0400
Subject: [PATCH 24/34] Add spore and spine crawler movespeed and root speed
 upgrade

---
 .../Base.SC2Data/GameData/ButtonData.xml         |  4 ++++
 .../Base.SC2Data/GameData/RequirementData.xml    |  4 ++++
 .../GameData/RequirementNodeData.xml             |  4 ++++
 .../Base.SC2Data/GameData/UnitData.xml           |  4 ++++
 .../Base.SC2Data/GameData/UpgradeData.xml        | 16 ++++++++++++++++
 .../enUS.SC2Data/LocalizedData/GameStrings.txt   |  2 ++
 6 files changed, 34 insertions(+)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 557dc94d1..d177aa513 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6654,4 +6654,8 @@
         <Icon value="Assets\Textures\btn-ability-mengsk-ghost-pyrokineticimmolation_orange.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-mengsk-ghost-pyrokineticimmolation_orange.dds"/>
     </CButton>
+    <CButton id="AP_ZergExcavatingClaws">
+        <Icon value="Assets\Textures\btn-upgrade-zerg-anabolicsynthesis.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-zerg-anabolicsynthesis.dds"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 623449059..cbc68a984 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4108,4 +4108,8 @@
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeInfestedDiamondbackBasicEnsnareCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveZergExcavatingClaws">
+        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeZergExcavatingClawsCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 5dcdc34b2..b429fff59 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6749,4 +6749,8 @@
         <Count Link="AP_InfestedDiamondbackBasicEnsnare" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeZergExcavatingClawsCompleteOnly">
+        <Count Link="AP_ZergExcavatingClaws" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 424e7ed23..b6bf03c7b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -21829,6 +21829,7 @@
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="AttackBuilding" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SpineCrawlerUproot" Type="AbilCmd" AbilCmd="AP_SpineCrawlerUproot,0" Row="2" Column="0"/>
         </CardLayouts>
         <Radius value="0.875"/>
@@ -21901,6 +21902,7 @@
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SpineCrawlerRoot" Type="AbilCmd" AbilCmd="AP_SpineCrawlerRoot,0" Row="2" Column="0"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_SpineCrawlerRoot,1" Row="2" Column="4"/>
         </CardLayouts>
@@ -21977,6 +21979,7 @@
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="AttackBuilding" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SporeCrawlerUproot" Type="AbilCmd" AbilCmd="AP_SporeCrawlerUproot,0" Row="2" Column="0"/>
             <LayoutButtons Face="Detector" Type="Passive" Requirements="NotUnderConstruction" Row="2" Column="3"/>
         </CardLayouts>
@@ -22050,6 +22053,7 @@
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SporeCrawlerRoot" Type="AbilCmd" AbilCmd="AP_SporeCrawlerRoot,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_SporeCrawlerRoot,Cancel" Row="2" Column="4"/>
         </CardLayouts>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index c88dc8ec5..b9dc1c7bc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15905,4 +15905,20 @@
         <Icon value="Assets\Textures\btn-ability-zerg-stukov-ensnare.dds"/>
         <AffectedUnitArray value="AP_StukovInfestedDiamondBack"/>
     </CUpgrade>
+    <CUpgrade id="AP_ZergExcavatingClaws">
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SpineCrawlerRoot,InfoArray[0].SectionArray[Abils].DurationArray[Delay]" Value="3.000000"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SpineCrawlerRoot,InfoArray[0].SectionArray[Actor].DurationArray[Duration]" Value="3.000000"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SpineCrawlerRoot,InfoArray[0].SectionArray[Mover].DurationArray[Delay]" Value="3.000000"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SpineCrawlerRoot,InfoArray[0].SectionArray[Stats].DurationArray[Delay]" Value="3.000000"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SporeCrawlerRoot,InfoArray[0].SectionArray[Abils].DurationArray[Delay]" Value="3.000000"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SporeCrawlerRoot,InfoArray[0].SectionArray[Actor].DurationArray[Duration]" Value="3.000000"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SporeCrawlerRoot,InfoArray[0].SectionArray[Mover].DurationArray[Delay]" Value="3.000000"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SporeCrawlerRoot,InfoArray[0].SectionArray[Stats].DurationArray[Delay]" Value="3.000000"/>
+        <EffectArray Reference="Unit,AP_SpineCrawlerUprooted,Speed" Value="1"/>
+        <EffectArray Reference="Unit,AP_SporeCrawlerUprooted,Speed" Value="1"/>
+        <EffectArray Operation="Set" Reference="Unit,AP_SpineCrawlerUprooted,SpeedMultiplierCreep" Value="1.4"/>
+        <EffectArray Operation="Set" Reference="Unit,AP_SporeCrawlerUprooted,SpeedMultiplierCreep" Value="1.4"/>
+        <AffectedUnitArray value="AP_SpineCrawlerUprooted"/>
+        <AffectedUnitArray value="AP_SporeCrawlerUprooted"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index ed76114b9..ac0a527b2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1984,6 +1984,7 @@ Button/Name/AP_ZealotShieldCapacity=Shield Capacity
 Button/Name/AP_ZergBuild=Basic Mutation
 Button/Name/AP_ZergBuildAdvanced=Advanced Mutation
 Button/Name/AP_ZergCreepStomach=Creep Stomach
+Button/Name/AP_ZergExcavatingClaws=Excavating Claws
 Button/Name/AP_ZergMercBroodWar=Brood War Strains
 Button/Name/AP_ZergMercInfested=Infested Units
 Button/Name/AP_ZergMercSC2=Modern Strains
@@ -3409,6 +3410,7 @@ Button/Tooltip/AP_ZealotShieldCapacity=Increases Shields by 30.
 Button/Tooltip/AP_ZergBuild=A list of basic structures.
 Button/Tooltip/AP_ZergBuildAdvanced=A list of advanced structures.
 Button/Tooltip/AP_ZergCreepStomach=This structure can survive off creep.
+Button/Tooltip/AP_ZergExcavatingClaws=Spine Crawlers and Spore Crawlers root faster, and have increased movement speed, particularly when off creep.
 Button/Tooltip/AP_ZergMercBroodWar=Show available <c val="ffff8a">Brood War</c> unit strains.
 Button/Tooltip/AP_ZergMercInfested=Show available <c val="ffff8a">Infested</c> type units.
 Button/Tooltip/AP_ZergMercSC2=Show available <c val="ffff8a">Modern</c> unit strains.

From 17f0d0ae342fbe4a3afcfe463745094a24760331 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 21:41:37 -0400
Subject: [PATCH 25/34] replace frightful fleshwelder with excavating claws
 triggers

---
 .../Base.SC2Data/LibABFE498B.galaxy           | 14 ++--
 .../Base.SC2Data/LibABFE498B_h.galaxy         |  2 +-
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 76 +++++++++----------
 .../LocalizedData/TriggerStrings.txt          |  4 +-
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index aa244c7d8..cd9f23152 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1231,7 +1231,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergEvolutionPit (int lp_player, int lp_bi
         libABFE498B_gf_AP_Triggers_Zerg_OverlordAntennae, // 8
         libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
         libABFE498B_gf_AP_Triggers_Zerg_CreepStomach, // 10
-        libABFE498B_gf_AP_Triggers_Zerg_FrightfulFleshwelder, // 11
+        libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws, // 11
         ap_triggers_PlayerConsumer_sig, // 12
         ap_triggers_PlayerConsumer_sig, // 13
         ap_triggers_PlayerConsumer_sig, // 14
@@ -6641,12 +6641,6 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockFlyerCarapace (int lp_player, int lp_
     }
 }
 
-void libABFE498B_gf_AP_Triggers_Zerg_FrightfulFleshwelder (int lp_player) {
-    // Automatic Variable Declarations
-    // Implementation
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_FrightfulFleshwelder", 1);
-}
-
 void libABFE498B_gf_AP_Triggers_Zerg_TwinDrones (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -6701,6 +6695,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_CreepStomach (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergCreepStomach", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergCreepStomach", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 4becaf38c..e9c60ec38 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -672,12 +672,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockMissileAttacks (int lp_player, int lp
 void libABFE498B_gf_AP_Triggers_Zerg_unlockGroundCarapace (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Zerg_unlockFlyerAttacks (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Zerg_unlockFlyerCarapace (int lp_player, int lp_level);
-void libABFE498B_gf_AP_Triggers_Zerg_FrightfulFleshwelder (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_TwinDrones (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_AutomatedExtractor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_VespeneEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_MalignantCreep (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_CreepStomach (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganHeroicFortitude (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganLeapingStrike (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 63af47532..00e6c4987 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4008,7 +4008,7 @@
                     libABFE498B_gf_AP_Triggers_Zerg_OverlordAntennae, // 8
                     libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
                     libABFE498B_gf_AP_Triggers_Zerg_CreepStomach, // 10
-                    libABFE498B_gf_AP_Triggers_Zerg_FrightfulFleshwelder, // 11
+                    libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws, // 11
                     ap_triggers_PlayerConsumer_sig, // 12
                     ap_triggers_PlayerConsumer_sig, // 13
                     ap_triggers_PlayerConsumer_sig, // 14
@@ -54193,48 +54193,12 @@
             <ValueType Type="bool"/>
         </Element>
         <Element Type="Category" Id="1105382E">
-            <Item Type="FunctionDef" Library="ABFE498B" Id="1C3D4AA2"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D421BE14"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="AD9BBB7A"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="F9AC760F"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="FA0C159C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6214A1C3"/>
-        </Element>
-        <Element Type="FunctionDef" Id="1C3D4AA2">
-            <FlagAction/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="BA679F2E"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="5E718CA0"/>
-        </Element>
-        <Element Type="ParamDef" Id="BA679F2E">
-            <ParameterType>
-                <Type Value="int"/>
-            </ParameterType>
-            <Default Type="Param" Library="ABFE498B" Id="8B0728D8"/>
-        </Element>
-        <Element Type="Param" Id="8B0728D8">
-            <Value>0</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="FunctionCall" Id="5E718CA0">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="707919A4"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="6C429FD3"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="3D8CC368"/>
-        </Element>
-        <Element Type="Param" Id="707919A4">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="BA679F2E"/>
-        </Element>
-        <Element Type="Param" Id="6C429FD3">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
-            <Value>1</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="Param" Id="3D8CC368">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_FrightfulFleshwelder</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Upgrade"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="89082B8D"/>
         </Element>
         <Element Type="FunctionDef" Id="D421BE14">
             <FlagAction/>
@@ -54707,6 +54671,42 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="89082B8D">
+            <Identifier>AP_Triggers_Zerg_ExcavatingClaws</Identifier>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="68DD31A8"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="18879931"/>
+        </Element>
+        <Element Type="ParamDef" Id="68DD31A8">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="CB14872B"/>
+        </Element>
+        <Element Type="Param" Id="CB14872B">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="18879931">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8318CD87"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C1DBDC19"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BFB8B4F3"/>
+        </Element>
+        <Element Type="Param" Id="8318CD87">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="68DD31A8"/>
+        </Element>
+        <Element Type="Param" Id="C1DBDC19">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_ZergCreepStomach</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="BFB8B4F3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Category" Id="264418B4">
             <Item Type="FunctionDef" Library="ABFE498B" Id="D81959AC"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="17839D05"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 39d4bdc9c..9d1d98bbc 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -198,7 +198,6 @@ FunctionDef/Name/lib_ABFE498B_1B25348F=AP_Triggers_Protoss_unlockAscendantPowerO
 FunctionDef/Name/lib_ABFE498B_1B752B8E=AP_Triggers_Protoss_unlockStalwartStabilizedElectrodes
 FunctionDef/Name/lib_ABFE498B_1BAA9376=AP_Triggers_Zerg_AdvancedTargetingOptics
 FunctionDef/Name/lib_ABFE498B_1C1CE788=AP_Triggers_Zerg_SwarmHostOrganicCarapace
-FunctionDef/Name/lib_ABFE498B_1C3D4AA2=AP_Triggers_Zerg_FrightfulFleshwelder
 FunctionDef/Name/lib_ABFE498B_1C63B5BD=AP_Triggers_Zerg_GuardianPropellantSacs
 FunctionDef/Name/lib_ABFE498B_1C7597C1=AP_Triggers_Terran_unlockDominionTrooperCPO7SalamanderFlamethrower
 FunctionDef/Name/lib_ABFE498B_1ED0A5FF=AP_Triggers_Protoss_unlockDestroyer
@@ -551,6 +550,7 @@ FunctionDef/Name/lib_ABFE498B_8826925C=AP_Triggers_Terran_unlockMedicRestoration
 FunctionDef/Name/lib_ABFE498B_8859BEBD=AP_Triggers_Zerg_DefilerTrapdoorAdaptation
 FunctionDef/Name/lib_ABFE498B_88A21D71=AP_Triggers_Terran_unlockWidowMineDrillingClaws
 FunctionDef/Name/lib_ABFE498B_88D72592=AP_Triggers_Terran_unlockBattlecruiserBehemothReactor
+FunctionDef/Name/lib_ABFE498B_89082B8D=AP_Triggers_Zerg_ExcavatingClaws
 FunctionDef/Name/lib_ABFE498B_890AF278=AP_Triggers_Zerg_ZerglingMetabolicBoost
 FunctionDef/Name/lib_ABFE498B_8965C9CD=AP_Triggers_Zerg_unlockCorruptor
 FunctionDef/Name/lib_ABFE498B_89D560A9=AP_Triggers_Terran_unlockHerculesTacticalJump
@@ -1302,6 +1302,7 @@ ParamDef/Name/lib_ABFE498B_67BDBEBF=player
 ParamDef/Name/lib_ABFE498B_67CD19A4=player
 ParamDef/Name/lib_ABFE498B_681686A6=player
 ParamDef/Name/lib_ABFE498B_688E7741=player
+ParamDef/Name/lib_ABFE498B_68DD31A8=player
 ParamDef/Name/lib_ABFE498B_69281A84=player
 ParamDef/Name/lib_ABFE498B_699CDF24=player
 ParamDef/Name/lib_ABFE498B_6A20DA36=player
@@ -1570,7 +1571,6 @@ ParamDef/Name/lib_ABFE498B_B97BA144=player
 ParamDef/Name/lib_ABFE498B_B9A45B62=player
 ParamDef/Name/lib_ABFE498B_B9BA73BB=player
 ParamDef/Name/lib_ABFE498B_B9E98629=player
-ParamDef/Name/lib_ABFE498B_BA679F2E=player
 ParamDef/Name/lib_ABFE498B_BA701225=player
 ParamDef/Name/lib_ABFE498B_BAAC57DA=player
 ParamDef/Name/lib_ABFE498B_BABA11AE=player

From e817003a14529aba4e236a494c3070692c7df59b Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 22:03:31 -0400
Subject: [PATCH 26/34] rebalance frightful fleshwelder

---
 .../Base.SC2Data/GameData/UpgradeData.xml     | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index b9dc1c7bc..91020ccdc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15699,36 +15699,6 @@
         <Icon value="Assets\Textures\btn-ability-zerg-deeptunnel.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CUpgrade>
-    <CUpgrade id="AP_FrightfulFleshwelder">
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedBanshee,CostResource[Minerals]" Value="45"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedBanshee,CostResource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedBanshee,CostResource[Minerals]" Value="45"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedBanshee,CostResource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedBanshee,InfoArray[Train1].Resource[Minerals]" Value="45"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedBanshee,InfoArray[Train1].Resource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedBansheeBurrowed,CostResource[Minerals]" Value="45"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedBansheeBurrowed,CostResource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedLiberator,CostResource[Minerals]" Value="45"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedLiberator,CostResource[Vespene]" Value="38"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SILiberator,CostResource[Minerals]" Value="45"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SILiberator,CostResource[Vespene]" Value="38"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedLiberator,InfoArray[Train1].Resource[Minerals]" Value="45"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedLiberator,InfoArray[Train1].Resource[Vespene]" Value="38"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedSiegeTank,CostResource[Minerals]" Value="60"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedSiegeTank,CostResource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTank,CostResource[Minerals]" Value="60"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTank,CostResource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedSiegeTank,InfoArray[Train1].Resource[Minerals]" Value="60"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedSiegeTank,InfoArray[Train1].Resource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTankUprooted,CostResource[Minerals]" Value="60"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTankUprooted,CostResource[Vespene]" Value="30"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedDiamondBack,CostResource[Minerals]" Value="68"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedDiamondBack,CostResource[Vespene]" Value="23"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedDiamondBack,CostResource[Minerals]" Value="68"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedDiamondBack,CostResource[Vespene]" Value="23"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedDiamondBack,InfoArray[Train1].Resource[Minerals]" Value="68"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedDiamondBack,InfoArray[Train1].Resource[Vespene]" Value="23"/>
-    </CUpgrade>
     <CUpgrade id="AP_AcidicEnzymes">
         <Icon value="Assets\Textures\btn-upgrade-zerg-stukov-siegetankbonusdamage.dds"/>
         <EffectArray Reference="Effect,AP_StukovInfestedSiegeTankImpalerTentacleDamage,AttributeBonus[Armored]" Value="15"/>
@@ -15921,4 +15891,37 @@
         <AffectedUnitArray value="AP_SpineCrawlerUprooted"/>
         <AffectedUnitArray value="AP_SporeCrawlerUprooted"/>
     </CUpgrade>
+    <CUpgrade id="AP_FrightfulFleshwelderInfestedSiegeTank">
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedSiegeTank,CostResource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedSiegeTank,CostResource[Vespene]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTank,CostResource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTank,CostResource[Vespene]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedSiegeTank,InfoArray[Train1].Resource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedSiegeTank,InfoArray[Train1].Resource[Vespene]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTankUprooted,CostResource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTankUprooted,CostResource[Vespene]" Value="25"/>
+        <AffectedUnitArray value="AP_StukovInfestedSiegeTank"/>
+    </CUpgrade>
+    <CUpgrade id="AP_FrightfulFleshwelderInfestedDiamondBack">
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedDiamondBack,CostResource[Minerals]" Value="50"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedDiamondBack,CostResource[Minerals]" Value="50"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedDiamondBack,InfoArray[Train1].Resource[Minerals]" Value="50"/>
+        <AffectedUnitArray value="AP_StukovInfestedDiamondBack"/>
+    </CUpgrade>
+    <CUpgrade id="AP_FrightfulFleshwelderInfestedBanshee">
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedBanshee,CostResource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedBanshee,CostResource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedBanshee,InfoArray[Train1].Resource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedBansheeBurrowed,CostResource[Minerals]" Value="25"/>
+        <AffectedUnitArray value="AP_StukovInfestedBanshee"/>
+    </CUpgrade>
+    <CUpgrade id="AP_FrightfulFleshwelderInfestedLiberator">
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedLiberator,CostResource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedLiberator,CostResource[Vespene]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SILiberator,CostResource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_SILiberator,CostResource[Vespene]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedLiberator,InfoArray[Train1].Resource[Minerals]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedLiberator,InfoArray[Train1].Resource[Vespene]" Value="25"/>
+        <AffectedUnitArray value="AP_SILiberator"/>
+    </CUpgrade>
 </Catalog>

From f534a8d78ef65d28a8d95391dc0b3a1f0da1bf29 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 22:08:07 -0400
Subject: [PATCH 27/34] add rebalanced frightful fleshwelder triggers

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  32 +++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   4 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 160 +++++++++++++++++-
 .../LocalizedData/TriggerStrings.txt          |   8 +
 4 files changed, 196 insertions(+), 8 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index cd9f23152..f4a9cb9ec 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1022,10 +1022,10 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation5 (int lp_player, int lp_bitAr
         lp_bitArrayValue,
         libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots, // 0
         libABFE498B_gf_AP_Triggers_Zerg_ConcentratedSpew, // 1
-        ap_triggers_PlayerConsumer_sig, // 2
-        ap_triggers_PlayerConsumer_sig, // 3
-        ap_triggers_PlayerConsumer_sig, // 4
-        ap_triggers_PlayerConsumer_sig, // 5
+        libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankFrightfulFleshwelder, // 2
+        libABFE498B_gf_AP_Triggers_Zerg_InfestedDiamondbackFrightfulFleshwelder, // 3
+        libABFE498B_gf_AP_Triggers_Zerg_InfestedBansheeFrightfulFleshwelder, // 4
+        libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder, // 5
         ap_triggers_PlayerConsumer_sig, // 6
         ap_triggers_PlayerConsumer_sig, // 7
         ap_triggers_PlayerConsumer_sig, // 8
@@ -6164,6 +6164,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots (int lp_play
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedSiegeTankBalancedRoots", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankFrightfulFleshwelder (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_FrightfulFleshwelderInfestedSiegeTank", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_CausticMucus (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -6195,6 +6201,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare (int lp_player, int
 
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedDiamondbackFrightfulFleshwelder (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_FrightfulFleshwelderInfestedDiamondBack", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -6213,6 +6225,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_AdvancedTargetingOptics (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InfestedBansheeAdvancedOptics", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedBansheeFrightfulFleshwelder (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_FrightfulFleshwelderInfestedBanshee", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -6225,6 +6243,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_Viral_Contamination (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SILiberatorImprovedAoeAttack", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_FrightfulFleshwelderInfestedLiberator", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_unlockTyrannozor (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index e9c60ec38..a067e0c1b 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -647,15 +647,19 @@ void libABFE498B_gf_AP_Triggers_Zerg_AcidicEnzymes (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankSeismicSonar (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankFrightfulFleshwelder (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_CausticMucus (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ViolentEnzymes (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ConcentratedSpew (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare (int lp_player, int lp_level);
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedDiamondbackFrightfulFleshwelder (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Braced_Exoskeleton (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Rapid_Hibernation (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_AdvancedTargetingOptics (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedBansheeFrightfulFleshwelder (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_Viral_Contamination (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_unlockTyrannozor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_unlockBaneling (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_unlockLurker (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 00e6c4987..0b479fe44 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -3669,10 +3669,10 @@
                     lp_bitArrayValue,
                     libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankBalancedRoots, // 0
                     libABFE498B_gf_AP_Triggers_Zerg_ConcentratedSpew, // 1
-                    ap_triggers_PlayerConsumer_sig, // 2
-                    ap_triggers_PlayerConsumer_sig, // 3
-                    ap_triggers_PlayerConsumer_sig, // 4
-                    ap_triggers_PlayerConsumer_sig, // 5
+                    libABFE498B_gf_AP_Triggers_Zerg_InfestedSiegeTankFrightfulFleshwelder, // 2
+                    libABFE498B_gf_AP_Triggers_Zerg_InfestedDiamondbackFrightfulFleshwelder, // 3
+                    libABFE498B_gf_AP_Triggers_Zerg_InfestedBansheeFrightfulFleshwelder, // 4
+                    libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder, // 5
                     ap_triggers_PlayerConsumer_sig, // 6
                     ap_triggers_PlayerConsumer_sig, // 7
                     ap_triggers_PlayerConsumer_sig, // 8
@@ -48800,6 +48800,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="55DF3B98"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="8DFF7275"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="B858F916"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="9C126C35"/>
         </Element>
         <Element Type="FunctionDef" Id="C5881300">
             <FlagAction/>
@@ -49067,11 +49068,49 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="9C126C35">
+            <Identifier>AP_Triggers_Zerg_InfestedSiegeTankFrightfulFleshwelder</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="C232AA4D"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="89CD6B3E"/>
+        </Element>
+        <Element Type="ParamDef" Id="C232AA4D">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="096DE0E1"/>
+        </Element>
+        <Element Type="Param" Id="096DE0E1">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="89CD6B3E">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1AD50B59"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="039301DD"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="B7FEF9EE"/>
+        </Element>
+        <Element Type="Param" Id="1AD50B59">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="C232AA4D"/>
+        </Element>
+        <Element Type="Param" Id="039301DD">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="B7FEF9EE">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_FrightfulFleshwelderInfestedSiegeTank</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="FCEAA835">
             <Item Type="FunctionDef" Library="ABFE498B" Id="1FC24D9E"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="7DD83154"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="F412BCCF"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="F085F181"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="FEAF9239"/>
         </Element>
         <Element Type="FunctionDef" Id="1FC24D9E">
             <FlagAction/>
@@ -49303,10 +49342,48 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="FEAF9239">
+            <Identifier>AP_Triggers_Zerg_InfestedDiamondbackFrightfulFleshwelder</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="7C638B9A"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="33B122CE"/>
+        </Element>
+        <Element Type="ParamDef" Id="7C638B9A">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="A6AC9693"/>
+        </Element>
+        <Element Type="Param" Id="A6AC9693">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="33B122CE">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="501FBE8D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BDFDB8F6"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E08F3110"/>
+        </Element>
+        <Element Type="Param" Id="501FBE8D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="7C638B9A"/>
+        </Element>
+        <Element Type="Param" Id="BDFDB8F6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="E08F3110">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_FrightfulFleshwelderInfestedDiamondBack</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="1E6E4119">
             <Item Type="FunctionDef" Library="ABFE498B" Id="62F3AD66"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="66487CBD"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="1BAA9376"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="450C2B0C"/>
         </Element>
         <Element Type="FunctionDef" Id="62F3AD66">
             <FlagAction/>
@@ -49416,9 +49493,47 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="450C2B0C">
+            <Identifier>AP_Triggers_Zerg_InfestedBansheeFrightfulFleshwelder</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="9C92E18E"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C7556DB8"/>
+        </Element>
+        <Element Type="ParamDef" Id="9C92E18E">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="BA129CE8"/>
+        </Element>
+        <Element Type="Param" Id="BA129CE8">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="C7556DB8">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DD6C2624"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E76ED633"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9C079F77"/>
+        </Element>
+        <Element Type="Param" Id="DD6C2624">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="9C92E18E"/>
+        </Element>
+        <Element Type="Param" Id="E76ED633">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="9C079F77">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_FrightfulFleshwelderInfestedBanshee</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="03D4DBCE">
             <Item Type="FunctionDef" Library="ABFE498B" Id="341415B4"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3A78C1F2"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="71D1D81B"/>
         </Element>
         <Element Type="FunctionDef" Id="341415B4">
             <FlagAction/>
@@ -49492,6 +49607,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="71D1D81B">
+            <Identifier>AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="5D4AF948"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B51084BA"/>
+        </Element>
+        <Element Type="ParamDef" Id="5D4AF948">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="B2129A95"/>
+        </Element>
+        <Element Type="Param" Id="B2129A95">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="B51084BA">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="57C6F93D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F12349D6"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="2A609495"/>
+        </Element>
+        <Element Type="Param" Id="57C6F93D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="5D4AF948"/>
+        </Element>
+        <Element Type="Param" Id="F12349D6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="2A609495">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_FrightfulFleshwelderInfestedLiberator</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="5C4EBED0">
             <Item Type="FunctionDef" Library="ABFE498B" Id="2A727968"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="FC1FC16F"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 9d1d98bbc..d5b63008e 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -325,6 +325,7 @@ FunctionDef/Name/lib_ABFE498B_43B7CA33=AP_Triggers_Protoss_unlockStargate
 FunctionDef/Name/lib_ABFE498B_440A195A=AP_Triggers_Terran_unlockCommandCenterExtraSupplies
 FunctionDef/Name/lib_ABFE498B_445D902C=AP_Triggers_Terran_unlockBansheeShapedHull
 FunctionDef/Name/lib_ABFE498B_449F2986=AP_Triggers_Terran_unlockRavenRailgunTurret
+FunctionDef/Name/lib_ABFE498B_450C2B0C=AP_Triggers_Zerg_InfestedBansheeFrightfulFleshwelder
 FunctionDef/Name/lib_ABFE498B_45AD82C7=AP_Triggers_Terran_unlockPlanetaryFortressOrbitalModule
 FunctionDef/Name/lib_ABFE498B_45C06340=AP_Triggers_Zerg_LurkerAdaptedSpines
 FunctionDef/Name/lib_ABFE498B_45C6D6AC=AP_Triggers_Protoss_unlockAscendant
@@ -463,6 +464,7 @@ FunctionDef/Name/lib_ABFE498B_71223E47=AP_Triggers_Terran_unlockFirebatNanoProje
 FunctionDef/Name/lib_ABFE498B_713252DF=AP_Triggers_Protoss_unlockDisruptorPermanentCloak
 FunctionDef/Name/lib_ABFE498B_71802505=AP_Triggers_Zerg_OverlordVentralSacs
 FunctionDef/Name/lib_ABFE498B_71C9C69E=AP_Triggers_Terran_unlockMedivacAfterburners
+FunctionDef/Name/lib_ABFE498B_71D1D81B=AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder
 FunctionDef/Name/lib_ABFE498B_7228E898=AP_Triggers_Protoss_unlockSkylord
 FunctionDef/Name/lib_ABFE498B_7426F719=AP_Triggers_Protoss_unlockWarpPrism
 FunctionDef/Name/lib_ABFE498B_74E97F99=AP_Triggers_Terran_unlockReaperProgressiveStimpack
@@ -609,6 +611,7 @@ FunctionDef/Name/lib_ABFE498B_9B42D3C4=AP_Triggers_Protoss_unlockProgressiveWarp
 FunctionDef/Name/lib_ABFE498B_9B930B10=AP_Triggers_Protoss_unlockTempestGravitySling
 FunctionDef/Name/lib_ABFE498B_9BABFDA0=AP_Triggers_Protoss_unlockImmortalFamilyAdvancedTargetingMechanics
 FunctionDef/Name/lib_ABFE498B_9BBEBA80=AP_Triggers_giveProtossDefaultTech
+FunctionDef/Name/lib_ABFE498B_9C126C35=AP_Triggers_Zerg_InfestedSiegeTankFrightfulFleshwelder
 FunctionDef/Name/lib_ABFE498B_9C290257=AP_Triggers_Protoss_unlockOracleStealthDrive
 FunctionDef/Name/lib_ABFE498B_9C3FA6C1=AP_Triggers_Terran_unlockMedicAdvancedMedicFacilities
 FunctionDef/Name/lib_ABFE498B_9C5845F9=AP_Triggers_Protoss_unlockSolarBombardment
@@ -927,6 +930,7 @@ FunctionDef/Name/lib_ABFE498B_FE756FB1=AP_Triggers_unlockTerranArmory5
 FunctionDef/Name/lib_ABFE498B_FE76F038=AP_Triggers_Zerg_unlockSwarmQueen
 FunctionDef/Name/lib_ABFE498B_FE8BED83=AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency
 FunctionDef/Name/lib_ABFE498B_FE9453BD=AP_Triggers_Terran_unlockShipWeapon
+FunctionDef/Name/lib_ABFE498B_FEAF9239=AP_Triggers_Zerg_InfestedDiamondbackFrightfulFleshwelder
 FunctionDef/Name/lib_ABFE498B_FF8C8ED5=AP_Triggers_Protoss_unlockDeployFenix
 Library/Name/ABFE498B=Archipelago Triggers
 ParamDef/Name/lib_ABFE498B_009DEEF9=player
@@ -1266,6 +1270,7 @@ ParamDef/Name/lib_ABFE498B_5CBD4F41=player
 ParamDef/Name/lib_ABFE498B_5CC2F1ED=player
 ParamDef/Name/lib_ABFE498B_5D03C0E3=level
 ParamDef/Name/lib_ABFE498B_5D188D3F=player
+ParamDef/Name/lib_ABFE498B_5D4AF948=player
 ParamDef/Name/lib_ABFE498B_5DEEA879=player
 ParamDef/Name/lib_ABFE498B_5E221033=player
 ParamDef/Name/lib_ABFE498B_5EC13B5A=player
@@ -1376,6 +1381,7 @@ ParamDef/Name/lib_ABFE498B_7B0E9955=player
 ParamDef/Name/lib_ABFE498B_7BFE65D1=player
 ParamDef/Name/lib_ABFE498B_7C09DAB0=player
 ParamDef/Name/lib_ABFE498B_7C5D358F=player
+ParamDef/Name/lib_ABFE498B_7C638B9A=player
 ParamDef/Name/lib_ABFE498B_7C6A2BF2=player
 ParamDef/Name/lib_ABFE498B_7C94192B=player
 ParamDef/Name/lib_ABFE498B_7CB892BB=player
@@ -1487,6 +1493,7 @@ ParamDef/Name/lib_ABFE498B_9B60CD06=player
 ParamDef/Name/lib_ABFE498B_9BA9F109=player
 ParamDef/Name/lib_ABFE498B_9BD1EB64=player
 ParamDef/Name/lib_ABFE498B_9C22FD60=player
+ParamDef/Name/lib_ABFE498B_9C92E18E=player
 ParamDef/Name/lib_ABFE498B_9CC96E37=player
 ParamDef/Name/lib_ABFE498B_9CCD3E05=player
 ParamDef/Name/lib_ABFE498B_9D72F60F=player
@@ -1602,6 +1609,7 @@ ParamDef/Name/lib_ABFE498B_C1502EC7=level
 ParamDef/Name/lib_ABFE498B_C19F101A=player
 ParamDef/Name/lib_ABFE498B_C20125CA=player
 ParamDef/Name/lib_ABFE498B_C22E91A6=player
+ParamDef/Name/lib_ABFE498B_C232AA4D=player
 ParamDef/Name/lib_ABFE498B_C24A7EA8=player
 ParamDef/Name/lib_ABFE498B_C354A116=player
 ParamDef/Name/lib_ABFE498B_C3764345=player

From 8f8c8096ec92e9c2a93185bd916ce48be7cff79f Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 22:13:16 -0400
Subject: [PATCH 28/34] fix predator nest not being frozen with rescue group

---
 .../MapScript.galaxy                          |  3 ++
 .../ap_harvest_of_screams.SC2Map/Triggers     | 46 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
index 4bfa915b0..cab9912a8 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
@@ -1371,6 +1371,9 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) {
         else if (auto1A1E4CE8_val == "AP_Roach") {
             UnitBehaviorAdd(autoFD5DAF59_var, "FlashFreeze", autoFD5DAF59_var, 1);
         }
+        else if (auto1A1E4CE8_val == "AP_ZergMercenaryCompound") {
+            UnitBehaviorAdd(autoFD5DAF59_var, "FlashFreeze", autoFD5DAF59_var, 1);
+        }
         else {
         }
     }
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
index 65187ce0b..b158b38df 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
@@ -2650,6 +2650,7 @@
         <FunctionCall Type="FunctionCall" Id="F74B21D7"/>
         <FunctionCall Type="FunctionCall" Id="A8CD1E6E"/>
         <FunctionCall Type="FunctionCall" Id="8113E6C6"/>
+        <FunctionCall Type="FunctionCall" Id="F2C7E382"/>
     </Element>
     <Element Type="Param" Id="688F956D">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="B4ACF12A"/>
@@ -3766,6 +3767,51 @@
     <Element Type="FunctionCall" Id="6E797F36">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
     </Element>
+    <Element Type="FunctionCall" Id="F2C7E382">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="3A1227AB"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="AD43BC93"/>
+        <Parameter Type="Param" Id="D3552815"/>
+        <FunctionCall Type="FunctionCall" Id="CCEC83BA"/>
+    </Element>
+    <Element Type="Param" Id="D3552815">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="9A8F1093"/>
+        <Value>AP_ZergMercenaryCompound</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Unit"/>
+    </Element>
+    <Element Type="FunctionCall" Id="CCEC83BA">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C47C0524"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="363CE97C"/>
+        <Parameter Type="Param" Id="1EB81638"/>
+        <Parameter Type="Param" Id="B5E2E8B1"/>
+        <Parameter Type="Param" Id="0ED5FB0B"/>
+        <Parameter Type="Param" Id="3322D198"/>
+    </Element>
+    <Element Type="Param" Id="1EB81638">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="6F19F7ED"/>
+        <Value>1</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Param" Id="B5E2E8B1">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="9A6B09E3"/>
+        <Value>FlashFreeze</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Behavior"/>
+    </Element>
+    <Element Type="Param" Id="0ED5FB0B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="2E722704"/>
+        <FunctionCall Type="FunctionCall" Id="906AD0E5"/>
+    </Element>
+    <Element Type="FunctionCall" Id="906AD0E5">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+    </Element>
+    <Element Type="Param" Id="3322D198">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="02BBDCC1"/>
+        <FunctionCall Type="FunctionCall" Id="1A101E25"/>
+    </Element>
+    <Element Type="FunctionCall" Id="1A101E25">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+    </Element>
     <Element Type="Comment" Id="8E1D8155">
         <Comment>
             Setup Protoss Player Units

From 1c1a50096f925ddb26bae389916c5fa0ce855941 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 22:45:17 -0400
Subject: [PATCH 29/34] increase base resource cost of infested diamondbacks
 and siege tanks

---
 .../Base.SC2Data/GameData/AbilData.xml                 |  4 ++--
 .../Base.SC2Data/GameData/UnitData.xml                 | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index b8093b5d7..52b66f9fa 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -12594,7 +12594,7 @@
         <MorphUnit value="AP_SICocoonInfestedSiegeTank"/>
         <InfoArray index="Train1" Time="32" Effect="">
             <Resource index="Minerals" value="200"/>
-            <Resource index="Vespene" value="100"/>
+            <Resource index="Vespene" value="125"/>
             <Button DefaultButtonFace="AP_SISiegeTank"/>
             <Unit value="AP_StukovInfestedSiegeTankUprooted"/>
             <Flags index="AutoCast" value="1"/>
@@ -12732,7 +12732,7 @@
         <MorphUnit value="AP_SICocoonInfestedDiamondBack"/>
         <InfoArray index="Train1" Time="32" Effect="">
             <Resource index="Minerals" value="225"/>
-            <Resource index="Vespene" value="75"/>
+            <Resource index="Vespene" value="100"/>
             <Button DefaultButtonFace="AP_SIDiamondBack"/>
             <Unit value="AP_StukovInfestedDiamondBack"/>
             <Flags index="AutoCast" value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index b6bf03c7b..cc2f6b9b9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26675,7 +26675,7 @@
     <CUnit id="AP_SICocoonInfestedSiegeTank" parent="AP_SICocoon">
         <Food value="-3"/>
         <CostResource index="Minerals" value="200"/>
-        <CostResource index="Vespene" value="100"/>
+        <CostResource index="Vespene" value="125"/>
         <AbilArray Link="AP_SIMorphtoInfestedSiegeTank"/>
         <CardLayouts>
             <LayoutButtons Face="AP_SISiegeTank" Type="AbilCmd" AbilCmd="AP_SIMorphtoInfestedSiegeTank,Train1" Row="0" Column="0"/>
@@ -26712,7 +26712,7 @@
         <Food value="-3"/>
         <CostCategory value="Army"/>
         <CostResource index="Minerals" value="200"/>
-        <CostResource index="Vespene" value="100"/>
+        <CostResource index="Vespene" value="125"/>
         <RepairTime value="45"/>
         <AttackTargetPriority value="20"/>
         <DamageDealtXP value="1"/>
@@ -26793,7 +26793,7 @@
         <Food value="-3"/>
         <CostCategory value="Army"/>
         <CostResource index="Minerals" value="200"/>
-        <CostResource index="Vespene" value="100"/>
+        <CostResource index="Vespene" value="125"/>
         <RepairTime value="45"/>
         <AttackTargetPriority value="20"/>
         <DamageDealtXP value="1"/>
@@ -27035,7 +27035,7 @@
         <Food value="-3"/>
         <CostCategory value="Army"/>
         <CostResource index="Minerals" value="225"/>
-        <CostResource index="Vespene" value="75"/>
+        <CostResource index="Vespene" value="100"/>
         <RepairTime value="50"/>
         <AttackTargetPriority value="20"/>
         <AbilArray Link="stop"/>
@@ -27108,7 +27108,7 @@
     <CUnit id="AP_SICocoonInfestedDiamondBack" parent="AP_SICocoon">
         <Food value="-3"/>
         <CostResource index="Minerals" value="225"/>
-        <CostResource index="Vespene" value="75"/>
+        <CostResource index="Vespene" value="100"/>
         <AbilArray Link="AP_SIMorphtoInfestedDiamondBack"/>
         <CardLayouts>
             <LayoutButtons Face="AP_SIDiamondBack" Type="AbilCmd" AbilCmd="AP_SIMorphtoInfestedDiamondBack,Train1" Row="0" Column="0"/>

From 712bdd220da351337995f76f5f2e653dd89f8d4f Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 23:13:07 -0400
Subject: [PATCH 30/34] minor fixes

---
 .../ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml | 1 +
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                  | 2 ++
 Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy | 2 +-
 Mods/ArchipelagoTriggers.SC2Mod/Triggers                        | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index cc2f6b9b9..510bb2d3f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -26818,6 +26818,7 @@
             <LayoutButtons Face="AP_StukovInfestedSiegeTankUproot" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankUproot,Execute" Row="2" Column="1"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankAmmo" Type="Passive" Row="2" Column="4"/>
             <LayoutButtons Face="AP_StukovInfestedSiegeTankDeepTunnel" Type="AbilCmd" AbilCmd="AP_StukovInfestedSiegeTankDeepTunnel,Execute" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_InfestedSiegeTankBalancedRoots" Type="Passive" Requirements="AP_HaveInfestedSiegeTankBalancedRoots" Row="1" Column="1"/>
             <LayoutButtons Face="AP_InfestedSiegeTankSeismicSonar" Type="Passive" Requirements="AP_HaveInfestedSiegeTankSeismicSonar" Row="1" Column="2"/>
             <LayoutButtons Face="AP_AutomatedMitosis" Type="Passive" Requirements="AP_HaveAutomatedMitosis" Row="1" Column="3"/>
             <LayoutButtons Face="AP_AcidicEnzymes" Type="Passive" Requirements="AP_HaveAcidicEnzymes" Row="1" Column="4"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index ac0a527b2..f95d3ce3d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1274,6 +1274,7 @@ Button/Name/AP_InfestedDuskWing=Infested Dusk Wings
 Button/Name/AP_InfestedMedic=Infested Medics
 Button/Name/AP_InfestedSiegeBreaker=Infested Siege Breakers
 Button/Name/AP_InfestedSiegeTankBalancedRoots=Balanced Roots
+Button/Name/AP_InfestedSiegeTankSeismicSonar=Seismic Sonar
 Button/Name/AP_InfestedTerrans=Infested Terran
 Button/Name/AP_Infestor=Morph to Infestor
 Button/Name/AP_InfestorConsumption=Consumption
@@ -2562,6 +2563,7 @@ Button/Tooltip/AP_InfestedDuskWing=Request 2 Infested Dusk Wings.<n/><n/>Tactica
 Button/Tooltip/AP_InfestedMedic=Request 2 Infested Medics.<n/><n/>Support trooper. Heals nearby biological units.
 Button/Tooltip/AP_InfestedSiegeBreaker=Request 2 Infested Siege Breakers.<n/><n/>Heavy tank. Long-range artillery in Siege Mode.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_InfestedSiegeTankBalancedRoots=Allows Infested Siege Tanks to attack with their Tentacle while moving.
+Button/Tooltip/AP_InfestedSiegeTankSeismicSonar=Increases attack range of Infested Siege Tanks by +2.
 Button/Tooltip/AP_InfestedTerrans=Spawn an Infested Terran. Infested Terrans last <d ref="Behavior,AP_InfestedTerranTimedLife,Duration"/> seconds.
 Button/Tooltip/AP_Infestor=Infestation specialist. Can move while burrowed. Can use the Fungal Growth, Parasitic Domination, and Consumption abilities.<n/><n/><c val="ffff8a">Cannot attack.</c>
 Button/Tooltip/AP_InfestorConsumption=Drains up to 75 life from a friendly Zerg unit and gives the Infestor 2 energy for each point of life drained.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index f4a9cb9ec..92edd6ef1 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -6722,7 +6722,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_CreepStomach (int lp_player) {
 void libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergCreepStomach", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergExcavatingClaws", 1);
 }
 
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (int lp_player) {
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 0b479fe44..8b5d91771 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -54850,7 +54850,7 @@
         </Element>
         <Element Type="Param" Id="C1DBDC19">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_ZergCreepStomach</Value>
+            <Value>AP_ZergExcavatingClaws</Value>
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>

From ba12ca42d8e808154635ce8bb006c82ba4900fa1 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Sun, 13 Oct 2024 23:19:52 -0400
Subject: [PATCH 31/34] remove duplicate mengsk actor, might have been from
 rebase or something

---
 .../Base.SC2Data/GameData/ActorData.xml                       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 4c4570d14..ef3983074 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -26806,10 +26806,6 @@
         <Icon value="Assets\Textures\RadarIcon2.dds"/>
         <IconArcLength value="3.250000"/>
     </CActorRange>
-    <CActorRange id="AP_LiberatorMengskAGTargetRange" parent="RangeAbil" abil="AP_LiberatorMengskAGTarget">
-        <Icon value="Assets\Textures\RadarIcon2.dds"/>
-        <IconArcLength value="3.250000"/>
-    </CActorRange>
     <CActorLookAt id="AP_LiberatorAGTurret" parent="UnitTurret">
         <Type value="LiberatorAG"/>
     </CActorLookAt>

From 5b80948f28e98abc0aa1febf1d278793a347d9cc Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Mon, 14 Oct 2024 10:12:11 -0400
Subject: [PATCH 32/34] changes to frightful fleshwelder efficiency

---
 .../Base.SC2Data/GameData/UpgradeData.xml                  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 91020ccdc..45f6fbbe4 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15892,13 +15892,9 @@
         <AffectedUnitArray value="AP_SporeCrawlerUprooted"/>
     </CUpgrade>
     <CUpgrade id="AP_FrightfulFleshwelderInfestedSiegeTank">
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedSiegeTank,CostResource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedSiegeTank,CostResource[Vespene]" Value="25"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTank,CostResource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTank,CostResource[Vespene]" Value="25"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedSiegeTank,InfoArray[Train1].Resource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedSiegeTank,InfoArray[Train1].Resource[Vespene]" Value="25"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTankUprooted,CostResource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_StukovInfestedSiegeTankUprooted,CostResource[Vespene]" Value="25"/>
         <AffectedUnitArray value="AP_StukovInfestedSiegeTank"/>
     </CUpgrade>
@@ -15916,11 +15912,8 @@
         <AffectedUnitArray value="AP_StukovInfestedBanshee"/>
     </CUpgrade>
     <CUpgrade id="AP_FrightfulFleshwelderInfestedLiberator">
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedLiberator,CostResource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_SICocoonInfestedLiberator,CostResource[Vespene]" Value="25"/>
-        <EffectArray Operation="Subtract" Reference="Unit,AP_SILiberator,CostResource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Unit,AP_SILiberator,CostResource[Vespene]" Value="25"/>
-        <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedLiberator,InfoArray[Train1].Resource[Minerals]" Value="25"/>
         <EffectArray Operation="Subtract" Reference="Abil,AP_SIMorphtoInfestedLiberator,InfoArray[Train1].Resource[Vespene]" Value="25"/>
         <AffectedUnitArray value="AP_SILiberator"/>
     </CUpgrade>

From 7354b907870fec632b625784b1232d2169527829 Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Mon, 14 Oct 2024 10:40:06 -0400
Subject: [PATCH 33/34] fix hunterling strings after balance changes

---
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index f95d3ce3d..c2e05e295 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -2510,7 +2510,7 @@ Button/Tooltip/AP_HunterCliffJumper=This unit can jump up and down cliffs.
 Button/Tooltip/AP_HunterKiller=Elite Hydralisk.<n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_HunterSeekerMissile=Missile that chases its target. Has enough fuel for <d ref="Behavior,AP_SeekerMissileTimeout,Duration"/> seconds. Deals up to <d ref="Effect,AP_SeekerMissileDamage,Amount"/> area damage.
 Button/Tooltip/AP_Hunterling=Mercenary unit that can cliff jump and leap on enemies to stun and damage them. <n/><n/><c val="ffff8a">Can attack ground units.</c>
-Button/Tooltip/AP_HunterlingSummon=Summons a Hunterling. A Mercenary unit that can cliff jump and leap on enemies to stun and damage them. <n/><n/><c val="ffff8a">Can attack ground units.</c>
+Button/Tooltip/AP_HunterlingSummon=Summons two Hunterlings. A Mercenary unit that can cliff jump and leap on enemies to stun and damage them. <n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_Hydralisk=High-damage ranged unit.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_HydraliskDen=<c val="ffff8a">Enables:</c><n/>- Hydralisks from Larvae
 Button/Tooltip/AP_HydraliskDenImpalerPassive=Impaler Strain<n/><n/>Hydralisk Den enables you to morph Hydralisks.
@@ -2602,7 +2602,7 @@ Button/Tooltip/AP_KineticFoamHERC=Increases HERC life by 50.
 Button/Tooltip/AP_Lair=Evolved version of the Hatchery that allows additional upgrades and structures to be produced. Also spawns all Zerg units and receives gathered resources.
 Button/Tooltip/AP_Larva=Morphs into Zerg units.
 Button/Tooltip/AP_LaserTargetingSystem=Increases vision by 2 and weapon range by 1.
-Button/Tooltip/AP_LeapAttack=Jump on enemy units, dealing 20 damage and stunning them for 3 seconds.
+Button/Tooltip/AP_LeapAttack=Jump on enemy units, dealing 20 damage and stunning them for 3 seconds.<n/><n/><c val="#ColorAttackInfo">Heroic units are stunned for 1 second.</c>
 Button/Tooltip/AP_LegEnhancements=Increases movement speed.
 Button/Tooltip/AP_Liberator=Artillery fighter. Loaded with missiles that deal area damage to enemy air targets. Can switch into Defender Mode to provide siege support.<n/><n/><c val="#ColorAttackInfo">Can attack air units.</c>
 Button/Tooltip/AP_LiberatorMengsk=Royal Guard artillery fighter. Loaded with missiles that deal area damage to enemy air targets. Can switch into Defender Mode to provide siege support.<n/><n/><c val="#ColorAttackInfo">Can attack air units.</c>

From e6a34327cd0b175fe3a65edd07dd3b89fa1fbd1a Mon Sep 17 00:00:00 2001
From: bones <bones@bonesserver.com>
Date: Thu, 17 Oct 2024 23:07:41 -0400
Subject: [PATCH 34/34] add infested scv support for cliff jump

---
 .../Base.SC2Data/GameData/ActorData.xml                     | 6 ++++++
 .../Base.SC2Data/GameData/UnitData.xml                      | 2 ++
 .../Base.SC2Data/GameData/UpgradeData.xml                   | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index ef3983074..d36438743 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -21855,6 +21855,12 @@
         <On Terms="Abil.*.WorkerStop" Send="AnimClear Build"/>
         <On Terms="Abil.*.WorkerCancel" Send="TimerKill Build"/>
         <On Terms="Abil.*.WorkerCancel" Send="AnimClear Build"/>
+        <On Terms="Behavior.AP_SCVCliffJump.Launch" Send="AnimBracketStart Jump Stand IGNORE IGNORE"/>
+        <On Terms="Behavior.AP_SCVCliffJump.Launch" Send="AnimBlendTimeApply 0.100000"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandDown" Send="AnimBracketStop Jump"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandDown" Send="AnimBlendTimeApply"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandUp" Send="AnimBracketStop Jump"/>
+        <On Terms="Behavior.AP_SCVCliffJump.LandUp" Send="AnimBlendTimeApply"/>
         <On Terms="AnimDone.*.Complete; AnimName Build" Send="TimerSet 0.000000,0.300000 Build"/>
         <On Terms="TimerExpired; TimerName Build" Send="AnimPlay Build Work NonLooping"/>
         <On Terms="TimerExpired; TimerName Build" Send="Create SCVBuildSound"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 510bb2d3f..fd2c0912f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -22662,6 +22662,7 @@
         <AbilArray Link="AP_SIAdvancedBuild"/>
         <AbilArray Link="GatherSpecialObject"/>
         <AbilArray Link="CancelTerrazineHarvest"/>
+        <BehaviorArray Link="AP_SCVCliffJump"/>
         <WeaponArray Link="AP_FusionCutter"/>
         <CardLayouts>
             <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
@@ -22677,6 +22678,7 @@
             <LayoutButtons Face="AP_HostileEnvironmentAdaptation" Type="Passive" Requirements="AP_HaveHostileEnvironmentAdaptation" Row="1" Column="4"/>
             <LayoutButtons Face="TerranBuild" Type="Submenu" SubmenuCardId="TBl1" Row="2" Column="0"/>
             <!--            <LayoutButtons Face="TerranBuildAdvanced" Type="Submenu" SubmenuCardId="TBl2" Row="2" Column="1"/>-->
+            <LayoutButtons Face="AP_SCVCliffJump" Type="Passive" Requirements="AP_HaveSCVCliffJump" Row="2" Column="3"/>
             <LayoutButtons Face="Halt" Type="AbilCmd" AbilCmd="AP_SIAdvancedBuild,30" Row="2" Column="4"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="CancelTerrazineHarvest,0" Row="2" Column="4"/>
         </CardLayouts>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 45f6fbbe4..7cff32f87 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -15845,8 +15845,10 @@
     </CUpgrade>
     <CUpgrade id="AP_SCVCliffJump">
         <EffectArray Operation="Set" Reference="Unit,AP_SCV,Mover" Value="CliffJumper"/>
+        <EffectArray Operation="Set" Reference="Unit,AP_SISCV,Mover" Value="CliffJumper"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_SCV"/>
+        <AffectedUnitArray value="AP_SISCV"/>
     </CUpgrade>
     <CUpgrade id="AP_WidowMineDemolitionArmaments">
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>