From 4fa3059892805fb1824cb160029338e4d78659e4 Mon Sep 17 00:00:00 2001 From: Lamandus Date: Mon, 15 Feb 2021 11:02:22 +0100 Subject: [PATCH 1/6] Add duct tape blindfold for old reciepe, tweaks for reciepe and item. --- data/json/items/tool_armor.json | 22 ++++++++++++++++++++++ data/json/recipes/armor/head.json | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index f82ce64ceb194..893ccb94d72e8 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -114,6 +114,28 @@ "environmental_protection": 1, "flags": [ "BLIND" ] }, + { + "id": "blindfold_duct", + "type": "ARMOR", + "name": { "str": "duct tape blindfold" }, + "//": "A folded bandana still takes up some space on the head.", + "description": "A simple covering tied over the eyes to block sight, made out of duct tape. Useful for sleeping in bright areas.", + "weight": "20 g", + "volume": "60 ml", + "price": 10, + "price_postapoc": 5, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "blindfold", + "color": "dark_gray", + "covers": [ "eyes" ], + "coverage": 95, + "encumbrance": 10, + "warmth": 0, + "material_thickness": 1, + "environmental_protection": 1, + "flags": [ "BLIND" ] + }, { "id": "ear_plugs", "type": "ARMOR", diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 67dcbe307a6a4..91eec977c09f0 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -42,7 +42,7 @@ "components": [ [ [ "felt_patch", 4 ] ] ] }, { - "result": "blindfold", + "result": "blindfold_duct", "type": "recipe", "activity_level": "NO_EXERCISE", "id_suffix": "from_tape", @@ -53,7 +53,7 @@ "time": "3 m", "reversible": true, "autolearn": true, - "components": [ [ [ "duct_tape", 10 ] ] ], + "components": [ [ [ "duct_tape", 50 ] ] ], "flags": [ "BLIND_EASY" ] }, { From 1cd6d12d2f71a7b489f1de823f1afa66c78595cb Mon Sep 17 00:00:00 2001 From: Lamandus <33199510+Lamandus@users.noreply.github.com> Date: Mon, 15 Feb 2021 15:28:01 +0100 Subject: [PATCH 2/6] Update head.json --- data/json/recipes/armor/head.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 91eec977c09f0..0d4a5e08a50b4 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -49,9 +49,8 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", - "difficulty": 1, + "difficulty": 0, "time": "3 m", - "reversible": true, "autolearn": true, "components": [ [ [ "duct_tape", 50 ] ] ], "flags": [ "BLIND_EASY" ] From cb297bcbb23005ff9955448aa1957c5929416fe0 Mon Sep 17 00:00:00 2001 From: Zhilkin Serg Date: Tue, 23 Feb 2021 10:42:21 +0300 Subject: [PATCH 3/6] Apply suggestions from code review --- data/json/recipes/armor/head.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 0d4a5e08a50b4..ac44d9344682a 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -49,7 +49,6 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", - "difficulty": 0, "time": "3 m", "autolearn": true, "components": [ [ [ "duct_tape", 50 ] ] ], From 64a47747dee371b28985072288433b78a6e84c85 Mon Sep 17 00:00:00 2001 From: Zhilkin Serg Date: Tue, 23 Feb 2021 10:44:44 +0300 Subject: [PATCH 4/6] Apply suggestions from code review --- data/json/recipes/armor/head.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index ac44d9344682a..b560f786d19cb 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -42,7 +42,7 @@ "components": [ [ [ "felt_patch", 4 ] ] ] }, { - "result": "blindfold_duct", + "result": "blindfold", "type": "recipe", "activity_level": "NO_EXERCISE", "id_suffix": "from_tape", From 6c9843f29cb5fd7707915d307245ebc28bd56143 Mon Sep 17 00:00:00 2001 From: Zhilkin Serg Date: Tue, 23 Feb 2021 10:45:46 +0300 Subject: [PATCH 5/6] Update head.json --- data/json/recipes/armor/head.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index b560f786d19cb..7bbb2c3ff2c67 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -42,10 +42,9 @@ "components": [ [ [ "felt_patch", 4 ] ] ] }, { - "result": "blindfold", + "result": "blindfold_duct", "type": "recipe", "activity_level": "NO_EXERCISE", - "id_suffix": "from_tape", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", From 26048120787a1e1d7429eba7d7fd200c9b0d193a Mon Sep 17 00:00:00 2001 From: Zhilkin Serg Date: Tue, 23 Feb 2021 10:46:32 +0300 Subject: [PATCH 6/6] Update recipe_obsolete.json --- data/json/recipes/recipe_obsolete.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 2900cf13e3b33..00280c471259b 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2726,6 +2726,12 @@ "result": "mp3", "obsolete": true }, + { + "type": "recipe", + "result": "blindfold", + "id_suffix": "from_tape", + "obsolete": true + }, { "type": "recipe", "result": "towel",