From a9abaf692140740d64310c6f6e9dc812e537fa57 Mon Sep 17 00:00:00 2001
From: Manifold Paradox <masakitenchi@users.noreply.github.com>
Date: Fri, 19 Jul 2024 08:02:26 +0900
Subject: [PATCH] Patch merge & small tweaks for 155mm shell

airburst shell now produces more fragments
---
 .../Ammo/Shell/155mmHowitzer.xml              | 128 +++++-------------
 1 file changed, 31 insertions(+), 97 deletions(-)

diff --git a/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml b/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml
index b601a0ca04..747562977a 100644
--- a/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml
+++ b/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml
@@ -39,16 +39,25 @@
 		</value>
 	</Operation>
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Bullet_155mmHowitzerShell_HE"]/comps</xpath>
+		<xpath>Defs/ThingDef[defName="Bullet_155mmHowitzerShell_HE"]/comps/li[@Class="CombatExtended.CompProperties_Fragments"]</xpath>
 		<value>
-			<comps>
-				<li Class="CombatExtended.CompProperties_Fragments">
-					<fragments>
-						<Fragment_Large>40</Fragment_Large>
-						<Fragment_Small>80</Fragment_Small>
-					</fragments>
-				</li>
-			</comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>40</Fragment_Large>
+					<Fragment_Small>80</Fragment_Small>
+				</fragments>
+			</li>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Bullet_155mmHowitzerShell_HE_Fuzed"]/comps/li[@Class="CombatExtended.CompProperties_Fragments"]</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>80</Fragment_Large>
+					<Fragment_Small>160</Fragment_Small>
+				</fragments>
+			</li>
 		</value>
 	</Operation>
 	<Operation Class="PatchOperationReplace">
@@ -78,16 +87,14 @@
 		</value>
 	</Operation>
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Bullet_155mmHowitzerShell_HE_directfire"]/comps</xpath>
+		<xpath>Defs/ThingDef[defName="Bullet_155mmHowitzerShell_HE_directfire"]/comps/li[@Class="CombatExtended.CompProperties_Fragments"]</xpath>
 		<value>
-			<comps>
-				<li Class="CombatExtended.CompProperties_Fragments">
-					<fragments>
-						<Fragment_Large>40</Fragment_Large>
-						<Fragment_Small>80</Fragment_Small>
-					</fragments>
-				</li>
-			</comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>40</Fragment_Large>
+					<Fragment_Small>80</Fragment_Small>
+				</fragments>
+			</li>
 		</value>
 	</Operation>
 	<Operation Class="PatchOperationAdd">
@@ -109,27 +116,12 @@
 			</categories>
 		</value>
 	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE"]/jobString</xpath>
+	<Operation Class="SK.PatchOperationReplaceExtended">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE"]</xpath>
 		<value>
 			<jobString>Making 155mm HE howitzer shells.</jobString>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE"]/description</xpath>
-		<value>
 			<description>Craft 155mm HE howitzer shells.</description>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE"]/workAmount</xpath>
-		<value>
 			<workAmount>2000</workAmount>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE"]/ingredients</xpath>
-		<value>
 			<ingredients>
 				<li>
 					<filter>
@@ -166,20 +158,9 @@
 					<count>3</count>
 				</li>
 			</ingredients>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE"]/label</xpath>
-		<value>
 			<label>make 155mm HE howitzer shells x1</label>
 		</value>
 	</Operation>
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE"]</xpath>
-		<value>
-			<targetCountAdjustment>10</targetCountAdjustment>
-		</value>
-	</Operation>
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE_HFuzed"]/fixedIngredientFilter/thingDefs</xpath>
 		<value>
@@ -199,27 +180,12 @@
 			</categories>
 		</value>
 	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE_HFuzed"]/jobString</xpath>
+	<Operation Class="SK.PatchOperationReplaceExtended">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE_HFuzed"]</xpath>
 		<value>
 			<jobString>Making 155mm airburst howitzer shells.</jobString>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE_HFuzed"]/description</xpath>
-		<value>
 			<description>Craft 155mm airburst howitzer shells.</description>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE_HFuzed"]/workAmount</xpath>
-		<value>
 			<workAmount>2000</workAmount>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE_HFuzed"]/ingredients</xpath>
-		<value>
 			<ingredients>
 				<li>
 					<filter>
@@ -266,12 +232,6 @@
 			</ingredients>
 		</value>
 	</Operation>
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_HE_HFuzed"]</xpath>
-		<value>
-			<targetCountAdjustment>10</targetCountAdjustment>
-		</value>
-	</Operation>
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/fixedIngredientFilter/thingDefs</xpath>
 		<value>
@@ -293,27 +253,12 @@ Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/fixedIngredientFilter/
 			</categories>
 		</value>
 	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/workAmount</xpath>
+	<Operation Class="SK.PatchOperationReplacexExtended">
+		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]</xpath>
 		<value>
 			<workAmount>2000</workAmount>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/description</xpath>
-		<value>
 			<description>Craft 155mm EMP  howitzer shells.</description>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/jobString</xpath>
-		<value>
 			<jobString>Making 155mm EMP  howitzer shells.</jobString>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/ingredients</xpath>
-		<value>
 			<ingredients>
 				<li>
 					<filter>
@@ -349,20 +294,9 @@ Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/fixedIngredientFilter/
 					<count>4</count>
 				</li>
 			</ingredients>
-		</value>
-	</Operation>
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]/label</xpath>
-		<value>
 			<label>make 155mm EMP howitzer shells x1</label>
 		</value>
 	</Operation>
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/RecipeDef[defName="MakeAmmo_155mmHowitzerShell_EMP"]</xpath>
-		<value>
-			<targetCountAdjustment>10</targetCountAdjustment>
-		</value>
-	</Operation>
 	<Operation Class="PatchOperationRemove">
 		<xpath>Defs/ThingDef[defName="Ammo_155mmHowitzerShell_Incendiary" or 
 								defName="Ammo_155mmHowitzerShell_Smoke" or