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 | 113 |
1 files changed, 0 insertions, 113 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 index b4de191..177994a 100644 --- 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 @@ -19,12 +19,6 @@ since there's many 7.62mm calibre rounds with different lengths. data/json/monsters/turrets.json | 2 +- data/json/obsoletion/items.json | 8 ++++---- data/json/requirements/ammo.json | 4 ++-- - data/mods/Aftershock/items/corpses.json | 2 +- - data/mods/Aftershock/items/inactiverobot.json | 2 +- - data/mods/Aftershock/mobs/robots.json | 2 +- - data/mods/Modular_Turrets/corpses.json | 4 ++-- - data/mods/Modular_Turrets/items.json | 6 +++--- - data/mods/Modular_Turrets/monster.json | 4 ++-- data/mods/Salvaged_Robots/monsters.json | 2 +- doc/GAME_BALANCE.md | 4 ++-- tests/ranged_burst_balance_test.cpp | 8 ++++---- @@ -234,113 +228,6 @@ index add42666055..7b1a6d112fa 100644 "tools": [ [ [ "308_casing", -1 ], -diff --git a/data/mods/Aftershock/items/corpses.json b/data/mods/Aftershock/items/corpses.json -index bf33efab485..b0f8b35d8a4 100644 ---- a/data/mods/Aftershock/items/corpses.json -+++ b/data/mods/Aftershock/items/corpses.json -@@ -142,7 +142,7 @@ - "copy-from": "broken_milbot_disarmed", - "color": "light_gray", - "name": "broken military robot", -- "description": "A broken military robot, shattered and inert. This one is armed with an integrated 7.62mm firearm. Could be stripped for parts." -+ "description": "A broken military robot, shattered and inert. This one is armed with an integrated 7.62x51mm firearm. Could be stripped for parts." - }, - { - "type": "GENERIC", -diff --git a/data/mods/Aftershock/items/inactiverobot.json b/data/mods/Aftershock/items/inactiverobot.json -index b7e97390ea3..a06dba740ae 100644 ---- a/data/mods/Aftershock/items/inactiverobot.json -+++ b/data/mods/Aftershock/items/inactiverobot.json -@@ -352,7 +352,7 @@ - "type": "TOOL", - "copy-from": "bot_milbot_base", - "name": "inactive military robot", -- "description": "An unpowered military robot fitted with an integrated 7.62 firearm and electric prod. Activate this item, with ammo in your inventory, to load and deploy the robot.", -+ "description": "An unpowered military robot fitted with an integrated 7.62x51mm firearm and electric prod. Activate this item, with ammo in your inventory, to load and deploy the robot.", - "color": "green", - "use_action": { - "type": "place_monster", -diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json -index 29e3f463f74..df35663319b 100644 ---- a/data/mods/Aftershock/mobs/robots.json -+++ b/data/mods/Aftershock/mobs/robots.json -@@ -541,7 +541,7 @@ - "type": "MONSTER", - "copy-from": "mon_milbot_base", - "name": "military robot", -- "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 7.62mm firearm.", -+ "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 7.62x51mm firearm.", - "diff": 20, - "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "starting_ammo": { "762_51": 1000 }, -diff --git a/data/mods/Modular_Turrets/corpses.json b/data/mods/Modular_Turrets/corpses.json -index 85812093300..aff9f781350 100644 ---- a/data/mods/Modular_Turrets/corpses.json -+++ b/data/mods/Modular_Turrets/corpses.json -@@ -118,8 +118,8 @@ - "type": "GENERIC", - "copy-from": "broken_turret_base", - "color": "light_green", -- "name": "broken 7.62mm turret", -- "description": "A broken military-grade 7.62mm turret. Much less threatening now that it lies limp on solid ground. Could be gutted for parts." -+ "name": "broken 7.62x51mm turret", -+ "description": "A broken military-grade 7.62x51mm turret. Much less threatening now that it lies limp on solid ground. Could be gutted for parts." - }, - { - "id": "broken_milturret_50bmg", -diff --git a/data/mods/Modular_Turrets/items.json b/data/mods/Modular_Turrets/items.json -index 1671f3c5673..5055135e79e 100644 ---- a/data/mods/Modular_Turrets/items.json -+++ b/data/mods/Modular_Turrets/items.json -@@ -84,7 +84,7 @@ - "id": "robopart_308", - "type": "GENERIC", - "copy-from": "robopart_base", -- "name": "integral 7.62mm firearm" -+ "name": "integral 7.62x51mm firearm" - }, - { - "id": "robopart_shot", -@@ -356,8 +356,8 @@ - "id": "bot_milturret_308", - "copy-from": "bot_turret_base", - "type": "TOOL", -- "name": "inactive 7.62mm military turret", -- "description": "An inactive 7.62mm military turret. Up to 100 standard 7.62mm NATO rounds will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", -+ "name": "inactive 7.62x51mm military turret", -+ "description": "An inactive 7.62x51mm military turret. Up to 100 standard 7.62x51mm NATO rounds will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.", - "color": "green", - "price": 10000, - "price_postapoc": 10000, -diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json -index c1b765fe26d..fc52cf074a8 100644 ---- a/data/mods/Modular_Turrets/monster.json -+++ b/data/mods/Modular_Turrets/monster.json -@@ -195,9 +195,9 @@ - "id": "mon_milturret_308", - "type": "MONSTER", - "copy-from": "base_turret", -- "name": "7.62mm turret", -+ "name": "7.62x51mm turret", - "symbol": "t", -- "description": "The Leadworks LLC's TX-32H Sentry, a military-grade automated machinegun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike. Its integrated 7.62 rifle can swivel a full 360 degrees.", -+ "description": "The Leadworks LLC's TX-32H Sentry, a military-grade automated machinegun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike. Its integrated 7.62x51mm rifle can swivel a full 360 degrees.", - "default_faction": "military", - "diff": 20, - "color": "green", -diff --git a/data/mods/Modular_Turrets/roboguns.json b/data/mods/Modular_Turrets/roboguns.json -index 5dad0377169..a3678fd4127 100644 ---- a/data/mods/Modular_Turrets/roboguns.json -+++ b/data/mods/Modular_Turrets/roboguns.json -@@ -75,7 +75,7 @@ - "id": "robogun_308", - "type": "GUN", - "copy-from": "robogun_base", -- "name": "integral 7.62mm firearm", -+ "name": "integral 7.62x51mm firearm", - "skill": "rifle", - "ammo": "308", - "clip_size": 100, 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 |