Finalize Pride of Augustgrad unit

Ziktofel · Sep 3, 2024 · 300a99d · 300a99d
1 parent ff64e48
commit 300a99d
Show file tree

Hide file tree

Showing 20 changed files with 875 additions and 11 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -12058,7 +12058,7 @@
         <ShowProgressArray index="Channel" value="1"/>
         <UninterruptibleArray index="Channel" value="1"/>
         <ProgressButtonArray index="Channel" value="AP_BattlecruiserMengskHyperjump"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_BattlecruiserMengskHyperjump" Requirements="AP_HaveMengskVeterancyBattlecruiserMengskLevel1">
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_BattlecruiserMengskHyperjump" Requirements="AP_HaveMengskVeterancyBattlecruiserMengskLevel1AndHyperjump">
             <Flags index="ToSelection" value="1"/>
         </CmdButtonArray>
     </CAbilEffectTarget>
@@ -12087,8 +12087,21 @@
         <ShowProgressArray index="Channel" value="1"/>
         <UninterruptibleArray index="Channel" value="1"/>
         <ProgressButtonArray index="Channel" value="AP_BattlecruiserMengskHyperjump"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_BattlecruiserMengskHyperjump" Requirements="AP_HaveMengskVeterancyBattlecruiserMengskGELevel2">
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_BattlecruiserMengskHyperjump" Requirements="AP_HaveMengskVeterancyBattlecruiserMengskGELevel2AndHyperjump">
             <Flags index="ToSelection" value="1"/>
         </CmdButtonArray>
     </CAbilEffectTarget>
+    <CAbilEffectInstant id="AP_BattlecruiserShieldRestore">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_BattlecruiserShieldRestore"/>
+        <Flags index="AutoCast" value="1"/>
+        <Flags index="TransientPreferred" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="100"/>
+            <Cooldown TimeUse="20"/>
+        </Cost>
+        <AutoCastRange value="1"/>
+        <AutoCastValidatorArray value="CasterShieldsLT1"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_AdvancedDefensiveMatrix" Requirements="AP_HaveBattlecruiserAdvancedDefensiveMatrix"/>
+    </CAbilEffectInstant>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -4434,6 +4434,7 @@
     <CActorSound id="AP_DefensiveMatrixBirth" parent="SoundOneShot">
         <On Terms="Behavior.AP_DefensiveMatrix.On" Send="Create"/>
         <On Terms="Behavior.AP_DefensiveMatrix.Off" Send="Destroy"/>
+        <On Terms="Effect.AP_BattlecruiserShieldRestore.Start" Send="Create"/>
         <Sound value="Battlecruiser_DefensiveMatrixBirth"/>
     </CActorSound>
     <CActorSound id="AP_DefensiveMatrixDeath" parent="SoundOneShot">
@@ -35483,6 +35484,8 @@
         <On Terms="WeaponStart.AP_ATSLaserBatteryMengsk.AttackStart" Target="_BattlecruiserTurretATA" Send="LookAtEngage Continue"/>
         <On Terms="Abil.attack.ReadyStop" Target="_BattlecruiserTurretATS" Send="LookAtDisengage"/>
         <On Terms="Abil.attack.ReadyStop" Target="_BattlecruiserTurretATA" Send="LookAtDisengage"/>
+        <On Terms="Upgrade.AP_BattlecruiserAdvancedDefensiveMatrix.Add" Send="Create ShieldImpact"/>
+        <On Terms="Upgrade.AP_BattlecruiserRangeAura.Add" Send="Create AP_BattlecruiserBonusRange"/>
         <HostSiteOps Ops="SOpBankerBattlecruiser"/>
         <ModelFlags index="AutomateGlobalLoops" value="1"/>
         <ModelFlags index="NeedsVolumeMonitoring" value="1"/>
@@ -35622,6 +35625,11 @@
         <Wireframe>
             <Image value="Assets\Textures\Wireframe-Terran-Battlecruiser.dds"/>
         </Wireframe>
