Add bonus max supply filler item

Ziktofel · Dec 12, 2024 · a917e25 · a917e25
1 parent e1e96a6
commit a917e25
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 0 deletions.
diff --git 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
@@ -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
diff --git a/Mods/ArchipelagoCore.SC2Mod/GameText.version b/Mods/ArchipelagoCore.SC2Mod/GameText.version
diff --git a/Mods/ArchipelagoCore.SC2Mod/Triggers b/Mods/ArchipelagoCore.SC2Mod/Triggers
@@ -5565,9 +5565,20 @@
             <Item Type="Category" Library="5BD4895D" Id="C1D641B9"/>
         </Element>
         <Element Type="Category" Id="983E707E">
+            <Item Type="Variable" Library="5BD4895D" Id="76C59CB0"/>
             <Item Type="Variable" Library="5BD4895D" Id="6E72D461"/>
             <Item Type="Variable" Library="5BD4895D" Id="83506236"/>
         </Element>
+        <Element Type="Variable" Id="76C59CB0">
+            <VariableType>
+                <Type Value="int"/>
+            </VariableType>
+            <Value Type="Param" Library="5BD4895D" Id="F5A276F1"/>
+        </Element>
+        <Element Type="Param" Id="F5A276F1">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Variable" Id="6E72D461">
             <VariableType>
                 <Type Value="int"/>
@@ -6392,14 +6403,17 @@
         <Element Type="Trigger" Id="FE6C5704">
             <Variable Type="Variable" Library="5BD4895D" Id="56EB2B72"/>
             <Variable Type="Variable" Library="5BD4895D" Id="6829115A"/>
+            <Variable Type="Variable" Library="5BD4895D" Id="9FA0B24B"/>
             <Variable Type="Variable" Library="5BD4895D" Id="1269724E"/>
             <Variable Type="Variable" Library="5BD4895D" Id="CF227E57"/>
             <Event Type="FunctionCall" Library="5BD4895D" Id="E43BC78B"/>
             <Action Type="FunctionCall" Library="5BD4895D" Id="DF7E119E"/>
             <Action Type="FunctionCall" Library="5BD4895D" Id="89D1E8FD"/>
+            <Action Type="FunctionCall" Library="5BD4895D" Id="B46EB75A"/>
             <Action Type="FunctionCall" Library="5BD4895D" Id="C1679B92"/>
             <Action Type="FunctionCall" Library="5BD4895D" Id="7A5AE522"/>
             <Action Type="FunctionCall" Library="5BD4895D" Id="B00D5C84"/>
+            <Action Type="FunctionCall" Library="5BD4895D" Id="E73E5716"/>
             <Action Type="FunctionCall" Library="5BD4895D" Id="ED0BFB0D"/>
         </Element>
         <Element Type="Variable" Id="56EB2B72">
@@ -6422,6 +6436,16 @@
             <Value>0</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="Variable" Id="9FA0B24B">
+            <VariableType>
+                <Type Value="int"/>
+            </VariableType>
+            <Value Type="Param" Library="5BD4895D" Id="D3B63755"/>
+        </Element>
+        <Element Type="Param" Id="D3B63755">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Variable" Id="1269724E">
             <VariableType>
                 <Type Value="int"/>
@@ -6487,6 +6511,19 @@
             <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
             <Variable Type="Variable" Library="5BD4895D" Id="83506236"/>
         </Element>
+        <Element Type="FunctionCall" Id="B46EB75A">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="06AF5841"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="50E8B005"/>
+        </Element>
+        <Element Type="Param" Id="06AF5841">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="5BD4895D" Id="9FA0B24B"/>
+        </Element>
+        <Element Type="Param" Id="50E8B005">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Variable Type="Variable" Library="5BD4895D" Id="76C59CB0"/>
+        </Element>
         <Element Type="FunctionCall" Id="C1679B92">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
             <Parameter Type="Param" Library="5BD4895D" Id="EC4F9021"/>
@@ -6616,13 +6653,57 @@
             <Value>4</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionCall" Id="E73E5716">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="9C96D871"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="E4A9E70C"/>
