From 091e73b4907e9e9d1dfc63438528615e3ce2cb8e Mon Sep 17 00:00:00 2001
From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com>
Date: Thu, 25 Jul 2024 11:50:18 -0400
Subject: [PATCH] Roach morphs, Enemy Within, Conviction

---
 .../Base.SC2Data/GameData/AbilData.xml        |   5 +
 .../HotS/ap_conviction.SC2Map/DocumentHeader  | Bin 9137 -> 9137 bytes
 .../ap_conviction.SC2Map/GameData.version     | Bin 40 -> 44 bytes
 .../ap_conviction.SC2Map/PreloadAssetDB.txt   | 124 ++++++++++++------
 .../Base.SC2Data/GameData/AbilData.xml        |  55 +++++++-
 .../Base.SC2Data/GameData/ButtonData.xml      |   8 ++
 .../Base.SC2Data/GameData/UnitData.xml        |  24 ++++
 .../ap_enemy_within.SC2Map/DocumentHeader     | Bin 7969 -> 7969 bytes
 .../ap_enemy_within.SC2Map/GameData.version   | Bin 44 -> 44 bytes
 .../ap_enemy_within.SC2Map/PreloadAssetDB.txt | 100 +++++++++++++-
 .../LocalizedData/GameHotkeys.txt             |   1 +
 .../LocalizedData/GameStrings.txt             |   4 +-
 .../LocalizedData/ObjectStrings.txt           |   3 +-
 .../Base.SC2Data/GameData/AbilData.xml        |   4 +-
 .../Base.SC2Data/GameData/ButtonData.xml      |   5 +
 .../Base.SC2Data/GameData/RequirementData.xml |   3 +
 .../GameData/RequirementNodeData.xml          |   4 +
 .../Base.SC2Data/GameData/UnitData.xml        |   1 +
 .../LocalizedData/GameStrings.txt             |   2 +
 19 files changed, 288 insertions(+), 55 deletions(-)
 create mode 100644 Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/ButtonData.xml
 create mode 100644 Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameHotkeys.txt

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/Base.SC2Data/GameData/AbilData.xml b/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/Base.SC2Data/GameData/AbilData.xml
index 7d9801ab1..9e41e3d8b 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/Base.SC2Data/GameData/AbilData.xml
+++ b/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/Base.SC2Data/GameData/AbilData.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="us-ascii"?>
 <Catalog>
+    <CAbilMerge id="AP_PrimalIgniterMerge">
+        <CmdButtonArray index="SelectedUnits" Requirements=""/>
+        <CmdButtonArray index="WithTarget" Requirements=""/>
+        <Info Time="5"/>
+    </CAbilMerge>
     <CAbilMorph id="PerditionTurretBurrow">
         <CmdButtonArray index="Execute" DefaultButtonFace="BurrowDown"/>
     </CAbilMorph>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/DocumentHeader
