Skip to content

Shot ammo mass value fix #1833

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

Merged
SamaelGray merged 4 commits into from
Sep 7, 2022
Merged

Shot ammo mass value fix #1833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
150b224
Add files via upload
SamaelGray Sep 7, 2022
91cfdaf
Add files via upload
SamaelGray Sep 7, 2022
26c61c3
Update 23x75mmR.xml
SamaelGray Sep 7, 2022
a9351a2
Add files via upload
SamaelGray Sep 7, 2022
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
8 changes: 4 additions & 4 deletions Defs/Ammo/Advanced/12GaugeCharged.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<ThingDef Class="CombatExtended.AmmoDef" Name="12GaugeChargedBase" ParentName="SmallAmmoBase" Abstract="True">
<description>Multi-pellet charge shot cartridge designed for shotgun-type weapons.</description>
<statBases>
<Mass>0.034</Mass>
<Mass>0.047</Mass>
<Bulk>0.07</Bulk>
</statBases>
<tradeTags>
Expand All @@ -46,8 +46,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>2.8</MarketValue>
<Mass>0.028</Mass>
<MarketValue>2.8</MarketValue>
</statBases>
<ammoClass>BuckShot</ammoClass>
</ThingDef>
Expand All @@ -60,7 +59,8 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>2.8</MarketValue>
<MarketValue>2.8</MarketValue>
<Mass>0.043</Mass>
</statBases>
<ammoClass>Slug</ammoClass>
</ThingDef>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/15x65mmDiffusingCharged.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ThingDef Class="CombatExtended.AmmoDef" Name="15x65mmDiffusingChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
<description>Mechanoid-built cartridge designed to split upon firing.</description>
<statBases>
<Mass>0.05</Mass>
<Mass>0.11</Mass>
<Bulk>0.04</Bulk>
</statBases>
<thingCategories>
Expand Down
4 changes: 2 additions & 2 deletions Defs/Ammo/Shotgun/12Gauge.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
<Ammo_12Gauge_Beanbag>Bullet_12Gauge_Beanbag</Ammo_12Gauge_Beanbag>
<Ammo_12Gauge_ElectroSlug>Bullet_12Gauge_ElectroSlug</Ammo_12Gauge_ElectroSlug>
</ammoTypes>
<similarTo>AmmoSet_Shotgun</similarTo>
<similarTo>AmmoSet_Shotgun</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" Name="12GaugeBase" ParentName="SmallAmmoBase" Abstract="True">
<description>Extremely common shotgun caliber used in almost every application, from hunting over riot control to military firearms.</description>
<statBases>
<Mass>0.023</Mass>
<Mass>0.051</Mass>
<Bulk>0.06</Bulk>
</statBases>
<tradeTags>
Expand Down
8 changes: 5 additions & 3 deletions Defs/Ammo/Shotgun/20Gauge.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
<Ammo_20Gauge_Beanbag>Bullet_20Gauge_Beanbag</Ammo_20Gauge_Beanbag>
<Ammo_20Gauge_ElectroSlug>Bullet_20Gauge_ElectroSlug</Ammo_20Gauge_ElectroSlug>
</ammoTypes>
<similarTo>AmmoSet_Shotgun</similarTo>
<similarTo>AmmoSet_Shotgun</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" Name="20GaugeBase" ParentName="SmallAmmoBase" Abstract="True">
<description>Very common shotgun caliber used mostly for hunting.</description>
<statBases>
<Mass>0.017</Mass>
<Mass>0.044</Mass>
<Bulk>0.05</Bulk>
</statBases>
<tradeTags>
Expand Down Expand Up @@ -77,7 +77,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<Mass>0.08</Mass>
<Mass>0.033</Mass>
<MarketValue>0.14</MarketValue>
</statBases>
<ammoClass>Slug</ammoClass>
Expand All @@ -93,6 +93,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<Mass>0.042</Mass>
<MarketValue>0.19</MarketValue>
</statBases>
<ammoClass>Beanbag</ammoClass>
Expand All @@ -107,6 +108,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<Mass>0.037</Mass>
<MarketValue>0.49</MarketValue>
</statBases>
<ammoClass>ElectroSlug</ammoClass>
Expand Down
18 changes: 9 additions & 9 deletions Defs/Ammo/Shotgun/23x75mmR.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
<Ammo_23x75mmR_Beanbag>Bullet_23x75mmR_Beanbag</Ammo_23x75mmR_Beanbag>
<Ammo_23x75mmR_ElectroSlug>Bullet_23x75mmR_ElectroSlug</Ammo_23x75mmR_ElectroSlug>
</ammoTypes>
<similarTo>AmmoSet_Shotgun</similarTo>
<similarTo>AmmoSet_Shotgun</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" Name="23x75mmRBase" ParentName="SmallAmmoBase" Abstract="True">
<description>Large 6.27 gauge shotgun caliber designed to be fired by the KS-23 shotgun.</description>
<statBases>
<Mass>0.023</Mass>
<Mass>0.077</Mass>
<Bulk>0.1</Bulk>
</statBases>
<tradeTags>
Expand Down Expand Up @@ -119,10 +119,10 @@
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>10</damageAmountBase>
<damageAmountBase>11</damageAmountBase>
<pelletCount>16</pelletCount>
<armorPenetrationSharp>5</armorPenetrationSharp>
<armorPenetrationBlunt>3.98</armorPenetrationBlunt>
<armorPenetrationSharp>5</armorPenetrationSharp>
<armorPenetrationBlunt>5.3</armorPenetrationBlunt>
<spreadMult>17.8</spreadMult>
</projectile>
</ThingDef>
Expand All @@ -135,10 +135,10 @@
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>114</speed>
<speed>114</speed>
<damageAmountBase>57</damageAmountBase>
<armorPenetrationSharp>9</armorPenetrationSharp>
<armorPenetrationBlunt>526.34</armorPenetrationBlunt>
<armorPenetrationSharp>9</armorPenetrationSharp>
<armorPenetrationBlunt>526.34</armorPenetrationBlunt>
</projectile>
</ThingDef>

Expand All @@ -150,7 +150,7 @@
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>22</speed>
<speed>18</speed>
<damageDef>Beanbag</damageDef>
<damageAmountBase>16</damageAmountBase>
<armorPenetrationBlunt>13.78</armorPenetrationBlunt>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Shotgun/410Bore.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ThingDef Class="CombatExtended.AmmoDef" Name="410BoreBase" ParentName="SmallAmmoBase" Abstract="True">
<description>Low caliber shotgun shell. Its small diameter allows it to be fired from many of the same firearms as the .45 Colt cartridge.</description>
<statBases>
<Mass>0.009</Mass>
<Mass>0.027</Mass>
<Bulk>0.03</Bulk>
</statBases>
<tradeTags>
Expand Down