Merge pull request #320 from MatthewMarinets/mm/broodling_upgrade

Mm/broodling upgrade

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml

@@ -4413,6 +4413,27 @@
             </DeathResponse>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_ZergBuildingDies9">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <BuffFlags index="DisableWhileUnderConstruction" value="1"/>
+        <Modification>
+            <DeathResponse Chance="1" Effect="AP_ZergBuildingSpawnBroodling9Delay">
+                <Type index="Remove" value="0"/>
+            </DeathResponse>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_ZergBuildingDiesCrawler">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <Requirements value="AP_HaveZergBroodlingPacking"/>
+        <BuffFlags index="DisableWhileUnderConstruction" value="1"/>
+        <Modification>
+            <DeathResponse Chance="1" Effect="AP_ZergBuildingSpawnBroodlingCrawlerDelay">
+                <Type index="Remove" value="0"/>
+            </DeathResponse>
+        </Modification>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_ZergBuildingNotOnCreep">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>
         <InfoFlags index="Hidden" value="1"/>
@@ -5079,16 +5100,6 @@
         <Limit value="19"/>
         <ConjoinedLink value="SpawnLarvaConjoined"/>
     </CBehaviorSpawn>
-    <CBehaviorBuff id="AP_ZergBuildingDies9">
-        <InfoFlags index="Hidden" value="1"/>
-        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
-        <BuffFlags index="DisableWhileUnderConstruction" value="1"/>
-        <Modification>
-            <DeathResponse Chance="1" Effect="ZergBuildingSpawnBroodling9Delay">
-                <Type index="Remove" value="0"/>
-            </DeathResponse>
-        </Modification>
-    </CBehaviorBuff>
     <CBehaviorCreepSource id="AP_makeCreep8x6">
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml

@@ -6904,4 +6904,9 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-zerg-stukov-queenenergyregen.dds"/>
         <EditorCategories value="Race:Zerg"/>
     </CButton>
+    <CButton id="AP_ZergBroodlingPacking">
+        <Icon value="Assets\Textures\btn-ability-kerrigan-broodlingnest.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-kerrigan-broodlingnest.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
 </Catalog>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml

@@ -12666,6 +12666,36 @@
         <ExpireDelay value="0.5"/>
         <FinalEffect value="AP_ZergBuildingSpawnBroodling6"/>
     </CEffectCreatePersistent>
+    <CEffectCreateUnit id="AP_ZergBuildingSpawnBroodling9">
+        <EditorCategories value="Race:Zerg"/>
+        <WhichLocation Value="TargetPoint"/>
+        <CreateFlags index="Placement" value="0"/>
+        <SpawnOwner Value="Caster"/>
+        <SpawnEffect value="AP_BroodlingTimedLife"/>
+        <SpawnUnit value="AP_Broodling"/>
+        <SpawnCount value="9"/>
+    </CEffectCreateUnit>
+    <CEffectCreatePersistent id="AP_ZergBuildingSpawnBroodling9Delay">
+        <ValidatorArray value="CasterIsNotHidden"/>
+        <EditorCategories value="Race:Zerg"/>
+        <ExpireDelay value="0.5"/>
+        <FinalEffect value="AP_ZergBuildingSpawnBroodling9"/>
+    </CEffectCreatePersistent>
+    <CEffectCreateUnit id="AP_ZergBuildingSpawnBroodlingCrawler">
+        <EditorCategories value="Race:Zerg"/>
+        <WhichLocation Value="TargetPoint"/>
+        <CreateFlags index="Placement" value="0"/>
+        <SpawnOwner Value="Caster"/>
+        <SpawnEffect value="AP_BroodlingTimedLife"/>
+        <SpawnUnit value="AP_Broodling"/>
+        <SpawnCount value="4"/>
+    </CEffectCreateUnit>
+    <CEffectCreatePersistent id="AP_ZergBuildingSpawnBroodlingCrawlerDelay">
+        <ValidatorArray value="CasterIsNotHidden"/>
+        <EditorCategories value="Race:Zerg"/>
+        <ExpireDelay value="0.5"/>
+        <FinalEffect value="AP_ZergBuildingSpawnBroodlingCrawler"/>
+    </CEffectCreatePersistent>
     <CEffectDamage id="AP_HydraliskDenMorphFinishDummy"/>
     <CEffectApplyBehavior id="AP_SiegeTankSiegeModeProgressiveRangeInceaseAB">
         <Behavior value="AP_SiegeTankSiegeModeProgressiveRangeIncease"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml

@@ -4259,4 +4259,8 @@
         <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountBioMechanicalStockpilingCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveZergBroodlingPacking">
+        <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountZergBroodlingPackingCompleteOnly"/>
+    </CRequirement>
 </Catalog>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml

@@ -6945,4 +6945,8 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_BioMechanicalStockpiling" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountZergBroodlingPackingCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_ZergBroodlingPacking" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml

@@ -21851,14 +21851,16 @@
         <BehaviorArray Link="OnCreep"/>
         <BehaviorArray Link="AP_ZergBuildingNotOnCreep"/>
         <BehaviorArray Link="AP_CreepFrenzy13Crawler"/>
+        <BehaviorArray Link="AP_ZergBuildingDiesCrawler"/>
         <WeaponArray Link="AP_ImpalerTentacle" Turret="AP_SpineCrawler"/>
         <CardLayouts>
             <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_ZergBroodlingPacking" Type="Passive" Requirements="AP_HaveZergBroodlingPacking" Row="1" Column="2"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_SpineCrawlerUproot" Type="AbilCmd" AbilCmd="AP_SpineCrawlerUproot,0" Row="2" Column="0"/>
         </CardLayouts>
         <Radius value="0.875"/>
@@ -21922,6 +21924,7 @@
         <AbilArray Link="move"/>
         <AbilArray Link="AP_SpineCrawlerRoot"/>
         <BehaviorArray Link="AP_CreepFrenzy13Crawler"/>
+        <BehaviorArray Link="AP_ZergBuildingDiesCrawler"/>
         <WeaponArray Turret="AP_SpineCrawlerUprooted"/>
         <CardLayouts>
             <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
@@ -21931,8 +21934,9 @@
             <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_ZergBroodlingPacking" Type="Passive" Requirements="AP_HaveZergBroodlingPacking" Row="1" Column="2"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_SpineCrawlerRoot" Type="AbilCmd" AbilCmd="AP_SpineCrawlerRoot,0" Row="2" Column="0"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_SpineCrawlerRoot,1" Row="2" Column="4"/>
         </CardLayouts>
@@ -22003,14 +22007,16 @@
         <BehaviorArray Link="AP_ZergBuildingNotOnCreep"/>
         <BehaviorArray Link="UnderConstruction"/>
         <BehaviorArray Link="AP_CreepFrenzy13Crawler"/>
+        <BehaviorArray Link="AP_ZergBuildingDiesCrawler"/>
         <WeaponArray Link="AP_AcidSpew" Turret="AP_SporeCrawler"/>
         <CardLayouts>
             <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_ZergBroodlingPacking" Type="Passive" Requirements="AP_HaveZergBroodlingPacking" Row="1" Column="2"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_SporeCrawlerUproot" Type="AbilCmd" AbilCmd="AP_SporeCrawlerUproot,0" Row="2" Column="0"/>
             <LayoutButtons Face="Detector" Type="Passive" Requirements="NotUnderConstruction" Row="2" Column="3"/>
         </CardLayouts>
@@ -22075,6 +22081,7 @@
         <AbilArray Link="move"/>
         <AbilArray Link="AP_SporeCrawlerRoot"/>
         <BehaviorArray Link="AP_CreepFrenzy13Crawler"/>
+        <BehaviorArray Link="AP_ZergBuildingDiesCrawler"/>
         <WeaponArray Turret="AP_SporeCrawlerUprooted"/>
         <CardLayouts>
             <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
@@ -22084,8 +22091,9 @@
             <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_ZergBroodlingPacking" Type="Passive" Requirements="AP_HaveZergBroodlingPacking" Row="1" Column="2"/>
             <LayoutButtons Face="AP_ZergExcavatingClaws" Type="Passive" Requirements="AP_HaveZergExcavatingClaws" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_ZergCreepStomach" Type="Passive" Requirements="AP_HaveZergCreepStomach" Row="1" Column="4"/>
             <LayoutButtons Face="AP_SporeCrawlerRoot" Type="AbilCmd" AbilCmd="AP_SporeCrawlerRoot,Execute" Row="2" Column="0"/>
             <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_SporeCrawlerRoot,Cancel" Row="2" Column="4"/>
         </CardLayouts>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml

@@ -16698,7 +16698,7 @@
         <AffectedUnitArray value="AP_Lair"/>
         <AffectedUnitArray value="AP_Hive"/>
     </CUpgrade>
-    <CUpgrade id="AP_ZergStructureRapidRegen" />
+    <CUpgrade id="AP_ZergStructureRapidRegen"/>
     <CUpgrade id="AP_ViralPlasma"/>
     <CUpgrade id="AP_BioMechanicalStockpiling">
         <EffectArray Reference="Abil,AP_SIFactoryTrain,InfoArray[Train2].Charge.CountMax" Value="3"/>
@@ -16709,4 +16709,9 @@
         <AffectedUnitArray value="AP_SIFactory"/>
         <AffectedUnitArray value="AP_SIStarport"/>
     </CUpgrade>
