Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20x82mm casing mass fix and misc typo fix #3429

Merged
merged 2 commits into from
Sep 18, 2024
Merged

20x82mm casing mass fix and misc typo fix #3429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51072f7
20x82mm casing mass fix
SamaelGray Sep 17, 2024
9ab13a3
.45-70 recipe typo fix
SamaelGray Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Defs/Ammo/HighCaliber/20x82mmMauser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -180,7 +180,7 @@
<li>Steel</li>
</thingDefs>
</filter>
<count>70</count>
<count>82</count>
</li>
</ingredients>
<fixedIngredientFilter>
Expand All @@ -191,7 +191,7 @@
<products>
<Ammo_20x82mmMauser_AP>200</Ammo_20x82mmMauser_AP>
</products>
<workAmount>8400</workAmount>
<workAmount>9840</workAmount>
</RecipeDef>

<RecipeDef ParentName="AdvancedAmmoRecipeBase">
Expand All @@ -206,7 +206,7 @@
<li>Steel</li>
</thingDefs>
</filter>
<count>70</count>
<count>82</count>
</li>
<li>
<filter>
Expand All @@ -226,7 +226,7 @@
<products>
<Ammo_20x82mmMauser_Incendiary>200</Ammo_20x82mmMauser_Incendiary>
</products>
<workAmount>11400</workAmount>
<workAmount>12600</workAmount>
</RecipeDef>

<RecipeDef ParentName="AdvancedAmmoRecipeBase">
Expand All @@ -241,7 +241,7 @@
<li>Steel</li>
</thingDefs>
</filter>
<count>70</count>
<count>82</count>
</li>
<li>
<filter>
Expand All @@ -261,7 +261,7 @@
<products>
<Ammo_20x82mmMauser_HE>200</Ammo_20x82mmMauser_HE>
</products>
<workAmount>15800</workAmount>
<workAmount>17000</workAmount>
</RecipeDef>

<RecipeDef ParentName="AdvancedAmmoRecipeBase">
Expand All @@ -276,7 +276,7 @@
<li>Steel</li>
</thingDefs>
</filter>
<count>26</count>
<count>38</count>
</li>
<li>
<filter>
Expand Down Expand Up @@ -305,7 +305,7 @@
<products>
<Ammo_20x82mmMauser_Sabot>200</Ammo_20x82mmMauser_Sabot>
</products>
<workAmount>10400</workAmount>
<workAmount>11600</workAmount>
</RecipeDef>

</Defs>
2 changes: 1 addition & 1 deletion Defs/Ammo/Rifle/4570Gov.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading