From 863677d95db19eb04ffc1b2a39e97cede9f7303a Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 30 Jun 2024 01:25:39 -0700
Subject: [PATCH 1/7] sc2: Added devastator turrets

---
 .../Base.SC2Data/GameData/AbilData.xml        |  3 +
 .../Base.SC2Data/GameData/ActorData.xml       | 36 ++++++++++
 .../Base.SC2Data/GameData/ButtonData.xml      | 15 ++++
 .../Base.SC2Data/GameData/EffectData.xml      | 25 +++++++
 .../Base.SC2Data/GameData/ModelData.xml       | 26 +++++++
 .../Base.SC2Data/GameData/MoverData.xml       |  8 +++
 .../Base.SC2Data/GameData/RequirementData.xml |  7 ++
 .../GameData/RequirementNodeData.xml          |  4 ++
 .../Base.SC2Data/GameData/SoundData.xml       | 22 ++++++
 .../Base.SC2Data/GameData/UnitData.xml        | 68 ++++++++++++++++++-
 .../Base.SC2Data/GameData/UpgradeData.xml     | 12 ++++
 .../Base.SC2Data/GameData/ValidatorData.xml   |  3 +
 .../Base.SC2Data/GameData/WeaponData.xml      | 12 ++++
 Mods/ArchipelagoPlayer.SC2Mod/Preload.xml     |  2 +
 .../LocalizedData/GameHotkeys.txt             |  1 +
 .../LocalizedData/GameStrings.txt             |  8 +++
 16 files changed, 249 insertions(+), 3 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index b592a1de4..abeb30a84 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -8326,6 +8326,9 @@
         <InfoArray index="Build24" Unit="AP_ThorBuild" Time="60">
             <Button DefaultButtonFace="AP_Thor" State="Restricted" Requirements="AP_BuildThorBySCV"/>
         </InfoArray>
+        <InfoArray index="Build25" Unit="AP_DevastatorTurret" Time="30">
+            <Button DefaultButtonFace="AP_BuildDevastatorTurret" State="Restricted" Requirements="AP_HaveFactory"/>
+        </InfoArray>
         <FidgetDelayMin value="5"/>
         <FidgetDelayMax value="10"/>
         <ConstructionMover value="Construction"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 2bbcf9191..69cd1517f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -28197,6 +28197,41 @@
             <Image value="Assets\Textures\Wireframe-Terran-SensorTower.dds"/>
         </Wireframe>
     </CActorUnit>
+    <!-- Devastator Turret -->
+    <CActorUnit id="AP_DevastatorTurret" parent="TerranBuilding" unitName="AP_DevastatorTurret">
+        <DeathArray index="Normal" ModelLink="TerranBuildingDeath" SoundLink="AP_DevastatorTurretExplode"/>
+        <DeathArray index="UnderConstruction" ModelLink="TerranBuildingDeath" SoundLink="MissileTurret_Explode"/>
+        <PlacementModel value="AP_DevastatorTurretPlacement"/>
+        <PlacementSound value="Terran_BuildingPlacement"/>
+        <PortraitModel value="AdjutantPortrait"/>
+        <BarOffset value="75"/>
+        <BarWidth value="85"/>
+        <GroupIcon>
+            <Image value="Assets\Textures\Wireframe-Terran-flameturret.dds"/>
+        </GroupIcon>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-terran-buildingarmor.dds"/>
+        <SoundArray index="Birth" value="Raven_AutoTurretBirth"/>
+        <SoundArray index="Ready" value="Raven_AutoTurretReady"/>
+        <SoundArray index="What" value="Raven_AutoTurretWhat"/>
+        <SoundArray index="Construction" value="Terran_ConstructionWhat"/>
+        <UnitIcon value="Assets\Textures\btn-tips-flamingbetty.dds"/>
+        <Wireframe>
+            <Image value="Assets\Textures\Wireframe-Terran-flameturret.dds"/>
+        </Wireframe>
+        <CreepHeightClass value="Small"/>
+        <Aliases value="_UnitMedium"/>
+    </CActorUnit>
+    <CActorModel id="AP_DevastatorTurretBuild" parent="TerranBuildingBuildSmall">
+        <Model value="AP_DevastatorTurretBuild"/>
+    </CActorModel>
+    <CActorAction id="KelMorianGrenadeTurretAttack" parent="GenericAttack" effectImpact="AP_DevastatorTurretDamage" effectLaunch="AP_DevastatorTurretLM">
+        <LaunchAssets Sound="AP_DevastatorTurret_AttackLaunch"/>
+        <ImpactMap index="None" Sound="AP_DevastatorTurret_AttackImpact"/>
+    </CActorAction>
+    <CActorMissile id="AP_DevastatorTurretAttackMissile" parent="GenericAttackMissile" unitName="AP_DevastatorTurretMissile">
+        <Model value="AP_DevastatorTurretMissile"/>
+    </CActorMissile>
+    <CActorRange id="AP_DevastatorTurretProtectRange" parent="RangeWeapon" weapon="AP_DevastatorTurretWeapon"/>
     <CActorModel id="AP_SensorTowerPlacement">
         <Aliases value="_Main"/>
         <Aliases value="_Unit"/>
@@ -28337,6 +28372,7 @@
         <!-- Add AP buildings -->
         <On Terms="UnitCreation.AP_AutoTurret" Send="Create"/>
         <On Terms="UnitCreation.AP_MissileTurret" Send="Create"/>
+        <On Terms="UnitCreation.AP_DevastatorTurret" Send="Create"/>
         <On Terms="UnitCreation.AP_SensorTower" Send="Create"/>
         <On Terms="UnitCreation.AP_TechLab" Send="Create"/>
         <On Terms="UnitCreation.AP_BarracksTechLab" Send="Create"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 2ddeb90a7..fe0e35ebc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -961,6 +961,16 @@
         <Icon value="assets\textures\btn-ability-stetmann-corruptormissilebarrage.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
+    <CButton id="AP_DevastatorTurretSlow">
+        <Icon value="assets\textures\btn-ability-terran-punishergrenade-color.dds"/>
+        <AlertIcon value="assets\textures\btn-ability-terran-punishergrenade-color.dds"/>
+        <EditorCategories value="Race:Terran"/>
+    </CButton>
+    <CButton id="AP_HiSecAutoTracking">
+        <Icon value="assets\textures\btn-upgrade-terran-hisecautotracking.dds"/>
+        <AlertIcon value="assets\textures\btn-upgrade-terran-hisecautotracking.dds"/>
+        <EditorCategories value="Race:Terran"/>
+    </CButton>
     <CButton id="AP_ReinforcedSuperstructure">
         <Icon value="AP\Assets\Textures\btn-techupgrade-terran-titaniumhousing.dds"/>
         <EditorCategories value="Race:Terran"/>
@@ -1151,6 +1161,11 @@
         <AlertIcon value="Assets\Textures\btn-building-terran-missileturret.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
+    <CButton id="AP_BuildDevastatorTurret">
+        <Icon value="Assets\Textures\btn-tips-flamingbetty.dds"/>
+        <AlertIcon value="Assets\Textures\btn-tips-flamingbetty.dds"/>
+        <EditorCategories value="Race:Terran"/>
+    </CButton>
     <CButton id="AP_PsiDisruptor">
         <Icon value="AP\Assets\Textures\btn-building-terran-sigmaprojector.dds"/>
         <AlertIcon value="AP\Assets\Textures\btn-building-terran-sigmaprojector.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index deea221b0..ba40b94ec 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -3859,6 +3859,31 @@
         <EditorCategories value=""/>
         <Effect value="Kill"/>
     </CEffectEnumTransport>
+    <CEffectLaunchMissile id="AP_DevastatorTurretLM">
+        <EditorCategories value="Race:Terran"/>
+        <ImpactEffect value="AP_DevastatorTurretSet"/>
+        <AmmoUnit value="AP_DevastatorTurretMissile"/>
+        <Movers Link="AP_DevastatorTurretMissileMover"/>
+    </CEffectLaunchMissile>
+    <CEffectSet id="AP_DevastatorTurretSet">
+        <EditorCategories value="Race:Terran"/>
+        <EffectArray value="AP_DevastatorTurretDamage"/>
+        <EffectArray index="1" value=""/>
+    </CEffectSet>
+    <CEffectDamage id="AP_DevastatorTurretDamage" parent="DU_WEAP">
+        <EditorCategories value="Race:Terran"/>
+        <AttributeBonus index="Armored" value="25"/>
+        <Kind value="Ranged"/>
+        <Amount value="25"/>
+        <Death value="Blast"/>
+    </CEffectDamage>
+    <CEffectApplyBehavior id="AP_DevastatorTurretSlow">
+        <ValidatorArray index="0" value="AP_NotMassive"/>
+        <ValidatorArray value="NotStructure"/>
+        <ValidatorArray value="NotFrenzied"/>
+        <EditorCategories value="Race:Terran"/>
+        <Behavior value="AP_Slow"/>
+    </CEffectApplyBehavior>
     <CEffectApplyBehavior id="AP_MakePrecursorMerc">
         <Behavior value="AP_PrecursorMerc"/>
     </CEffectApplyBehavior>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index 7b26cbae3..19599f17e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -1883,6 +1883,32 @@
         <SelectionRadius value="0.000000"/>
         <ShadowRadius value="0.000000"/>
     </CModel>
