diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 71f511acbff92..80cbf521d57d4 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -2339,6 +2339,9 @@ [ "diving_watch", 16 ], [ "pocketwatch", 14 ], [ "holster", 14 ], + [ "throwingknifebandolier", 5 ], + [ "throwingknifebootsheath", 5 ], + [ "throwingknifewristsheath", 5 ], [ "bandana", 18 ], [ "scarf", 26 ], [ "long_knit_scarf", 15 ], diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index a352b31a8c050..aa3baa7059887 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -263,5 +263,35 @@ "flags": [ "GRENADE" ] }, "flags": [ "WATER_FRIENDLY", "BELTED" ] + }, + { + "id": "throwingknifebandolier", + "type": "ARMOR", + "name": "throwing knife bandolier", + "name_plural": "throwing knife bandoliers", + "description": "A leather bandolier strapped around the torso for keeping throwing knives close to hand.", + "weight": "600 g", + "volume": "1250 ml", + "price": 3000, + "price_postapoc": 5300, + "rigid": false, + "material": "cotton", + "symbol": "[", + "looks_like": "belt", + "color": "dark_gray", + "covers": [ "TORSO" ], + "coverage": 15, + "material_thickness": 2, + "use_action": { + "type": "holster", + "holster_prompt": "Stash throwing knives", + "holster_msg": "You stash your %s.", + "multi": 6, + "max_volume": "250 ml", + "min_volume": "250 ml", + "draw_cost": 10, + "flags": [ "SHEATH_KNIFE" ] + }, + "flags": [ "WATER_FRIENDLY", "BELTED" ] } ] diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json index 928952146cc32..d2fb792263716 100644 --- a/data/json/items/armor/sheath.json +++ b/data/json/items/armor/sheath.json @@ -185,5 +185,63 @@ "flags": [ "SHEATH_SPEAR" ] }, "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ] + }, + { + "id": "throwingknifewristsheath", + "type": "ARMOR", + "name": "throwing knife wrist sheath", + "description": "A small sheath for throwing knives designed to be worn around the wrist.", + "weight": "30 g", + "volume": "250 ml", + "price": 2900, + "price_postapoc": 5900, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "sheath", + "color": "brown", + "covers": [ "HAND_EITHER" ], + "coverage": 5, + "encumbrance": 1, + "material_thickness": 1, + "use_action": { + "type": "holster", + "holster_prompt": "Stash throwing knife", + "holster_msg": "You sheath your %s", + "multi": 2, + "max_volume": "250 ml", + "min_volume": "250 ml", + "draw_cost": 30, + "flags": [ "SHEATH_KNIFE" ] + }, + "flags": [ "WATER_FRIENDLY", "BELTED", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "throwingknifebootsheath", + "type": "ARMOR", + "name": "throwing knife ankle sheath", + "description": "A small concealed knife sheath worn on the ankle. It holds two throwing knives. Activate to sheathe/draw a weapon.", + "weight": "160 g", + "volume": "500 ml", + "price": 5200, + "to_hit": -1, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "sheath", + "color": "brown", + "covers": [ "FOOT_EITHER" ], + "coverage": 5, + "encumbrance": 3, + "material_thickness": 1, + "use_action": { + "type": "holster", + "holster_prompt": "Stash throwing knives", + "holster_msg": "You sheath your %s", + "multi": 2, + "max_volume": "250 ml", + "min_volume": "250 ml", + "draw_cost": 30, + "flags": [ "SHEATH_KNIFE" ] + }, + "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ] } ] diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json index f6814ee5bcefc..be969c0188b0f 100644 --- a/data/json/items/ranged/archery.json +++ b/data/json/items/ranged/archery.json @@ -667,5 +667,168 @@ "clip_size": 1, "reload": 40, "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ] + }, + { + "type": "GENERIC", + "id": "throwing_knife", + "category": "weapons", + "price": 5200, + "name": "throwing knife", + "name_plural": "throwing knives", + "symbol": ";", + "color": "light_gray", + "description": "A thin and flat knife made for throwing. Its ineffective cutting edge and odd shape makes it unsuitable for use as a tool.", + "material": "steel", + "volume": "250 ml", + "weight": "268 g", + "bashing": 1, + "cutting": 10, + "thrown_damage": [ { "damage_type": "stab", "amount": 14 } ], + "flags": "SHEATH_KNIFE" + }, + { + "type": "GENERIC", + "id": "throwing_axe", + "category": "weapons", + "price": 12400, + "name": "throwing axe", + "symbol": ";", + "color": "light_gray", + "description": "A lightweight hatchet made for throwing. Its ineffective cutting edge and light weight makes it unsuitable for use as a tool.", + "material": [ "steel", "wood" ], + "volume": "750 ml", + "weight": "792 g", + "bashing": 6, + "cutting": 16, + "thrown_damage": [ { "damage_type": "bash", "amount": 6 }, { "damage_type": "cut", "amount": 16 } ] + }, + { + "type": "GENERIC", + "id": "lawn_dart", + "category": "weapons", + "price": 1000, + "name": "lawn dart", + "symbol": ";", + "color": "yellow", + "description": "A large plastic dart made for outdoor games.", + "material": [ "plastic", "iron" ], + "volume": "500 ml", + "weight": "175 g", + "to_hit": -1, + "cutting": 8, + "thrown_damage": [ { "damage_type": "stab", "amount": 16 } ] + }, + { + "type": "GENERIC", + "id": "frisbee", + "category": "weapons", + "price": 1000, + "name": "frisbee", + "symbol": "o", + "color": "yellow", + "description": "A plastic frisbee made for outdoor games.", + "material": [ "plastic" ], + "volume": "500 ml", + "weight": "175 g", + "bashing": 1, + "thrown_damage": [ { "damage_type": "bash", "amount": 1 } ] + }, + { + "type": "GENERIC", + "id": "disc_golf", + "category": "weapons", + "price": 1000, + "name": "disc", + "symbol": "o", + "color": "red", + "description": "A plastic disc made for playing disc golf, it is smaller and denser then a normal frisbee.", + "material": [ "plastic" ], + "volume": "250 ml", + "weight": "170 g", + "bashing": 2, + "thrown_damage": [ { "damage_type": "bash", "amount": 1 } ] + }, + { + "type": "AMMO", + "id": "fishspear", + "price": 4000, + "name": "wooden fishing spear", + "symbol": "=", + "color": "brown", + "description": "An underwater fishing spear made from wood tipped with steel. It's very light, but doesn't have much range. Stands a below average chance of remaining intact once fired.", + "material": "wood", + "volume": "250 ml", + "weight": "18 g", + "bashing": 1, + "ammo_type": "fishspear", + "damage": 12, + "pierce": 4, + "range": 6, + "dispersion": 150, + "loudness": 0, + "count": 4, + "effects": [ "RECOVER_5" ] + }, + { + "type": "AMMO", + "id": "m_fishspear", + "price": 16000, + "name": "metal fishing spear", + "symbol": "=", + "color": "light_gray", + "description": "An underwater fishing spear made from metal. It's light, but doesn't have much range. Stands a very good chance of remaining intact once fired.", + "material": "iron", + "volume": "250 ml", + "weight": "28 g", + "bashing": 1, + "ammo_type": "fishspear", + "damage": 14, + "pierce": 8, + "range": 6, + "dispersion": 120, + "loudness": 0, + "count": 4, + "effects": [ "RECOVER_15" ] + }, + { + "type": "AMMO", + "id": "c_fishspear", + "price": 32000, + "name": "carbon fiber fishing spear", + "symbol": "=", + "color": "dark_gray", + "description": "An underwater fishing spear made from carbon fiber. It's very light, but doesn't have much range. Stands a bad chance of remaining intact once fired.", + "material": "kevlar_rigid", + "volume": "250 ml", + "weight": "12 g", + "bashing": 1, + "ammo_type": "fishspear", + "damage": 14, + "pierce": 12, + "range": 10, + "dispersion": 90, + "loudness": 0, + "count": 4, + "effects": [ "RECOVER_3" ] + }, + { + "id": "arrow_plastic", + "type": "AMMO", + "symbol": "=", + "color": "green", + "name": "wooden rubber blunt arrow", + "description": "A fletched wooden arrow shaft with a blunt rubber tip. Can stun weaker enemies. Stands a good chance of remaining intact once fired.", + "price": 500, + "material": [ "wood", "plastic" ], + "volume": "250 ml", + "weight": "60 g", + "bashing": 2, + "cutting": 1, + "ammo_type": "arrow", + "prop_damage": 0.2, + "dispersion": 250, + "loudness": 0, + "count": 10, + "effects": [ "RECOVER_35", "BEANBAG" ] } ] diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index c11c45e4e3341..946c6e880e939 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -154,6 +154,19 @@ "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "leather", 8 ] ] ] }, + { + "result": "throwingknifebandolier", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "skills_required": [ [ "gun", 1 ], [ "throw", 1 ] ], + "time": "1 h 20 m", + "autolearn": true, + "using": [ [ "sewing_standard", 20 ] ], + "components": [ [ [ "leather", 14 ] ] ] + }, { "result": "torso_bandolier_shotgun", "type": "recipe", @@ -180,6 +193,19 @@ "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "rag", 4 ] ], [ [ "filament", 8, "LIST" ] ] ] }, + { + "result": "throwingknifewristsheath", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "skills_required": [ [ "gun", 1 ], [ "throw", 1 ] ], + "time": "1 h", + "autolearn": true, + "qualities": [ { "id": "SEW", "level": 1 } ], + "components": [ [ [ "leather", 4 ] ], [ [ "filament", 8, "LIST" ] ] ] + }, { "result": "bholster", "type": "recipe", @@ -221,6 +247,19 @@ "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 3 ] ], [ [ "filament", 5, "LIST" ] ] ] }, + { + "result": "throwingknifebootsheath", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "skills_required": [ [ "gun", 1 ], [ "throw", 1 ] ], + "time": "1 h", + "autolearn": true, + "qualities": [ { "id": "SEW", "level": 1 } ], + "components": [ [ [ "leather", 4 ] ], [ [ "filament", 8, "LIST" ] ] ] + }, { "result": "bootstrap", "type": "recipe",