From fbe0bc7d05c552338d8069237259be2afea4cd67 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 28 Oct 2024 21:51:47 +0800
Subject: [PATCH 1/4] New pack

---
 .../Defs/Spacer Pack/Defs_Projectiles.xml     | 33 +++++++++
 .../Patches/Spacer Pack/Backpacks.xml         | 72 ++++++++++++++++++-
 .../Patches/Spacer Pack/Damage.xml            | 32 +++++++++
 .../Patches/Spacer Pack/Hediff.xml            | 36 ++++++++++
 4 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml
 create mode 100644 ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml

diff --git a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml
index 0db59b7c29..4706d7f5ce 100644
--- a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml	
+++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml	
@@ -32,6 +32,39 @@
 		</projectile>
 	</ThingDef>
 
+	<ThingDef ParentName="BaseExplosiveBullet">
+		<defName>dvd_Projectile_RipperRack_CE</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>ripper rack</label>
+		<graphicData>
+			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Projectile/Grenade_RipperMechanites</texPath>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>0</speed>
+			<flyOverhead>True</flyOverhead>
+			<gravityFactor>5</gravityFactor>
+			<damageDef>dvd_RipperBomb</damageDef>
+			<damageAmountBase>50</damageAmountBase>
+			<explosionRadius>3.0</explosionRadius>
+			<filth>dvd_Filth_RipperMechanites</filth>
+			<filthCount>1</filthCount>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ProjectileFleck">
+				<FleckDatas>
+					<li>
+						<fleck>dvd_Fleck_RipperMechanites_Random</fleck>
+						<emissionsPerTick>0.5</emissionsPerTick>
+						<rotation>0</rotation>
+						<scale>.5</scale>
+						<flecksPerEmission>1</flecksPerEmission>
+					</li>
+				</FleckDatas>
+			</li>
+		</comps>
+	</ThingDef>
+
 	<ThingDef ParentName="Base8x50mmChargedBullet">
 		<defName>dvd_SkipBolt_CE</defName>
 		<label>skipbolt</label>
diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml
index 809ee84417..897bb4d7be 100644
--- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml	
+++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml	
@@ -131,7 +131,7 @@
 					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
 					<onlyManualCast>True</onlyManualCast>
-					<warmupTime>2</warmupTime>
+					<warmupTime>1.5</warmupTime>
 					<range>35</range>
 					<minRange>5</minRange>
 					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
@@ -170,6 +170,76 @@
 		</value>
 	</Operation>
 
+	<!-- Miner Pack(with grey goo Grenade built in)-->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/VEF_MassCarryCapacity</xpath>
+		<value>
+			<CarryBulk>80</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd"><!-- Cost increase cause grey goo Grenade -->
+		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/costList</xpath>
+		<value>
+			<ComponentSpacer>1</ComponentSpacer>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/MoveSpeed</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/statBases/Mass</xpath>
+		<value>
+			<Mass>4</Mass>
+			<Bulk>5</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Charges">
+				<chargeSpeeds>
+					<li>30</li>
+					<li>50</li>
+					<li>70</li>
+					<li>90</li>
+				</chargeSpeeds>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<label>launch ripper rack</label>
+					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<onlyManualCast>True</onlyManualCast>
+					<warmupTime>1.0</warmupTime>
+					<range>17</range>
+					<minRange>4</minRange>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<soundCast>ThrowGrenade</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+					<defaultProjectile>dvd_Projectile_RipperRack_CE</defaultProjectile>
+					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
 	<!-- Med Pack -->
 
 	<Operation Class="PatchOperationReplace">
diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml
new file mode 100644
index 0000000000..3fb5c2d589
--- /dev/null
+++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ================== Damages ================== -->
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/DamageDef[defName="dvd_SkipBolt"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>Bullet</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAttributeSet">
+		<xpath>Defs/DamageDef[defName="dvd_RipperBomb"]</xpath>
+		<attribute>ParentName</attribute>
+		<value>Bomb</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="dvd_RipperBomb"]/defaultArmorPenetration</xpath>
+		<value>
+			<defaultArmorPenetration>62</defaultArmorPenetration>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="dvd_RipperBomb"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Blunt</armorCategory>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml
new file mode 100644
index 0000000000..63621ffc43
--- /dev/null
+++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ================== Hediff ================== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="limited"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>-3</ArmorRating_Sharp>
+				<ArmorRating_Blunt>-5</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="moderate"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>-7</ArmorRating_Sharp>
+				<ArmorRating_Blunt>-10</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="extensive"]/statOffsets</xpath>
+		<value>
+			<statOffsets>
+				<ArmorRating_Sharp>-15</ArmorRating_Sharp>
+				<ArmorRating_Blunt>-20</ArmorRating_Blunt>
+			</statOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file

From 3bd377446bf6d57d0481d1cb0cd6960036a57917 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 28 Oct 2024 22:23:51 +0800
Subject: [PATCH 2/4] remove mortar behavior

---
 .../Defs/Spacer Pack/Defs_Projectiles.xml      |  7 +++----
 .../Patches/Spacer Pack/Backpacks.xml          | 18 ++----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml
index 4706d7f5ce..f7142da932 100644
--- a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml	
+++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml	
@@ -41,12 +41,11 @@
 			<texPath>Things/Projectile/Grenade_RipperMechanites</texPath>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>0</speed>