+    <CModel id="AP_DevastatorTurret" parent="Building">
+        <Model value="Assets\Buildings\Terran\GrenadeTurret\GrenadeTurret.m3"/>
+        <AttachProps Id="Ref_Hardpoint">
+            <Keys index="Turret" value="0"/>
+        </AttachProps>
+        <EditorCategories value="Race:Terran"/>
+        <Flags index="AutoUnload" value="1"/>
+        <Occlusion value="Show"/>
+        <Radius value="0.750000"/>
+        <SelectionLayer value="2"/>
+        <SelectionRadius value="0.937500"/>
+        <ShadowRadius value="0.937500"/>
+    </CModel>
+    <CModel id="AP_DevastatorTurretPlacement" parent="Placement" Race="Terran">
+        <Model value="Assets\Buildings\Terran\GrenadeTurretPlacement\GrenadeTurretPlacement.m3"/>
+        <LowQualityModel value="AP_DevastatorTurret"/>
+        <SelectionRadius value="0.625000"/>
+        <ShadowRadius value="0.625000"/>
+    </CModel>
+    <CModel id="AP_DevastatorTurretBuild" parent="TerranBuildingBuildSmall"/>
+    <CModel id="AP_DevastatorTurretMissile" parent="MissileFX">
+        <Model value="Assets\Effects\Terran\MissileTurretMissile\MissileTurretMissile.m3"/>
+        <EditorCategories value="Race:Terran"/>
+        <ScaleMax value="2.000000,2.000000,2.000000"/>
+        <ScaleMin value="2.000000,2.000000,2.000000"/>
+    </CModel>
     <CModel id="AP_MercCompound" parent="Building" Race="Terran">
         <Model value="Assets\Buildings\Terran\MercCompound\MercCompound.m3"/>
         <Radius value="1.500000"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
index 00f8d6417..d8be20e1a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
@@ -763,6 +763,14 @@
             <YawPitchRoll value="719.2968"/>
         </MotionPhases>
     </CMoverMissile>
+    <CMoverMissile id="AP_DevastatorTurretMissileMover">
+        <MotionPhases>
+            <Driver value="Guidance"/>
+            <Acceleration value="3200"/>
+            <MaxSpeed value="20"/>
+            <YawPitchRoll value="MAX"/>
+        </MotionPhases>
+    </CMoverMissile>
     <CMoverMissile id="AP_LocustEggMissile">
         <MotionPhases>
             <Driver value="Ballistic"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 426050a56..da97fb00e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -760,6 +760,10 @@
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeHailstormMissilePodsCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveDevastatorTurretSlow">
+        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeDevastatorTurretSlowCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_UseReinforcedSuperstructure">
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeReinforcedSuperstructureCompleteOnly"/>
@@ -834,6 +838,9 @@
     <CRequirement id="AP_CommandCenterReactorResearched">
         <NodeArray index="Use" Link="AP_CountUpgradeCommandCenterReactorCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveFactory">
+        <NodeArray index="Use" Link="AP_CountUnitFactoryCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveFactoryOrStarport">
         <NodeArray index="Use" Link="AP_OrCountUnitAlias_FactoryCompleteOnlyTechTreeCheatCountUnitAlias_StarportCompleteOnlyTechTreeCheat"/>
     </CRequirement>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 716448fff..e7eb3290e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -1056,6 +1056,10 @@
         <Count Link="AP_SwapToHailstormMissiles" State="CompleteOnlyAtUnit"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountBehavior>
+    <CRequirementCountUpgrade id="AP_CountUpgradeDevastatorTurretSlowCompleteOnly">
+        <Count Link="AP_DevastatorTurretSlow" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeReinforcedSuperstructureCompleteOnly">
         <Count Link="AP_ReinforcedSuperstructure" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
index e00a4bca7..47181a143 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
@@ -2319,6 +2319,28 @@
         <Pitch value="-2.000000,2.000000"/>
         <Volume value="-7.500000,-6.000000"/>
     </CSound>
+    <CSound id="AP_DevastatorTurretExplode" parent="Terran_ExplosionMedium"/>
+    <CSound id="AP_DevastatorTurret_AttackLaunch" parent="Combat">
+        <EditorCategories value="Race:Terran"/>
+        <AssetArray File="Assets\Sounds\Terran\MissileTurret\MissileTurret_AttackLaunch0.wav"/>
+        <AssetArray File="Assets\Sounds\Terran\MissileTurret\MissileTurret_AttackLaunch1.wav"/>
+        <AssetArray File="Assets\Sounds\Terran\MissileTurret\MissileTurret_AttackLaunch2.wav"/>
+        <DupeDestroyCount value="5"/>
+        <DupeMaximumMethod value="Replace"/>
+        <OverlapTimeDelta value="100"/>
+        <Pitch value="-2.000000,3.000000"/>
+        <Volume value="-6.000000,-6.000000"/>
+    </CSound>
+    <CSound id="AP_DevastatorTurret_AttackImpact" parent="Combat">
+        <EditorCategories value="Race:Terran"/>
+        <AssetArray File="Assets\Sounds\Terran\SharedEffects\Explosions\Terran_ExplosionSmall0.wav"/>
+        <AssetArray File="Assets\Sounds\Terran\SharedEffects\Explosions\Terran_ExplosionSmall1.wav"/>
+        <AssetArray File="Assets\Sounds\Terran\SharedEffects\Explosions\Terran_ExplosionSmall2.wav"/>
+        <AssetArray File="Assets\Sounds\Terran\SharedEffects\Explosions\Terran_ExplosionSmall3.wav"/>
+        <AssetArray File="Assets\Sounds\Terran\SharedEffects\Explosions\Terran_ExplosionSmall4.wav"/>
+        <AssetArray File="Assets\Sounds\Terran\SharedEffects\Explosions\Terran_ExplosionSmall5.wav"/>
+        <Pitch value="-6.000000,6.000000"/>
+    </CSound>
     <CSound id="AP_HiveMindEmulator_MindControlImpact" parent="Spell">
         <EditorCategories value="Race:Terran"/>
         <AssetArray File="Assets\Sounds\Terran\Nova\Nova_DominationEnd0.wav"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 343de349f..d53990082 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -6888,6 +6888,67 @@
         <RankDisplay value="Never"/>
         <AIEvaluateAlias value=""/>
     </CUnit>
+    <CUnit id="AP_DevastatorTurret">
+        <DeathRevealRadius value="3"/>
+        <Race value="Terr"/>
+        <FlagArray index="Turnable" value="0"/>
+        <FlagArray index="UseLineOfSight" value="1"/>
+        <FlagArray index="TownAlert" value="1"/>
+        <FlagArray index="NoPortraitTalk" value="1"/>
+        <FlagArray index="AIDefense" value="1"/>
+        <FlagArray index="ArmorDisabledWhileConstructing" value="1"/>
+        <FogVisibility value="Snapshot"/>
+        <PlaneArray index="Ground" value="1"/>
+        <Collide index="Burrow" value="1"/>
+        <Collide index="Ground" value="1"/>
+        <Collide index="Structure" value="1"/>
+        <Collide index="RoachBurrow" value="1"/>
+        <Collide index="ForceField" value="1"/>
+        <Collide index="Locust" value="1"/>
+        <Collide index="Small" value="1"/>
+        <Attributes index="Armored" value="1"/>
+        <Attributes index="Mechanical" value="1"/>
+        <Attributes index="Structure" value="1"/>
+        <LifeStart value="300"/>
+        <LifeMax value="300"/>
+        <LifeArmorName value="Unit/LifeArmorName/TerranBuildingPlating"/>
+        <Sight value="9"/>
+        <CostResource index="Minerals" value="200"/>
+        <RepairTime value="26.25"/>
+        <AttackTargetPriority value="20"/>
+        <AbilArray Link="BuildInProgress"/>
+        <AbilArray Link="stop"/>
+        <AbilArray Link="attack"/>
+        <AbilArray Link="AP_SalvageShared"/>
+        <BehaviorArray Link="AP_TerranBuildingBurnDown"/>
+        <BehaviorArray Link="UnderConstruction"/>
+        <BehaviorArray Link="AP_FireSuppressionSystem"/>
+        <WeaponArray Link="AP_DevastatorTurretWeapon" Turret="AutoTurret"/>
+        <CardLayouts>
+            <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
+            <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
+            <LayoutButtons Face="SelectBuilder" Type="SelectBuilder" AbilCmd="BuildInProgress,Cancel" Row="1" Column="3"/>
+            <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="Halt" Type="AbilCmd" AbilCmd="BuildInProgress,Halt" Row="2" Column="3"/>
+            <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
+        </CardLayouts>
+        <Radius value="0.75"/>
+        <SeparationRadius value="0.75"/>
+        <Footprint value="Footprint2x2Contour"/>
+        <PlacementFootprint value="Footprint2x2"/>
+        <SubgroupPriority value="3"/>
+        <MinimapRadius value="0.75"/>
+        <EditorCategories value="ObjectType:Structure,ObjectFamily:FactionRaider"/>
+        <GlossaryPriority value="250"/>
+        <HotkeyCategory value="Unit/Category/AP_TerranUnitsGround"/>
+    </CUnit>
+    <CUnit id="AP_DevastatorTurretMissile" parent="MISSILE">
+        <Race value="Terr"/>
+        <Mover value="AP_DevastatorTurretMissileMover"/>
+        <EditorCategories value="ObjectType:Projectile,ObjectFamily:Campaign"/>
+    </CUnit>
     <CUnit id="AP_Armory">
         <DeathRevealRadius value="3"/>
         <Race value="Terr"/>
