v1.117

kaitokid222 · Apr 26, 2024 · da47400 · da47400
1 parent ce06642
commit da47400
Show file tree

Hide file tree

Showing 24 changed files with 1,272 additions and 1,383 deletions.
diff --git a/Base.SC2Data/GameData/AbilData.xml b/Base.SC2Data/GameData/AbilData.xml
@@ -50,6 +50,11 @@
             <Button Requirements=""/>
         </InfoArray>
     </CAbilBuild>
+    <CAbilEffectInstant id="SelectInfestedMarineSpawn">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Effect index="0" value="RemoveBomberSpawn"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="SelectInfestedMarineSpawn" Requirements="Bunkerupgraded"/>
+    </CAbilEffectInstant>
     <CAbilResearch id="TombstoneResearch">
         <EditorCategories value="AbilityorEffectType:Units"/>
         <InfoArray index="Research1" Time="20" Upgrade="TombstoneLevel2">
@@ -1214,6 +1219,10 @@
             <Resource index="Vespene" value="100"/>
             <Button DefaultButtonFace="ResearchInfestedSpeedUp" Requirements="ResearchInfestedSpeedUp"/>
         </InfoArray>
+        <InfoArray index="Research25" Time="30" Upgrade="ChaosPowerArmorUpgrade">
+            <Resource index="Vespene" value="200"/>
+            <Button DefaultButtonFace="ResearchChaosPowerArmorUpgrade" Requirements="ChaosPowerArmorUpgradeRequirement"/>
+        </InfoArray>
     </CAbilResearch>
     <CAbilMorph id="BurrowFireling">
         <AbilSetId value="BrwD"/>
@@ -1790,10 +1799,10 @@
         <CmdButtonArray index="Execute" DefaultButtonFace="MobileMode"/>
         <InfoArray index="0" Unit="SiegeTank22"/>
     </CAbilMorph>
-    <CAbilEffectInstant id="UpgradeBunker">
+    <CAbilEffectInstant id="SelectBomberSpawn">
         <EditorCategories value="AbilityorEffectType:Units"/>
         <Effect index="0" value="AddUpgradedBunker"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="UpgradeBunker" Requirements="Bunkerupgradeable"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="SelectBomberSpawn" Requirements="Bunkerupgradeable"/>
     </CAbilEffectInstant>
     <CAbilTrain id="ConstructionYardTrain">
         <EditorCategories value="AbilityorEffectType:Units"/>

diff --git a/Base.SC2Data/GameData/ActorData.xml b/Base.SC2Data/GameData/ActorData.xml
@@ -12134,6 +12134,6 @@
             <Image value="Assets\Icon\Wireframe Chaos Lord.dds"/>
         </Wireframe>
         <WireframeShieldColor value="255,0,128,0"/>
-        <Scale value="1.300000"/>
+        <Scale value="1.450000"/>
     </CActorUnit>
 </Catalog>
diff --git a/Base.SC2Data/GameData/BehaviorData.xml b/Base.SC2Data/GameData/BehaviorData.xml
@@ -313,22 +313,22 @@
         <InfoIcon value="Assets\Textures\btn-doodad-zerg-ancientmeat.dds"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
         <Modification>
-            <VitalMaxArray index="Life" value="25"/>
+            <VitalMaxArray index="Life" value="35"/>
         </Modification>
     </CBehaviorBuff>
     <CBehaviorBuff id="ConsumedBlood2">
         <BehaviorFlags index="Permanent" value="1"/>
         <InfoIcon value="Assets\Textures\btn-doodad-zerg-ancientmeat.dds"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
         <Modification>
-            <VitalRegenArray index="Life" value="1"/>
+            <VitalRegenArray index="Life" value="2.5"/>
         </Modification>
     </CBehaviorBuff>
     <CBehaviorBuff id="ConsumedBlood3">
         <BehaviorFlags index="Permanent" value="1"/>
         <InfoIcon value="Assets\Textures\btn-doodad-zerg-ancientmeat.dds"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
-        <Modification MoveSpeedBonus="0.3007"/>
+        <Modification MoveSpeedBonus="0.6015"/>
     </CBehaviorBuff>
     <CBehaviorBuff id="BanelingCountDummyStack">
         <InfoFlags index="Hidden" value="1"/>

