From 57e054f7b83e5112da0feb39dc12a23be9916f55 Mon Sep 17 00:00:00 2001
From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:07:15 -0400
Subject: [PATCH 1/2] Zerg structure upgrades

---
 .../Base.SC2Data/GameData/AbilData.xml        |  13 +-
 .../Base.SC2Data/GameData/ActorData.xml       |  20 ++
 .../Base.SC2Data/GameData/BehaviorData.xml    |  13 +
 .../Base.SC2Data/GameData/ButtonData.xml      |  12 +
 .../Base.SC2Data/GameData/EffectData.xml      |   5 +
 .../GameData/PlayerResponseData.xml           |   4 +
 .../Base.SC2Data/GameData/RequirementData.xml |  17 ++
 .../GameData/RequirementNodeData.xml          |  11 +
 .../Base.SC2Data/GameData/UnitData.xml        |  26 +-
 .../Base.SC2Data/GameData/UpgradeData.xml     |  16 +
 .../Base.SC2Data/Lib15EF4C78.galaxy           |  56 ++++
 .../Base.SC2Data/Lib15EF4C78_h.galaxy         |   1 +
 Mods/ArchipelagoPlayer.SC2Mod/Triggers        | 283 ++++++++++++++++++
 .../LocalizedData/GameStrings.txt             |   5 +
 .../LocalizedData/TriggerStrings.txt          |   1 +
 15 files changed, 481 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 4a341ec12..bd3f2b032 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -222,7 +222,7 @@
         <EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
         <FlagArray index="Cancelable" value="1"/>
         <FlagArray index="PeonMaintained" value="0"/>
-        <InfoArray index="Build1" Unit="AP_NydusWorm" Time="20">
+        <InfoArray index="Build1" Unit="AP_NydusWorm" Time="10">
             <Cooldown TimeUse="30"/>
             <Button DefaultButtonFace="AP_NydusWorm" State="Restricted" Requirements="AP_HaveNydusNetwork"/>
         </InfoArray>
@@ -13930,4 +13930,15 @@
         <UninterruptibleArray index="Finish" value="1"/>
         <FinishTime value="0.25"/>
     </CAbilEffectInstant>
+    <CAbilMorph id="AP_AutoMorphLairToHive">
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="Raise" Requirements="AP_HaveHiveClusterMaturation"/>
+        <CmdButtonArray index="Cancel" DefaultButtonFace="Cancel"/>
+        <Flags index="Automatic" value="1"/>
+        <Flags index="IgnorePlacement" value="1"/>
+        <Flags index="IgnoreFacing" value="1"/>
+        <Flags index="IgnoreUnitCost" value="1"/>
+        <Flags index="IgnoreFood" value="1"/>
+        <InfoArray Unit="AP_Hive" CollideRange="0"/>
+    </CAbilMorph>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index cafdc6aad..81a632d58 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -18588,6 +18588,7 @@
         <On Terms="ActorCreation" Send="AnimGroupRemove B"/>
         <On Terms="ActorCreation" Send="AnimGroupApply C"/>
         <On Terms="AbilMorph.*.Finish; MorphFrom AP_Lair; MorphTo AP_Hive" Send="Create"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="Create"/>
         <On Terms="UnitBirth.AP_Hive; PlayerHasClanDecal" Send="Create ZergClanFlag"/>
         <On Terms="UnitBirth.AP_Hive; PlayerHasTrophy" Send="Create ZergPlayerTrophy"/>
         <On Terms="UnitDeathCustomize; ValidateUnit AP_HasZergGenericDeath" Send="DeathCustomize Detached"/>
@@ -18629,6 +18630,13 @@
         <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Hatchery; MorphTo AP_Lair" Send="AnimBaselineStart"/>
         <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Hatchery; MorphTo AP_Lair" Send="AnimPlay MorphCancel Cover,End,A"/>
         <On Terms="AbilMorph.*.Finish; MorphFrom AP_Hatchery; MorphTo AP_Lair" Send="Destroy"/>
+        <On Terms="AbilMorph.*.Start; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="Create AP_ZergHatcheryToHive"/>
+        <On Terms="AbilMorph.*.Start; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="AnimGroupApply C"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="AnimGroupRemove C"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="AnimClearAllBut Stand"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="AnimBaselineStart"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="AnimPlay MorphCancel Cover,End,A"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="Destroy"/>
         <On Terms="UnitBirth.AP_Hatchery" Send="Create PlayerLogoDoodadList"/>
         <On Terms="UnitBirth.AP_Hatchery; PlayerHasClanDecal" Send="Create ZergClanFlag"/>
         <On Terms="UnitBirth.AP_Hatchery; PlayerHasTrophy" Send="Create ZergPlayerTrophy"/>
@@ -18722,6 +18730,18 @@
         <!-- linked to -->
         <Supporter Subject="_ZergHiveMorph"/>
     </CActorProgress>
+    <CActorProgress id="AP_ZergHatcheryToHive">
+        <!-- remove progress if cancelled, killed or completed -->
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="Destroy"/>
+        <On Terms="AbilMorph.*.Start; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="Destroy"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Hatchery; MorphTo AP_Hive" Send="Destroy"/>
+        <!-- the animations -->
+        <StageArray AnimProps="Morph,Start,A" BlendTime="0.000000"/>
+        <StageArray AnimProps="Stand,Morph,A"/>
+        <StageArray AnimProps="Morph,End,B"/>
+        <!-- linked to -->
+        <Supporter Subject="_ZergLairMorph"/>
+    </CActorProgress>
     <CActorUnit id="AP_Larva" parent="GenericUnitMorph" unitName="AP_Larva">
         <Aliases value="_UnitSmall"/>
         <Model value="Larva"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index b136bd36e..7ee00ba11 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -2735,6 +2735,19 @@
             <VitalRegenArray index="Life" value="10"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_ZergStructureRapidRegen">
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\btn-ability-zerg-transfusion.dds"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_CasterNotInCombat10s"/>
+        <DisableValidatorArray value="AP_NotMaxHP"/>
+        <DisableValidatorArray value="OnCreep"/>
+        <DisableValidatorArray value="AP_NotSpineCrawlerUprooted"/>
+        <DisableValidatorArray value="AP_NotSporeCrawlerUprooted"/>
+        <Modification>
+            <VitalRegenArray index="Life" value="10"/>
+        </Modification>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_Corruption">
         <Alignment value="Negative"/>
         <Duration value="30"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 11bced385..fbcd9e8eb 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -6735,4 +6735,16 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-kerrigan-crushinggripwave.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CButton>
