diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 407bbab37..3aff21fb9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -10749,4 +10749,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 6d61660cb..ca7b0cabc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -7748,8 +7748,6 @@
-
-
@@ -32254,4 +32252,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 56a96427d..014ca63cc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -7018,4 +7018,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index c086bc95f..e03cdf809 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -5437,4 +5437,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 9a5029411..aee50c3cd 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -16908,4 +16908,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index c625a186a..3bf30b6a7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -14569,4 +14569,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 55cb3fcfb..91c0605d5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3411,4 +3411,12 @@
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 59aed600a..316acdd72 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5884,4 +5884,12 @@
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
index 47181a143..89bb7f82b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
@@ -11309,4 +11309,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 86d3272b3..4763ed173 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -7669,9 +7669,9 @@
-
+
-
+
@@ -7699,11 +7699,33 @@
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ |
+
+
+
+
@@ -7712,6 +7734,11 @@
+
+
+
+
+
@@ -18270,11 +18297,13 @@
+
+
@@ -18289,13 +18318,14 @@
-
-
+
+
-
+
+
@@ -18364,10 +18394,11 @@
+
-
+
@@ -18380,8 +18411,8 @@
-
-
+
+
@@ -23576,4 +23607,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index cf6680410..3aa7cae97 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -1404,6 +1404,11 @@
+
+
+
+
+
@@ -1638,6 +1643,8 @@
+
+
@@ -5165,18 +5172,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -5231,6 +5226,7 @@
+
@@ -5280,19 +5276,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -8710,6 +8693,7 @@
+
@@ -8765,6 +8749,8 @@
+
+
@@ -9327,6 +9313,7 @@
+
@@ -9383,6 +9370,7 @@
+
@@ -9439,6 +9427,7 @@
+
@@ -9495,6 +9484,7 @@
+
@@ -9551,6 +9541,7 @@
+
@@ -9688,6 +9679,7 @@
+
@@ -9727,6 +9719,7 @@
+
@@ -9766,6 +9759,7 @@
+
@@ -9805,6 +9799,7 @@
+
@@ -9844,6 +9839,7 @@
+
@@ -12598,4 +12594,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index 628b7d7d3..cd9f8bec7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -5466,4 +5466,12 @@
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index ca5d4ff7d..cf10525c6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -3035,4 +3035,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index b3ea0e402..62778c21e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -210,8 +210,11 @@ Button/Hotkey/AP_MissileTurret=T
Button/Hotkey/AP_MorphBackToRoboticsFacility=M
Button/Hotkey/AP_MorphBackToStargate=M
Button/Hotkey/AP_Morphling=G
+Button/Hotkey/AP_MorphlingPrimalMorphs=V
+Button/Hotkey/AP_MorphlingSwarmMorphs=B
Button/Hotkey/AP_MorphlingToBaneling=A
Button/Hotkey/AP_MorphlingToImpaler=R
+Button/Hotkey/AP_MorphlingToPrimalIgniterMerge=R
Button/Hotkey/AP_MorphMorphalisk=V
Button/Hotkey/AP_MorphToHellion=E
Button/Hotkey/AP_MorphToHellionTank=D
@@ -259,6 +262,7 @@ Button/Hotkey/AP_PoisonNova=X
Button/Hotkey/AP_Predator=P
Button/Hotkey/AP_PredatorFury=F
Button/Hotkey/AP_PrimalHeal=E
+Button/Hotkey/AP_PrimalIgniterMerge=G
Button/Hotkey/AP_PrimalSlash=T
Button/Hotkey/AP_Probe=E
Button/Hotkey/AP_ProbeHallucination=E
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index b1d97bf49..88c7fb895 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -489,6 +489,7 @@ Behavior/Name/AP_HHWraithFury9=Trigger Override
Behavior/Name/AP_HellbatLeapStun=Stunned
Behavior/Name/AP_HighArchonPsiStorm=Psi Storm
Behavior/Name/AP_HotSBioStasis=Bio-Stasis
+Behavior/Name/AP_HotSRoachShieldIndicator=Adaptive Plating
Behavior/Name/AP_HotSRaptorCharging=Leaping
Behavior/Name/AP_HydraliskFrenzy=Frenzy
Behavior/Name/AP_ImmortalOverload=Barrier
@@ -666,6 +667,7 @@ Behavior/Tooltip/AP_HHWraithFury9=Attack Speed increased by 90%
Behavior/Tooltip/AP_HellbatLeapStun=This unit cannot move or attack.
Behavior/Tooltip/AP_HighArchonPsiStorm=Target is under the effects of Psionic Storm and will take massive damage while in this area of effect.
Behavior/Tooltip/AP_HotSBioStasis=Target is stunned.
+Behavior/Tooltip/AP_HotSRoachShieldIndicator=Roach gains + armor when life is under 50%.
Behavior/Tooltip/AP_HotSRaptorCharging=This Raptor is leaping, allowing it to quickly close the distance with its target.
Behavior/Tooltip/AP_HydraliskFrenzy=Attack speed increased.
Behavior/Tooltip/AP_ImmortalOverload=This unit is absorbing damage dealt to it.
@@ -1221,8 +1223,11 @@ Button/Name/AP_MorphToSwarmHostSplitB=Morph to Swarm Host
Button/Name/AP_MorphToSwarmling=Morph to Zergling
Button/Name/AP_MorphToVile=Morph to Roach
Button/Name/AP_Morphling=Morph to Morphling
+Button/Name/AP_MorphlingPrimalMorphs=Morph to Primal Zerg Units
+Button/Name/AP_MorphlingSwarmMorphs=Morph to Swarm Zerg Units
Button/Name/AP_MorphlingToBaneling=Morph to Baneling
Button/Name/AP_MorphlingToImpaler=Morph to Impaler
+Button/Name/AP_MorphlingToPrimalIgniterMerge=Merge to Primal Igniter
Button/Name/AP_MorphtoDefiler=Morph to Defiler
Button/Name/AP_MorphtoHunter=Morph to Baneling
Button/Name/AP_MorphtoSplitterling=Morph to Baneling
@@ -1325,6 +1330,9 @@ Button/Name/AP_Predator=Build Predator
Button/Name/AP_PredatorFury=Predator's Fury
Button/Name/AP_PrimalAdaptation=Primal Adaptation
Button/Name/AP_PrimalHeal=Mend
+Button/Name/AP_PrimalIgniterMerge=Merge to Primal Igniter
+Button/Name/AP_PrimalIgniterFireBreath=Concentrated Fire
+Button/Name/AP_PrimalIgniterToughness=Primal Tenacity
Button/Name/AP_PrimalSlash=Leaping Strike
Button/Name/AP_Probe=Warp In Probe
Button/Name/AP_ProbeHallucination=Summon 4 Probe Hallucinations
@@ -2279,8 +2287,11 @@ Button/Tooltip/AP_MorphToSwarmHostSplitB=Creeper StrainLiving host. Can
Button/Tooltip/AP_MorphToSwarmling=Swarmling StrainFast melee unit. Spawns in groups of three. Morphs almost instantly. Can morph into a Baneling.Can attack ground units.
Button/Tooltip/AP_MorphToVile=Vile StrainAssault unit. Regenerates life quickly while burrowed. Can debilitate the enemy.Can attack ground units.
Button/Tooltip/AP_Morphling=Intermediary unit. Cannot attack, low health, slow movement, even slower off creep. Can morph into any advanced Zerg unit (Baneling, Lurker, Brood Lord, etc).
+Button/Tooltip/AP_MorphlingPrimalMorphs=Merge two Morphlings into Primal Zerg units that you have unlocked.
+Button/Tooltip/AP_MorphlingSwarmMorphs=Morph a Morphling into Swarm Zerg units that you have unlocked.
Button/Tooltip/AP_MorphlingToBaneling=Suicide unit. Does damage over a small area on death. Can attack ground units.
Button/Tooltip/AP_MorphlingToImpaler=Long-range anti-armor ambusher. Must burrow to attack.Can attack ground units.
+Button/Tooltip/AP_MorphlingToPrimalIgniterMerge=Combine two Morphlings into a Primal Igniter.Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed.Can attack ground units.
Button/Tooltip/AP_MorphtoDefiler=Caster
Button/Tooltip/AP_MorphtoHunter=Hunter StrainSuicide unit. Deals damage over a small area upon death. Launches toward enemies at range 6.Can attack ground units.
Button/Tooltip/AP_MorphtoSplitterling=Splitter StrainSuicide unit. Deals damage over a small area upon death. Splits into smaller units as it dies. Can attack ground units.
@@ -2393,6 +2404,10 @@ Button/Tooltip/AP_Predator=Anti-infantry specialist that deals area damage with
Button/Tooltip/AP_PredatorFury=Jump from target to target, dealing damage with each jump. Hits times.
Button/Tooltip/AP_PrimalAdaptation=Allows Guardians to attack air units with a decreased attack damage.
Button/Tooltip/AP_PrimalHeal=Heals Kerrigan for life and friendly biological units nearby for life. An additional 50% of the amount healed regenerates over .
+Button/Tooltip/AP_PrimalIgniter=Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed.Can attack ground units.
+Button/Tooltip/AP_PrimalIgniterMerge=Combine two Roaches into a Primal Igniter.Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed.Can attack ground units.
+Button/Tooltip/AP_PrimalIgniterFireBreath=Increases the Primal Igniter's damage against light armored enemies.
+Button/Tooltip/AP_PrimalIgniterToughness=Increases health by 100 and armor by 1.
Button/Tooltip/AP_PrimalSlash=Kerrigan leaps to her target and deals damage. Can be used without a target to travel quickly.Passive: Kerrigan gains +10 damage.
Button/Tooltip/AP_PrimalZergling=Fast melee creature.Can attack ground units.
Button/Tooltip/AP_Probe=Basic worker unit. Can gather resources and warp in Protoss structures.Can attack ground units.
@@ -4856,6 +4871,8 @@ Unit/Name/AP_PointDefenseDroneReleaseWeapon=Point Defense Drone Release
Unit/Name/AP_Predator=Predator
Unit/Name/AP_PreviewBunkerUpgraded=Bunker
Unit/Name/AP_PrimalHydralisk=Hydralisk
+Unit/Name/AP_PrimalIgniter=Primal Igniter
+Unit/Name/AP_PrimalIgniterBurrowed=Primal Igniter
Unit/Name/AP_PrimalRoach=Roach
Unit/Name/AP_PrimalRoachWeapon=Primal Roach
Unit/Name/AP_PrimalUltralisk=Ultralisk
@@ -5096,7 +5113,6 @@ Upgrade/Name/AP_FirebatJuggernautPlating=Juggernaut Plating
Upgrade/Name/AP_FortifiedBunkerCarapace=Fortified Bunker
Upgrade/Name/AP_FullBoreCanisterAmmo=Full-Bore Canister Ammo
Upgrade/Name/AP_GhostMoebiusReactor=Moebius Reactor
-Upgrade/Name/AP_GlialReconstitution=Glial Reconstitution
Upgrade/Name/AP_GraviticDrive=Gravitic Drive
Upgrade/Name/AP_HALORockets=Ripwave Missiles
Upgrade/Name/AP_HailstormMissilePods=Hellstorm Batteries
@@ -5261,6 +5277,7 @@ Upgrade/Name/AP_PermanentCloakGhost=Permanent Cloaking
Upgrade/Name/AP_PermanentCloakSpectre=Nyx-Class Cloaking Module
Upgrade/Name/AP_PersonalCloaking=Personal Cloaking
Upgrade/Name/AP_Predator=Predator
+Upgrade/Name/AP_PrimalIgniterFireBreath=Concentrated Fire
Upgrade/Name/AP_ProjectileAccelerators=Projectile Accelerators
Upgrade/Name/AP_ProtossAirArmorsLevel4=Protoss Air Armor Level 4
Upgrade/Name/AP_ProtossAirArmorsLevel5=Protoss Air Armor Level 5
@@ -5422,7 +5439,6 @@ Upgrade/Name/AP_TerranVehicleWeaponsUltraCapacitorsLevel5=Terran Vehicle Weapons
Upgrade/Name/AP_ThorSkin=Thor
Upgrade/Name/AP_TriLithiumPowerCells=Tri-Lithium Power Cell
Upgrade/Name/AP_TungstenSpikes=Tungsten Spikes
-Upgrade/Name/AP_TunnelingClaws=Tunneling Claws
Upgrade/Name/AP_TurboChargedEngines=Turbo-Charged Engines
Upgrade/Name/AP_TwinLinkedFlameThrowers=Twin-Linked Flame Thrower
Upgrade/Name/AP_UltraCapacitors=Ultra-Capacitors
@@ -5626,6 +5642,7 @@ Weapon/Name/AP_PhaseDisruptorsStrafe=Phase Disruptors
Weapon/Name/AP_PhotonCannon=Photon Cannon
Weapon/Name/AP_Predator=Titanium Claws
Weapon/Name/AP_PrimalHydraliskMelee=Primal Hydralisk Melee
+Weapon/Name/AP_PrimalIgniterCone=Fire Breath
Weapon/Name/AP_PrimalNeedleSpines=Needle Spines
Weapon/Name/AP_PrimalRoach=Acid Saliva
Weapon/Name/AP_PrimalRoachMelee=Claws
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
index 8f2a93bac..258427149 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
@@ -2742,7 +2742,6 @@ Button/EditorSuffix/AP_TerranVehicleWeaponsUltraCapacitorsLevel1=(Ultra Capacito
Button/EditorSuffix/AP_TerranVehicleWeaponsUltraCapacitorsLevel2=(Ultra Capacitors)
Button/EditorSuffix/AP_TerranVehicleWeaponsUltraCapacitorsLevel3=(Ultra Capacitors)
Button/EditorSuffix/AP_TissueAssimilation=- Ultralisk upgrade
-Button/EditorSuffix/AP_TunnelingClaws=(Roach)
Button/EditorSuffix/AP_VikingFighter=(Fighter Mode)
Button/EditorSuffix/AP_VoidColossusChargedBlast=- Taldarim
Button/EditorSuffix/AP_VoidRayPrismaticAlignmentBase=(Base)
@@ -6259,6 +6258,7 @@ Unit/EditorSuffix/AP_PhoenixAiur=- Aiur
Unit/EditorSuffix/AP_PhoenixPurifier=- Purifier
Unit/EditorSuffix/AP_PrimalHydralisk=(Primal Strain)
Unit/EditorSuffix/AP_PrimalHydraliskBurrowed=(Primal, Burrowed)
+Unit/EditorSuffix/AP_PrimalIgniterBurrowed=(Burrowed)
Unit/EditorSuffix/AP_PrimalRoach=(Primal Strain)
Unit/EditorSuffix/AP_PrimalRoachBurrowed=(Primal, Burrowed)
Unit/EditorSuffix/AP_PrimalUltralisk=(Primal Strain)
@@ -6384,7 +6384,6 @@ Upgrade/EditorPrefix/AP_GhostAlternate=AP -
Upgrade/EditorPrefix/AP_GhostMoebiusReactor=AP - Ghost -
Upgrade/EditorPrefix/AP_GhostSkinJunker=AP -
Upgrade/EditorPrefix/AP_GhostSkinNova=AP -
-Upgrade/EditorPrefix/AP_GlialReconstitution=AP - Roach -
Upgrade/EditorPrefix/AP_GraviticDrive=Warp Prism -
Upgrade/EditorPrefix/AP_HALORockets=AP - Story Mode Tech - (Viking)
Upgrade/EditorPrefix/AP_HailstormMissilePods=AP - Story Mode Tech - (Missile Turret)
@@ -6613,7 +6612,6 @@ Upgrade/EditorPrefix/AP_TerranVehicleWeaponsUltraCapacitorsLevel5=AP -
Upgrade/EditorPrefix/AP_ThorSkin=Model Reward -
Upgrade/EditorPrefix/AP_TriLithiumPowerCells=AP - Story Mode Tech - (Diamondback)
Upgrade/EditorPrefix/AP_TungstenSpikes=AP - Story Mode Tech - (Diamondback)
-Upgrade/EditorPrefix/AP_TunnelingClaws=AP - Roach -
Upgrade/EditorPrefix/AP_TurboChargedEngines=AP - Story Mode Tech - (Hellion)
Upgrade/EditorPrefix/AP_TwinLinkedFlameThrowers=AP - Story Mode Tech - (Hellion)
Upgrade/EditorPrefix/AP_UltraCapacitors=Story Mode Lab Tech -
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 7df37f956..ea3fc24f3 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -938,6 +938,46 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation3 (int lp_player, int lp_bitAr
);
}
+void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (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_Zerg_PrimalIgniterFireBreath, // 0
+ libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterToughness, // 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_unlockZergStrain (int lp_player, int lp_bitArrayValue) {
// Automatic Variable Declarations
// Implementation
@@ -994,7 +1034,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergMorph (int lp_player, int lp_bitArrayV
libABFE498B_gf_AP_Triggers_Zerg_unlockGuardian, // 6
libABFE498B_gf_AP_Triggers_Zerg_unlockDevourer, // 7
libABFE498B_gf_AP_Triggers_Zerg_unlockRavager, // 8
- ap_triggers_PlayerConsumer_sig, // 9
+ libABFE498B_gf_AP_Triggers_Zerg_unlockPrimalIgniter, // 9
ap_triggers_PlayerConsumer_sig, // 10
ap_triggers_PlayerConsumer_sig, // 11
ap_triggers_PlayerConsumer_sig, // 12
@@ -5411,6 +5451,18 @@ void libABFE498B_gf_AP_Triggers_Zerg_AberrationResourceEfficiency (int lp_player
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AberrationResourceEfficiency", 1);
}
+void libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterFireBreath (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PrimalIgniterFireBreath", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterToughness (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PrimalIgniterToughness", 1);
+}
+
void libABFE498B_gf_AP_Triggers_Zerg_unlockBaneling (int lp_player) {
// Automatic Variable Declarations
// Implementation
@@ -5529,6 +5581,18 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockOverseer (int lp_player) {
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_OverlordMorphOverseer", 1);
}
+void libABFE498B_gf_AP_Triggers_Zerg_unlockPrimalIgniter (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ TechTreeUnitAllow(lp_player, "AP_RoachWarren", true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_PrimalIgniterMerge", 0), true);
+ if ((libABFE498B_gv_aP_Triggers_Option_enableMorphling == true)) {
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_EnableMorphling", 1);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToPrimalIgniterMerge", 0), true);
+ }
+
+}
+
void libABFE498B_gf_AP_Triggers_Zerg_unlockMeleeAttacks (int lp_player, int lp_level) {
// Automatic Variable Declarations
// Implementation
@@ -5998,10 +6062,12 @@ void libABFE498B_gf_AP_Triggers_clearZergTech (int lp_player) {
TechTreeUnitAllow(lp_player, "AP_Scourge", false);
TechTreeUnitAllow(lp_player, "AP_SIQueen", false);
TechTreeUnitAllow(lp_player, "AP_DefilerSCBW", false);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_PrimalIgniterMerge", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphZerglingToBaneling", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphToRavager", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToBaneling", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToRavager", 0), false);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToPrimalIgniterMerge", 0), false);
TechTreeUnitAllow(lp_player, "AP_InfestedMedic", false);
TechTreeUnitAllow(lp_player, "AP_InfestedSiegeTank", false);
TechTreeUnitAllow(lp_player, "AP_InfestedBanshee", false);
@@ -7846,6 +7912,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
string lv_mutation1Value;
string lv_mutation2Value;
string lv_mutation3Value;
+ string lv_mutation4Value;
string lv_strainValue;
string lv_morphValue;
string lv_upgradeValue;
@@ -7864,6 +7931,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
lv_mutation1Value = "";
lv_mutation2Value = "";
lv_mutation3Value = "";
+ lv_mutation4Value = "";
lv_strainValue = "";
lv_morphValue = "";
lv_upgradeValue = "";
@@ -7888,6 +7956,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
lv_evolutionPitValue = StringWord(EventChatMessage(false), 11);
lv_mutation2Value = StringWord(EventChatMessage(false), 12);
lv_mutation3Value = StringWord(EventChatMessage(false), 13);
+ lv_mutation4Value = StringWord(EventChatMessage(false), 14);
auto6CA7C5BB_g = lib5BD4895D_gv_aP_Core_affectedPlayers;
lv_currentPlayer = -1;
while (true) {
@@ -7930,6 +7999,7 @@ bool libABFE498B_gt_AP_Triggers_giveZergTech_Func (bool testConds, bool runActio
libABFE498B_gf_AP_Triggers_unlockZergEvolutionPit(lv_currentPlayer, StringToInt(lv_evolutionPitValue));
libABFE498B_gf_AP_Triggers_unlockZergMutation2(lv_currentPlayer, StringToInt(lv_mutation2Value));
libABFE498B_gf_AP_Triggers_unlockZergMutation3(lv_currentPlayer, StringToInt(lv_mutation3Value));
+ libABFE498B_gf_AP_Triggers_unlockZergMutation4(lv_currentPlayer, StringToInt(lv_mutation4Value));
}
return true;
}
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index f8d2fb44b..54776df2b 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -132,6 +132,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergUpgrades (int lp_player, int lp_bitArr
void libABFE498B_gf_AP_Triggers_unlockZergMutation1 (int lp_player, int lp_bitArrayValue);
void libABFE498B_gf_AP_Triggers_unlockZergMutation2 (int lp_player, int lp_bitArrayValue);
void libABFE498B_gf_AP_Triggers_unlockZergMutation3 (int lp_player, int lp_bitArrayValue);
+void libABFE498B_gf_AP_Triggers_unlockZergMutation4 (int lp_player, int lp_bitArrayValue);
void libABFE498B_gf_AP_Triggers_unlockZergStrain (int lp_player, int lp_bitArrayValue);
void libABFE498B_gf_AP_Triggers_unlockZergMorph (int lp_player, int lp_bitArrayValue);
void libABFE498B_gf_AP_Triggers_unlockZergKerriganAbilities (int lp_player, int lp_bitArrayValue);
@@ -571,6 +572,8 @@ void libABFE498B_gf_AP_Triggers_Zerg_AberrationConstructRegeneration (int lp_pla
void libABFE498B_gf_AP_Triggers_Zerg_AberrationBanelingIncubation (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_AberrationProtectiveCover (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_AberrationResourceEfficiency (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterFireBreath (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterToughness (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockBaneling (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockLurker (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockImpaler (int lp_player);
@@ -580,6 +583,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockRavager (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockGuardian (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockDevourer (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockOverseer (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_unlockPrimalIgniter (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockMeleeAttacks (int lp_player, int lp_level);
void libABFE498B_gf_AP_Triggers_Zerg_unlockMissileAttacks (int lp_player, int lp_level);
void libABFE498B_gf_AP_Triggers_Zerg_unlockGroundCarapace (int lp_player, int lp_level);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
index c703c02f6..045c763a8 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader and b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
index 572755164..5e3e80bbc 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version and b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index f36b729be..f533183b6 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -894,6 +894,7 @@