diff options
Diffstat (limited to 'ammo-10_ammo-order-fix.patch')
| -rw-r--r-- | ammo-10_ammo-order-fix.patch | 144 |
1 files changed, 144 insertions, 0 deletions
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch index 502c1bc..01e7733 100644 --- a/ammo-10_ammo-order-fix.patch +++ b/ammo-10_ammo-order-fix.patch @@ -392,6 +392,150 @@ "copy-from": "50bmg", "type": "AMMO", +--- a/data/json/items/ammo/8x40mm.json ++++ b/data/json/items/ammo/8x40mm.json +@@ -1,5 +1,36 @@ + [ + { ++ "id": "8mm_caseless", ++ "type": "AMMO", ++ "name": { "str_sp": "8x40mm caseless" }, ++ "//": "Cased ammo tends to be roughly $1/shot, more or less. Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.", ++ "description": "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", ++ "weight": "12 g", ++ "volume": "250 ml", ++ "price": 225, ++ "price_postapoc": 8000, ++ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], ++ "material": [ "plastic", "powder" ], ++ "symbol": "=", ++ "color": "pink", ++ "count": 40, ++ "stack_size": 40, ++ "ammo_type": "8x40mm", ++ "range": 42, ++ "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 }, ++ "dispersion": 75, ++ "recoil": 2200, ++ "effects": [ "NEVER_MISFIRES" ] ++ }, ++ { ++ "id": "8mm_jhp", ++ "copy-from": "8mm_caseless", ++ "type": "AMMO", ++ "name": { "str": "8x40mm JHP" }, ++ "description": "8x40mm caseless rounds, jacketed hollowpoint. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": 11, "armor_penetration": -22 } } ++ }, ++ { + "id": "8mm_jhp_reloaded", + "copy-from": "8mm_jhp", + "type": "AMMO", +@@ -20,6 +51,19 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { ++ "id": "8mm_hvp", ++ "copy-from": "8mm_caseless", ++ "type": "AMMO", ++ "name": { "str": "8x40mm HVP" }, ++ "description": "8x40mm caseless rounds, saboted high-velocity penetrator type. Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette. Being caseless rounds, these cannot be disassembled or reloaded.", ++ "price": 2500, ++ "price_postapoc": 50000, ++ "count": 20, ++ "//": "Balanced as AP, with 25% higher damage and 50% higher arpen", ++ "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } }, ++ "proportional": { "dispersion": 1.5, "recoil": 1.5 } ++ }, ++ { + "id": "8mm_hvp_reloaded", + "copy-from": "8mm_hvp", + "type": "AMMO", +@@ -30,6 +74,16 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { ++ "id": "8mm_inc", ++ "copy-from": "8mm_caseless", ++ "type": "AMMO", ++ "name": { "str": "8x40mm tracer" }, ++ "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", ++ "count": 20, ++ "proportional": { "dispersion": 0.8 }, ++ "extend": { "effects": [ "INCENDIARY" ] } ++ }, ++ { + "id": "8mm_inc_reloaded", + "copy-from": "8mm_inc", + "type": "AMMO", +@@ -40,29 +94,6 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { +- "id": "8mm_caseless", +- "type": "AMMO", +- "name": { "str_sp": "8x40mm caseless" }, +- "//": "Cased ammo tends to be roughly $1/shot, more or less. Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.", +- "description": "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", +- "weight": "12 g", +- "volume": "250 ml", +- "price": 225, +- "price_postapoc": 8000, +- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], +- "material": [ "plastic", "powder" ], +- "symbol": "=", +- "color": "pink", +- "count": 40, +- "stack_size": 40, +- "ammo_type": "8x40mm", +- "range": 42, +- "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 }, +- "dispersion": 75, +- "recoil": 2200, +- "effects": [ "NEVER_MISFIRES" ] +- }, +- { + "id": "8mm_civilian", + "copy-from": "8mm_caseless", + "type": "AMMO", +@@ -83,36 +114,5 @@ + "dispersion": 1.2, + "recoil": 0.5 + } +- }, +- { +- "id": "8mm_hvp", +- "copy-from": "8mm_caseless", +- "type": "AMMO", +- "name": { "str": "8x40mm HVP" }, +- "description": "8x40mm caseless rounds, saboted high-velocity penetrator type. Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette. Being caseless rounds, these cannot be disassembled or reloaded.", +- "price": 2500, +- "price_postapoc": 50000, +- "count": 20, +- "//": "Balanced as AP, with 25% higher damage and 50% higher arpen", +- "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } }, +- "proportional": { "dispersion": 1.5, "recoil": 1.5 } +- }, +- { +- "id": "8mm_inc", +- "copy-from": "8mm_caseless", +- "type": "AMMO", +- "name": { "str": "8x40mm tracer" }, +- "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", +- "count": 20, +- "proportional": { "dispersion": 0.8 }, +- "extend": { "effects": [ "INCENDIARY" ] } +- }, +- { +- "id": "8mm_jhp", +- "copy-from": "8mm_caseless", +- "type": "AMMO", +- "name": { "str": "8x40mm JHP" }, +- "description": "8x40mm caseless rounds, jacketed hollowpoint. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", +- "relative": { "damage": { "damage_type": "bullet", "amount": 11, "armor_penetration": -22 } } + } + ] + --- a/data/json/items/ammo/shot.json +++ b/data/json/items/ammo/shot.json @@ -1,5 +1,50 @@ |