diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield01.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield01.dds
new file mode 100644
index 000000000..a3672a7ed
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield01.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield02.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield02.dds
new file mode 100644
index 000000000..f11cad2c6
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield02.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield03.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield03.dds
new file mode 100644
index 000000000..3afdc40f9
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield03.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 26fa430cf..6febf5fa6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -1207,22 +1207,15 @@
         </Cost>
         <BehaviorArray value="AP_BattlecruiserCloak"/>
     </CAbilBehavior>
-    <CAbilBehavior id="AP_PredatorCloak">
-        <AbilSetId value="Clok"/>
-        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
-        <CmdButtonArray index="On" DefaultButtonFace="AP_CloakOn" Requirements="AP_HaveCloakingTechnologyPredator">
-            <Flags index="ToSelection" value="1"/>
-        </CmdButtonArray>
-        <CmdButtonArray index="Off" DefaultButtonFace="CloakOff">
-            <Flags index="ToSelection" value="1"/>
-        </CmdButtonArray>
-        <Flags index="Toggle" value="1"/>
+    <CAbilEffectInstant id="AP_PredatorCloak">
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_PredatorCloakAB"/>
         <Flags index="Transient" value="1"/>
         <Cost>
-            <Vital index="Energy" value="25"/>
+            <Cooldown TimeUse="15"/>
         </Cost>
-        <BehaviorArray value="AP_BattlecruiserCloak"/>
-    </CAbilBehavior>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_CloakOn" Requirements="AP_HaveCloakingTechnologyPredator"/>
+    </CAbilEffectInstant>
     <CAbilQueue id="AP_que1">
         <EditorCategories value="Race:Neutral,AbilityorEffectType:Structures"/>
         <QueueSize value="1"/>
@@ -3067,8 +3060,8 @@
     </CAbilAugment>
     <CAbilAugment id="AP_ChargePredator">
         <Alignment value="Negative"/>
-        <Effect value="AP_Charge"/>
-        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect value="AP_PredatorChargeSet"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_ChargePredator" Requirements="AP_HavePredatorCharge"/>
         <Flags index="AutoCast" value="1"/>
         <Flags index="AutoCastOn" value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 588fbaea5..d036e8b68 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -25652,6 +25652,7 @@
         <Aliases value="_UnitMedium"/>
         <Macros value="UnloadDropAnim"/>
         <Baselines index="Walk" AnimProps="Walk,Fast"/>
+        <On Terms="Upgrade.AP_PredatorAdaptiveDefenses.Add" Send="Create ShieldImpact"/>
         <DeathArray index="Normal" ModelLink="AP_PredatorDeath" SoundLink="AP_Predator_Explode"/>
         <PortraitModel value="AP_CyberCatPortrait"/>
         <BarOffset value="50"/>
@@ -25665,6 +25666,11 @@
         <Wireframe>
             <Image value="AP\Assets\Textures\Wireframe-Terran-predator.dds"/>
         </Wireframe>
+        <WireframeShield>
+            <Image value="AP\Assets\Custom\Textures\Wireframe-Terran-Predator-shield01.dds"/>
+            <Image value="AP\Assets\Custom\Textures\Wireframe-Terran-Predator-shield02.dds"/>
+            <Image value="AP\Assets\Custom\Textures\Wireframe-Terran-Predator-shield03.dds"/>
+        </WireframeShield>
     </CActorUnit>
     <CActorAction id="AP_PredatorAttack" parent="GenericAttack" effectAttack="AP_Predator">
         <LaunchAttachQuery Methods="Weapon"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 9b4b7fbc8..aed18be21 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -7498,6 +7498,51 @@
         <Name value="Button/Name/AP_MonarchBlades"/>
         <Tooltip value="Button/Tooltip/AP_MercMonarchBlades"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PredatorCloak">
+        <Alignment value="Positive"/>
+        <Duration value="5"/>
+        <InfoIcon value="Assets\Textures\btn-ability-terran-cloak.dds"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <Modification>
+            <StateFlags index="Cloak" value="1"/>
+            <StateFlags index="SuppressCollision" value="1"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PredatorAdaptiveDefenses">
+        <Alignment value="Positive"/>
+        <BehaviorFlags index="Permanent" value="1"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_HavePredatorAdaptiveDefenses"/>
+        <DisableValidatorArray value="hasShields"/>
+        <DamageResponse ModifyFraction="0.5">
+            <Kind index="Spell" value="0"/>
+            <Kind index="Melee" value="0"/>
+            <Chance value="1"/>
+        </DamageResponse>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PredatorCharging">
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-charge.dds"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <Duration value="3.5"/>
+        <Modification MoveSpeedMultiplier="2.2"/>
+        <Alignment value="Positive"/>
+        <BuffFlags index="Channeling" value="1"/>
+        <RemoveValidatorArray value="ChargeMinDistance"/>
+        <FinalEffect value="AP_PredatorChargeImpactReadyAB"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PredatorChargeImpactReady">
+        <Alignment value="Positive"/>
+        <InfoIcon value="AP\Assets\Textures\btn-ability-terran-ultrasonicpulse.dds"/>
+        <Duration value="2"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PredatorChargeSlow">
+        <Alignment value="Negative"/>
+        <InfoIcon value="AP\Assets\Textures\btn-ability-terran-ultrasonicpulse.dds"/>
+        <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <Duration value="2.5"/>
+        <Modification MoveSpeedMultiplier="0.5" AttackSpeedMultiplier="0.5"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_BattlecruiserBonusRange">
         <Alignment value="Positive"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index a93c01a17..9f60355c0 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4691,11 +4691,9 @@
         <Universal value="1"/>
     </CButton>
     <CButton id="AP_ChargePredator">
-        <Icon value="Assets\Textures\btn-ability-protoss-charge-color.dds"/>
-        <AlertIcon value="Assets\Textures\btn-ability-protoss-charge-color.dds"/>
+        <Icon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadspeed.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadspeed.dds"/>
         <EditorCategories value="Race:Protoss"/>
-        <Name value="Button/Name/AP_Charge"/>
-        <Tooltip value="Button/Tooltip/AP_Charge"/>
     </CButton>
     <CButton id="AP_HyperjumpHercules">
         <Icon value="Assets\Textures\btn-ability-terran-hercules-tacticaljump.dds"/>
@@ -4826,9 +4824,9 @@
         <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-zealotsuit-armorplate.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
-    <CButton id="AP_PredatorFury">
-        <Icon value="Assets\Textures\BTN-Ability-Protoss-ShadowFury.dds"/>
-        <EditorCategories value="Race:Protoss"/>
+    <CButton id="AP_PredatorVespeneSynthesis">
+        <Icon value="Assets\Textures\btn-tips-sellzergbiosamples.dds"/>
+        <EditorCategories value="Race:Terran"/>
     </CButton>
     <CButton id="AP_ScoutWeaponRange">
         <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-scoutchampionrange.dds"/>