@@ -18122,17 +18183,18 @@
             <LayoutButtons Face="AP_SupplyDepot" Type="AbilCmd" AbilCmd="AP_TerranBuild,1" Row="0" Column="2"/>
             <LayoutButtons Face="AP_Barracks" Type="AbilCmd" AbilCmd="AP_TerranBuild,3" Row="1" Column="0"/>
             <LayoutButtons Face="AP_EngineeringBay" Type="AbilCmd" AbilCmd="AP_TerranBuild,4" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_PerditionTurret" Type="AbilCmd" AbilCmd="AP_TerranBuild,19" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_PsiDisruptor" Type="AbilCmd" AbilCmd="AP_TerranBuild,7" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_BuildDevastatorTurret" Type="AbilCmd" AbilCmd="AP_TerranBuild,Build25" Row="1" Column="4"/>
             <LayoutButtons Face="AP_Bunker" Type="AbilCmd" AbilCmd="AP_TerranBuild,6" Row="2" Column="0"/>
             <LayoutButtons Face="AP_MissileTurret" Type="AbilCmd" AbilCmd="AP_TerranBuild,5" Row="2" Column="1"/>
             <LayoutButtons Face="AP_SensorTower" Type="AbilCmd" AbilCmd="AP_TerranBuild,8" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_HiveMindEmulator" Type="AbilCmd" AbilCmd="AP_TerranBuild,21" Row="2" Column="3"/>
             <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
             <LayoutButtons Face="AP_CommandCenterOrbRelay" Type="AbilCmd" AbilCmd="AP_TerranBuild,20" Row="0" Column="0"/>
             <LayoutButtons Face="AP_AutomatedRefinery" Type="AbilCmd" AbilCmd="AP_TerranBuild,18" Row="0" Column="1"/>
             <LayoutButtons Face="AP_SupplyDepotDrop" Type="AbilCmd" AbilCmd="AP_TerranBuildDrop,0" Row="0" Column="2"/>
             <LayoutButtons Face="AP_BunkerFortified" Type="AbilCmd" AbilCmd="AP_TerranBuild,22" Row="2" Column="0"/>
-            <LayoutButtons Face="AP_PerditionTurret" Type="AbilCmd" AbilCmd="AP_TerranBuild,19" Row="1" Column="2"/>
-            <LayoutButtons Face="AP_HiveMindEmulator" Type="AbilCmd" AbilCmd="AP_TerranBuild,21" Row="2" Column="3"/>
-            <LayoutButtons Face="AP_PsiDisruptor" Type="AbilCmd" AbilCmd="AP_TerranBuild,7" Row="1" Column="3"/>
         </CardLayouts>
         <CardLayouts CardId="TBl2">
             <LayoutButtons Face="AP_GhostAcademy" Type="AbilCmd" AbilCmd="AP_TerranBuild,9" Row="0" Column="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index a2e2f8fb6..2172c31bf 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -2986,6 +2986,12 @@
         <Flags index="UpgradeCheat" value="0"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
     </CUpgrade>
+    <CUpgrade id="AP_DevastatorTurretSlow">
+        <Flags index="UpgradeCheat" value="0"/>
+        <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
+        <EffectArray Operation="Set" Reference="Effect,AP_DevastatorTurretSet,EffectArray[1]" Value="AP_DevastatorTurretSlow"/>
+        <AffectedUnitArray value="AP_DevastatorTurret"/>
+    </CUpgrade>
     <CUpgrade id="AP_OrbitalRelay">
         <Flags index="UpgradeCheat" value="0"/>
         <EffectArray Operation="Set" Reference="Unit,AP_CommandCenter,EnergyMax" Value="200"/>
@@ -10622,6 +10628,8 @@
         <EffectArray Reference="Unit,AP_GhostAcademy,LifeArmorLevel" Value="2"/>
         <EffectArray Reference="Unit,AP_MissileTurret,LifeArmor" Value="2.000000"/>
         <EffectArray Reference="Unit,AP_MissileTurret,LifeArmorLevel" Value="2"/>
+        <EffectArray Reference="Unit,AP_DevastatorTurret,LifeArmor" Value="2.000000"/>
+        <EffectArray Reference="Unit,AP_DevastatorTurret,LifeArmorLevel" Value="2"/>
         <EffectArray Reference="Unit,AP_SensorTower,LifeArmor" Value="2.000000"/>
         <EffectArray Reference="Unit,AP_SensorTower,LifeArmorLevel" Value="2"/>
         <EffectArray Reference="Unit,AP_Bunker,LifeArmor" Value="2.000000"/>
@@ -10680,6 +10688,7 @@
         <AffectedUnitArray value="AP_FusionCore"/>
         <AffectedUnitArray value="AP_GhostAcademy"/>
         <AffectedUnitArray value="AP_MissileTurret"/>
+        <AffectedUnitArray value="AP_DevastatorTurret"/>
         <AffectedUnitArray value="AP_OrbitalCommand"/>
         <AffectedUnitArray value="AP_OrbitalCommandFlying"/>
         <AffectedUnitArray value="AP_PlanetaryFortress"/>
@@ -10731,9 +10740,12 @@
         <EffectArray Reference="Effect,AP_PerditionTurretFlameThrowerCreatePersistent,PeriodCount" Value="4"/>
         <EffectArray Reference="Abil,AP_PerditionTurretUnburrow,AutoCastRange" Value="1"/>
         <EffectArray Reference="Abil,AP_MindControl,Range" Value="1"/>
+        <EffectArray Reference="Weapon,AP_DevastatorTurretWeapon,Range" Value="1"/>
+        <EffectArray Reference="Weapon,AP_DevastatorTurretWeapon,MinScanRange" Value="1"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <ScoreResult value="BuildOrder"/>
         <AffectedUnitArray value="AP_AutoTurret"/>
+        <AffectedUnitArray value="AP_DevastatorTurret"/>
         <AffectedUnitArray value="AP_MissileTurret"/>
         <AffectedUnitArray value="AP_PlanetaryFortress"/>
         <AffectedUnitArray value="AP_PerditionTurret"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index d3694eebf..628b7d7d3 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -6,6 +6,9 @@
     <CValidatorCombine default="1" id="AP_SCBW_Behavior">
         <Type value="And"/>
     </CValidatorCombine>
+    <CValidatorUnitFilters id="AP_NotMassive">
+        <Filters value="-;Massive"/>
+    </CValidatorUnitFilters>
     <CValidatorPlayerRequirement id="AP_HaveGhostPermanentCloak">
         <Find value="1"/>
         <Value value="AP_PermanentCloakGhostResearched"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index 5d8f40de2..ca5d4ff7d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -1083,6 +1083,18 @@
         <Effect value="AP_MindControlDummyImpact"/>
         <!-- Unused in vanilla -->
     </CWeaponLegacy>
+    <CWeaponLegacy id="AP_DevastatorTurretWeapon">
+        <EditorCategories value="Race:Terran"/>
+        <Icon value="Assets\Textures\btn-upgrade-terran-infantryweaponslevel0.dds"/>
+        <DisplayEffect value="AP_DevastatorTurretDamage"/>
+        <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <MinScanRange value="6.5"/>
+        <Range value="6"/>
+        <Period value="1.5"/>
+        <DamagePoint value="0"/>
+        <Backswing value="0"/>
+        <Effect value="AP_DevastatorTurretLM"/>
+    </CWeaponLegacy>
     <CWeaponLegacy id="AP_TwinIbiksCannon">
         <EditorCategories value="Race:Terran"/>
         <Options index="OnlyFireAtAttackOrderTarget" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
index 7d810959c..a5758a364 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
@@ -36,6 +36,8 @@
 <Model id="AP_KerriganLevelUpPortrait"/>
 <Model id="AP_UI_SOA_ButtonActivate"/>
 <Model id="AP_SOA_Calldown_UI"/>
