From 49f2d6b46f393cd689858aca86a7adaab522c2b4 Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Sun, 25 Aug 2024 04:05:44 -0400
Subject: [PATCH 1/4] Add natural armor to BodyDef tail.

---
 .../QuadrupedAnimalWithPawsAndTail.xml        | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml b/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml
index 4f5870bb23..2ff3114da7 100644
--- a/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml
+++ b/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml
@@ -25,6 +25,27 @@
 		</nomatch>
 	</Operation>
 
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
+
 	<Operation Class="PatchOperationConditional">
 		<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
 		<nomatch Class="PatchOperationAdd">
@@ -104,6 +125,14 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
 		<value>

From ae5db2171d25eb34e4df44226dcb2ec560aa5788 Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Sun, 25 Aug 2024 04:09:18 -0400
Subject: [PATCH 2/4] Add some missing generic nade recipes

---
 Defs/Ammo/Generic/LauncherGrenade.xml | 115 +++++++++++++++++++++++---
 1 file changed, 104 insertions(+), 11 deletions(-)

diff --git a/Defs/Ammo/Generic/LauncherGrenade.xml b/Defs/Ammo/Generic/LauncherGrenade.xml
index 938b78bb66..6c4d30b995 100644
--- a/Defs/Ammo/Generic/LauncherGrenade.xml
+++ b/Defs/Ammo/Generic/LauncherGrenade.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
-	<!-- Relabeled 40x46mm grenades -->
+	<!-- Relabeled launcher grenades -->
 
 	<ThingCategoryDef>
 		<defName>AmmoLauncherGrenade</defName>
@@ -16,11 +16,11 @@
 		<defName>AmmoSet_LauncherGrenade</defName>
 		<label>launcher grenade</label>
 		<ammoTypes>
-			<Ammo_LauncherGrenade_HE>Bullet_40x46mmGrenade_HE</Ammo_LauncherGrenade_HE>
-			<Ammo_LauncherGrenade_HE_TFuzed>Bullet_40x46mmGrenade_HE_TFuzed</Ammo_LauncherGrenade_HE_TFuzed>
-			<Ammo_LauncherGrenade_HEDP>Bullet_40x46mmGrenade_HEDP</Ammo_LauncherGrenade_HEDP>
-			<Ammo_LauncherGrenade_EMP>Bullet_40x46mmGrenade_EMP</Ammo_LauncherGrenade_EMP>
-			<Ammo_LauncherGrenade_Smoke>Bullet_40x46mmGrenade_Smoke</Ammo_LauncherGrenade_Smoke>
+			<Ammo_LauncherGrenade_HE>Bullet_launcherGrenade_HE</Ammo_LauncherGrenade_HE>
+			<Ammo_LauncherGrenade_HE_TFuzed>Bullet_launcherGrenade_HE_TFuzed</Ammo_LauncherGrenade_HE_TFuzed>
+			<Ammo_LauncherGrenade_HEDP>Bullet_launcherGrenade_HEDP</Ammo_LauncherGrenade_HEDP>
+			<Ammo_LauncherGrenade_EMP>Bullet_launcherGrenade_EMP</Ammo_LauncherGrenade_EMP>
+			<Ammo_LauncherGrenade_Smoke>Bullet_launcherGrenade_Smoke</Ammo_LauncherGrenade_Smoke>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
@@ -54,7 +54,7 @@
 			<MarketValue>2.27</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHE</ammoClass>
-		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
+		<detonateProjectile>Bullet_launcherGrenade_HE</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -68,7 +68,7 @@
 			<MarketValue>3.25</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHETF</ammoClass>
-		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
+		<detonateProjectile>Bullet_launcherGrenade_HE</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -82,7 +82,7 @@
 			<MarketValue>2.12</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHEDP</ammoClass>
-		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
+		<detonateProjectile>Bullet_launcherGrenade_HE</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -96,7 +96,7 @@
 			<MarketValue>4.57</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeEMP</ammoClass>
-		<detonateProjectile>Bullet_40x46mmGrenade_EMP</detonateProjectile>
+		<detonateProjectile>Bullet_launcherGrenade_EMP</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -111,7 +111,7 @@
 		</statBases>
 		<ammoClass>Smoke</ammoClass>
 		<generateAllowChance>0</generateAllowChance>
-		<detonateProjectile>Bullet_40x46mmGrenade_Smoke</detonateProjectile>
+		<detonateProjectile>Bullet_launcherGrenade_Smoke</detonateProjectile>
 	</ThingDef>
 
 	<!-- ==================== Recipes ========================== -->
@@ -160,6 +160,51 @@
 		<workAmount>9000</workAmount>
 	</RecipeDef>
 
+	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+		<defName>MakeAmmo_LauncherGrenade_HE_TFuzed</defName>
+		<label>make launcher HE Time-Fuzed grenades x100</label>
+		<description>Craft 100 launcher HE Time-Fuzed grenades.</description>
+		<jobString>Making launcher HE Time-Fuzed grenades.</jobString>
+		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_LauncherGrenade_HE_TFuzed>100</Ammo_LauncherGrenade_HE_TFuzed>
+		</products>
+		<workAmount>11200</workAmount>
+	</RecipeDef>
+
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_LauncherGrenade_HEDP</defName>
 		<label>make launcher HEDP grenades x100</label>
@@ -287,4 +332,52 @@
 		<workAmount>7400</workAmount>
 	</RecipeDef>
 
