From 8f713d6fa49e1f642108844246be379e9e540fe4 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Mon, 1 Aug 2022 22:05:31 -0600 Subject: [PATCH] beds --- df_dependencies/minetest_game.lua | 9 +++++-- df_dependencies/mod.conf | 2 +- df_trees/dependencies.lua | 26 ++++++++++--------- df_trees/mod.conf | 2 +- df_trees/schematics/goblin_cap_big_hut.lua | 8 +++--- df_trees/schematics/goblin_cap_bigger_hut.lua | 6 ++--- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/df_dependencies/minetest_game.lua b/df_dependencies/minetest_game.lua index 205d66c..89b5f3c 100644 --- a/df_dependencies/minetest_game.lua +++ b/df_dependencies/minetest_game.lua @@ -48,8 +48,7 @@ if minetest.get_modpath("default") then df_dependencies.node_name_torch = "default:torch" df_dependencies.node_name_torch_wall = "default:torch_wall" df_dependencies.node_name_water_flowing = "default:water_flowing" - df_dependencies.node_name_water_source = "default:water_source" - + df_dependencies.node_name_water_source = "default:water_source" df_dependencies.texture_cobble = "default_cobble.png" df_dependencies.texture_coral_skeleton = "default_coral_skeleton.png" @@ -60,6 +59,7 @@ if minetest.get_modpath("default") then df_dependencies.texture_stone = "default_stone.png" df_dependencies.texture_wood = "default_wood.png" + -- used to determine colour of spindlestem caps df_dependencies.data_iron_containing_nodes = {"default:stone_with_iron", "default:steelblock"} df_dependencies.data_copper_containing_nodes = {"default:stone_with_copper", "default:copperblock"} df_dependencies.data_mese_containing_nodes = {"default:stone_with_mese", "default:mese"} @@ -223,4 +223,9 @@ end if minetest.get_modpath("vessels") then df_dependencies.node_name_glass_bottle = "vessels:glass_bottle" +end + +if minetest.get_modpath("beds") then + df_dependencies.node_name_bed_bottom = "beds:bed_bottom" + df_dependencies.node_name_bed_top = "beds:bed_top" end \ No newline at end of file diff --git a/df_dependencies/mod.conf b/df_dependencies/mod.conf index 9ca3dd6..24378bd 100644 --- a/df_dependencies/mod.conf +++ b/df_dependencies/mod.conf @@ -1,4 +1,4 @@ name = df_dependencies description = A utility mod for df_caverns that gathers all dependencies on minetest_game in one place, to ease compatibility efforts with mineclone and other such games depends = default -optional_depends = moreblocks, stairs, doors, farming, wool, fireflies, vessels, bucket \ No newline at end of file +optional_depends = moreblocks, stairs, doors, farming, wool, fireflies, vessels, bucket, beds \ No newline at end of file diff --git a/df_trees/dependencies.lua b/df_trees/dependencies.lua index 0307011..5f3f8c1 100644 --- a/df_trees/dependencies.lua +++ b/df_trees/dependencies.lua @@ -11,21 +11,23 @@ df_trees.sounds.glass = df_dependencies.sound_glass() df_trees.node_names = {} -df_trees.node_names.torch = df_dependencies.node_name_torch -df_trees.node_names.chest = df_dependencies.node_name_chest -df_trees.node_names.furnace = df_dependencies.node_name_furnace df_trees.node_names.apple = df_dependencies.node_name_apple -df_trees.node_names.gold_ingot = df_dependencies.node_name_gold_ingot -df_trees.node_names.water_source = df_dependencies.node_name_water_source -df_trees.node_names.river_water_source = df_dependencies.node_name_river_water_source -df_trees.node_names.ice = df_dependencies.node_name_ice -df_trees.node_names.water_flowing = df_dependencies.node_name_water_flowing -df_trees.node_names.river_water_flowing = df_dependencies.node_name_river_water_flowing -df_trees.node_names.snow = df_dependencies.node_name_snow -df_trees.node_names.torch_wall = df_dependencies.node_name_torch_wall -df_trees.node_names.stone_with_coal = df_dependencies.node_name_stone_with_coal +df_trees.node_names.bed_bottom = df_dependencies.node_name_bed_bottom +df_trees.node_names.bed_top = df_dependencies.node_name_bed_top +df_trees.node_names.chest = df_dependencies.node_name_chest df_trees.node_names.coalblock = df_dependencies.node_name_coalblock +df_trees.node_names.furnace = df_dependencies.node_name_furnace +df_trees.node_names.gold_ingot = df_dependencies.node_name_gold_ingot +df_trees.node_names.ice = df_dependencies.node_name_ice df_trees.node_names.paper = df_dependencies.node_name_paper +df_trees.node_names.river_water_flowing = df_dependencies.node_name_river_water_flowing +df_trees.node_names.river_water_source = df_dependencies.node_name_river_water_source +df_trees.node_names.snow = df_dependencies.node_name_snow +df_trees.node_names.stone_with_coal = df_dependencies.node_name_stone_with_coal +df_trees.node_names.torch = df_dependencies.node_name_torch +df_trees.node_names.torch_wall = df_dependencies.node_name_torch_wall +df_trees.node_names.water_flowing = df_dependencies.node_name_water_flowing +df_trees.node_names.water_source = df_dependencies.node_name_water_source df_trees.textures = {} df_trees.textures.gold_block = df_dependencies.texture_gold_block diff --git a/df_trees/mod.conf b/df_trees/mod.conf index b859ef4..9d6cb0b 100644 --- a/df_trees/mod.conf +++ b/df_trees/mod.conf @@ -1,4 +1,4 @@ name = df_trees description = Adds various types of underground fungal "trees". Light kills their saplings, they only grow in the dark. depends = df_dependencies -optional_depends = doc, vessels, basic_materials, beds, df_farming, mapgen_helper \ No newline at end of file +optional_depends = doc, vessels, basic_materials, df_farming, mapgen_helper \ No newline at end of file diff --git a/df_trees/schematics/goblin_cap_big_hut.lua b/df_trees/schematics/goblin_cap_big_hut.lua index 091b193..962e20d 100644 --- a/df_trees/schematics/goblin_cap_big_hut.lua +++ b/df_trees/schematics/goblin_cap_big_hut.lua @@ -8,10 +8,10 @@ local n8 = { name = "doors:door_wood_a", force_place=true } local n9 = { name = "doors:hidden", 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 n12 = { name = df_trees.node_names.bed_bottom, force_place=true } local n13 = { name = "df_trees:goblin_cap_stem", prob = 198, force_place=true } -- possible window holes local n16 = { name = df_trees.node_names.chest, param2 = 3, force_place=true } -local n17 = { name = "beds:bed_top", force_place=true } +local n17 = { name = df_trees.node_names.bed_top, 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 @@ -19,8 +19,6 @@ local n20 = {name = "stairs:stair_goblin_cap_stem_wood", param2 = 1 } local n21 = {name = "stairs:stair_goblin_cap_stem_wood", param2 = 3 } local n22 = {name = "stairs:slab_goblin_cap_stem_wood", param2 = 22} - - if minetest.get_modpath("vessels") then n18 = { name = "df_trees:glowing_bottle_red", force_place=true} end @@ -30,7 +28,7 @@ if not minetest.get_modpath("doors") then n8 = n11 n9 = n11 end -if not minetest.get_modpath("beds") then +if not df_trees.node_names.bed_top then --replace the bed with air n12 = n11 n17 = n11 diff --git a/df_trees/schematics/goblin_cap_bigger_hut.lua b/df_trees/schematics/goblin_cap_bigger_hut.lua index dd6bb75..7a0b2e9 100644 --- a/df_trees/schematics/goblin_cap_bigger_hut.lua +++ b/df_trees/schematics/goblin_cap_bigger_hut.lua @@ -12,8 +12,8 @@ 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 n16 = { name = df_trees.node_names.bed_top, param2 = 3, force_place = true } +local n17 = { name = df_trees.node_names.bed_bottom, param2 = 3, 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" } @@ -32,7 +32,7 @@ if not minetest.get_modpath("doors") then n13 = n9 n14 = n9 end -if not minetest.get_modpath("beds") then +if not df_trees.node_names.bed_top then --replace the bed with air n16 = n9 n17 = n9