-			<flyOverhead>True</flyOverhead>
-			<gravityFactor>5</gravityFactor>
+			<speed>20</speed>
+			<gravityFactor>3</gravityFactor>
 			<damageDef>dvd_RipperBomb</damageDef>
 			<damageAmountBase>50</damageAmountBase>
-			<explosionRadius>3.0</explosionRadius>
+			<explosionRadius>5.0</explosionRadius>
 			<filth>dvd_Filth_RipperMechanites</filth>
 			<filthCount>1</filthCount>
 		</projectile>
diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml
index 897bb4d7be..1a96cbae8a 100644
--- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml	
+++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml	
@@ -198,20 +198,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/comps</xpath>
-		<value>
-			<li Class="CombatExtended.CompProperties_Charges">
-				<chargeSpeeds>
-					<li>30</li>
-					<li>50</li>
-					<li>70</li>
-					<li>90</li>
-				</chargeSpeeds>
-			</li>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/verbs</xpath>
 		<value>
@@ -222,8 +208,8 @@
 					<hasStandardCommand>true</hasStandardCommand>
 					<onlyManualCast>True</onlyManualCast>
 					<warmupTime>1.0</warmupTime>
-					<range>17</range>
-					<minRange>4</minRange>
+					<range>21</range>
+					<minRange>6</minRange>
 					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
 					<soundCast>ThrowGrenade</soundCast>
 					<soundCastTail>GunTail_Medium</soundCastTail>

From efc29b1b3d8c852061ca16dc8aa8b3876088b529 Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Thu, 7 Nov 2024 19:57:53 -0500
Subject: [PATCH 3/4] Housekeeping

---
 ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml
index 1a96cbae8a..4d7df8809a 100644
--- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml	
+++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml	
@@ -170,7 +170,7 @@
 		</value>
 	</Operation>
 
-	<!-- Miner Pack(with grey goo Grenade built in)-->
+	<!-- Miner Pack (with grey goo Grenade built in)-->
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/VEF_MassCarryCapacity</xpath>
@@ -179,7 +179,7 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd"><!-- Cost increase cause grey goo Grenade -->
+	<Operation Class="PatchOperationAdd"> <!-- Cost increase cause grey goo Grenade -->
 		<xpath>Defs/ThingDef[defName="dvd_minerpack"]/costList</xpath>
 		<value>
 			<ComponentSpacer>1</ComponentSpacer>

From 3581ae3a4dcd8974949a8b7b97f5b0d8cb3d573d Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Thu, 7 Nov 2024 20:10:41 -0500
Subject: [PATCH 4/4] Tweaks and housekeeping

---
 .../Defs/Spacer Pack/Defs_Projectiles.xml         | 15 +++++++++------
 .../Spacer Pack/Patches/Spacer Pack/Damage.xml    |  5 +++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml
index f7142da932..18f444f3b4 100644
--- a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml	
+++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml	
@@ -32,9 +32,8 @@
 		</projectile>
 	</ThingDef>
 
-	<ThingDef ParentName="BaseExplosiveBullet">
+	<ThingDef ParentName="BaseFragGrenadeProjectile">
 		<defName>dvd_Projectile_RipperRack_CE</defName>
-		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>ripper rack</label>
 		<graphicData>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -45,7 +44,11 @@
 			<gravityFactor>3</gravityFactor>
 			<damageDef>dvd_RipperBomb</damageDef>
 			<damageAmountBase>50</damageAmountBase>
-			<explosionRadius>5.0</explosionRadius>
+			<dangerFactor>3.0</dangerFactor>
+			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			<suppressionFactor>3.0</suppressionFactor>			
+			<explosionDelay>50</explosionDelay>
+			<explosionRadius>3.9</explosionRadius>
 			<filth>dvd_Filth_RipperMechanites</filth>
 			<filthCount>1</filthCount>
 		</projectile>
@@ -56,7 +59,7 @@
 						<fleck>dvd_Fleck_RipperMechanites_Random</fleck>
 						<emissionsPerTick>0.5</emissionsPerTick>
 						<rotation>0</rotation>
-						<scale>.5</scale>
+						<scale>0.5</scale>
 						<flecksPerEmission>1</flecksPerEmission>
 					</li>
 				</FleckDatas>
@@ -84,14 +87,14 @@
 						<fleck>dvd_Fleck_ArchoPack_Main</fleck>
 						<emissionsPerTick>0.5</emissionsPerTick>
 						<rotation>0</rotation>
-						<scale>.5</scale>
+						<scale>0.5</scale>
 						<flecksPerEmission>1</flecksPerEmission>
 					</li>
 					<li>
 						<fleck>dvd_Fleck_ArchoPack_Smoke</fleck>
 						<emissionsPerTick>0.5</emissionsPerTick>
 						<rotation>0</rotation>
-						<scale>.5</scale>
+						<scale>0.5</scale>
 						<flecksPerEmission>1</flecksPerEmission>
 						<cutoffTickRange>120~240</cutoffTickRange>
 					</li>
diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml
index 3fb5c2d589..eb9872e8fd 100644
--- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml	
+++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml	
@@ -29,4 +29,9 @@
 		</value>
 	</Operation>
 
+	<!-- Get rid of the unused vanilla projectile to suppress an error. -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="dvd_Projectile_RipperRack"]</xpath>
+	</Operation>
+
 </Patch>
\ No newline at end of file