+<Model id="AP_DevastatorTurret"/>
+<Model id="AP_DevastatorTurretPlacement"/>
 <Model id="AP_MercCompound"/>
 <Model id="AP_MercCompoundBuild"/>
 <Model id="AP_MercCompoundDeath"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index f928b002b..356f42abd 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -29,6 +29,7 @@ Button/Hotkey/AP_BuildAutoTurret=T
 Button/Hotkey/AP_BuildCreepTumor=C
 Button/Hotkey/AP_BuildCreepTumorPropagate=C
 Button/Hotkey/AP_BuildCyclone=N
+Button/Hotkey/AP_BuildDevastatorTurret=G
 Button/Hotkey/AP_BuildHealingDrone=B
 Button/Hotkey/AP_BuildHercules=H
 Button/Hotkey/AP_BuildPointDefenseDrone=D
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index ef5d6075a..6d57785c0 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -951,6 +951,8 @@ Button/Name/AP_DefilerSCBWPredatoryConsumption=Predatory Consumption
 Button/Name/AP_DeploySpiderMines=Deploy Spider Mines
 Button/Name/AP_DeploySpiderMinesRaven=Deploy Spider Mines
 Button/Name/AP_DestroyerChargingBeam=Reforged Bloodshard Core
+Button/Name/AP_BuildDevastatorTurret=Build Devastation Turret
+Button/Name/AP_DevastatorTurretSlow=Concussive Grenades
 Button/Name/AP_DevourerAoEDamage=Corrosive Spray
 Button/Name/AP_DevourerSCBW=Morph to Devourer
 Button/Name/AP_Diamondback=Build Diamondback
@@ -1039,6 +1041,7 @@ Button/Name/AP_HercGrapplePull=Grapple Pull
 Button/Name/AP_HerculesLoad=Load
 Button/Name/AP_HerculesUnloadAll=Unload All
 Button/Name/AP_HeroNukeCalldown=Tac Nuke Strike
+Button/Name/AP_HiSecAutoTracking=Hi-Sec Auto Tracking
 Button/Name/AP_HighArchonPsiStorm=Psionic Storm
 Button/Name/AP_HighImpactParticleDisruptor=Disintegrating Particles
 Button/Name/AP_HighImpactPhaseDisruptor=High Impact Phase Disruptor
@@ -1959,6 +1962,8 @@ Button/Tooltip/AP_DefilerSCBWPredatoryConsumption=Consumption can now target any
 Button/Tooltip/AP_DeploySpiderMines=Spider Mines pursue enemy units that come in range, and detonate for heavy area damage. Buried Spider Mines can only be seen by enemy <c val="FFE303">Detectors</c>.
 Button/Tooltip/AP_DeploySpiderMinesRaven=Spider Mines pursue enemy units that come in range, and detonate for heavy area damage. Buried Spider Mines can only be seen by enemy <c val="FFE303">Detectors</c>.
 Button/Tooltip/AP_DestroyerChargingBeam=When fully charged, the Destruction Beam weapon does full damage to secondary targets.
+Button/Tooltip/AP_BuildDevastatorTurret=Ranged defensive turret. Deals bonus damage to armored units. <n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
+Button/Tooltip/AP_DevastatorTurretSlow=Units hit by the Devastator Turret are temporarily slowed.<n/><n/><c val="#ColorAttackInfo">Massive units are immune.</c>
 Button/Tooltip/AP_DevilDog=This elite unit of ex-Confederate firebats has fought on dozens of worlds over the last four years. They don’t care about causes, only cash.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_DevourerAoEDamage=Devourer attacks will now deal area damage.
 Button/Tooltip/AP_DevourerSCBW=Anti-air flyer. Can use <c val="ffff8a">Acid Spores</c>.<n/><n/><c val="ffff8a">Can attack air units.</c>
@@ -2063,6 +2068,7 @@ Button/Tooltip/AP_Hercules=Massive transport ship that deploys its cargo almost
 Button/Tooltip/AP_HerculesLoad=Loads units into the Hercules' hold.
 Button/Tooltip/AP_HerculesUnloadAll=Unloads all units.
 Button/Tooltip/AP_HeroNukeCalldown=Calls down a Nuclear Strike at a target location. Nukes take <d time="5"/> to land, but they deal up to <d ref="Effect,AP_HeroNukeDamage,Amount"/> (+<d ref="Effect,AP_HeroNukeDamage,AttributeBonus[Structure]"/> vs. structures) damage in a large radius.
+Button/Tooltip/AP_HiSecAutoTracking=Adds +1 range to all Turrets.
 Button/Tooltip/AP_HighImpactParticleDisruptor=Increases Particle Disruptor weapon damage.
 Button/Tooltip/AP_HighImpactPhaseDisruptor=Increases Phase Disruptor weapon damage.
 Button/Tooltip/AP_HighImpactPsiStorm=Increases Psionic Storm damage.
@@ -4653,6 +4659,7 @@ Unit/Name/AP_DarkTemplarAiur=Avenger
 Unit/Name/AP_DarkTemplarShakuras=Dark Templar
 Unit/Name/AP_DarkTemplarTaldarim=Blood Hunter
 Unit/Name/AP_DefilerSCBW=Defiler
+Unit/Name/AP_DevastatorTurret=Devastator Turret
 Unit/Name/AP_DevilDog=Devil Dog
 Unit/Name/AP_DevourerSCBW=Devourer
 Unit/Name/AP_DevourerSCBWEgg=Devourer Cocoon
@@ -5515,6 +5522,7 @@ Weapon/Name/AP_DRCannonsA=Revenger Cannons
 Weapon/Name/AP_DRCannonsG=Revenger Cannons
 Weapon/Name/AP_DarkArchonWeapon=Chaotic Torrent
 Weapon/Name/AP_DarkTemplarTaldarim=Bane Blades
+Weapon/Name/AP_DevastatorTurretWeapon=Grenade Launcher
 Weapon/Name/AP_DevilDogFlameThrower=Firestorm Flamethrower
 Weapon/Name/AP_DevourerSCBWWeapon=Corrosive Acid
 Weapon/Name/AP_Diamondback=Eviscerator Rail Gun

From 2c9609f80c49ee849df51955c5b32f0f99f8b50f Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 30 Jun 2024 02:23:45 -0700
Subject: [PATCH 2/7] sc2: Lowered Devastator Turret's bonus damage vs armoured
 from +25 to +15

---
 .../Base.SC2Data/GameData/EffectData.xml                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index ba40b94ec..510f3bf2f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -3872,7 +3872,7 @@
     </CEffectSet>
     <CEffectDamage id="AP_DevastatorTurretDamage" parent="DU_WEAP">
         <EditorCategories value="Race:Terran"/>
-        <AttributeBonus index="Armored" value="25"/>
+        <AttributeBonus index="Armored" value="15"/>
         <Kind value="Ranged"/>
         <Amount value="25"/>
         <Death value="Blast"/>

From bcc31afaa3ee513d6cf9dca4471c0f482fc0c702 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 30 Jun 2024 02:29:39 -0700
Subject: [PATCH 3/7] sc2: Fixed an issue where flying factories didn't count
 towards devastator turret tech requirements

---
 .../Base.SC2Data/GameData/RequirementNodeData.xml           | 6 +++++-
 .../enUS.SC2Data/LocalizedData/GameStrings.txt              | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index e7eb3290e..fbf0a1665 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -1064,7 +1064,7 @@
         <Count Link="AP_ReinforcedSuperstructure" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
-    <CRequirementCountUnit id="AP_CountUnitFactoryCompleteOnly">
+    <CRequirementCountUnit id="AP_CountUnitFactoryLandedCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_Factory" State="CompleteOnly"/>
     </CRequirementCountUnit>
@@ -1079,6 +1079,10 @@
         <Tooltip value="RequirementNode/Tooltip/CountUnitFactoryFlyingCompleteOnly1718561093"/>
         <Count Link="AP_FactoryFlying" State="CompleteOnly"/>
     </CRequirementCountUnit>
+    <CRequirementOr id="AP_CountUnitFactoryCompleteOnly">
+        <OperandArray value="AP_CountUnitFactoryLandedCompleteOnly"/>
+        <OperandArray value="AP_CountUnitFactoryFlyingCompleteOnly"/>
+    </CRequirementOr>
     <CRequirementAnd id="AP_AndCountUnitAlias_TechLabCompleteOnlyAtUnitTechTreeCheatCountUnitArmoryCompleteOnlyTechTreeCheat">
         <OperandArray value="CountUnitAlias_TechLabCompleteOnlyAtUnit2589852481TechTreeCheat"/>
         <OperandArray value="AP_CountUnitArmoryCompleteOnlyTechTreeCheat"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 6d57785c0..fc9d828cc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -4483,6 +4483,7 @@ Param/Value/lib_15EF4C78_E2AE9BC3=<c val="FF9800">Kerrigan has been revived at y
 Param/Value/lib_15EF4C78_EAFF7887=<c val="FF9800">Dehaka has been revived at your Hatchery.</c>
 RequirementNode/Tooltip/AP_CountUnitFactoryCompleteOnly=Factory
 RequirementNode/Tooltip/AP_CountUnitFactoryFlyingCompleteOnly=Flying Factory
