Merge pull request #225 from EnvyDragon/one-ugly-motherf

Predator Rework
Ziktofel · Sep 2, 2024 · da23251 · da23251
2 parents 2e29d9c + 22a39f2
commit da23251
Show file tree

Hide file tree

Showing 20 changed files with 272 additions and 423 deletions.
diff --git a/...er.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield01.dds b/...er.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield01.dds
diff --git a/...er.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield02.dds b/...er.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield02.dds
diff --git a/...er.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield03.dds b/...er.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/wireframe-terran-predator-shield03.dds
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"/>