From 55e39b47ca25f882413c2b31dc212efefa288e2e Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 5 Jul 2024 22:32:40 -0700 Subject: [PATCH] sc2: Added instigator war council upgrade - resource efficiency --- .../Base.SC2Data/GameData/UnitData.xml | 4 +- .../Base.SC2Data/GameData/UpgradeData.xml | 6 +++ .../Base.SC2Data/LibABFE498B.galaxy | 8 +++- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + Mods/ArchipelagoTriggers.SC2Mod/Triggers | 40 ++++++++++++++++++- .../LocalizedData/TriggerStrings.txt | 2 + 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index ecb5d6918..8c0ee8e10 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -19422,8 +19422,8 @@ - - + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index 300784ca5..13c85856f 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -11100,6 +11100,12 @@ + + + + + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index 347ff34ce..33786f223 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1512,7 +1512,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor, // 3 libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit, // 4 - ap_triggers_PlayerConsumer_sig, // 5 + libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 @@ -6698,6 +6698,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerFamilyParticleReflection (i libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_VoidStalkerMultishot", 1); } +void libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InstigatorResourceEfficiency", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonHighImpactPhaseDisruptors (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 index b970bcab4..220fea3ec 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -669,6 +669,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptResonatingGlaives (int lp_pla void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptPhaseBulwark (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerFamilyDisintegratingParticles (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerFamilyParticleReflection (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonHighImpactPhaseDisruptors (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonTrillicCompressionSystems (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonSingularityCharge (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index f0f3939ec..3b0dfaec6 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4485,7 +4485,7 @@ libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor, // 3 libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit, // 4 - ap_triggers_PlayerConsumer_sig, // 5 + libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 @@ -57598,6 +57598,7 @@ + @@ -57965,6 +57966,43 @@ + + AP_Triggers_Protoss_unlockInstigatorResourceEfficiency + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_InstigatorResourceEfficiency + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index c257bbf36..dc3c48c80 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -737,6 +737,7 @@ FunctionDef/Name/lib_ABFE498B_EC85396E=AP_Triggers_Terran_unlockVikingShredderRo FunctionDef/Name/lib_ABFE498B_ECD098A2=AP_Triggers_Zerg_SwarmHostPressurizedGlands FunctionDef/Name/lib_ABFE498B_ED81992F=AP_Triggers_replaceUpgrade FunctionDef/Name/lib_ABFE498B_EDEC759C=AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore +FunctionDef/Name/lib_ABFE498B_EDEEBAA9=AP_Triggers_Protoss_unlockInstigatorResourceEfficiency FunctionDef/Name/lib_ABFE498B_EE4A905F=AP_Triggers_Terran_unlockThor330mmBarrageCannon FunctionDef/Name/lib_ABFE498B_EE64D006=AP_Triggers_Terran_unlockVikingRipwaveMissiles FunctionDef/Name/lib_ABFE498B_EFBB1950=AP_Triggers_Protoss_unlockArbiterSpacetimeAnchor @@ -1377,6 +1378,7 @@ ParamDef/Name/lib_ABFE498B_C9354091=player ParamDef/Name/lib_ABFE498B_C9699C93=player ParamDef/Name/lib_ABFE498B_C9E57784=player ParamDef/Name/lib_ABFE498B_CA59940A=player +ParamDef/Name/lib_ABFE498B_CA672396=player ParamDef/Name/lib_ABFE498B_CB32EAFA=player ParamDef/Name/lib_ABFE498B_CB6B1E85=player ParamDef/Name/lib_ABFE498B_CBC9B69F=player