Skip to content

Commit

Permalink
fix(i18n): metric bullets part 1: rename .223 -> 5.56x45mm (#2691)
Browse files Browse the repository at this point in the history
* refactor: fully specify milimetre for 5.56x45mm

* refactor: change display name of `.223` to `5.56x45mm`

* refactor: `.223` to `5.56x45mm`

* refactor: make metric diameter primary
  • Loading branch information
scarf005 authored Apr 29, 2023
1 parent 6fea142 commit 413fd95
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion data/help/texts.json
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
"Q: Why can't I carry anything?\nA: At the start of the game you only have the space in your pockets. A good first goal of many survivors is to find a backpack or pouch to store things in.",
"Q: Help! I started a fire and now my house is burning down!\nA: Fires will spread to nearby flammable tiles if they are able. Lighting a fire in a set-up brazier, stove, wood stove, stone fireplace, pit, or even in a kitchen stove will stop it from spreading. Fire extinguishers can put out fires that get out of control. You can put out a fire in the fireplace by examining it.",
"Q: I'm cold and can't sleep at night!\nA: Gather some clothes and put them in the place you use to sleep in. Being hungry, thirsty, wet, or injured can also make you feel the cold more, so try to avoid these effects before you go to sleep. Pillows and some other appliances will help you sleep, and the quality of your sleeping spot is also very important.",
"Q: There are too many calibers and guns. It confuses me - I don't usually understand what is compatible with what.\nA: Try to remember few usual calibers: \n9x19 (or simply 9mm) - fits most basic pistols (Glock, for example) and SMGs, quite easy to find and gets job done versus usual zombies;\n 00 buckshot - for most shotguns. Very powerful against unarmored target at closer ranges;\n .223 (5.56) - for rifles. Good long range option.\n .308 (7.62) - for even more powerful rifles. Also good long range option.\n It should be enough in the beginning. Or even just grab any shotgun, fill it with buckshot and give them hell!",
"Q: There are too many calibers and guns. It confuses me - I don't usually understand what is compatible with what.\nA: Try to remember few usual calibers: \n9x19mm (or simply 9mm) - fits most basic pistols (Glock, for example) and SMGs, quite easy to find and gets job done versus usual zombies;\n 00 buckshot - for most shotguns. Very powerful against unarmored target at closer ranges;\n 5.56mm (.223) - for rifles. Good long range option.\n 7.62mm (.308) - for even more powerful rifles. Also good long range option.\n It should be enough in the beginning. Or even just grab any shotgun, fill it with buckshot and give them hell!",
"Q: I have a question that's not addressed here. How can I get an answer?\nA: Check the wiki, or ask the helpful people on the forum or at the chat channels. Links are provided in MOTD in the main menu."
]
}
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/ammo/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"id": "223",
"type": "AMMO",
"name": { "str": ".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.56 NATO leading to slightly decreased accuracy and recoil.",
"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",
"price": 280,
Expand All @@ -27,7 +27,7 @@
"id": "556",
"copy-from": "223",
"type": "AMMO",
"name": { "str": "5.56 NATO M855A1" },
"name": { "str": "5.56x45mm NATO M855A1" },
"description": "5.56x45mm ammunition with a 62gr FMJ bullet containing a steel penetrator. Its light weight, high accuracy, and manageable recoil lead to widespread use in the 20th century and it remains popular among militaries and civilians.",
"price": 290,
"price_postapoc": 900,
Expand All @@ -41,15 +41,15 @@
"id": "556_incendiary",
"copy-from": "556",
"type": "AMMO",
"name": { "str": "5.56 NATO tracer" },
"name": { "str": "5.56x45mm NATO tracer" },
"description": "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
"extend": { "effects": [ "INCENDIARY" ] }
},
{
"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 All @@ -63,7 +63,7 @@
"id": "bp_556",
"copy-from": "556",
"type": "AMMO",
"name": { "str": "5.56 NATO, black powder" },
"name": { "str": "5.56x45mm NATO, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand All @@ -77,7 +77,7 @@
"id": "bp_556_incendiary",
"copy-from": "556_incendiary",
"type": "AMMO",
"name": { "str": "5.56 NATO tracer, black powder" },
"name": { "str": "5.56x45mm NATO tracer, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/ammo_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@
{
"type": "ammunition_type",
"id": "223",
"name": ".223",
"//": "This is a 5.56x45mm round, but it's called 223 because legacy migration reasons.",
"name": "5.56x45mm",
"default": "556"
},
{
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
12 changes: 6 additions & 6 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 @@ -1662,7 +1662,7 @@
"looks_like": "sw_619",
"type": "GUN",
"name": { "str": "L2037 Backup" },
"description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.",
"description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56x45mm NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.",
"weight": "2370 g",
"volume": "750 ml",
"price": 267000,
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 All @@ -3980,7 +3980,7 @@
"id": "reloaded_556",
"copy-from": "556",
"type": "AMMO",
"name": { "str": "5.56 NATO, reloaded" },
"name": { "str": "5.56x45mm NATO, 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 All @@ -3989,7 +3989,7 @@
"id": "reloaded_556_incendiary",
"copy-from": "556_incendiary",
"type": "AMMO",
"name": { "str": "5.56 NATO tracer, reloaded" },
"name": { "str": "5.56x45mm NATO tracer, 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
2 changes: 1 addition & 1 deletion data/mods/No_Hope/Items/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
"type": "GUN",
"name": { "str": "L2037 Backup" },
"//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.",
"description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.",
"description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56x45mm NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.",
"weight": "2370 g",
"volume": "750 ml",
"price": 267000,
Expand Down

0 comments on commit 413fd95

Please sign in to comment.