Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago-SC2-data i…

…nto sc2-next
Ziktofel · Jul 29, 2024 · ffebdd6 · ffebdd6
2 parents c9ddb01 + 25b27ca
commit ffebdd6
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 5 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -10194,7 +10194,7 @@
         <!--            <Button DefaultButtonFace="AP_NydusNetwork" State="Restricted" Requirements="AP_HaveLair"/>-->
         <!--        </InfoArray>-->
         <InfoArray index="Build11" Unit="AP_BanelingNest" Time="30">
-            <Button DefaultButtonFace="AP_BanelingNest" State="Restricted" Requirements="AP_HaveSpawningPool"/>
+            <Button DefaultButtonFace="AP_BanelingNest" State="Restricted" Requirements="AP_HaveHatchery"/>
         </InfoArray>
         <InfoArray index="Build13" Time="70"/>
         <InfoArray index="Build14" Unit="AP_RoachWarren" Time="40">

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -5868,6 +5868,7 @@
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
         <RemoveValidatorArray value="AP_NotFullLife"/>
         <RemoveValidatorArray value="NotHidden"/>
+        <RemoveValidatorArray value="AP_TargetNotUntargetable"/>
         <RemoveValidatorArray value="AP_NotStasis"/>
         <InitialEffect value="AP_SOARepairBeamSwitch"/>
     </CBehaviorBuff>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -14552,12 +14552,21 @@
         <ValidatorArray value="AP_NotArchon"/>
         <ValidatorArray value="AP_NotDarkArchon"/>
         <ValidatorArray value="AP_SoARepairBeamBioMechTraits"/>
+        <ValidatorArray value="AP_TargetNotUntargetable"/>
+        <ValidatorArray value="AP_NotStasis"/>
         <EditorCategories value="Race:Protoss"/>
         <Behavior value="AP_SOARepairBeam"/>
     </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_SOARepairBeamRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_SOARepairBeam"/>
+    </CEffectRemoveBehavior>
     <CEffectCreateHealer id="AP_SOARepairBeamHeal">
         <Flags index="Channeled" value="0"/>
         <RechargeVitalRate value="5"/>
+        <ValidatorArray value="AP_TargetNotUntargetable"/>
+        <ValidatorArray value="AP_NotStasis"/>
+        <FinalEffect value="AP_SOARepairBeamRB"/>
     </CEffectCreateHealer>
     <CEffectCreateHealer id="AP_SOARepairBeamHealStructure">
         <Flags index="Channeled" value="0"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -24832,6 +24832,7 @@
         </CardLayouts>
         <Radius value="0.25"/>
         <SeparationRadius value="0.25"/>
+        <MinimapRadius value="0"/>
         <ScoreMake value="25"/>
         <ScoreKill value="25"/>
         <EditorCategories value="ObjectType:Unit,ObjectFamily:Melee"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11446,6 +11446,12 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_VoidRayChargeBeamBounce,Tip" Value="Weapon/Tip/AP_VoidRayChargeBeamBounceUpgraded"/>
         <AffectedUnitArray value="AP_VoidRayTaldarim"/>
     </CUpgrade>
+    <CUpgrade id="AP_DestroyerResourceEfficiency">
+        <EffectArray Operation="Subtract" Reference="Unit,AP_VoidRayTaldarim,CostResource[Minerals]" Value="50"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_VoidRayTaldarim,CostResource[Vespene]" Value="25"/>
+        <EffectArray Reference="Unit,AP_VoidRayTaldarim,Food" Value="1"/>
+        <AffectedUnitArray value="AP_VoidRayTaldarim"/>
+    </CUpgrade>
     <CUpgrade id="AP_ArbiterCloakFieldRange">
         <EffectArray Reference="Effect,AP_ArbiterMPCloakingFieldSearch,AreaArray[0].Radius" Value="1"/>
         <EffectArray Reference="Actor,AP_ArbiterMPCloakingFieldRange,Range" Value="1"/>

diff --git 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
@@ -7134,6 +7134,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
@@ -726,6 +726,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
@@ -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
@@ -58837,6 +58837,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="DF908E38"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="7CB9C2C8"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="EDEC759C"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="BCB60FD6"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="DD51D531"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D97A7F35"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="B3FFF76C"/>
@@ -60447,6 +60448,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="BCB60FD6">
+            <Identifier>AP_Triggers_Protoss_unlockDestroyerResourceEfficiency</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="86F01352"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="9F0820E3"/>
+        </Element>
+        <Element Type="ParamDef" Id="86F01352">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="05271982"/>
+        </Element>
+        <Element Type="Param" Id="05271982">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="9F0820E3">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9B539CB8"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D34C13D2"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7B662107"/>
+        </Element>
+        <Element Type="Param" Id="9B539CB8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="86F01352"/>
+        </Element>
+        <Element Type="Param" Id="D34C13D2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DestroyerResourceEfficiency</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="7B662107">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="DD51D531">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="11D221E2"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -621,6 +621,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
@@ -1263,6 +1264,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