+        </Element>
+        <Element Type="Param" Id="9C96D871">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <FunctionCall Type="FunctionCall" Library="5BD4895D" Id="177A6F15"/>
+        </Element>
+        <Element Type="FunctionCall" Id="177A6F15">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000005"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="2C5C0BD4"/>
+        </Element>
+        <Element Type="Param" Id="2C5C0BD4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000006"/>
+            <FunctionCall Type="FunctionCall" Library="5BD4895D" Id="DA4C1F08"/>
+        </Element>
+        <Element Type="FunctionCall" Id="DA4C1F08">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="A078FB65"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="0FD0B79A"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="96CFB8E5"/>
+        </Element>
+        <Element Type="Param" Id="0FD0B79A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="655C865B"/>
+            <FunctionCall Type="FunctionCall" Library="5BD4895D" Id="EA83801D"/>
+        </Element>
+        <Element Type="FunctionCall" Id="EA83801D">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000122"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="D942E51D"/>
+        </Element>
+        <Element Type="Param" Id="D942E51D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000194"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000076"/>
+        </Element>
+        <Element Type="Param" Id="96CFB8E5">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
+            <Value>5</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="E4A9E70C">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="5BD4895D" Id="76C59CB0"/>
+        </Element>
         <Element Type="FunctionCall" Id="ED0BFB0D">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="B525B112"/>
             <Parameter Type="Param" Library="5BD4895D" Id="C58C8C48"/>
             <Parameter Type="Param" Library="5BD4895D" Id="7E9313D4"/>
             <FunctionCall Type="FunctionCall" Library="5BD4895D" Id="0170A194"/>
             <FunctionCall Type="FunctionCall" Library="5BD4895D" Id="9B8E9E73"/>
             <FunctionCall Type="FunctionCall" Library="5BD4895D" Id="F94B4C97"/>
+            <FunctionCall Type="FunctionCall" Library="5BD4895D" Id="4458EDEC"/>
         </Element>
         <Element Type="Param" Id="C58C8C48">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="A4B226A9"/>
@@ -6716,6 +6797,41 @@
             <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3020A812"/>
             <Variable Type="Variable" Library="5BD4895D" Id="1269724E"/>
         </Element>
+        <Element Type="FunctionCall" Id="4458EDEC">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="943DF2F7"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="DF50D5F0"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="728D9848"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="0F32B386"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="E86F244A"/>
+            <Parameter Type="Param" Library="5BD4895D" Id="0631C342"/>
+        </Element>
+        <Element Type="Param" Id="728D9848">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="75FC31CB"/>
+            <Variable Type="Variable" Library="5BD4895D" Id="CF227E57"/>
+        </Element>
+        <Element Type="Param" Id="0F32B386">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4AA9487D"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="74DE5DFF"/>
+        </Element>
+        <Element Type="Param" Id="E86F244A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C93A9DCB"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="A9A13ADB"/>
+        </Element>
+        <Element Type="Param" Id="0631C342">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="EEF303AC"/>
+            <ExpressionType Type="int"/>
+            <ExpressionText>~A~ - ~B~</ExpressionText>
+            <ExpressionParam Type="Param" Library="5BD4895D" Id="14C55D13"/>
+            <ExpressionParam Type="Param" Library="5BD4895D" Id="4F3207A4"/>
+        </Element>
+        <Element Type="Param" Id="14C55D13">
+            <Variable Type="Variable" Library="5BD4895D" Id="76C59CB0"/>
+            <ExpressionCode Value="A"/>
+        </Element>
+        <Element Type="Param" Id="4F3207A4">
+            <Variable Type="Variable" Library="5BD4895D" Id="9FA0B24B"/>
+            <ExpressionCode Value="B"/>
+        </Element>
         <Element Type="Comment" Id="1A4A319B">
             <Comment>
                 Format: ?SetColor &lt;faction&gt; &lt;colorIndex&gt;

diff --git a/Mods/ArchipelagoCore.SC2Mod/Triggers.version b/Mods/ArchipelagoCore.SC2Mod/Triggers.version
diff --git 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