Merge pull request #36368 from Maleclypse/Christmas-2019

Solstice Wreaths and trees
CleverRaven · Dec 30, 2019 · 775e2d4 · 775e2d4
2 parents 8bc6c43 + 4385b95
commit 775e2d4
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 0 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -3236,5 +3236,16 @@
     "components": [ [ [ "log", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_logstool"
+  },
+  {
+    "type": "construction",
+    "description": "Build Decorative Tree",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "20 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
+    "components": [ [ [ "stick", 4 ], [ "log", 1 ] ], [ [ "nail", 20 ] ], [ [ "pine_bough", 8 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_decorative_tree"
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json
@@ -205,5 +205,39 @@
         { "item": "pipe", "count": [ 0, 1 ] }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_winter_wreath",
+    "name": "pine wreath",
+    "description": "A decorative wreath for the winter holidays.",
+    "symbol": "o",
+    "color": "light_green",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "PLACE_ITEM" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_decorative_tree",
+    "name": "decorative tree",
+    "description": "A decorative tree for the winter holidays.",
+    "symbol": "+",
+    "color": "light_green",
+    "looks_like": "t_tree_pine",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "BLOCKSDOOR", "PLACE_ITEM", "EASY_DECONSTRUCT" ],
+    "bash": {
+      "str_min": 20,
+      "str_max": 40,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [
+        { "item": "pine_bough", "count": [ 4, 6 ] },
+        { "item": "nail", "count": [ 5, 14 ] },
+        { "item": "stick", "count": [ 1, 3 ] }
+      ]
+    }
   }
 ]
diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json
@@ -49,5 +49,20 @@
       "menu_text": "Extinguish"
     },
     "flags": [ "LIGHT_6", "TRADER_AVOID" ]
+  },
+  {
+    "id": "decorative_wreath",
+    "type": "TOOL",
+    "name": "yule wreath",
+    "description": "This decorative wreath can be deployed as furniture to decorate for the winter holidays.",
+    "weight": "1814 g",
+    "volume": "4 L",
+    "price": 100,
+    "to_hit": -2,
+    "material": "wood",
+    "symbol": "0",
+    "color": "green",
+    "looks_like": "plate",
+    "use_action": { "type": "deploy_furn", "furn_type": "f_winter_wreath" }
   }
 ]
diff --git a/data/json/recipes/recipes_holiday.json b/data/json/recipes/recipes_holiday.json
@@ -15,5 +15,17 @@
       [ [ "candle", 1 ] ],
       [ [ "y_paint", 1 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "result": "decorative_wreath",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "time": "45 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "pine_bough", 4 ] ], [ [ "duct_tape", 10 ], [ "cordage_superior", 6, "LIST" ] ] ]
   }
 ]