+    <CUpgrade id="AP_ZergBroodlingPacking">
+        <EffectArray Reference="Effect,AP_ZergBuildingSpawnBroodling9,SpawnCount" Value="9"/>
+        <EffectArray Reference="Effect,AP_ZergBuildingSpawnBroodling6,SpawnCount" Value="6"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CUpgrade>
 </Catalog>

Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt

@@ -2080,6 +2080,7 @@ Button/Name/AP_ZealotPurifier=Warp in Sentinel
 Button/Name/AP_ZealotPurifierRevive=Reconstruction
 Button/Name/AP_ZealotShakuras=Warp in Centurion
 Button/Name/AP_ZealotShieldCapacity=Shield Capacity
+Button/Name/AP_ZergBroodlingPacking=Broodling Packing
 Button/Name/AP_ZergBuild=Basic Mutation
 Button/Name/AP_ZergBuildAdvanced=Advanced Mutation
 Button/Name/AP_ZergCreepStomach=Creep Stomach
@@ -3541,8 +3542,8 @@ Button/Tooltip/AP_WrathwalkerAerialTracking=Allows the Wrathwalker to attack air
 Button/Tooltip/AP_WrathwalkerLongRangeChargedBlast=Increases Charged Blast weapon range by 1.
 Button/Tooltip/AP_YamatoGun=Blasts a target with a devastating plasma cannon, causing 300 damage.
 Button/Tooltip/AP_YamatoGunMengsk=Blasts a target with a devastating plasma cannon, causing <d ref="Effect,AP_BattlecruiserMengskYamatoDamage,Amount"/> damage.
-Button/Tooltip/AP_SummonYggdrasil=Summons a Yggdrasil. A massive overlord that gives more supply and has the ability to transport buildings.
-Button/Tooltip/AP_Yggdrasil=Massive variant of the Overlord from the Brood War. Grants significantly more supply than an Overlord, and is able to consume friendly structures and rebuild them.
+Button/Tooltip/AP_SummonYggdrasil=Summons a Yggdrasil. A massive overlord that gives more supply and has the ability to transport buildings and ground units.
+Button/Tooltip/AP_Yggdrasil=Massive variant of the Overlord from the Brood War. Grants significantly more supply than an Overlord, and is able to consume friendly structures and rebuild them. Can transport ground units.
 Button/Tooltip/AP_YggdrasilAssimilate=Absorbs the friendly zerg structure's biomass, destroying the structure and storing it's essence in the Yggdrasil. The Yggrdasil can recast this ability to build the structure at a reduced time and free of cost. <n/><n/>Structures do not provide tech while their essence is in the Yggdrasil. This ability only works on structures that can be morphed from Drones.
 Button/Tooltip/AP_YggdrasilAutomatedExtractor=Mutated over a Vespene Geyser to allow automatic harvesting of vespene gas.
 Button/Tooltip/AP_YggdrasilEvolutionChamber=Contains upgrades for Zerg ground units. <n/><n/><c val="ffff8a">Enables:</c><n/>- Spore Crawlers from Drones
@@ -3571,6 +3572,7 @@ Button/Tooltip/AP_ZealotPurifier=Purifier Faction<n/>Powerful melee warrior. Has
 Button/Tooltip/AP_ZealotPurifierRevive=Revives the Sentinel when killed. This effect can only occur once every <d ref="Behavior,AP_ZealotPurifierReviveSupressed,Cost.Cooldown.TimeStart"/> seconds.
 Button/Tooltip/AP_ZealotShakuras=Nerazim Faction<n/>Powerful melee warrior. Has Shadow Charge and Darkcoil abilities.<n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_ZealotShieldCapacity=Increases Shields by 30.
+Button/Tooltip/AP_ZergBroodlingPacking=This structure releases additional broodlings on death.
 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.

Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy

@@ -1235,7 +1235,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergEvolutionPit (int lp_player, int lp_bi
         libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation, // 12
         libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation, // 13
         libABFE498B_gf_AP_Triggers_Zerg_BioMechanicalStockpiling, // 14
-        ap_triggers_PlayerConsumer_sig, // 15
+        libABFE498B_gf_AP_Triggers_Zerg_unlockZergBroodlingPacking, // 15
         ap_triggers_PlayerConsumer_sig, // 16
         ap_triggers_PlayerConsumer_sig, // 17
         ap_triggers_PlayerConsumer_sig, // 18
@@ -6787,6 +6787,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_BioMechanicalStockpiling (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_BioMechanicalStockpiling", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_unlockZergBroodlingPacking (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergBroodlingPacking", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (int lp_player) {
     // Automatic Variable Declarations
     // Implementation

Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy

@@ -691,6 +691,7 @@ 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_BioMechanicalStockpiling (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_unlockZergBroodlingPacking (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);