From c5b6e09477895dde12ef9d0e70d8b291fde61c0e Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Mon, 1 Jul 2024 16:17:38 +0200 Subject: [PATCH] Add some Terran static def upgrades --- .../Base.SC2Data/GameData/ButtonData.xml | 4 + .../Base.SC2Data/GameData/RequirementData.xml | 4 + .../GameData/RequirementNodeData.xml | 4 + .../Base.SC2Data/GameData/UnitData.xml | 1 + .../Base.SC2Data/GameData/UpgradeData.xml | 9 ++ .../LocalizedData/GameStrings.txt | 2 + .../Base.SC2Data/LibABFE498B.galaxy | 24 +++- .../Base.SC2Data/LibABFE498B_h.galaxy | 3 + .../ArchipelagoTriggers.SC2Mod/DocumentHeader | Bin 156 -> 156 bytes .../GameText.version | Bin 44 -> 44 bytes Mods/ArchipelagoTriggers.SC2Mod/Triggers | 118 +++++++++++++++++- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 6 + 13 files changed, 168 insertions(+), 7 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index fe0e35ebc..efe281899 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -5425,4 +5425,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index da97fb00e..e4be3e6c4 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -3395,4 +3395,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index fbf0a1665..fd8ff0f76 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -5872,4 +5872,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 8b685a581..d1e3e5809 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -6931,6 +6931,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index c5604871b..33e661a4b 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -12578,4 +12578,13 @@ + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index fc9d828cc..512080185 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -1734,6 +1734,7 @@ Button/Name/AP_OverlordSpeed=Pneumatized Carapace Button/Name/AP_OverlordSightUpgrade=Antennae Button/Name/AP_MorphToOverseer=Morph to Overseer Button/Name/AP_OracleEnergyUpgrade=Bosonic Core +Button/Name/AP_DevastatorTurretPunisherGrenades=Punisher Grenades Button/Tooltip/AP_250mmStrikeCannons=Stuns target unit. Deals damage over seconds. Button/Tooltip/AP_330mmBarrageCannons=Stuns all enemies in a small area. Deals damage over seconds in a larger area. Button/Tooltip/AP_AWrp=Sacrifices 2 Templar to create an Archon.Can attack ground and air units. @@ -2829,6 +2830,7 @@ Button/Tooltip/AP_Overseer=Advanced aerial observer. Maintains the unit cap set Button/Tooltip/AP_MorphToOverseer=Advanced aerial observer. Provides the same supply as an Overlord. Can use the Spawn Creep Tumor and Contaminate abilities.Detector Button/Tooltip/AP_OverlordCocoon=This cocoon contains an Overlord as it is morphing into an Overseer. 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. 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 index fbfd5a8f6..e23035ed3 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -502,9 +502,9 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitAr lp_player, lp_bitArrayValue, libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow, // 0 - ap_triggers_PlayerConsumer_sig, // 1 - ap_triggers_PlayerConsumer_sig, // 2 - ap_triggers_PlayerConsumer_sig, // 3 + libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades, // 1 + libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency, // 2 + libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency, // 3 ap_triggers_PlayerConsumer_sig, // 4 ap_triggers_PlayerConsumer_sig, // 5 ap_triggers_PlayerConsumer_sig, // 6 @@ -3438,6 +3438,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretHellstormBatteries (in libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_HailstormMissilePods", 1); } +void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MissileTurretResourceEfficiency", 1); +} + void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterReactor (int lp_player) { // Automatic Variable Declarations // Implementation @@ -3540,6 +3546,18 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow (int lp_player libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DevastatorTurretSlow", 1); } +void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DevastatorTurretPunisherGrenades", 1); +} + +void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DevastatorTurretResourceEfficiency", 1); +} + void libABFE498B_gf_AP_Triggers_Terran_unlockInfantryArmor (int lp_player, int lp_level) { // Automatic Variable Declarations // Implementation diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy index e07769758..bc3a1bed9 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -386,6 +386,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockBunkerShrikeTurret (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockBunkerFortifiedBunker (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretTitaniumHousing (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretHellstormBatteries (int lp_player); +void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterReactor (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterPlanetaryFortress (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterExtraSupplies (int lp_player); @@ -395,6 +396,8 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressProgressiveAugumen void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressAdvancedTargeting (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressOrbitalModule (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow (int lp_player); +void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades (int lp_player); +void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockInfantryArmor (int lp_player, int lp_level); void libABFE498B_gf_AP_Triggers_Terran_unlockInfantryWeapon (int lp_player, int lp_level); void libABFE498B_gf_AP_Triggers_Terran_unlockVehicleArmor (int lp_player, int lp_level); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader index d84cdf8d135ac55a9092bd68c6710fd00bbdfaeb..8fb9cbaabd82fe794db406f5b8b20f01e45c14c4 100644 GIT binary patch delta 32 fcmbQkIEQh9jBr}lhI$ZYfC6R)hKT`U6J5groreft delta 32 gcmbQkIEQh9jIgu*@^2u_00qnp3=;#yCc1_L0GPK3KL7v# diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version index fc2091d5c736f1e370ef90231051f088c12f295a..2d02ee4ba074e6615d9fb3f9dcef3893e95e6ecb 100644 GIT binary patch delta 17 YcmdPVnV`U<&dk7|v8ySKk%55$03G533IG5A delta 17 YcmdPVnV`U<%FMu^JgX^ + @@ -24299,6 +24300,8 @@ + + @@ -24658,6 +24661,42 @@ + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 1 + + + + + AP_MissileTurretResourceEfficiency + + + @@ -25443,7 +25482,6 @@ - AP_Triggers_Terran_unlockDevastatorTurretSlow @@ -25479,6 +25517,78 @@ 1 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_DevastatorTurretPunisherGrenades + + + + + + 1 + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_DevastatorTurretResourceEfficiency + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version index 4f5afe0d2681aadbc60e3f0a1596477a253264eb..8c664282dc761a6fc8f5183db242788fb746106b 100644 GIT binary patch delta 17 YcmdPVnV`U9#KFK&u&XJJk%55$03h81VgLXD delta 17 YcmdPVnV`U<%fY}feQ{G7BLf2i03kR7Z2$lO diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 1806a5964..7409425ad 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -541,6 +541,7 @@ FunctionDef/Name/lib_ABFE498B_A8DC996F=AP_Triggers_Terran_unlockFirebatInfernalP FunctionDef/Name/lib_ABFE498B_A93D603A=AP_Triggers_Protoss_unlockSentinel FunctionDef/Name/lib_ABFE498B_A973FAB0=AP_Triggers_Terran_unlockGhostEMPRounds FunctionDef/Name/lib_ABFE498B_A9C6E0DA=AP_Triggers_Terran_unlockReaperCombatDrugs +FunctionDef/Name/lib_ABFE498B_AC4B1D2E=AP_Triggers_Terran_unlockMissileTurretResourceEfficency FunctionDef/Name/lib_ABFE498B_ACDAEFF1=AP_Triggers_Terran_unlockValkyrieLaunchingVectorCompensator FunctionDef/Name/lib_ABFE498B_AD5B5003=AP_Triggers_Terran_unlockMarineCombatShield FunctionDef/Name/lib_ABFE498B_AD9BBB7A=AP_Triggers_Zerg_AutomatedExtractor @@ -710,6 +711,7 @@ FunctionDef/Name/lib_ABFE498B_E7C72AF9=AP_Triggers_Terran_unlockMarauderJuggerna FunctionDef/Name/lib_ABFE498B_E809FD5E=AP_Triggers_MapConfig_setMissionProtoss FunctionDef/Name/lib_ABFE498B_E82091FB=AP_Triggers_Terran_unlockBattlecruiserATXLaserBattery FunctionDef/Name/lib_ABFE498B_E855CFB3=AP_Triggers_Protoss_unlockVanguard +FunctionDef/Name/lib_ABFE498B_E86DD6BC=AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades FunctionDef/Name/lib_ABFE498B_E93BF582=AP_Triggers_Zerg_ZerglingAdrenalOverload FunctionDef/Name/lib_ABFE498B_E9A6BFF9=AP_Triggers_Terran_unlockSiegeTankSmartServos FunctionDef/Name/lib_ABFE498B_EB0B3D1F=AP_Triggers_Terran_unlockPsiDisrupter @@ -762,6 +764,7 @@ FunctionDef/Name/lib_ABFE498B_FDDA1458=AP_Triggers_Protoss_unlockColossusPurifie FunctionDef/Name/lib_ABFE498B_FDFA73C1=AP_Triggers_Zerg_SwarmQueenOrganicCarapace FunctionDef/Name/lib_ABFE498B_FE756FB1=AP_Triggers_unlockTerranArmory5 FunctionDef/Name/lib_ABFE498B_FE76F038=AP_Triggers_Zerg_unlockSwarmQueen +FunctionDef/Name/lib_ABFE498B_FE8BED83=AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency FunctionDef/Name/lib_ABFE498B_FE9453BD=AP_Triggers_Terran_unlockShipWeapon FunctionDef/Name/lib_ABFE498B_FF8C8ED5=AP_Triggers_Protoss_unlockDeployFenix Library/Name/ABFE498B=Archipelago Triggers @@ -842,6 +845,7 @@ ParamDef/Name/lib_ABFE498B_19610AEA=bitArrayValue ParamDef/Name/lib_ABFE498B_19A18FCB=player ParamDef/Name/lib_ABFE498B_1A2AA6FA=player ParamDef/Name/lib_ABFE498B_1A92F828=player +ParamDef/Name/lib_ABFE498B_1A9EADDF=player ParamDef/Name/lib_ABFE498B_1AA1C443=player ParamDef/Name/lib_ABFE498B_1B042BAF=player ParamDef/Name/lib_ABFE498B_1B27F501=player @@ -983,6 +987,7 @@ ParamDef/Name/lib_ABFE498B_48E462B0=player ParamDef/Name/lib_ABFE498B_495EB8CE=player ParamDef/Name/lib_ABFE498B_4976F6CB=player ParamDef/Name/lib_ABFE498B_49E8E34B=player +ParamDef/Name/lib_ABFE498B_4A24B905=player ParamDef/Name/lib_ABFE498B_4A35B01B=player ParamDef/Name/lib_ABFE498B_4A59862A=player ParamDef/Name/lib_ABFE498B_4B2F6C4C=player @@ -1190,6 +1195,7 @@ ParamDef/Name/lib_ABFE498B_8A08982B=player ParamDef/Name/lib_ABFE498B_8A39C57E=player ParamDef/Name/lib_ABFE498B_8A906BD8=level ParamDef/Name/lib_ABFE498B_8AAC109F=player +ParamDef/Name/lib_ABFE498B_8B8A0FF6=player ParamDef/Name/lib_ABFE498B_8B8D1DD4=player ParamDef/Name/lib_ABFE498B_8BA94016=player ParamDef/Name/lib_ABFE498B_8BCD87DD=player