+    <CButton id="AP_HatchToLairUpgradeable">
+        <Name value="Button/Name/AP_Lair"/>
+        <Tooltip value="Button/Tooltip/AP_Lair"/>
+        <Hotkey value="Button/Hotkey/AP_Lair"/>
+        <Icon value="Assets\Textures\btn-building-zerg-lair.dds"/>
+        <AlertIcon value="Assets\Textures\btn-building-zerg-lair.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
+    <CButton id="AP_ZergStructureRapidRegen">
+        <Icon value="Assets\Textures\btn-upgrade-zerg-abathur-improvedmend.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 6c53daebf..a1737c297 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -22242,4 +22242,9 @@
         <SearchFlags index="CallForHelp" value="0"/>
         <Amount value="100"/>
     </CEffectDamage>
+    <CEffectApplyBehavior id="AP_ZergStructureRapidRegenAB">
+        <EditorCategories value="Race:Zerg"/>
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_ZergStructureRapidRegen"/>
+    </CEffectApplyBehavior>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/PlayerResponseData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/PlayerResponseData.xml
index ecf714377..9b927b366 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/PlayerResponseData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/PlayerResponseData.xml
@@ -9,4 +9,8 @@
         <Fatal value="1"/>
         <ModifyFraction value="0"/>
     </CPlayerResponseUnitDamage>
+    <CPlayerResponseUnitBirth id="AP_ZergStructureRapidRegen">
+        <CasterFilters value="Biological,Structure;Mechanical,Missile,Destructible,Hidden"/>
+        <Handled value="AP_ZergStructureRapidRegenAB"/>
+    </CPlayerResponseUnitBirth>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index feef66a06..8653c1e4a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4150,4 +4150,21 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeKerriganImmobilizationWaveCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveHiveClusterMaturation">
+        <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeHiveClusterMaturationCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_NotHaveHiveClusterMaturation">
+        <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_NotCountUpgradeHiveClusterMaturationCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveZergStructureRapidRegen">
+        <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeZergStructureRapidRegenCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveZergStructureRapidRegenMustBeRooted">
+        <EditorCategories value="Race:InfestedTerran,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_NotPossibleRootedCompleteOnly"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeZergStructureRapidRegenCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index a38763323..bae490a6b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6834,4 +6834,15 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_KerriganImmobilizationWave" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeHiveClusterMaturationCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_HiveClusterMaturation" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementNot id="AP_NotCountUpgradeHiveClusterMaturationCompleteOnly">
+        <OperandArray index="0" value="AP_CountUpgradeHiveClusterMaturationCompleteOnly"/>
+    </CRequirementNot>
+    <CRequirementCountUpgrade id="AP_CountUpgradeZergStructureRapidRegenCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_ZergStructureRapidRegen" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 8b4f232ea..5bfad2e9c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -8269,6 +8269,7 @@
         <CardLayouts>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
             <LayoutButtons Face="AP_K5GasBonuses" Type="Passive" Requirements="AP_HaveK5GasBonuses" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -8332,6 +8333,7 @@
         <CardLayouts>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
             <LayoutButtons Face="AP_K5GasBonuses" Type="Passive" Requirements="AP_HaveK5GasBonuses" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -8390,6 +8392,7 @@
         <CardLayouts>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
             <LayoutButtons Face="AP_K5GasBonuses" Type="Passive" Requirements="AP_HaveK5GasBonuses" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -9802,6 +9805,7 @@
             <LayoutButtons Face="AP_SummonNydusWorm" Type="AbilCmd" AbilCmd="AP_BuildNydusWorm,Build1" Row="2" Column="0"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="AP_SummonOmegaWorm" Type="AbilCmd" AbilCmd="AP_BuildOmegaWorm,Build1" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="3"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -9873,6 +9877,7 @@
             <LayoutButtons Face="AP_NydusWormJormungandrStrain" Type="Passive" Requirements="AP_HaveNydusWormJormungandrStrain" Row="1" Column="2"/>
             <LayoutButtons Face="AP_NydusRecall" Type="AbilCmd" AbilCmd="AP_SalvageNydus,On" Row="1" Column="3"/>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="2" Column="3"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
@@ -9962,6 +9967,7 @@
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_que7,CancelLast" Row="2" Column="4"/>
             <LayoutButtons Face="AP_NydusRecall" Type="AbilCmd" AbilCmd="AP_SalvageNydus,On" Row="2" Column="3"/>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="2" Column="2"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
@@ -16785,6 +16791,7 @@
             <LayoutButtons Face="AP_ScourgePassive" Type="Passive" Row="1" Column="2"/>
             <LayoutButtons Face="AP_BroodLordPassive" Type="Passive" Requirements="AP_HaveHotSMutaliskBroodLord" Row="1" Column="1"/>
             <LayoutButtons Face="AP_ViperPassive" Type="Passive" Requirements="AP_HaveHotSMutaliskViper" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
@@ -16968,6 +16975,7 @@
             <LayoutButtons Face="AP_SwarmHostCarrionPassive" Type="Passive" Requirements="AP_HotSHaveSwarmHostSplitA" Row="1" Column="1"/>
             <LayoutButtons Face="AP_SwarmHostCreeperPassive" Type="Passive" Requirements="AP_HotSHaveSwarmHostSplitB" Row="1" Column="1"/>
             <LayoutButtons Face="AP_SwarmHostPassive" Type="Passive" Requirements="AP_HotSHaveSwarmHost" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -17036,6 +17044,7 @@
             <LayoutButtons Face="AP_HydraliskDenImpalerPassive" Type="Passive" Requirements="AP_HaveHotSImpaler" Row="1" Column="0"/>
             <LayoutButtons Face="AP_HydraliskDenLurkerPassive" Type="Passive" Requirements="AP_HaveHotSLurker" Row="1" Column="0"/>
             <LayoutButtons Face="AP_HydraliskPassive" Type="Passive" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <!--            <LayoutButtons Face="AP_ImpalerDen" Type="AbilCmd" AbilCmd="AP_UpgradeToImpalerDen,0" Row="2" Column="1"/>-->
         <Radius value="1.5"/>