index 13e8d0c8fed87c743f8d6df97117166246560451..47c1c51e8b234aa8ad6d5389a6b3a521cb24ba1e 100644
GIT binary patch
delta 19
Ycmdn!zR`Vx49C>WCv_maQKeTI09jlJ>Hq)$

delta 19
Ycmdn!zR`Vx49ASDOVdGkqe`zb09oh>00000

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/GameData.version
index cf75c3b3fa668cdcd2b248dd7bbdf0d53a0fc9f7..802933eb1b991a154be6015179e06c3c902b9ec1 100644
GIT binary patch
literal 44
pcmYdJNi9xHNla&AU|^8QWMp6k(jdSK#2~&Tke*z;D2)+F0|2PM25kTU

literal 40
mcmYdJNi9xHNla&CU|^_9U|?VZ(jdSB#1cRpx9&#(NDcs;Fa~=7

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/PreloadAssetDB.txt
index 2c7003490..b25ab62c2 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/PreloadAssetDB.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/PreloadAssetDB.txt
@@ -1,72 +1,103 @@
 [Abil]
 id=PerditionTurretBurrow
 asset=Assets\Textures\WayPointLine.dds
-asset=Assets\UI\Feedback\WayPointConfirm\WayPointConfirm.m3
-Actor=TerrainMgr
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=Error
 Unit=PerditionTurretUnderground
 id=PerditionTurretUnburrow
 asset=Assets\Textures\WayPointLine.dds
-asset=Assets\UI\Feedback\WayPointConfirm\WayPointConfirm.m3
-Actor=TerrainMgr
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Unit=PerditionTurret
+id=AP_MorphToRavager
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,AP_Roach,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=Error,MorphComplete_Zerg
+Effect=PostMorphHeal
+Unit=AP_Ravager,AP_RavagerCocoon
+id=AP_MorphRoachToImpaler
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,AP_Hydralisk,AP_HydraliskBase,AP_HydraliskImpaler,AP_HydraliskLurker,AP_Impaler,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MorphComplete_Zerg,TrainError
+Unit=AP_Impaler,AP_ImpalerEgg
+id=AP_MorphHydraliskToLurker
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,AP_Hydralisk,AP_HydraliskBase,AP_HydraliskImpaler,AP_HydraliskLurker,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MorphComplete_Zerg,TrainError
+Unit=AP_HydraliskLurkerEgg,AP_Lurker
+id=AP_MorphZerglingToBaneling
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,AP_Zergling,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MorphComplete_Zerg,TrainError
+Unit=AP_Baneling,AP_BanelingCocoon
+id=AP_PrimalIgniterMerge
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MergeComplete
+Unit=AP_PrimalIgniter
 
 [Effect]
 id=CrucioShockCannonBlast
-Actor=SiegeTankSiegedAttack,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,SiegeTankSiegedAttack,TerrainMgr
 id=CrucioShockCannonFriendlyDamage
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=PerditionTurretFlameThrowerCreatePersistent
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=PerditionTurretFlameThrowerSearchArea
 id=CrucioShockCannonSwitch
-Actor=SiegeTankSiegedTargetImpactFire,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,SiegeTankSiegedTargetImpactFire,TerrainMgr
 Effect=CrucioShockCannonBlastSet,CrucioShockCannonDirected
 
 [Light]
 id=PortZion
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=PrisonShip
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 
 [Model]
 id=BraxisAlphaSkyParallax
-0=Assets\Skyboxes\SkyBoxPortZionSpace\SkyBoxPortZionSpace.m3
-Actor=TerrainMgr
+asset=Assets\Skyboxes\SkyBoxPortZionSpace\SkyBoxPortZionSpace.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 
 [Sound]
 id=FX_Space02Cutscene01_HyperionWarpIn
 0=Assets\Sounds\Spell_HyperionJumpIn_00.wav
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=FX_Space02Cutscene01_LeviathanWarpIn
 0=Assets\Sounds\##id##_00.wav
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=FinalMusic
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=IntroStinger1
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=IntroStinger2
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=CinematicMusic
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=IntroStinger
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=MidMusic
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 
 [Soundtrack]
 id=MidMusic
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound
 id=FinalMusic
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound
 
 [Terrain]
 id=PrisonShip
 path=Assets\Textures\.dds
 asset=Creep,CreepEdgeNormal,CreepHeight,CreepNoise,CreepSpecularMask
-Actor=TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Light
 Model=BraxisAlphaSkyBox,BraxisAlphaSkyParallax
 Soundtrack=Ambience_Castanar
@@ -75,77 +106,84 @@ TerrainTex=##id##1,##id##2,##id##3,##id##4,##id##5,##id##6,##id##7,##id##8
 [Unit]
 id=Baneling
 Abil=Burrow##id##Down,ExplodeHeal,VolatileBurstBuilding,attack,move,stop
-Actor=##id##,BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=##id##Explode
 Button=Attack,##id##CorrosiveBile,##id##Heal,BurrowDown,DisableBuildingAttack,EnableBuildingAttack,Explode,Move,MoveHoldPosition,MovePatrol,RuptureUpgrade,Stop
 Weapon=HotS##id##Explode,HotS##id##ExplodeBuilding
 id=BanelingBurrowed
 Abil=BurrowBanelingUp,Explode,VolatileBurstBuilding
-Actor=Baneling,##id##Splat,BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,Baneling,##id##Splat,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=BanelingExplode
 Button=Attack,BanelingCorrosiveBile,BanelingHeal,BurrowUp,Explode,RuptureUpgrade
 id=Lurker
 Abil=Burrow##id##Down,attack,move,stop
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,##id##_Death,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,##id##_Death,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=CreepFrenzy13Crawler,##id##WeaponDisabled
-Button=AcquireMove,Attack,##id##BurrowDown,Move,MoveHoldPosition,MovePatrol,Stop
+Button=AcquireMove,Attack,Burrow##id##MP,Move,MoveHoldPosition,MovePatrol,Stop
 Weapon
 id=LurkerBurrowed
 Abil=BurrowLurkerDown,BurrowLurkerUp,attack,stop
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,Lurker,##id##Splat,LurkerRange,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,Lurker,##id##Splat,LurkerRange,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=CreepFrenzy13Crawler
 Button=AttackBuilding,LurkerBurrowUp,Stop
 Weapon=Lurker
 id=PerditionTurret
 Abil=BuildInProgress,##id##Burrow,attack
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,##id##,##id##_MorphOpenSound,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,TerranFlamesSmallBuilding,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,##id##,##id##_MorphOpenSound,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,TerranFlamesSmallBuilding,UnitPointsTextAll
 Behavior=DistortionSensors,FireSuppressionSystem,TerranBuildingBurnDown
 Button=Attack,CancelBuilding,Detector,Halt
 Weapon=##id##Flamethrower
 id=CivilianFemale
 Abil=MorphToInfestedCivilian,attack,move,stop
-Actor=BlipVisual,##id##,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,##id##,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Button=Attack,Move,MoveHoldPosition,MovePatrol,Stop
 Weapon=ThrowMolotov
 id=ImpalerBurrowed
 Abil=BurrowImpaler,UnburrowImpaler,attack,stop
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,Impaler,##id##Splat,ImpalerRange,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,Impaler,##id##Splat,ImpalerRange,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=CreepFrenzy13Crawler
 Button=AttackBuilding,ImpalerBurrowUp,Stop
 Weapon=Impaler
 id=HotSHunter
 Abil=BurrowHunterDown,ExplodeHeal,VolatileBurstBuilding,attack,move,stop
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=BanelingExplode,##id##Jump
 Button=Attack,BanelingCorrosiveBile,BanelingHeal,BurrowDown,DisableBuildingAttack,EnableBuildingAttack,Explode,HunterCliffJumper,Move,MoveHoldPosition,MovePatrol,RuptureUpgrade,Stop
 Weapon=HotSBanelingExplode,HotSBanelingExplodeBuilding,HotSBanelingLaunch,HotSBanelingLaunchBuilding
 id=HotSHunterBurrowed
-Abil=BurrowHunterDown,BurrowHunterUp,Explode,VolatileBurstBuilding
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,HotSHunter,##id##Splat,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Abil=BurrowHunterUp,Explode,VolatileBurstBuilding
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,HotSHunter,##id##Splat,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=BanelingExplode
 Button=BanelingCorrosiveBile,BanelingHeal,BurrowUp,Explode,HunterCliffJumper,RuptureUpgrade
 id=HotSSplitterlingBig
 Abil=Burrow##id##Down,ExplodeHeal,MorphSplitterlingBigToMedium,VolatileBurstBuilding,attack,move,stop
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=BanelingExplode
-Button=Attack,BanelingCorrosiveBile,BanelingHeal,BurrowDown,DisableBuildingAttack,EnableBuildingAttack,Explode,Move,MoveHoldPosition,MovePatrol,RuptureUpgrade,Stop
+Button=Attack,BanelingCorrosiveBile,BanelingHeal,BanelingSplitterlingSplitPassive,BurrowDown,DisableBuildingAttack,EnableBuildingAttack,Explode,Move,MoveHoldPosition,MovePatrol,RuptureUpgrade,Stop
 Weapon=HotSBanelingExplode,HotSBanelingExplodeBuilding
 id=HotSSplitterlingBigBurrowed
-Abil=BurrowHotSSplitterlingBigDown,BurrowHotSSplitterlingBigUp,Explode,MorphSplitterlingBigToMedium,VolatileBurstBuilding
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,HotSSplitterlingBig,##id##Splat,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Abil=BurrowHotSSplitterlingBigUp,Explode,MorphSplitterlingBigToMedium,VolatileBurstBuilding
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,HotSSplitterlingBig,##id##Splat,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=BanelingExplode
-Button=Attack,BanelingCorrosiveBile,BanelingHeal,BurrowUp,Explode,RuptureUpgrade
+Button=Attack,BanelingCorrosiveBile,BanelingHeal,BanelingSplitterlingSplitPassive,BurrowUp,Explode,RuptureUpgrade
 id=Impaler
 Abil=Burrow##id##,attack,move,stop
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=CreepFrenzy13Crawler,##id##WeaponDisabled
 Button=AcquireMove,##id##BurrowDown,Move,MoveHoldPosition,MovePatrol,Stop
 Weapon
 id=BallOfDeath
 Abil=move,stop
-Actor=##id##,BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Button=Move,MoveHoldPosition,MovePatrol,Stop
 id=SpaceArmoredGenerator
-Actor=BlipVisual,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,##id##,TerrainMgr,UnitPointsTextAll
-Behavior=FireSuppressionSystem,TerranBuildingBurnDown
+Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,##id##,TerrainMgr,UnitPointsTextAll
+
+[Upgrade]
+id=AP_HotSRapidMetamorph
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_ResourceEfficiencyHydralisk
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
 
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/AbilData.xml b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/AbilData.xml
index e3297995b..e91985d6b 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/AbilData.xml
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/AbilData.xml
@@ -41,18 +41,58 @@
             </SectionArray>
         </InfoArray>
     </CAbilMorph>
+    <CAbilTrain id="AP_MorphlingToBaneling">
+        <Flags index="IgnoreUnitCost" value="1"/>
+        <InfoArray index="Train1" Time="5">
+            <Button Requirements=""/>
+        </InfoArray>
+    </CAbilTrain>
+    <CAbilTrain id="AP_MorphlingToImpaler">
+        <Flags index="IgnoreUnitCost" value="1"/>
+        <InfoArray index="Train1" Time="5">
+            <Button Requirements=""/>
+        </InfoArray>
+    </CAbilTrain>
+    <CAbilTrain id="AP_MorphlingToLurker">
+        <Flags index="IgnoreUnitCost" value="1"/>
+        <InfoArray index="Train1" Time="5">
+            <Button Requirements=""/>
+        </InfoArray>
+    </CAbilTrain>
+    <CAbilMerge id="AP_MorphlingToPrimalIgniterMerge">
+        <CmdButtonArray index="SelectedUnits" Requirements=""/>
+        <CmdButtonArray index="WithTarget" Requirements=""/>
+        <Info Time="5">
+            <Resource index="Minerals" value="0"/>
+            <Resource index="Vespene" value="0"/>
+        </Info>
+    </CAbilMerge>
+    <CAbilTrain id="AP_MorphlingToRavager">
+        <Flags index="IgnoreUnitCost" value="1"/>
+        <InfoArray index="Train1" Time="5">
+            <Button Requirements=""/>
+        </InfoArray>
+    </CAbilTrain>
+    <CAbilMerge id="AP_PrimalIgniterMerge">
+        <CmdButtonArray index="SelectedUnits" Requirements=""/>
+        <CmdButtonArray index="WithTarget" Requirements=""/>
+        <Info Time="5"/>
+    </CAbilMerge>
     <CAbilTrain id="SwarmQueenTrain">
         <InfoArray index="Train1">
+            <Resource index="Minerals" value="0"/>
             <Button State="Restricted"/>
             <Unit index="0" value="AP_Zergling"/>
             <Unit index="1" value="AP_Zergling"/>
         </InfoArray>
         <InfoArray index="Train2">
+            <Resource index="Minerals" value="0"/>
             <Button State="Restricted" Requirements="AP_HaveRaptor"/>
             <Unit index="0" value="AP_Zergling"/>
             <Unit index="1" value="AP_Zergling"/>
         </InfoArray>
         <InfoArray index="Train3">
+            <Resource index="Minerals" value="0"/>
             <Button State="Restricted" Requirements="AP_HaveSwarmling"/>
             <Unit index="0" value="AP_Zergling"/>
             <Unit index="1" value="AP_Zergling"/>
@@ -77,19 +117,24 @@
             <Unit index="0" value="AP_Roach"/>
         </InfoArray>
         <InfoArray index="Train7">
+            <Resource index="Minerals" value="0"/>
+            <Resource index="Vespene" value="0"/>
             <Button State="Restricted"/>
             <Unit index="0" value="AP_Hydralisk"/>
         </InfoArray>
         <InfoArray index="Train8">
+            <Resource index="Minerals" value="0"/>
+            <Resource index="Vespene" value="0"/>
             <Button State="Restricted" Requirements="AP_HaveLurker"/>
             <Unit index="0" value="AP_Hydralisk"/>
         </InfoArray>
         <InfoArray index="Train9">
+            <Resource index="Minerals" value="0"/>
+            <Resource index="Vespene" value="0"/>
             <Button State="Restricted" Requirements="AP_HaveImpaler"/>
             <Unit index="0" value="AP_Hydralisk"/>
         </InfoArray>
         <InfoArray index="Train10" Time="2.4" Rotation="Source">
-            <Resource index="Minerals" value="-75"/>
             <Display index="Custom" value="1"/>
             <Button DefaultButtonFace="AP_MorphToRaptor" State="Restricted" Requirements="AP_HaveRaptorSwarmling"/>
             <Unit value="AP_Zergling"/>
@@ -98,10 +143,14 @@
         </InfoArray>
         <InfoArray index="Train11" Time="2.4" Rotation="Source">
             <Display index="Custom" value="1"/>
-            <Resource index="Minerals" value="-100"/>
-            <Resource index="Vespene" value="-150"/>
             <Button DefaultButtonFace="AP_Infestor" State="Restricted"/>
             <Unit value="AP_Infestor"/>
         </InfoArray>
+        <InfoArray index="Train12" Time="5">
+            <Display index="Custom" value="1"/>
+            <Button DefaultButtonFace="AP_BirthMorphling" State="Restricted" Requirements="AP_MorphlingEnabled"/>
+            <Unit value="AP_Morphling"/>
+        </InfoArray>
+        <Flags index="IgnoreUnitCost" value="1"/>
     </CAbilTrain>
 </Catalog>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/ButtonData.xml b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/ButtonData.xml
new file mode 100644
index 000000000..266d5acaa
--- /dev/null
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/ButtonData.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Catalog>
+    <CButton id="AP_BirthMorphling">
+        <Icon value="Assets\Textures\BTN-Unit-Zerg-changeling.dds"/>
+        <AlertIcon value="Assets\Textures\BTN-Unit-Zerg-changeling.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/UnitData.xml b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/UnitData.xml
index 3af183592..89117f305 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/UnitData.xml
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/UnitData.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Catalog>
+    <CUnit id="AP_Morphling">
+        <CardLayouts index="0">
+            <LayoutButtons index="4" AbilCmd="255,255"/>
+            <LayoutButtons index="5" AbilCmd="255,255"/>
+        </CardLayouts>
+        <CardLayouts index="1">
+            <LayoutButtons index="0" AbilCmd="AP_MorphlingToBaneling,Train1"/>
+            <LayoutButtons index="1" AbilCmd="AP_MorphlingToRavager,Train1"/>
+            <LayoutButtons index="2" AbilCmd="AP_MorphlingToLurker,Train1"/>
+            <LayoutButtons index="3" AbilCmd="AP_MorphlingToImpaler,Train1"/>
+            <LayoutButtons index="4" Face="Cancel" Type="CancelSubmenu" AbilCmd="" Column="4"/>
+            <LayoutButtons index="5" removed="1"/>
+            <LayoutButtons index="6" removed="1"/>
+            <LayoutButtons index="7" removed="1"/>
+            <LayoutButtons index="8" removed="1"/>
+        </CardLayouts>
+        <CardLayouts index="2">
+            <LayoutButtons index="0" AbilCmd="AP_MorphlingToPrimalIgniterMerge,SelectedUnits"/>
+        </CardLayouts>
+    </CUnit>
     <CUnit id="Anteplott">
         <AbilArray index="2" Link="Consume"/>
         <BehaviorArray index="0" removed="1"/>
@@ -31,6 +51,7 @@
             <LayoutButtons index="17" Face="SwarmQueenHydraliskImpaler" AbilCmd="SwarmQueenTrain,Train9" Row="1" Column="3"/>
             <LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
             <LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
         </CardLayouts>
     </CUnit>
     <CUnit id="AP_Roach">
@@ -81,6 +102,7 @@
             <LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
             <LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
             <LayoutButtons Face="GrowHugeQueen" Type="AbilCmd" AbilCmd="MorphToHugeSwarmQueen,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
         </CardLayouts>
     </CUnit>
     <CUnit id="Lyote">
@@ -115,6 +137,7 @@
             <LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
             <LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
             <LayoutButtons Face="GrowLargeQueen" Type="AbilCmd" AbilCmd="MorphToLargeSwarmQueen,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
         </CardLayouts>
     </CUnit>
     <CUnit id="SwarmQueenEgg">
@@ -131,6 +154,7 @@
             <LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
             <LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
             <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
         </CardLayouts>
     </CUnit>
     <CUnit id="UrsadakFemale">
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/DocumentHeader
index aa2f7eb582312e45398e3c557e3757828f38c108..63667dc13c5e76462772d82adc66cc1bcaa23162 100644
GIT binary patch
delta 19
YcmZ2zx6p2a49EUAa#KKfqsm`709Y3Z9RL6T

