Merge pull request #3411 from SamaelGray/SamaelGray-MinorFixes

Minor assorted housekeeping
CombatExtended-Continued · Sep 11, 2024 · c40868e · c40868e
2 parents effe47e + abe2801
commit c40868e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Defs/Ammo/Medieval/BlunderbussShot.xml b/Defs/Ammo/Medieval/BlunderbussShot.xml
@@ -72,7 +72,7 @@
 			<speed>73</speed>
 			<damageAmountBase>7</damageAmountBase>
 			<pelletCount>20</pelletCount>
-			<armorPenetrationSharp>3.5</armorPenetrationSharp>
+			<armorPenetrationSharp>3</armorPenetrationSharp>
 			<armorPenetrationBlunt>3.14</armorPenetrationBlunt>
 			<spreadMult>17.8</spreadMult>
 		</projectile>

diff --git a/Defs/Ammo/Medieval/MiniCannonBall.xml b/Defs/Ammo/Medieval/MiniCannonBall.xml
@@ -127,7 +127,7 @@
 			<speed>73</speed>
 			<damageAmountBase>15</damageAmountBase>
 			<pelletCount>10</pelletCount>
-			<armorPenetrationSharp>3</armorPenetrationSharp>
+			<armorPenetrationSharp>3.5</armorPenetrationSharp>
 			<armorPenetrationBlunt>20.7</armorPenetrationBlunt>
 			<spreadMult>17.8</spreadMult>
 		</projectile>

diff --git a/Royalty/Patches/ThingDefs_Misc/Weapons_RoyaltyMelee.xml b/Royalty/Patches/ThingDefs_Misc/Weapons_RoyaltyMelee.xml
@@ -94,6 +94,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MeleeWeapon_Warhammer"]/costStuffCount</xpath>
+		<value>
+			<costStuffCount>125</costStuffCount>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="MeleeWeapon_Warhammer"]/statBases/Mass</xpath>
 		<value>
@@ -396,4 +403,4 @@
 		</value>
 	</Operation>
 
-</Patch>
+</Patch>