@@ -17099,6 +17108,7 @@
             <LayoutButtons Face="AP_BanelingHunterPassive" Type="Passive" Requirements="AP_HaveHotSHunter" Row="1" Column="0"/>
             <LayoutButtons Face="AP_BanelingSplitterlingPassive" Type="Passive" Requirements="AP_HotSHaveSplitterling" Row="1" Column="0"/>
             <LayoutButtons Face="AP_BanelingPassive" Type="Passive" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -17174,6 +17184,7 @@
             <LayoutButtons Face="AP_zergmissileweapons5" Type="AbilCmd" AbilCmd="AP_evolutionchamberresearch,12" Row="0" Column="1"/>
             <LayoutButtons Face="AP_SporeCrawlerPassive" Type="Passive" Requirements="AP_HotSHaveSporeCrawler" Row="1" Column="0"/>
             <LayoutButtons Face="AP_AberrationPassive" Type="Passive" Requirements="AP_HotSHaveAberration" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -18066,6 +18077,7 @@
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="que5CancelToSelection,0" Row="2" Column="4"/>
             <LayoutButtons Face="RallyEgg" Type="AbilCmd" AbilCmd="AP_RallyHatchery,1" Row="1" Column="3"/>
             <LayoutButtons Face="SetRallyPoint2" Type="AbilCmd" AbilCmd="AP_RallyHatchery,0" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="0"/>
             <LayoutButtons Face="AP_Queen" Type="AbilCmd" AbilCmd="AP_TrainQueen,0" Row="0" Column="1"/>
             <LayoutButtons Face="AP_RespawnZergling" Type="AbilCmd" AbilCmd="AP_ZerglingRespawn,Execute" Row="0" Column="4"/>
             <LayoutButtons Face="AP_SISCV" Type="AbilCmd" AbilCmd="AP_SICommandCenterTrain,Train1" Row="0" Column="2"/>
@@ -18159,6 +18171,7 @@
         <AttackTargetPriority value="11"/>
         <AbilArray Link="BuildInProgress"/>
         <AbilArray Link="AP_UpgradeToLair"/>
+        <AbilArray Link="AP_UpgradeHatchToHive"/>
         <AbilArray Link="AP_RallyHatchery"/>
         <AbilArray Link="AP_TrainQueen"/>
         <AbilArray Link="que5CancelToSelection"/>
@@ -18184,8 +18197,9 @@
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="que5CancelToSelection,CancelLast" Row="2" Column="4"/>
             <LayoutButtons Face="CancelMutateMorph" Type="AbilCmd" AbilCmd="AP_UpgradeToLair,Cancel" Row="2" Column="4"/>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
-            <LayoutButtons Face="Lair" Type="AbilCmd" AbilCmd="AP_UpgradeToLair,Execute" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_HatchToLairUpgradeable" Type="AbilCmd" AbilCmd="AP_UpgradeToLair,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="RallyEgg" Type="AbilCmd" AbilCmd="AP_RallyHatchery,Rally2" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="0"/>
             <LayoutButtons Face="AP_Queen" Type="AbilCmd" AbilCmd="AP_TrainQueen,Train1" Row="0" Column="1"/>
             <LayoutButtons Face="AP_SISCV" Type="AbilCmd" AbilCmd="AP_SICommandCenterTrain,Train1" Row="0" Column="2"/>
             <LayoutButtons Face="SetRallyPoint2" Type="AbilCmd" AbilCmd="AP_RallyHatchery,Rally1" Row="1" Column="4"/>
@@ -18254,6 +18268,7 @@
         <AttackTargetPriority value="11"/>
         <AbilArray Link="BuildInProgress"/>
         <AbilArray Link="AP_UpgradeToHive"/>
+        <AbilArray Link="AP_AutoMorphLairToHive"/>
         <AbilArray Link="AP_RallyHatchery"/>
         <AbilArray Link="AP_TrainQueen"/>
         <AbilArray Link="que5CancelToSelection"/>
@@ -18280,6 +18295,7 @@
             <LayoutButtons Face="AP_Hive" Type="AbilCmd" AbilCmd="AP_UpgradeToHive,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="RallyEgg" Type="AbilCmd" AbilCmd="AP_RallyHatchery,Rally2" Row="1" Column="3"/>
             <LayoutButtons Face="SetRallyPoint2" Type="AbilCmd" AbilCmd="AP_RallyHatchery,Rally1" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="0"/>
             <LayoutButtons Face="AP_Queen" Type="AbilCmd" AbilCmd="AP_TrainQueen,Train1" Row="0" Column="1"/>
             <LayoutButtons Face="AP_RespawnZergling" Type="AbilCmd" AbilCmd="AP_ZerglingRespawn,Execute" Row="0" Column="4"/>
             <LayoutButtons Face="AP_SISCV" Type="AbilCmd" AbilCmd="AP_SICommandCenterTrain,Train1" Row="0" Column="2"/>
@@ -21702,6 +21718,7 @@
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_UpgradeToGreaterSpireBroodlord,1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_GreaterSpireViper" Type="AbilCmd" AbilCmd="AP_UpgradeToGreaterSpireViper,0" Row="2" Column="0"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_UpgradeToGreaterSpireViper,1" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
@@ -21766,6 +21783,7 @@
             <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"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -21834,6 +21852,7 @@
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="AttackBuilding" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SpineCrawlerUproot" Type="AbilCmd" AbilCmd="AP_SpineCrawlerUproot,0" Row="2" Column="0"/>
@@ -21907,6 +21926,7 @@
             <LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegenMustBeRooted" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SpineCrawlerRoot" Type="AbilCmd" AbilCmd="AP_SpineCrawlerRoot,0" Row="2" Column="0"/>
