diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-08-03 11:47:00 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-08-03 11:47:00 -0700 |
commit | c9c7277b690e925ef4e6526c14ca09f24f151d26 (patch) | |
tree | e02def28ce62a13970bc2e8efd67b0b4a7147766 /revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch | |
parent | Updated to 2023-07-31-1155 (diff) | |
download | cataclysm-bn-c9c7277b690e925ef4e6526c14ca09f24f151d26.tar.xz |
Updated to 2023-08-03-1246
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 | 115 |
1 files changed, 0 insertions, 115 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 2cef13b..9063fe3 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 @@ -22,15 +22,10 @@ since there's many 7.62mm calibre rounds with different lengths. data/mods/Aftershock/items/corpses.json | 2 +- data/mods/Aftershock/items/inactiverobot.json | 2 +- data/mods/Aftershock/mobs/robots.json | 2 +- - data/mods/EW_Pack/obsolete.json | 12 ++++++------ data/mods/Modular_Turrets/corpses.json | 4 ++-- data/mods/Modular_Turrets/items.json | 6 +++--- data/mods/Modular_Turrets/monster.json | 4 ++-- - data/mods/Modular_Turrets/roboguns.json | 2 +- - data/mods/Salvaged_Robots/corpses.json | 2 +- - data/mods/Salvaged_Robots/items.json | 2 +- data/mods/Salvaged_Robots/monsters.json | 2 +- - .../blazemod/vehicleparts/blaze_turrets_vanilla.json | 4 ++-- doc/GAME_BALANCE.md | 4 ++-- tests/ranged_burst_balance_test.cpp | 8 ++++---- 23 files changed, 49 insertions(+), 49 deletions(-) @@ -278,55 +273,6 @@ index 29e3f463f74..df35663319b 100644 "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "starting_ammo": { "762_51": 1000 }, -diff --git a/data/mods/EW_Pack/obsolete.json b/data/mods/EW_Pack/obsolete.json -index bbda9e0f7a0..41d98b843fa 100644 ---- a/data/mods/EW_Pack/obsolete.json -+++ b/data/mods/EW_Pack/obsolete.json -@@ -2,12 +2,12 @@ - { - "type": "GUNMOD", - "id": "retool_545", -- "name": "5.45 caliber conversion kit", -+ "name": "5.45x42mm caliber conversion kit", - "location": "bore", - "weight": "114 g", - "color": "green", - "price": 50000, -- "description": "This kit is used to convert 6.54 rifle to the 5.45 caliber. The conversion results in slight reductions to recoil.", -+ "description": "This kit is used to convert 6.54x42mm rifle to the 5.45x39mm caliber. The conversion results in slight reductions to recoil.", - "symbol": ":", - "material": [ "steel" ], - "volume": "500 ml", -@@ -19,12 +19,12 @@ - { - "type": "GUNMOD", - "id": "retool_654", -- "name": "6.54 caliber conversion kit", -+ "name": "6.54x42mm caliber conversion kit", - "location": "bore", - "weight": "114 g", - "color": "green", - "price": 50000, -- "description": "This kit is used to convert 5.45 rifle to the 6.54 caliber. The conversion results in increased recoil.", -+ "description": "This kit is used to convert 5.45x39mm rifle to the 6.54x42mm caliber. The conversion results in increased recoil.", - "symbol": ":", - "material": [ "steel" ], - "volume": "500 ml", -@@ -36,12 +36,12 @@ - { - "type": "GUNMOD", - "id": "retool_762", -- "name": "7.62 caliber conversion kit", -+ "name": "7.62x39mm caliber conversion kit", - "location": "bore", - "weight": "114 g", - "color": "green", - "price": 50000, -- "description": "This kit is used to convert 6.54 rifle to the 7.62 caliber. The conversion results in increased recoil.", -+ "description": "This kit is used to convert 6.54x42mm rifle to the 7.62x39mm caliber. The conversion results in increased recoil.", - "symbol": ":", - "material": [ "steel" ], - "volume": "500 ml", 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 @@ -395,67 +341,6 @@ index 5dad0377169..a3678fd4127 100644 "skill": "rifle", "ammo": "308", "clip_size": 100, -diff --git a/data/mods/Salvaged_Robots/corpses.json b/data/mods/Salvaged_Robots/corpses.json -index 920c4317c40..e1884e9efb4 100644 ---- a/data/mods/Salvaged_Robots/corpses.json -+++ b/data/mods/Salvaged_Robots/corpses.json -@@ -375,7 +375,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/Salvaged_Robots/items.json b/data/mods/Salvaged_Robots/items.json -index f393489d2c8..0179b65c561 100644 ---- a/data/mods/Salvaged_Robots/items.json -+++ b/data/mods/Salvaged_Robots/items.json -@@ -720,7 +720,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/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json -index 9e9cf18b476..2f62bec75cf 100644 ---- a/data/mods/Salvaged_Robots/monsters.json -+++ b/data/mods/Salvaged_Robots/monsters.json -@@ -813,7 +813,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/blazemod/vehicleparts/blaze_turrets_vanilla.json b/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json -index 7a80bf31e28..6dce9cf0142 100644 ---- a/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json -+++ b/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json -@@ -457,7 +457,7 @@ - "id": "mounted_rifle_308", - "copy-from": "turret", - "type": "vehicle_part", -- "name": { "str": "mounted .308 pipe rifle" }, -+ "name": { "str": "mounted 7.62x51mm pipe rifle" }, - "item": "rifle_308", - "breaks_into": [ { "item": "rifle_308", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } -@@ -631,7 +631,7 @@ - "id": "mounted_surv_carbine_223", - "copy-from": "turret", - "type": "vehicle_part", -- "name": { "str": "mounted 223 carbine" }, -+ "name": { "str": "mounted 5.56x45mm carbine" }, - "item": "surv_carbine_223", - "breaks_into": [ { "item": "surv_carbine_223", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md index 5a51a530d5c..2e7ef664f27 100644 --- a/doc/GAME_BALANCE.md |