delta 19
YcmZ2zx6p2a496P2;`JcBQRS~308PmV8vp<R

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/GameData.version
index af2151b17194f64e8cf789416a3280cda8cf07b5..edfa666d635b7da8827264ac9078b78aad0a95c9 100644
GIT binary patch
literal 44
ocmYdJNi9xHNla&AU|^8QWMp6k(jdSK#2`Kgkj^Yvl*S080j7=yF8}}l

literal 44
pcmYdJNi9xHNla&AU|@Ki%*enBq(OiOh(UaIAkB4dYAPd;1^~=42e<$L

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/PreloadAssetDB.txt
index 938389bcd..d29d8d344 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/PreloadAssetDB.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/PreloadAssetDB.txt
@@ -4,25 +4,68 @@ asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,LarvaTrain,SwarmQueenEggHatch,TerrainMgr
 Alert=TrainComplete,TrainError
-Unit=AP_Hydralisk,AP_Infestor,AP_Roach,AP_Zergling,SwarmQueenEgg
+Unit=AP_Hydralisk,AP_Infestor,AP_Morphling,AP_Roach,AP_Zergling,SwarmQueenEgg
+id=AP_MorphToRavager
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,AP_Roach,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=Error,MorphComplete_Zerg
+Effect=PostMorphHeal
+Unit=AP_Ravager,AP_RavagerCocoon
+id=AP_MorphlingToRavager
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MorphComplete_Zerg,TrainError
+Unit=AP_Ravager,AP_RavagerCocoon
 id=AP_MorphRoachToImpaler
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,AP_Hydralisk,AP_HydraliskBase,AP_HydraliskImpaler,AP_HydraliskLurker,AP_Impaler,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=MorphComplete_Zerg,TrainError
 Unit=AP_Impaler,AP_ImpalerEgg
+id=AP_MorphlingToImpaler
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MorphComplete_Zerg,TrainError
+Unit=AP_Impaler,AP_ImpalerEgg
 id=AP_MorphHydraliskToLurker
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,AP_Hydralisk,AP_HydraliskBase,AP_HydraliskImpaler,AP_HydraliskLurker,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=MorphComplete_Zerg,TrainError
 Unit=AP_HydraliskLurkerEgg,AP_Lurker
+id=AP_MorphlingToLurker
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MorphComplete_Zerg,TrainError
+Unit=AP_HydraliskLurkerEgg,AP_Lurker
 id=AP_MorphZerglingToBaneling
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,AP_Zergling,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=MorphComplete_Zerg,TrainError
 Unit=AP_Baneling,AP_BanelingCocoon
+id=AP_MorphlingToBaneling
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MorphComplete_Zerg,TrainError
+Unit=AP_Baneling,AP_BanelingCocoon
+id=AP_PrimalIgniterMerge
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MergeComplete
+Unit=AP_PrimalIgniter
+id=AP_MorphlingToPrimalIgniterMerge
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=MergeComplete
+Unit=AP_PrimalIgniter
 
 [Actor]
 id=ShipEscapePod
@@ -32,6 +75,11 @@ Actor=AP_GimbalZTurret,CliffLocalSelection,CliffLocalSelectionObserver,CliffPreS
 Model=ExecutorPortrait,ForgePlacement,Invisible,ProtossSmallUnitDeathLow,##id##,##id##Death,TerranSmallUnitDeathLow,ZergSmallUnitDeathLow
 Sound=ForgeWhat,Protoss_BuildingPlacement,##id##_Ambience
 
+[Button]
+id=AP_BirthMorphling
+asset=Assets\Textures\BTN-Unit-Zerg-changeling.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+
 [GameUI]
 id=Dflt
 path=Assets\Textures\.dds
@@ -113,30 +161,56 @@ Button=Attack,Consume,CritterFlee,Move,MoveHoldPosition,MovePatrol,Stop
 id=SwarmQueenEgg
 Abil=Rally,SwarmQueenTrain,que1
 Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,##id##,TerrainMgr,UnitPointsTextAll
-Button=AP_Infestor,AcquireMove,Cancel,Rally,SwarmQueenCorpser,SwarmQueenHydralisk,SwarmQueenHydraliskImpaler,SwarmQueenHydraliskLurker,SwarmQueenRaptor,SwarmQueenRoach,SwarmQueenSwarmling,SwarmQueenVile,SwarmQueenZergling
+Button=AP_BirthMorphling,AP_Infestor,AcquireMove,Cancel,Rally,SwarmQueenCorpser,SwarmQueenHydralisk,SwarmQueenHydraliskImpaler,SwarmQueenHydraliskLurker,SwarmQueenRaptor,SwarmQueenRoach,SwarmQueenSwarmling,SwarmQueenVile,SwarmQueenZergling
 id=SwarmQueen
 Abil=Burrow##id##Down,MorphToLarge##id##,##id##ParasiticInvasion,##id##Train,attack,move,que1,stop
 Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,##id##,TerrainMgr,UnitPointsTextAll
 Behavior=AP_MalignantCreepFix,##id##RegenAura
-Button=AP_Infestor,Attack,BurrowDown,Cancel,GrowLargeQueen,Move,MoveHoldPosition,MovePatrol,Stop,##id##Corpser,##id##Hydralisk,##id##HydraliskImpaler,##id##HydraliskLurker,##id##ParasiticInvasion,##id##Raptor,##id##RegenAura,##id##Roach,##id##Swarmling,##id##Vile,##id##Zergling
+Button=AP_BirthMorphling,AP_Infestor,Attack,BurrowDown,Cancel,GrowLargeQueen,Move,MoveHoldPosition,MovePatrol,Stop,##id##Corpser,##id##Hydralisk,##id##HydraliskImpaler,##id##HydraliskLurker,##id##ParasiticInvasion,##id##Raptor,##id##RegenAura,##id##Roach,##id##Swarmling,##id##Vile,##id##Zergling
 Weapon=##id##AcidSpines
 id=LargeSwarmQueen
 Abil=Burrow##id##Down,MorphToHugeSwarmQueen,SwarmQueenParasiticInvasion,SwarmQueenTrain,attack,move,stop
 Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_MalignantCreepFix,SwarmQueenRegenAura
-Button=AP_Infestor,Attack,BurrowDown,Cancel,GrowHugeQueen,Move,MoveHoldPosition,MovePatrol,Stop,SwarmQueenCorpser,SwarmQueenHydralisk,SwarmQueenHydraliskImpaler,SwarmQueenHydraliskLurker,SwarmQueenParasiticInvasion,SwarmQueenRaptor,SwarmQueenRegenAura,SwarmQueenRoach,SwarmQueenSwarmling,SwarmQueenVile,SwarmQueenZergling
+Button=AP_BirthMorphling,AP_Infestor,Attack,BurrowDown,Cancel,GrowHugeQueen,Move,MoveHoldPosition,MovePatrol,Stop,SwarmQueenCorpser,SwarmQueenHydralisk,SwarmQueenHydraliskImpaler,SwarmQueenHydraliskLurker,SwarmQueenParasiticInvasion,SwarmQueenRaptor,SwarmQueenRegenAura,SwarmQueenRoach,SwarmQueenSwarmling,SwarmQueenVile,SwarmQueenZergling
 Weapon=SwarmQueenAcidSpines
 id=HugeSwarmQueen
 Abil=Burrow##id##Down,NoxiousCreep,SwarmQueenParasiticInvasion,SwarmQueenTrain,attack,move,stop
 Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_MalignantCreepFix,SwarmQueenRegenAura
-Button=AP_Infestor,Attack,BurrowDown,Cancel,Move,MoveHoldPosition,MovePatrol,Stop,SwarmQueenCorpser,SwarmQueenHydralisk,SwarmQueenHydraliskImpaler,SwarmQueenHydraliskLurker,SwarmQueenParasiticInvasion,SwarmQueenRaptor,SwarmQueenRegenAura,SwarmQueenRoach,SwarmQueenSwarmling,SwarmQueenVile,SwarmQueenZergling
+Button=AP_BirthMorphling,AP_Infestor,Attack,BurrowDown,Cancel,Move,MoveHoldPosition,MovePatrol,Stop,SwarmQueenCorpser,SwarmQueenHydralisk,SwarmQueenHydraliskImpaler,SwarmQueenHydraliskLurker,SwarmQueenParasiticInvasion,SwarmQueenRaptor,SwarmQueenRegenAura,SwarmQueenRoach,SwarmQueenSwarmling,SwarmQueenVile,SwarmQueenZergling
 Weapon=SwarmQueenAcidSpines
 id=GiantYeti
 Abil=Consume,##id##Leap,attack,move,stop
 Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,##id##,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Button=Attack,Consume,##id##Leap,Move,MoveHoldPosition,MovePatrol,Stop
 Weapon=##id##Claws
+id=AP_RoachBurrowed
+Abil=AP_BurrowRoachUp,AP_burrowedStop,move
+Actor=AP_GimbalZTurret,AP_Roach,##id##Splat,AP_Roach_Death,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Behavior=AP_HotSRoachShieldIndicator,AP_MalignantCreepFix,AP_RoachShield
+Button=AP_CorpserPassive,AP_GlialReconstitution,AP_HotSRoachDamage,AP_OrganicCarapace,AP_RapidRegeneration,AP_TunnelingClaws,AP_VilePassive,Attack,BurrowUp,Move,MoveHoldPosition,MovePatrol,StopRoachBurrowed
+id=AP_Roach
+Abil=AP_BurrowRoachDown,AP_MorphToRavager,AP_PrimalIgniterMerge,attack,move,stop
+Actor=AP_GimbalZTurret,##id##,##id##_Death,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Behavior=AP_HotSRoachShieldIndicator,AP_MalignantCreepFix,##id##Shield,AP_UseRoachCorpserWeapon,AP_UseRoachVileCorpserWeapon,AP_UseRoachVileWeapon
+Button=AP_CorpserPassive,AP_GlialReconstitution,AP_HotSRoachDamage,AP_OrganicCarapace,AP_PrimalIgniterMerge,AP_RapidRegeneration,AP_Ravager,AP_TunnelingClaws,AP_VilePassive,Attack,BurrowDown,Move,MoveHoldPosition,MovePatrol,Stop
+Weapon=AP_AcidSaliva,##id##CorpserAcidSaliva,##id##CorpserMelee,##id##Melee,##id##VileAcidSaliva,##id##VileCorpserAcidSaliva,##id##VileCorpserMelee,##id##VileMelee
+id=AP_RavagerBurrowed
+Abil=AP_BurrowRavagerUp,AP_DeepTunnel
+Actor=AP_GimbalZTurret,AP_Ravager,##id##Splat,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Behavior=AP_MalignantCreepFix
+Button=AP_GlialReconstitution,AP_HotSRoachDamage,AP_OrganicCarapace,AP_RavagerBileDamage,AP_RavagerBileRadius,Attack,BurrowUp
+id=AP_Ravager
+Abil=AP_BurrowRavagerDown,AP_DeepTunnel,##id##CorrosiveBile,attack,move,que1,stop
+Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Behavior=AP_MalignantCreepFix
+Button=AP_DeepTunnel,AP_GlialReconstitution,AP_HotSRoachDamage,AP_OrganicCarapace,##id##BileDamage,##id##BileRadius,##id##CorrosiveBile,Attack,BurrowDown,Move,MoveHoldPosition,MovePatrol,Stop
+Weapon=##id##Weapon
+id=AP_Morphling
+Abil=##id##ToBaneling,##id##ToBroodLord,##id##ToDevourerSCBW@Morph,##id##ToGuardianSCBW@Morph,##id##ToImpaler,##id##ToLurker,##id##ToPrimalIgniterMerge,##id##ToRavager,##id##ToViper,move,que1,stop
+Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Button=AP_Lurker,##id##PrimalMorphs,##id##SwarmMorphs,##id##ToBaneling,##id##ToImpaler,##id##ToPrimalIgniterMerge,AP_Ravager,Cancel,Move,MoveHoldPosition,MovePatrol,Stop
 
 [Upgrade]
 id=AP_ZergGroundArmorsLevel1
@@ -163,6 +237,22 @@ id=AP_ZergMissileWeaponsLevel3
 asset=Assets\Textures\btn-upgrade-zerg-missileattacks-level3.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
+id=AP_ZergMissileWeaponsLevel4
+asset=AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level4.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_ZergMissileWeaponsLevel5
+asset=AP\Assets\Custom\Textures\btn-upgrade-zerg-missileattacks-level5.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_ZergGroundArmorsLevel4
+asset=AP\Assets\Custom\Textures\btn-upgrade-zerg-groundcarapace-level4.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_ZergGroundArmorsLevel5
+asset=AP\Assets\Custom\Textures\btn-upgrade-zerg-groundcarapace-level5.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
 id=AP_BaseZergGroundArmors
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameHotkeys.txt
new file mode 100644
index 000000000..f3295ca56
--- /dev/null
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -0,0 +1 @@
+Button/Hotkey/AP_BirthMorphling=V
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
index 7e0d42ff9..5b921d63a 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1,4 +1,6 @@
-Button/Name/AP_Infestor=Birth Infestor
+Button/Name/AP_BirthMorphling=Birth Morphling
+Button/Name/AP_Infestor=Birth Infestor
+Button/Tooltip/AP_BirthMorphling=Intermediary unit. Cannot attack, low health, slow movement, even slower off creep. <n/><n/>Can morph into any advanced Zerg unit (Baneling, Lurker, Brood Lord, etc).
 DocInfo/Author=Blizzard Entertainment
 DocInfo/Name=Enemy Within
 LoadingScreen/Tip=During certain missions you will control a hero other than Kerrigan.<n/>Use their unique abilities to defeat your enemies.
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt
index 1001d3da3..04cec01a4 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt
@@ -1,4 +1,5 @@
-Camera/Name/LarvaCamera=Larva Camera
+Button/EditorSuffix/AP_BirthMorphling=(Swarm Queen, Morphling)
+Camera/Name/LarvaCamera=Larva Camera
 Camera/Name/SwarmQueen=Swarm Queen (Normal)
 Camera/Name/SwarmQueenHuge=Swarm Queen (Huge)
 Camera/Name/SwarmQueenLarge=Swarm Queen (Large)
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 922aa8198..4acfa3c7f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -4666,7 +4666,7 @@
     </CAbilEffectTarget>
     <CAbilMorph id="AP_MorphToRavager">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_Ravager" Requirements="AP_HaveLair"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_Ravager" Requirements="AP_HaveLairAndRoachWarren"/>
         <CmdButtonArray index="Cancel" DefaultButtonFace="Cancel"/>
         <Flags index="BestUnit" value="1"/>
         <Flags index="Birth" value="1"/>
@@ -4711,7 +4711,7 @@
         <Flags index="WaitForFood" value="0"/>
         <MorphUnit value="AP_RavagerCocoon"/>
         <InfoArray index="Train1" Time="39" Alert="MorphComplete_Zerg">
-            <Button DefaultButtonFace="AP_Ravager" Requirements="AP_HaveLair">
+            <Button DefaultButtonFace="AP_Ravager" Requirements="AP_HaveLairAndRoachWarren">
                 <Flags index="ShowInGlossary" value="1"/>
             </Button>
             <Unit value="AP_Ravager"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 81322f7c5..e126bee07 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -3113,6 +3113,11 @@
         <AlertIcon value="Assets\Textures\btn-unit-zerg-ravager.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CButton>
+    <CButton id="AP_PrimalIgniterPassive">
+        <Icon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
     <CButton id="AP_BanelingHunterPassive">
         <Icon value="Assets\Textures\btn-unit-zerg-baneling-hunter.dds"/>
         <AlertIcon value="Assets\Textures\btn-unit-zerg-baneling-hunter.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 5df16b8f9..ba23cbdaf 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2193,6 +2193,9 @@
     <CRequirement id="AP_HaveLairAndEvolutionChamber">
         <NodeArray index="Use" Link="AP_AndCountUnitAlias_LairCompleteOnlyTechTreeCheatCountUnitEvolutionChamberCompleteOnlyTechTreeCheat"/>
     </CRequirement>
+    <CRequirement id="AP_HaveLairAndRoachWarren">
+        <NodeArray index="Use" Link="AP_AndCountUnitAlias_LairCompleteOnlyTechTreeCheatCountUnitRoachWarrenCompleteOnlyTechTreeCheat"/>
+    </CRequirement>
     <CRequirement id="AP_HaveSpawnLarvaInstant">
         <EditorCategories value="Race:Zerg,TechType:Unit"/>
         <NodeArray index="Use" Link="AP_AndLTCountUnitLarvaCompleteOnlyAtUnit3CountBehaviorSpawnLarvaInstantQueuedOrBetterAtUnit"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 101b2e024..f97cc3baa 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -3946,6 +3946,10 @@
         <OperandArray value="AP_CountUnitAlias_LairCompleteOnlyTechTreeCheat"/>
         <OperandArray value="AP_CountUnitEvolutionChamberCompleteOnlyTechTreeCheat"/>
     </CRequirementAnd>
+    <CRequirementAnd id="AP_AndCountUnitAlias_LairCompleteOnlyTechTreeCheatCountUnitRoachWarrenCompleteOnlyTechTreeCheat">
+        <OperandArray value="AP_CountUnitAlias_LairCompleteOnlyTechTreeCheat"/>
+        <OperandArray value="AP_CountUnitRoachWarrenCompleteOnlyTechTreeCheat"/>
+    </CRequirementAnd>
     <CRequirementCountUnit id="AP_CountUnitEvolutionChamberCompleteOnlyTechTreeCheat">
         <Count Link="AP_EvolutionChamber" State="CompleteOnly"/>
     </CRequirementCountUnit>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 467c8daa1..c45f0c97e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -20865,6 +20865,7 @@
             <LayoutButtons Face="AP_RoachVilePassive" Type="Passive" Requirements="AP_HaveRoachVile" Row="1" Column="0"/>
             <LayoutButtons Face="AP_RoachPassive" Type="Passive" Row="1" Column="0"/>
             <LayoutButtons Face="AP_RavagerPassive" Type="Passive" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_PrimalIgniterPassive" Type="Passive" Row="1" Column="2"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 8e4c2542c..d16bee1c5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1391,6 +1391,7 @@ Button/Name/AP_RavagerBileDamage=Potent Bile
 Button/Name/AP_RavagerBileRadius=Bloated Bile Ducts
 Button/Name/AP_RavagerCorrosiveBile=Corrosive Bile
 Button/Name/AP_RavagerPassive=Ravager
+Button/Name/AP_PrimalIgniterPassive=Primal Igniter
 Button/Name/AP_Raven=Build Raven
 Button/Name/AP_RavenScramblerMissile=Interference Matrix
 Button/Name/AP_RavenShredderMissile=Anti-Armor Missile
@@ -2493,6 +2494,7 @@ Button/Tooltip/AP_RavagerBurrowed=Ranged artillery. Can use Corrosive Bile.<n/><
 Button/Tooltip/AP_RavagerCocoon=This cocoon contains a Roach that is morphing into a Ravager.
 Button/Tooltip/AP_RavagerCorrosiveBile=Launch a missile at the target location, dealing <d ref="Effect,AP_RavagerCorrosiveBileDamage,Amount"/> damage to all units in the area upon impact.<n/><n/><c val="#ColorAttackInfo">Can destroy Protoss Force Fields.</c>
 Button/Tooltip/AP_RavagerPassive=Roach Warren enables you to morph Ravagers from Roaches.
+Button/Tooltip/AP_PrimalIgniterPassive=Roach Warren enables you to merge Primal Igniters from two Roaches.
 Button/Tooltip/AP_Raven=Aerial support unit. Can use Auto-Turret, Point Defense Drone and Seeker Missile.<n/><n/><c val="FFE303">Detector</c>
 Button/Tooltip/AP_RavenScramblerMissile=Disables a target unit rendering it unable to attack or use abilities for <d ref="Behavior,AP_RavenScramblerMissile,Duration"/> seconds. Reveals Cloaked units.<n/><n/><c val="#ColorAttackInfo">Can target mechanical and psionic units.</c>
 Button/Tooltip/AP_RavenShredderMissile=Deploys a missile which pursues the target unit and, upon contact, reduces the armor and shield armor of affected units by <d ref="-1*Behavior,AP_RavenShredderMissileArmorReductionUISubtruct,Modification.LifeArmorBonus"/> for <d ref="Behavior,AP_RavenShredderMissileArmorReductionUISubtruct,Duration"/> seconds.