From b91f8795a18652d6e719b2e1c26e5a35326da5cf Mon Sep 17 00:00:00 2001 From: RarkGrames <50421549+RarkGrames@users.noreply.github.com> Date: Tue, 31 Dec 2019 01:06:26 +0100 Subject: [PATCH] Carbon fiber crossbow bolts (#36552) * Added the bolt * Added spawns --- data/json/itemgroups/item_groups.json | 2 ++ data/json/itemgroups/main.json | 3 ++- data/json/items/crossbows.json | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 951751203405c..ec01d32cda91a 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -1407,6 +1407,7 @@ [ "10gal_hat", 4 ], [ "bb", 8 ], [ "bolt_steel", 7 ], + [ "bolt_cf", 5 ], [ "bbgun", 10 ], [ "crossbow", 2 ], [ "mag_survival", 40 ], @@ -2315,6 +2316,7 @@ [ "hat_boonie", 10 ], [ "helmet_riot", 25 ], [ "bolt_steel", 7 ], + [ "bolt_cf", 5 ], [ "shot_00", 8 ], [ "shot_flechette", 3 ], [ "20x66_shot", 4 ], diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json index ed5a13cb02d33..68292fdaddb19 100644 --- a/data/json/itemgroups/main.json +++ b/data/json/itemgroups/main.json @@ -260,7 +260,8 @@ [ "arrow_field_point_fletched", 50 ], [ "arrow_cf", 100 ], [ "bolt_wood", 100 ], - [ "bolt_wood_bodkin", 50 ] + [ "bolt_wood_bodkin", 50 ], + [ "bolt_cf", 100 ] ] } ] diff --git a/data/json/items/crossbows.json b/data/json/items/crossbows.json index cdd1f20007dc9..06ce4388ebe0f 100644 --- a/data/json/items/crossbows.json +++ b/data/json/items/crossbows.json @@ -219,6 +219,28 @@ "count": 10, "effects": [ "RECOVER_45", "NOGIB" ] }, + { + "type": "AMMO", + "id": "bolt_cf", + "price": 2000, + "name": "carbon fiber hunting bolt", + "symbol": "=", + "color": "green", + "looks_like": "bolt_steel", + "description": "A fletched carbon fiber crossbow bolt shaft with an expanding broadhead tip. Deals impressive damage to targets. Stands a good chance of remaining intact once fired.", + "material": [ "kevlar_rigid", "steel" ], + "volume": "250 ml", + "weight": "30 g", + "bashing": 1, + "ammo_type": "bolt", + "prop_damage": 1.35, + "range": 4, + "dispersion": 50, + "loudness": 0, + "count": 10, + "stack_size": 10, + "effects": [ "RECOVER_30" ] + }, { "type": "AMMO", "id": "bolt_explosive",