Add Liberator Compressed Rocket Fuel

Ziktofel · Jul 2, 2024 · fb3cc6f · fb3cc6f
1 parent ccbf046
commit fb3cc6f
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 2 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -5433,4 +5433,8 @@
         <Icon value="Assets\Textures\btn-ability-hornerhan-fleethyperjump.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-hornerhan-fleethyperjump.dds"/>
     </CButton>
+    <CButton id="AP_LiberatorCompressedRocketFuel">
+        <Icon value="Assets\Textures\btn-upgrade-terran-magfieldaccelerator.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-terran-magfieldaccelerator.dds"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3403,4 +3403,12 @@
         <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeScienceVesselTacticalJumpCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveLiberatorImprovedAARange">
+        <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeLiberatorImprovedAARangeCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveLiberatorImprovedAARangeNoFighterMode">
+        <NodeArray index="Use" Link="AP_CountUpgradeNotPossibleFighterModeCompleteOnly"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeLiberatorImprovedAARangeCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5880,4 +5880,8 @@
         <Count Link="AP_ScienceVesselTacticalJump" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeLiberatorImprovedAARangeCompleteOnly">
+        <Count Link="AP_LiberatorImprovedAARange" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -3317,6 +3317,7 @@
             <LayoutButtons Face="AP_NovaMultiTaskMAFServos" Type="Passive" Requirements="AP_HaveMultiTaskMAFServosLiberator" Row="1" Column="2"/>
             <LayoutButtons Face="AP_LaserTargetingSystem" Type="Passive" Requirements="AP_HaveLaserTargetingSystemLiberator" Row="1" Column="3"/>
             <LayoutButtons Face="AP_LiberatorGuerillaMissiles" Type="Passive" Requirements="AP_HaveLiberatorGuerillaMissiles" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_LiberatorCompressedRocketFuel" Type="Passive" Requirements="AP_HaveLiberatorImprovedAARange" Row="2" Column="4"/>
             <LayoutButtons Face="AP_CloakOnLiberator" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,On" Row="2" Column="2"/>
             <LayoutButtons Face="CloakOff" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,Off" Row="2" Column="3"/>
         </CardLayouts>
@@ -3391,6 +3392,7 @@
             <LayoutButtons Face="AP_NovaMultiTaskMAFServos" Type="Passive" Requirements="AP_HaveMultiTaskMAFServosLiberator" Row="1" Column="2"/>
             <LayoutButtons Face="AP_LaserTargetingSystem" Type="Passive" Requirements="AP_HaveLaserTargetingSystemLiberator" Row="1" Column="3"/>
             <LayoutButtons Face="AP_LiberatorGuerillaMissiles" Type="Passive" Requirements="AP_HaveLiberatorGuerillaMissilesNoFighterMode" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_LiberatorCompressedRocketFuel" Type="Passive" Requirements="AP_HaveLiberatorImprovedAARangeNoFighterMode" Row="2" Column="4"/>
             <LayoutButtons Face="AP_CloakOnLiberator" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,On" Row="2" Column="2"/>
             <LayoutButtons Face="CloakOff" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,Off" Row="2" Column="3"/>
         </CardLayouts>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -12521,6 +12521,7 @@
         <EffectArray Reference="Weapon,AP_NovaRavenSeekerMissile,RateMultiplier" Value="0.15"/>
         <EffectArray Reference="Weapon,AP_InfestedSiegeBreaker,RateMultiplier" Value="0.15"/>
         <EffectArray Reference="Weapon,AP_InfestedArcliteShockCannon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MedivacInfestedSiegeTankAirlift,RateMultiplier" Value="0.15"/>
         <EffectArray Reference="Weapon,AP_InfestedBanshee,RateMultiplier" Value="0.15"/>
     </CUpgrade>
     <CUpgrade id="AP_FastDelivery">
@@ -12588,4 +12589,13 @@
         <EffectArray Operation="Subtract" Reference="Unit,AP_MissileTurret,CostResource[Minerals]" Value="25"/>
     </CUpgrade>
     <CUpgrade id="AP_ScienceVesselTacticalJump"/>
+    <CUpgrade id="AP_LiberatorImprovedAARange">
+        <Flags index="UpgradeCheat" value="0"/>
+        <EffectArray Reference="Weapon,AP_LiberatorMissileLaunchers,Range" Value="4"/>
+        <EffectArray Reference="Weapon,AP_LiberatorMissileLaunchers,MinScanRange" Value="4"/>
+        <EffectArray Reference="Weapon,AP_MercLiberatorMissileLaunchers,Range" Value="4"/>
+        <EffectArray Reference="Weapon,AP_MercLiberatorMissileLaunchers,MinScanRange" Value="4"/>
+        <EditorCategories value="Race:Terran,UpgradeType:SpellResearch"/>
+        <AffectedUnitArray value="AP_Liberator"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1736,6 +1736,7 @@ Button/Name/AP_MorphToOverseer=Morph to Overseer
 Button/Name/AP_OracleEnergyUpgrade=Bosonic Core
 Button/Name/AP_DevastatorTurretPunisherGrenades=Punisher Grenades
 Button/Name/AP_FleetwideJump=Tactical Jump
