Skip to content

Commit

Permalink
Crossbow rebalance (cataclysmbnteam#3441)
Browse files Browse the repository at this point in the history
* Added steel bowstring mechanism mod, gave crossbow and repeating crossbow mechanism mod slot

* Bump

Bumped up crossbows range, increased repeating crossbow damage to match crossbow

* Bump 2 bump harder

Increased crossbow ranges further to make them all outrange longbows, save for hand crossbows and repeating crossbows. You can genuinely snipe with compound and huge crossbows now.

* Fixes!

Put steel bowstring item in the appropriate json file, added in recipe for steel bowstring

* Fixed damage modifier

Damage modifier hadn't accommodated bullet crossbow damage, that's now fixed

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
yay855 and autofix-ci[bot] authored Oct 16, 2023
1 parent 75812e3 commit 466e633
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 11 deletions.
2 changes: 1 addition & 1 deletion data/json/items/classes/range.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"weapon_category": [ "S_XBOWS", "ELASTIC" ],
"name": { "str": "base hand crossbow" },
"skill": "pistol",
"range": 6,
"range": 12,
"dispersion": 400,
"durability": 6,
"reload": 1200,
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/gunmod/mechanism.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,23 @@
],
"install_time": "10 m",
"flags": [ "WATERPROOF_GUN" ]
},
{
"id": "xbow_string",
"type": "GUNMOD",
"name": { "str": "steel bowstring" },
"description": "A forged steel bowstring designed for crossbows. It allows bolts to hit harder and fly faster, but it's too high-tension to use in a regular bow.",
"weight": "50 g",
"volume": "250 ml",
"integral_volume": "0 ml",
"price": 500,
"price_postapoc": 250,
"material": [ "steel" ],
"symbol": ":",
"color": "brown",
"location": "mechanism",
"mod_target_category": [ [ "S_XBOWS" ], [ "M_XBOWS" ] ],
"damage_modifier": [ { "damage_type": "stab", "amount": 15 }, { "damage_type": "bash", "amount": 15 } ],
"range_modifier": 5
}
]
19 changes: 9 additions & 10 deletions data/json/items/ranged/crossbows.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
"volume": "1250 ml",
"bashing": 9,
"ranged_damage": { "damage_type": "bash", "amount": 15 },
"range": 10,
"range": 16,
"dispersion": 55,
"durability": 6,
"reload": 400,
Expand Down Expand Up @@ -335,11 +335,11 @@
"to_hit": 1,
"loudness": 10,
"ranged_damage": { "damage_type": "stab", "amount": 45 },
"range": 9,
"range": 22,
"dispersion": 375,
"durability": 6,
"reload": 800,
"valid_mod_locations": [ [ "dampening", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ]
"valid_mod_locations": [ [ "dampening", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ], [ "mechanism", 1 ] ]
},
{
"id": "compositecrossbow",
Expand All @@ -356,7 +356,7 @@
"bashing": 11,
"to_hit": 1,
"ranged_damage": { "damage_type": "stab", "amount": 55 },
"range": 16,
"range": 32,
"loudness": 8,
"dispersion": 350,
"durability": 6,
Expand All @@ -377,7 +377,7 @@
"bashing": 11,
"to_hit": 1,
"ranged_damage": { "damage_type": "stab", "amount": 60 },
"range": 22,
"range": 32,
"loudness": 12,
"dispersion": 325,
"durability": 6,
Expand All @@ -398,7 +398,7 @@
"bashing": 20,
"to_hit": -1,
"ranged_damage": { "damage_type": "stab", "amount": 75 },
"range": 30,
"range": 44,
"dispersion": 300,
"recoil": 30,
"durability": 6,
Expand All @@ -414,19 +414,18 @@
"price": 324000,
"material": [ "steel", "wood" ],
"extend": { "flags": [ "FIRE_TWOHAND", "TRADER_AVOID" ] },
"skill": "smg",
"weight": "3628 g",
"volume": "2500 ml",
"price_postapoc": 6000,
"bashing": 13,
"to_hit": -1,
"ranged_damage": { "damage_type": "stab", "amount": 30 },
"range": 8,
"ranged_damage": { "damage_type": "stab", "amount": 45 },
"range": 20,
"dispersion": 500,
"recoil": 30,
"durability": 6,
"clip_size": 10,
"reload": 800,
"valid_mod_locations": [ [ "dampening", 1 ] ]
"valid_mod_locations": [ [ "dampening", 1 ], [ "accessories", 2 ], [ "grip", 1 ], [ "mechanism", 1 ] ]
}
]
12 changes: 12 additions & 0 deletions data/json/recipes/weapon/mods.json
Original file line number Diff line number Diff line change
Expand Up @@ -1073,5 +1073,17 @@
"book_learn": [ [ "mag_archery", 1 ], [ "manual_archery", 1 ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "plastic_chunk", 1 ], [ "fur", 1 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ] ]
},
{
"type": "recipe",
"result": "xbow_string",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_MODS",
"skill_used": "fabrication",
"difficulty": 5,
"time": "30 m",
"autolearn": true,
"book_learn": [ [ "mag_archery", 3 ], [ "manual_archery", 2 ] ],
"using": [ [ "blacksmithing_advanced", 10 ], [ "steel_standard", 2 ] ]
}
]

0 comments on commit 466e633

Please sign in to comment.