From 0dd67bb2c7d87422467b7bccd4d8bd2ad35917ce Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Wed, 17 Aug 2022 04:53:15 -0400
Subject: [PATCH] final tweaks

---
 Patches/Archotech PowerArmor/Apparel_JDS.xml  | 45 +++++++++----------
 .../RM2_Swords_CE.xml"                        | 10 ++---
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/Patches/Archotech PowerArmor/Apparel_JDS.xml b/Patches/Archotech PowerArmor/Apparel_JDS.xml
index 12bbc2b490..7e8471bf7d 100644
--- a/Patches/Archotech PowerArmor/Apparel_JDS.xml	
+++ b/Patches/Archotech PowerArmor/Apparel_JDS.xml	
@@ -9,7 +9,7 @@
 
                 <!-- ===== Add Bodypart Groups and Layers ===== -->
                 <li Class="PatchOperationAdd">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/apparel/layers</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel/layers</xpath>
                     <value>
                         <li>OnHead</li>
                         <li>StrappedHead</li>
@@ -17,7 +17,7 @@
                 </li>
 
                 <li Class="PatchOperationAdd">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/apparel/bodyPartGroups</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/apparel/bodyPartGroups</xpath>
                     <value>
                         <li>Hands</li>
                         <li>Feet</li>
@@ -26,7 +26,7 @@
 
                 <!-- ===== Add Costlist ===== -->
                 <li Class="PatchOperationAdd">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/costList</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/costList</xpath>
                     <value>
                         <Uranium>20</Uranium>
                         <Hyperweave>30</Hyperweave>
@@ -34,7 +34,7 @@
                 </li>
 
                 <li Class="PatchOperationAdd">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/costList</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/costList</xpath>
                     <value>
                         <Uranium>45</Uranium>
                         <Hyperweave>90</Hyperweave>
@@ -45,14 +45,14 @@
 
                 <!-- === Archotech Power Helmet === -->
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/WorkToMake</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/WorkToMake</xpath>
                     <value>
                         <WorkToMake>26250</WorkToMake>
                     </value>
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/MaxHitPoints</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/MaxHitPoints</xpath>
                     <value>
                         <MaxHitPoints>360</MaxHitPoints>
                         <Bulk>5.5</Bulk>
@@ -61,14 +61,14 @@
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/Mass</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/Mass</xpath>
                     <value>
                         <Mass>5</Mass>
                     </value>
                 </li>
 
                 <li Class="PatchOperationAdd">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/equippedStatOffsets</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/equippedStatOffsets</xpath>
                     <value>
                         <AimingAccuracy>0.20</AimingAccuracy>
                         <ToxicSensitivity>-0.50</ToxicSensitivity>
@@ -78,21 +78,21 @@
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/ArmorRating_Sharp</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Sharp</xpath>
                     <value>
                         <ArmorRating_Sharp>24</ArmorRating_Sharp>
                     </value>
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/ArmorRating_Blunt</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Blunt</xpath>
                     <value>
                         <ArmorRating_Blunt>52</ArmorRating_Blunt>
                     </value>
                 </li>
 
                 <li Class="PatchOperationAddModExtension">
-                    <xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_HelmetBase"]</xpath>
                     <value>
                         <li Class="CombatExtended.PartialArmorExt">
                             <stats>
@@ -115,14 +115,14 @@
 
                 <!-- === Archotech Power Armor === -->
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/WorkToMake</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/WorkToMake</xpath>
                     <value>
                         <WorkToMake>80000</WorkToMake>
                     </value>
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/MaxHitPoints</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/MaxHitPoints</xpath>
                     <value>
                         <MaxHitPoints>650</MaxHitPoints>
                         <Bulk>100</Bulk>
@@ -131,40 +131,37 @@
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/Mass</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/Mass</xpath>
                     <value>
                         <Mass>60</Mass>
                     </value>
                 </li>
 
                 <li Class="PatchOperationAdd">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/equippedStatOffsets</xpath>
                     <value>
-                        <equippedStatOffsets>
-                            <CarryWeight>90</CarryWeight>
-                            <CarryBulk>12.5</CarryBulk>
-                            <ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
-                            <ToxicSensitivity>-0.50</ToxicSensitivity>
-                        </equippedStatOffsets>
+						<CarryWeight>90</CarryWeight>
+						<CarryBulk>12.5</CarryBulk>
+						<ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
                     </value>
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/ArmorRating_Sharp</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Sharp</xpath>
                     <value>
                         <ArmorRating_Sharp>30</ArmorRating_Sharp>
                     </value>
                 </li>
 
                 <li Class="PatchOperationReplace">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/ArmorRating_Blunt</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Blunt</xpath>
                     <value>
                         <ArmorRating_Blunt>62</ArmorRating_Blunt>
                     </value>
                 </li>
 
                 <li Class="PatchOperationAddModExtension">
-                    <xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]</xpath>
+                    <xpath>Defs/ThingDef[@Name="APA_ArmorBase"]</xpath>
                     <value>
                         <li Class="CombatExtended.PartialArmorExt">
                             <stats>
diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml"
index 0422c647f4..93b8a6875a 100644
--- "a/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml"	
+++ "b/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_Swords_CE.xml"	
@@ -256,13 +256,11 @@
 	</li>
 
 	<li Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]</xpath>
+		<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/equippedStatOffsets</xpath>
 		<value>
-			<equippedStatOffsets>
-				<MeleeCritChance>0.30</MeleeCritChance>
-				<MeleeParryChance>0.25</MeleeParryChance>
-				<MeleeDodgeChance>0.08</MeleeDodgeChance>	
-			</equippedStatOffsets>
+			<MeleeCritChance>0.30</MeleeCritChance>
+			<MeleeParryChance>0.25</MeleeParryChance>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>	
 		</value>
 	</li>