Tweaks

CombatExtended-Continued · Aug 29, 2024 · 9f11122 · 9f11122
1 parent 5e802d3
commit 9f11122
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 18 deletions.
diff --git a/ModPatches/Grimworld Core Imperialis/Patches/CE_Patch_RangedWeapons.xml b/ModPatches/Grimworld Core Imperialis/Patches/CE_Patch_RangedWeapons.xml
@@ -134,14 +134,14 @@
 		<xpath>Defs/ThingDef[defName="GW_SS_VolkCulverin"]</xpath>
 		<value>
 			<comps>
-				<AmmoUser>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
 					<magazineSize>10</magazineSize>
 					<reloadTime>4</reloadTime>
 					<ammoSet>AmmoSet_Volk_Cannon</ammoSet>
-				</AmmoUser>
-				<FireModes>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
 					<aiAimMode>Snapshot</aiAimMode>
-				</FireModes>			
+				</li>			
 			</comps>
 		</value>
 	</Operation>
@@ -183,14 +183,14 @@
 		<xpath>Defs/ThingDef[defName="GW_SM_VolkSerpenta"]</xpath>
 		<value>
 			<comps>
-				<AmmoUser>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
 					<magazineSize>20</magazineSize>
 					<reloadTime>4</reloadTime>
 					<ammoSet>AmmoSet_Volk_Pistol</ammoSet>
-				</AmmoUser>
-				<FireModes>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
 					<aiAimMode>AimedShot</aiAimMode>
-				</FireModes>		
+				</li>		
 			</comps>
 		</value>
 	</Operation>
@@ -245,16 +245,16 @@
 		<xpath>Defs/ThingDef[defName="GW_SS_VolkCaliver"]</xpath>
 		<value>
 			<comps>
-				<AmmoUser>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
 					<magazineSize>60</magazineSize>
 					<reloadTime>4</reloadTime>
 					<ammoSet>AmmoSet_Volk_Rifle</ammoSet>
-				</AmmoUser>
-				<FireModes>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
 					<aiAimMode>AimedShot</aiAimMode>
 					<aiUseBurstMode>True</aiUseBurstMode>
 					<aimedBurstShotCount>3</aimedBurstShotCount>
-				</FireModes>			
+				</li>			
 			</comps>
 		</value>
 	</Operation>
@@ -283,7 +283,7 @@
 				<recoilAmount>0.01</recoilAmount>
 				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 				<hasStandardCommand>True</hasStandardCommand>
-				<defaultProjectile>Bullet_Volk_Rifle</defaultProjectile>
+				<defaultProjectile>Bullet_Volk_HellGun</defaultProjectile>
 				<warmupTime>1</warmupTime>
 				<range>42</range>
 				<burstShotCount>6</burstShotCount>
@@ -302,16 +302,16 @@
 		<xpath>Defs/ThingDef[defName="GW_SS_VolkBlast"]</xpath>
 		<value>
 			<comps>
-				<AmmoUser>
+				<li Class="CombatExtended.CompProperties_AmmoUser">
 					<magazineSize>60</magazineSize>
 					<reloadTime>4</reloadTime>
-					<ammoSet>AmmoSet_Volk_Rifle</ammoSet>
-				</AmmoUser>
-				<FireModes>
+					<ammoSet>AmmoSet_Volk_HellGun</ammoSet>
+				</li>
+				<li Class="CombatExtended.CompProperties_FireModes">
 					<aiAimMode>AimedShot</aiAimMode>
 					<aiUseBurstMode>True</aiUseBurstMode>
 					<aimedBurstShotCount>3</aimedBurstShotCount>
-				</FireModes>			
+				</li>			
 			</comps>
 		</value>
 	</Operation>

diff --git a/...world Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Armors.xml b/...world Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Armors.xml
@@ -54,6 +54,39 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GW_AM_PriestHat" or defName="GW_AM_PriestHood" or defName="GW_AM_PriestHoodDown"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<ArmorRating_Sharp>0.16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GW_AM_PriestHat"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.24</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GW_AM_CommissarCap"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<Bulk>1.5</Bulk>
+			<WornBulk>0.5</WornBulk>
+			<ArmorRating_Sharp>0.16</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GW_AM_CommissarCap"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>0.32</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+
 	<!-- Wraps -->
 
 	<Operation Class="PatchOperationAddModExtension">