+	<RecipeDef ParentName="LauncherAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>MakeAmmo_LauncherGrenade_Tox</defName>
+		<label>make launcher tox grenades x100</label>
+		<description>Craft 100 launcher tox grenades.</description>
+		<jobString>Making launcher tox grenades.</jobString>
+		<researchPrerequisites>
+			<li>CE_Launchers</li>
+			<li>ToxGas</li>
+		</researchPrerequisites>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_LauncherGrenade_Tox>100</Ammo_LauncherGrenade_Tox>
+		</products>
+		<workAmount>7400</workAmount>
+	</RecipeDef>
+
 </Defs>
\ No newline at end of file

From eaac6e3ee0a15234109ab688e1a92f4e6615f000 Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Sun, 25 Aug 2024 04:19:51 -0400
Subject: [PATCH 3/4] Whoopsie

---
 Defs/Ammo/Generic/LauncherGrenade.xml         | 37 +++++++++++++------
 .../QuadrupedAnimalWithPawsAndTail.xml        |  1 -
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Defs/Ammo/Generic/LauncherGrenade.xml b/Defs/Ammo/Generic/LauncherGrenade.xml
index 6c4d30b995..73ddaaa5c1 100644
--- a/Defs/Ammo/Generic/LauncherGrenade.xml
+++ b/Defs/Ammo/Generic/LauncherGrenade.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
-	<!-- Relabeled launcher grenades -->
+	<!-- Relabeled 40x46mm grenades -->
 
 	<ThingCategoryDef>
 		<defName>AmmoLauncherGrenade</defName>
@@ -16,11 +16,11 @@
 		<defName>AmmoSet_LauncherGrenade</defName>
 		<label>launcher grenade</label>
 		<ammoTypes>
-			<Ammo_LauncherGrenade_HE>Bullet_launcherGrenade_HE</Ammo_LauncherGrenade_HE>
-			<Ammo_LauncherGrenade_HE_TFuzed>Bullet_launcherGrenade_HE_TFuzed</Ammo_LauncherGrenade_HE_TFuzed>
-			<Ammo_LauncherGrenade_HEDP>Bullet_launcherGrenade_HEDP</Ammo_LauncherGrenade_HEDP>
-			<Ammo_LauncherGrenade_EMP>Bullet_launcherGrenade_EMP</Ammo_LauncherGrenade_EMP>
-			<Ammo_LauncherGrenade_Smoke>Bullet_launcherGrenade_Smoke</Ammo_LauncherGrenade_Smoke>
+			<Ammo_LauncherGrenade_HE>Bullet_40x46mmGrenade_HE</Ammo_LauncherGrenade_HE>
+			<Ammo_LauncherGrenade_HE_TFuzed>Bullet_40x46mmGrenade_HE_TFuzed</Ammo_LauncherGrenade_HE_TFuzed>
+			<Ammo_LauncherGrenade_HEDP>Bullet_40x46mmGrenade_HEDP</Ammo_LauncherGrenade_HEDP>
+			<Ammo_LauncherGrenade_EMP>Bullet_40x46mmGrenade_EMP</Ammo_LauncherGrenade_EMP>
+			<Ammo_LauncherGrenade_Smoke>Bullet_40x46mmGrenade_Smoke</Ammo_LauncherGrenade_Smoke>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
@@ -54,7 +54,7 @@
 			<MarketValue>2.27</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHE</ammoClass>
-		<detonateProjectile>Bullet_launcherGrenade_HE</detonateProjectile>
+		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -68,7 +68,7 @@
 			<MarketValue>3.25</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHETF</ammoClass>
-		<detonateProjectile>Bullet_launcherGrenade_HE</detonateProjectile>
+		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -82,7 +82,7 @@
 			<MarketValue>2.12</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHEDP</ammoClass>
-		<detonateProjectile>Bullet_launcherGrenade_HE</detonateProjectile>
+		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -96,7 +96,7 @@
 			<MarketValue>4.57</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeEMP</ammoClass>
-		<detonateProjectile>Bullet_launcherGrenade_EMP</detonateProjectile>
+		<detonateProjectile>Bullet_40x46mmGrenade_EMP</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
@@ -111,7 +111,22 @@
 		</statBases>
 		<ammoClass>Smoke</ammoClass>
 		<generateAllowChance>0</generateAllowChance>
-		<detonateProjectile>Bullet_launcherGrenade_Smoke</detonateProjectile>
+		<detonateProjectile>Bullet_40x46mmGrenade_Smoke</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Ammo_LauncherGrenade_Tox</defName>
+		<label>launcher grenade (Tox)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/Tox</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.84</MarketValue>
+		</statBases>
+		<ammoClass>Toxic</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+		<detonateProjectile>Bullet_40x46mmGrenade_Tox</detonateProjectile>
 	</ThingDef>
 
 	<!-- ==================== Recipes ========================== -->
diff --git a/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml b/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml
index 2ff3114da7..e72d9c55f5 100644
--- a/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml
+++ b/Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml
@@ -132,7 +132,6 @@
 		</value>
 	</Operation>
 
-
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
 		<value>

From d5cf86ac56673696707dee409bc0f726f97bfbd8 Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Sun, 25 Aug 2024 15:59:36 -0400
Subject: [PATCH 4/4] Add launcher tox grenade to ammo set

---
 .../ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml b/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml
index bbd45c03be..20d2de1826 100644
--- a/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml
+++ b/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml
@@ -16,6 +16,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_LauncherGrenade"]/ammoTypes</xpath>
+		<value>
+			<Ammo_LauncherGrenade_Tox>Bullet_40x46mmGrenade_Tox</Ammo_LauncherGrenade_Tox>
+		</value>
+	</Operation>
+
 	<!-- ========== Tox Grenades ========== -->
 
 	<!-- Kill recipe maker -->