Merge branch 'cataclysmbnteam:main' into implement_global_unique

cataclysmbnteam · Jan 3, 2025 · edb5077 · edb5077
2 parents 7b58ccb + 7c55574
commit edb5077
Show file tree

Hide file tree

Showing 35 changed files with 764 additions and 336 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -7,6 +7,7 @@
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "PRY", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
+    "deny_flags": [ "ADV_DECONSTRUCT" ],
     "pre_special": "check_deconstruct",
     "post_flags": [ "keep_items" ],
     "post_special": "done_deconstruct"
@@ -20,6 +21,7 @@
     "time": "10 s",
     "pre_note": "Certain terrain and furniture can be deconstructed without any tools.",
     "pre_flags": "EASY_DECONSTRUCT",
+    "deny_flags": [ "ADV_DECONSTRUCT" ],
     "pre_special": "check_deconstruct",
     "post_flags": [ "keep_items" ],
     "dark_craftable": true,