Skip to content

Commit

Permalink
10mm adheres to GAME_BALANCE.md (#49380)
Browse files Browse the repository at this point in the history
  • Loading branch information
LaVeyanFiend committed Jun 21, 2021
1 parent 1a916cd commit 7b0c179
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 13 deletions.
4 changes: 2 additions & 2 deletions data/json/items/ammo/10mm.json
View file
Expand Up @@ -3,7 +3,7 @@
"id": "10mm_fmj",
"type": "AMMO",
"name": { "str_sp": "10mm Auto FMJ" },
"description": "A jacketed 10mm Auto round. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
"description": "Jacketed 10mm Auto ammunition with 180gr bullets. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
"weight": "9 g",
"volume": "117 ml",
"price": 400,
Expand All @@ -17,7 +17,7 @@
"ammo_type": "10mm",
"casing": "10mm_casing",
"range": 14,
"damage": { "damage_type": "bullet", "amount": 31, "armor_penetration": 4 },
"damage": { "damage_type": "bullet", "amount": 28, "armor_penetration": 4 },
"dispersion": 50,
"recoil": 750,
"effects": [ "COOKOFF" ]
Expand Down
10 changes: 1 addition & 9 deletions data/json/items/gun/10mm.json
View file
Expand Up @@ -18,7 +18,6 @@
"symbol": "(",
"color": "dark_gray",
"ammo": [ "10mm", "40" ],
"ranged_damage": { "damage_type": "bullet", "amount": -7 },
"dispersion": 320,
"durability": 8,
"blackpowder_tolerance": 56,
Expand Down Expand Up @@ -51,7 +50,6 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -7 },
"dispersion": 510,
"durability": 8,
"blackpowder_tolerance": 48,
Expand Down Expand Up @@ -86,7 +84,6 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -6 },
"dispersion": 480,
"durability": 8,
"blackpowder_tolerance": 48,
Expand Down Expand Up @@ -121,7 +118,6 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -4 },
"dispersion": 440,
"sight_dispersion": 440,
"durability": 8,
Expand Down Expand Up @@ -154,7 +150,7 @@
"min_cycle_recoil": 675,
"ammo": "10mm",
"skill": "rifle",
"ranged_damage": { "damage_type": "bullet", "amount": -1 },
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"built_in_mods": [ "folding_stock" ],
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"pocket_data": [
Expand Down Expand Up @@ -220,7 +216,6 @@
"material": [ "steel" ],
"color": "dark_gray",
"ammo": "10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -6 },
"dispersion": 480,
"durability": 7,
"min_cycle_recoil": 675,
Expand Down Expand Up @@ -253,7 +248,6 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -5 },
"dispersion": 410,
"durability": 7,
"min_cycle_recoil": 675,
Expand Down Expand Up @@ -286,7 +280,6 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -5 },
"dispersion": 480,
"durability": 8,
"min_cycle_recoil": 675,
Expand Down Expand Up @@ -315,7 +308,6 @@
"price_postapoc": 2300,
"skill": "pistol",
"ammo": "10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -4 },
"min_cycle_recoil": 675,
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"pocket_data": [
Expand Down
4 changes: 2 additions & 2 deletions doc/GAME_BALANCE.md
View file
Expand Up @@ -191,7 +191,7 @@ Bow damage is based on the momentum achieved in the projectile. Since arrows an
## Ammo stats
The damage (**Dmg**) of firearm ammunition is the square root of a round's muzzle energy in joules (**Energy, J**) rounded to the nearest integer with an arbitrary increase or decrease to account for terminal ballistics. Damage of handloaded ammo is set to 92% (rounded down) of their factory counterparts. A similar system for calculating recoil is planned but not currently being worked on. The figures used to calculate stats and any other relevant information are presented in table below.

Each cartridge also has a Base Barrel Length (**Base Brl**) listed; this determines the damage for the connected guns. A firearm has its damage modifier determined by it's real life barrel length; for every three inches between it and the listed baseline here, the gun takes a 1 point bonus or penalty, rounding to the nearest modifier. For example, a .45 ACP gun with a 7 inch barrel would get a +1 bonus (against a baseline of 5 inches).
Each cartridge also has a Base Barrel Length (**Base Brl**) listed; this determines the damage for the connected guns. A firearm has its damage modifier determined by its real life barrel length; for every three inches between it and the listed baseline here, the gun takes a 1 point bonus or penalty, rounding to the nearest modifier. For example, a .45 ACP gun with a 7 inch barrel would get a +1 bonus (against a baseline of 5 inches).

Ammo ID | Description | Energy, J | Dmg | Base Brl | Applied Modifiers / Comments |
-------------------|-----------------------------|-----------|-----|----------|-------------------------------
Expand All @@ -211,7 +211,7 @@ Ammo ID | Description | Energy, J | Dmg | Base Brl |
.38 Special | 130gr FMJ bullet | 256 | 16 | 4in | |
.38 FMJ | 130gr FMJ bullet | 256 | 16 | 4in | |
.38 Super | 147gr JHP bullet | 660 | 26 | 4in | |
10mm Auto | 180gr FMJ bullet | 960 | 31 | 4in | |
10mm Auto | 180gr FMJ bullet | 799 | 28 | 5in | |
.40 S&W | 135gr JHP bullet | 575 | 24 | 4in | |
.40 FMJ | 180gr FMJ bullet | 598 | 24 | 4in | |
.44 Magnum | 240gr JHP bullet | 1570 | 40 | 7.5in | |
Expand Down

0 comments on commit 7b0c179

Please sign in to comment.