From 4de45bb6d728b0696a1e968744b06191e9283c14 Mon Sep 17 00:00:00 2001
From: FaceDeer <derksenmobile@gmail.com>
Date: Mon, 1 Aug 2022 11:09:48 -0600
Subject: [PATCH] account for some additional mod dependencies

---
 df_trees/schematics/goblin_cap_big_hut.lua    | 13 ++++++++++---
 df_trees/schematics/goblin_cap_bigger_hut.lua | 16 +++++++++++-----
 mapgen_helper                                 |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/df_trees/schematics/goblin_cap_big_hut.lua b/df_trees/schematics/goblin_cap_big_hut.lua
index c04ca15..091b193 100644
--- a/df_trees/schematics/goblin_cap_big_hut.lua
+++ b/df_trees/schematics/goblin_cap_big_hut.lua
@@ -6,13 +6,13 @@ local n6 = { name = "df_trees:goblin_cap_stem", force_place=true } -- walls
 local n7 = { name = "df_trees:goblin_cap_stem_wood", force_place=true } -- internal floor
 local n8 = { name = "doors:door_wood_a", force_place=true }
 local n9 = { name = "doors:hidden", force_place=true }
-local n10 = { name = "default:furnace", param2 = 3, force_place=true }
+local n10 = { name = df_trees.node_names.furnace, param2 = 3, force_place=true }
 local n11 = { name = "air", force_place=true } -- internal air
 local n12 = { name = "beds:bed_bottom", force_place=true }
 local n13 = { name = "df_trees:goblin_cap_stem", prob = 198, force_place=true } -- possible window holes
-local n16 = { name = "default:chest", param2 = 3, force_place=true }
+local n16 = { name = df_trees.node_names.chest, param2 = 3, force_place=true }
 local n17 = { name = "beds:bed_top", force_place=true }
-local n18 = { name = "default:torch_wall", param2 = 4, force_place=true }
+local n18 = { name = df_trees.node_names.torch_wall, param2 = 4, force_place=true }
 local n19 = { name = "df_trees:goblin_cap_stem" } -- base
 
 local n20 = {name = "stairs:stair_goblin_cap_stem_wood", param2 = 1 }
@@ -35,6 +35,13 @@ if not minetest.get_modpath("beds") then
 	n12 = n11
 	n17 = n11
 end
+if not minetest.get_modpath("stairs") then
+	-- replace stairs with air
+	n3 = nil
+	n20 = nil
+	n21 = nil
+	n22 = nil
+end
 
 return {
 	yslice_prob = {},
diff --git a/df_trees/schematics/goblin_cap_bigger_hut.lua b/df_trees/schematics/goblin_cap_bigger_hut.lua
index 9be6270..dd6bb75 100644
--- a/df_trees/schematics/goblin_cap_bigger_hut.lua
+++ b/df_trees/schematics/goblin_cap_bigger_hut.lua
@@ -5,17 +5,17 @@ local n4 = { name = "df_trees:goblin_cap_gills" }
 local n5 = { name = "df_trees:goblin_cap_stem", force_place = true } -- walls, force place these
 local n6 = { name = "df_trees:goblin_cap_stem", prob = 198, force_place=true } -- possible window holes
 local n7 = { name = "df_trees:goblin_cap_stem_wood", force_place=true } -- internal floor
-local n8 = { name = "default:furnace", param2 = 2, force_place=true }
+local n8 = { name = df_trees.node_names.furnace, param2 = 2, force_place=true }
 local n9 = { name = "air", force_place=true } -- internal air
-local n10 = { name = "default:torch_wall", param2 = 3, force_place = true }
+local n10 = { name = df_trees.node_names.torch_wall, param2 = 3, force_place = true }
 local n12 = {name = "stairs:slab_goblin_cap_stem_wood", param2 = 2} -- porch top
 local n13 = { name = "doors:door_wood_a", param2 = 3, force_place = true }
 local n14 = { name = "doors:hidden", param2 = 3, force_place = true }
 local n15 = n9 -- internal air, but could be a vessel shelf
 local n16 = { name = "beds:bed_top", param2 = 3, force_place = true }
 local n17 = { name = "beds:bed_bottom", param2 = 3, force_place = true }
-local n18 = { name = "default:chest", force_place = true }
-local n19 = { name = "default:torch_wall", param2 = 2, force_place = true }
+local n18 = { name = df_trees.node_names.chest, force_place = true }
+local n19 = { name = df_trees.node_names.torch_wall, param2 = 2, force_place = true }
 local n20 = {name = "stairs:stair_goblin_cap_stem_wood" }
 local n21 = {name = "stairs:stair_goblin_cap_stem_wood", param2 = 2 }
 local n22 = {name = "stairs:slab_goblin_cap_stem_wood", param2 = 22}
@@ -37,7 +37,13 @@ if not minetest.get_modpath("beds") then
 	n16 = n9
 	n17 = n9
 end
-
+if not minetest.get_modpath("stairs") then
+	-- replace stairs with air
+	n12 = nil
+	n20 = nil
+	n21 = nil
+	n22 = nil
+end
 
 return {
 	yslice_prob = {},
diff --git a/mapgen_helper b/mapgen_helper
index 4e226f1..2521562 160000
--- a/mapgen_helper
+++ b/mapgen_helper
@@ -1 +1 @@
-Subproject commit 4e226f123772cd1239c0b37080ffb82020397c90
+Subproject commit 2521562a42472271d9d761f2b1e84ead59250a14