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.

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

Fix plural names in the Generic Guns mod #37514

Merged
merged 1 commit into from
Jan 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 6 additions & 12 deletions data/mods/Generic_Guns/ammo/pistol.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "pistol_ball",
"type": "AMMO",
"copy-from": "40fmj",
"name": "pistol ammo, ball",
"name-plural": "pistol ammo, ball",
"name": { "str": "pistol ammo, ball", "str_pl": "pistol ammo, ball" },
"ammo_type": "ammo_pistol",
"casing": "pistol_casing",
"description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
Expand All @@ -13,35 +12,31 @@
"id": "pistol_jhp",
"type": "AMMO",
"copy-from": "pistol_ball",
"name": "pistol ammo, JHP",
"name-plural": "pistol ammo, JHP",
"name": { "str": "pistol ammo, JHP", "str_pl": "pistol ammo, JHP" },
"description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
"relative": { "damage": 3, "pierce": -6 }
},
{
"id": "reloaded_pistol_ball",
"type": "AMMO",
"copy-from": "pistol_ball",
"name": "pistol ammo, ball (reloaded)",
"name-plural": "pistol ammo, ball (reloaded)",
"name": { "str": "pistol ammo, ball (reloaded)", "str_pl": "pistol ammo, ball (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "reloaded_pistol_jhp",
"type": "AMMO",
"copy-from": "pistol_jhp",
"name": "pistol ammo, JHP (reloaded)",
"name-plural": "pistol ammo, JHP (reloaded)",
"name": { "str": "pistol ammo, JHP (reloaded)", "str_pl": "pistol ammo, JHP (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "bp_pistol_ball",
"copy-from": "pistol_ball",
"type": "AMMO",
"name": "pistol ammo, ball (black powder)",
"name-plural": "pistol ammo, ball (black powder)",
"name": { "str": "pistol ammo, ball (black powder)", "str_pl": "pistol ammo, ball (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 @@ -50,8 +45,7 @@
"id": "bp_pistol_jhp",
"copy-from": "pistol_jhp",
"type": "AMMO",
"name": "pistol ammo, JHP (black powder)",
"name-plural": "pistol ammo, JHP (black powder)",
"name": { "str": "pistol ammo, JHP (black powder)", "str_pl": "pistol ammo, 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 Down
15 changes: 5 additions & 10 deletions data/mods/Generic_Guns/ammo/pistol_magnum.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,31 @@
"id": "pistol_magnum_jhp",
"type": "AMMO",
"copy-from": "pistol_magnum_ball",
"name": "magnum ammo, JHP",
"name-plural": "magnum ammo, JHP",
"name": { "str": "magnum ammo, JHP", "str_pl": "magnum ammo, JHP" },
"description": "Magnum ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
"relative": { "damage": 3, "pierce": -6 }
},
{
"id": "reloaded_pistol_magnum_ball",
"type": "AMMO",
"copy-from": "pistol_magnum_ball",
"name": "magnum ammo, ball (reloaded)",
"name-plural": "magnum ammo, ball (reloaded)",
"name": { "str": "magnum ammo, ball (reloaded)", "str_pl": "magnum ammo, ball (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "reloaded_pistol_magnum_jhp",
"type": "AMMO",
"copy-from": "pistol_magnum_jhp",
"name": "magnum ammo, JHP (reloaded)",
"name-plural": "magnum ammo, JHP (reloaded)",
"name": { "str": "magnum ammo, JHP (reloaded)", "str_pl": "magnum ammo, JHP (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "bp_pistol_magnum_ball",
"copy-from": "pistol_magnum_ball",
"type": "AMMO",
"name": "magnum ammo, ball (black powder)",
"name-plural": "magnum ammo, ball (black powder)",
"name": { "str": "magnum ammo, ball (black powder)", "str_pl": "magnum ammo, ball (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 @@ -50,8 +46,7 @@
"id": "bp_pistol_magnum_jhp",
"copy-from": "pistol_magnum_jhp",
"type": "AMMO",
"name": "magnum ammo, JHP (black powder)",
"name-plural": "magnum ammo, JHP (black powder)",
"name": { "str": "magnum ammo, JHP (black powder)", "str_pl": "magnum ammo, 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 Down
18 changes: 6 additions & 12 deletions data/mods/Generic_Guns/ammo/pistol_tiny.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "tiny_pistol_ball",
"type": "AMMO",
"copy-from": "32_acp",
"name": "tiny pistol ammo, ball",
"name-plural": "tiny pistol ammo, ball",
"name": { "str": "tiny pistol ammo, ball", "str_pl": "tiny pistol ammo, ball" },
"ammo_type": "ammo_pistol_tiny",
"casing": "pistol_tiny_casing",
"description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.",
Expand All @@ -14,35 +13,31 @@
"id": "tiny_pistol_jhp",
"type": "AMMO",
"copy-from": "tiny_pistol_ball",
"name": "tiny pistol ammo, JHP",
"name-plural": "tiny pistol ammo, JHP",
"name": { "str": "tiny pistol ammo, JHP", "str_pl": "tiny pistol ammo, JHP" },
"description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
"relative": { "damage": 2, "pierce": -3 }
},
{
"id": "reloaded_tiny_pistol_ball",
"type": "AMMO",
"copy-from": "tiny_pistol_ball",
"name": "tiny pistol ammo, ball (reloaded)",
"name-plural": "tiny pistol ammo, ball (reloaded)",
"name": { "str": "tiny pistol ammo, ball (reloaded)", "str_pl": "tiny pistol ammo, ball (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "reloaded_tiny_pistol_jhp",
"type": "AMMO",
"copy-from": "tiny_pistol_jhp",
"name": "tiny pistol ammo, JHP (reloaded)",
"name-plural": "tiny pistol ammo, JHP (reloaded)",
"name": { "str": "tiny pistol ammo, JHP (reloaded)", "str_pl": "tiny pistol ammo, JHP (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "bp_tiny_pistol_ball",
"type": "AMMO",
"copy-from": "tiny_pistol_ball",
"name": "tiny pistol ammo, ball (black powder)",
"name-plural": "tiny pistol ammo, ball (black powder)",
"name": { "str": "tiny pistol ammo, ball (black powder)", "str_pl": "tiny pistol ammo, ball (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 @@ -51,8 +46,7 @@
"id": "bp_tiny_pistol_jhp",
"type": "AMMO",
"copy-from": "tiny_pistol_jhp",
"name": "tiny pistol ammo, JHP (black powder)",
"name-plural": "tiny pistol ammo, JHP (black powder)",
"name": { "str": "tiny pistol ammo, JHP (black powder)", "str_pl": "tiny pistol ammo, JHP (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 Down
18 changes: 6 additions & 12 deletions data/mods/Generic_Guns/ammo/rifle.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "rifle_ball",
"type": "AMMO",
"copy-from": "762_51",
"name": "rifle ammo, ball",
"name-plural": "rifle ammo, ball",
"name": { "str": "rifle ammo, ball", "str_pl": "rifle ammo, ball" },
"ammo_type": "ammo_rifle",
"casing": "rifle_casing",
"description": "Modern rifle ammunition, ubiquitous and affordable. It's suitable for international conflicts, hunting small to large game, home defense, and these days, zombies. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
Expand All @@ -13,35 +12,31 @@
"id": "rifle_AP",
"type": "AMMO",
"copy-from": "rifle_ball",
"name": "rifle ammo, AP",
"name-plural": "rifle ammo, AP",
"name": { "str": "rifle ammo, AP", "str_pl": "rifle ammo, AP" },
"description": "Modern rifle ammunition, ubiquitous and affordable. It's suitable for international conflicts, hunting small to large game, home defense, and these days, zombies. This 'armor piercing' variant features a mild steel penetrator for environmental friendliness, improved barrier penetration, and enhanced effect on armor.",
"relative": { "damage": -2, "pierce": 4 }
},
{
"id": "reloaded_rifle_ball",
"type": "AMMO",
"copy-from": "rifle_ball",
"name": "rifle ammo, ball (reloaded)",
"name-plural": "rifle ammo, ball (reloaded)",
"name": { "str": "rifle ammo, ball (reloaded)", "str_pl": "rifle ammo, ball (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "reloaded_rifle_AP",
"type": "AMMO",
"copy-from": "rifle_AP",
"name": "rifle ammo, AP (reloaded)",
"name-plural": "rifle ammo, AP (reloaded)",
"name": { "str": "rifle ammo, AP (reloaded)", "str_pl": "rifle ammo, AP (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "bp_rifle_ball",
"copy-from": "rifle_ball",
"type": "AMMO",
"name": "rifle ammo, ball (black powder)",
"name-plural": "rifle ammo, ball (black powder)",
"name": { "str": "rifle ammo, ball (black powder)", "str_pl": "rifle ammo, ball (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 @@ -50,8 +45,7 @@
"id": "bp_rifle_AP",
"copy-from": "rifle_AP",
"type": "AMMO",
"name": "rifle ammo, AP (black powder)",
"name-plural": "rifle ammo, A (black powder)P",
"name": { "str": "rifle ammo, AP (black powder)", "str_pl": "rifle ammo, A (black powder)P" },
"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 Down
18 changes: 6 additions & 12 deletions data/mods/Generic_Guns/ammo/rifle_huge.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "rifle_huge_ball",
"type": "AMMO",
"copy-from": "50bmg",
"name": "huge rifle ammo, ball",
"name-plural": "huge rifle ammo, ball",
"name": { "str": "huge rifle ammo, ball", "str_pl": "huge rifle ammo, ball" },
"ammo_type": "ammo_rifle_huge",
"casing": "rifle_huge_casing",
"description": "Huge rifle ammunition like this bridges the gap between light cannons and big game rifles. It's suitable for taking on light vehicles and other materiel, or hunting extremely large game. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
Expand All @@ -13,35 +12,31 @@
"id": "rifle_huge_AP",
"type": "AMMO",
"copy-from": "rifle_huge_ball",
"name": "huge rifle ammo, AP",
"name-plural": "huge rifle ammo, AP",
"name": { "str": "huge rifle ammo, AP", "str_pl": "huge rifle ammo, AP" },
"description": "Huge rifle ammunition like this bridges the gap between light cannons and big game rifles. It's suitable for taking on light vehicles and other materiel, or hunting extremely large game. These armor piercing munitions feature tungsten steel penetrators for use against light-skinned vehicles.",
"relative": { "damage": -10, "pierce": 20 }
},
{
"id": "reloaded_rifle_huge_ball",
"type": "AMMO",
"copy-from": "rifle_huge_ball",
"name": "huge rifle ammo, ball (reloaded)",
"name-plural": "huge rifle ammo, ball (reloaded)",
"name": { "str": "huge rifle ammo, ball (reloaded)", "str_pl": "huge rifle ammo, ball (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "reloaded_rifle_huge_AP",
"type": "AMMO",
"copy-from": "rifle_huge_AP",
"name": "huge rifle ammo, AP (reloaded)",
"name-plural": "huge rifle ammo, AP (reloaded)",
"name": { "str": "huge rifle ammo, AP (reloaded)", "str_pl": "huge rifle ammo, AP (reloaded)" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] }
},
{
"id": "bp_rifle_huge_ball",
"copy-from": "rifle_huge_ball",
"type": "AMMO",
"name": "rifle ammo, ball (black powder)",
"name-plural": "rifle ammo, ball (black powder)",
"name": { "str": "rifle ammo, ball (black powder)", "str_pl": "rifle ammo, ball (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 @@ -50,8 +45,7 @@
"id": "bp_rifle_huge_AP",
"copy-from": "rifle_huge_AP",
"type": "AMMO",
"name": "rifle ammo, AP (black powder)",
"name-plural": "rifle ammo, AP (black powder)",
"name": { "str": "rifle ammo, AP (black powder)", "str_pl": "rifle ammo, AP (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 Down
9 changes: 3 additions & 6 deletions data/mods/Generic_Guns/ammo/rocket.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "rocket_he",
"type": "AMMO",
"copy-from": "84x246mm_he",
"name": "rocket, antipersonnel",
"name-plural": "rocket, antipersonnel",
"name": { "str": "rocket, antipersonnel", "str_pl": "rocket, antipersonnel" },
"description": "A large anti-personnel rocket for a military rocket launcher. Designed to be highly effective against personnel.",
"material": [ "steel", "powder" ],
"volume": "1250 ml",
Expand All @@ -15,16 +14,14 @@
"id": "rocket_hedp",
"type": "AMMO",
"copy-from": "84x246mm_hedp",
"name": "rocket, multipurpose",
"name-plural": "rocket, multipurpose",
"name": { "str": "rocket, multipurpose", "str_pl": "rocket, multipurpose" },
"description": "An anti-tank rocket with a high explosive dual purpose warhead for a military rocket launcher. Designed to be highly effective against vehicles and structures, and retains some effectiveness against personnel."
},
{
"id": "rocket_smoke",
"type": "AMMO",
"copy-from": "84x246mm_smoke",
"name": "rocket, smoke",
"name-plural": "rocket, smoke",
"name": { "str": "rocket, smoke", "str_pl": "rocket, smoke" },
"description": "A rocket loaded with a smoke warhead for a military rocket launcher. Commonly used for signaling, target designation, and for screening troop movements."
}
]
Loading