Skip to content

Commit

Permalink
refactor: .223 to 5.56x45mm
Browse files Browse the repository at this point in the history
  • Loading branch information
scarf005 committed Apr 24, 2023
1 parent c180b31 commit 722dbdf
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions data/json/items/ammo/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "223",
"type": "AMMO",
"name": { "str": ".223 Remington" },
"name": { "str": "5.56x45mm '.223 Remington'" },
"description": ".223 Remington ammunition with 36gr JHP bullets. The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons. It generates lower pressure than 5.56x45mm NATO leading to slightly decreased accuracy and recoil.",
"weight": "12 g",
"volume": "250 ml",
Expand Down Expand Up @@ -49,7 +49,7 @@
"id": "bp_223",
"copy-from": "223",
"type": "AMMO",
"name": { "str": ".223 Remington, black powder" },
"name": { "str": "5.56x45mm '.223 Remington', black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/generic/ammolink.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"id": "ammolink223",
"copy-from": "ammolink",
"type": "GENERIC",
"name": { "str": ".223 ammo belt linkage" },
"name": { "str": "5.56x45mm ammo belt linkage" },
"use_action": { "type": "ammobelt", "belt": "belt223" }
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/generic/casing.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"id": "223_casing",
"copy-from": "casing",
"type": "GENERIC",
"name": { "str": ".223 casing" },
"description": "An empty casing from a .223 round.",
"name": { "str": "5.56x45mm casing" },
"description": "An empty casing from a 5.56x45mm round.",
"weight": "5 g",
"volume": "5ml"
},
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"copy-from": "rifle_auto",
"type": "GUN",
"name": { "str": "Remington ACR" },
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing .223 carbines.",
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing 5.56x45mm carbines.",
"weight": "3590 g",
"volume": "2 L",
"price": 234300,
Expand Down Expand Up @@ -179,7 +179,7 @@
"copy-from": "rifle_auto",
"type": "GUN",
"name": { "str": "H&K G36" },
"description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.",
"description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter 5.56x45mm round, allowing for a higher ammo capacity.",
"weight": "3630 g",
"volume": "2500 ml",
"barrel_length": "250 ml",
Expand Down Expand Up @@ -396,7 +396,7 @@
"id": "rifle_223",
"copy-from": "rifle_home_made",
"type": "GUN",
"name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" },
"name": { "str": "pipe rifle: 5.56x45mm", "str_pl": "pipe rifles: 5.56x45mm" },
"description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
"weight": "4080 g",
"volume": "3 L",
Expand Down Expand Up @@ -447,7 +447,7 @@
"copy-from": "rifle_auto",
"type": "GUN",
"name": { "str": "FN SCAR-L" },
"description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command. The 'L' in its name stands for light, as it uses the lightweight .223 round.",
"description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command. The 'L' in its name stands for light, as it uses the lightweight 5.56x45mm round.",
"weight": "3300 g",
"volume": "2250 ml",
"barrel_length": "250 ml",
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/magazine/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"id": "ruger5",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "Ruger .223 5-round magazine" },
"name": { "str": "Ruger 5.56x45mm 5-round magazine" },
"description": "A compact 5-round box magazine used with the Ruger Mini-14 rifle.",
"weight": "60 g",
"volume": "250 ml",
Expand Down Expand Up @@ -70,7 +70,7 @@
"copy-from": "stanag10",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "Ruger .223 10-round magazine" },
"name": { "str": "Ruger 5.56x45mm 10-round magazine" },
"description": "A compact 10-round box magazine used with the Ruger Mini-14 rifle.",
"ammo_type": "223"
},
Expand All @@ -79,15 +79,15 @@
"copy-from": "stanag20",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "Ruger .223 20-round magazine" },
"name": { "str": "Ruger 5.56x45mm 20-round magazine" },
"description": "A 20-round box magazine used with the Ruger Mini-14 rifle.",
"ammo_type": "223"
},
{
"id": "ruger30",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "Ruger .223 30-round magazine" },
"name": { "str": "Ruger 5.56x45mm 30-round magazine" },
"description": "A high-capacity box magazine for use with the Ruger Mini-14 rifle.",
"weight": "360 g",
"volume": "500 ml",
Expand All @@ -106,7 +106,7 @@
"copy-from": "stanag90",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "Ruger .223 90-round snail drum magazine" },
"name": { "str": "Ruger 5.56x45mm 90-round snail drum magazine" },
"description": "A bulky 90-round snail drum magazine for use with the Ruger Mini-14 rifle.",
"ammo_type": "223"
},
Expand All @@ -115,7 +115,7 @@
"copy-from": "stanag100drum",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "Ruger .223 100-round double drum magazine" },
"name": { "str": "Ruger 5.56x45mm 100-round double drum magazine" },
"description": "A bulky 100-round double drum magazine for use with the Ruger Mini-14 rifle.",
"ammo_type": "223"
},
Expand Down
6 changes: 3 additions & 3 deletions data/json/obsoletion/items.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@
{
"id": "retool_223",
"type": "GUNMOD",
"name": { "str": ".223 caliber conversion kit" },
"description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or .308 rifle to the popular, accurate, and lighter .223 caliber. The conversion results in slight reductions to both accuracy and ammo capacity.",
"name": { "str": "5.56x45mm caliber conversion kit" },
"description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or .308 rifle to the popular, accurate, and lighter 5.56x45mm caliber. The conversion results in slight reductions to both accuracy and ammo capacity.",
"weight": "114 g",
"volume": "500 ml",
"integral_volume": 0,
Expand Down Expand Up @@ -3971,7 +3971,7 @@
"id": "reloaded_223",
"copy-from": "223",
"type": "AMMO",
"name": { "str": ".223 Remington, reloaded" },
"name": { "str": "5.56x45mm '.223 Remington', reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand Down

0 comments on commit 722dbdf

Please sign in to comment.