@@ -5946,6 +5944,11 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-swann-scvdoublerepair.dds"/>
         <EditorCategories value="Race:InfestedTerran"/>
     </CButton>
+    <CButton id="AP_PredatorAdaptiveDefenses">
+        <Icon value="Assets\Textures\btn-ability-stetmann-banelingmanashield.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-stetmann-banelingmanashield.dds"/>
+        <EditorCategories value="Race:Terran"/>
+    </CButton>
     <CButton id="AP_TyrannozorTyrantsProtection">
         <Icon value="Assets\Textures\btn-ability-zerg-dehaka-tyrannozor-tyrantprotection.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-zerg-dehaka-tyrannozor-tyrantprotection.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index a0159bcf5..f985c50d1 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -2203,17 +2203,30 @@
         <EditorCategories value="Race:Terran"/>
         <Amount value="20"/>
     </CEffectDamage>
+    <CEffectModifyPlayer id="AP_VespeneSynthesisRefund">
+        <EditorCategories value="Race:Terran"/>
+        <WhichPlayer Value="Origin"/>
+        <Resources index="Vespene" value="1"/>
+        <ValidatorArray value="AP_HavePredatorVespeneSynthesis"/>
+    </CEffectModifyPlayer>
     <CEffectEnumArea id="AP_RetributionFieldSearch">
         <EditorCategories value="Race:Terran"/>
         <ImpactLocation Value="SourceUnit"/>
         <SearchFilters value="Ground;Self,Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <AreaArray Radius="0.5" Effect="AP_RetributionFieldDamage"/>
+        <AreaArray Radius="0.5" Effect="AP_RetributionFieldEffectSet"/>
         <SearchFlags index="ExtendByUnitRadius" value="1"/>
     </CEffectEnumArea>
     <CEffectSet id="AP_RetributionFieldSet">
         <EditorCategories value="Race:Terran"/>
-        <EffectArray value="AP_Predator"/>
         <EffectArray value="AP_RetributionFieldSearch"/>
+        <EffectArray value="AP_Predator"/>
+        <EffectArray value="AP_PredatorChargeImpactSearch"/>
+        <EffectArray value="AP_PredatorChargeImpactReadyRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_RetributionFieldEffectSet">
+        <EditorCategories value="Race:Terran"/>
+        <EffectArray value="AP_RetributionFieldDamage"/>
+        <EffectArray value="AP_VespeneSynthesisRefund"/>
     </CEffectSet>
     <CEffectCreatePersistent id="AP_RescuePods">
         <EditorCategories value="Race:Terran"/>
@@ -17872,6 +17885,43 @@
         <ValidatorArray index="0" value="AP_NotHeroic"/>
         <ValidatorArray value="NotStructure"/>
     </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PredatorCloakAB">
+        <Behavior value="AP_PredatorCloak"/>
+        <WhichUnit Value="Caster"/>
+    </CEffectApplyBehavior>
+    <CEffectSet id="AP_PredatorChargeSet">
+        <EditorCategories value="Race:Terran"/>
+        <EffectArray value="AP_PredatorCharge"/>
+        <EffectArray value="AP_PredatorChargeImpactReadyAB"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_PredatorCharge">
+        <EditorCategories value="Race:Terran"/>
+        <Behavior value="AP_PredatorCharging"/>
+        <WhichUnit Value="Caster"/>
+        <ValidatorArray index="0" value="ChargeMinTriggerDistance"/>
+        <ValidatorArray value="ChargeMaxDistance"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PredatorChargeImpactReadyAB">
+        <EditorCategories value="Race:Terran"/>
+        <Behavior value="AP_PredatorChargeImpactReady"/>
+        <WhichUnit Value="Caster"/>
+    </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_PredatorChargeImpactReadyRB">
+        <EditorCategories value="Race:Terran"/>
+        <BehaviorLink value="AP_PredatorChargeImpactReady"/>
+        <WhichUnit Value="Caster"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_PredatorChargeSlowTarget">
+        <EditorCategories value="Race:Terran"/>
+        <Behavior value="AP_PredatorChargeSlow"/>
+    </CEffectApplyBehavior>
+    <CEffectEnumArea id="AP_PredatorChargeImpactSearch">
+        <EditorCategories value="Race:Terran"/>
+        <ImpactLocation Value="SourceUnit"/>
+        <SearchFilters value="Ground;Player,Ally,Structure,Missile,Stasis,Dead,Hidden,Invulnerable,Unstoppable"/>
+        <AreaArray Radius="1.5" Effect="AP_PredatorChargeSlowTarget"/>
+        <ValidatorArray value="AP_PredatorChargeImpactIsReady"/>
+    </CEffectEnumArea>
     <CEffectSet id="AP_MercCompoundInfantryTabSet"/>
     <CEffectSet id="AP_MercCompoundVehiclesTabSet"/>
     <CEffectSet id="AP_MercCompoundStarshipsTabSet"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index de9fa6f77..4b0b962c5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -825,6 +825,9 @@
         <ShadowRadius value="0.400000"/>
         <TechPurchaseCamera value="Star2CameraMid04"/>
         <UnitGlossaryCamera value="Star2CameraMid04"/>
+        <AttachProps Id="Ref_Origin" SquibType="Shield" RadiusShield="1.000000">
+            <Keys index="Shield" value="1"/>
+        </AttachProps>
     </CModel>
     <CModel id="AP_PredatorDeath" parent="UnitDeath" Race="Terran">
         <Model value="Assets\Units\Terran\PredatorDeath\PredatorDeath.m3"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 64d0b9f57..3c7dadd6d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2815,9 +2815,9 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Use" Link="AP_CountUpgradeDragoonPhalanxSuitCompleteOnly"/>
     </CRequirement>
-    <CRequirement id="AP_HavePredatorFury">
+    <CRequirement id="AP_HavePredatorVespeneSynthesis">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
-        <NodeArray index="Show" Link="AP_CountUpgradePredatorFuryCompleteOnly"/>
+        <NodeArray index="Show" Link="AP_CountUpgradePredatorVespeneSynthesisCompleteOnly"/>
     </CRequirement>
     <CRequirement id="AP_HaveScoutWeaponRange">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
@@ -3754,6 +3754,10 @@
         <NodeArray index="Use" Link="AP_CountUnitAP_RoachWarrenCompleteOnlyTechTreeCheat"/>
         <NodeArray index="Show" Link="AP_CountUpgradeAP_OmegaWormOuroborosStrainCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HavePredatorAdaptiveDefenses">
