From f9c604e4d0f416927da790404e860d06e4f83b07 Mon Sep 17 00:00:00 2001 From: anothersimulacrum Date: Sun, 16 Jun 2024 16:35:16 +0000 Subject: [PATCH] Bows and crossbows are worse weapons --- data/json/items/ranged/archery.json | 49 ++++++++++++++++++++------- data/json/items/ranged/crossbows.json | 28 +++++++-------- data/mods/TEST_DATA/weapons.json | 2 +- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json index a1f02fc4dea6c..9b60d11fc2607 100644 --- a/data/json/items/ranged/archery.json +++ b/data/json/items/ranged/archery.json @@ -339,6 +339,7 @@ "//": "52in Elm Shortbow at 24in draw with 26in, 0.077 lb aspen arrow: 45J, 50 lbs draw, 0.35 slugs with 30g arrow.", "material": [ "wood" ], "flags": [ + "FRAGILE_MELEE", "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", @@ -378,7 +379,7 @@ "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 3 } }, { "id": "compbow", @@ -391,7 +392,15 @@ "price": "550 USD", "//": "60 lb draw weight 24in draw, 100J, 0.55 slugs of momentum with a 30g arrow.", "material": [ "steel", "plastic" ], - "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "SHEATH_BOW", "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ + "FIRE_TWOHAND", + "RELOAD_AND_SHOOT", + "FRAGILE_MELEE", + "PRIMITIVE_RANGED_WEAPON", + "SHEATH_BOW", + "WATERPROOF_GUN", + "NEVER_JAMS" + ], "ammo_effects": [ "NEVER_MISFIRES" ], "skill": "archery", "min_strength": 9, @@ -420,7 +429,7 @@ }, "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 8 } + "melee_damage": { "bash": 4 } }, { "id": "compbow_high", @@ -477,6 +486,7 @@ "WATER_FRIENDLY", "SHEATH_BOW", "WATERPROOF_GUN", + "FRAGILE_MELEE", "NEVER_JAMS" ], "ammo_effects": [ "NEVER_MISFIRES" ], @@ -512,7 +522,7 @@ "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 8 } + "melee_damage": { "bash": 4 } }, { "id": "reflexbow", @@ -530,6 +540,7 @@ "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", + "FRAGILE_MELEE", "WATER_FRIENDLY", "SHEATH_BOW", "WATERPROOF_GUN", @@ -565,7 +576,7 @@ "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 12 } + "melee_damage": { "bash": 6 } }, { "id": "recurbow", @@ -581,6 +592,7 @@ "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", + "FRAGILE_MELEE", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY", @@ -621,7 +633,7 @@ "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 12 } + "melee_damage": { "bash": 6 } }, { "id": "takedown_recurbow", @@ -636,6 +648,7 @@ "material": [ "steel", "fiberglass" ], "flags": [ "FIRE_TWOHAND", + "FRAGILE_MELEE", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", @@ -687,7 +700,7 @@ "ammo_scale": 0, "moves": 1500 }, - "melee_damage": { "bash": 12 } + "melee_damage": { "bash": 6 } }, { "id": "takedown_recurbow_folded", @@ -706,7 +719,7 @@ "longest_side": "60 cm", "//2": "When taken down.", "price_postapoc": "22 USD", - "flags": [ "NO_TURRET" ], + "flags": [ "FRAGILE_MELEE", "NO_TURRET" ], "modes": [ [ "DEFAULT", "disassembled", 0, [ "MELEE" ] ] ], "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], @@ -718,7 +731,7 @@ "msg": "You assemble your bow.", "moves": 1500 }, - "melee_damage": { "bash": 12 } + "melee_damage": { "bash": 6 } }, { "id": "longbow", @@ -738,6 +751,7 @@ "WATER_FRIENDLY", "SHEATH_BOW", "WATERPROOF_GUN", + "FRAGILE_MELEE", "NEVER_JAMS" ], "ammo_effects": [ "NEVER_MISFIRES" ], @@ -770,7 +784,7 @@ "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 10 } + "melee_damage": { "bash": 5 } }, { "id": "woodgreatbow", @@ -846,7 +860,15 @@ "price": "1 kUSD 600 USD", "//": "120 lb draw weight, very efficient, 0.5 slugs of momentum with a 30g arrow.", "material": [ "steel", "plastic" ], - "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "SHEATH_BOW", "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ + "FIRE_TWOHAND", + "FRAGILE_MELEE", + "RELOAD_AND_SHOOT", + "PRIMITIVE_RANGED_WEAPON", + "SHEATH_BOW", + "WATERPROOF_GUN", + "NEVER_JAMS" + ], "ammo_effects": [ "NEVER_MISFIRES" ], "skill": "archery", "min_strength": 15, @@ -866,7 +888,7 @@ "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 14 } + "melee_damage": { "bash": 7 } }, { "id": "reflexrecurvebow", @@ -884,6 +906,7 @@ "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", + "FRAGILE_MELEE", "WATER_FRIENDLY", "SHEATH_BOW", "WATERPROOF_GUN", @@ -919,6 +942,6 @@ "valid_mod_locations": [ [ "sights", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ], - "melee_damage": { "bash": 12 } + "melee_damage": { "bash": 6 } } ] diff --git a/data/json/items/ranged/crossbows.json b/data/json/items/ranged/crossbows.json index 03f4dd10adcfb..5a4d7b80f3b14 100644 --- a/data/json/items/ranged/crossbows.json +++ b/data/json/items/ranged/crossbows.json @@ -193,7 +193,7 @@ "price": "200 USD", "price_postapoc": "20 USD", "material": [ "wood", "iron" ], - "flags": [ "PRIMITIVE_RANGED_WEAPON" ], + "flags": [ "PRIMITIVE_RANGED_WEAPON", "FRAGILE_MELEE" ], "skill": "rifle", "ammo": [ "pebble" ], "weight": "1906 g", @@ -217,7 +217,7 @@ [ "underbarrel", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 } } ], - "melee_damage": { "bash": 9 } + "melee_damage": { "bash": 4 } }, { "id": "hand_crossbow", @@ -232,7 +232,7 @@ "price": "550 USD", "price_postapoc": "25 USD", "material": [ "steel", "wood" ], - "flags": [ "PRIMITIVE_RANGED_WEAPON" ], + "flags": [ "PRIMITIVE_RANGED_WEAPON", "FRAGILE_MELEE" ], "skill": "pistol", "ammo": [ "bolt" ], "weight": "900 g", @@ -255,7 +255,7 @@ [ "dampening", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 1 } } ], - "melee_damage": { "bash": 4 } + "melee_damage": { "bash": 2 } }, { "id": "crossbow", @@ -270,7 +270,7 @@ "price": "60 USD", "price_postapoc": "35 USD", "material": [ "wood" ], - "flags": [ "PRIMITIVE_RANGED_WEAPON" ], + "flags": [ "PRIMITIVE_RANGED_WEAPON", "FRAGILE_MELEE" ], "skill": "rifle", "min_strength": 8, "longest_side": "86 cm", @@ -289,7 +289,7 @@ "reload": 1200, "valid_mod_locations": [ [ "dampening", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ], [ "sling", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 1 } } ], - "melee_damage": { "bash": 11 } + "melee_damage": { "bash": 5 } }, { "id": "compositecrossbow", @@ -304,7 +304,7 @@ "price": "890 USD", "price_postapoc": "40 USD", "material": [ "wood", "bone" ], - "flags": [ "PRIMITIVE_RANGED_WEAPON" ], + "flags": [ "PRIMITIVE_RANGED_WEAPON", "FRAGILE_MELEE" ], "skill": "rifle", "min_strength": 9, "ammo": [ "bolt" ], @@ -331,7 +331,7 @@ [ "dampening", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 1 } } ], - "melee_damage": { "bash": 11 } + "melee_damage": { "bash": 5 } }, { "id": "compcrossbow", @@ -345,7 +345,7 @@ "//": "27in Carbon fiber compound crossbow at 17in draw with 20in, 197J, 175 lbs draw, 0.636 Slugs with 300grain quarrels.", "price": "2 kUSD", "material": [ "steel", "plastic" ], - "flags": [ "PRIMITIVE_RANGED_WEAPON" ], + "flags": [ "PRIMITIVE_RANGED_WEAPON", "FRAGILE_MELEE" ], "skill": "rifle", "min_strength": 7, "ammo": [ "bolt" ], @@ -372,7 +372,7 @@ [ "dampening", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 1 } } ], - "melee_damage": { "bash": 11 } + "melee_damage": { "bash": 5 } }, { "id": "huge_crossbow", @@ -386,7 +386,7 @@ "price": "324 USD", "//": "800 lbs, 40in steel limbs, 0.41 Slugs with a 30g bolt, 2.0 slugs with a special 0.5 lb bolt", "material": [ "iron", "wood" ], - "flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ], + "flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID", "FRAGILE_MELEE" ], "skill": "rifle", "ammo": [ "bolt" ], "weight": "6803 g", @@ -404,7 +404,7 @@ "reload": 6000, "valid_mod_locations": [ [ "dampening", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 1 } } ], - "melee_damage": { "bash": 20 } + "melee_damage": { "bash": 10 } }, { "id": "rep_crossbow", @@ -418,7 +418,7 @@ "//": "Cho-ku-no style repeating crossbow, very short draw and very light pull. 30lb draw weight, 10 in draw distance. 0.25 Slugs", "price": "3 kUSD 240 USD", "material": [ "steel", "wood" ], - "flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ], + "flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID", "FRAGILE_MELEE" ], "skill": "rifle", "ammo": [ "bolt" ], "weight": "3628 g", @@ -436,6 +436,6 @@ "reload": 900, "valid_mod_locations": [ [ "dampening", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 10 } } ], - "melee_damage": { "bash": 13 } + "melee_damage": { "bash": 6 } } ] diff --git a/data/mods/TEST_DATA/weapons.json b/data/mods/TEST_DATA/weapons.json index 8437a1a0b15cd..479e51e7642c7 100644 --- a/data/mods/TEST_DATA/weapons.json +++ b/data/mods/TEST_DATA/weapons.json @@ -48,6 +48,6 @@ "reload": 60, "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 3 } } ]