diff options
-rw-r--r-- | ammo.json | 21 | ||||
-rw-r--r-- | armor.json | 10 | ||||
-rw-r--r-- | recipes.json | 18 |
3 files changed, 25 insertions, 24 deletions
@@ -1,6 +1,6 @@ [ { - "type": "AMMO", + "type": "GENERIC", "id": "assassins_throwing_dagger", "category": "weapons", "price": "90 USD", @@ -13,15 +13,22 @@ "weight": "750 g", "cutting": 21, "to_hit": 2, - "flags": [ "SPEAR", "SHEATH_KNIFE" ], + "flags": [ "SHEATH_KNIFE" ], "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ], - "ammo_type": "assassins_throwing_dagger", "count": 4, "stack_size": 4, "thrown_damage": [ { "damage_type": "stab", "amount": 25 } ] }, { - "type": "AMMO", + "type": "GENERIC", + "id": "throwing_knife", + "category": "weapons", + "copy-from": "throwing_knife", + "name": { "str": "throwing knife", "str_pl": "throwing knives" }, + "flags": [ "SHEATH_KNIFE" ] + }, + { + "type": "GENERIC", "id": "makeshift_throwing_knife", "category": "weapons", "price": "52 USD", @@ -32,9 +39,9 @@ "material": [ "steel" ], "volume": "250 ml", "weight": "600 g", - "bashing": 3, - "cutting": 9, - "ammo_type": "makeshift_throwing_knife", + "bashing": 0, + "cutting": 7, + "flags": [ "SHEATH_KNIFE" ], "count": 5, "thrown_damage": [ { "damage_type": "stab", "amount": 10 } ] } @@ -629,8 +629,14 @@ "warmth": 30, "material_thickness": 5, "environmental_protection": 3, - "max_charges": 12, - "ammo": "assassins_throwing_dagger", + "use_action": { + "type": "holster", + "holster_prompt": "Sheath throwing knife", + "holster_msg": "You sheath your %s", + "max_volume": "250 L", + "multi": 12, + "flags": [ "SHEATH_DAGGER" ] + }, "flags": ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY"] }, { diff --git a/recipes.json b/recipes.json index cc2180f..58002eb 100644 --- a/recipes.json +++ b/recipes.json @@ -233,21 +233,9 @@ "time": "240 m", "reversible": false, "autolearn": true, - "qualities":[ - { "id":"HAMMER","level":3,"amount":1 } - ], - "tools": [ - [ ["tongs", -1] ], - [ ["chisel", -1] ], - [ ["anvil", -1] ], - [ ["swage", -1] ], - [ ["forge", 200], ["char_forge", 40], [ "oxy_torch", 40] ] - ], - "components": - [ - [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ], - [ [ "leather", 1 ] ] - ] + "using": [ [ "blacksmithing_standard", 10 ], [ "steel_tiny", 3 ] ], + "qualities": [ { "id": "CHISEL", "level": 3 } ], + "tools": [ [ [ "swage", -1 ] ] ] }, { "type" : "recipe", |