+        <EditorCategories value="Race:InfestedTerran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradePredatorAdaptiveDefensesCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_MercCompoundCanSwitchInfantry">
         <NodeArray index="Show" Link="AP_CountUpgradeMercCompoundInfantryCompleteOnly"/>
         <NodeArray index="Use" Link="AP_NotCountUpgradeMercCompoundInfantrySelectedCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 21131ee85..dad9b0e01 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5182,8 +5182,8 @@
         <Count Link="AP_DragoonPhalanxSuit" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
-    <CRequirementCountUpgrade id="AP_CountUpgradePredatorFuryCompleteOnly">
-        <Count Link="AP_PredatorFury" State="CompleteOnly"/>
+    <CRequirementCountUpgrade id="AP_CountUpgradePredatorVespeneSynthesisCompleteOnly">
+        <Count Link="AP_PredatorVespeneSynthesis" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeScoutWeaponRangeCompleteOnly">
@@ -6127,6 +6127,10 @@
         <OperandArray value="AP_CompareNodeLTTyrannozorMergeSupply"/>
         <OperandArray value="AP_CountUnitUltraliskCavernCompleteOnlyTechTreeCheat"/>
     </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradePredatorAdaptiveDefensesCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_PredatorAdaptiveDefenses" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeMercCompoundInfantrySelectedCompleteOnly">
         <Count Link="AP_MercCompoundInfantrySelected" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 885d06315..e2984d72c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -3167,6 +3167,7 @@
         <LifeMax value="140"/>
         <LifeArmor value="1"/>
         <LifeArmorName value="Unit/LifeArmorName/TerranVehiclePlating"/>
+        <ShieldArmorName value="Unit/ShieldArmorName/AP_TerranShieldArmor"/>
         <Speed value="4"/>
         <Acceleration value="1000"/>
         <LateralAcceleration value="46"/>
@@ -3187,7 +3188,7 @@
         <AbilArray Link="stop"/>
         <AbilArray Link="AP_PredatorCloak"/>
         <AbilArray Link="AP_ChargePredator"/>
-        <AbilArray Link="AP_PredatorFury"/>
+        <BehaviorArray Link="AP_PredatorAdaptiveDefenses"/>
         <WeaponArray Link="AP_Predator"/>
         <CardLayouts>
             <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
@@ -3197,10 +3198,10 @@
             <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
             <LayoutButtons Face="AcquireMove" Type="AbilCmd" AbilCmd="move,AcquireMove" Row="0" Column="4"/>
             <LayoutButtons Face="AP_RetributionField" Type="Passive" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_PredatorAdaptiveDefenses" Type="Passive" Row="1" Column="1" Requirements="AP_HavePredatorAdaptiveDefenses"/>
+            <LayoutButtons Face="AP_PredatorVespeneSynthesis" Type="Passive" Row="1" Column="2" Requirements="AP_HavePredatorVespeneSynthesis"/>
             <LayoutButtons Face="AP_CloakOnPredator" Type="AbilCmd" AbilCmd="AP_PredatorCloak,0" Row="2" Column="0"/>
-            <LayoutButtons Face="CloakOff" Type="AbilCmd" AbilCmd="AP_PredatorCloak,1" Row="2" Column="1"/>
-            <LayoutButtons Face="AP_ChargePredator" Type="AbilCmd" AbilCmd="AP_ChargePredator,Execute" Row="2" Column="2"/>
-            <LayoutButtons Face="AP_PredatorFury" Type="AbilCmd" AbilCmd="AP_PredatorFury,0" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_ChargePredator" Type="AbilCmd" AbilCmd="AP_ChargePredator,Execute" Row="2" Column="1"/>
         </CardLayouts>
         <Radius value="0.625"/>
         <SeparationRadius value="0.625"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 6830025f5..924aa1f21 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -524,6 +524,8 @@
         <!-- Predator -->
         <EffectArray Reference="Unit,AP_Predator,LifeArmor" Value="1"/>
         <EffectArray Reference="Unit,AP_Predator,LifeArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_Predator,ShieldArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_Predator,ShieldArmorLevel" Value="1"/>
         <!-- Widow Mine -->
         <EffectArray Reference="Unit,AP_WidowMine,LifeArmor" Value="1"/>
         <EffectArray Reference="Unit,AP_WidowMine,LifeArmorLevel" Value="1"/>
@@ -674,6 +676,7 @@
         <EffectArray Reference="Effect,AP_ArcliteShockCannonAirliftDirected,Amount" Value="10"/>
         <!-- Predator -->
         <EffectArray Reference="Effect,AP_Predator,Amount" Value="2"/>
+        <EffectArray Reference="Effect,AP_RetributionFieldDamage,Amount" Value="2"/>
         <EffectArray Reference="Weapon,AP_Predator,Level" Value="1"/>
         <!-- Cyclone -->
         <EffectArray Reference="Effect,AP_CycloneAttackWeaponDamage,Amount" Value="2"/>
@@ -4687,6 +4690,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
@@ -4711,6 +4715,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
@@ -4735,6 +4740,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
@@ -4759,6 +4765,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
@@ -4783,6 +4790,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
@@ -4807,6 +4815,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel1.dds"/>
@@ -4830,6 +4839,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel2.dds"/>
@@ -4854,6 +4864,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Odin,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel3.dds"/>
@@ -4877,6 +4888,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel4.dds"/>
@@ -4901,6 +4913,7 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSieged,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_SiegeBreakerSiegedTransportable,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Predator,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_Predator,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WidowMine,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_Cyclone,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_WarHound,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-terran-vehicleplatinglevel5.dds"/>
@@ -10785,14 +10798,20 @@
         <AffectedUnitArray value="AP_MercLiberatorAG"/>
     </CUpgrade>
     <CUpgrade id="AP_CellularReactorsPredator">
-        <EffectArray Reference="Unit,AP_Predator,EnergyStart" Value="100"/>
-        <EffectArray Reference="Unit,AP_Predator,EnergyMax" Value="100"/>
+<!--        <EffectArray Reference="Unit,AP_Predator,EnergyStart" Value="100"/>-->
+<!--        <EffectArray Reference="Unit,AP_Predator,EnergyMax" Value="100"/>-->
     </CUpgrade>
     <CUpgrade id="AP_CloakingTechnologyPredator">
         <Icon value="Assets\Textures\btn-ability-terran-cloak-color.dds"/>
-        <EffectArray Reference="Unit,AP_Predator,EnergyMax" Value="200"/>
-        <EffectArray Reference="Unit,AP_Predator,EnergyStart" Value="50"/>
-        <EffectArray Reference="Unit,AP_Predator,EnergyRegenRate" Value=".5625"/>
+        <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
+    </CUpgrade>
+    <CUpgrade id="AP_PredatorAdaptiveDefenses">
+        <EffectArray Reference="Unit,AP_Predator,ShieldsMax" Value="50"/>
+        <EffectArray Reference="Unit,AP_Predator,ShieldsStart" Value="50"/>
+        <EffectArray Reference="Unit,AP_Predator,ShieldArmor" Value="2"/>
+        <EffectArray Reference="Unit,AP_Predator,ShieldRegenDelay" Value="10"/>
+        <EffectArray Reference="Unit,AP_Predator,ShieldRegenRate" Value="2"/>
+        <EffectArray Reference="Effect,AP_RetributionFieldDamage,LeechFraction[Shields]" Value="0.15"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
     </CUpgrade>
     <CUpgrade id="AP_PredatorCharge"/>
