Skip to content

Commit

Permalink
Bows and crossbows are worse weapons
Browse files Browse the repository at this point in the history
  • Loading branch information
anothersimulacrum committed Jun 16, 2024
1 parent ce5fdd5 commit f9c604e
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 28 deletions.
49 changes: 36 additions & 13 deletions data/json/items/ranged/archery.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -477,6 +486,7 @@
"WATER_FRIENDLY",
"SHEATH_BOW",
"WATERPROOF_GUN",
"FRAGILE_MELEE",
"NEVER_JAMS"
],
"ammo_effects": [ "NEVER_MISFIRES" ],
Expand Down Expand Up @@ -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",
Expand All @@ -530,6 +540,7 @@
"RELOAD_AND_SHOOT",
"PRIMITIVE_RANGED_WEAPON",
"BELTED",
"FRAGILE_MELEE",
"WATER_FRIENDLY",
"SHEATH_BOW",
"WATERPROOF_GUN",
Expand Down Expand Up @@ -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",
Expand All @@ -581,6 +592,7 @@
"flags": [
"FIRE_TWOHAND",
"RELOAD_AND_SHOOT",
"FRAGILE_MELEE",
"PRIMITIVE_RANGED_WEAPON",
"BELTED",
"WATER_FRIENDLY",
Expand Down Expand Up @@ -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",
Expand All @@ -636,6 +648,7 @@
"material": [ "steel", "fiberglass" ],
"flags": [
"FIRE_TWOHAND",
"FRAGILE_MELEE",
"RELOAD_AND_SHOOT",
"PRIMITIVE_RANGED_WEAPON",
"BELTED",
Expand Down Expand Up @@ -687,7 +700,7 @@
"ammo_scale": 0,
"moves": 1500
},
"melee_damage": { "bash": 12 }
"melee_damage": { "bash": 6 }
},
{
"id": "takedown_recurbow_folded",
Expand All @@ -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 } ],
Expand All @@ -718,7 +731,7 @@
"msg": "You assemble your bow.",
"moves": 1500
},
"melee_damage": { "bash": 12 }
"melee_damage": { "bash": 6 }
},
{
"id": "longbow",
Expand All @@ -738,6 +751,7 @@
"WATER_FRIENDLY",
"SHEATH_BOW",
"WATERPROOF_GUN",
"FRAGILE_MELEE",
"NEVER_JAMS"
],
"ammo_effects": [ "NEVER_MISFIRES" ],
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand All @@ -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",
Expand All @@ -884,6 +906,7 @@
"RELOAD_AND_SHOOT",
"PRIMITIVE_RANGED_WEAPON",
"BELTED",
"FRAGILE_MELEE",
"WATER_FRIENDLY",
"SHEATH_BOW",
"WATERPROOF_GUN",
Expand Down Expand Up @@ -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 }
}
]
28 changes: 14 additions & 14 deletions data/json/items/ranged/crossbows.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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" ],
Expand All @@ -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",
Expand All @@ -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" ],
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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 }
}
]
2 changes: 1 addition & 1 deletion data/mods/TEST_DATA/weapons.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
]

0 comments on commit f9c604e

Please sign in to comment.