+        <WireframeShield>
+            <Image value="AP\Assets\Custom\Textures\Wireframe-Terran-Battlecruiser-shield01.dds"/>
+            <Image value="AP\Assets\Custom\Textures\Wireframe-Terran-Battlecruiser-shield02.dds"/>
+            <Image value="AP\Assets\Custom\Textures\Wireframe-Terran-Battlecruiser-shield03.dds"/>
+        </WireframeShield>
     </CActorUnit>
     <CActorSound id="AP_BattlecruiserMengsk_HyperJumpIn_Sound">
         <On Terms="Behavior.AP_HyperjumpMengskTeleportIn.On" Send="Create"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -7621,35 +7621,38 @@
     <CBehaviorVeterancy id="AP_MengskVeterancyBattlecruiserMengsk">
         <EditorCategories value="AbilityorEffectType:Units"/>
         <XPFraction index="Kills" value="0"/>
-        <VeterancyLevelArray RankNameSchema="Behavior/RankName/MengskRank0"/>
-        <VeterancyLevelArray MinVeterancyXP="3000" LevelGainEffect="AP_MengskVeteranLevelUpDummy" RankNameSchema="Behavior/RankName/MengskRank1">
+        <VeterancyLevelArray RankNameSchema="Behavior/RankName/AP_MengskRank0"/>
+        <VeterancyLevelArray MinVeterancyXP="3000" LevelGainEffect="AP_MengskVeteranLevelUpDummy" RankNameSchema="Behavior/RankName/AP_MengskRank1">
             <Modification>
 <!--                <DamageDealtFraction index="Melee" value="0.25"/>-->
 <!--                <DamageDealtFraction index="Ranged" value="0.25"/>-->
 <!--                <DamageDealtFraction index="Splash" value="0.25"/>-->
                 <LifeArmorBonus value="1"/>
+                <ShieldArmorBonus value="1"/>
                 <VitalMaxArray index="Life" value="200"/>
             </Modification>
         </VeterancyLevelArray>
-        <VeterancyLevelArray MinVeterancyXP="7000" LevelGainEffect="AP_MengskVeteranLevelUpDummy" RankNameSchema="Behavior/RankName/MengskRank2">
+        <VeterancyLevelArray MinVeterancyXP="7000" LevelGainEffect="AP_MengskVeteranLevelUpDummy" RankNameSchema="Behavior/RankName/AP_MengskRank2">
             <Modification>
 <!--                <DamageDealtFraction index="Melee" value="0.25"/>-->
 <!--                <DamageDealtFraction index="Ranged" value="0.25"/>-->
 <!--                <DamageDealtFraction index="Splash" value="0.25"/>-->
                 <LifeArmorBonus value="1"/>
+                <ShieldArmorBonus value="1"/>
                 <VitalMaxArray index="Life" value="200"/>
             </Modification>
         </VeterancyLevelArray>
         <VeterancyLevelArray>
             <MinVeterancyXP value="12000"/>
             <LevelGainEffect value="AP_MengskVeteranMaxedTrigger"/>
             <LevelLossEffect value="AP_MengskVeteranTrigger"/>
-            <RankNameSchema value="Behavior/RankName/MengskRank3"/>
+            <RankNameSchema value="Behavior/RankName/AP_MengskRank3"/>
             <Modification>
 <!--                <DamageDealtFraction index="Melee" value="0.25"/>-->
 <!--                <DamageDealtFraction index="Ranged" value="0.25"/>-->
 <!--                <DamageDealtFraction index="Splash" value="0.25"/>-->
                 <LifeArmorBonus value="1"/>
+                <ShieldArmorBonus value="1"/>
                 <VitalMaxArray index="Life" value="200"/>
             </Modification>
         </VeterancyLevelArray>