@@ -11403,7 +11422,7 @@
         <EditorCategories value="Race:Protoss,UpgradeType:SpellResearch"/>
         <AffectedUnitArray value="AP_Dragoon"/>
     </CUpgrade>
-    <CUpgrade id="AP_PredatorFury"/>
+    <CUpgrade id="AP_PredatorVespeneSynthesis"/>
     <CUpgrade id="AP_ScoutWeaponRange">
         <EffectArray Reference="Weapon,AP_ScoutMPAir,Range" Value="3"/>
         <EffectArray Reference="Weapon,AP_ScoutMPAir,MinScanRange" Value="2.5"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index 19e3dc334..8887cb8af 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -6037,6 +6037,41 @@
         <CombineArray value="AP_CheckTyrannozorMorphlingMergeSupplyAndNotHaveResourceEfficiencyUltralisk"/>
         <CombineArray value="AP_CheckTyrannozorMorphlingMergeSupplyResourceEfficiency"/>
     </CValidatorCombine>
+    <CValidatorPlayerRequirement id="AP_HavePredatorAdaptiveDefenses">
+        <Find value="1"/>
+        <Value value="AP_HavePredatorAdaptiveDefenses"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorUnitCompareBehaviorCount id="AP_NotPredatorAttackedRecently">
+        <Value value="0"/>
+        <Behavior value="AP_PredatorAttackedRecently"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareVital id="AP_CasterHasShields">
+        <WhichUnit Value="Caster"/>
+        <Compare value="GE"/>
+        <Value value="0.1"/>
+        <Vital value="Shields"/>
+    </CValidatorUnitCompareVital>
+    <CValidatorPlayerRequirement id="AP_HavePredatorVespeneSynthesis">
+        <Value value="AP_HavePredatorVespeneSynthesis"/>
+        <Find value="1"/>
+        <WhichPlayer Value="Caster"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorUnitCompareBehaviorCount id="AP_PredatorNotCharging">
+        <WhichUnit Value="Caster"/>
+        <Compare value="LT"/>
+        <Value value="1"/>
+        <Behavior value="AP_PredatorCharging"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_PredatorChargeImpactIsReady">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_PredatorChargeImpactReady"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_TargetNotPredatorChargeSlowed">
+        <Compare value="LT"/>
+        <Value value="1"/>
+        <Behavior value="AP_PredatorChargeSlow"/>
+    </CValidatorUnitCompareBehaviorCount>
     <CValidatorPlayerRequirement id="AP_NotMercCompoundInfantryTabSelected">
         <Value value="AP_MercCompoundInfantry"/>
     </CValidatorPlayerRequirement>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 38fed2a14..0091ea814 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -281,7 +281,6 @@ Button/Hotkey/AP_PhotonCannon=C
 Button/Hotkey/AP_PlanetaryFortressLoad=O
 Button/Hotkey/AP_PoisonNova=X
 Button/Hotkey/AP_Predator=P
-Button/Hotkey/AP_PredatorFury=F
 Button/Hotkey/AP_PrimalHeal=E
 Button/Hotkey/AP_PrimalIgniterMerge=G
 Button/Hotkey/AP_PrimalSlash=T
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 2a53b8be8..17078d8f9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -84,6 +84,7 @@ Abil/Name/AP_CarrierRepairDroneHanger=Carrier Repair Drone Hanger
 Abil/Name/AP_CausticSpray=Caustic Spray
 Abil/Name/AP_ChampionWarpTrain=Champion Warp Train
 Abil/Name/AP_Charge=Charge
+Abil/Name/AP_ChargePredator=Concussive Charge
 Abil/Name/AP_CommandCenterLand=Land (Command Center)
 Abil/Name/AP_CommandCenterLiftOff=Lift Off (Command Center)
 Abil/Name/AP_CommandCenterTrain=Train (Command Center)
@@ -552,7 +553,9 @@ Behavior/Name/AP_ParalyticSpines=Paralytic Spines
 Behavior/Name/AP_PersonalCloakingFree=Cloak
 Behavior/Name/AP_PersonalDefensiveMatrix=Ionic Force Field
 Behavior/Name/AP_PhaseBlinkDamage=Phase Blink
-Behavior/Name/AP_PredatorCloaking=Cloak
+Behavior/Name/AP_PredatorCloak=Phase Cloak
+Behavior/Name/AP_PredatorChargeImpactReady=Concussive Momentum
+Behavior/Name/AP_PredatorChargeSlow=Concussive Charge Debuff
 Behavior/Name/AP_PrimalHealBig=Mend
 Behavior/Name/AP_PrimalHealSmall=Mend
 Behavior/Name/AP_PsiDisruption=Psi Disruption
@@ -726,7 +729,9 @@ Behavior/Tooltip/AP_ParalyticSpines=This unit's attack speed is slowed.
 Behavior/Tooltip/AP_PersonalCloakingFree=This unit is cloaked and will only be revealed by detectors or effects.
 Behavior/Tooltip/AP_PersonalDefensiveMatrix=Nova is absorbing a portion of the damage dealt to her.
 Behavior/Tooltip/AP_PhaseBlinkDamage=This unit's next attack will deal double the damage.
-Behavior/Tooltip/AP_PredatorCloaking=This unit is cloaked and will only be revealed by detectors or effects.
+Behavior/Tooltip/AP_PredatorCloak=This unit is cloaked ignores unit collision.
+Behavior/Tooltip/AP_PredatorChargeImpactReady=This unit's next attack will apply a slow in an area around it.
+Behavior/Tooltip/AP_PredatorChargeSlow=This unit's movement and attack speeds are reduced.
 Behavior/Tooltip/AP_PrimalHealBig=Regenerating life.
 Behavior/Tooltip/AP_PrimalHealSmall=Regenerating life.
 Behavior/Tooltip/AP_PsiDisruption=Attack and movement speeds halved.
@@ -934,6 +939,7 @@ Button/Name/AP_CentrifugalHooksUpgrade=Centrifugal Hooks
 Button/Name/AP_CerberusMines=Cerberus Mine
 Button/Name/AP_ChainReaction=Chain Reaction
 Button/Name/AP_Charge=Charge
+Button/Name/AP_ChargePredator=Concussive Charge
 Button/Name/AP_ChitinousPlating=Chitinous Plating
 Button/Name/AP_CliffJumper=Cliff Jumper
 Button/Name/AP_CliffWalk=Cliff Walk