diff --git a/Base.SC2Data/GameData/ButtonData.xml b/Base.SC2Data/GameData/ButtonData.xml
@@ -14,6 +14,14 @@
         <EditorCategories value="Race:Terran"/>
     </CButton>
     <CButton id="EmpoweredShadowCannon" parent="CButtonKeiron" Icon="Assets\Textures\btn-ability-keiron-convergence.dds"/>
+    <CButton id="ResearchChaosPowerArmorUpgrade">
+        <Icon value="assets\icon\ICON CSM Armor Lord.dds"/>
+    </CButton>
+    <CButton id="SelectInfestedMarineSpawn">
+        <Icon value="Assets\Textures\btn-unit-zerg-infestedmarine.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-zerg-infestedmarine.dds"/>
+        <EditorCategories value="Race:Zerg"/>
+    </CButton>
     <CButton id="StoptheRain">
         <Icon value="Assets\Textures\btn-minimap-toggleterrain.dds"/>
         <AlertIcon value="Assets\Textures\btn-minimap-toggleterrain.dds"/>
@@ -758,7 +766,7 @@
         <Icon value="Assets\Textures\btn-unit-zerg-infestedcolonist.dds"/>
         <AlertIcon value="Assets\Textures\btn-unit-zerg-infestedcolonist.dds"/>
     </CButton>
-    <CButton id="UpgradeBunker">
+    <CButton id="SelectBomberSpawn">
         <Icon value="Assets\Textures\btn-unit-zerg-volatileinfested.dds"/>
         <AlertIcon value="Assets\Textures\btn-unit-zerg-volatileinfested.dds"/>
         <EditorCategories value="Race:Zerg"/>

diff --git a/Base.SC2Data/GameData/EffectData.xml b/Base.SC2Data/GameData/EffectData.xml
@@ -6,6 +6,9 @@
         <Amount value="100"/>
         <Death value="Blast"/>
     </CEffectDamage>
+    <CEffectSet id="RemoveBomberSpawn">
+        <EditorCategories value=""/>
+    </CEffectSet>
     <CEffectEnumArea id="AnalysisTerminalAuraSA">
         <EditorCategories value=""/>
         <SearchFilters value="Structure;Neutral,Enemy"/>
@@ -5905,7 +5908,7 @@
     <CEffectDamage id="DesecratedBolter" parent="DU_WEAP">
         <EditorCategories value="Race:Terran"/>
         <Kind value="Ranged"/>
-        <Amount value="7"/>
+        <Amount value="8"/>
     </CEffectDamage>
     <CEffectSet id="ChaosPowerSwordEffectSet">
         <EditorCategories value="Race:Zerg"/>

diff --git a/Base.SC2Data/GameData/RequirementData.xml b/Base.SC2Data/GameData/RequirementData.xml
@@ -7,6 +7,10 @@
     <CRequirement id="HaveUmbraShadowCannons">
         <NodeArray index="Use" Link="CountUpgradeEmpowerShadowCannonCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="ChaosPowerArmorUpgradeRequirement">
+        <NodeArray index="Use" Link="CountUpgradeTier2EquipmentCompleteOnly729820030"/>
+        <NodeArray index="Show" Link="NotCountUpgradeChaosPowerArmorUpgradeQueuedOrBetter"/>
+    </CRequirement>
     <CRequirement id="UnlockUmbraShadowCannonRequirement">
         <NodeArray index="Use" Link="CountUpgradeTombstoneLevel2CompleteOnly"/>
         <NodeArray index="Show" Link="NotCountUpgradeEmpowerShadowCannonQueuedOrBetter"/>

diff --git a/Base.SC2Data/GameData/RequirementNodeData.xml b/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -593,6 +593,11 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="CasualTraderImprovement" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="CountUpgradeChaosPowerArmorUpgradeQueuedOrBetter">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <Count Link="ChaosPowerArmorUpgrade" State="QueuedOrBetter"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="CountUpgradeChemicalPlantCompleteOnly1337995533">
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="ChemicalPlant" State="CompleteOnly"/>
@@ -659,12 +664,10 @@
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="CountUpgradeEmpowerShadowCannonCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
-        <Tooltip value="RequirementNode/Tooltip/##id##"/>
         <Count Link="EmpowerShadowCannon" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="CountUpgradeEmpowerShadowCannonQueuedOrBetter">
         <Flags index="TechTreeCheat" value="0"/>