@@ -21984,6 +22004,7 @@
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="AttackBuilding" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SporeCrawlerUproot" Type="AbilCmd" AbilCmd="AP_SporeCrawlerUproot,0" Row="2" Column="0"/>
@@ -22058,6 +22079,7 @@
             <LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegenMustBeRooted" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
             <LayoutButtons Face="AP_SporeCrawlerRoot" Type="AbilCmd" AbilCmd="AP_SporeCrawlerRoot,Execute" Row="2" Column="0"/>
@@ -22128,6 +22150,7 @@
             <LayoutButtons Face="AP_ZerglingPassive" Type="Passive" Row="1" Column="0"/>
             <LayoutButtons Face="AP_SpineCrawlerPassive" Type="Passive" Requirements="AP_HotSHaveSpineCrawlerSpawningPool" Row="1" Column="1"/>
             <LayoutButtons Face="AP_QueenPassive" Type="Passive" Requirements="AP_HotSHaveQueen" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
@@ -23865,6 +23888,7 @@
             <LayoutButtons Face="AP_UltraliskPassive" Type="Passive" Row="1" Column="0"/>
             <LayoutButtons Face="AP_TyrannozorPassive" Type="Passive" Row="1" Column="1"/>
             <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_ZergStructureRapidRegen" Type="Passive" Requirements="AP_HaveZergStructureRapidRegen" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1.5"/>
         <SeparationRadius value="1.5"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index b21755ea7..7c0945f18 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -16260,4 +16260,20 @@
         <AffectedUnitArray value="AP_K5KerriganBurrowed"/>
     </CUpgrade>
     <CUpgrade id="AP_KerriganImmobilizationWave"/>
+    <CUpgrade id="AP_HiveClusterMaturation">
+        <Flags index="UpgradeCheat" value="0"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_Hive,CostResource[Minerals]" Value="200"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_Hive,CostResource[Vespene]" Value="150"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_UpgradeToLair,CmdButtonArray[Execute].DefaultButtonFace" Value="AP_Hive"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_UpgradeToLair,InfoArray[0].Unit" Value="AP_Hive"/>
+        <EffectArray Operation="Set" Reference="Button,AP_HatchToLairUpgradeable,Name" Value="Button/Name/AP_Hive"/>
+        <EffectArray Operation="Set" Reference="Button,AP_HatchToLairUpgradeable,Tooltip" Value="Button/Tooltip/AP_HatchToHive"/>
+        <EffectArray Operation="Set" Reference="Button,AP_HatchToLairUpgradeable,Hotkey" Value="Button/Hotkey/AP_Hive"/>
+        <EffectArray Operation="Set" Reference="Button,AP_HatchToLairUpgradeable,AlertIcon" Value="Assets\Textures\btn-building-zerg-hive.dds"/>
+        <EffectArray Operation="Set" Reference="Button,AP_HatchToLairUpgradeable,Icon" Value="Assets\Textures\btn-building-zerg-hive.dds"/>
+        <AffectedUnitArray value="AP_Hatchery"/>
+        <AffectedUnitArray value="AP_Lair"/>
+        <AffectedUnitArray value="AP_Hive"/>
+    </CUpgrade>
+    <CUpgrade id="AP_ZergStructureRapidRegen" />
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
index b13e65fe8..01c337811 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
@@ -3888,6 +3888,61 @@ bool lib15EF4C78_gf_AP_Player_isPlayerInCinematicMode (int lp_player) {
 }
 
 // Triggers