@@ -941,7 +947,7 @@ Button/Name/AP_CloakOnBanshee=Cloak
 Button/Name/AP_CloakOnBattlecruiser=Cloak
 Button/Name/AP_CloakOnGhost=Cloak
 Button/Name/AP_CloakOnLiberator=Cloak
-Button/Name/AP_CloakOnPredator=Cloak
+Button/Name/AP_CloakOnPredator=Phase Cloak
 Button/Name/AP_CloakOnReaper=Permanently Cloaked
 Button/Name/AP_CloakOnSpectre=Cloak
 Button/Name/AP_Colossus=Warp In Colossus
@@ -1420,7 +1426,8 @@ Button/Name/AP_PlanetaryFortressAttackAirlift=Armament Stabilizers
 Button/Name/AP_PlanetaryFortressLoad=Load
 Button/Name/AP_PoisonNova=Toxic Blast
 Button/Name/AP_Predator=Build Predator
-Button/Name/AP_PredatorFury=Predator's Fury
+Button/Name/AP_PredatorVespeneSynthesis=Vespene Synthesis
+Button/Name/AP_PredatorAdaptiveDefenses=Adaptive Defenses
 Button/Name/AP_PrimalAdaptation=Primal Adaptation
 Button/Name/AP_PrimalHeal=Mend
 Button/Name/AP_PrimalIgniterFireBreath=Concentrated Fire
@@ -2047,6 +2054,7 @@ Button/Tooltip/AP_CentrifugalHooksUpgrade=Increases Baneling movement speed.
 Button/Tooltip/AP_CerberusMines=Increases blast radius and trigger radius by 33%.
 Button/Tooltip/AP_ChainReaction=Kerrigan's attacks deal normal damage to her target then jump to additional nearby enemies. Deals <d ref="Effect,AP_ChainReaction2Damage,Amount"/> damage to up to four additional targets.
 Button/Tooltip/AP_Charge=Intercepts enemy ground units.
+Button/Tooltip/AP_ChargePredator=Intercepts enemy ground units. The first attack after charging applies a slow to surrounding enemy units.
 Button/Tooltip/AP_ChitinousPlating=Increases Ultralisk armor by 2.
 Button/Tooltip/AP_CliffJumper=This unit can jump up and down cliffs.
 Button/Tooltip/AP_CliffWalk=This unit can walk up and down cliffs.
@@ -2057,7 +2065,7 @@ Button/Tooltip/AP_CloakOnBattlecruiser=Cloaks the unit, preventing enemy units f
 Button/Tooltip/AP_CloakOnGhost=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.<n/><n/><c val="f078ff">Drains <d ref="-1 * (Behavior,AP_GhostCloak,Modification.VitalRegenArray[2] + Unit,AP_Ghost,EnergyRegenRate)" precision="1"/> energy per second.</c>
 Button/Tooltip/AP_CloakOnGhostFree=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.
 Button/Tooltip/AP_CloakOnLiberator=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.<n/><n/><c val="f078ff">Drains <d ref="-1 * (Behavior,AP_LiberatorCloak,Modification.VitalRegenArray[2] + Unit,AP_Liberator,EnergyRegenRate)" precision="1"/> energy per second.</c>
-Button/Tooltip/AP_CloakOnPredator=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.<n/><n/><c val="f078ff">Drains <d ref="-1 * (Behavior,AP_BattlecruiserCloak,Modification.VitalRegenArray[2] + Unit,AP_Predator,EnergyRegenRate)" precision="1"/> energy per second.</c>
+Button/Tooltip/AP_CloakOnPredator=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.<n/><n/>Effect lasts <d ref="Behavior,AP_PredatorCloak,Duration"/> seconds. While cloaked, the Predator ignores unit collision.
 Button/Tooltip/AP_CloakOnReaper=The Reaper is permanently cloaked.
 Button/Tooltip/AP_CloakOnSpectre=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.<n/><n/><c val="f078ff">Drains <d ref="-1 * (Behavior,AP_SpectreCloaking,Modification.VitalRegenArray[2] + Unit,AP_Spectre,EnergyRegenRate)" precision="1"/> energy per second.</c>
 Button/Tooltip/AP_CloakOnSpectreFree=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.
@@ -2613,7 +2621,8 @@ Button/Tooltip/AP_PlanetaryFortressLoad=Loads nearby SCVs into the Planetary For
 Button/Tooltip/AP_PointDefenseDrone=Uses a laser to shoot down enemy missiles.  <n/>Cannot target special attacks. <n/>Times out after <d ref="Behavior,AP_PointDefenseDroneTimedLife,Duration"/> seconds.<n/><n/><c val="f078ff">Each shot consumes 10 energy.</c>
 Button/Tooltip/AP_PoisonNova=Instantly deals 20 damage to enemy ground units nearby.
 Button/Tooltip/AP_Predator=Anti-infantry specialist that deals area damage with each attack.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
-Button/Tooltip/AP_PredatorFury=Jump from target to target, dealing <d ref="Effect,AP_DarkTemplarShadowFuryDamage,Amount"/> damage with each jump. Hits <d ref="Behavior,AP_PredatorShadowFuryController,PeriodCount+1"/> times.
+Button/Tooltip/AP_PredatorVespeneSynthesis=The player owning the Predator gains 1 Vespene every time Lightning Field deals damage.
+Button/Tooltip/AP_PredatorAdaptiveDefenses=Predators gain recharging shields, and take 50% reduced splash and ranged damage while the shield is active. A portion of damage dealt by Lightning Field also restores shields.<n/><n/>Shields have 2 base armor and are improved by Terran Vehicle Armor upgrades.
 Button/Tooltip/AP_PrimalAdaptation=Allows Guardians to attack air units with a decreased attack damage.
 Button/Tooltip/AP_PrimalHeal=Heals Kerrigan for <d ref="Effect,AP_PrimalHealBig,VitalArray[0].Change"/> life and friendly biological units nearby for <d ref="Effect,AP_PrimalHealSmall,VitalArray[0].Change"/> life. An additional 50% of the amount healed regenerates over <d time="15"/>.
 Button/Tooltip/AP_PrimalIgniter=Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed.<n/><n/><c val="ffff8a">Can attack ground units.</c>
@@ -2697,7 +2706,7 @@ Button/Tooltip/AP_ResearchAlarakHighTemplarPsionicOrbTravelDistancePassive=Incre
 Button/Tooltip/AP_ResearchCycloneRapidFireLaunchers=Increases the attack speed of the first 12 shots of the <c val="ffff8a">Cyclone's</c> Lock On.
 Button/Tooltip/AP_ResearchMagFieldLaunchers=Increases <c val="ffff8a">Cyclone's</c> attack range by +<d ref="$UpgradeEffectArrayValue:AP_MagFieldLaunchers:Weapon,AP_TyphoonMissilePod,Range$"/>.
 Button/Tooltip/AP_RespawnZergling=Respawns up to <d ref="Effect,ZerglingRespawnTooltipDummy,SpawnCount"/> Zerglings at no cost until all Zerglings have returned to life.
