Add some Terran static def upgrades

Ziktofel · Jul 1, 2024 · c5b6e09 · c5b6e09
1 parent bacccd3
commit c5b6e09
Show file tree

Hide file tree

Showing 13 changed files with 168 additions and 7 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -5425,4 +5425,8 @@
         <AlertIcon value="Assets\Textures\BTN-Upgrade-Protoss-ResearchBosonicCore.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_DevastatorTurretPunisherGrenades">
+        <Icon value="Assets\Textures\btn-ability-terran-ignorearmor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-terran-ignorearmor.dds"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3395,4 +3395,8 @@
         <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeOracleEnergyUpgradeCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveDevastatorTurretPunisherGrenades">
+        <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeDevastatorTurretPunisherGrenadesCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5872,4 +5872,8 @@
         <Count Link="AP_OracleEnergyUpgrade" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeDevastatorTurretPunisherGrenadesCompleteOnly">
+        <Count Link="AP_DevastatorTurretPunisherGrenades" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -6931,6 +6931,7 @@
             <LayoutButtons Face="Salvage" Type="AbilCmd" AbilCmd="AP_SalvageShared,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_HiSecAutoTracking" Type="Passive" Requirements="AP_HaveHiSecAutoTracking" Row="1" Column="0"/>
             <LayoutButtons Face="AP_DevastatorTurretSlow" Type="Passive" Requirements="AP_HaveDevastatorTurretSlow" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_DevastatorTurretPunisherGrenades" Type="Passive" Requirements="AP_HaveDevastatorTurretPunisherGrenades" Row="1" Column="2"/>
             <LayoutButtons Face="Halt" Type="AbilCmd" AbilCmd="BuildInProgress,Halt" Row="2" Column="3"/>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
         </CardLayouts>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -12578,4 +12578,13 @@
         <EffectArray Operation="Divide" Reference="Abil,AP_SummonInfestedMercs,InfoArray[Train3].Cooldown.TimeUse" Value="2"/>
         <EffectArray Operation="Divide" Reference="Abil,AP_SummonInfestedMercs,InfoArray[Train3].Cooldown.TimeStart" Value="2"/>
     </CUpgrade>
+    <CUpgrade id="AP_DevastatorTurretPunisherGrenades">
+        <EffectArray Reference="Effect,AP_DevastatorTurretDamage,AttributeBonus[Armored]" Value="10"/>
+    </CUpgrade>
+    <CUpgrade id="AP_DevastatorTurretResourceEfficiency">
+        <EffectArray Operation="Subtract" Reference="Unit,AP_DevastatorTurret,CostResource[Minerals]" Value="50"/>
+    </CUpgrade>
+    <CUpgrade id="AP_MissileTurretResourceEfficiency">
+        <EffectArray Operation="Subtract" Reference="Unit,AP_MissileTurret,CostResource[Minerals]" Value="25"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1734,6 +1734,7 @@ Button/Name/AP_OverlordSpeed=Pneumatized Carapace
 Button/Name/AP_OverlordSightUpgrade=Antennae
 Button/Name/AP_MorphToOverseer=Morph to Overseer
 Button/Name/AP_OracleEnergyUpgrade=Bosonic Core
+Button/Name/AP_DevastatorTurretPunisherGrenades=Punisher Grenades
 Button/Tooltip/AP_250mmStrikeCannons=Stuns target unit. Deals <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsDamage,Amount"/> damage over <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodicPeriodArray[0]"/> seconds.
 Button/Tooltip/AP_330mmBarrageCannons=Stuns all enemies in a small area. Deals <d ref="Effect,AP_330mmBarrageCannonsPersistent,PeriodCount * Effect,AP_330mmBarrageCannonsDamage,Amount"/> damage over <d ref="Effect,AP_330mmBarrageCannonsPersistent,PeriodCount * Effect,AP_330mmBarrageCannonsPersistent,PeriodicPeriodArray[0]"/> seconds in a larger area.
 Button/Tooltip/AP_AWrp=Sacrifices 2 Templar to create an Archon.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
@@ -2829,6 +2830,7 @@ Button/Tooltip/AP_Overseer=Advanced aerial observer. Maintains the unit cap set
 Button/Tooltip/AP_MorphToOverseer=Advanced aerial observer. Provides the same supply as an Overlord. Can use the Spawn Creep Tumor and Contaminate abilities.<n/><n/><c val="FFE303">Detector</c>
 Button/Tooltip/AP_OverlordCocoon=This cocoon contains an Overlord as it is morphing into an Overseer.
 Button/Tooltip/AP_OracleEnergyUpgrade=Increases starting energy by 150 and maximum energy by 50.
+Button/Tooltip/AP_DevastatorTurretPunisherGrenades=Increases damage to armored targets by 10.
 Effect/Name/AP_250mmStrikeCannonsApplyBehavior=250mm Strike Cannons (Apply Behavior)
 Effect/Name/AP_250mmStrikeCannonsCreatePersistent=250mm Strike Cannons (Create Persistent)
 Effect/Name/AP_250mmStrikeCannonsDamage=250mm Strike Cannons (Damage)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -502,9 +502,9 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitAr
         lp_player,
         lp_bitArrayValue,
         libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow, // 0