@@ -7733,4 +7736,11 @@
         <BehaviorFlags index="Permanent" value="1"/>
         <DisableValidatorArray value="AP_LevelEq4"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_BattlecruiserMengskBehemothReactorIndicator">
+        <!-- Indicator of passive upgrade - full command card -->
+        <BehaviorFlags index="Permanent" value="1"/>
+        <DisableValidatorArray value="AP_HaveBattlecruiserBehemothReactor"/>
+        <InfoIcon value="Assets\Textures\btn-upgrade-terran-behemothreactor.dds"/>
+        <Name value="Button/Name/AP_BattlecruiserBehemothReactor"/>
+    </CBehaviorBuff>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4286,6 +4286,7 @@
         <EditorCategories value="Race:Protoss"/>
     </CButton>
     <CButton id="AP_AdvancedDefensiveMatrix">
+        <Hotkey value="Button/Hotkey/AP_DefensiveMatrix"/>
         <Icon value="assets\textures\btn-upgrade-swann-defensivematrix.dds"/>
         <AlertIcon value="assets\textures\btn-upgrade-swann-defensivematrix.dds"/>
     </CButton>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -18335,4 +18335,11 @@
     <CEffectModifyUnit id="AP_MengskVeteranMaxedTrigger">
         <EditorCategories value=""/>
     </CEffectModifyUnit>
+    <CEffectModifyUnit id="AP_BattlecruiserShieldRestore">
+        <ValidatorArray value="ShieldsNotFull"/>
+        <EditorCategories value="Race:Zerg"/>
+        <VitalArray index="Shields">
+            <Change value="1000"/>
+        </VitalArray>
+    </CEffectModifyUnit>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -16655,6 +16655,10 @@
         <Model value="Assets\COOP\Mengsk\Units\Battlecruiser_Mengsk_COOP\Battlecruiser_Mengsk_COOP.m3"/>
         <ScaleMax value="1.000000,1.000000,1.000000"/>
         <ScaleMin value="1.000000,1.000000,1.000000"/>
+        <!-- Shield Effect -->
+        <AttachProps Id="Ref_Origin" SquibType="Shield" RadiusShield="3">
+            <Keys index="Shield" value="1"/>
+        </AttachProps>
     </CModel>
     <CModel id="AP_BattlecruiserMengskAirAttackImpact" parent="ImpactFX">
         <Model value="Assets\Effects\Terran\BattlecruiserMissileImpact\BattleCruiserMissileImpact.m3"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3815,4 +3815,10 @@
     <CRequirement id="AP_HaveMengskVeterancyBattlecruiserMengskLevel1">
         <NodeArray index="Show" Link="AP_EqCountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit1"/>
     </CRequirement>
+    <CRequirement id="AP_HaveMengskVeterancyBattlecruiserMengskGELevel2AndHyperjump">
+        <NodeArray index="Show" Link="AP_AndGTECountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit2CountUpgradeTacticalJumpCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveMengskVeterancyBattlecruiserMengskLevel1AndHyperjump">
+        <NodeArray index="Show" Link="AP_AndEqCountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit1CountUpgradeTacticalJumpCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6362,4 +6362,12 @@
         <OperandArray index="0" value="AP_CountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit"/>
         <OperandArray index="1" value="2"/>
     </CRequirementGTE>
+    <CRequirementAnd id="AP_AndEqCountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit1CountUpgradeTacticalJumpCompleteOnly">
+        <OperandArray value="AP_EqCountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit1"/>
+        <OperandArray value="AP_CountUpgradeTacticalJumpCompleteOnly"/>
+    </CRequirementAnd>
+    <CRequirementAnd id="AP_AndGTECountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit2CountUpgradeTacticalJumpCompleteOnly">
+        <OperandArray value="AP_GTECountBehaviorMengskVeterancyBattlecruiserMengskCompleteOnlyAtUnit2"/>
+        <OperandArray value="AP_CountUpgradeTacticalJumpCompleteOnly"/>
+    </CRequirementAnd>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -2122,6 +2122,7 @@
         <AbilArray Link="AP_DefensiveMatrix"/>
         <AbilArray Link="AP_Hyperjump"/>
         <AbilArray Link="AP_BattlecruiserCloak"/>