-Button/Tooltip/AP_RetributionField=The Predator unleashes a deadly field of electricity each time it attacks. Deals 20 damage.
+Button/Tooltip/AP_RetributionField=The Predator unleashes a deadly field of electricity each time it attacks. Deals <d ref="Effect,AP_RetributionFieldDamage,Amount"/> damage.
 Button/Tooltip/AP_RipwaveMissiles=Viking missiles deal area damage.
 Button/Tooltip/AP_Roach=Assault unit. Regenerates life quickly when burrowed.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_RoachCorpserPassive=Corpser Strain<n/><n/>Roach Warren enables you to morph Roaches.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index a0bcccbe2..ae71ac392 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -466,7 +466,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory6 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressAdvancedTargeting, // 7
         libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieLaunchingVectorCompensator, // 8
         libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieResourceEfficiency, // 9
-        libABFE498B_gf_AP_Triggers_Terran_unlockPredatorFury, // 10
+        libABFE498B_gf_AP_Triggers_Terran_unlockPredatorVespeneSynthesis, // 10
         libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserBehemothPlating, // 11
         libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserCovertOpsEngines, // 12
         libABFE498B_gf_AP_Triggers_Terran_unlockWarhoundResourceEfficiency, // 13
@@ -503,7 +503,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Terran_unlockScienceVesselTacticalJump, // 4
         libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel, // 5
         libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserFieldAssistTargetingSystem, // 6
-        ap_triggers_PlayerConsumer_sig, // 7
+        libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses, // 7
         ap_triggers_PlayerConsumer_sig, // 8
         ap_triggers_PlayerConsumer_sig, // 9
         ap_triggers_PlayerConsumer_sig, // 10
