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

Jump to bottom

Regularize ammunition naming #34618

Merged
merged 6 commits into from
Nov 25, 2019
Merged

Regularize ammunition naming #34618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1478e8a
Regularize ammunition naming
Muffindrake Oct 10, 2019
5452fa2
Change ammunition name scheme to commas
Muffindrake Oct 11, 2019
7f5bcdd
Merge branch 'master' into ammo_naming
Muffindrake Oct 25, 2019
335b25d
Fix renaming mistake for reloaded .223 Remington
Muffindrake Nov 25, 2019
0d8f79e
Fix naming mistake for regular scrap loaded shot
Muffindrake Nov 25, 2019
0c748de
Change blackpowder to black powder
Muffindrake Nov 25, 2019
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/10mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"id": "bp_10mm_fmj",
"copy-from": "10mm_fmj",
"type": "AMMO",
"name": "10mm Auto FMJ blackpowder",
"name": "10mm Auto 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 @@ -35,7 +35,7 @@
"id": "reloaded_10mm_fmj",
"copy-from": "10mm_fmj",
"type": "AMMO",
"name": "reloaded 10mm Auto FMJ",
"name": "10mm Auto FMJ, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/ammo/20x66mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"id": "20x66_bootleg_flechette",
"copy-from": "20x66_flechette",
"type": "AMMO",
"name": "handmade 20x66mm flechette",
"name": "20x66mm flechette, handmade",
"description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
Expand All @@ -25,7 +25,7 @@
"id": "20x66_bootleg_shot",
"copy-from": "20x66_shot",
"type": "AMMO",
"name": "handmade 20x66mm buckshot",
"name": "20x66mm buckshot, handmade",
"description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
Expand All @@ -35,7 +35,7 @@
"id": "20x66_bootleg_slug",
"copy-from": "20x66_slug",
"type": "AMMO",
"name": "handmade 20x66mm slug",
"name": "20x66mm slug, handmade",
"description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/ammo/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"id": "bp_22_fmj",
"copy-from": "22_fmj",
"type": "AMMO",
"name": ".22 LR FMJ blackpowder",
"name": ".22 LR FMJ, 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 @@ -67,7 +67,7 @@
"id": "bp_22_lr",
"copy-from": "22_lr",
"type": "AMMO",
"name": ".22 LR blackpowder",
"name": ".22 LR, 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 @@ -76,7 +76,7 @@
"id": "reloaded_22_lr",
"copy-from": "22_lr",
"type": "AMMO",
"name": "handloaded .22 LR",
"name": ".22 LR, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -85,7 +85,7 @@
"id": "reloaded_22_fmj",
"copy-from": "22_fmj",
"type": "AMMO",
"name": "handloaded .22 FMJ",
"name": ".22 FMJ, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
12 changes: 6 additions & 6 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 blackpowder",
"name": ".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 @@ -55,7 +55,7 @@
"id": "bp_556",
"copy-from": "556",
"type": "AMMO",
"name": "5.56 NATO blackpowder",
"name": "5.56 NATO, 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 @@ -64,7 +64,7 @@
"id": "bp_556_incendiary",
"copy-from": "556_incendiary",
"type": "AMMO",
"name": "5.56 NATO tracer blackpowder",
"name": "5.56 NATO tracer, 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": "reloaded .223 Remington",
Muffindrake marked this conversation as resolved.
Show resolved Hide resolved
"name": ".223 Remington, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -82,7 +82,7 @@
"id": "reloaded_556",
"copy-from": "556",
"type": "AMMO",
"name": "reloaded 5.56 NATO",
"name": "5.56 NATO, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -91,7 +91,7 @@
"id": "reloaded_556_incendiary",
"copy-from": "556_incendiary",
"type": "AMMO",
"name": "reloaded 5.56 NATO tracer",
"name": "5.56 NATO tracer, 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/270win.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"id": "bp_270win_jsp",
"copy-from": "270win_jsp",
"type": "AMMO",
"name": ".270 Winchester JSP blackpowder",
"name": ".270 Winchester JSP, black powder",
"proportional": { "price": 0.3, "damage": 0.7, "recoil": 0.7, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -35,7 +35,7 @@
"id": "reloaded_270win_jsp",
"copy-from": "270win_jsp",
"type": "AMMO",
"name": "reloaded .270 Winchester JSP",
"name": ".270 Winchester JSP, 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 @@ -26,7 +26,7 @@
"id": "bp_300_winmag",
"copy-from": "300_winmag",
"type": "AMMO",
"name": ".300 Winchester Magnum blackpowder",
"name": ".300 Winchester Magnum, 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 @@ -35,7 +35,7 @@
"id": "reloaded_300_winmag",
"copy-from": "300_winmag",
"type": "AMMO",
"name": "reloaded .300 Winchester Magnum",
"name": ".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
12 changes: 6 additions & 6 deletions data/json/items/ammo/3006.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"id": "bp_3006",
"copy-from": "3006",
"type": "AMMO",
"name": ".30-06 Springfield blackpowder",
"name": ".30-06 Springfield, 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 @@ -51,7 +51,7 @@
"id": "bp_3006_incendiary",
"copy-from": "3006_incendiary",
"type": "AMMO",
"name": ".30-06 Springfield tracer blackpowder",
"name": ".30-06 Springfield tracer, 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 @@ -60,7 +60,7 @@
"id": "bp_3006fmj",
"copy-from": "bp_3006",
"type": "AMMO",
"name": ".30-06 Springfield M2 AP blackpowder",
"name": ".30-06 Springfield M2 AP, 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 @@ -69,7 +69,7 @@
"id": "reloaded_3006",
"copy-from": "3006",
"type": "AMMO",
"name": "reloaded .30-06 Springfield",
"name": ".30-06 Springfield, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -78,7 +78,7 @@
"id": "reloaded_3006_incendiary",
"copy-from": "3006_incendiary",
"type": "AMMO",
"name": "reloaded .30-06 incendiary",
"name": ".30-06 incendiary, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -87,7 +87,7 @@
"id": "reloaded_3006fmj",
"copy-from": "3006fmj",
"type": "AMMO",
"name": "reloaded .30-06 M2 AP",
"name": ".30-06 M2 AP, 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/300blk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"id": "bp_300blk",
"copy-from": "300blk",
"type": "AMMO",
"name": ".300 AAC Blackout blackpowder",
"name": ".300 AAC Blackout, 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 @@ -46,7 +46,7 @@
"id": "reloaded_300blk",
"copy-from": "300blk",
"type": "AMMO",
"name": "reloaded .300 AAC Blackout",
"name": ".300 AAC Blackout, reloaded",
"description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform. The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine. It requires a specific barrel, so will not work in a standard M4 or similar carbine. This one has been hand-reloaded.",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
Expand Down
12 changes: 6 additions & 6 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 blackpowder",
"name": ".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 @@ -54,7 +54,7 @@
"id": "bp_762_51",
"copy-from": "762_51",
"type": "AMMO",
"name": "7.62x51mm blackpowder",
"name": "7.62x51mm, 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 @@ -63,7 +63,7 @@
"id": "bp_762_51_incendiary",
"copy-from": "762_51_incendiary",
"type": "AMMO",
"name": "7.62x51mm tracer blackpowder",
"name": "7.62x51mm tracer, 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": "reloaded .308 Winchester",
"name": ".308 Winchester, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -81,7 +81,7 @@
"id": "reloaded_762_51",
"copy-from": "762_51",
"type": "AMMO",
"name": "reloaded 7.62x51mm",
"name": "7.62x51mm, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand All @@ -90,7 +90,7 @@
"id": "reloaded_762_51_incendiary",
"copy-from": "762_51_incendiary",
"type": "AMMO",
"name": "reloaded 7.62x51mm incendiary",
"name": "7.62x51mm incendiary, 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/32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"id": "bp_32_acp",
"copy-from": "32_acp",
"type": "AMMO",
"name": ".32 ACP blackpowder",
"name": ".32 ACP, 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 @@ -34,7 +34,7 @@
"id": "reloaded_32_acp",
"copy-from": "32_acp",
"type": "AMMO",
"name": "reloaded .32 ACP",
"name": ".32 ACP, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/ammo/357mag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"id": "bp_357mag_fmj",
"copy-from": "357mag_fmj",
"type": "AMMO",
"name": ".357 Magnum FMJ blackpowder",
"name": ".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 blackpowder",
"name": ".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,16 @@
"id": "reloaded_357mag_fmj",
"copy-from": "357mag_fmj",
"type": "AMMO",
"name": "reloaded .357 Magnum FMJ",
"name_plural": "reloaded .357 Magnum FMJ",
"name": ".357 Magnum FMJ, reloaded",
"name_plural": ".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": "reloaded .357 Magnum JHP",
"name_plural": "reloaded .357 Magnum JHP",
"name": ".357 Magnum JHP, reloaded",
"name_plural": ".357 Magnum JHP, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
}
]
4 changes: 2 additions & 2 deletions data/json/items/ammo/357sig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"id": "reloaded_357sig_fmj",
"copy-from": "357sig_fmj",
"type": "AMMO",
"name": "reloaded .357 SIG FMJ",
"name": ".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": "reloaded .357 SIG JHP",
"name": ".357 SIG JHP, reloaded",
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
Expand Down
Loading