Merge pull request #70 from chaosvolt/pending-bn-update-mainline-more…

…-things Pending BN Update: assorted content being mainlined
chaosvolt · Sep 30, 2024 · 6c58f65 · 6c58f65
2 parents f0e187a + a82180e
commit 6c58f65
Show file tree

Hide file tree

Showing 28 changed files with 79 additions and 790 deletions.
diff --git a/MST_Extra/harvest.json b/MST_Extra/harvest.json
@@ -1,7 +1,2 @@
 [
-  {
-    "id": "hive_ready_harv",
-    "type": "harvest",
-    "entries": [ { "drop": "honeycomb", "base_num": [ 1, 8 ] } ]
-  }
 ]
diff --git a/MST_Extra/item_groups.json b/MST_Extra/item_groups.json
@@ -5,12 +5,6 @@
     "type": "item_group",
     "extend": { "items": [ [ "crossbow_makeshift", 1 ] ] }
   },
-  {
-    "id": "survivorzed_extra",
-    "copy-from": "survivorzed_extra",
-    "type": "item_group",
-    "extend": { "items": [ [ "hat_hooded", 1 ] ] }
-  },
   {
     "id": "tools_survival",
     "copy-from": "tools_survival",
@@ -25,12 +19,6 @@
       "items": [ [ "atlatl", 50 ], [ "javelin", 30 ], [ "primitive_hoe", 10 ], [ "pitch_wood", 5 ], [ "makeshift_sled_item", 1 ] ]
     }
   },