+        <AbilArray Link="AP_BattlecruiserShieldRestore"/>
         <BehaviorArray Link="AP_ScavengingSystemsMechDeath"/>
         <BehaviorArray Link="AP_BattlecruiserBonusRangeSource"/>
         <BehaviorArray Link="AP_BattlecruiserBonusRangeIndicator"/>
@@ -2143,7 +2144,7 @@
             <LayoutButtons Face="AP_YamatoGun" Type="AbilCmd" AbilCmd="AP_Yamato,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_MissilePodsUpgraded" Type="AbilCmd" AbilCmd="AP_MissilePodsUpgraded,0" Row="2" Column="2"/>
             <LayoutButtons Face="AP_MissilePods" Type="AbilCmd" AbilCmd="AP_MissilePods,0" Row="2" Column="2"/>
-            <LayoutButtons Face="AP_AdvancedDefensiveMatrix" Type="Passive" Requirements="AP_HaveBattlecruiserAdvancedDefensiveMatrix" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_AdvancedDefensiveMatrix" Type="AbilCmd" AbilCmd="AP_BattlecruiserShieldRestore,0" Row="2" Column="3"/>
             <LayoutButtons Face="AP_DefensiveMatrix" Type="AbilCmd" AbilCmd="AP_DefensiveMatrix,0" Row="2" Column="3"/>
             <LayoutButtons Face="AP_Hyperjump" Type="AbilCmd" AbilCmd="AP_Hyperjump,Execute" Row="2" Column="1"/>
         </CardLayouts>
@@ -4856,6 +4857,7 @@
         <AbilArray Link="AP_DukesRevengeDefensiveMatrix"/>
         <AbilArray Link="AP_HyperjumpJacksonsRevenge"/>
         <AbilArray Link="AP_BattlecruiserCloak"/>
+        <AbilArray Link="AP_BattlecruiserShieldRestore"/>
         <BehaviorArray Link="AP_BattlecruiserBonusRangeSource"/>
         <BehaviorArray Link="AP_BattlecruiserBonusRangeIndicator"/>
         <WeaponArray Link="AP_DRBattlecruiserG"/>
@@ -4879,7 +4881,7 @@
             <LayoutButtons Face="AP_YamatoGun" Type="AbilCmd" AbilCmd="AP_DukesRevengeYamato,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_MissilePodsUpgraded" Type="AbilCmd" AbilCmd="AP_MissilePodsUpgraded,0" Row="2" Column="2"/>
             <LayoutButtons Face="AP_MissilePods" Type="AbilCmd" AbilCmd="AP_DukesRevengeMissilePods,0" Row="2" Column="2"/>
-            <LayoutButtons Face="AP_AdvancedDefensiveMatrix" Type="Passive" Requirements="AP_HaveBattlecruiserAdvancedDefensiveMatrix" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_AdvancedDefensiveMatrix" Type="AbilCmd" AbilCmd="AP_BattlecruiserShieldRestore,0" Row="2" Column="3"/>
             <LayoutButtons Face="AP_DefensiveMatrix" Type="AbilCmd" AbilCmd="AP_DukesRevengeDefensiveMatrix,0" Row="2" Column="3"/>
             <LayoutButtons Face="AP_Hyperjump" Type="AbilCmd" AbilCmd="AP_HyperjumpJacksonsRevenge,Execute" Row="2" Column="1"/>
         </CardLayouts>
@@ -25675,6 +25677,7 @@
         <LifeMax value="800"/>
         <LifeArmor value="3"/>
         <LifeArmorName value="Unit/LifeArmorName/TerranShipPlating"/>
