From a917e25e7b9d5dfe63615d35c62e124f19ee3be6 Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Thu, 12 Dec 2024 18:20:24 +0100 Subject: [PATCH] Add bonus max supply filler item --- .../Base.SC2Data/Lib5BD4895D.galaxy | 4 + .../Base.SC2Data/Lib5BD4895D_h.galaxy | 1 + Mods/ArchipelagoCore.SC2Mod/DocumentHeader | Bin 201 -> 201 bytes Mods/ArchipelagoCore.SC2Mod/GameText.version | Bin 44 -> 44 bytes Mods/ArchipelagoCore.SC2Mod/Triggers | 116 ++++++++++++++++++ Mods/ArchipelagoCore.SC2Mod/Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 2 + 7 files changed, 123 insertions(+) diff --git a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy index 039189fb2..12df7545c 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy +++ b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy @@ -1965,6 +1965,7 @@ bool lib5BD4895D_gt_AP_Core_giveStartingResources_Func (bool testConds, bool run // Variable Declarations int lv_oldStartingMinerals; int lv_oldStartingVespene; + int lv_oldBonusMaxSupply; int lv_supplyAmount; int lv_currentPlayer; @@ -1980,9 +1981,11 @@ bool lib5BD4895D_gt_AP_Core_giveStartingResources_Func (bool testConds, bool run lv_oldStartingMinerals = lib5BD4895D_gv_aP_Core_BonusMinerals; lv_oldStartingVespene = lib5BD4895D_gv_aP_Core_BonusVespene; + lv_oldBonusMaxSupply = lib5BD4895D_gv_aP_Core_BonusMaxSupply; lib5BD4895D_gv_aP_Core_BonusMinerals = StringToInt(StringWord(EventChatMessage(false), 2)); lib5BD4895D_gv_aP_Core_BonusVespene = StringToInt(StringWord(EventChatMessage(false), 3)); lv_supplyAmount = StringToInt(StringWord(EventChatMessage(false), 4)); + lib5BD4895D_gv_aP_Core_BonusMaxSupply = StringToInt(StringWord(EventChatMessage(false), 5)); autoED0BFB0D_g = lib5BD4895D_gv_aP_Core_affectedPlayers; lv_currentPlayer = -1; while (true) { @@ -1991,6 +1994,7 @@ bool lib5BD4895D_gt_AP_Core_giveStartingResources_Func (bool testConds, bool run PlayerModifyPropertyInt(lv_currentPlayer, c_playerPropMinerals, c_playerPropOperAdd, (lib5BD4895D_gv_aP_Core_BonusMinerals - lv_oldStartingMinerals)); PlayerModifyPropertyInt(lv_currentPlayer, c_playerPropVespene, c_playerPropOperAdd, (lib5BD4895D_gv_aP_Core_BonusVespene - lv_oldStartingVespene)); lib5BD4895D_gf_AP_Core_giveBonusSupplies(lv_currentPlayer, lv_supplyAmount); + PlayerModifyPropertyInt(lv_currentPlayer, c_playerPropSuppliesLimit, c_playerPropOperAdd, (lib5BD4895D_gv_aP_Core_BonusMaxSupply - lv_oldBonusMaxSupply)); } return true; } diff --git a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy index 6b70352c5..d20b9ffdb 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy +++ b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy @@ -97,6 +97,7 @@ string lib5BD4895D_gv_aP_Core_tradeFlavorName; unit lib5BD4895D_gv_aP_Core_tradeUnit; string lib5BD4895D_gv_aP_Core_tradeSendUnitType; string lib5BD4895D_gv_aP_Core_tradeReceiveUnitType; +int lib5BD4895D_gv_aP_Core_BonusMaxSupply; int lib5BD4895D_gv_aP_Core_BonusMinerals; int lib5BD4895D_gv_aP_Core_BonusVespene; int lib5BD4895D_gv_aP_Core_objectiveUsedCategories; diff --git a/Mods/ArchipelagoCore.SC2Mod/DocumentHeader b/Mods/ArchipelagoCore.SC2Mod/DocumentHeader index 18bea7e0eb72afca2eb899ed8ebbe7bb2961f1ce..33cf2b4c76559dc54bae18d133043457365eac69 100644 GIT binary patch delta 18 XcmX@fc#?5~3`gMx76uTWsIn9QI$8zo delta 18 WcmX@fc#?5~3`g(dOfa6PvJ?PCXa{8g diff --git a/Mods/ArchipelagoCore.SC2Mod/GameText.version b/Mods/ArchipelagoCore.SC2Mod/GameText.version index dd41cd31da4fe707ba9561c49fed5413811c1954..45735f02451dbd8e96ac8c35c53782fde1873e1c 100644 GIT binary patch delta 17 XcmdPVnV`V)o`HektyFY6Baj9FC + + + + + + + + + 0 + + @@ -6392,14 +6403,17 @@ + + + @@ -6422,6 +6436,16 @@ 0 + + + + + + + + 0 + + @@ -6487,6 +6511,19 @@ + + + + + + + + + + + + + @@ -6616,6 +6653,49 @@ 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + @@ -6623,6 +6703,7 @@ + @@ -6716,6 +6797,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + ~A~ - ~B~ + + + + + + + + + + + Format: ?SetColor <faction> <colorIndex> diff --git a/Mods/ArchipelagoCore.SC2Mod/Triggers.version b/Mods/ArchipelagoCore.SC2Mod/Triggers.version index b795f902bdc07277900454537480b8c94a22d359..0fe8b917e2cc197f62c0f36c99e9a50d00f5fa5c 100644 GIT binary patch delta 17 YcmdPVnV`U9!^FT4ARV2~$iTn=02