+Button/Name/AP_LiberatorCompressedRocketFuel=Compressed Rocket Fuel
 Button/Tooltip/AP_250mmStrikeCannons=Stuns target unit. Deals <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsDamage,Amount"/> damage over <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodicPeriodArray[0]"/> seconds.
 Button/Tooltip/AP_330mmBarrageCannons=Stuns all enemies in a small area. Deals <d ref="Effect,AP_330mmBarrageCannonsPersistent,PeriodCount * Effect,AP_330mmBarrageCannonsDamage,Amount"/> damage over <d ref="Effect,AP_330mmBarrageCannonsPersistent,PeriodCount * Effect,AP_330mmBarrageCannonsPersistent,PeriodicPeriodArray[0]"/> seconds in a larger area.
 Button/Tooltip/AP_AWrp=Sacrifices 2 Templar to create an Archon.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
@@ -2833,6 +2834,7 @@ Button/Tooltip/AP_OverlordCocoon=This cocoon contains an Overlord as it is morph
 Button/Tooltip/AP_OracleEnergyUpgrade=Increases starting energy by 150 and maximum energy by 50.
 Button/Tooltip/AP_DevastatorTurretPunisherGrenades=Increases damage to armored targets by 10.
 Button/Tooltip/AP_FleetwideJump=Warps to the target location. Aircraft is invulnerable while warping.
+Button/Tooltip/AP_LiberatorCompressedRocketFuel=Increases Lexington Rockets range by 4.
 Effect/Name/AP_250mmStrikeCannonsApplyBehavior=250mm Strike Cannons (Apply Behavior)
 Effect/Name/AP_250mmStrikeCannonsCreatePersistent=250mm Strike Cannons (Create Persistent)
 Effect/Name/AP_250mmStrikeCannonsDamage=250mm Strike Cannons (Damage)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -506,7 +506,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency, // 2
         libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency, // 3
         libABFE498B_gf_AP_Triggers_Terran_unlockScienceVesselTacticalJump, // 4
-        ap_triggers_PlayerConsumer_sig, // 5
+        libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel, // 5
         ap_triggers_PlayerConsumer_sig, // 6
         ap_triggers_PlayerConsumer_sig, // 7
         ap_triggers_PlayerConsumer_sig, // 8
@@ -3284,6 +3284,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorGuerillaMissiles (int lp_p
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_LiberatorGuerillaMissiles", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_LiberatorImprovedAARange", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDrillingClaws (int lp_player) {
     // Automatic Variable Declarations
     // Implementation

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -362,6 +362,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorLaserTargetingSystem (int
 void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorOptimizedLogistics (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorResourceEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorGuerillaMissiles (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDrillingClaws (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineConcealment (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineBlackMarketLaunchers (int lp_player);

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2749,7 +2749,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency, // 2
                     libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency, // 3
                     libABFE498B_gf_AP_Triggers_Terran_unlockScienceVesselTacticalJump, // 4
-                    ap_triggers_PlayerConsumer_sig, // 5
+                    libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel, // 5
                     ap_triggers_PlayerConsumer_sig, // 6
                     ap_triggers_PlayerConsumer_sig, // 7
                     ap_triggers_PlayerConsumer_sig, // 8
@@ -22848,6 +22848,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="0A2637A8"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="E461A967"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D133E010"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="85D3604E"/>
         </Element>
         <Element Type="FunctionDef" Id="113B7B29">
             <FlagAction/>
@@ -23607,6 +23608,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="85D3604E">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E0E985F2"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1F270527"/>
+        </Element>
+        <Element Type="ParamDef" Id="E0E985F2">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="94D36744"/>
+        </Element>
+        <Element Type="Param" Id="94D36744">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="1F270527">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="CEEB1F14"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="58066339"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="780B2D4C"/>
+        </Element>
+        <Element Type="Param" Id="CEEB1F14">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E0E985F2"/>
+        </Element>
+        <Element Type="Param" Id="58066339">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="780B2D4C">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_LiberatorImprovedAARange</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="401B8EE2">
             <Item Type="FunctionDef" Library="ABFE498B" Id="88A21D71"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="B38C6B54"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -449,6 +449,7 @@ FunctionDef/Name/lib_ABFE498B_836F60F0=AP_Triggers_Terran_unlockMarauderKineticF
 FunctionDef/Name/lib_ABFE498B_83833BCC=AP_Triggers_Zerg_RavagerDeepTunnel
 FunctionDef/Name/lib_ABFE498B_844AC9AE=AP_Triggers_Terran_unlockCycloneResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_848D560C=AP_Triggers_Zerg_CorruptorCausticSpray
+FunctionDef/Name/lib_ABFE498B_85D3604E=AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel
 FunctionDef/Name/lib_ABFE498B_862C698C=AP_Triggers_Zerg_HydraliskResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_872A7796=AP_Triggers_Terran_unlockBattlecruiserProgressiveDefensiveMatrix
 FunctionDef/Name/lib_ABFE498B_87978982=AP_Triggers_Terran_unlockSiegeTankJumpJets
@@ -1433,6 +1434,7 @@ ParamDef/Name/lib_ABFE498B_E070D3F5=player
 ParamDef/Name/lib_ABFE498B_E082403E=onNormal
 ParamDef/Name/lib_ABFE498B_E0C664B7=bitArrayValue
 ParamDef/Name/lib_ABFE498B_E0D9067E=player
+ParamDef/Name/lib_ABFE498B_E0E985F2=player
 ParamDef/Name/lib_ABFE498B_E1253FFC=player
 ParamDef/Name/lib_ABFE498B_E138340F=player
 ParamDef/Name/lib_ABFE498B_E1BBB135=player