-        <Tooltip value="RequirementNode/Tooltip/##id##"/>
         <Count Link="EmpowerShadowCannon" State="QueuedOrBetter"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="CountUpgradeEnableMineralProductionCompleteOnly">
@@ -1914,6 +1917,10 @@
     <CRequirementNot id="NotCountUpgradeBase6DeadCompleteOnly">
         <OperandArray index="0" value="CountUpgradeBase6DeadCompleteOnly"/>
     </CRequirementNot>
+    <CRequirementNot id="NotCountUpgradeChaosPowerArmorUpgradeQueuedOrBetter">
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <OperandArray index="0" value="CountUpgradeChaosPowerArmorUpgradeQueuedOrBetter"/>
+    </CRequirementNot>
     <CRequirementNot id="NotCountUpgradeChemicalPlantQueuedOrBetter">
         <OperandArray index="0" value="CountUpgradeChemicalPlantQueuedOrBetter"/>
     </CRequirementNot>
@@ -1939,7 +1946,6 @@
         <OperandArray index="0" value="CountUpgradeEliteScopeQueuedOrBetter"/>
     </CRequirementNot>
     <CRequirementNot id="NotCountUpgradeEmpowerShadowCannonQueuedOrBetter">
-        <Tooltip value="RequirementNode/Tooltip/##id##"/>
         <OperandArray index="0" value="CountUpgradeEmpowerShadowCannonQueuedOrBetter"/>
     </CRequirementNot>
     <CRequirementNot id="NotCountUpgradeEnableMineralProductionQueuedOrBetter">

diff --git a/Base.SC2Data/GameData/UnitData.xml b/Base.SC2Data/GameData/UnitData.xml
@@ -269,8 +269,8 @@
         <Collide index="Small" value="1"/>
         <Attributes index="Armored" value="1"/>
         <Attributes index="Mechanical" value="1"/>
-        <LifeStart value="90"/>
-        <LifeMax value="120"/>
+        <LifeStart value="100"/>
+        <LifeMax value="100"/>
         <LifeArmor value="1"/>
         <LifeArmorName value="Unit/LifeArmorName/TerranVehiclePlating"/>
         <Speed value="2.3984"/>
@@ -466,7 +466,7 @@
         <StationaryTurningRate value="719.4726"/>
         <TurningRate value="719.4726"/>
         <Sight value="9"/>
-        <Food value="-4"/>
+        <Food value="-20"/>
         <CostCategory value="Technology"/>
         <CostResource index="Minerals" value="70"/>
         <AttackTargetPriority value="11"/>
@@ -754,7 +754,7 @@
         <StationaryTurningRate value="719.4726"/>
         <TurningRate value="719.4726"/>
         <Sight value="9"/>
-        <Food value="-4"/>
+        <Food value="-7"/>
         <CostCategory value="Technology"/>
         <CostResource index="Minerals" value="70"/>
         <AttackTargetPriority value="11"/>
@@ -826,7 +826,7 @@
         <StationaryTurningRate value="719.4726"/>
         <TurningRate value="719.4726"/>
         <Sight value="9"/>
-        <Food value="-4"/>
+        <Food value="-15"/>
         <CostCategory value="Technology"/>
         <CostResource index="Minerals" value="70"/>
         <AttackTargetPriority value="11"/>
@@ -3286,17 +3286,18 @@
         <AbilArray index="4" Link="CopyRally"/>
         <AbilArray Link="TrainInfestedMarine"/>
         <AbilArray Link="TrainBomber"/>
-        <AbilArray Link="UpgradeBunker"/>
+        <AbilArray Link="SelectBomberSpawn"/>
         <AbilArray Link="Demolish"/>
         <AbilArray Link="UpgradeBunkerCapacity"/>