+//--------------------------------------------------------------------------------------------------
+// Trigger: Apply Zerg Structure Rapid Regen
+//--------------------------------------------------------------------------------------------------
+bool lib15EF4C78_gt_ApplyZergStructureRapidRegen_Func (bool testConds, bool runActions) {
+    // Automatic Variable Declarations
+    unitgroup autoD2A1AF36_g;
+    int autoD2A1AF36_u;
+    unit autoD2A1AF36_var;
+    unitgroup autoF5B11B43_g;
+    int autoF5B11B43_u;
+    unit autoF5B11B43_var;
+
+    // Conditions
+    if (testConds) {
+        if (!((EventUpgradeName() == "AP_ZergStructureRapidRegen"))) {
+            return false;
+        }
+    }
+
+    // Actions
+    if (!runActions) {
+        return true;
+    }
+
+    if ((EventUpgradeLevelDelta() >= 1)) {
+        PlayerAddResponse(EventPlayer(), "AP_ZergStructureRapidRegen");
+        autoD2A1AF36_g = UnitGroup(null, EventPlayer(), RegionEntireMap(), UnitFilter((1 << c_targetFilterBiological) | (1 << c_targetFilterStructure), 0, (1 << c_targetFilterMechanical) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+        autoD2A1AF36_u = UnitGroupCount(autoD2A1AF36_g, c_unitCountAll);
+        for (;; autoD2A1AF36_u -= 1) {
+            autoD2A1AF36_var = UnitGroupUnitFromEnd(autoD2A1AF36_g, autoD2A1AF36_u);
+            if (autoD2A1AF36_var == null) { break; }
+            UnitBehaviorAdd(autoD2A1AF36_var, "AP_ZergStructureRapidRegen", autoD2A1AF36_var, 1);
+        }
+    }
+
+    if ((EventUpgradeLevelDelta() <= -1)) {
+        PlayerRemoveResponse(EventPlayer(), "AP_ZergStructureRapidRegen");
+        autoF5B11B43_g = UnitGroup(null, EventPlayer(), RegionEntireMap(), UnitFilter((1 << c_targetFilterBiological) | (1 << c_targetFilterStructure), 0, (1 << c_targetFilterMechanical) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+        autoF5B11B43_u = UnitGroupCount(autoF5B11B43_g, c_unitCountAll);
+        for (;; autoF5B11B43_u -= 1) {
+            autoF5B11B43_var = UnitGroupUnitFromEnd(autoF5B11B43_g, autoF5B11B43_u);
+            if (autoF5B11B43_var == null) { break; }
+            UnitBehaviorRemove(autoF5B11B43_var, "AP_ZergStructureRapidRegen", 1);
+        }
+    }
+
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void lib15EF4C78_gt_ApplyZergStructureRapidRegen_Init () {
+    lib15EF4C78_gt_ApplyZergStructureRapidRegen = TriggerCreate("lib15EF4C78_gt_ApplyZergStructureRapidRegen_Func");
+    TriggerAddEventUpgradeLevelChanged(lib15EF4C78_gt_ApplyZergStructureRapidRegen, c_playerAny);
+}
+
 //--------------------------------------------------------------------------------------------------
 // Trigger: Stukov_InfestedBunkerRegister
 //--------------------------------------------------------------------------------------------------
@@ -9168,6 +9223,7 @@ void lib15EF4C78_gt_EmitTransformerLand_Init () {
 }
 
 void lib15EF4C78_InitTriggers () {
+    lib15EF4C78_gt_ApplyZergStructureRapidRegen_Init();
     lib15EF4C78_gt_Stukov_InfestedBunkerRegister_Init();
     lib15EF4C78_gt_Stukov_InfestedBunkerInitialSpawn_Init();
     lib15EF4C78_gt_Stukov_InfestedBunkerAutoLoad_Init();
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy
index 6969f8869..aa99cb401 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy
@@ -413,6 +413,7 @@ void lib15EF4C78_gf_LotV_HideCampaignTeaching ();
 bool lib15EF4C78_gf_AP_Player_isPlayerInCinematicMode (int lp_player);
 
 // Trigger Declarations
+trigger lib15EF4C78_gt_ApplyZergStructureRapidRegen;
 trigger lib15EF4C78_gt_Stukov_InfestedBunkerRegister;
 trigger lib15EF4C78_gt_Stukov_InfestedBunkerInitialSpawn;
 trigger lib15EF4C78_gt_Stukov_InfestedBunkerAutoLoad;
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
index b4e31fa5b..6ca806104 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Triggers
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
@@ -24,8 +24,291 @@
             <Item Type="Category" Library="15EF4C78" Id="1C54F153"/>
         </Root>
         <Element Type="Category" Id="31663303">
+            <Item Type="Trigger" Library="15EF4C78" Id="D12FF437"/>
             <Item Type="Category" Library="15EF4C78" Id="64F68847"/>
         </Element>
+        <Element Type="Trigger" Id="D12FF437">
+            <Internal/>
+            <Event Type="FunctionCall" Library="15EF4C78" Id="0DAA07C1"/>
+            <Condition Type="FunctionCall" Library="15EF4C78" Id="D22E71B5"/>
+            <Action Type="FunctionCall" Library="15EF4C78" Id="5D16EDF2"/>
+            <Action Type="FunctionCall" Library="15EF4C78" Id="763DECDA"/>
+        </Element>
+        <Element Type="FunctionCall" Id="0DAA07C1">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="1F2B8F70"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="560933C6"/>
+        </Element>
+        <Element Type="Param" Id="560933C6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="0C5438BA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
+        </Element>
+        <Element Type="FunctionCall" Id="D22E71B5">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="03D129EC"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="95598109"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="0EE7D31B"/>
+        </Element>
+        <Element Type="Param" Id="03D129EC">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="9CD8A0A1"/>
+        </Element>
+        <Element Type="FunctionCall" Id="9CD8A0A1">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="F161CEC9"/>
+        </Element>
+        <Element Type="Param" Id="95598109">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+        </Element>
+        <Element Type="Param" Id="0EE7D31B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+            <Value>AP_ZergStructureRapidRegen</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionCall" Id="5D16EDF2">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="537054FD"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="D2A1AF36"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="915F2032"/>
+        </Element>
+        <Element Type="FunctionCall" Id="537054FD">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="22A8F646"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="7058F94C"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="209C1A3B"/>
+        </Element>
+        <Element Type="Param" Id="7058F94C">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="F238A523"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="197DEC02"/>
+        </Element>
+        <Element Type="FunctionCall" Id="197DEC02">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000053"/>
+        </Element>
+        <Element Type="Param" Id="209C1A3B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4ED92DC7"/>
+            <Value>AP_ZergStructureRapidRegen</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="PlayerResponse"/>
+        </Element>
+        <Element Type="FunctionCall" Id="D2A1AF36">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="C9A4A718"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="5639F2CC"/>
+        </Element>
+        <Element Type="Param" Id="C9A4A718">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="439A773A"/>
+        </Element>
+        <Element Type="FunctionCall" Id="439A773A">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="2D924636"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="BFA3E4DD"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="C7D360B7"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="89335C47"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="6C8F5A27"/>
+        </Element>
+        <Element Type="Param" Id="2D924636">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000231"/>
+        </Element>
+        <Element Type="Param" Id="BFA3E4DD">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="17DD3475"/>
+        </Element>
+        <Element Type="FunctionCall" Id="17DD3475">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000053"/>
+        </Element>
+        <Element Type="Param" Id="C7D360B7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="4F60A840"/>
+        </Element>
+        <Element Type="FunctionCall" Id="4F60A840">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
+        </Element>
+        <Element Type="Param" Id="89335C47">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
+            <Value>Biological,Structure;Mechanical,Missile,Dead,Hidden</Value>
+            <ValueType Type="unitfilter"/>
+        </Element>
+        <Element Type="Param" Id="6C8F5A27">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
+        </Element>
+        <Element Type="FunctionCall" Id="5639F2CC">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C47C0524"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="DD66261B"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="A606C31D"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="5B6435D4"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="9BA769B1"/>
+        </Element>
+        <Element Type="Param" Id="DD66261B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="6F19F7ED"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="A606C31D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="9A6B09E3"/>
+            <Value>AP_ZergStructureRapidRegen</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Behavior"/>
+        </Element>
+        <Element Type="Param" Id="5B6435D4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="2E722704"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="C46CCF29"/>
+        </Element>
+        <Element Type="FunctionCall" Id="C46CCF29">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+        </Element>
+        <Element Type="Param" Id="9BA769B1">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="02BBDCC1"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="E1B2C1A1"/>
+        </Element>
+        <Element Type="FunctionCall" Id="E1B2C1A1">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+        </Element>
+        <Element Type="FunctionCall" Id="915F2032">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="B2B6599E"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="A8084A56"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="3F90B066"/>
+        </Element>
+        <Element Type="Param" Id="B2B6599E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="0E89A082"/>
+        </Element>
+        <Element Type="FunctionCall" Id="0E89A082">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="81F49744"/>
+        </Element>
+        <Element Type="Param" Id="A8084A56">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="B128CB9A"/>
+        </Element>
+        <Element Type="Param" Id="3F90B066">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="763DECDA">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="EF010414"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="F5B11B43"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="CA3E6F4F"/>
+        </Element>
+        <Element Type="FunctionCall" Id="EF010414">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="6914EAD1"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="00272DFC"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="6F9399EF"/>
+        </Element>
+        <Element Type="Param" Id="00272DFC">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7FEB9719"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="56431122"/>
+        </Element>
+        <Element Type="FunctionCall" Id="56431122">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000053"/>
+        </Element>
+        <Element Type="Param" Id="6F9399EF">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="9F091543"/>
+            <Value>AP_ZergStructureRapidRegen</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="PlayerResponse"/>
+        </Element>
+        <Element Type="FunctionCall" Id="F5B11B43">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="2349AE8E"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="28842940"/>
+        </Element>
+        <Element Type="Param" Id="2349AE8E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="14C42D30"/>
+        </Element>
+        <Element Type="FunctionCall" Id="14C42D30">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="AC236F00"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="CDEE05C3"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="63DA057B"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="7F1F68DA"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="5225CF9E"/>
+        </Element>
+        <Element Type="Param" Id="AC236F00">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000231"/>
+        </Element>
+        <Element Type="Param" Id="CDEE05C3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="29AE94CE"/>
+        </Element>
+        <Element Type="FunctionCall" Id="29AE94CE">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000053"/>
+        </Element>
+        <Element Type="Param" Id="63DA057B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="B2380122"/>
+        </Element>
+        <Element Type="FunctionCall" Id="B2380122">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
+        </Element>
+        <Element Type="Param" Id="7F1F68DA">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
+            <Value>Biological,Structure;Mechanical,Missile,Dead,Hidden</Value>
+            <ValueType Type="unitfilter"/>
+        </Element>
+        <Element Type="Param" Id="5225CF9E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
+        </Element>
+        <Element Type="FunctionCall" Id="28842940">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="09840835"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="930C62EC"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="782981A9"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="480FA5B9"/>
+        </Element>
+        <Element Type="Param" Id="930C62EC">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="A45406E1"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="782981A9">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="EB47C731"/>
+            <Value>AP_ZergStructureRapidRegen</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Behavior"/>
+        </Element>
+        <Element Type="Param" Id="480FA5B9">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="A6600060"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="E4D1CFCF"/>
+        </Element>
+        <Element Type="FunctionCall" Id="E4D1CFCF">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
+        </Element>
+        <Element Type="FunctionCall" Id="CA3E6F4F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="3725713E"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="A537089E"/>
+            <Parameter Type="Param" Library="15EF4C78" Id="3C826328"/>
+        </Element>
+        <Element Type="Param" Id="3725713E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+            <FunctionCall Type="FunctionCall" Library="15EF4C78" Id="EB737FBB"/>
+        </Element>
+        <Element Type="FunctionCall" Id="EB737FBB">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="81F49744"/>
+        </Element>
+        <Element Type="Param" Id="A537089E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="E123C832"/>
+        </Element>
+        <Element Type="Param" Id="3C826328">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+            <Value>-1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Category" Id="64F68847">
             <Item Type="Category" Library="15EF4C78" Id="7C7FE694"/>
             <Item Type="Category" Library="15EF4C78" Id="841EBD79"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 321527afb..1a7c67e3b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -662,6 +662,7 @@ Behavior/Name/AP_WraithCloak=Cloak
 Behavior/Name/AP_WraithMengskResonatingFeedbackInterference=Stunned
 Behavior/Name/AP_ZealotPurifierRevive=Reconstruction
 Behavior/Name/AP_ZealotPurifierReviveSupressed=Recently Reconstructed
+Behavior/Name/AP_ZergStructureRapidRegen=Macroscopic Recuperation
 Behavior/Name/AP_ZerglingArmorShredTarget=Armor Negated
 Behavior/Name/AP_ZerglingFury1=Fury
 Behavior/Name/AP_ZerglingFury2=Fury
@@ -843,6 +844,7 @@ Behavior/Tooltip/AP_WraithCloak=This unit is cloaked and will only be revealed b
 Behavior/Tooltip/AP_WraithMengskResonatingFeedbackInterference=Target is currently stunned and unable to use any abilities.
 Behavior/Tooltip/AP_ZealotPurifierRevive=This unit will be revived upon death.
 Behavior/Tooltip/AP_ZealotPurifierReviveSupressed=This unit has been recently reconstructed and cannot be revived again.
+Behavior/Tooltip/AP_ZergStructureRapidRegen=This structure has not been damaged recently, and is rapidly recovering health.
 Behavior/Tooltip/AP_ZerglingArmorShredTarget=This unit's armor has been reduced to 0.
 Behavior/Tooltip/AP_ZerglingFury1=Attacking <d ref="(Behavior,AP_ZerglingFury1,Modification.AttackSpeedMultiplier - 1) * 100"/>% faster.
 Behavior/Tooltip/AP_ZerglingFury2=Attacking <d ref="(Behavior,AP_ZerglingFury2,Modification.AttackSpeedMultiplier - 1) * 100"/>% faster.
@@ -2017,6 +2019,7 @@ Button/Name/AP_ZergBuild=Basic Mutation
 Button/Name/AP_ZergBuildAdvanced=Advanced Mutation
 Button/Name/AP_ZergCreepStomach=Creep Stomach
 Button/Name/AP_ZergExcavatingClaws=Excavating Claws
+Button/Name/AP_ZergStructureRapidRegen=Macroscopic Recuperation
 Button/Name/AP_ZergMercBroodWar=Brood War Strains
 Button/Name/AP_ZergMercInfested=Infested Units
 Button/Name/AP_ZergMercSC2=Modern Strains
@@ -2549,6 +2552,7 @@ Button/Tooltip/AP_HireSiegeBreakersPH=<c val="ff4040">Contract required. Visit t
 Button/Tooltip/AP_HireSpartanCompany=Request 2 Spartan Company Mercenaries.<n/><n/>UED veterans using advanced Goliath prototypes.
 Button/Tooltip/AP_HireSpartanCompanyPH=<c val="ff4040">Contract required. Visit the Cantina on the Hyperion to purchase.</c>
 Button/Tooltip/AP_Hive=Further evolved version of the Hatchery that allows additional upgrades and structures to be produced. Also spawns all Zerg units and receives gathered resources.
+Button/Tooltip/AP_HatchToHive=Evolve this Hatchery directly to a Hive, allowing additional upgrades and structures to be produced. Also spawns all Zerg units and receives gathered resources.
 Button/Tooltip/AP_HiveMindEmulator=Defensive structure. Can permanently Mind Control Zerg units.
 Button/Tooltip/AP_HostileEnvironmentAdaptation=Increases SCV life by 15 and attack speed slightly.
 Button/Tooltip/AP_HotSBioPlasmidDischarge=Deals <d ref="Effect,AP_HotSBioPlasmidDischargeDamage,Amount"/> damage to a target unit or structure from long range.
@@ -3482,6 +3486,7 @@ Button/Tooltip/AP_ZergBuild=A list of basic structures.
 Button/Tooltip/AP_ZergBuildAdvanced=A list of advanced structures.
 Button/Tooltip/AP_ZergCreepStomach=Zerg structures can now survive off creep. Defensive structures can additionally root themselves without requiring creep.
 Button/Tooltip/AP_ZergExcavatingClaws=Zerg defensive structures root faster, and have increased movement speed, particularly when off creep.
+Button/Tooltip/AP_ZergStructureRapidRegen=Structures will begin to rapidly recover health while on creep and out of combat. Applies only to structures which are biological and non-mechanical.
 Button/Tooltip/AP_ZergMercBroodWar=Show available <c val="ffff8a">Brood War</c> unit strains.
 Button/Tooltip/AP_ZergMercInfested=Show available <c val="ffff8a">Infested</c> type units.
 Button/Tooltip/AP_ZergMercSC2=Show available <c val="ffff8a">Modern</c> unit strains.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 81753d577..3ca224d97 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -634,6 +634,7 @@ Trigger/Name/lib_15EF4C78_C88F5911=MedivacShockDivisionDrop
 Trigger/Name/lib_15EF4C78_C970113D=AP_Player_setHolodecoyWeapon
 Trigger/Name/lib_15EF4C78_CD08D748=Tech Reactor swap to AP_Factory
 Trigger/Name/lib_15EF4C78_CDF98655=PM_SoATargetingPurifierBeamOff
+Trigger/Name/lib_15EF4C78_D12FF437=Apply Zerg Structure Rapid Regen
 Trigger/Name/lib_15EF4C78_D42F8E47=AP_Player_ZS_KerriganDied
 Trigger/Name/lib_15EF4C78_D750DF51=Stukov_InfestedBunkerUnloadRally
 Trigger/Name/lib_15EF4C78_D7BD5808=Reactor swap to AP_Starport

From bd0ae6286c730bc0150372aa124f643c25d911fb Mon Sep 17 00:00:00 2001
From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:14:30 -0400
Subject: [PATCH 2/2] triggers for zerg structure items

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  16 +++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   2 +
 .../ArchipelagoTriggers.SC2Mod/DocumentHeader | Bin 156 -> 156 bytes
 .../GameText.version                          | Bin 44 -> 44 bytes
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      |  78 +++++++++++++++++-
 .../Triggers.version                          | Bin 44 -> 44 bytes
 .../LocalizedData/TriggerStrings.txt          |   4 +
 7 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index f4626d70f..b06c508a5 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1232,8 +1232,8 @@ void libABFE498B_gf_AP_Triggers_unlockZergEvolutionPit (int lp_player, int lp_bi
         libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
         libABFE498B_gf_AP_Triggers_Zerg_CreepStomach, // 10
         libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws, // 11
-        ap_triggers_PlayerConsumer_sig, // 12
-        ap_triggers_PlayerConsumer_sig, // 13
+        libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation, // 12
+        libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation, // 13
         ap_triggers_PlayerConsumer_sig, // 14
         ap_triggers_PlayerConsumer_sig, // 15
         ap_triggers_PlayerConsumer_sig, // 16
@@ -6761,6 +6761,18 @@ void libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergExcavatingClaws", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_HiveClusterMaturation", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergStructureRapidRegen", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index cb312daba..dfe586fec 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -687,6 +687,8 @@ void libABFE498B_gf_AP_Triggers_Zerg_VespeneEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_MalignantCreep (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_CreepStomach (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganHeroicFortitude (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganLeapingStrike (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
index f52c11a378e8e7246b10223aed280ca931b6bb08..dd09af0aa7e1770fd97685f254279a96112838ec 100644
GIT binary patch
delta 32
gcmbQkIEQh9jPM4ouX-TN00qnp3=;#yCc1_L0F!+O+W-In

delta 32
gcmbQkIEQh9jBx77>=hu)00qnp3=;#yCc1_L0HZ?)qW}N^

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
index 417d5e50c13e7440fcdb65084c1a8da1b533a0f0..d7c4912d35253e66550c5aed7ec4c008f9f43e75 100644
GIT binary patch
delta 17
YcmdPVnV`TE$jrbnEn6m?k%55$03N~u?f?J)

delta 17
YcmdPVnV`TEz|6pqqbiZk$iTn=02^cic>n+a

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index e6744435a..5360c88a9 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4009,8 +4009,8 @@
                     libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
                     libABFE498B_gf_AP_Triggers_Zerg_CreepStomach, // 10
                     libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws, // 11
-                    ap_triggers_PlayerConsumer_sig, // 12
-                    ap_triggers_PlayerConsumer_sig, // 13
+                    libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation, // 12
+                    libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation, // 13
                     ap_triggers_PlayerConsumer_sig, // 14
                     ap_triggers_PlayerConsumer_sig, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
@@ -54638,6 +54638,8 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="FA0C159C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6214A1C3"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="89082B8D"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="9CD24A02"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="F36C2964"/>
         </Element>
         <Element Type="FunctionDef" Id="D421BE14">
             <FlagAction/>
@@ -55146,6 +55148,78 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="9CD24A02">
+            <Identifier>AP_Triggers_Zerg_HiveClusterMaturation</Identifier>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1F3F9DE8"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6A196A8B"/>
+        </Element>
+        <Element Type="ParamDef" Id="1F3F9DE8">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="3E53DB9E"/>
+        </Element>
+        <Element Type="Param" Id="3E53DB9E">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="6A196A8B">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="77818397"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9562E908"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6DBA7955"/>
+        </Element>
+        <Element Type="Param" Id="77818397">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1F3F9DE8"/>
+        </Element>
+        <Element Type="Param" Id="9562E908">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_HiveClusterMaturation</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="6DBA7955">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="F36C2964">
+            <Identifier>AP_Triggers_Zerg_MacroscopicRecuperation</Identifier>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="908BD5B9"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F0EA16A8"/>
+        </Element>
+        <Element Type="ParamDef" Id="908BD5B9">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="3D6493D3"/>
+        </Element>
+        <Element Type="Param" Id="3D6493D3">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="F0EA16A8">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E09F34C8"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="19EDD93B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9EE72BD1"/>
+        </Element>
+        <Element Type="Param" Id="E09F34C8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="908BD5B9"/>
+        </Element>
+        <Element Type="Param" Id="19EDD93B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_ZergStructureRapidRegen</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="9EE72BD1">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Category" Id="264418B4">
             <Item Type="FunctionDef" Library="ABFE498B" Id="D81959AC"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="17839D05"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
index 7cb90c9d8c05f966b95452ae173017ccf8982eda..86838e2acf311259ddbd4c5f2c4136d257233b20 100644
GIT binary patch
delta 17
YcmdPVnV`Va!@<B1mm`zT$iTn=03ZYc_W%F@

delta 17
YcmdPVnV`Va#lgUkqbiZk$iTn=03K5UxBvhE

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index d0af3fb22..e09224370 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -621,6 +621,7 @@ FunctionDef/Name/lib_ABFE498B_9C290257=AP_Triggers_Protoss_unlockOracleStealthDr
 FunctionDef/Name/lib_ABFE498B_9C3FA6C1=AP_Triggers_Terran_unlockMedicAdvancedMedicFacilities
 FunctionDef/Name/lib_ABFE498B_9C5845F9=AP_Triggers_Protoss_unlockSolarBombardment
 FunctionDef/Name/lib_ABFE498B_9C94445C=AP_Triggers_Terran_unlockSonOfKorhal
+FunctionDef/Name/lib_ABFE498B_9CD24A02=AP_Triggers_Zerg_HiveClusterMaturation
 FunctionDef/Name/lib_ABFE498B_9CE17053=AP_Triggers_Terran_unlockBattlecruiserOptimizedLogistics
 FunctionDef/Name/lib_ABFE498B_9CF140DB=AP_Triggers_Terran_unlockReaperResorceEfficiency
 FunctionDef/Name/lib_ABFE498B_9D916EDC=AP_Triggers_Terran_unlockMarauderProgressiveStimpack
@@ -902,6 +903,7 @@ FunctionDef/Name/lib_ABFE498B_F1DB7DA2=AP_Triggers_Terran_unlockBattlecruiserInt
 FunctionDef/Name/lib_ABFE498B_F1EE5A2F=AP_Triggers_Terran_unlockReaperKineticFoam
 FunctionDef/Name/lib_ABFE498B_F2A42013=AP_Triggers_Terran_unlockDominionTrooper
 FunctionDef/Name/lib_ABFE498B_F2E889AB=AP_Triggers_Zerg_CorruptorMonstrousResilience
+FunctionDef/Name/lib_ABFE498B_F36C2964=AP_Triggers_Zerg_MacroscopicRecuperation
 FunctionDef/Name/lib_ABFE498B_F3C18F49=AP_Triggers_Protoss_unlockVanguardMatterDispersion
 FunctionDef/Name/lib_ABFE498B_F412BCCF=AP_Triggers_Zerg_ConcentratedSpew
 FunctionDef/Name/lib_ABFE498B_F42EFE8F=AP_Triggers_Terran_unlockHellionThermiteFilaments
@@ -1047,6 +1049,7 @@ ParamDef/Name/lib_ABFE498B_1D202509=player
 ParamDef/Name/lib_ABFE498B_1D4A8FBD=level
 ParamDef/Name/lib_ABFE498B_1D669BFE=player
 ParamDef/Name/lib_ABFE498B_1F3C75B2=player
+ParamDef/Name/lib_ABFE498B_1F3F9DE8=player
 ParamDef/Name/lib_ABFE498B_1F471C41=bitArrayValue
 ParamDef/Name/lib_ABFE498B_1FA9B7E1=player
 ParamDef/Name/lib_ABFE498B_1FAEEAF8=player
@@ -1465,6 +1468,7 @@ ParamDef/Name/lib_ABFE498B_8F1069F3=player
 ParamDef/Name/lib_ABFE498B_8F40B939=player
 ParamDef/Name/lib_ABFE498B_8F71D318=onHard
 ParamDef/Name/lib_ABFE498B_900CF381=player
+ParamDef/Name/lib_ABFE498B_908BD5B9=player
 ParamDef/Name/lib_ABFE498B_90B53627=player
 ParamDef/Name/lib_ABFE498B_91292E8B=player
 ParamDef/Name/lib_ABFE498B_912FF53C=player