From 93ca1fc974f272f5e69d5cf06c3654e13e413361 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 28 Jul 2024 16:44:52 -0700 Subject: [PATCH 1/2] sc2: Added Destroyer resource efficiency upgrade --- .../Base.SC2Data/GameData/UpgradeData.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index ddcf7b67d..33591fd7a 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -11419,6 +11419,12 @@ + + + + + + From b947cc80db54fea375d6728af5514f38804635a6 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 28 Jul 2024 16:54:17 -0700 Subject: [PATCH 2/2] sc2: Added unlock trigger for destroyer RE; moved unlock trigger for RBC to war council category --- .../Base.SC2Data/LibABFE498B.galaxy | 10 ++++- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + Mods/ArchipelagoTriggers.SC2Mod/Triggers | 42 ++++++++++++++++++- .../LocalizedData/TriggerStrings.txt | 2 + 4 files changed, 51 insertions(+), 4 deletions(-) diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index c0df5bcb1..34ba70a5d 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1468,7 +1468,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge2 (int lp_player, int lp_bitAr libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult, // 3 libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories, // 4 libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes, // 5 - libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 6 + libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency, // 6 libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive, // 7 libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismPhaseBlaster, // 8 libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration, // 9 @@ -1587,7 +1587,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_ ap_triggers_PlayerConsumer_sig, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3 ap_triggers_PlayerConsumer_sig, // 4 - ap_triggers_PlayerConsumer_sig, // 5 + libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 @@ -7096,6 +7096,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore (i libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DestroyerChargingBeam", 1); } +void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DestroyerResourceEfficiency", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive (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 817edaf15..2bc68ce38 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -721,6 +721,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult (int lp_pl void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismPhaseBlaster (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index 767537a67..329bf033f 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4422,7 +4422,7 @@ libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult, // 3 libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories, // 4 libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes, // 5 - libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 6 + libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency, // 6 libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive, // 7 libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismPhaseBlaster, // 8 libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration, // 9 @@ -4621,7 +4621,7 @@ ap_triggers_PlayerConsumer_sig, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3 ap_triggers_PlayerConsumer_sig, // 4 - ap_triggers_PlayerConsumer_sig, // 5 + libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 @@ -58520,6 +58520,7 @@ + @@ -60130,6 +60131,43 @@ + + AP_Triggers_Protoss_unlockDestroyerResourceEfficiency + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_DestroyerResourceEfficiency + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index a2119c83b..dfd6eaf9f 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -616,6 +616,7 @@ FunctionDef/Name/lib_ABFE498B_BADDFA87=AP_Triggers_Terran_unlockMedicStabilizerM FunctionDef/Name/lib_ABFE498B_BC29CCFF=AP_Triggers_Zerg_unlockSwarmHost FunctionDef/Name/lib_ABFE498B_BC5C802E=AP_Triggers_Zerg_SISCVChargeCount FunctionDef/Name/lib_ABFE498B_BCAA01BD=AP_Triggers_Terran_unlockNovaGadgetHoloDecoy +FunctionDef/Name/lib_ABFE498B_BCB60FD6=AP_Triggers_Protoss_unlockDestroyerResourceEfficiency FunctionDef/Name/lib_ABFE498B_BCCD7C2B=AP_Triggers_Zerg_unlockMutalisk FunctionDef/Name/lib_ABFE498B_BD2B0D2A=AP_Triggers_setRaceOverride FunctionDef/Name/lib_ABFE498B_BD2B87FB=AP_Triggers_Protoss_unlockSentryFamilyCloakingModule @@ -1254,6 +1255,7 @@ ParamDef/Name/lib_ABFE498B_85B4F873=player ParamDef/Name/lib_ABFE498B_8630CFD0=player ParamDef/Name/lib_ABFE498B_866517EF=player ParamDef/Name/lib_ABFE498B_86D37399=player +ParamDef/Name/lib_ABFE498B_86F01352=player ParamDef/Name/lib_ABFE498B_870A3EA3=level ParamDef/Name/lib_ABFE498B_872176AE=player ParamDef/Name/lib_ABFE498B_876B423A=player