+        <AbilArray Link="SelectInfestedMarineSpawn"/>
         <CardLayouts index="0">
             <LayoutButtons index="0" Face="Cancel" AbilCmd="BuildInProgress,Cancel" Column="4"/>
             <LayoutButtons index="1" Face="InfestedTerranCampaign" AbilCmd="TrainInfestedMarine,Train1" Row="0" Column="0"/>
             <LayoutButtons index="2" Face="SpawnBomber" AbilCmd="TrainBomber,Train1" Row="0" Column="1"/>
-            <LayoutButtons index="3" Face="UpgradeBunker" AbilCmd="UpgradeBunker,Execute" Column="0"/>
+            <LayoutButtons index="3" Face="SelectBomberSpawn" AbilCmd="SelectBomberSpawn,Execute" Column="0"/>
             <LayoutButtons index="4" Face="Demolish" AbilCmd="Demolish,Execute" Row="2" Column="3"/>
             <LayoutButtons index="5" Face="UpgradeBunkerCapacity" AbilCmd="UpgradeBunkerCapacity,Execute" Row="2"/>
-            <LayoutButtons index="6" removed="1"/>
+            <LayoutButtons index="6" Face="SelectInfestedMarineSpawn" AbilCmd="SelectInfestedMarineSpawn,Execute" Row="2" Column="0"/>
         </CardLayouts>
         <Attributes index="Light" value="0"/>
         <Attributes index="Armored" value="1"/>
@@ -6703,6 +6704,7 @@
             <LayoutButtons Face="ResearchMobileSquadTraining" Type="AbilCmd" AbilCmd="ArmoryResearch2,Research12" Row="2" Column="1"/>
             <LayoutButtons Face="ResearchHeavyPlating" Type="AbilCmd" AbilCmd="ArmoryResearch2,Research18" Row="1" Column="2"/>
             <LayoutButtons Face="ResearchBomberSpawns" Type="AbilCmd" AbilCmd="ArmoryResearch2,Research19" Row="1" Column="2"/>
+            <LayoutButtons Face="ResearchChaosPowerArmorUpgrade" Type="AbilCmd" AbilCmd="ArmoryResearch2,Research25" Row="1" Column="2"/>
         </CardLayouts>
         <LeaderAlias value="Armory2"/>
         <HotkeyAlias value="Armory2"/>
@@ -10720,8 +10722,8 @@
         <Attributes index="Armored" value="1"/>
         <Attributes index="Biological" value="1"/>
         <Attributes index="Heroic" value="1"/>
-        <LifeStart value="500"/>
-        <LifeMax value="500"/>
+        <LifeStart value="600"/>
+        <LifeMax value="600"/>
         <LifeArmorName value="Unit/LifeArmorName/ArmorOfTheDarkGods"/>
         <ShieldArmorName value="Unit/ShieldArmorName/ZergWildMutation"/>
         <Speed value="3"/>

diff --git a/Base.SC2Data/GameData/UpgradeData.xml b/Base.SC2Data/GameData/UpgradeData.xml
@@ -97,6 +97,15 @@
         <EffectArray Reference="Unit,Uploader,LifeArmorLevel" Value="1"/>
         <MaxLevel value="100"/>
     </CUpgrade>
+    <CUpgrade id="ChaosPowerArmorUpgrade">
+        <Icon value="assets\icon\ICON CSM Armor Lord.dds"/>
+        <EffectArray Reference="Unit,ChaosSlave,LifeMax" Value="35"/>
+        <EffectArray Reference="Unit,ChaosSlave,LifeStart" Value="35"/>
+        <EffectArray Reference="Unit,ChaosLord,LifeMax" Value="350"/>
+        <EffectArray Reference="Unit,ChaosLord,LifeStart" Value="350"/>
+        <EffectArray Reference="Unit,ChaosCultist,LifeMax" Value="35"/>
+        <EffectArray Reference="Unit,ChaosCultist,LifeStart" Value="35"/>
+    </CUpgrade>
     <CUpgrade id="Stoptherain"/>
     <CUpgrade id="GenetronTier3">
         <Icon value="Assets\Textures\btn-upgrade-genetron-lightmechweapons-level2.dds"/>
