From 896c142473cdf388bd7cac5b670d2446695791ac Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Mon, 1 Aug 2022 21:51:53 -0600 Subject: [PATCH] more default dependencies --- df_caverns/dependencies.lua | 8 ++++++++ df_caverns/primordial.lua | 2 +- df_caverns/schematics/lamppost.lua | 2 +- df_dependencies/minetest_game.lua | 1 + df_primordial_items/dependencies.lua | 4 ++++ df_primordial_items/giant_fern.lua | 2 +- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/df_caverns/dependencies.lua b/df_caverns/dependencies.lua index 1b7bde3..782d777 100644 --- a/df_caverns/dependencies.lua +++ b/df_caverns/dependencies.lua @@ -17,3 +17,11 @@ df_caverns.node_id.snow = minetest.get_content_id(df_dependencies.node_name_snow df_caverns.node_id.stone = minetest.get_content_id(df_dependencies.node_name_stone) df_caverns.node_id.stone_with_coal = minetest.get_content_id(df_dependencies.node_name_stone_with_coal) df_caverns.node_id.water = minetest.get_content_id(df_dependencies.node_name_water_source) + +df_caverns.node_name = {} +df_caverns.node_name.meselamp = df_dependencies.node_name_meselamp +df_caverns.node_name.stone = df_dependencies.node_name_stone + +minetest.after(0, function() + df_caverns.node_name = nil +end) \ No newline at end of file diff --git a/df_caverns/primordial.lua b/df_caverns/primordial.lua index 3a5582a..080bdea 100644 --- a/df_caverns/primordial.lua +++ b/df_caverns/primordial.lua @@ -395,7 +395,7 @@ subterrane.register_layer({ columns = { maximum_radius = 20, minimum_radius = 5, - node = "default:stone", -- no flowstone below the Sunless Sea, replace with something else + node = df_caverns.node_name.stone, -- no flowstone below the Sunless Sea, replace with something else weight = 0.5, maximum_count = 60, minimum_count = 10, diff --git a/df_caverns/schematics/lamppost.lua b/df_caverns/schematics/lamppost.lua index 52f27ad..213f985 100644 --- a/df_caverns/schematics/lamppost.lua +++ b/df_caverns/schematics/lamppost.lua @@ -13,7 +13,7 @@ local n7 = { name = "stairs:stair_slade_brick", param2 = 1, force_place=true } local n8 = { name = "df_underworld_items:slade_brick", force_place=true } local n9 = { name = "stairs:stair_slade_brick", param2 = 3, force_place=true } local n10 = { name = "df_underworld_items:slade_wall", force_place=true } -local n11 = { name = "default:meselamp", force_place=true } +local n11 = { name = df_caverns.node_name.meselamp, force_place=true } local n12 = { name = outer_stair, param2 = 2, force_place=true } local n13 = { name = "stairs:stair_slade_brick", param2 = 2, force_place=true } local n14 = { name = outer_stair, param2 = 3, force_place=true } diff --git a/df_dependencies/minetest_game.lua b/df_dependencies/minetest_game.lua index 06e11fb..205d66c 100644 --- a/df_dependencies/minetest_game.lua +++ b/df_dependencies/minetest_game.lua @@ -58,6 +58,7 @@ if minetest.get_modpath("default") then df_dependencies.texture_ice = "default_ice.png" df_dependencies.texture_sand = "default_sand.png" df_dependencies.texture_stone = "default_stone.png" + df_dependencies.texture_wood = "default_wood.png" df_dependencies.data_iron_containing_nodes = {"default:stone_with_iron", "default:steelblock"} df_dependencies.data_copper_containing_nodes = {"default:stone_with_copper", "default:copperblock"} diff --git a/df_primordial_items/dependencies.lua b/df_primordial_items/dependencies.lua index ed13f83..bbea82a 100644 --- a/df_primordial_items/dependencies.lua +++ b/df_primordial_items/dependencies.lua @@ -18,8 +18,12 @@ df_primordial_items.sounds.dirt = df_dependencies.sound_dirt() df_primordial_items.register_leafdecay = df_dependencies.register_leafdecay df_primordial_items.after_place_leaves = df_dependencies.after_place_leaves +df_primordial_items.textures = {} +df_primordial_items.textures.wood = df_dependencies.texture_wood + -- This stuff should only be used during initialization minetest.after(0, function() df_primordial_items.node_names = nil df_primordial_items.sounds = nil + df_primordial_items.textures = nil end) \ No newline at end of file diff --git a/df_primordial_items/giant_fern.lua b/df_primordial_items/giant_fern.lua index f749154..2c44a15 100644 --- a/df_primordial_items/giant_fern.lua +++ b/df_primordial_items/giant_fern.lua @@ -133,7 +133,7 @@ minetest.register_node("df_primordial_items:fern_wood", { _doc_items_longdesc = df_primordial_items.doc.giant_fern_desc, _doc_items_usagehelp = df_primordial_items.doc.giant_fern_usage, paramtype2 = "facedir", - tiles = {"default_wood.png^[multiply:#10FF10"}, + tiles = {df_primordial_items.textures.wood .. "^[multiply:#10FF10"}, is_ground_content = false, groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1}, sounds = df_primordial_items.sounds.wood,