-        ap_triggers_PlayerConsumer_sig, // 1
-        ap_triggers_PlayerConsumer_sig, // 2
-        ap_triggers_PlayerConsumer_sig, // 3
+        libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades, // 1
+        libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency, // 2
+        libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency, // 3
         ap_triggers_PlayerConsumer_sig, // 4
         ap_triggers_PlayerConsumer_sig, // 5
         ap_triggers_PlayerConsumer_sig, // 6
@@ -3438,6 +3438,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretHellstormBatteries (in
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_HailstormMissilePods", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MissileTurretResourceEfficiency", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterReactor (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -3540,6 +3546,18 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow (int lp_player
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DevastatorTurretSlow", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DevastatorTurretPunisherGrenades", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DevastatorTurretResourceEfficiency", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockInfantryArmor (int lp_player, int lp_level) {
     // Automatic Variable Declarations
     // Implementation

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -386,6 +386,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockBunkerShrikeTurret (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockBunkerFortifiedBunker (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretTitaniumHousing (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretHellstormBatteries (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterReactor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterPlanetaryFortress (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterExtraSupplies (int lp_player);
@@ -395,6 +396,8 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressProgressiveAugumen
 void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressAdvancedTargeting (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressOrbitalModule (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockInfantryArmor (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Terran_unlockInfantryWeapon (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Terran_unlockVehicleArmor (int lp_player, int lp_level);

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2745,9 +2745,9 @@
                     lp_player,
                     lp_bitArrayValue,
                     libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow, // 0
-                    ap_triggers_PlayerConsumer_sig, // 1
-                    ap_triggers_PlayerConsumer_sig, // 2
-                    ap_triggers_PlayerConsumer_sig, // 3
+                    libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades, // 1
+                    libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency, // 2
+                    libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency, // 3
                     ap_triggers_PlayerConsumer_sig, // 4
                     ap_triggers_PlayerConsumer_sig, // 5
                     ap_triggers_PlayerConsumer_sig, // 6
@@ -24290,6 +24290,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="8A1924D2"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="E05CAAAE"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="05CB2059"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="AC4B1D2E"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="11540F21"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6E8FBBCE"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="440A195A"/>
@@ -24299,6 +24300,8 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="09B67FC0"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="45AD82C7"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D462CB24"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="E86DD6BC"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="FE8BED83"/>
         </Element>
         <Element Type="FunctionDef" Id="0E95856F">
             <FlagAction/>
@@ -24658,6 +24661,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="AC4B1D2E">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1A9EADDF"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D2D42A78"/>
+        </Element>
+        <Element Type="ParamDef" Id="1A9EADDF">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="90436DB8"/>
+        </Element>
+        <Element Type="Param" Id="90436DB8">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="D2D42A78">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FBE5F86A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="975046B7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A87E2D41"/>
+        </Element>
+        <Element Type="Param" Id="FBE5F86A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1A9EADDF"/>
+        </Element>
+        <Element Type="Param" Id="975046B7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="A87E2D41">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_MissileTurretResourceEfficiency</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="FunctionDef" Id="11540F21">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="328ADB18"/>
@@ -25443,7 +25482,6 @@
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionDef" Id="D462CB24">
-            <Identifier>AP_Triggers_Terran_unlockDevastatorTurretSlow</Identifier>
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="7C94192B"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="830A037E"/>
@@ -25479,6 +25517,78 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="E86DD6BC">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8B8A0FF6"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="388D1897"/>
+        </Element>
+        <Element Type="ParamDef" Id="8B8A0FF6">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="D80F34A1"/>
+        </Element>
+        <Element Type="Param" Id="D80F34A1">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="388D1897">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6E7CBF92"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FF3055E0"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BC5F4400"/>
+        </Element>
+        <Element Type="Param" Id="6E7CBF92">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8B8A0FF6"/>
+        </Element>
+        <Element Type="Param" Id="FF3055E0">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DevastatorTurretPunisherGrenades</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="BC5F4400">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="FE8BED83">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="4A24B905"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="DCA800D7"/>
+        </Element>
+        <Element Type="ParamDef" Id="4A24B905">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="52A77F01"/>
+        </Element>
+        <Element Type="Param" Id="52A77F01">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="DCA800D7">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F9C21895"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7B8CF936"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="486B49FA"/>
+        </Element>
+        <Element Type="Param" Id="F9C21895">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="4A24B905"/>
+        </Element>
+        <Element Type="Param" Id="7B8CF936">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DevastatorTurretResourceEfficiency</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="486B49FA">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Category" Id="50A7FFA8">
             <Item Type="FunctionDef" Library="ABFE498B" Id="C9ED962C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3F5DBF15"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -541,6 +541,7 @@ FunctionDef/Name/lib_ABFE498B_A8DC996F=AP_Triggers_Terran_unlockFirebatInfernalP
 FunctionDef/Name/lib_ABFE498B_A93D603A=AP_Triggers_Protoss_unlockSentinel
 FunctionDef/Name/lib_ABFE498B_A973FAB0=AP_Triggers_Terran_unlockGhostEMPRounds
 FunctionDef/Name/lib_ABFE498B_A9C6E0DA=AP_Triggers_Terran_unlockReaperCombatDrugs
+FunctionDef/Name/lib_ABFE498B_AC4B1D2E=AP_Triggers_Terran_unlockMissileTurretResourceEfficency
 FunctionDef/Name/lib_ABFE498B_ACDAEFF1=AP_Triggers_Terran_unlockValkyrieLaunchingVectorCompensator
 FunctionDef/Name/lib_ABFE498B_AD5B5003=AP_Triggers_Terran_unlockMarineCombatShield
 FunctionDef/Name/lib_ABFE498B_AD9BBB7A=AP_Triggers_Zerg_AutomatedExtractor
@@ -710,6 +711,7 @@ FunctionDef/Name/lib_ABFE498B_E7C72AF9=AP_Triggers_Terran_unlockMarauderJuggerna
 FunctionDef/Name/lib_ABFE498B_E809FD5E=AP_Triggers_MapConfig_setMissionProtoss
 FunctionDef/Name/lib_ABFE498B_E82091FB=AP_Triggers_Terran_unlockBattlecruiserATXLaserBattery
 FunctionDef/Name/lib_ABFE498B_E855CFB3=AP_Triggers_Protoss_unlockVanguard
+FunctionDef/Name/lib_ABFE498B_E86DD6BC=AP_Triggers_Terran_unlockDevastatorTurretPunisherGrenades
 FunctionDef/Name/lib_ABFE498B_E93BF582=AP_Triggers_Zerg_ZerglingAdrenalOverload
 FunctionDef/Name/lib_ABFE498B_E9A6BFF9=AP_Triggers_Terran_unlockSiegeTankSmartServos
 FunctionDef/Name/lib_ABFE498B_EB0B3D1F=AP_Triggers_Terran_unlockPsiDisrupter
@@ -762,6 +764,7 @@ FunctionDef/Name/lib_ABFE498B_FDDA1458=AP_Triggers_Protoss_unlockColossusPurifie
 FunctionDef/Name/lib_ABFE498B_FDFA73C1=AP_Triggers_Zerg_SwarmQueenOrganicCarapace
 FunctionDef/Name/lib_ABFE498B_FE756FB1=AP_Triggers_unlockTerranArmory5
 FunctionDef/Name/lib_ABFE498B_FE76F038=AP_Triggers_Zerg_unlockSwarmQueen
+FunctionDef/Name/lib_ABFE498B_FE8BED83=AP_Triggers_Terran_unlockDevastatorTurretResourceEfficency
 FunctionDef/Name/lib_ABFE498B_FE9453BD=AP_Triggers_Terran_unlockShipWeapon
 FunctionDef/Name/lib_ABFE498B_FF8C8ED5=AP_Triggers_Protoss_unlockDeployFenix
 Library/Name/ABFE498B=Archipelago Triggers
@@ -842,6 +845,7 @@ ParamDef/Name/lib_ABFE498B_19610AEA=bitArrayValue
 ParamDef/Name/lib_ABFE498B_19A18FCB=player
 ParamDef/Name/lib_ABFE498B_1A2AA6FA=player
 ParamDef/Name/lib_ABFE498B_1A92F828=player
+ParamDef/Name/lib_ABFE498B_1A9EADDF=player
 ParamDef/Name/lib_ABFE498B_1AA1C443=player
 ParamDef/Name/lib_ABFE498B_1B042BAF=player
 ParamDef/Name/lib_ABFE498B_1B27F501=player
@@ -983,6 +987,7 @@ ParamDef/Name/lib_ABFE498B_48E462B0=player
 ParamDef/Name/lib_ABFE498B_495EB8CE=player
 ParamDef/Name/lib_ABFE498B_4976F6CB=player
 ParamDef/Name/lib_ABFE498B_49E8E34B=player
+ParamDef/Name/lib_ABFE498B_4A24B905=player
 ParamDef/Name/lib_ABFE498B_4A35B01B=player
 ParamDef/Name/lib_ABFE498B_4A59862A=player
 ParamDef/Name/lib_ABFE498B_4B2F6C4C=player
@@ -1190,6 +1195,7 @@ ParamDef/Name/lib_ABFE498B_8A08982B=player
 ParamDef/Name/lib_ABFE498B_8A39C57E=player
 ParamDef/Name/lib_ABFE498B_8A906BD8=level
 ParamDef/Name/lib_ABFE498B_8AAC109F=player
+ParamDef/Name/lib_ABFE498B_8B8A0FF6=player
 ParamDef/Name/lib_ABFE498B_8B8D1DD4=player
 ParamDef/Name/lib_ABFE498B_8BA94016=player
 ParamDef/Name/lib_ABFE498B_8BCD87DD=player