From 37688e0bee79d2ffae23b2fb6e4fefee3e7c6cb5 Mon Sep 17 00:00:00 2001 From: ashGlaw <59815584+lewdregards@users.noreply.github.com> Date: Thu, 30 Jan 2020 11:00:00 -0500 Subject: [PATCH 01/13] [WIP]throwingknifebandolier I'm not 100% on how all the moving parts connect with eachother, so I'm adding the bandolier and a tag to throwing-knifes so I can begin testing --- data/json/items/archery.json | 35 ++++++++++++++------------ data/json/items/armor/bandolier.json | 37 +++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/data/json/items/archery.json b/data/json/items/archery.json index df45ec1a1b7bc..9e281e9b73310 100644 --- a/data/json/items/archery.json +++ b/data/json/items/archery.json @@ -651,22 +651,25 @@ "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 } ] - }, + "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", diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index a352b31a8c050..58da728747e6f 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -263,5 +263,40 @@ "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" + ] +} ] From 0624b56fbd5b42634eee0cf09c20fdfe837c05cd Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Thu, 30 Jan 2020 22:09:39 -0500 Subject: [PATCH 02/13] Update med.json --- data/json/items/comestibles/med.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 2fe8d170f9c94..0e86354a714e1 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -28,9 +28,12 @@ "symbol": "!", "color": "yellow", "use_action": { - "type": "consume_drug", - "activation_message": "You pop a melatonin tablet.", - "effects": [ { "id": "melatonin", "duration": "16 h" } ] + "type": "consume_drug", + "activation_message": "You pop a melatonin tablet.", + "effects": [{ + "id": "melatonin", + "duration": 960 + }] } }, { From b11542873f3ec064d5602dcb4ccedeab3b172c76 Mon Sep 17 00:00:00 2001 From: ashGlaw <58862150+ashGlaw@users.noreply.github.com> Date: Fri, 31 Jan 2020 08:51:28 -0500 Subject: [PATCH 03/13] Update data/json/items/armor/bandolier.json Remove extra period Co-Authored-By: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com> --- data/json/items/armor/bandolier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index 58da728747e6f..b4fe500fda589 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -269,7 +269,7 @@ "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..", + "description": "A leather bandolier strapped around the torso for keeping throwing knives close to hand.", "weight": "600 g", "volume": "1250 ml", "price": 3000, From d24791a2ac49a38c62bc2f84fd25288a36879607 Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 09:08:15 -0500 Subject: [PATCH 04/13] Added crafting recipe Added a crafting recipe, based off of other bandolier recipes No tests yet, still compiling, but I plan to once I can --- data/json/recipes/armor/storage.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index c11c45e4e3341..760998230ab42 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -154,6 +154,26 @@ "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", From 10db80b8a4eaf1e9a5f90e3713682a74a36732ab Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 10:22:09 -0500 Subject: [PATCH 05/13] Testing Tested the crafting recipe. Worked fine. Linted the recipe file too --- data/json/recipes/armor/storage.json | 33 +++++++++++----------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 760998230ab42..4e7e0dc097d67 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -154,26 +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": "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", From 9439b3137ec6d2f9a2527d5da942b6858ca6817f Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 10:24:04 -0500 Subject: [PATCH 06/13] Update bandolier.json Linted bandolier.json to pass tests --- data/json/items/armor/bandolier.json | 63 +++++++++++++--------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index b4fe500fda589..aa3baa7059887 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -265,38 +265,33 @@ "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" - ] -} + "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" ] + } ] From 1ba842efc89db86c1175524c7b98d8e96c4a1638 Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 11:27:28 -0500 Subject: [PATCH 07/13] Update clothing.json added [ "throwingknifebandolier", 5 ], to clothing.json in itemgroups, as recommended --- data/json/itemgroups/clothing.json | 181 +++++++++++++++-------------- 1 file changed, 91 insertions(+), 90 deletions(-) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 71f511acbff92..29272977a0d51 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -2288,96 +2288,97 @@ [ "hood_rain", 14 ] ] }, - { - "type": "item_group", - "id": "survivorzed_extra", - "items": [ - [ "daypack", 4 ], - [ "mask_lsurvivor", 10 ], - [ "mask_survivor", 8 ], - [ "mask_hsurvivor", 6 ], - [ "survivor_vest", 8 ], - [ "survivor_runner_pack", 6 ], - [ "survivor_pack", 5 ], - [ "survivor_rucksack", 4 ], - [ "survivor_duffel_bag", 3 ], - [ "dive_bag", 10 ], - [ "runner_bag", 20 ], - [ "molle_pack", 12 ], - [ "backpack", 40 ], - [ "backpack_leather", 32 ], - [ "mbag", 26 ], - [ "purse", 14 ], - [ "slingpack", 12 ], - [ "rucksack", 12 ], - [ "duffelbag", 8 ], - [ "mask_h20survivor", 1 ], - [ "mask_bal", 14 ], - [ "mask_hockey", 26 ], - [ "mask_gas", 24 ], - [ "mask_filter", 12 ], - [ "mask_bunker", 2 ], - [ "mask_wsurvivor", 4 ], - [ "mask_fsurvivor", 2 ], - [ "sunglasses", 12 ], - [ "fitover_sunglasses", 8 ], - [ "glasses_bal", 18 ], - [ "glasses_safety", 24 ], - [ "goggles_ski", 14 ], - [ "goggles_nv", 2 ], - [ "goggles_ir", 1 ], - [ "tacvest", 22 ], - [ "legrig", 22 ], - [ "tool_belt", 16 ], - [ "fanny", 12 ], - [ "dump_pouch", 6 ], - [ "ragpouch", 22 ], - [ "leather_pouch", 16 ], - [ "quiver", 14 ], - [ "quiver_large", 8 ], - [ "wristwatch", 24 ], - [ "diving_watch", 16 ], - [ "pocketwatch", 14 ], - [ "holster", 14 ], - [ "bandana", 18 ], - [ "scarf", 26 ], - [ "long_knit_scarf", 15 ], - [ "mask_gas_xl", 4 ], - [ "hat_boonie", 16 ], - [ "beret", 18 ], - [ "beret_wool", 14 ], - [ "balclava", 12 ], - [ "mask_survivorxl", 2 ], - [ "combatsaw_off", 1 ], - [ "helsing", 1 ], - [ "tihar", 2 ], - [ "bigun", 2 ], - [ "ashot", 4 ], - [ "pickaxe", 1 ], - [ "makeshift_machete", 4 ], - [ "flamethrower_crude", 6 ], - [ "fungicide", 10 ], - [ "insecticide", 10 ], - [ "antifungal", 1 ], - [ "antiparasitic", 5 ], - [ "diazepam", 1 ], - [ "throw_extinguisher", 2 ], - [ "small_repairkit", 14 ], - [ "grapnel", 6 ], - [ "misc_repairkit", 8 ], - [ "survival_kit", 3 ], - [ "toolbox", 1 ], - [ "survivor_belt", 2 ], - [ "survivor_machete", 2 ], - [ "spear_survivor", 2 ], - [ "survivor_light", 24 ], - [ "survivor_mess_kit", 6 ], - [ "survivor_shavingkit", 3 ], - [ "survivor_hairtrimmer", 1 ], - [ "survivor_scope", 1 ], - [ "survnote", 30 ] - ] - }, +{ + "type": "item_group", + "id": "survivorzed_extra", + "items": [ + [ "daypack", 4 ], + [ "mask_lsurvivor", 10 ], + [ "mask_survivor", 8 ], + [ "mask_hsurvivor", 6 ], + [ "survivor_vest", 8 ], + [ "survivor_runner_pack", 6 ], + [ "survivor_pack", 5 ], + [ "survivor_rucksack", 4 ], + [ "survivor_duffel_bag", 3 ], + [ "dive_bag", 10 ], + [ "runner_bag", 20 ], + [ "molle_pack", 12 ], + [ "backpack", 40 ], + [ "backpack_leather", 32 ], + [ "mbag", 26 ], + [ "purse", 14 ], + [ "slingpack", 12 ], + [ "rucksack", 12 ], + [ "duffelbag", 8 ], + [ "mask_h20survivor", 1 ], + [ "mask_bal", 14 ], + [ "mask_hockey", 26 ], + [ "mask_gas", 24 ], + [ "mask_filter", 12 ], + [ "mask_bunker", 2 ], + [ "mask_wsurvivor", 4 ], + [ "mask_fsurvivor", 2 ], + [ "sunglasses", 12 ], + [ "fitover_sunglasses", 8 ], + [ "glasses_bal", 18 ], + [ "glasses_safety", 24 ], + [ "goggles_ski", 14 ], + [ "goggles_nv", 2 ], + [ "goggles_ir", 1 ], + [ "tacvest", 22 ], + [ "legrig", 22 ], + [ "tool_belt", 16 ], + [ "fanny", 12 ], + [ "dump_pouch", 6 ], + [ "ragpouch", 22 ], + [ "leather_pouch", 16 ], + [ "quiver", 14 ], + [ "quiver_large", 8 ], + [ "wristwatch", 24 ], + [ "diving_watch", 16 ], + [ "pocketwatch", 14 ], + [ "holster", 14 ], + [ "throwingknifebandolier", 5 ], + [ "bandana", 18 ], + [ "scarf", 26 ], + [ "long_knit_scarf", 15 ], + [ "mask_gas_xl", 4 ], + [ "hat_boonie", 16 ], + [ "beret", 18 ], + [ "beret_wool", 14 ], + [ "balclava", 12 ], + [ "mask_survivorxl", 2 ], + [ "combatsaw_off", 1 ], + [ "helsing", 1 ], + [ "tihar", 2 ], + [ "bigun", 2 ], + [ "ashot", 4 ], + [ "pickaxe", 1 ], + [ "makeshift_machete", 4 ], + [ "flamethrower_crude", 6 ], + [ "fungicide", 10 ], + [ "insecticide", 10 ], + [ "antifungal", 1 ], + [ "antiparasitic", 5 ], + [ "diazepam", 1 ], + [ "throw_extinguisher", 2 ], + [ "small_repairkit", 14 ], + [ "grapnel", 6 ], + [ "misc_repairkit", 8 ], + [ "survival_kit", 3 ], + [ "toolbox", 1 ], + [ "survivor_belt", 2 ], + [ "survivor_machete", 2 ], + [ "spear_survivor", 2 ], + [ "survivor_light", 24 ], + [ "survivor_mess_kit", 6 ], + [ "survivor_shavingkit", 3 ], + [ "survivor_hairtrimmer", 1 ], + [ "survivor_scope", 1 ], + [ "survnote", 30 ] + ] +}, { "type": "item_group", "id": "museum_armor", From 29200bc0b935166655cb2dcc002bc91e7bb6f229 Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 16:55:54 -0500 Subject: [PATCH 08/13] Added a 2 knife ankle sheath, and a 1 knife wrist sheath Tested. Both seem to work when spawned --- data/json/items/armor/sheath.json | 77 ++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json index 928952146cc32..ae9a8e793ecb9 100644 --- a/data/json/items/armor/sheath.json +++ b/data/json/items/armor/sheath.json @@ -185,5 +185,80 @@ "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" + ] +} ] From b3f114054b8beaef0e777f2a8a08bd082806081c Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 17:34:48 -0500 Subject: [PATCH 09/13] Update clothing.json --- data/json/itemgroups/clothing.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 29272977a0d51..5481f4b045970 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -2340,6 +2340,8 @@ [ "pocketwatch", 14 ], [ "holster", 14 ], [ "throwingknifebandolier", 5 ], + [ "throwingknifebootsheath", 5 ], + [ "throwingknifewristsheath", 5 ], [ "bandana", 18 ], [ "scarf", 26 ], [ "long_knit_scarf", 15 ], From 9de700b59def437591fd26be2bcf67116d6968dd Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 17:46:32 -0500 Subject: [PATCH 10/13] Add recipes for ankle and wrist sheaths --- data/json/recipes/armor/storage.json | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 4e7e0dc097d67..1350a4abec5c9 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -193,6 +193,27 @@ "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", @@ -234,6 +255,27 @@ "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", From b4e78e6bbbea5cf17fd5c591171522c3d6102cdb Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 31 Jan 2020 22:36:59 -0500 Subject: [PATCH 11/13] Linted the files I've edited --- data/json/itemgroups/clothing.json | 186 +++++++++++++-------------- data/json/items/armor/sheath.json | 129 ++++++++----------- data/json/recipes/armor/storage.json | 28 +--- 3 files changed, 155 insertions(+), 188 deletions(-) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 5481f4b045970..80cbf521d57d4 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -2288,99 +2288,99 @@ [ "hood_rain", 14 ] ] }, -{ - "type": "item_group", - "id": "survivorzed_extra", - "items": [ - [ "daypack", 4 ], - [ "mask_lsurvivor", 10 ], - [ "mask_survivor", 8 ], - [ "mask_hsurvivor", 6 ], - [ "survivor_vest", 8 ], - [ "survivor_runner_pack", 6 ], - [ "survivor_pack", 5 ], - [ "survivor_rucksack", 4 ], - [ "survivor_duffel_bag", 3 ], - [ "dive_bag", 10 ], - [ "runner_bag", 20 ], - [ "molle_pack", 12 ], - [ "backpack", 40 ], - [ "backpack_leather", 32 ], - [ "mbag", 26 ], - [ "purse", 14 ], - [ "slingpack", 12 ], - [ "rucksack", 12 ], - [ "duffelbag", 8 ], - [ "mask_h20survivor", 1 ], - [ "mask_bal", 14 ], - [ "mask_hockey", 26 ], - [ "mask_gas", 24 ], - [ "mask_filter", 12 ], - [ "mask_bunker", 2 ], - [ "mask_wsurvivor", 4 ], - [ "mask_fsurvivor", 2 ], - [ "sunglasses", 12 ], - [ "fitover_sunglasses", 8 ], - [ "glasses_bal", 18 ], - [ "glasses_safety", 24 ], - [ "goggles_ski", 14 ], - [ "goggles_nv", 2 ], - [ "goggles_ir", 1 ], - [ "tacvest", 22 ], - [ "legrig", 22 ], - [ "tool_belt", 16 ], - [ "fanny", 12 ], - [ "dump_pouch", 6 ], - [ "ragpouch", 22 ], - [ "leather_pouch", 16 ], - [ "quiver", 14 ], - [ "quiver_large", 8 ], - [ "wristwatch", 24 ], - [ "diving_watch", 16 ], - [ "pocketwatch", 14 ], - [ "holster", 14 ], - [ "throwingknifebandolier", 5 ], - [ "throwingknifebootsheath", 5 ], - [ "throwingknifewristsheath", 5 ], - [ "bandana", 18 ], - [ "scarf", 26 ], - [ "long_knit_scarf", 15 ], - [ "mask_gas_xl", 4 ], - [ "hat_boonie", 16 ], - [ "beret", 18 ], - [ "beret_wool", 14 ], - [ "balclava", 12 ], - [ "mask_survivorxl", 2 ], - [ "combatsaw_off", 1 ], - [ "helsing", 1 ], - [ "tihar", 2 ], - [ "bigun", 2 ], - [ "ashot", 4 ], - [ "pickaxe", 1 ], - [ "makeshift_machete", 4 ], - [ "flamethrower_crude", 6 ], - [ "fungicide", 10 ], - [ "insecticide", 10 ], - [ "antifungal", 1 ], - [ "antiparasitic", 5 ], - [ "diazepam", 1 ], - [ "throw_extinguisher", 2 ], - [ "small_repairkit", 14 ], - [ "grapnel", 6 ], - [ "misc_repairkit", 8 ], - [ "survival_kit", 3 ], - [ "toolbox", 1 ], - [ "survivor_belt", 2 ], - [ "survivor_machete", 2 ], - [ "spear_survivor", 2 ], - [ "survivor_light", 24 ], - [ "survivor_mess_kit", 6 ], - [ "survivor_shavingkit", 3 ], - [ "survivor_hairtrimmer", 1 ], - [ "survivor_scope", 1 ], - [ "survnote", 30 ] - ] -}, + { + "type": "item_group", + "id": "survivorzed_extra", + "items": [ + [ "daypack", 4 ], + [ "mask_lsurvivor", 10 ], + [ "mask_survivor", 8 ], + [ "mask_hsurvivor", 6 ], + [ "survivor_vest", 8 ], + [ "survivor_runner_pack", 6 ], + [ "survivor_pack", 5 ], + [ "survivor_rucksack", 4 ], + [ "survivor_duffel_bag", 3 ], + [ "dive_bag", 10 ], + [ "runner_bag", 20 ], + [ "molle_pack", 12 ], + [ "backpack", 40 ], + [ "backpack_leather", 32 ], + [ "mbag", 26 ], + [ "purse", 14 ], + [ "slingpack", 12 ], + [ "rucksack", 12 ], + [ "duffelbag", 8 ], + [ "mask_h20survivor", 1 ], + [ "mask_bal", 14 ], + [ "mask_hockey", 26 ], + [ "mask_gas", 24 ], + [ "mask_filter", 12 ], + [ "mask_bunker", 2 ], + [ "mask_wsurvivor", 4 ], + [ "mask_fsurvivor", 2 ], + [ "sunglasses", 12 ], + [ "fitover_sunglasses", 8 ], + [ "glasses_bal", 18 ], + [ "glasses_safety", 24 ], + [ "goggles_ski", 14 ], + [ "goggles_nv", 2 ], + [ "goggles_ir", 1 ], + [ "tacvest", 22 ], + [ "legrig", 22 ], + [ "tool_belt", 16 ], + [ "fanny", 12 ], + [ "dump_pouch", 6 ], + [ "ragpouch", 22 ], + [ "leather_pouch", 16 ], + [ "quiver", 14 ], + [ "quiver_large", 8 ], + [ "wristwatch", 24 ], + [ "diving_watch", 16 ], + [ "pocketwatch", 14 ], + [ "holster", 14 ], + [ "throwingknifebandolier", 5 ], + [ "throwingknifebootsheath", 5 ], + [ "throwingknifewristsheath", 5 ], + [ "bandana", 18 ], + [ "scarf", 26 ], + [ "long_knit_scarf", 15 ], + [ "mask_gas_xl", 4 ], + [ "hat_boonie", 16 ], + [ "beret", 18 ], + [ "beret_wool", 14 ], + [ "balclava", 12 ], + [ "mask_survivorxl", 2 ], + [ "combatsaw_off", 1 ], + [ "helsing", 1 ], + [ "tihar", 2 ], + [ "bigun", 2 ], + [ "ashot", 4 ], + [ "pickaxe", 1 ], + [ "makeshift_machete", 4 ], + [ "flamethrower_crude", 6 ], + [ "fungicide", 10 ], + [ "insecticide", 10 ], + [ "antifungal", 1 ], + [ "antiparasitic", 5 ], + [ "diazepam", 1 ], + [ "throw_extinguisher", 2 ], + [ "small_repairkit", 14 ], + [ "grapnel", 6 ], + [ "misc_repairkit", 8 ], + [ "survival_kit", 3 ], + [ "toolbox", 1 ], + [ "survivor_belt", 2 ], + [ "survivor_machete", 2 ], + [ "spear_survivor", 2 ], + [ "survivor_light", 24 ], + [ "survivor_mess_kit", 6 ], + [ "survivor_shavingkit", 3 ], + [ "survivor_hairtrimmer", 1 ], + [ "survivor_scope", 1 ], + [ "survnote", 30 ] + ] + }, { "type": "item_group", "id": "museum_armor", diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json index ae9a8e793ecb9..d2fb792263716 100644 --- a/data/json/items/armor/sheath.json +++ b/data/json/items/armor/sheath.json @@ -187,78 +187,61 @@ "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" ] + "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" ] }, - "flags": [ - "BELTED", - "OVERSIZE", - "ALLOWS_NATURAL_ATTACKS", - "WATER_FRIENDLY" - ] -} + { + "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/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 1350a4abec5c9..946c6e880e939 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -200,19 +200,11 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 3, - "skills_required": [ - [ "gun", 1 ], - [ "throw", 1 ] - ], + "skills_required": [ [ "gun", 1 ], [ "throw", 1 ] ], "time": "1 h", "autolearn": true, - "qualities": [ - { "id": "SEW", "level": 1 } - ], - "components": [ - [ [ "leather", 4 ] ], - [ [ "filament", 8, "LIST" ] ] - ] + "qualities": [ { "id": "SEW", "level": 1 } ], + "components": [ [ [ "leather", 4 ] ], [ [ "filament", 8, "LIST" ] ] ] }, { "result": "bholster", @@ -262,19 +254,11 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 3, - "skills_required": [ - [ "gun", 1 ], - [ "throw", 1 ] - ], + "skills_required": [ [ "gun", 1 ], [ "throw", 1 ] ], "time": "1 h", "autolearn": true, - "qualities": [ - { "id": "SEW", "level": 1 } - ], - "components": [ - [ [ "leather", 4 ] ], - [ [ "filament", 8, "LIST" ] ] - ] + "qualities": [ { "id": "SEW", "level": 1 } ], + "components": [ [ [ "leather", 4 ] ], [ [ "filament", 8, "LIST" ] ] ] }, { "result": "bootstrap", From dc496ddfb7823065274aafd40f444f7ffc26bba4 Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 7 Feb 2020 19:40:30 -0500 Subject: [PATCH 12/13] Getting the linter to work properly Finally formatted right, I hope --- data/json/items/comestibles/med.json | 9 +++---- data/json/items/ranged/archery.json | 36 +++++++++++++--------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 330f80b62fecb..0b8ca4853265b 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -28,12 +28,9 @@ "symbol": "!", "color": "yellow", "use_action": { - "type": "consume_drug", - "activation_message": "You pop a melatonin tablet.", - "effects": [{ - "id": "melatonin", - "duration": 960 - }] + "type": "consume_drug", + "activation_message": "You pop a melatonin tablet.", + "effects": [ { "id": "melatonin", "duration": 960 } ] } }, { diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json index 47ddb37cbe1af..be969c0188b0f 100644 --- a/data/json/items/ranged/archery.json +++ b/data/json/items/ranged/archery.json @@ -669,25 +669,23 @@ "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_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", From b06a0efe05b0dffd37d200727d18f41024221793 Mon Sep 17 00:00:00 2001 From: ashGlaw Date: Fri, 7 Feb 2020 19:44:53 -0500 Subject: [PATCH 13/13] Update med.json Fixed a change I made to avoid a crash to conform to master --- data/json/items/comestibles/med.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 0b8ca4853265b..004e880c4e529 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -30,7 +30,7 @@ "use_action": { "type": "consume_drug", "activation_message": "You pop a melatonin tablet.", - "effects": [ { "id": "melatonin", "duration": 960 } ] + "effects": [ { "id": "melatonin", "duration": "16 h" } ] } }, {