@@ -351,12 +360,6 @@
         <Icon value="Assets\Textures\btn-upgrade-terran-infantryarmorlevel3.dds"/>
         <EffectArray Reference="Unit,FirebatZergHex,LifeMax" Value="200"/>
         <EffectArray Reference="Unit,FirebatZergHex,LifeStart" Value="200"/>
-        <EffectArray Reference="Unit,ChaosSlave,LifeMax" Value="35"/>
-        <EffectArray Reference="Unit,ChaosSlave,LifeStart" Value="35"/>
-        <EffectArray Reference="Unit,ChaosLord,LifeMax" Value="325"/>
-        <EffectArray Reference="Unit,ChaosLord,LifeStart" Value="325"/>
-        <EffectArray Reference="Unit,ChaosCultist,LifeMax" Value="35"/>
-        <EffectArray Reference="Unit,ChaosCultist,LifeStart" Value="35"/>
     </CUpgrade>
     <CUpgrade id="LotsofBlood">
         <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-empowermeslaves.dds"/>
@@ -910,6 +913,12 @@
         <EditorCategories value="Race:Zerg"/>
         <MaxLevel value="3"/>
     </CUpgrade>
+    <CUpgrade id="ZergDefenseDamage">
+        <Icon value="Assets\Textures\btn-upgrade-zerg-meleeattacks-level2.dds"/>
+        <EffectArray Reference="Effect,TanklingMeleeDamage,Amount" Value="0.75"/>
+        <EffectArray Reference="Weapon,ImpalerTentacle3v3,Level" Value="1"/>
+        <MaxLevel value="100"/>
+    </CUpgrade>
     <CUpgrade id="ZergMovement">
         <Icon value="Assets\Textures\btn-upgrade-zerg-metabolicboost.dds"/>
         <EffectArray Reference="Abil,ZergResearch,InfoArray[Research8].Charge.CountMax" Value="1"/>

diff --git a/Base.SC2Data/GameData/WeaponData.xml b/Base.SC2Data/GameData/WeaponData.xml
@@ -671,7 +671,7 @@
         <Icon value="Assets\Icon\ICON CSM Power Sword.dds"/>
         <DisplayEffect value="ChaosPowerSowrd"/>
         <TargetFilters value="Ground,Visible;Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <Range value="0.855"/>
+        <Range value="1.25"/>
         <Cost>
             <Cooldown Link="Weapon/TwinBolter"/>
         </Cost>
@@ -683,7 +683,7 @@
         <EditorCategories value="Race:Terran"/>
         <Icon value="Assets\Icon\ICON CSM Bolter.dds"/>
         <TargetFilters value="Visible;Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <Period value="0.4"/>
+        <Period value="0.3"/>
         <DamagePoint value="0.05"/>
         <Backswing value="0.75"/>
         <AcquireTargetSorts>

diff --git a/ComponentList.SC2Components b/ComponentList.SC2Components
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
+    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>
     <DataComponent Type="mapi">MapInfo</DataComponent>

diff --git a/DocumentHeader b/DocumentHeader
diff --git a/DocumentInfo b/DocumentInfo
@@ -193,6 +193,8 @@
             <Value>1.111</Value>
             <Value>1.114</Value>
             <Value>1.115</Value>
+            <Value>1.116</Value>
+            <Value>1.117</Value>
         </Version>
         <Date>
             <Value>9/6/2021</Value>
@@ -361,6 +363,8 @@
             <Value>4/14/2024</Value>
             <Value>4/15/2024</Value>
             <Value>4/21/2024</Value>
+            <Value>4/22/2024</Value>
+            <Value>4/24/2024</Value>
         </Date>
         <Notes>
             <Value>1</Value>
@@ -529,6 +533,8 @@
             <Value>772,773</Value>
             <Value>774,775,776,777,778,779,780,781,782,783,784,785</Value>
             <Value>786,787,788,789</Value>
+            <Value>790,791</Value>
+            <Value>792,793,794,795,796,797</Value>
         </Notes>
     </PatchNote>
     <Preload>

diff --git a/DocumentInfo.version b/DocumentInfo.version
diff --git a/GameData.version b/GameData.version
diff --git a/GameText.version b/GameText.version