diff options
Diffstat (limited to 'revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch')
| -rw-r--r-- | revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch | 228 |
1 files changed, 228 insertions, 0 deletions
diff --git a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch new file mode 100644 index 0000000..1b48c17 --- /dev/null +++ b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch @@ -0,0 +1,228 @@ +From 4aceff1708412b5778d89a44d0ad178c064c04e6 Mon Sep 17 00:00:00 2001 +From: scarf <greenscarf005@gmail.com> +Date: Sat, 29 Apr 2023 13:21:19 +0900 +Subject: [PATCH 03/31] fix(i18n): metric bullets part 2: rename `.308` -> + `7.62x51mm` (#2724) + +* refactor: `7.62` -> `7.62x51mm` + +since there's many 7.62mm calibre rounds with different lengths. + +* refactor: `.308`-> `7.62x51mm` +--- + data/help/texts.json | 2 +- + data/json/items/ammo/308.json | 10 +++++----- + data/json/items/ammo_types.json | 2 +- + data/json/items/generic/ammolink.json | 2 +- + data/json/items/generic/casing.json | 4 ++-- + data/json/items/gun/308.json | 8 ++++---- + data/json/monsters/turrets.json | 2 +- + data/json/obsoletion/items.json | 8 ++++---- + data/json/requirements/ammo.json | 4 ++-- + data/mods/Salvaged_Robots/monsters.json | 2 +- + doc/GAME_BALANCE.md | 4 ++-- + tests/ranged_burst_balance_test.cpp | 8 ++++---- + 23 files changed, 49 insertions(+), 49 deletions(-) + +diff --git a/data/help/texts.json b/data/help/texts.json +index a155169f812..45f26483c03 100644 +--- a/data/help/texts.json ++++ b/data/help/texts.json +@@ -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: \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: 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.56x45mm (.223) - for rifles. Good long range option.\n 7.62x51mm (.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." + ] + } +diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json +index 52e9c588eda..c8832a73794 100644 +--- a/data/json/items/ammo/308.json ++++ b/data/json/items/ammo/308.json +@@ -2,7 +2,7 @@ + { + "id": "308", + "type": "AMMO", +- "name": { "str": ".308 Winchester" }, ++ "name": { "str": "7.62x51mm '.308 Winchester'" }, + "description": ".308 Winchester ammunition with 168gr hollow point bullets. The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.", + "weight": "18 g", + "volume": "250 ml", +@@ -46,7 +46,7 @@ + "id": "bp_308", + "copy-from": "308", + "type": "AMMO", +- "name": { "str": ".308 Winchester, black powder" }, ++ "name": { "str": "7.62x51mm '.308 Winchester', black powder" }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, +diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json +index 06cbf7f7e8a..19c14a9397d 100644 +--- a/data/json/items/ammo_types.json ++++ b/data/json/items/ammo_types.json +@@ -231,7 +231,7 @@ + { + "type": "ammunition_type", + "id": "308", +- "name": ".308", ++ "name": "7.62x51mm", + "default": "762_51" + }, + { +diff --git a/data/json/items/generic/ammolink.json b/data/json/items/generic/ammolink.json +index b7108aedbbd..4635d1a3bf4 100644 +--- a/data/json/items/generic/ammolink.json ++++ b/data/json/items/generic/ammolink.json +@@ -24,7 +24,7 @@ + "id": "ammolink308", + "copy-from": "ammolink", + "type": "GENERIC", +- "name": { "str": ".308 ammo belt linkage" }, ++ "name": { "str": "7.62x51mm ammo belt linkage" }, + "use_action": { "type": "ammobelt", "belt": "belt308" } + }, + { +diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json +index 133ceb06528..1643fd856e7 100644 +--- a/data/json/items/generic/casing.json ++++ b/data/json/items/generic/casing.json +@@ -78,8 +78,8 @@ + "copy-from": "casing", + "looks_like": "223_casing", + "type": "GENERIC", +- "name": { "str": ".308 casing" }, +- "description": "An empty casing from a .308 round.", ++ "name": { "str": "7.62x51mm '.308 Winchester' casing" }, ++ "description": "An empty casing from a 7.62x51mm '.308 Winchester' round.", + "weight": "6 g", + "volume": "9ml" + }, +diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json +index 0bc0eecb631..30c25837e42 100644 +--- a/data/json/items/gun/308.json ++++ b/data/json/items/gun/308.json +@@ -206,8 +206,8 @@ + "copy-from": "rifle_manual", + "type": "GUN", + "name": { "str": "handmade heavy carbine" }, +- "//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.", +- "description": "A homemade lever-action magazine-fed smoothbore rifle. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.", ++ "//": "It's amongst the smallest of the 7.62x51mm(.308) firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.", ++ "description": "A homemade lever-action magazine-fed smoothbore rifle. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful 7.62x51mm (.308) rounds.", + "weight": "2311 g", + "volume": "2 L", + "price": "100 USD", +@@ -243,7 +243,7 @@ + "copy-from": "rifle_manual", + "type": "GUN", + "name": { "str_sp": "Savage 111F" }, +- "description": "A very accurate rifle chambered for the powerful .308 round. Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.", ++ "description": "A very accurate rifle chambered for the powerful 7.62x51mm (.308) round. Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.", + "weight": "2993 g", + "volume": "3 L", + "price": "530 USD", +@@ -264,7 +264,7 @@ + "copy-from": "scar_l", + "type": "GUN", + "name": { "str_sp": "FN SCAR-H" }, +- "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command. The 'H' in its name stands for heavy, as it uses the powerful .308 round.", ++ "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command. The 'H' in its name stands for heavy, as it uses the powerful 7.62x51mm (.308) round.", + "weight": "3640 g", + "ascii_picture": "scar-H", + "ammo": "308", +diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json +index df9783c632d..396a7007c88 100644 +--- a/data/json/monsters/turrets.json ++++ b/data/json/monsters/turrets.json +@@ -254,7 +254,7 @@ + "id": "mon_turret_longrange", + "type": "MONSTER", + "name": { "str": "longrange milspec turret" }, +- "description": "The General Atomics TX-7 Sniper, an automated milspec turret equipped with a 7.62mm gun. Designed as a counter-sniper turret to cover the vulnerability of TX-5 Sentinel to sniper fire. Its advanced target recognition system and 7.62mm gun allows it to engage targets protected by modern body armor at very long range.", ++ "description": "The General Atomics TX-7 Sniper, an automated milspec turret equipped with a 7.62x51mm gun. Designed as a counter-sniper turret to cover the vulnerability of TX-5 Sentinel to sniper fire. Its advanced target recognition system and 7.62x51mm gun allows it to engage targets protected by modern body armor at very long range.", + "default_faction": "military", + "species": [ "ROBOT" ], + "looks_like": "mon_turret_bmg", +diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json +index f90219f33a8..1b029a72e13 100644 +--- a/data/json/obsoletion/items.json ++++ b/data/json/obsoletion/items.json +@@ -196,7 +196,7 @@ + "id": "retool_223", + "type": "GUNMOD", + "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.", ++ "description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or 7.62x51mm 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, +@@ -215,8 +215,8 @@ + { + "id": "retool_308", + "type": "GUNMOD", +- "name": { "str": ".308 caliber conversion kit" }, +- "description": "This kit is used to convert a shotgun or 7.62x39mm, .223 or .30-06 rifle to the popular and powerful .308 caliber. The conversion results in reduced ammo capacity and a slight reduction to accuracy.", ++ "name": { "str": "7.62x51mm caliber conversion kit" }, ++ "description": "This kit is used to convert a shotgun or 7.62x39mm, .223 or .30-06 rifle to the popular and powerful 7.62x51mm caliber. The conversion results in reduced ammo capacity and a slight reduction to accuracy.", + "weight": "114 g", + "volume": "500 ml", + "integral_volume": 0, +@@ -4027,7 +4027,7 @@ + "id": "reloaded_308", + "copy-from": "308", + "type": "AMMO", +- "name": { "str": ".308 Winchester, reloaded" }, ++ "name": { "str": "7.62x51mm '.308 Winchester', 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" ] } +diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json +index add42666055..7b1a6d112fa 100644 +--- a/data/json/requirements/ammo.json ++++ b/data/json/requirements/ammo.json +@@ -97,7 +97,7 @@ + { + "id": "223_casehead", + "type": "requirement", +- "//": "References needed for boltfaces and magazines using .223 or derivatives", ++ "//": "References needed for boltfaces and magazines using 5.56x45mm (.223) or derivatives", + "tools": [ + [ + [ "300blk_casing", -1 ], +@@ -121,7 +121,7 @@ + { + "id": "308_casehead", + "type": "requirement", +- "//": "References needed for boltfaces and magazines using .308 or derivatives", ++ "//": "References needed for boltfaces and magazines using 7.62x51mm (.308) or derivatives", + "tools": [ + [ + [ "308_casing", -1 ], +diff --git a/tests/ranged_burst_balance_test.cpp b/tests/ranged_burst_balance_test.cpp +index ec61fad0613..de55646f92d 100644 +--- a/tests/ranged_burst_balance_test.cpp ++++ b/tests/ranged_burst_balance_test.cpp +@@ -61,13 +61,13 @@ TEST_CASE( "unskilled_burst_no_mods", "[ranged] [balance]" ) + check_burst_penalty( shooter, "american_180", 0 ); + // 9mm SMG - should be manageable + check_burst_penalty( shooter, "calico", 60 ); +- // .223 machine gun - should have lower penalty than a rifle of the same caliber ++ // 5.56x45mm machine gun - should have lower penalty than a rifle of the same caliber + check_burst_penalty( shooter, "m249", 250 ); +- // .223 rifle ++ // 5.56x45mm rifle + check_burst_penalty( shooter, "m4a1", 600 ); +- // 7.62 rifle ++ // 7.62x39mm rifle + check_burst_penalty( shooter, "ak47", 700 ); +- // .50 machine gun - heaviest expected burst fire ++ // 12.7mm '.50 BMG' machine gun - heaviest expected burst fire + check_burst_penalty( shooter, "m2browning", 800 ); + } + +-- +2.40.0 + |