diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index ad0057e6f..b18d168d9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -7100,6 +7100,9 @@
+
+
+
@@ -10644,4 +10647,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index e7b7d4dd5..ae99f6e69 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -19933,6 +19933,7 @@
+
@@ -31935,4 +31936,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index c9a33687f..af8e7e0e7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -6935,4 +6935,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 48d6df2bd..980946c4b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -5367,4 +5367,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index e90dd3a61..7db0f9e51 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -16763,4 +16763,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 04ee522de..4676cba8b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3353,4 +3353,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 9dab33112..12ad5d15b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5814,4 +5814,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 83621ee4d..6c2c55414 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -16862,8 +16862,9 @@
+
+
-
@@ -16873,8 +16874,12 @@
-
-
+
+
+
+
+
+
@@ -23357,4 +23362,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 823d927e6..7d87f401d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -1271,8 +1271,8 @@
-
-
+
+
@@ -8681,21 +8681,12 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -12263,4 +12254,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 267ab1ed8..34f9fef17 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -469,3 +469,8 @@ Button/Hotkey/AP_TornadoMissile=E
Button/Hotkey/AP_WarHound=R
Button/Hotkey/AP_StimRedirect=T
Button/Hotkey/AP_HellbatCharge=J
+Button/Hotkey/AP_GenerateCreep=G
+Button/Hotkey/AP_StopGenerateCreep=C
+Button/Hotkey/AP_SpawnChangeling=C
+Button/Hotkey/AP_Contaminate=E
+Button/Hotkey/AP_MorphToOverseer=V
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index b1e6885ca..dec926fec 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -619,6 +619,7 @@ Behavior/Name/AP_ZerglingFury5=Fury
Behavior/Name/AP_ZerglingRespawnControllerRebirth=Zergling Reconstitution Controller Rebirth
Behavior/Name/AP_ZerglingRespawnControllerSearch=Zergling Reconstitution Controller Search
Behavior/Name/AP_ZerglingSunder=Sundered
+Behavior/Name/AP_Contaminated=Contaminated
Behavior/Tooltip/AP_250mmStrikeCannons=Target is currently stunned and unable to use any abilities.
Behavior/Tooltip/AP_330mmBarrageCannons=Target is currently stunned and unable to use any abilities.
Behavior/Tooltip/AP_AberrationArmorAuraTarget=An Aberration is granting this unit % damage reduction.
@@ -755,6 +756,7 @@ Behavior/Tooltip/AP_ZerglingFury3=Attacking % faster.
Behavior/Tooltip/AP_ZerglingFury5=Attacking % faster.
Behavior/Tooltip/AP_ZerglingSunder=This unit receives extra damage from ranged attacks.
+Behavior/Tooltip/AP_Contaminated=This structure is unable to train new units or research upgrades.
Button/Name/AP_250mmStrikeCannons=250mm Strike Cannons
Button/Name/AP_330mmBarrageCannons=330mm Barrage Cannons (Free Aim)
Button/Name/AP_330mmBarrageCannonsTargetUnit=330mm Barrage Cannons (Unit Target)
@@ -1717,8 +1719,15 @@ Button/Name/AP_zergmissileweapons2=Evolve Missile Attacks Level 2
Button/Name/AP_zergmissileweapons3=Evolve Missile Attacks Level 3
Button/Name/AP_zergmissileweapons4=Evolve Missile Attacks Level 4
Button/Name/AP_zergmissileweapons5=Evolve Missile Attacks Level 5
-Button/Name/TerranVehicleWeaponsLevel4=Upgrade Vehicle Weapons Level 4
-Button/Name/TerranVehicleWeaponsLevel5=Upgrade Vehicle Weapons Level 5
+Button/Name/AP_TerranVehicleWeaponsLevel4=Upgrade Vehicle Weapons Level 4
+Button/Name/AP_TerranVehicleWeaponsLevel5=Upgrade Vehicle Weapons Level 5
+Button/Name/AP_GenerateCreep=Generate Creep
+Button/Name/AP_StopGenerateCreep=Stop Generate Creep
+Button/Name/AP_SpawnChangeling=Spawn Changeling
+Button/Name/AP_Contaminate=Contaminate
+Button/Name/AP_OverlordSpeed=Pneumatized Carapace
+Button/Name/AP_OverlordSightUpgrade=Antennae
+Button/Name/AP_MorphToOverseer=Morph to Overseer
Button/Tooltip/AP_250mmStrikeCannons=Stuns target unit. Deals damage over seconds.
Button/Tooltip/AP_330mmBarrageCannons=Stuns all enemies in a small area. Deals damage over seconds in a larger area.
Button/Tooltip/AP_AWrp=Sacrifices 2 Templar to create an Archon.Can attack ground and air units.
@@ -2801,6 +2810,15 @@ Button/Tooltip/AP_zergmissileweapons2=Further upgrades the attacks of all Zerg g
Button/Tooltip/AP_zergmissileweapons3=Maximizes the attacks of all Zerg ground ranged units.
Button/Tooltip/AP_zergmissileweapons4=Maximizes the attacks of all Zerg ground ranged units.
Button/Tooltip/AP_zergmissileweapons5=Maximizes the attacks of all Zerg ground ranged units.
+Button/Tooltip/AP_GenerateCreep=Makes the Overlord start to generate creep. Creep will only be generated when the Overlord isn't moving. Creep feeds nearby Zerg structures.Bonus: Zerg move faster on creep.
+Button/Tooltip/AP_StopGenerateCreep=Stops generating creep.
+Button/Tooltip/AP_SpawnChangeling=Creates a Changeling. Changelings cannot attack and die after . When a Changeling first encounters an enemy unit, it will match that unit's color and change into a Zealot, Marine, or Zergling, depending on the enemy race.
+Button/Tooltip/AP_Contaminate=The target structure will be unable to attack, train units or research upgrades for seconds.
+Button/Tooltip/AP_OverlordSpeed=Increases Overlord movement speed.
+Button/Tooltip/AP_OverlordSightUpgrade=Increases Overlord sight range.
+Button/Tooltip/AP_Overseer=Advanced aerial observer. Maintains the unit cap set by the Overlord. Can use the Spawn Creep Tumor and Contaminate abilities.Detector
+Button/Tooltip/AP_MorphToOverseer=Advanced aerial observer. Provides the same supply as an Overlord. Can use the Spawn Creep Tumor and Contaminate abilities.Detector
+Button/Tooltip/AP_OverlordCocoon=This cocoon contains an Overlord as it is morphing into an Overseer.
Effect/Name/AP_250mmStrikeCannonsApplyBehavior=250mm Strike Cannons (Apply Behavior)
Effect/Name/AP_250mmStrikeCannonsCreatePersistent=250mm Strike Cannons (Create Persistent)
Effect/Name/AP_250mmStrikeCannonsDamage=250mm Strike Cannons (Damage)
@@ -4966,6 +4984,8 @@ Unit/Name/AP_ZealotShakuras=Centurion
Unit/Name/AP_Zergling=Zergling
Unit/Name/AP_ZerglingRespawnControllerUnit=Zergling Reconstitution Controller Unit
Unit/Name/AP_ZerglingRespawnWeapon=Zergling Reconstitution Weapon
+Unit/Name/AP_Overseer=Overseer
+Unit/Name/AP_OverlordCocoon=Overseer Cocoon
Unit/ShieldArmorName/AP_DefensiveMatrixShields=Defensive Matrix
Unit/ShieldArmorName/AP_NovaShieldArmor=Terran Energy Shields
Unit/ShieldArmorName/AP_TerranShieldArmor=Terran Energy Shields
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 223a936ba..746a23c20 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -929,7 +929,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergMorph (int lp_player, int lp_bitArrayV
libABFE498B_gf_AP_Triggers_Zerg_unlockLurker, // 1
libABFE498B_gf_AP_Triggers_Zerg_unlockBroodLord, // 2
libABFE498B_gf_AP_Triggers_Zerg_unlockViper, // 3
- ap_triggers_PlayerConsumer_sig, // 4
+ libABFE498B_gf_AP_Triggers_Zerg_unlockOverseer, // 4
libABFE498B_gf_AP_Triggers_Zerg_unlockBaneling, // 5
libABFE498B_gf_AP_Triggers_Zerg_unlockGuardian, // 6
libABFE498B_gf_AP_Triggers_Zerg_unlockDevourer, // 7
@@ -1052,9 +1052,9 @@ void libABFE498B_gf_AP_Triggers_unlockZergEvolutionPit (int lp_player, int lp_bi
libABFE498B_gf_AP_Triggers_Zerg_MalignantCreep, // 4
libABFE498B_gf_AP_Triggers_Zerg_VespeneEfficiency, // 5
libABFE498B_gf_AP_Triggers_Zerg_OverlordVentralSacs, // 6
- ap_triggers_PlayerConsumer_sig, // 7
- ap_triggers_PlayerConsumer_sig, // 8
- ap_triggers_PlayerConsumer_sig, // 9
+ libABFE498B_gf_AP_Triggers_Zerg_OverlordGenerateCreep, // 7
+ libABFE498B_gf_AP_Triggers_Zerg_OverlordAntennae, // 8
+ libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
ap_triggers_PlayerConsumer_sig, // 10
ap_triggers_PlayerConsumer_sig, // 11
ap_triggers_PlayerConsumer_sig, // 12
@@ -4923,6 +4923,24 @@ void libABFE498B_gf_AP_Triggers_Zerg_OverlordVentralSacs (int lp_player) {
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_overlordtransport", 1);
}
+void libABFE498B_gf_AP_Triggers_Zerg_OverlordGenerateCreep (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_OverlordGenerateCreep", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_OverlordAntennae (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_OverlordSightUpgrade", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_OverlordSpeed", 1);
+}
+
void libABFE498B_gf_AP_Triggers_Zerg_CorruptorCausticSpray (int lp_player) {
// Automatic Variable Declarations
// Implementation
@@ -5340,6 +5358,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockDevourer (int lp_player) {
}
+void libABFE498B_gf_AP_Triggers_Zerg_unlockOverseer (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_OverlordMorphOverseer", 1);
+}
+
void libABFE498B_gf_AP_Triggers_Zerg_unlockMeleeAttacks (int lp_player, int lp_level) {
// Automatic Variable Declarations
// Implementation
@@ -5761,6 +5785,32 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockHive (int lp_player) {
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_UpgradeToHive", 0), true);
}
+void libABFE498B_gf_AP_Triggers_Zerg_unlockOverlordEnergy (int lp_player) {
+ // Variable Declarations
+ unit lv_currentUnit;
+ int lv_upgradeLevels;
+
+ // Automatic Variable Declarations
+ unitgroup auto6027F01E_g;
+ int auto6027F01E_u;
+
+ // Variable Initialization
+
+ // Implementation
+ lv_upgradeLevels = TechTreeUpgradeCount(lp_player, "AP_OverlordSpellcaster", c_techCountQueuedOrBetter);
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_OverlordSpellcaster", 1);
+ if ((lv_upgradeLevels == 0)) {
+ auto6027F01E_g = UnitGroup("AP_Overlord", lp_player, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+ auto6027F01E_u = UnitGroupCount(auto6027F01E_g, c_unitCountAll);
+ for (;; auto6027F01E_u -= 1) {
+ lv_currentUnit = UnitGroupUnitFromEnd(auto6027F01E_g, auto6027F01E_u);
+ if (lv_currentUnit == null) { break; }
+ UnitSetPropertyFixed(lv_currentUnit, c_unitPropEnergy, 50.0);
+ }
+ }
+
+}
+
void libABFE498B_gf_AP_Triggers_clearZergTech (int lp_player) {
// Automatic Variable Declarations
// Implementation
@@ -5827,6 +5877,7 @@ void libABFE498B_gf_AP_Triggers_giveZergDefaultTech (int lp_player) {
// Automatic Variable Declarations
// Implementation
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_KerriganPostLabSounds", 1);
+ libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_OverlordContaminate", 1);
}
void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurZealot (int lp_player) {
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 5ca16e37f..453f81c49 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -501,6 +501,9 @@ void libABFE498B_gf_AP_Triggers_Zerg_UltraliskOrganicCarapace (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_UltraliskResourceEfficiency (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_OverlordImprovedOverlord (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_OverlordVentralSacs (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_OverlordGenerateCreep (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_OverlordAntennae (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_CorruptorCausticSpray (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_CorruptorCorruption (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_ScourgeVirulentSpores (int lp_player);
@@ -560,6 +563,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockBroodLord (int lp_player);
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_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);
@@ -586,6 +590,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_KerriganSpawnLeviathan (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_KerriganDropPods (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockLair (int lp_player);
void libABFE498B_gf_AP_Triggers_Zerg_unlockHive (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_unlockOverlordEnergy (int lp_player);
void libABFE498B_gf_AP_Triggers_clearZergTech (int lp_player);
void libABFE498B_gf_AP_Triggers_giveZergDefaultTech (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurZealot (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
index 02033b175..95ab16d78 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 a5a95fb56..598396bd6 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 f4e9d58d6..b2ef26cd0 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -3363,7 +3363,7 @@
libABFE498B_gf_AP_Triggers_Zerg_unlockLurker, // 1
libABFE498B_gf_AP_Triggers_Zerg_unlockBroodLord, // 2
libABFE498B_gf_AP_Triggers_Zerg_unlockViper, // 3
- ap_triggers_PlayerConsumer_sig, // 4
+ libABFE498B_gf_AP_Triggers_Zerg_unlockOverseer, // 4
libABFE498B_gf_AP_Triggers_Zerg_unlockBaneling, // 5
libABFE498B_gf_AP_Triggers_Zerg_unlockGuardian, // 6
libABFE498B_gf_AP_Triggers_Zerg_unlockDevourer, // 7
@@ -3564,9 +3564,9 @@
libABFE498B_gf_AP_Triggers_Zerg_MalignantCreep, // 4
libABFE498B_gf_AP_Triggers_Zerg_VespeneEfficiency, // 5
libABFE498B_gf_AP_Triggers_Zerg_OverlordVentralSacs, // 6
- ap_triggers_PlayerConsumer_sig, // 7
- ap_triggers_PlayerConsumer_sig, // 8
- ap_triggers_PlayerConsumer_sig, // 9
+ libABFE498B_gf_AP_Triggers_Zerg_OverlordGenerateCreep, // 7
+ libABFE498B_gf_AP_Triggers_Zerg_OverlordAntennae, // 8
+ libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
ap_triggers_PlayerConsumer_sig, // 10
ap_triggers_PlayerConsumer_sig, // 11
ap_triggers_PlayerConsumer_sig, // 12
@@ -37806,6 +37806,9 @@
+
+
+
@@ -40586,6 +40589,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ AP_OverlordGenerateCreep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ AP_OverlordSightUpgrade
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ AP_OverlordSpeed
+
+
+
@@ -42431,6 +42542,7 @@
+
@@ -43659,6 +43771,42 @@
true
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ AP_OverlordMorphOverseer
+
+
+
@@ -47797,6 +47945,7 @@
+
@@ -47875,6 +48024,199 @@
AP_UpgradeToHive
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_OverlordSpellcaster
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ AP_OverlordSpellcaster
+
+
+
+
+
+
+
+
+
+
+
+ If the player didn't have the upgrade before, set the starting energy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_Overlord
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -;Missile,Dead,Hidden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 50.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
@@ -49108,6 +49450,7 @@
+
@@ -49140,6 +49483,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ AP_OverlordContaminate
+
+
+
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
index 93ec1fd07..ba8e84ada 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version and b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 4fd1d6fe4..454d76967 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -129,6 +129,7 @@ FunctionDef/Name/lib_ABFE498B_16A5F200=AP_Triggers_Terran_unlockHellion
FunctionDef/Name/lib_ABFE498B_16B97B59=AP_Triggers_Zerg_InfestorInfestedTerran
FunctionDef/Name/lib_ABFE498B_170C5251=AP_Triggers_Terran_unlockGhost
FunctionDef/Name/lib_ABFE498B_172E339A=AP_Triggers_Protoss_unlockVoidRayShakuras
+FunctionDef/Name/lib_ABFE498B_17666DBE=AP_Triggers_Zerg_OverlordGenerateCreep
FunctionDef/Name/lib_ABFE498B_17839D05=AP_Triggers_Zerg_KerriganHeroicFortitude
FunctionDef/Name/lib_ABFE498B_17D54790=AP_Triggers_Terran_unlockPredator
FunctionDef/Name/lib_ABFE498B_17F71020=AP_Triggers_Protoss_unlockOracle
@@ -189,6 +190,7 @@ FunctionDef/Name/lib_ABFE498B_2EED33D4=AP_Triggers_Zerg_AberrationConstructRegen
FunctionDef/Name/lib_ABFE498B_2F0A0E5C=AP_Triggers_Terran_unlockReaperJetPackOverdrive
FunctionDef/Name/lib_ABFE498B_2FDFD4B9=AP_Triggers_Protoss_unlockOracleStasisCalibration
FunctionDef/Name/lib_ABFE498B_2FF6495C=AP_Triggers_Zerg_ZerglingReconstitution
+FunctionDef/Name/lib_ABFE498B_302DF0A8=AP_Triggers_Zerg_unlockOverlordEnergy
FunctionDef/Name/lib_ABFE498B_303E26B5=AP_Triggers_Zerg_DefilerImprovedCastRange
FunctionDef/Name/lib_ABFE498B_30642978=AP_Triggers_Protoss_unlockDarkArchon
FunctionDef/Name/lib_ABFE498B_311283F0=AP_Triggers_Terran_unlockSiegeTankMaelstromRounds
@@ -256,6 +258,7 @@ FunctionDef/Name/lib_ABFE498B_49E36E4B=AP_Triggers_MapConfig_setKerriganStoryTec
FunctionDef/Name/lib_ABFE498B_4A055597=AP_Triggers_Terran_unlockWraithDisplacementField
FunctionDef/Name/lib_ABFE498B_4A6A5B00=AP_Triggers_Protoss_unlockNexusOvercharge
FunctionDef/Name/lib_ABFE498B_4AE87663=AP_Triggers_Terran_unlockCycloneInternalTechModule
+FunctionDef/Name/lib_ABFE498B_4AE9A1DC=AP_Triggers_Zerg_OverlordPneumatizedCarapace
FunctionDef/Name/lib_ABFE498B_4D2A102F=AP_Triggers_MapConfig_setDifficultySetup
FunctionDef/Name/lib_ABFE498B_4D7D491B=AP_Triggers_Protoss_unlockShieldBattery
FunctionDef/Name/lib_ABFE498B_4DF3B624=AP_Triggers_Protoss_unlockScoutGraviticThrusters
@@ -389,6 +392,7 @@ FunctionDef/Name/lib_ABFE498B_7B14B7D2=AP_Triggers_Terran_unlockJotun
FunctionDef/Name/lib_ABFE498B_7B30260A=AP_Triggers_Protoss_unlockEnergizerForgedChassis
FunctionDef/Name/lib_ABFE498B_7B9AD2C5=AP_Triggers_Protoss_unlockArbiterKhaydarinCore
FunctionDef/Name/lib_ABFE498B_7BF4E121=AP_Triggers_Terran_unlockDevilDogs
+FunctionDef/Name/lib_ABFE498B_7C350205=AP_Triggers_Zerg_unlockOverseer
FunctionDef/Name/lib_ABFE498B_7C4A41BD=AP_Triggers_Terran_unlockSiegeTankSpiderMines
FunctionDef/Name/lib_ABFE498B_7C6BA796=AP_Triggers_Terran_unlockSiegeBreakers
FunctionDef/Name/lib_ABFE498B_7C6D6C84=AP_Triggers_Protoss_unlockSignifier
@@ -484,6 +488,7 @@ FunctionDef/Name/lib_ABFE498B_9E5DB341=AP_Triggers_Terran_unlockHellionInfernalP
FunctionDef/Name/lib_ABFE498B_9E7EC561=AP_Triggers_Zerg_KerriganWildMutation
FunctionDef/Name/lib_ABFE498B_9F10430B=AP_Triggers_Terran_unlockNovaGadgetPulseGrenades
FunctionDef/Name/lib_ABFE498B_9F180882=AP_Triggers_Terran_unlockValkyrieEnhancedCluserLaunchers
+FunctionDef/Name/lib_ABFE498B_9F40B38A=AP_Triggers_Zerg_OverlordAntennae
FunctionDef/Name/lib_ABFE498B_9F948966=AP_Triggers_Protoss_unlockSlayer
FunctionDef/Name/lib_ABFE498B_A001B908=AP_Triggers_Terran_unlockFirebatIncineratorGauntlets
FunctionDef/Name/lib_ABFE498B_A047E206=AP_Triggers_Zerg_BroodQueenEnhancedMitochondria
@@ -757,6 +762,7 @@ ParamDef/Name/lib_ABFE498B_082C2741=player
ParamDef/Name/lib_ABFE498B_0874A303=player
ParamDef/Name/lib_ABFE498B_08B3D29D=player
ParamDef/Name/lib_ABFE498B_08CA6C97=player
+ParamDef/Name/lib_ABFE498B_08FE0002=player
ParamDef/Name/lib_ABFE498B_099D5849=player
ParamDef/Name/lib_ABFE498B_09C47095=player
ParamDef/Name/lib_ABFE498B_09D076EE=player
@@ -838,6 +844,7 @@ ParamDef/Name/lib_ABFE498B_268EF1DB=player
ParamDef/Name/lib_ABFE498B_26C50CAD=bitArrayValue
ParamDef/Name/lib_ABFE498B_27A446B8=level
ParamDef/Name/lib_ABFE498B_285F3328=player
+ParamDef/Name/lib_ABFE498B_28798243=player
ParamDef/Name/lib_ABFE498B_28B7B6EB=player
ParamDef/Name/lib_ABFE498B_296EEBB6=level
ParamDef/Name/lib_ABFE498B_29ADDFA1=player
@@ -1148,6 +1155,7 @@ ParamDef/Name/lib_ABFE498B_8C410A98=player
ParamDef/Name/lib_ABFE498B_8CC2F9BF=player
ParamDef/Name/lib_ABFE498B_8CDFA65D=player
ParamDef/Name/lib_ABFE498B_8D327E85=newUpgrade
+ParamDef/Name/lib_ABFE498B_8DDC17F6=player
ParamDef/Name/lib_ABFE498B_8E0F5BE2=onCasual
ParamDef/Name/lib_ABFE498B_8F1069F3=player
ParamDef/Name/lib_ABFE498B_8F40B939=player
@@ -1199,6 +1207,7 @@ ParamDef/Name/lib_ABFE498B_A035FADD=kerriganBonusLevels
ParamDef/Name/lib_ABFE498B_A0AA41F8=player
ParamDef/Name/lib_ABFE498B_A0F9B7DC=player
ParamDef/Name/lib_ABFE498B_A110EB9E=player
+ParamDef/Name/lib_ABFE498B_A1449053=player
ParamDef/Name/lib_ABFE498B_A152128E=player
ParamDef/Name/lib_ABFE498B_A1C9043A=level
ParamDef/Name/lib_ABFE498B_A1D5274F=player
@@ -1316,6 +1325,7 @@ ParamDef/Name/lib_ABFE498B_D23FD809=player
ParamDef/Name/lib_ABFE498B_D28AE3DF=player
ParamDef/Name/lib_ABFE498B_D2B91BC5=player
ParamDef/Name/lib_ABFE498B_D30D39C0=player
+ParamDef/Name/lib_ABFE498B_D3148D4B=player
ParamDef/Name/lib_ABFE498B_D3892858=player
ParamDef/Name/lib_ABFE498B_D3DF1C46=player
ParamDef/Name/lib_ABFE498B_D3F8E167=player
@@ -1570,6 +1580,7 @@ Variable/Name/lib_ABFE498B_A4077B3C=takeOverAIAllies
Variable/Name/lib_ABFE498B_A4361B8E=armory6Value
Variable/Name/lib_ABFE498B_A54B32FA=abilityValue
Variable/Name/lib_ABFE498B_A613AA23=upgradeLevels
+Variable/Name/lib_ABFE498B_A93B0EB8=currentUnit
Variable/Name/lib_ABFE498B_AA6D36F6=difficulty
Variable/Name/lib_ABFE498B_AAD2978F=AP_Triggers_Option_SoAPresenceNoBuild
Variable/Name/lib_ABFE498B_AC7E9244=AP_Triggers_Protoss_has_Havoc
@@ -1587,6 +1598,7 @@ Variable/Name/lib_ABFE498B_C51D2F3D=AP_Triggers_Protoss_has_Corsair
Variable/Name/lib_ABFE498B_C6027B72=currentPlayer
Variable/Name/lib_ABFE498B_C69636BB=upgradeLevels
Variable/Name/lib_ABFE498B_C7F210FF=evolutionPitValue
+Variable/Name/lib_ABFE498B_C7FFAFDD=upgradeLevels
Variable/Name/lib_ABFE498B_C96CA63A=ncoOnlyRun
Variable/Name/lib_ABFE498B_CB30259A=AP_Triggers_Protoss_has_Ascendant
Variable/Name/lib_ABFE498B_CF581792=currentPlayer