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 18bea7e0e..33cf2b4c7 100644 Binary files a/Mods/ArchipelagoCore.SC2Mod/DocumentHeader and b/Mods/ArchipelagoCore.SC2Mod/DocumentHeader differ diff --git a/Mods/ArchipelagoCore.SC2Mod/GameText.version b/Mods/ArchipelagoCore.SC2Mod/GameText.version index dd41cd31d..45735f024 100644 Binary files a/Mods/ArchipelagoCore.SC2Mod/GameText.version and b/Mods/ArchipelagoCore.SC2Mod/GameText.version differ diff --git a/Mods/ArchipelagoCore.SC2Mod/Triggers b/Mods/ArchipelagoCore.SC2Mod/Triggers index 048ed6746..9613d3867 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Triggers +++ b/Mods/ArchipelagoCore.SC2Mod/Triggers @@ -5565,9 +5565,20 @@ + + + + + + + + + 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 b795f902b..0fe8b917e 100644 Binary files a/Mods/ArchipelagoCore.SC2Mod/Triggers.version and b/Mods/ArchipelagoCore.SC2Mod/Triggers.version differ diff --git a/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 4a309884a..a0f61b582 100644 --- a/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -319,6 +319,7 @@ Variable/Name/lib_5BD4895D_701833B8=Counter Value Variable/Name/lib_5BD4895D_71332705=chatbox Variable/Name/lib_5BD4895D_71AC67E1=Locations Variable/Name/lib_5BD4895D_7550FD8F=timer index +Variable/Name/lib_5BD4895D_76C59CB0=AP_Core_BonusMaxSupply Variable/Name/lib_5BD4895D_771C9F67=index Variable/Name/lib_5BD4895D_77FF591A=Hide If No Locs Variable/Name/lib_5BD4895D_7A01FE6A=AP_Core_blackScreen_dialog @@ -347,6 +348,7 @@ Variable/Name/lib_5BD4895D_9906A014=chat message Variable/Name/lib_5BD4895D_9940F539=AP_Core_affectedPlayers Variable/Name/lib_5BD4895D_9996B797=category index Variable/Name/lib_5BD4895D_9E5E3CA0=Objectives +Variable/Name/lib_5BD4895D_9FA0B24B=oldBonusMaxSupply Variable/Name/lib_5BD4895D_A06B998F=category index Variable/Name/lib_5BD4895D_A15DE7BB=Dialog Panel Variable/Name/lib_5BD4895D_A1FF6AAA=objective index