@@ -2748,46 +2748,9 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorResourceEfficiency (int lp_
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCloak (int lp_player) {
-    // Variable Declarations
-    int lv_upgradeLevels;
-    unit lv_currentUnit;
-
     // Automatic Variable Declarations
-    unitgroup autoA2DC915D_g;
-    int autoA2DC915D_u;
-    unitgroup auto458755E3_g;
-    int auto458755E3_u;
-
-    // Variable Initialization
-
     // Implementation
-    lv_upgradeLevels = TechTreeUpgradeCount(lp_player, "AP_CloakingTechnologyPredator", c_techCountQueuedOrBetter);
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CloakingTechnologyPredator", 1);
-    if ((TechTreeUpgradeCount(lp_player, "AP_CellularReactors", c_techCountQueuedOrBetter) == 1)) {
-        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CellularReactorsPredator", 1);
-        if ((lv_upgradeLevels == 0)) {
-            auto458755E3_g = UnitGroup("AP_Predator", lp_player, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
-            auto458755E3_u = UnitGroupCount(auto458755E3_g, c_unitCountAll);
-            for (;; auto458755E3_u -= 1) {
-                lv_currentUnit = UnitGroupUnitFromEnd(auto458755E3_g, auto458755E3_u);
-                if (lv_currentUnit == null) { break; }
-                UnitSetPropertyFixed(lv_currentUnit, c_unitPropEnergy, 150.0);
-            }
-        }
-
-    }
-    else {
-        if ((lv_upgradeLevels == 0)) {
-            autoA2DC915D_g = UnitGroup("AP_Predator", lp_player, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
-            autoA2DC915D_u = UnitGroupCount(autoA2DC915D_g, c_unitCountAll);
-            for (;; autoA2DC915D_u -= 1) {
-                lv_currentUnit = UnitGroupUnitFromEnd(autoA2DC915D_g, autoA2DC915D_u);
-                if (lv_currentUnit == null) { break; }
-                UnitSetPropertyFixed(lv_currentUnit, c_unitPropEnergy, 50.0);
-            }
-        }
-
-    }
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCharge (int lp_player) {
@@ -2796,10 +2759,16 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCharge (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PredatorCharge", 1);
 }
 
-void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorFury (int lp_player) {
+void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorVespeneSynthesis (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PredatorVespeneSynthesis", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PredatorFury", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PredatorAdaptiveDefenses", 1);
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacRapidDeploymentTube (int lp_player) {
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 3ef8841fe..03dc454bb 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -286,7 +286,8 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockSiegeTankEnhancedCombustionEngines
 void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorResourceEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCloak (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCharge (int lp_player);
-void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorFury (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorVespeneSynthesis (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacRapidDeploymentTube (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacAdvancedHealingAI (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacExpandedHull (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 804177314..6b7dca534 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2691,7 +2691,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressAdvancedTargeting, // 7
                     libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieLaunchingVectorCompensator, // 8
                     libABFE498B_gf_AP_Triggers_Terran_unlockValkyrieResourceEfficiency, // 9
-                    libABFE498B_gf_AP_Triggers_Terran_unlockPredatorFury, // 10
+                    libABFE498B_gf_AP_Triggers_Terran_unlockPredatorVespeneSynthesis, // 10
                     libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserBehemothPlating, // 11
                     libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserCovertOpsEngines, // 12
                     libABFE498B_gf_AP_Triggers_Terran_unlockWarhoundResourceEfficiency, // 13
@@ -2754,7 +2754,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockScienceVesselTacticalJump, // 4
                     libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel, // 5
                     libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserFieldAssistTargetingSystem, // 6
-                    ap_triggers_PlayerConsumer_sig, // 7
+                    libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses, // 7
                     ap_triggers_PlayerConsumer_sig, // 8
                     ap_triggers_PlayerConsumer_sig, // 9
                     ap_triggers_PlayerConsumer_sig, // 10
@@ -19126,6 +19126,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="76872FAF"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="0B9FD37F"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="A64D8598"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="6649708D"/>
         </Element>
         <Element Type="FunctionDef" Id="60946550">
             <FlagAction/>
@@ -19166,11 +19167,7 @@
         <Element Type="FunctionDef" Id="76872FAF">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="783BE80D"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="0E436422"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="4EADCD86"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4FF06364"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E43B0C36"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="7CA34B80"/>
         </Element>
         <Element Type="ParamDef" Id="783BE80D">
             <ParameterType>
@@ -19182,58 +19179,6 @@
             <Value>0</Value>
             <ValueType Type="int"/>
         </Element>
-        <Element Type="Variable" Id="0E436422">
-            <VariableType>
-                <Type Value="int"/>
-            </VariableType>
-            <Value Type="Param" Library="ABFE498B" Id="23615A6E"/>
-        </Element>
-        <Element Type="Param" Id="23615A6E">
-            <Value>0</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="Variable" Id="4EADCD86">
-            <VariableType>
-                <Type Value="unit"/>
-            </VariableType>
-            <Value Type="Param" Library="ABFE498B" Id="DD3B4847"/>
-        </Element>
-        <Element Type="Param" Id="DD3B4847">
-            <Preset Type="PresetValue" Library="Ntve" Id="D6EA4D09"/>
-        </Element>
-        <Element Type="FunctionCall" Id="4FF06364">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="278E53F9"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="07DB3D7C"/>
-        </Element>
-        <Element Type="Param" Id="278E53F9">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="0E436422"/>
-        </Element>
-        <Element Type="Param" Id="07DB3D7C">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FBAEF0D9"/>
-        </Element>
-        <Element Type="FunctionCall" Id="FBAEF0D9">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000255"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="BD4F6DCF"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="969497A5"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="2A20FE00"/>
-        </Element>
-        <Element Type="Param" Id="BD4F6DCF">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="448F39DC"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="DA6F0821"/>
-        </Element>
-        <Element Type="Param" Id="969497A5">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000447"/>
-            <Value>AP_CloakingTechnologyPredator</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Upgrade"/>
-        </Element>
-        <Element Type="Param" Id="2A20FE00">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000446"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="783BE80D"/>
-        </Element>
         <Element Type="FunctionCall" Id="E43B0C36">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
             <Parameter Type="Param" Library="ABFE498B" Id="3382CA3A"/>
@@ -19255,279 +19200,6 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
-        <Element Type="FunctionCall" Id="7CA34B80">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2C4805B0"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1866E581"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="9143B2F3"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="9F063A6F"/>
-        </Element>
-        <Element Type="FunctionCall" Id="2C4805B0">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
-            <FunctionCall Type="Comment" Library="ABFE498B" Id="914EB16A"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="A2DC915D"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="7CA4D409"/>
-        </Element>
-        <Element Type="Comment" Id="914EB16A">
-            <Comment>
-                If the player didn&apos;t have the upgrade before, set the starting energy
-            </Comment>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        </Element>
-        <Element Type="FunctionCall" Id="A2DC915D">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000327"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="78DC40F0"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="2449F013"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B8636EB2"/>
-        </Element>
-        <Element Type="Param" Id="78DC40F0">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000618"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="73DA7600"/>
-        </Element>
-        <Element Type="FunctionCall" Id="73DA7600">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="82C68E13"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="F1ECA00C"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="6A450928"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="6AB5375A"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="0DB57F16"/>
-        </Element>
-        <Element Type="Param" Id="82C68E13">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-            <Value>AP_Predator</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Unit"/>
-        </Element>
-        <Element Type="Param" Id="F1ECA00C">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="783BE80D"/>
-        </Element>
-        <Element Type="Param" Id="6A450928">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FB7438E4"/>
-        </Element>
-        <Element Type="FunctionCall" Id="FB7438E4">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-        </Element>
-        <Element Type="Param" Id="6AB5375A">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-            <Value>-;Missile,Dead,Hidden</Value>
-            <ValueType Type="unitfilter"/>
-        </Element>
-        <Element Type="Param" Id="0DB57F16">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-        </Element>
-        <Element Type="Param" Id="2449F013">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000617"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="4EADCD86"/>
-        </Element>
-        <Element Type="FunctionCall" Id="B8636EB2">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000087"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000007"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="62BA74AA"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="C15C5FE5"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="7CCAAD06"/>
-        </Element>
-        <Element Type="Param" Id="62BA74AA">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000151"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="4EADCD86"/>
-        </Element>
-        <Element Type="Param" Id="C15C5FE5">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000152"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="B02395AB"/>
-        </Element>
-        <Element Type="Param" Id="7CCAAD06">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000153"/>
-            <Value>50.0</Value>
-            <ValueType Type="fixed"/>
-        </Element>
-        <Element Type="FunctionCall" Id="7CA4D409">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="206F7D55"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="0499EC4B"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="24A14E27"/>
-        </Element>
-        <Element Type="Param" Id="206F7D55">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="0E436422"/>
-        </Element>
-        <Element Type="Param" Id="0499EC4B">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
-        </Element>
-        <Element Type="Param" Id="24A14E27">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
-            <Value>0</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="FunctionCall" Id="1866E581">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="2F2F49AF"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="EF0DF6F7"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="8B7E322C"/>
-        </Element>
-        <Element Type="Param" Id="2F2F49AF">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="783BE80D"/>
-        </Element>
-        <Element Type="Param" Id="EF0DF6F7">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
-            <Value>1</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="Param" Id="8B7E322C">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_CellularReactorsPredator</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Upgrade"/>
-        </Element>
-        <Element Type="FunctionCall" Id="9143B2F3">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-            <FunctionCall Type="Comment" Library="ABFE498B" Id="15F6F936"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="458755E3"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="7395670D"/>
-        </Element>
-        <Element Type="Comment" Id="15F6F936">
-            <Comment>
-                If the player didn&apos;t have the upgrade before, set the starting energy
-            </Comment>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        </Element>
-        <Element Type="FunctionCall" Id="458755E3">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000327"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="5E738E10"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="E847A7B9"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6A29FCB5"/>
-        </Element>
-        <Element Type="Param" Id="5E738E10">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000618"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F9775D67"/>
-        </Element>
-        <Element Type="FunctionCall" Id="F9775D67">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="0A714916"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="5CC97387"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="BCEBB3D7"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="B2EC1D8E"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="42D60414"/>
-        </Element>
-        <Element Type="Param" Id="0A714916">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-            <Value>AP_Predator</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Unit"/>
-        </Element>
-        <Element Type="Param" Id="5CC97387">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="783BE80D"/>
-        </Element>
-        <Element Type="Param" Id="BCEBB3D7">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F9C1D8EC"/>
-        </Element>
-        <Element Type="FunctionCall" Id="F9C1D8EC">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-        </Element>
-        <Element Type="Param" Id="B2EC1D8E">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-            <Value>-;Missile,Dead,Hidden</Value>
-            <ValueType Type="unitfilter"/>
-        </Element>
-        <Element Type="Param" Id="42D60414">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-        </Element>
-        <Element Type="Param" Id="E847A7B9">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000617"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="4EADCD86"/>
-        </Element>
-        <Element Type="FunctionCall" Id="6A29FCB5">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000087"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000007"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="D7D4E8E0"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="FAB74361"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="F5A82402"/>
-        </Element>
-        <Element Type="Param" Id="D7D4E8E0">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000151"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="4EADCD86"/>
-        </Element>
-        <Element Type="Param" Id="FAB74361">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000152"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="B02395AB"/>
-        </Element>
-        <Element Type="Param" Id="F5A82402">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000153"/>
-            <Value>150.0</Value>
-            <ValueType Type="fixed"/>
-        </Element>
-        <Element Type="FunctionCall" Id="7395670D">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="54D9A159"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="01ACCA93"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="539BB980"/>
-        </Element>
-        <Element Type="Param" Id="54D9A159">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
-            <Variable Type="Variable" Library="ABFE498B" Id="0E436422"/>
-        </Element>
-        <Element Type="Param" Id="01ACCA93">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
-        </Element>
-        <Element Type="Param" Id="539BB980">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
-            <Value>0</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="FunctionCall" Id="9F063A6F">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
-            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="ADDB9E40"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="31B585EA"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="4B6FEDAF"/>
-        </Element>
-        <Element Type="Param" Id="ADDB9E40">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1AC3CEF9"/>
-        </Element>
-        <Element Type="FunctionCall" Id="1AC3CEF9">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000255"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="7972C05D"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="7F8724D4"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="4FFD4547"/>
-        </Element>
-        <Element Type="Param" Id="7972C05D">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="448F39DC"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="DA6F0821"/>
-        </Element>
-        <Element Type="Param" Id="7F8724D4">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000446"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="783BE80D"/>
-        </Element>
-        <Element Type="Param" Id="4FFD4547">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000447"/>
-            <Value>AP_CellularReactors</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Upgrade"/>
-        </Element>
-        <Element Type="Param" Id="31B585EA">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
-            <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
-        </Element>
-        <Element Type="Param" Id="4B6FEDAF">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
-            <Value>1</Value>
-            <ValueType Type="int"/>
-        </Element>
         <Element Type="FunctionDef" Id="0B9FD37F">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="67549B31"/>
@@ -19596,7 +19268,43 @@
         </Element>
         <Element Type="Param" Id="4609DA85">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_PredatorFury</Value>
+            <Value>AP_PredatorVespeneSynthesis</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionDef" Id="6649708D">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="3CFF4268"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C2C37697"/>
+        </Element>
+        <Element Type="ParamDef" Id="3CFF4268">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="0D6BE43A"/>
+        </Element>
+        <Element Type="Param" Id="0D6BE43A">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="C2C37697">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A52BB97F"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="402D179A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E542D455"/>
+        </Element>
+        <Element Type="Param" Id="A52BB97F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="3CFF4268"/>
+        </Element>
+        <Element Type="Param" Id="402D179A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="E542D455">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_PredatorAdaptiveDefenses</Value>
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 3041fc71b..512ee1ebc 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -386,6 +386,7 @@ FunctionDef/Name/lib_ABFE498B_64F45D80=AP_Triggers_Protoss_unlockDisruptorPerfec
 FunctionDef/Name/lib_ABFE498B_64F777D3=AP_Triggers_Zerg_BroodLordEvolvedCarapace
 FunctionDef/Name/lib_ABFE498B_651AD4D5=AP_Triggers_unlockTerranArmory7
 FunctionDef/Name/lib_ABFE498B_652B58E3=AP_Triggers_Terran_unlockHERCGrapplePull
+FunctionDef/Name/lib_ABFE498B_6649708D=AP_Triggers_Terran_unlockPredatorAdaptiveDefenses
 FunctionDef/Name/lib_ABFE498B_66568157=AP_Triggers_unlockTerranBuildings
 FunctionDef/Name/lib_ABFE498B_66759A11=AP_Triggers_Terran_unlockScienceVesselAdvancedAISystems
 FunctionDef/Name/lib_ABFE498B_671B0162=AP_Triggers_Zerg_unlockSpineCrawler
@@ -592,7 +593,7 @@ FunctionDef/Name/lib_ABFE498B_A580862B=AP_Triggers_Terran_unlockHiSecAutoTrackin
 FunctionDef/Name/lib_ABFE498B_A5FA163C=AP_Triggers_Zerg_unlockInfestedSiegeTank
 FunctionDef/Name/lib_ABFE498B_A6091B36=AP_Triggers_Protoss_unlockSuperiorWarpGates
 FunctionDef/Name/lib_ABFE498B_A643BA8C=AP_Triggers_Protoss_unlockDarkTemplarShakuras
-FunctionDef/Name/lib_ABFE498B_A64D8598=AP_Triggers_Terran_unlockPredatorFury
+FunctionDef/Name/lib_ABFE498B_A64D8598=AP_Triggers_Terran_unlockPredatorVespeneSynthesis
 FunctionDef/Name/lib_ABFE498B_A7186D24=AP_Triggers_Protoss_unlockReaverSolaritePayload
 FunctionDef/Name/lib_ABFE498B_A7282F2F=AP_Triggers_Protoss_unlockHavocBloodshardResonance
 FunctionDef/Name/lib_ABFE498B_A7AE2616=AP_Triggers_Terran_unlockTechReactor
@@ -1064,6 +1065,7 @@ ParamDef/Name/lib_ABFE498B_3BC06227=level
 ParamDef/Name/lib_ABFE498B_3C1D477D=player
 ParamDef/Name/lib_ABFE498B_3C96567F=player
 ParamDef/Name/lib_ABFE498B_3CC53835=bitArrayValue
+ParamDef/Name/lib_ABFE498B_3CFF4268=player
 ParamDef/Name/lib_ABFE498B_3D0270E9=player
 ParamDef/Name/lib_ABFE498B_3D29B8AC=level
 ParamDef/Name/lib_ABFE498B_3EC8574D=player
@@ -1706,7 +1708,6 @@ Variable/Name/lib_ABFE498B_07352B2A=AP_Triggers_Terran_terranShipArmorLevel
 Variable/Name/lib_ABFE498B_08801FBF=AP_Triggers_Terran_hasBanshee
 Variable/Name/lib_ABFE498B_0CCA3825=AP_Triggers_onDifficultyCasual
 Variable/Name/lib_ABFE498B_0D7B4949=AP_Triggers_Protoss_has_Energizer
-Variable/Name/lib_ABFE498B_0E436422=upgradeLevels
 Variable/Name/lib_ABFE498B_0F2909FC=mutation1Value
 Variable/Name/lib_ABFE498B_0F481473=AP_Triggers_Protoss_has_Tempest
 Variable/Name/lib_ABFE498B_0FAF9046=AP_Triggers_Protoss_has_Annihilator
@@ -1758,7 +1759,6 @@ Variable/Name/lib_ABFE498B_4B49FCFE=mutation3Value
 Variable/Name/lib_ABFE498B_4C07DE09=overrideRace
 Variable/Name/lib_ABFE498B_4D3F73BE=upgradeLevels
 Variable/Name/lib_ABFE498B_4DCCF6C3=enableMorphling
-Variable/Name/lib_ABFE498B_4EADCD86=currentUnit
 Variable/Name/lib_ABFE498B_4F2C5082=unit
 Variable/Name/lib_ABFE498B_4F660184=AP_Triggers_Protoss_has_StalkerShakuras
 Variable/Name/lib_ABFE498B_50E9FC36=AP_Triggers_Option_SoAPresenceAutocasts