+        <ShieldArmorName value="Unit/ShieldArmorName/AP_DefensiveMatrixShields"/>
         <Mover value="Fly"/>
         <Speed value="1.4062"/>
         <Acceleration value="1"/>
@@ -25695,13 +25698,20 @@
         <AbilArray Link="AP_BattlecruiserMengskYamatoTwoCharges"/>
         <AbilArray Link="AP_BattlecruiserMengskHyperjump"/>
         <AbilArray Link="AP_BattlecruiserMengskHyperjumpTwoCharges"/>
+        <AbilArray Link="AP_DefensiveMatrix"/>
+        <AbilArray Link="AP_MissilePods"/>
+        <AbilArray Link="AP_MissilePodsUpgraded"/>
+        <AbilArray Link="AP_BattlecruiserCloak"/>
+        <AbilArray Link="AP_BattlecruiserShieldRestore"/>
         <BehaviorArray Link="AP_MengskVeterancyBattlecruiserMengsk"/>
         <BehaviorArray Link="AP_BattlecruiserBonusRangeSource"/>
         <BehaviorArray Link="AP_MengskVeteranTrigger"/>
         <BehaviorArray Link="AP_MengskVeteranL1Tracker"/>
         <BehaviorArray Link="AP_MengskVeteranL2Tracker"/>
         <BehaviorArray Link="AP_MengskVeteranL3Tracker"/>
         <BehaviorArray Link="AP_MengskVeteranL4Tracker"/>
+        <BehaviorArray Link="AP_BattlecruiserBonusRangeIndicator"/>
+        <BehaviorArray Link="AP_BattlecruiserMengskBehemothReactorIndicator"/>
         <WeaponArray Link="AP_BaseLaserBatteryMengskL1Fake"/>
         <WeaponArray Link="AP_ATXLaserBatteryMengskL1Fake"/>
         <WeaponArray Link="AP_ATSLaserBatteryMengsk" Turret="AP_Battlecruiser"/>
@@ -25718,7 +25728,16 @@
             <LayoutButtons Face="AP_YamatoGunMengsk" Type="AbilCmd" AbilCmd="AP_BattlecruiserMengskYamato,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="AP_BattlecruiserMengskHyperjump" Type="AbilCmd" AbilCmd="AP_BattlecruiserMengskHyperjumpTwoCharges,Execute" Row="2" Column="1"/>
             <LayoutButtons Face="AP_BattlecruiserMengskHyperjump" Type="AbilCmd" AbilCmd="AP_BattlecruiserMengskHyperjump,Execute" Row="2" Column="1"/>
-            <LayoutButtons Face="AP_BattlecruiserMengskVeterancy" Type="Passive" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_BattlecruiserMengskVeterancy" Type="Passive" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_AdvancedDefensiveMatrix" Type="AbilCmd" AbilCmd="AP_BattlecruiserShieldRestore,0" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_DefensiveMatrix" Type="AbilCmd" AbilCmd="AP_DefensiveMatrix,0" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_MissilePodsUpgraded" Type="AbilCmd" AbilCmd="AP_MissilePodsUpgraded,0" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_MissilePods" Type="AbilCmd" AbilCmd="AP_MissilePods,0" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_CloakOnBattlecruiser" Type="AbilCmd" AbilCmd="AP_BattlecruiserCloak,0" Row="1" Column="0"/>
+            <LayoutButtons Face="CloakOff" Type="AbilCmd" AbilCmd="AP_BattlecruiserCloak,1" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_BattlecruiserCovertOpsEngines" Type="Passive" Requirements="AP_HaveBattlecruiserCovertOpsEngines" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_BehemothPlating" Type="Passive" Requirements="AP_HaveBattlecruiserBehemothPlating" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_AllPurposeLaserBattery" Type="Passive" Requirements="AP_HaveAdvancedWeaponryBattlecruiser" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.25"/>
         <SeparationRadius value="2.5"/>