Merge branch 'master' into sc2-next

Ziktofel · Jul 1, 2024 · 368c43c · 368c43c
2 parents 9ac3fbc + 64cca57
commit 368c43c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 52 deletions.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -7485,8 +7485,6 @@ void libABFE498B_gf_AP_Triggers_giveProtossDefaultTech (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_VoidZealotWhirlwind", 1);
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ResourceEfficiencyCenturion", 1);
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ResourceEfficiencySentinel", 1);
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AlarakSupplicantShieldArmor", 1);
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AlarakSupplicantMaxShields", 1);
 }
 
 void libABFE498B_gf_AP_Triggers_replaceUpgrade (int lp_player, string lp_oldUpgrade, string lp_newUpgrade) {

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -65153,9 +65153,6 @@
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="45EB03F1"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="99354651"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F3AE087F"/>
-            <FunctionCall Type="Comment" Library="ABFE498B" Id="F9C1F2F5"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="84144BA7"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="BB4FCC7A"/>
             <FunctionCall Type="Comment" Library="ABFE498B" Id="D966F9C6"/>
         </Element>
         <Element Type="ParamDef" Id="56209DEA">
@@ -65341,53 +65338,6 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
-        <Element Type="Comment" Id="F9C1F2F5">
-            <Comment>
-                BloodShield and Soul Augmentation go together
-            </Comment>
-        </Element>
-        <Element Type="FunctionCall" Id="84144BA7">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="33D6E179"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="38B0DFC7"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="C7CB1F6E"/>
-        </Element>
-        <Element Type="Param" Id="33D6E179">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="56209DEA"/>
-        </Element>
-        <Element Type="Param" Id="38B0DFC7">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
-            <Value>1</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="Param" Id="C7CB1F6E">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_AlarakSupplicantShieldArmor</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Upgrade"/>
-        </Element>
-        <Element Type="FunctionCall" Id="BB4FCC7A">
-            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="6441BCCF"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="80EF8B03"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="CB390CAF"/>
-        </Element>
-        <Element Type="Param" Id="6441BCCF">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="56209DEA"/>
-        </Element>
-        <Element Type="Param" Id="80EF8B03">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
-            <Value>1</Value>
-            <ValueType Type="int"/>
-        </Element>
-        <Element Type="Param" Id="CB390CAF">
-            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_AlarakSupplicantMaxShields</Value>
-            <ValueType Type="gamelink"/>
-            <ValueGameType Type="Upgrade"/>
-        </Element>
         <Element Type="Comment" Id="D966F9C6">
         </Element>
         <Element Type="Trigger" Id="251CB9EA">