From 8790ccae1394b742dfbe1e7e0c78d5b30ad204f6 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 7 May 2021 00:42:44 -0700 Subject: Port to Bright Nights --- 0003-inconsistent-ammo-names.patch | 154 ++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 78 deletions(-) (limited to '0003-inconsistent-ammo-names.patch') diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch index 4b6dcb0..abfca23 100644 --- a/0003-inconsistent-ammo-names.patch +++ b/0003-inconsistent-ammo-names.patch @@ -1,34 +1,50 @@ ---- a/data/json/items/ammo/45.json -+++ b/data/json/items/ammo/45.json -@@ -63,7 +63,7 @@ - "id": "reloaded_45_acp", - "copy-from": "45_acp", - "type": "AMMO", -- "name": { "str": ".45 FMJ, reloaded" }, -+ "name": { "str": ".45 ACP FMJ, reloaded" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } --- a/data/json/items/ammo/223.json +++ b/data/json/items/ammo/223.json -@@ -55,7 +55,7 @@ +@@ -39,7 +39,7 @@ + "id": "556_incendiary", + "copy-from": "556", + "type": "AMMO", +- "name": { "str": "5.56 NATO tracer" }, ++ "name": { "str": "5.56 NATO M856 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" ] } + }, +@@ -61,7 +61,7 @@ "id": "bp_556", "copy-from": "556", "type": "AMMO", - "name": { "str": "5.56 NATO, black powder" }, + "name": { "str": "5.56 NATO M855A1, black powder" }, - "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } -@@ -82,7 +82,7 @@ + "proportional": { + "price": 0.3, + "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 }, +@@ -75,7 +75,7 @@ + "id": "bp_556_incendiary", + "copy-from": "556_incendiary", + "type": "AMMO", +- "name": { "str": "5.56 NATO tracer, black powder" }, ++ "name": { "str": "5.56 NATO M856 tracer, black powder" }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 }, +@@ -98,7 +98,7 @@ "id": "reloaded_556", "copy-from": "556", "type": "AMMO", - "name": { "str": "5.56 NATO, reloaded" }, -+ "name": { "str": "5.56 NATO M855A1, reloaded" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, ++ "name": { "str": "5.56 NATO M885A1, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +@@ -107,7 +107,7 @@ + "id": "reloaded_556_incendiary", + "copy-from": "556_incendiary", + "type": "AMMO", +- "name": { "str": "5.56 NATO tracer, reloaded" }, ++ "name": { "str": "5.56 NATO M856 tracer, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } --- a/data/json/items/ammo/300blk.json +++ b/data/json/items/ammo/300blk.json @@ -26,7 +26,7 @@ @@ -50,54 +66,52 @@ + "name": { "str": "7.62x51mm NATO M80" }, "casing": "762_51_casing", "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet. It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.", - "relative": { "damage": -2, "pierce": 4, "dispersion": -10 }, -@@ -54,7 +54,7 @@ + "relative": { "damage": { "damage_type": "stab", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 }, +@@ -37,7 +37,7 @@ + "id": "762_51_incendiary", + "copy-from": "762_51", + "type": "AMMO", +- "name": { "str": "7.62x51mm NATO tracer" }, ++ "name": { "str": "7.62x51mm NATO M82 tracer" }, + "description": "This ammunition is a one-in-five mix of M80 and M62 tracer rounds to help keep the weapon they are fired from on target.", + "extend": { "effects": [ "INCENDIARY" ] } + }, +@@ -59,7 +59,7 @@ "id": "bp_762_51", "copy-from": "762_51", "type": "AMMO", - "name": { "str": "7.62x51mm, black powder" }, + "name": { "str": "7.62x51mm NATO M80, black powder" }, - "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } -@@ -63,7 +63,7 @@ + "proportional": { + "price": 0.3, + "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 }, +@@ -73,7 +73,7 @@ "id": "bp_762_51_incendiary", "copy-from": "762_51_incendiary", "type": "AMMO", - "name": { "str": "7.62x51mm tracer, black powder" }, -+ "name": { "str": "7.62x51mm NATO tracer, black powder" }, - "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } -@@ -81,7 +81,7 @@ ++ "name": { "str": "7.62x51mm NATO M82 tracer, black powder" }, + "proportional": { + "price": 0.3, + "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 }, +@@ -96,7 +96,7 @@ "id": "reloaded_762_51", "copy-from": "762_51", "type": "AMMO", - "name": { "str": "7.62x51mm, reloaded" }, + "name": { "str": "7.62x51mm NATO M80, reloaded" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } -@@ -90,7 +90,7 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +@@ -105,7 +105,7 @@ "id": "reloaded_762_51_incendiary", "copy-from": "762_51_incendiary", "type": "AMMO", - "name": { "str": "7.62x51mm incendiary, reloaded" }, -+ "name": { "str": "7.62x51mm NATO incendiary, reloaded" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, ++ "name": { "str": "7.62x51mm NATO M82 incendiary, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } ---- a/data/json/items/ammo/5x50.json -+++ b/data/json/items/ammo/5x50.json -@@ -38,7 +38,7 @@ - "id": "reloaded_5x50dart", - "copy-from": "5x50dart", - "type": "AMMO", -- "name": { "str": "5x50mm flechette, reloaded" }, -+ "name": { "str": "RA110 5x50mm flechette, reloaded" }, - "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator. This one has been hand-reloaded.", - "effects": [ "COOKOFF", "RECYCLED" ], - "relative": { "range": -15, "dispersion": 40 }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } --- a/data/json/items/ammo/357mag.json +++ b/data/json/items/ammo/357mag.json @@ -2,8 +2,8 @@ @@ -111,7 +125,7 @@ "weight": "8 g", "volume": "250 ml", "price": 140, -@@ -26,8 +26,8 @@ +@@ -27,8 +27,8 @@ "id": "357mag_jhp", "copy-from": "357mag_fmj", "type": "AMMO", @@ -119,46 +133,30 @@ - "description": "Jacketed hollow point .357 magnum ammunition. The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.", + "name": { "str": ".357 Magnum JHP" }, + "description": "Jacketed hollow point .357 Magnum ammunition. The .357 Magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.", - "relative": { "damage": 4, "pierce": -2 } + "damage": { "damage_type": "stab", "amount": 42, "armor_penetration": 0 } }, { -@@ -53,13 +53,15 @@ - "copy-from": "357mag_fmj", - "type": "AMMO", - "name": { "str": ".357 Magnum FMJ, reloaded", "str_pl": ".357 Magnum FMJ, reloaded" }, -- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 } -+ "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }, -+ "extend": { "effects": [ "RECYCLED" ] } - }, - { - "id": "reloaded_357mag_jhp", - "copy-from": "357mag_jhp", +--- a/data/json/items/ammo/5x50.json ++++ b/data/json/items/ammo/5x50.json +@@ -38,7 +38,7 @@ + "id": "reloaded_5x50dart", + "copy-from": "5x50dart", "type": "AMMO", - "name": { "str": ".357 Magnum JHP, reloaded", "str_pl": ".357 Magnum JHP, reloaded" }, -- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 } -+ "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }, -+ "extend": { "effects": [ "RECYCLED" ] } - } - ] +- "name": { "str": "5x50mm flechette, reloaded" }, ++ "name": { "str": "RA110 5x50mm flechette, reloaded" }, + "price_postapoc": 1200, + "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator. This one has been hand-reloaded.", + "effects": [ "COOKOFF", "RECYCLED" ], --- a/data/json/items/ammo/762x25.json +++ b/data/json/items/ammo/762x25.json -@@ -26,7 +26,7 @@ - "id": "762_25hot", - "copy-from": "762_25", - "type": "AMMO", -- "name": { "str": "7.62x25mm FMJ hot load" }, -+ "name": { "str": "7.62x25mm FMJ" }, - "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet. It is more powerful than the original.", - "relative": { "price": 500, "range": 2, "damage": 4, "pierce": 3 }, - "proportional": { "recoil": 1.4 } -@@ -55,7 +55,8 @@ +@@ -68,7 +68,8 @@ "id": "reloaded_762_25", "copy-from": "762_25hot", "type": "AMMO", - "name": { "str": "7.62x25mm, reloaded" }, -- "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 } +- "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 } + "name": { "str": "7.62x25mm FMJ, reloaded" }, -+ "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 }, ++ "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } } ] -- cgit v1.2.1