+RequirementNode/Tooltip/AP_CountUnitFactoryLandedCompleteOnly=Landed Factory
 RequirementNode/Tooltip/AP_CountUnitGreaterSpireCompleteOnly291495724TechTreeCheat=Mutate Spire into Greater Spire
 RequirementNode/Tooltip/AP_CountUnitImpalerDenCompleteOnly3322076208TechTreeCheat=Mutate Hydralisk Den into Impaler Den
 RequirementNode/Tooltip/AP_CountUnitLurkerDenCompleteOnlyTechTreeCheat=Mutate Hydralisk Den into Greater Hydralisk Den

From ca05bab05c23b2cdb635572c07fc1efcb6eb9355 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 30 Jun 2024 02:44:10 -0700
Subject: [PATCH 4/7] sc2: Added range indicators to Devastator turret on
 placement, placeholder, and selection

---
 .../Base.SC2Data/GameData/ActorData.xml               | 11 ++++++++++-
 .../Base.SC2Data/GameData/UnitData.xml                |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 69cd1517f..18bac625f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -28202,6 +28202,8 @@
         <DeathArray index="Normal" ModelLink="TerranBuildingDeath" SoundLink="AP_DevastatorTurretExplode"/>
         <DeathArray index="UnderConstruction" ModelLink="TerranBuildingDeath" SoundLink="MissileTurret_Explode"/>
         <PlacementModel value="AP_DevastatorTurretPlacement"/>
+        <PlacementActorModel value="AP_DevastatorTurretPlacement"/>
+        <PlaceholderActorModel value="AP_DevastatorTurretPlacement"/>
         <PlacementSound value="Terran_BuildingPlacement"/>
         <PortraitModel value="AdjutantPortrait"/>
         <BarOffset value="75"/>
@@ -28221,6 +28223,10 @@
         <CreepHeightClass value="Small"/>
         <Aliases value="_UnitMedium"/>
     </CActorUnit>
+    <CActorModel id="AP_DevastatorTurretPlacement" parent="PlacementModel">
+        <On Terms="ActorCreation" Send="Create AP_DevastatorTurretProtectRange"/>
+        <On Terms="ActorDestruction" Target="AP_DevastatorTurretProtectRange" Send="Destroy"/>
+    </CActorModel>
     <CActorModel id="AP_DevastatorTurretBuild" parent="TerranBuildingBuildSmall">
         <Model value="AP_DevastatorTurretBuild"/>
     </CActorModel>
@@ -28231,7 +28237,10 @@
     <CActorMissile id="AP_DevastatorTurretAttackMissile" parent="GenericAttackMissile" unitName="AP_DevastatorTurretMissile">
         <Model value="AP_DevastatorTurretMissile"/>
     </CActorMissile>
-    <CActorRange id="AP_DevastatorTurretProtectRange" parent="RangeWeapon" weapon="AP_DevastatorTurretWeapon"/>
+    <CActorRange id="AP_DevastatorTurretProtectRange" parent="RangeWeapon" weapon="AP_DevastatorTurretWeapon">
+        <On Terms="SelectionLocalUpdate.AP_DevastatorTurret.Start" Send="Create"/>
+        <On Terms="SelectionLocalUpdate.AP_DevastatorTurret.Stop" Send="Destroy"/>
+    </CActorRange>
     <CActorModel id="AP_SensorTowerPlacement">
         <Aliases value="_Main"/>
         <Aliases value="_Unit"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index d53990082..8b685a581 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -6942,6 +6942,7 @@
         <MinimapRadius value="0.75"/>
         <EditorCategories value="ObjectType:Structure,ObjectFamily:FactionRaider"/>
         <GlossaryPriority value="250"/>
+        <GlossaryCategory value="Unit/Category/AP_TerranUnitsGround"/>
         <HotkeyCategory value="Unit/Category/AP_TerranUnitsGround"/>
     </CUnit>
     <CUnit id="AP_DevastatorTurretMissile" parent="MISSILE">

