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

Ammo modern json #37320

Merged
merged 1 commit into from
Jan 23, 2020
Merged

Ammo modern json #37320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions data/json/items/ammo/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"id": "bp_223",
"copy-from": "223",
"type": "AMMO",
"name": ".223 Remington, black powder",
"name": { "str": ".223 Remington, black powder" },
"proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -73,7 +73,7 @@
"id": "reloaded_223",
"copy-from": "223",
"type": "AMMO",
"name": ".223 Remington, reloaded",
"name": { "str": ".223 Remington, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/300.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "300_winmag",
"type": "AMMO",
"name": ".300 Winchester Magnum",
"name": { "str": ".300 Winchester Magnum" },
"description": ".300 Winchester Magnum rounds with 220gr JHP bullets. The 300WM round is an extremely powerful and accurate rifle round introduced in 1963. It has proven popular with hunters and snipers, although it is not as common as .308 or .30-06.",
"weight": "28 g",
"volume": "250 ml",
Expand Down Expand Up @@ -35,7 +35,7 @@
"id": "reloaded_300_winmag",
"copy-from": "300_winmag",
"type": "AMMO",
"name": ".300 Winchester Magnum, reloaded",
"name": { "str": ".300 Winchester Magnum, reloaded" },
"description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines. The cartridge has found use by hunters, military units, and law enforcement departments. This one has been hand-reloaded.",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/308.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"id": "bp_308",
"copy-from": "308",
"type": "AMMO",
"name": ".308 Winchester, black powder",
"name": { "str": ".308 Winchester, black powder" },
"proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -72,7 +72,7 @@
"id": "reloaded_308",
"copy-from": "308",
"type": "AMMO",
"name": ".308 Winchester, reloaded",
"name": { "str": ".308 Winchester, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
14 changes: 6 additions & 8 deletions data/json/items/ammo/357mag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "357mag_fmj",
"type": "AMMO",
"name": ".357 magnum FMJ",
"name": { "str": ".357 magnum FMJ" },
"description": "Jacketed .357 magnum ammunition. The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
"weight": "8 g",
"volume": "250 ml",
Expand All @@ -26,15 +26,15 @@
"id": "357mag_jhp",
"copy-from": "357mag_fmj",
"type": "AMMO",
"name": ".357 magnum JHP",
"name": { "str": ".357 magnum JHP" },
"description": "Jacketed hollow point .357 magnum ammunition. The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
"relative": { "damage": 4, "pierce": -2 }
},
{
"id": "bp_357mag_fmj",
"copy-from": "357mag_fmj",
"type": "AMMO",
"name": ".357 Magnum FMJ, black powder",
"name": { "str": ".357 Magnum FMJ, black powder" },
"proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -43,7 +43,7 @@
"id": "bp_357mag_jhp",
"copy-from": "357mag_jhp",
"type": "AMMO",
"name": ".357 Magnum JHP, black powder",
"name": { "str": ".357 Magnum JHP, black powder" },
"proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -52,16 +52,14 @@
"id": "reloaded_357mag_fmj",
"copy-from": "357mag_fmj",
"type": "AMMO",
"name": ".357 Magnum FMJ, reloaded",
"name_plural": ".357 Magnum FMJ, reloaded",
"name": { "str": ".357 Magnum FMJ, reloaded", "str_pl": ".357 Magnum FMJ, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
},
{
"id": "reloaded_357mag_jhp",
"copy-from": "357mag_jhp",
"type": "AMMO",
"name": ".357 Magnum JHP, reloaded",
"name_plural": ".357 Magnum JHP, reloaded",
"name": { "str": ".357 Magnum JHP, reloaded", "str_pl": ".357 Magnum JHP, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
}
]
8 changes: 4 additions & 4 deletions data/json/items/ammo/357sig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "357sig_fmj",
"type": "AMMO",
"name": ".357 SIG FMJ",
"name": { "str": ".357 SIG FMJ" },
"description": "Jacketed .357 SIG ammunition. The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds.",
"weight": "8 g",
"volume": "250 ml",
Expand All @@ -26,15 +26,15 @@
"id": "357sig_jhp",
"copy-from": "357sig_fmj",
"type": "AMMO",
"name": ".357 SIG JHP",
"name": { "str": ".357 SIG JHP" },
"description": "Jacketed hollow point .357 SIG ammunition. The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds.",
"relative": { "damage": 4, "pierce": -2 }
},
{
"id": "reloaded_357sig_fmj",
"copy-from": "357sig_fmj",
"type": "AMMO",
"name": ".357 SIG FMJ, reloaded",
"name": { "str": ".357 SIG FMJ, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -43,7 +43,7 @@
"id": "reloaded_357sig_jhp",
"copy-from": "357sig_jhp",
"type": "AMMO",
"name": ".357 SIG JHP, reloaded",
"name": { "str": ".357 SIG JHP, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/36paper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "36navy",
"type": "AMMO",
"name": ".36 paper cartridge",
"name": { "str": ".36 paper cartridge" },
"description": "A paper cartridge containing a premeasured amount of black powder and a .36 projectile. Used by the Colt M1861 Navy.",
"weight": "6 g",
"volume": "250 ml",
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/ammo/38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{
"id": "38_special",
"type": "AMMO",
"name": ".38 Special",
"name": { "str": ".38 Special" },
"description": ".38 Special ammunition with 130gr FMJ bullets. The .38 Special round was extremely common among US police forces during the 20th century.",
"weight": "8 g",
"volume": "250 ml",
Expand Down Expand Up @@ -45,7 +45,7 @@
"id": "reloaded_38_fmj",
"copy-from": "38_fmj",
"type": "AMMO",
"name": ".38 FMJ, reloaded",
"name": { "str": ".38 FMJ, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -54,7 +54,7 @@
"id": "reloaded_38_special",
"copy-from": "38_special",
"type": "AMMO",
"name": ".38 Special, reloaded",
"name": { "str": ".38 Special, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -72,7 +72,7 @@
"id": "bp_38_fmj",
"copy-from": "38_fmj",
"type": "AMMO",
"name": ".38 FMJ, black powder",
"name": { "str": ".38 FMJ, black powder" },
"proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -81,7 +81,7 @@
"id": "bp_38_special",
"copy-from": "38_special",
"type": "AMMO",
"name": ".38 Special, black powder",
"name": { "str": ".38 Special, black powder" },
"proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/38super.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "38super_fmj",
"type": "AMMO",
"name": ".38 Super FMJ",
"name": { "str": ".38 Super FMJ" },
"description": ".38 Super ammunition with 147gr FMJ bullets. The .38 Super round was developed from .38 ACP in the 1920s, designed to penetrate the body armor of the era.",
"weight": "8 g",
"volume": "250 ml",
Expand All @@ -25,7 +25,7 @@
"id": "reloaded_38super_fmj",
"copy-from": "38super_fmj",
"type": "AMMO",
"name": ".38 Super FMJ, reloaded",
"name": { "str": ".38 Super FMJ, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down