-  {
-    "id": "hive",
-    "copy-from": "hive",
-    "type": "item_group",
-    "extend": { "items": [ [ "beehive_empty", 1 ] ] }
-  },
   {
     "id": "museum_misc",
     "copy-from": "museum_misc",

diff --git a/MST_Extra/items/comestibles.json b/MST_Extra/items/comestibles.json
@@ -1,19 +1,4 @@
 [
-  {
-    "id": "tar_oil",
-    "type": "COMESTIBLE",
-    "comestible_type": "MED",
-    "name": { "str_sp": "tar oil" },
-    "description": "A thick, runny tar typically made from birch bark or pine.  Among various historical uses, it is also used as an antiseptic and astringent.",
-    "weight": "40 g",
-    "volume": "250 ml",
-    "material": [ "oil" ],
-    "symbol": "~",
-    "color": "yellow",
-    "phase": "liquid",
-    "charges": 5,
-    "use_action": { "type": "heal", "disinfectant_power": 2, "bleed": 2, "bite": 0.75, "move_cost": 100 }
-  },
   {
     "type": "COMESTIBLE",
     "id": "oil_garlic",

diff --git a/MST_Extra/items/generic.json b/MST_Extra/items/generic.json
@@ -89,18 +89,6 @@
     "volume": "4 L",
     "category": "veh_parts"
   },
-  {
-    "id": "beehive_empty",
-    "type": "GENERIC",
-    "name": { "str": "empty beehive" },
-    "description": "A large, enclosed wooden box with multiple sliding frames in it.  With something to attract bees, it can be used to grow a hive.",
-    "weight": "10000 g",
-    "volume": "20 L",
-    "price": "92 USD",
-    "material": [ "wood" ],
-    "symbol": "-",
-    "color": "brown"
-  },
   {
     "id": "cordage_6_leather",
     "copy-from": "string_6",

diff --git a/MST_Extra/mod_tileset/mod_tileset_DP_Normal.json b/MST_Extra/mod_tileset/mod_tileset_DP_Normal.json
@@ -11,9 +11,7 @@
           { "id": "f_barricade_windbreak", "fg": 2 },
           { "id": "f_tarptent_leather", "fg": 3 },
           { "id": "f_hobo_stove_clay_placed", "fg": 4 },
-          { "id": "t_covered_well_bucket", "fg": 5 },
-          { "id": [ "f_hive_young", "f_hive_growing", "f_hive_recovering" ], "fg": 6 },
-          { "id": "f_hive_ready", "fg": 7 }
+          { "id": "t_covered_well_bucket", "fg": 5 }
         ],
         "sprite_width": 32,
         "sprite_height": 32

diff --git a/MST_Extra/obsolete.json b/MST_Extra/obsolete.json
@@ -330,6 +330,45 @@
     "result": "tea_willow",
     "obsolete": true
   },
+  {
+    "type": "recipe",
+    "result": "cured_hide",
+    "id_suffix": "drying",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "cured_pelt",
+    "id_suffix": "drying",
+    "obsolete": true
+  },
+  {
+    "id": "tar_oil",
+    "type": "MIGRATION",
+    "replace": "pitch_wood"
+  },
+  {
+    "type": "recipe",
+    "result": "tar_oil",
+    "obsolete": true
+  },
+  {
+    "id": "beehive_empty",
+    "type": "GENERIC",
+    "name": { "str": "empty beehive" },
+    "description": "A large, enclosed wooden box with multiple sliding frames in it.  With something to attract bees, it can be used to grow a hive.",
+    "weight": "10000 g",
+    "volume": "20 L",
+    "price": "92 USD",
+    "material": [ "wood" ],
+    "symbol": "-",
+    "color": "brown"
+  },
+  {
+    "type": "recipe",
+    "result": "beehive_empty",
+    "obsolete": true
+  },
   {
     "type": "terrain",
     "id": "t_hive_young",
@@ -470,8 +509,9 @@
         { "item": "nail", "charges": [ 4, 8 ] },
         { "item": "splinter", "count": [ 2, 6 ] }
       ]
-    },
-    {
+    }
+  },
+  {
     "id": "t_tarptent_leather",
     "type": "terrain",
     "name": "leather tarp lean-to",

diff --git a/MST_Extra/recipes/recipe_medsandchemicals.json b/MST_Extra/recipes/recipe_medsandchemicals.json
@@ -14,7 +14,7 @@
     "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ],
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ],
-    "components": [ [ [ "tar_oil", 1 ] ] ]
+    "components": [ [ [ "pine_bough", 5 ], [ "birchbark", 5 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/MST_Extra/recipes/recipe_other.json b/MST_Extra/recipes/recipe_other.json
@@ -21,38 +21,6 @@
     ],
     "components": [ [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "cured_hide",
-    "activity_level": "NO_EXERCISE",
-    "id_suffix": "drying",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "survival",
-    "difficulty": 3,
-    "time": "10 m",
-    "autolearn": true,
-    "batch_time_factors": [ 83, 5 ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "cured_pelt",
-    "activity_level": "NO_EXERCISE",
-    "id_suffix": "drying",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "survival",
-    "difficulty": 3,
-    "time": "10 m",
-    "autolearn": true,
-    "batch_time_factors": [ 83, 5 ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ], [ "raw_hfur", 1 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "sharp_rock",
@@ -183,22 +151,6 @@
     "qualities": [ { "id": "SAW_W", "level": 1 } ],
     "components": [ [ [ "2x4", 2 ], [ "stick", 2 ] ], [ [ "cordage_short", 2, "LIST" ] ] ]
   },
-  {
-    "result": "tar_oil",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MEDICAL",
-    "skill_used": "chemistry",
-    "difficulty": 1,
-    "skills_required": [ "survival", 1 ],
-    "time": "60 m",
-    "batch_time_factors": [ 80, 4 ],
-    "autolearn": true,
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [ [ "pine_bough", 5 ], [ "birchbark", 5 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "primitive_hoe",
@@ -298,21 +250,6 @@
       [ [ "vehicle_sled", 2, "LIST" ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "result": "beehive_empty",
-    "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_TOOLS",
-    "skill_used": "fabrication",
-    "difficulty": 4,
-    "skills_required": [ "survival", 3 ],
-    "time": "10 m",
-    "autolearn": true,
-    "book_learn": [ [ "textbook_fabrication", 4 ], [ "atomic_survival", 3 ], [ "survival_book", 3 ] ],
-    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
-    "components": [ [ [ "2x4", 4 ], [ "stick", 8 ] ], [ [ "nail", 10 ], [ "pointy_stick", 5 ], [ "spike", 5 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "log_frame_item",
@@ -418,7 +355,6 @@
         [ "garlic_clove", 6 ],
         [ "oil_garlic", 6 ],
         [ "raw_dandelion", 8 ],
-        [ "tar_oil", 1 ],
         [ "honey_glassed", 5 ],
         [ "honey_bottled", 5 ]
       ]

diff --git a/MST_Extra_BN/furniture_and_terrain/construction.json b/MST_Extra_BN/furniture_and_terrain/construction.json
@@ -1,73 +1,4 @@
 [
-  {
-    "type": "construction",
-    "id": "constr_mst_door_frame",
-    "group": "build_door",
-    "//": "Step 1: door frame",
-    "category": "CONSTRUCT",
-    "required_skills": [ [ "fabrication", 1 ] ],
-    "time": "60 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ] ],
-    "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 12 ] ] ],
-    "pre_terrain": "t_window_empty",
-    "post_terrain": "t_door_frame"
-  },
-  {
-    "type": "construction",
-    "id": "constr_mst_door_frame_2",
-    "group": "build_door",
-    "//": "Step 1: door frame",
-    "category": "CONSTRUCT",
-    "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ],
-    "time": "80 m",
-    "qualities": [
-      [ { "id": "HAMMER", "level": 2 } ],
-      [ { "id": "CUT", "level": 1 } ],
-      [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ]
-    ],
-    "components": [ [ [ "wood_structural", 3, "LIST" ] ], [ [ "adhesive", 4, "LIST" ] ] ],
-    "pre_terrain": "t_window_empty",
-    "post_terrain": "t_door_frame"
-  },
-  {
-    "type": "construction",
-    "id": "constr_mst_door_frame_3",
-    "group": "build_door",
-    "//": "Step 1: door frame",
-    "category": "CONSTRUCT",
-    "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ],
-    "time": "80 m",
-    "qualities": [
-      [ { "id": "HAMMER", "level": 2 } ],
-      [ { "id": "CUT", "level": 1 } ],
-      [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ]
-    ],
-    "components": [ [ [ "wood_structural", 6, "LIST" ] ], [ [ "adhesive", 4, "LIST" ] ] ],
-    "pre_special": "check_empty",
-    "post_terrain": "t_door_frame"
-  },
-  {
-    "type": "construction",
-    "id": "constr_mst_beehive",
-    "group": "build_beehive",
-    "//": "Hive lure includes classic of sweet water, or a few other substitutes.  Bee balm tea however is because we don't have lemongrass.",
-    "category": "FURN",
-    "required_skills": [ [ "survival", 2 ] ],
-    "time": "5 m",
-    "components": [
-      [ [ "beehive_empty", 1 ] ],
-      [
-        [ "sweet_water", 1 ],
-        [ "bee_balm_tea", 1 ],
-        [ "honey_bottled", 3 ],
-        [ "honey_glassed", 3 ],
-        [ "syrup", 3 ],
-        [ "beet_syrup", 5 ]
-      ]
-    ],
-    "pre_special": "check_empty",
-    "post_furniture": "f_hive_young"
-  },
   {
     "type": "construction",
     "id": "constr_mst_cpurifier",

diff --git a/MST_Extra_BN/furniture_and_terrain/construction_group.json b/MST_Extra_BN/furniture_and_terrain/construction_group.json
@@ -1,9 +1,4 @@
 [
-  {
-    "type": "construction_group",
-    "id": "build_beehive",
-    "name": "Build Beehive"
-  },
   {
     "type": "construction_group",
     "id": "build_cpurifier",