From f00d73bc2f9d550d7d986b4c30c3e50315efe859 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 30 Jun 2024 21:21:56 -0700
Subject: [PATCH 5/7] sc2: Added unlock triggers

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  17 ++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   2 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 100 +++++++++++++++++-
 .../LocalizedData/TriggerStrings.txt          |   4 +
 4 files changed, 119 insertions(+), 4 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index e810713b9..cb86821eb 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -511,7 +511,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranLaboratory (int lp_player, int lp_bi
         libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces, // 12
         libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow, // 13
         libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions, // 14
-        ap_triggers_PlayerConsumer_sig, // 15
+        libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow, // 15
         ap_triggers_PlayerConsumer_sig, // 16
         ap_triggers_PlayerConsumer_sig, // 17
         ap_triggers_PlayerConsumer_sig, // 18
@@ -583,7 +583,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranBuildings (int lp_player, int lp_bit
         libABFE498B_gf_AP_Triggers_Terran_unlockPerditionTurret, // 4
         libABFE498B_gf_AP_Triggers_Terran_unlockHiveMindEmulator, // 5
         libABFE498B_gf_AP_Triggers_Terran_unlockPsiDisrupter, // 6
-        ap_triggers_PlayerConsumer_sig, // 7
+        libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurret, // 7
         ap_triggers_PlayerConsumer_sig, // 8
         ap_triggers_PlayerConsumer_sig, // 9
         ap_triggers_PlayerConsumer_sig, // 10
@@ -1910,6 +1910,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockHiveMindEmulator (int lp_player) {
     TechTreeUnitAllow(lp_player, "AP_HiveMindEmulator", true);
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurret (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    TechTreeUnitAllow(lp_player, "AP_DevastatorTurret", true);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockSCVAdvancedConstruction (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -3482,6 +3488,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressOrbitalModule (int
 
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DevastatorTurretSlow", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockInfantryArmor (int lp_player, int lp_level) {
     // Automatic Variable Declarations
     // Implementation
@@ -4353,6 +4365,7 @@ void libABFE498B_gf_AP_Triggers_clearTerranTech (int lp_player) {
     TechTreeUnitAllow(lp_player, "AP_PsiDisruptor", false);
     TechTreeUnitAllow(lp_player, "AP_Bunker", false);
     TechTreeUnitAllow(lp_player, "AP_MissileTurret", false);
+    TechTreeUnitAllow(lp_player, "AP_DevastatorTurret", false);
     TechTreeUnitAllow(lp_player, "AP_SensorTower", false);
     TechTreeUnitAllow(lp_player, "AP_HiveMindEmulator", false);
     TechTreeUnitAllow(lp_player, "AP_GhostAcademy", false);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 690efe222..0dccd6283 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -193,6 +193,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockSensorTower (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockPerditionTurret (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockPsiDisrupter (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockHiveMindEmulator (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurret (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockSCVAdvancedConstruction (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockSCVDualFusionWelders (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockSCVHostileEnvironmentAdaptation (int lp_player);
@@ -412,6 +413,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockAdvancedOptics (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaGhostVisor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaRangefinderOculus (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaDomination (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 74078a00c..1abe2af2c 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2758,7 +2758,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces, // 12
                     libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow, // 13
                     libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions, // 14
-                    ap_triggers_PlayerConsumer_sig, // 15
+                    libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
                     ap_triggers_PlayerConsumer_sig, // 17
                     ap_triggers_PlayerConsumer_sig, // 18
@@ -2882,7 +2882,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockPerditionTurret, // 4
                     libABFE498B_gf_AP_Triggers_Terran_unlockHiveMindEmulator, // 5
                     libABFE498B_gf_AP_Triggers_Terran_unlockPsiDisrupter, // 6
-                    ap_triggers_PlayerConsumer_sig, // 7
+                    libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurret, // 7
                     ap_triggers_PlayerConsumer_sig, // 8
                     ap_triggers_PlayerConsumer_sig, // 9
                     ap_triggers_PlayerConsumer_sig, // 10
@@ -12867,6 +12867,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="19467E56"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="EB0B3D1F"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="F0AE94EE"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="C9EDD088"/>
         </Element>
         <Element Type="FunctionDef" Id="A510A47F">
             <FlagAction/>
@@ -13204,6 +13205,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Unit"/>
         </Element>
+        <Element Type="FunctionDef" Id="C9EDD088">
+            <Identifier>AP_Triggers_Terran_unlockDevastatorTurret</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="54F7DF50"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D675818F"/>
+        </Element>
+        <Element Type="ParamDef" Id="54F7DF50">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="BFF1A49A"/>
+        </Element>
+        <Element Type="Param" Id="BFF1A49A">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="D675818F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DC4E1867"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9FA2F1E4"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="AF0523C1"/>
+        </Element>
+        <Element Type="Param" Id="DC4E1867">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="54F7DF50"/>
+        </Element>
+        <Element Type="Param" Id="9FA2F1E4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_DevastatorTurret</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="Param" Id="AF0523C1">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
         <Element Type="Category" Id="279E947C">
             <Item Type="Category" Library="ABFE498B" Id="5EF49186"/>
             <Item Type="Category" Library="ABFE498B" Id="65B8E6B3"/>
@@ -23733,6 +23770,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="128BEA72"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="09B67FC0"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="45AD82C7"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="D462CB24"/>
         </Element>
         <Element Type="FunctionDef" Id="0E95856F">
             <FlagAction/>
@@ -24876,6 +24914,43 @@
             <Value>0</Value>
             <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"/>
+        </Element>
+        <Element Type="ParamDef" Id="7C94192B">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="C84F252A"/>
+        </Element>
+        <Element Type="Param" Id="C84F252A">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="830A037E">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D19FA6BD"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1946F1F8"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="28B5EDCE"/>
+        </Element>
+        <Element Type="Param" Id="D19FA6BD">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="7C94192B"/>
+        </Element>
+        <Element Type="Param" Id="1946F1F8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DevastatorTurretSlow</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="28B5EDCE">
+            <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"/>
@@ -33998,6 +34073,7 @@
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="7B4B072B"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F79D4A89"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="41A3952A"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F3CDEA83"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="8A5B1074"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="515E5F2B"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="232784D5"/>
@@ -35143,6 +35219,26 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Unit"/>
         </Element>
+        <Element Type="FunctionCall" Id="F3CDEA83">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="20EBBE3B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8D6FC7FF"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4C4A3966"/>
+        </Element>
+        <Element Type="Param" Id="20EBBE3B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="FFC5A20B"/>
+        </Element>
+        <Element Type="Param" Id="8D6FC7FF">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_DevastatorTurret</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="Param" Id="4C4A3966">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
+        </Element>
         <Element Type="FunctionCall" Id="8A5B1074">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
             <Parameter Type="Param" Library="ABFE498B" Id="3A33C2BC"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 9afcd6b7e..eaa8d1074 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -618,6 +618,7 @@ FunctionDef/Name/lib_ABFE498B_C8E1A3BC=AP_Triggers_unlockProtossSpearOfAdun
 FunctionDef/Name/lib_ABFE498B_C8F67358=AP_Triggers_MapConfig_setSoAControllingPlayers
 FunctionDef/Name/lib_ABFE498B_C9720F38=AP_Triggers_Protoss_unlockCenturion
 FunctionDef/Name/lib_ABFE498B_C9ED962C=AP_Triggers_Terran_unlockInfantryArmor
+FunctionDef/Name/lib_ABFE498B_C9EDD088=AP_Triggers_Terran_unlockDevastatorTurret
 FunctionDef/Name/lib_ABFE498B_CA0C43C5=AP_Triggers_Zerg_RoachVile
 FunctionDef/Name/lib_ABFE498B_CA1333E8=AP_Triggers_Zerg_BroodQueenFungalGrowth
 FunctionDef/Name/lib_ABFE498B_CB89C797=AP_Triggers_Zerg_RoachGlialReconstitution
@@ -645,6 +646,7 @@ FunctionDef/Name/lib_ABFE498B_D3F0F221=AP_Triggers_Zerg_RavagerBloatedBileDucts
 FunctionDef/Name/lib_ABFE498B_D4040AD0=AP_Triggers_Zerg_BroodLordResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_D4116829=AP_Triggers_Protoss_unlockDarkArchonFeedback
 FunctionDef/Name/lib_ABFE498B_D421BE14=AP_Triggers_Zerg_TwinDrones
+FunctionDef/Name/lib_ABFE498B_D462CB24=AP_Triggers_Terran_unlockDevastatorTurretSlow
 FunctionDef/Name/lib_ABFE498B_D4789795=AP_Triggers_Protoss_unlockHavoc
 FunctionDef/Name/lib_ABFE498B_D4C59830=AP_Triggers_Terran_unlockSiegeTankShapedHull
 FunctionDef/Name/lib_ABFE498B_D4C5B753=AP_Triggers_Terran_unlockMarauder
@@ -1012,6 +1014,7 @@ ParamDef/Name/lib_ABFE498B_544336B5=player
 ParamDef/Name/lib_ABFE498B_54E0F5AF=player
 ParamDef/Name/lib_ABFE498B_54F33D3B=bitArrayValue
 ParamDef/Name/lib_ABFE498B_54F3F99A=player
+ParamDef/Name/lib_ABFE498B_54F7DF50=player
 ParamDef/Name/lib_ABFE498B_5524294C=player
 ParamDef/Name/lib_ABFE498B_552EC6A9=player
 ParamDef/Name/lib_ABFE498B_55A7134E=bitArrayValue
@@ -1135,6 +1138,7 @@ ParamDef/Name/lib_ABFE498B_7BFE65D1=player
 ParamDef/Name/lib_ABFE498B_7C09DAB0=player
 ParamDef/Name/lib_ABFE498B_7C5D358F=player
 ParamDef/Name/lib_ABFE498B_7C6A2BF2=player
+ParamDef/Name/lib_ABFE498B_7C94192B=player
 ParamDef/Name/lib_ABFE498B_7CB892BB=player
 ParamDef/Name/lib_ABFE498B_7D087641=player
 ParamDef/Name/lib_ABFE498B_7D48AA8A=player

From 5abace88d3ec371d4d1aee594cfcf909fdfb7f93 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 30 Jun 2024 21:46:32 -0700
Subject: [PATCH 6/7] sc2: Ensured factory is unlocked with devastator turret

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  1 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index cb86821eb..b92f8dda9 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1913,6 +1913,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockHiveMindEmulator (int lp_player) {
 void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurret (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
+    TechTreeUnitAllow(lp_player, "AP_Factory", true);
     TechTreeUnitAllow(lp_player, "AP_DevastatorTurret", true);
 }
 
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 1abe2af2c..aefef8c35 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -13206,11 +13206,32 @@
             <ValueGameType Type="Unit"/>
         </Element>
         <Element Type="FunctionDef" Id="C9EDD088">
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FFA29486"/>
             <Identifier>AP_Triggers_Terran_unlockDevastatorTurret</Identifier>
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="54F7DF50"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D675818F"/>
         </Element>
+        <Element Type="FunctionCall" Id="FFA29486">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C907BD9B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C30F9EE6"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6E878307"/>
+        </Element>
+        <Element Type="Param" Id="C907BD9B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="54F7DF50"/>
+        </Element>
+        <Element Type="Param" Id="C30F9EE6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_Factory</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="Param" Id="6E878307">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
         <Element Type="ParamDef" Id="54F7DF50">
             <ParameterType>
                 <Type Value="int"/>

From 5d3290b3f7824a068bbb5e47eaf14d7c257980d0 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Mon, 1 Jul 2024 02:47:54 -0700
Subject: [PATCH 7/7] sc2: Moving devastator turret slow to new armory 7
 category

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  62 +++++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   3 +-
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 177 ++++++++++++++++--
 .../LocalizedData/TriggerStrings.txt          |   4 +
 4 files changed, 216 insertions(+), 30 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index b92f8dda9..4d6975956 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -489,6 +489,46 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory6 (int lp_player, int lp_bitAr
     );
 }
 
+void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitArrayValue) {
+    // Automatic Variable Declarations
+    // Implementation
+    // Yeah, this must be done in Galaxy
+    ap_triggers_processBitsInBitArray(
+        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
+        ap_triggers_PlayerConsumer_sig, // 4
+        ap_triggers_PlayerConsumer_sig, // 5
+        ap_triggers_PlayerConsumer_sig, // 6
+        ap_triggers_PlayerConsumer_sig, // 7
+        ap_triggers_PlayerConsumer_sig, // 8
+        ap_triggers_PlayerConsumer_sig, // 9
+        ap_triggers_PlayerConsumer_sig, // 10
+        ap_triggers_PlayerConsumer_sig, // 11
+        ap_triggers_PlayerConsumer_sig, // 12
+        ap_triggers_PlayerConsumer_sig, // 13
+        ap_triggers_PlayerConsumer_sig, // 14
+        ap_triggers_PlayerConsumer_sig, // 15
+        ap_triggers_PlayerConsumer_sig, // 16
+        ap_triggers_PlayerConsumer_sig, // 17
+        ap_triggers_PlayerConsumer_sig, // 18
+        ap_triggers_PlayerConsumer_sig, // 19
+        ap_triggers_PlayerConsumer_sig, // 20
+        ap_triggers_PlayerConsumer_sig, // 21
+        ap_triggers_PlayerConsumer_sig, //22
+        ap_triggers_PlayerConsumer_sig, //23
+        ap_triggers_PlayerConsumer_sig, //24
+        ap_triggers_PlayerConsumer_sig, //25
+        ap_triggers_PlayerConsumer_sig, //26
+        ap_triggers_PlayerConsumer_sig, //27
+        ap_triggers_PlayerConsumer_sig, //28
+        ap_triggers_PlayerConsumer_sig //29
+    );
+}
+
 void libABFE498B_gf_AP_Triggers_unlockTerranLaboratory (int lp_player, int lp_bitArrayValue) {
     // Automatic Variable Declarations
     // Implementation
@@ -511,7 +551,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranLaboratory (int lp_player, int lp_bi
         libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces, // 12
         libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow, // 13
         libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions, // 14
-        libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow, // 15
+        ap_triggers_PlayerConsumer_sig, // 15
         ap_triggers_PlayerConsumer_sig, // 16
         ap_triggers_PlayerConsumer_sig, // 17
         ap_triggers_PlayerConsumer_sig, // 18
@@ -7632,6 +7672,7 @@ bool libABFE498B_gt_AP_Triggers_giveTerranTech_Func (bool testConds, bool runAct
     string lv_armory4Value;
     string lv_armory5Value;
     string lv_armory6Value;
+    string lv_armory7Value;
     string lv_buildingValue;
     string lv_mercenaryValue;
     string lv_laboratoryValue;
@@ -7651,6 +7692,7 @@ bool libABFE498B_gt_AP_Triggers_giveTerranTech_Func (bool testConds, bool runAct
     lv_armory4Value = "";
     lv_armory5Value = "";
     lv_armory6Value = "";
+    lv_armory7Value = "";
     lv_buildingValue = "";
     lv_mercenaryValue = "";
     lv_laboratoryValue = "";
@@ -7669,14 +7711,15 @@ bool libABFE498B_gt_AP_Triggers_giveTerranTech_Func (bool testConds, bool runAct
     lv_armory4Value = StringWord(EventChatMessage(false), 5);
     lv_armory5Value = StringWord(EventChatMessage(false), 6);
     lv_armory6Value = StringWord(EventChatMessage(false), 7);
-    lv_progressiveUpgradeValue = StringWord(EventChatMessage(false), 8);
-    lv_laboratoryValue = StringWord(EventChatMessage(false), 9);
-    lv_upgradeValue = StringWord(EventChatMessage(false), 10);
-    lv_unitValue = StringWord(EventChatMessage(false), 11);
-    lv_buildingValue = StringWord(EventChatMessage(false), 12);
-    lv_mercenaryValue = StringWord(EventChatMessage(false), 13);
-    lv_novaGearValue = StringWord(EventChatMessage(false), 14);
-    lv_progressiveUpgrade2Value = StringWord(EventChatMessage(false), 15);
+    lv_armory7Value = StringWord(EventChatMessage(false), 8);
+    lv_progressiveUpgradeValue = StringWord(EventChatMessage(false), 9);
+    lv_laboratoryValue = StringWord(EventChatMessage(false), 10);
+    lv_upgradeValue = StringWord(EventChatMessage(false), 11);
+    lv_unitValue = StringWord(EventChatMessage(false), 12);
+    lv_buildingValue = StringWord(EventChatMessage(false), 13);
+    lv_mercenaryValue = StringWord(EventChatMessage(false), 14);
+    lv_novaGearValue = StringWord(EventChatMessage(false), 15);
+    lv_progressiveUpgrade2Value = StringWord(EventChatMessage(false), 16);
     auto3377504F_g = lib5BD4895D_gv_aP_Core_affectedPlayers;
     lv_currentPlayer = -1;
     while (true) {
@@ -7688,6 +7731,7 @@ bool libABFE498B_gt_AP_Triggers_giveTerranTech_Func (bool testConds, bool runAct
         libABFE498B_gf_AP_Triggers_unlockTerranArmory4(lv_currentPlayer, StringToInt(lv_armory4Value));
         libABFE498B_gf_AP_Triggers_unlockTerranArmory5(lv_currentPlayer, StringToInt(lv_armory5Value));
         libABFE498B_gf_AP_Triggers_unlockTerranArmory6(lv_currentPlayer, StringToInt(lv_armory6Value));
+        libABFE498B_gf_AP_Triggers_unlockTerranArmory7(lv_currentPlayer, StringToInt(lv_armory7Value));
         libABFE498B_gf_AP_Triggers_unlockTerranProgressiveUpgrades(lv_currentPlayer, StringToInt(lv_progressiveUpgradeValue));
         libABFE498B_gf_AP_Triggers_unlockTerranLaboratory(lv_currentPlayer, StringToInt(lv_laboratoryValue));
         libABFE498B_gf_AP_Triggers_unlockTerranUpgrades(lv_currentPlayer, StringToInt(lv_upgradeValue));
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 0dccd6283..2a2f4572a 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -117,6 +117,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory3 (int lp_player, int lp_bitAr
 void libABFE498B_gf_AP_Triggers_unlockTerranArmory4 (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockTerranArmory5 (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockTerranArmory6 (int lp_player, int lp_bitArrayValue);
+void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockTerranLaboratory (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockTerranMercenaries (int lp_player, int lp_bitArrayValue);
 void libABFE498B_gf_AP_Triggers_unlockTerranBuildings (int lp_player, int lp_bitArrayValue);
@@ -391,6 +392,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterMULE (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockPlanetaryFortressProgressiveAugumentedThrusters (int lp_player, int lp_level);
 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_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);
@@ -413,7 +415,6 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockAdvancedOptics (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions (int lp_player);
-void libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaGhostVisor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaRangefinderOculus (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaDomination (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index aefef8c35..bb040f233 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -881,6 +881,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="6B972EC2"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="FE756FB1"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D1EAAD52"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="651AD4D5"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="9706676A"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="52E13FC7"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="66568157"/>
@@ -2710,6 +2711,72 @@
                 );
             </ScriptCode>
         </Element>
+        <Element Type="FunctionDef" Id="651AD4D5">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="5F106376"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="51E0AC1D"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3B12790B"/>
+        </Element>
+        <Element Type="ParamDef" Id="5F106376">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="76811D80"/>
+        </Element>
+        <Element Type="Param" Id="76811D80">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="ParamDef" Id="51E0AC1D">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="DDB58A9E"/>
+        </Element>
+        <Element Type="Param" Id="DDB58A9E">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="3B12790B">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000123"/>
+            <ScriptCode>
+                // Yeah, this must be done in Galaxy
+                ap_triggers_processBitsInBitArray(
+                    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
+                    ap_triggers_PlayerConsumer_sig, // 4
+                    ap_triggers_PlayerConsumer_sig, // 5
+                    ap_triggers_PlayerConsumer_sig, // 6
+                    ap_triggers_PlayerConsumer_sig, // 7
+                    ap_triggers_PlayerConsumer_sig, // 8
+                    ap_triggers_PlayerConsumer_sig, // 9
+                    ap_triggers_PlayerConsumer_sig, // 10
+                    ap_triggers_PlayerConsumer_sig, // 11
+                    ap_triggers_PlayerConsumer_sig, // 12
+                    ap_triggers_PlayerConsumer_sig, // 13
+                    ap_triggers_PlayerConsumer_sig, // 14
+                    ap_triggers_PlayerConsumer_sig, // 15
+                    ap_triggers_PlayerConsumer_sig, // 16
+                    ap_triggers_PlayerConsumer_sig, // 17
+                    ap_triggers_PlayerConsumer_sig, // 18
+                    ap_triggers_PlayerConsumer_sig, // 19
+                    ap_triggers_PlayerConsumer_sig, // 20
+                    ap_triggers_PlayerConsumer_sig, // 21
+                    ap_triggers_PlayerConsumer_sig, //22
+                    ap_triggers_PlayerConsumer_sig, //23
+                    ap_triggers_PlayerConsumer_sig, //24
+                    ap_triggers_PlayerConsumer_sig, //25
+                    ap_triggers_PlayerConsumer_sig, //26
+                    ap_triggers_PlayerConsumer_sig, //27
+                    ap_triggers_PlayerConsumer_sig, //28
+                    ap_triggers_PlayerConsumer_sig //29
+                );
+            </ScriptCode>
+        </Element>
         <Element Type="FunctionDef" Id="9706676A">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="872176AE"/>
@@ -2758,7 +2825,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces, // 12
                     libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow, // 13
                     libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions, // 14
-                    libABFE498B_gf_AP_Triggers_Terran_unlockDevastatorTurretSlow, // 15
+                    ap_triggers_PlayerConsumer_sig, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
                     ap_triggers_PlayerConsumer_sig, // 17
                     ap_triggers_PlayerConsumer_sig, // 18
@@ -5476,6 +5543,7 @@
             <Variable Type="Variable" Library="ABFE498B" Id="BEDD7954"/>
             <Variable Type="Variable" Library="ABFE498B" Id="42FE32E7"/>
             <Variable Type="Variable" Library="ABFE498B" Id="A4361B8E"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="5613E176"/>
             <Variable Type="Variable" Library="ABFE498B" Id="232483FD"/>
             <Variable Type="Variable" Library="ABFE498B" Id="9904111B"/>
             <Variable Type="Variable" Library="ABFE498B" Id="62ACDBC9"/>
@@ -5489,6 +5557,7 @@
             <Action Type="FunctionCall" Library="ABFE498B" Id="1067E998"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="4497DC5F"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="95B6F1E2"/>
+            <Action Type="FunctionCall" Library="ABFE498B" Id="5D0E4361"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="CA606991"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="11ADB3C5"/>
             <Action Type="FunctionCall" Library="ABFE498B" Id="F7744BBC"/>
@@ -5581,6 +5650,16 @@
         <Element Type="Param" Id="8C1EFA43">
             <ValueType Type="string"/>
         </Element>
+        <Element Type="Variable" Id="5613E176">
+            <Identifier>armory7Value</Identifier>
+            <VariableType>
+                <Type Value="string"/>
+            </VariableType>
+            <Value Type="Param" Library="ABFE498B" Id="F59950D9"/>
+        </Element>
+        <Element Type="Param" Id="F59950D9">
+            <ValueType Type="string"/>
+        </Element>
         <Element Type="Variable" Id="232483FD">
             <VariableType>
                 <Type Value="string"/>
@@ -5864,6 +5943,41 @@
             <Value>7</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionCall" Id="5D0E4361">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C06591C3"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="22BA2805"/>
+        </Element>
+        <Element Type="Param" Id="C06591C3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="5613E176"/>
+        </Element>
+        <Element Type="Param" Id="22BA2805">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="62E946FD"/>
+        </Element>
+        <Element Type="FunctionCall" Id="62E946FD">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="A078FB65"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C8F91AC4"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A6A6AC9A"/>
+        </Element>
+        <Element Type="Param" Id="C8F91AC4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="655C865B"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B7E3F2F9"/>
+        </Element>
+        <Element Type="FunctionCall" Id="B7E3F2F9">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000122"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A87A4A00"/>
+        </Element>
+        <Element Type="Param" Id="A87A4A00">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000194"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000076"/>
+        </Element>
+        <Element Type="Param" Id="A6A6AC9A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
+            <Value>8</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionCall" Id="CA606991">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
             <Parameter Type="Param" Library="ABFE498B" Id="C3FEC9CC"/>
@@ -5896,7 +6010,7 @@
         </Element>
         <Element Type="Param" Id="A432CC70">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>8</Value>
+            <Value>9</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="11ADB3C5">
@@ -5931,7 +6045,7 @@
         </Element>
         <Element Type="Param" Id="EA3CE271">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>9</Value>
+            <Value>10</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="F7744BBC">
@@ -5966,7 +6080,7 @@
         </Element>
         <Element Type="Param" Id="B98812EE">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>10</Value>
+            <Value>11</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="9084FC80">
@@ -6001,7 +6115,7 @@
         </Element>
         <Element Type="Param" Id="AE859CEE">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>11</Value>
+            <Value>12</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="3320AA22">
@@ -6036,7 +6150,7 @@
         </Element>
         <Element Type="Param" Id="4AD2C3BC">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>12</Value>
+            <Value>13</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="4380823E">
@@ -6071,7 +6185,7 @@
         </Element>
         <Element Type="Param" Id="9C39464E">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>13</Value>
+            <Value>14</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="141A8D16">
@@ -6106,7 +6220,7 @@
         </Element>
         <Element Type="Param" Id="F1799977">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>14</Value>
+            <Value>15</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="FCBC1A17">
@@ -6141,7 +6255,7 @@
         </Element>
         <Element Type="Param" Id="74DDD5B0">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="13CABA7C"/>
-            <Value>15</Value>
+            <Value>16</Value>
             <ValueType Type="int"/>
         </Element>
         <Element Type="FunctionCall" Id="3377504F">
@@ -6154,6 +6268,7 @@
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="86401855"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C509B08B"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="AC96D4E8"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="0C0AD1F7"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="CE43844D"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="5E6BD774"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2188CED2"/>
@@ -6303,6 +6418,28 @@
             <ParameterDef Type="ParamDef" Library="Ntve" Id="00000006"/>
             <Variable Type="Variable" Library="ABFE498B" Id="A4361B8E"/>
         </Element>
+        <Element Type="FunctionCall" Id="0C0AD1F7">
+            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="651AD4D5"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="DF50D5F0"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E01C4E22"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="091E117A"/>
+        </Element>
+        <Element Type="Param" Id="E01C4E22">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="5F106376"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="7D25C7CD"/>
+        </Element>
+        <Element Type="Param" Id="091E117A">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="51E0AC1D"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="08774950"/>
+        </Element>
+        <Element Type="FunctionCall" Id="08774950">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000005"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C413DF8B"/>
+        </Element>
+        <Element Type="Param" Id="C413DF8B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000006"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="5613E176"/>
+        </Element>
         <Element Type="FunctionCall" Id="CE43844D">
             <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="76614C81"/>
             <SubFunctionType Type="SubFuncType" Library="Ntve" Id="DF50D5F0"/>
@@ -13206,12 +13343,22 @@
             <ValueGameType Type="Unit"/>
         </Element>
         <Element Type="FunctionDef" Id="C9EDD088">
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FFA29486"/>
             <Identifier>AP_Triggers_Terran_unlockDevastatorTurret</Identifier>
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="54F7DF50"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FFA29486"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D675818F"/>
         </Element>
+        <Element Type="ParamDef" Id="54F7DF50">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="BFF1A49A"/>
+        </Element>
+        <Element Type="Param" Id="BFF1A49A">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionCall" Id="FFA29486">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
             <Parameter Type="Param" Library="ABFE498B" Id="C907BD9B"/>
@@ -13232,16 +13379,6 @@
             <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
             <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
         </Element>
-        <Element Type="ParamDef" Id="54F7DF50">
-            <ParameterType>
-                <Type Value="int"/>
-            </ParameterType>
-            <Default Type="Param" Library="ABFE498B" Id="BFF1A49A"/>
-        </Element>
-        <Element Type="Param" Id="BFF1A49A">
-            <Value>0</Value>
-            <ValueType Type="int"/>
-        </Element>
         <Element Type="FunctionCall" Id="D675818F">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
             <Parameter Type="Param" Library="ABFE498B" Id="DC4E1867"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index eaa8d1074..35f0b1e03 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -349,6 +349,7 @@ FunctionDef/Name/lib_ABFE498B_648B29A7=AP_Triggers_Zerg_HydraliskGroovedSpines
 FunctionDef/Name/lib_ABFE498B_64BCFCC4=AP_Triggers_Protoss_unlockCorsairNeutronShields
 FunctionDef/Name/lib_ABFE498B_64C26431=AP_Triggers_Terran_unlockHERCKineticFoam
 FunctionDef/Name/lib_ABFE498B_64F777D3=AP_Triggers_Zerg_BroodLordEvolvedCarapace
+FunctionDef/Name/lib_ABFE498B_651AD4D5=AP_Triggers_unlockTerranArmory7
 FunctionDef/Name/lib_ABFE498B_652B58E3=AP_Triggers_Terran_unlockHERCGrapplePull
 FunctionDef/Name/lib_ABFE498B_66568157=AP_Triggers_unlockTerranBuildings
 FunctionDef/Name/lib_ABFE498B_66759A11=AP_Triggers_Terran_unlockScienceVesselAdvancedAISystems
@@ -1003,6 +1004,7 @@ ParamDef/Name/lib_ABFE498B_513F4404=player
 ParamDef/Name/lib_ABFE498B_51591C88=player
 ParamDef/Name/lib_ABFE498B_5161D884=player
 ParamDef/Name/lib_ABFE498B_51DF09F6=level
+ParamDef/Name/lib_ABFE498B_51E0AC1D=bitArrayValue
 ParamDef/Name/lib_ABFE498B_520F6CF1=race
 ParamDef/Name/lib_ABFE498B_52517705=player
 ParamDef/Name/lib_ABFE498B_5316ADC0=player
@@ -1045,6 +1047,7 @@ ParamDef/Name/lib_ABFE498B_5D03C0E3=level
 ParamDef/Name/lib_ABFE498B_5D188D3F=player
 ParamDef/Name/lib_ABFE498B_5E221033=player
 ParamDef/Name/lib_ABFE498B_5EC13B5A=player
+ParamDef/Name/lib_ABFE498B_5F106376=player
 ParamDef/Name/lib_ABFE498B_5F280584=player
 ParamDef/Name/lib_ABFE498B_5F33302A=player
 ParamDef/Name/lib_ABFE498B_5F5A9CC4=bitArrayValue
@@ -1568,6 +1571,7 @@ Variable/Name/lib_ABFE498B_50E9FC36=AP_Triggers_Option_SoAPresenceAutocasts
 Variable/Name/lib_ABFE498B_53A2FE67=AP_Triggers_MapConfig_MISSION_LOTV_PROTOSS
 Variable/Name/lib_ABFE498B_54607318=AP_Triggers_Terran_hasGoliath
 Variable/Name/lib_ABFE498B_55F7A1F1=storyTech
+Variable/Name/lib_ABFE498B_5613E176=armory7Value
 Variable/Name/lib_ABFE498B_56AD3F20=AP_Triggers_Protoss_has_WarpPrism
 Variable/Name/lib_ABFE498B_56CB28C1=AP_Triggers_Terran_hasMarauder
 Variable/Name/lib_ABFE498B_5C408E14=currentPlayer