From 51072f746c83e6274fba174e28101c46f774e96a Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Tue, 17 Sep 2024 22:17:13 +0330
Subject: [PATCH 1/2] 20x82mm casing mass fix

---
 Defs/Ammo/HighCaliber/20x82mmMauser.xml | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Defs/Ammo/HighCaliber/20x82mmMauser.xml b/Defs/Ammo/HighCaliber/20x82mmMauser.xml
index 7630b773ba..9325ad4929 100644
--- a/Defs/Ammo/HighCaliber/20x82mmMauser.xml
+++ b/Defs/Ammo/HighCaliber/20x82mmMauser.xml
@@ -27,7 +27,7 @@
 	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo20x82mmMauserBase" ParentName="MediumAmmoBase" Abstract="True">
 		<description>Large caliber cartridge used by autocannons and a handful of anti-tank rifles.</description>
 		<statBases>
-			<Mass>0.175</Mass>
+			<Mass>0.205</Mass>
 			<Bulk>0.22</Bulk>
 		</statBases>
 		<tradeTags>
@@ -48,7 +48,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.7</MarketValue>
+			<MarketValue>0.82</MarketValue>
 		</statBases>
 		<ammoClass>ArmorPiercing</ammoClass>
 		<cookOffProjectile>Bullet_20x82mmMauser_AP</cookOffProjectile>
@@ -62,7 +62,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>1.05</MarketValue>
+			<MarketValue>1.17</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryAP</ammoClass>
 		<cookOffProjectile>Bullet_20x82mmMauser_Incendiary</cookOffProjectile>
@@ -76,7 +76,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>1.56</MarketValue>
+			<MarketValue>1.68</MarketValue>
 		</statBases>
 		<ammoClass>ExplosiveAP</ammoClass>
 		<cookOffProjectile>Bullet_20x82mmMauser_HE</cookOffProjectile>
@@ -90,8 +90,8 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.83</MarketValue>
-			<Mass>0.128</Mass>
+			<MarketValue>0.95</MarketValue>
+			<Mass>0.158</Mass>
 		</statBases>
 		<ammoClass>Sabot</ammoClass>
 		<cookOffProjectile>Bullet_20x82mmMauser_Sabot</cookOffProjectile>
@@ -180,7 +180,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>70</count>
+				<count>82</count>
 			</li>
 		</ingredients>
 		<fixedIngredientFilter>
@@ -191,7 +191,7 @@
 		<products>
 			<Ammo_20x82mmMauser_AP>200</Ammo_20x82mmMauser_AP>
 		</products>
-		<workAmount>8400</workAmount>
+		<workAmount>9840</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
@@ -206,7 +206,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>70</count>
+				<count>82</count>
 			</li>
 			<li>
 				<filter>
@@ -226,7 +226,7 @@
 		<products>
 			<Ammo_20x82mmMauser_Incendiary>200</Ammo_20x82mmMauser_Incendiary>
 		</products>
-		<workAmount>11400</workAmount>
+		<workAmount>12600</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
@@ -241,7 +241,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>70</count>
+				<count>82</count>
 			</li>
 			<li>
 				<filter>
@@ -261,7 +261,7 @@
 		<products>
 			<Ammo_20x82mmMauser_HE>200</Ammo_20x82mmMauser_HE>
 		</products>
-		<workAmount>15800</workAmount>
+		<workAmount>17000</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
@@ -276,7 +276,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>26</count>
+				<count>38</count>
 			</li>
 			<li>
 				<filter>
@@ -305,7 +305,7 @@
 		<products>
 			<Ammo_20x82mmMauser_Sabot>200</Ammo_20x82mmMauser_Sabot>
 		</products>
-		<workAmount>10400</workAmount>
+		<workAmount>11600</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file

From 9ab13a3e4e2a2abd6915dca1c80b97f76d857581 Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:25:33 +0330
Subject: [PATCH 2/2] .45-70 recipe typo fix

---
 Defs/Ammo/Rifle/4570Gov.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Defs/Ammo/Rifle/4570Gov.xml b/Defs/Ammo/Rifle/4570Gov.xml
index c94a38e1dd..171038260c 100644
--- a/Defs/Ammo/Rifle/4570Gov.xml
+++ b/Defs/Ammo/Rifle/4570Gov.xml
@@ -217,7 +217,7 @@
 
 	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_4570Gov_FMJ</defName>
-		<label>make .45-70 Government cartridge (FMJ) cartridge x400</label>
+		<label>make .45-70 Government cartridge (FMJ) cartridge x500</label>
 		<description>Craft 500 .45-70 Government cartridge (FMJ) cartridges.</description>
 		<jobString>Making .45-70 Government cartridge (FMJ) cartridges.</jobString>
 		<ingredients>