diff --git a/df_mapitems/castle_coral.lua b/df_mapitems/castle_coral.lua index f16771b..1ef944d 100644 --- a/df_mapitems/castle_coral.lua +++ b/df_mapitems/castle_coral.lua @@ -17,7 +17,7 @@ minetest.register_node("df_mapitems:castle_coral", { drop = "df_mapitems:castle_coral_skeleton", paramtype = "light", groups = {cracky=2,}, - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), _mcl_hardness = 1.5, _mcl_blast_resistance = 6, }) @@ -27,14 +27,14 @@ minetest.register_node("df_mapitems:castle_coral_skeleton", { _doc_items_longdesc = df_mapitems.doc.castle_coral_desc, _doc_items_usagehelp = df_mapitems.doc.castle_coral_usage, tiles = { - df_mapitems.texture.coral_skeleton + df_dependencies.texture_coral_skeleton }, drawtype = "mesh", mesh = "octagonal_coral.obj", paramtype = "light", is_ground_content = false, groups = {cracky = 3}, - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), _mcl_hardness = 1.5, _mcl_blast_resistance = 6, }) @@ -42,8 +42,8 @@ minetest.register_node("df_mapitems:castle_coral_skeleton", { local c_coral = minetest.get_content_id("df_mapitems:castle_coral") local c_coral_skeleton = minetest.get_content_id("df_mapitems:castle_coral_skeleton") -local c_stone = df_mapitems.node_id.stone -local c_water = df_mapitems.node_id.water +local c_stone = minetest.get_content_id(df_dependencies.node_name_stone) +local c_water = minetest.get_content_id(df_dependencies.node_name_water_source) df_mapitems.spawn_castle_coral = function(area, data, vi, iterations) local run = math.random(2,4) diff --git a/df_mapitems/cave_coral.lua b/df_mapitems/cave_coral.lua index 1aa711e..a595e1d 100644 --- a/df_mapitems/cave_coral.lua +++ b/df_mapitems/cave_coral.lua @@ -1,7 +1,7 @@ local S = df_mapitems.S -local water_source = df_mapitems.node_name.water -local coral_skeleton = df_mapitems.node_name.coral_skeleton +local water_source = df_dependencies.node_name_water_source +local coral_skeleton = df_dependencies.node_name_coral_skeleton minetest.register_node("df_mapitems:cave_coral_3", { description = S("Cave Coral"), @@ -13,7 +13,7 @@ minetest.register_node("df_mapitems:cave_coral_3", { paramtype2 = "facedir", is_ground_content = false, groups = {cracky = 3, dfcaverns_cave_coral = 1}, - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), on_timer = function(pos) if minetest.find_node_near(pos, 1, {water_source}) == nil then minetest.set_node(pos, {name=coral_skeleton}) @@ -33,7 +33,7 @@ minetest.register_node("df_mapitems:cave_coral_2", { paramtype2 = "facedir", is_ground_content = false, groups = {cracky = 3, dfcaverns_cave_coral = 1}, - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), on_timer = function(pos) if minetest.find_node_near(pos, 1, {water_source}) == nil then minetest.set_node(pos, {name=coral_skeleton}) @@ -53,7 +53,7 @@ minetest.register_node("df_mapitems:cave_coral_1", { paramtype2 = "facedir", is_ground_content = false, groups = {cracky = 3, dfcaverns_cave_coral = 1}, - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), on_timer = function(pos) if minetest.find_node_near(pos, 1, {water_source}) == nil then minetest.set_node(pos, {name=coral_skeleton}) @@ -64,7 +64,7 @@ minetest.register_node("df_mapitems:cave_coral_1", { }) local coral_names = {"df_mapitems:cave_coral_1", "df_mapitems:cave_coral_2", "df_mapitems:cave_coral_3"} -local water_node = df_mapitems.node_name.water +local water_node = df_dependencies.node_name_water_source minetest.register_abm{ label = "df_mapitems:shifting_coral", nodenames = {"group:dfcaverns_cave_coral"}, diff --git a/df_mapitems/crystals_mese.lua b/df_mapitems/crystals_mese.lua index 61257cc..8aaf57e 100644 --- a/df_mapitems/crystals_mese.lua +++ b/df_mapitems/crystals_mese.lua @@ -7,7 +7,7 @@ minetest.register_node("df_mapitems:glow_mese", { _doc_items_usagehelp = df_mapitems.doc.glow_mese_usage, tiles = {"dfcaverns_glow_mese.png"}, groups = {cracky=3}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), is_ground_content = false, light_source = 13, paramtype = "light", @@ -37,7 +37,7 @@ minetest.register_node("df_mapitems:mese_crystal", { mesh = "underch_crystal.obj", light_source = 12, is_ground_content = false, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), use_texture_alpha = "blend", sunlight_propagates = true, on_place = df_mapitems.place_against_surface, @@ -46,7 +46,7 @@ minetest.register_node("df_mapitems:mese_crystal", { }) minetest.register_craft({ - output = df_mapitems.node_name.mese_crystal .. ' 9', + output = df_dependencies.node_name_mese_crystal .. ' 9', recipe = { {'df_mapitems:mese_crystal'}, } diff --git a/df_mapitems/crystals_ruby.lua b/df_mapitems/crystals_ruby.lua index 0b1833b..81d1643 100644 --- a/df_mapitems/crystals_ruby.lua +++ b/df_mapitems/crystals_ruby.lua @@ -7,7 +7,7 @@ minetest.register_node("df_mapitems:glow_ruby_ore", { tiles = {"dfcaverns_glow_ruby_ore.png"}, is_ground_content = false, groups = {cracky=2}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), _mcl_blast_resistance = 1.5, _mcl_hardness = 1.5, }) @@ -29,7 +29,7 @@ minetest.register_node("df_mapitems:big_crystal", { sunlight_propagates = true, light_source = 12, groups = {cracky=2, dfcaverns_big_crystal = 1}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), selection_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 3, 0.5}, @@ -59,7 +59,7 @@ minetest.register_node("df_mapitems:med_crystal", { sunlight_propagates = true, light_source = 12, groups = {cracky=2, dfcaverns_big_crystal = 1}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 1.25, 0.25}, @@ -91,7 +91,7 @@ minetest.register_node("df_mapitems:big_crystal_30", { light_source = 12, drop = "df_mapitems:big_crystal", groups = {cracky=2, dfcaverns_big_crystal = 1}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), selection_box = { type = "fixed", fixed = { @@ -145,7 +145,7 @@ minetest.register_node("df_mapitems:med_crystal_30", { light_source = 12, drop = "df_mapitems:med_crystal", groups = {cracky=2, dfcaverns_big_crystal = 1}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), selection_box = { type = "fixed", fixed = { @@ -184,7 +184,7 @@ minetest.register_node("df_mapitems:big_crystal_30_45", { light_source = 12, drop = "df_mapitems:big_crystal", groups = {cracky=2, dfcaverns_big_crystal = 1}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), selection_box = { type = "fixed", fixed = { @@ -224,7 +224,7 @@ minetest.register_node("df_mapitems:med_crystal_30_45", { light_source = 12, drop = "df_mapitems:med_crystal", groups = {cracky=2, dfcaverns_big_crystal = 1}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), selection_box = { type = "fixed", fixed = { @@ -276,7 +276,7 @@ minetest.register_craft({ recipe = {'df_mapitems:med_crystal_30_45'}, }) -local c_stone = df_mapitems.node_id.stone +local c_stone = minetest.get_content_id(df_dependencies.node_name_stone) local c_air = minetest.get_content_id("air") local c_big_crystal = minetest.get_content_id("df_mapitems:big_crystal") local c_med_crystal = minetest.get_content_id("df_mapitems:med_crystal") diff --git a/df_mapitems/crystals_salt.lua b/df_mapitems/crystals_salt.lua index 649235e..d843e24 100644 --- a/df_mapitems/crystals_salt.lua +++ b/df_mapitems/crystals_salt.lua @@ -11,7 +11,7 @@ minetest.register_node("df_mapitems:salt_crystal", { drawtype = "mesh", mesh = "underch_crystal.obj", light_source = 6, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), use_texture_alpha = "blend", sunlight_propagates = true, is_ground_content = false, @@ -24,13 +24,13 @@ minetest.register_node("df_mapitems:salty_cobble", { description = S("Salty Cobble"), _doc_items_longdesc = df_mapitems.doc.salty_cobble_desc, _doc_items_usagehelp = df_mapitems.doc.salty_cobble_desc, - tiles = {df_mapitems.texture.cobble .. "^dfcaverns_salty.png"}, + tiles = {df_dependencies.texture_cobble .. "^dfcaverns_salty.png"}, groups = {cracky = 3, stone = 1, lava_heatable = 1}, - _magma_conduits_heats_to = df_mapitems.node_name.cobble, + _magma_conduits_heats_to = df_dependencies.node_name_cobble, is_ground_content = false, light_source = 2, - drop = df_mapitems.node_name.cobble, - sounds = df_mapitems.sounds.stone, + drop = df_dependencies.node_name_cobble, + sounds = df_dependencies.sound_stone(), _mcl_blast_resistance = 6, _mcl_hardness = 2, }) \ No newline at end of file diff --git a/df_mapitems/dependencies.lua b/df_mapitems/dependencies.lua deleted file mode 100644 index c336a29..0000000 --- a/df_mapitems/dependencies.lua +++ /dev/null @@ -1,45 +0,0 @@ -df_mapitems.sounds = {} - -df_mapitems.sounds.stone = df_dependencies.sound_stone() -df_mapitems.sounds.floor_fungus = df_dependencies.sound_stone({footstep = {name = "dfcaverns_squish", gain = 0.25},}) -df_mapitems.sounds.sandscum = df_dependencies.sound_sand({footstep = {name = "dfcaverns_squish", gain = 0.25},}) -df_mapitems.sounds.glass = df_dependencies.sound_glass() -df_mapitems.sounds.dirt = df_dependencies.sound_dirt() -df_mapitems.sounds.dirt_mossy = df_dependencies.sound_dirt({footstep = {name = df_dependencies.soundfile_grass_footstep, gain = 0.25},}) - -df_mapitems.node_id = {} - -df_mapitems.node_id.stone = minetest.get_content_id(df_dependencies.node_name_stone) -df_mapitems.node_id.water = minetest.get_content_id(df_dependencies.node_name_water_source) -df_mapitems.node_id.dirt = minetest.get_content_id(df_dependencies.node_name_dirt) - -df_mapitems.texture = {} - -df_mapitems.texture.coral_skeleton = df_dependencies.texture_coral_skeleton -df_mapitems.texture.cobble = df_dependencies.texture_cobble -df_mapitems.texture.stone = df_dependencies.texture_stone -df_mapitems.texture.ice = df_dependencies.texture_ice -df_mapitems.texture.sand = df_dependencies.texture_sand -df_mapitems.texture.dirt = df_dependencies.texture_dirt - -df_mapitems.node_name = {} - -df_mapitems.node_name.coral_skeleton = df_dependencies.node_name_coral_skeleton -df_mapitems.node_name.water = df_dependencies.node_name_water_source -df_mapitems.node_name.mese_crystal = df_dependencies.node_name_mese_crystal -df_mapitems.node_name.cobble = df_dependencies.node_name_cobble -df_mapitems.node_name.sand = df_dependencies.node_name_sand -df_mapitems.node_name.dirt = df_dependencies.node_name_dirt -df_mapitems.node_name.stone = df_dependencies.node_name_stone -df_mapitems.node_name.ice = df_dependencies.node_name_ice - -df_mapitems.node_name.farming_soil = df_dependencies.node_name_dirt_furrowed -df_mapitems.node_name.farming_soil_wet = df_dependencies.node_name_dirt_wet - --- This stuff should only be used during initialization -minetest.after(0, function() - df_mapitems.node_name = nil - df_mapitems.sounds = nil - df_mapitems.texture = nil - df_mapitems.node_id = nil -end) \ No newline at end of file diff --git a/df_mapitems/flowstone.lua b/df_mapitems/flowstone.lua index 6f41ca2..e6826b9 100644 --- a/df_mapitems/flowstone.lua +++ b/df_mapitems/flowstone.lua @@ -7,10 +7,10 @@ df_mapitems.dry_stalagmite_ids = subterrane.register_stalagmite_nodes("df_mapite _doc_items_longdesc = df_mapitems.doc.dripstone_desc, _doc_items_usagehelp = df_mapitems.doc.dripstone_usage, tiles = { - df_mapitems.texture.stone .. "^[brighten", + df_dependencies.texture_stone .. "^[brighten", }, groups = {cracky = 3, stone = 2}, - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), is_ground_content = false, _mcl_blast_resistance = 6, _mcl_hardness = 1.5, @@ -20,12 +20,12 @@ minetest.register_node("df_mapitems:dry_flowstone", { description = S("Dry Flowstone"), _doc_items_longdesc = df_mapitems.doc.flowstone_desc, _doc_items_usagehelp = df_mapitems.doc.flowstone_usage, - tiles = {df_mapitems.texture.stone .. "^[brighten"}, + tiles = {df_dependencies.texture_stone .. "^[brighten"}, groups = {cracky = 3, stone = 1, lava_heatable = 1}, - _magma_conduits_heats_to = df_mapitems.node_name.cobble, + _magma_conduits_heats_to = df_dependencies.node_name_cobble, is_ground_content = false, - drop = df_mapitems.node_name.cobble, - sounds = df_mapitems.sounds.stone, + drop = df_dependencies.node_name_cobble, + sounds = df_dependencies.sound_stone(), _mcl_blast_resistance = 6, _mcl_hardness = 1.5, }) @@ -37,10 +37,10 @@ df_mapitems.wet_stalagmite_ids = subterrane.register_stalagmite_nodes("df_mapite _doc_items_longdesc = df_mapitems.doc.dripstone_desc, _doc_items_usagehelp = df_mapitems.doc.dripstone_usage, tiles = { - df_mapitems.texture.stone .. "^[brighten^dfcaverns_dripstone_streaks.png", + df_dependencies.texture_stone .. "^[brighten^dfcaverns_dripstone_streaks.png", }, groups = {cracky = 3, stone = 2, subterrane_wet_dripstone = 1}, - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), is_ground_content = false, _mcl_blast_resistance = 6, _mcl_hardness = 1.5, @@ -51,12 +51,12 @@ minetest.register_node("df_mapitems:wet_flowstone", { description = S("Wet Flowstone"), _doc_items_longdesc = df_mapitems.doc.flowstone_desc, _doc_items_usagehelp = df_mapitems.doc.flowstone_usage, - tiles = {df_mapitems.texture.stone .. "^[brighten^dfcaverns_dripstone_streaks.png"}, + tiles = {df_dependencies.texture_stone .. "^[brighten^dfcaverns_dripstone_streaks.png"}, groups = {cracky = 3, stone = 1, subterrane_wet_dripstone = 1, lava_heatable = 1}, _magma_conduits_heats_to = "df_mapitems:dry_flowstone", is_ground_content = false, - drop = df_mapitems.node_name.cobble, - sounds = df_mapitems.sounds.stone, + drop = df_dependencies.node_name_cobble, + sounds = df_dependencies.sound_stone(), _mcl_blast_resistance = 6, _mcl_hardness = 1.5, }) @@ -68,10 +68,10 @@ df_mapitems.icicle_ids = subterrane.register_stalagmite_nodes("df_mapitems:icicl _doc_items_longdesc = df_mapitems.doc.icicle_desc, _doc_items_usagehelp = df_mapitems.doc.icicle_usage, tiles = { - df_mapitems.texture.ice, + df_dependencies.texture_ice, }, groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1, slippery = 3}, - sounds = df_mapitems.sounds.glass, + sounds = df_dependencies.sound_glass(), _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, }) diff --git a/df_mapitems/ground_cover.lua b/df_mapitems/ground_cover.lua index aba5c7d..4d5edea 100644 --- a/df_mapitems/ground_cover.lua +++ b/df_mapitems/ground_cover.lua @@ -18,21 +18,21 @@ local function soil_type_spread(label, node_to_spread, target_node) } end -local farming_soil = df_mapitems.node_name.farming_soil -local farming_soil_wet = df_mapitems.node_name.farming_soil_wet +local farming_soil = df_dependencies.node_name_dirt_furrowed +local farming_soil_wet = df_dependencies.node_name_dirt_wet -------------------------------------------------- -- Cave moss -- cyan/dark cyan -local dirt_texture = df_mapitems.texture.dirt -local sand_texture = df_mapitems.texture.sand +local dirt_texture = df_dependencies.texture_dirt +local sand_texture = df_dependencies.texture_sand -local dirt_node = df_mapitems.node_name.dirt -local sand_node = df_mapitems.node_name.sand -local stone_node = df_mapitems.node_name.stone -local cobble_node = df_mapitems.node_name.cobble +local dirt_node = df_dependencies.node_name_dirt +local sand_node = df_dependencies.node_name_sand +local stone_node = df_dependencies.node_name_stone +local cobble_node = df_dependencies.node_name_cobble minetest.register_node("df_mapitems:dirt_with_cave_moss", { description = S("Dirt with Cave Moss"), @@ -46,7 +46,7 @@ minetest.register_node("df_mapitems:dirt_with_cave_moss", { light_source = 2, paramtype = "light", groups = {crumbly = 3, soil = 1, light_sensitive_fungus = 8}, - sounds = df_mapitems.sounds.dirt_mossy, + sounds = df_dependencies.sound_dirt({footstep = {name = df_dependencies.soundfile_grass_footstep, gain = 0.25},}), soil = { base = "df_mapitems:dirt_with_cave_moss", dry = farming_soil, @@ -74,7 +74,7 @@ minetest.register_node("df_mapitems:sand_scum", { light_source = 2, paramtype = "light", groups = {crumbly = 3, soil = 1, light_sensitive_fungus = 8}, - sounds = df_mapitems.sounds.sandscum, + sounds = df_dependencies.sound_sand({footstep = {name = "dfcaverns_squish", gain = 0.25},}), _dfcaverns_dead_node = sand_node, _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, @@ -97,7 +97,7 @@ minetest.register_node("df_mapitems:dirt_with_pebble_fungus", { light_source = 2, paramtype = "light", groups = {crumbly = 3, soil = 1, light_sensitive_fungus = 8}, - sounds = df_mapitems.sounds.dirt, + sounds = df_dependencies.sound_dirt(), soil = { base = "df_mapitems:dirt_with_pebble_fungus", dry = farming_soil, @@ -125,7 +125,7 @@ minetest.register_node("df_mapitems:dirt_with_stillworm", { light_source = 2, paramtype = "light", groups = {crumbly = 3, soil = 1, light_sensitive_fungus = 8}, - sounds = df_mapitems.sounds.dirt_mossy, + sounds = df_dependencies.sound_dirt({footstep = {name = df_dependencies.soundfile_grass_footstep, gain = 0.25},}), soil = { base = "df_mapitems:dirt_with_stillworm", dry = farming_soil, @@ -150,7 +150,7 @@ minetest.register_node("df_mapitems:spongestone", { is_ground_content = false, paramtype = "light", groups = {crumbly = 3, soil = 1, light_sensitive_fungus = 8}, - sounds = df_mapitems.sounds.dirt, + sounds = df_dependencies.sound_dirt(), soil = { base = "df_mapitems:spongestone", dry = farming_soil, @@ -165,15 +165,15 @@ minetest.register_node("df_mapitems:rock_rot", { description = S("Rock Rot"), _doc_items_longdesc = df_mapitems.doc.rock_rot_desc, _doc_items_usagehelp = df_mapitems.doc.rock_rot_usage, - tiles = {df_mapitems.texture.stone .. "^dfcaverns_ground_cover_rock_rot.png", df_mapitems.texture.stone, - {name = df_mapitems.texture.stone .. "^(dfcaverns_ground_cover_rock_rot.png^[mask:dfcaverns_ground_cover_side_mask.png)", + tiles = {df_dependencies.texture_stone .. "^dfcaverns_ground_cover_rock_rot.png", df_dependencies.texture_stone, + {name = df_dependencies.texture_stone .. "^(dfcaverns_ground_cover_rock_rot.png^[mask:dfcaverns_ground_cover_side_mask.png)", tileable_vertical = false}}, - drop = df_mapitems.node_name.cobble, + drop = df_dependencies.node_name_cobble, is_ground_content = false, light_source = 2, paramtype = "light", groups = {crumbly = 3, soil = 1, light_sensitive_fungus = 8}, - sounds = df_mapitems.sounds.dirt, + sounds = df_dependencies.sound_dirt(), _dfcaverns_dead_node = stone_node, _mcl_blast_resistance = 3, _mcl_hardness = 1, @@ -191,13 +191,13 @@ minetest.register_node("df_mapitems:cobble_with_floor_fungus", { description = S("Cobblestone with Floor Fungus"), _doc_items_longdesc = df_mapitems.doc.floor_fungus_desc, _doc_items_usagehelp = df_mapitems.doc.floor_fungus_usage, - tiles = {df_mapitems.texture.cobble .. "^dfcaverns_floor_fungus.png"}, + tiles = {df_dependencies.texture_cobble .. "^dfcaverns_floor_fungus.png"}, drop = cobble_node, is_ground_content = false, paramtype = "light", groups = {cracky = 3, stone = 2, slippery = 1, light_sensitive_fungus = 8, df_caverns_floor_fungus = 1}, - _dfcaverns_dead_node = df_mapitems.node_name.cobble, - sounds = df_mapitems.sounds.floor_fungus, + _dfcaverns_dead_node = df_dependencies.node_name_cobble, + sounds = df_dependencies.sound_stone({footstep = {name = "dfcaverns_squish", gain = 0.25},}), _mcl_blast_resistance = 6, _mcl_hardness = 1.5, }) @@ -206,13 +206,13 @@ minetest.register_node("df_mapitems:cobble_with_floor_fungus_fine", { description = S("Cobblestone with Floor Fungus"), _doc_items_longdesc = df_mapitems.doc.floor_fungus_desc, _doc_items_usagehelp = df_mapitems.doc.floor_fungus_usage, - tiles = {df_mapitems.texture.cobble .. "^dfcaverns_floor_fungus_fine.png"}, + tiles = {df_dependencies.texture_cobble .. "^dfcaverns_floor_fungus_fine.png"}, drop = cobble_node, is_ground_content = false, paramtype = "light", groups = {cracky = 3, stone = 2, slippery = 1, light_sensitive_fungus = 8, df_caverns_floor_fungus = 1}, - _dfcaverns_dead_node = df_mapitems.node_name.cobble, - df_mapitems.sounds.floor_fungus, + _dfcaverns_dead_node = df_dependencies.node_name_cobble, + df_dependencies.sound_stone({footstep = {name = "dfcaverns_squish", gain = 0.25},}), _mcl_blast_resistance = 6, _mcl_hardness = 1.5, on_timer = function(pos, elapsed) @@ -248,14 +248,14 @@ minetest.register_node("df_mapitems:ice_with_hoar_moss", { description = S("Ice with Hoar Moss"), _doc_items_longdesc = df_mapitems.doc.hoar_moss_desc, _doc_items_usagehelp = df_mapitems.doc.hoar_moss_usage, - tiles = {df_mapitems.texture.ice .. "^dfcaverns_hoar_moss.png"}, - drop = df_mapitems.node_name.ice, + tiles = {df_dependencies.texture_ice .. "^dfcaverns_hoar_moss.png"}, + drop = df_dependencies.node_name_ice, paramtype = "light", light_source = 2, is_ground_content = false, groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1, slippery = 2, light_sensitive_fungus = 8}, - sounds = df_mapitems.sounds.glass, - _dfcaverns_dead_node = df_mapitems.node_name.ice, + sounds = df_dependencies.sound_glass(), + _dfcaverns_dead_node = df_dependencies.node_name_ice, _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, }) @@ -278,7 +278,7 @@ if minetest.get_modpath("footprints") then footprints.register_trample_node("df_mapitems:sand_scum", { trampled_node_def_override = {description = S("Sand Scum with Footprint"),}, - hard_pack_node_name = df_mapitems.node_name.sand, + hard_pack_node_name = df_dependencies.node_name_sand, footprint_opacity = 128, hard_pack_probability = HARDPACK_PROBABILITY, hard_pack_count = HARDPACK_COUNT * 0.5, diff --git a/df_mapitems/init.lua b/df_mapitems/init.lua index f80cb40..9ef8bb6 100644 --- a/df_mapitems/init.lua +++ b/df_mapitems/init.lua @@ -6,7 +6,6 @@ local modpath = minetest.get_modpath(modname) --load companion lua files dofile(modpath.."/config.lua") -dofile(modpath.."/dependencies.lua") dofile(modpath.."/doc.lua") dofile(modpath.."/aliases.lua") dofile(modpath.."/util.lua") diff --git a/df_mapitems/snareweed.lua b/df_mapitems/snareweed.lua index 72ccaab..c3fa114 100644 --- a/df_mapitems/snareweed.lua +++ b/df_mapitems/snareweed.lua @@ -4,15 +4,15 @@ minetest.register_node("df_mapitems:snareweed", { description = S("Snareweed"), _doc_items_longdesc = df_mapitems.doc.snareweed_desc, _doc_items_usagehelp = df_mapitems.doc.snareweed_usage, - tiles = {df_mapitems.texture.dirt .. "^dfcaverns_snareweed_roots.png", df_mapitems.texture.dirt}, + tiles = {df_dependencies.texture_dirt .. "^dfcaverns_snareweed_roots.png", df_dependencies.texture_dirt}, drawtype="plantlike_rooted", paramtype2 = "leveled", special_tiles = {{name = "dfcaverns_snareweed.png", tileable_vertical = true}}, is_ground_content = false, - drop = df_mapitems.node_name.dirt, + drop = df_dependencies.node_name_dirt, light_source = 6, groups = {crumbly = 3, soil = 1}, - sounds = df_mapitems.sounds.dirt, + sounds = df_dependencies.sound_dirt(), _mcl_blast_resistance = 0.5, _mcl_hardness = 0.6, }) @@ -43,9 +43,9 @@ if df_mapitems.config.snareweed_damage then end -local c_water = df_mapitems.node_id.water -local c_dirt = df_mapitems.node_id.dirt -local c_stone = df_mapitems.node_id.stone +local c_water = minetest.get_content_id(df_dependencies.node_name_water_source) +local c_dirt = minetest.get_content_id(df_dependencies.node_name_dirt) +local c_stone = minetest.get_content_id(df_dependencies.node_name_stone) local c_snareweed = minetest.get_content_id("df_mapitems:snareweed") df_mapitems.place_snareweed = function(area, data, bi, param2_data) diff --git a/df_mapitems/veinstone.lua b/df_mapitems/veinstone.lua index 70bd3dc..801e840 100644 --- a/df_mapitems/veinstone.lua +++ b/df_mapitems/veinstone.lua @@ -4,13 +4,13 @@ minetest.register_node("df_mapitems:veinstone", { description = S("Veinstone"), _doc_items_longdesc = df_mapitems.doc.veinstone_desc, _doc_items_usagehelp = df_mapitems.doc.veinstone_usage, - tiles = {df_mapitems.texture.stone .. "^dfcaverns_veins.png"}, + tiles = {df_dependencies.texture_stone .. "^dfcaverns_veins.png"}, groups = {cracky = 3, stone = 1, lava_heatable = 1}, - _magma_conduits_heats_to = df_mapitems.node_name.cobble, + _magma_conduits_heats_to = df_dependencies.node_name_cobble, is_ground_content = false, light_source = 2, drop = "df_mapitems:veinstone", - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), on_punch = function(pos, node, puncher, pointed_thing) minetest.node_punch(pos, node, puncher, pointed_thing) minetest.swap_node(pos, {name="df_mapitems:veinstone_pulse"}) @@ -24,13 +24,13 @@ minetest.register_node("df_mapitems:veinstone_pulse", { description = S("Veinstone"), _doc_items_longdesc = df_mapitems.doc.veinstone_desc, _doc_items_usagehelp = df_mapitems.doc.veinstone_usage, - tiles = {df_mapitems.texture.stone .. "^dfcaverns_veins.png"}, + tiles = {df_dependencies.texture_stone .. "^dfcaverns_veins.png"}, groups = {cracky = 3, stone = 1, lava_heatable = 1, not_in_creative_inventory = 1}, - _magma_conduits_heats_to = df_mapitems.node_name.cobble, + _magma_conduits_heats_to = df_dependencies.node_name_cobble, is_ground_content = false, light_source = 8, drop = "df_mapitems:veinstone", - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), on_timer = function(pos, elapsed) local positions, count = minetest.find_nodes_in_area(vector.add(pos,1), vector.subtract(pos,1), "df_mapitems:veinstone") if count["df_mapitems:veinstone"] == 0 then @@ -57,13 +57,13 @@ minetest.register_node("df_mapitems:veinstone_refractory", { description = S("Veinstone"), _doc_items_longdesc = df_mapitems.doc.veinstone_desc, _doc_items_usagehelp = df_mapitems.doc.veinstone_usage, - tiles = {df_mapitems.texture.stone .. "^dfcaverns_veins.png"}, + tiles = {df_dependencies.texture_stone .. "^dfcaverns_veins.png"}, groups = {cracky = 3, stone = 1, lava_heatable = 1, not_in_creative_inventory = 1}, - _magma_conduits_heats_to = df_mapitems.node_name.cobble, + _magma_conduits_heats_to = df_dependencies.node_name_cobble, is_ground_content = false, light_source = 1, drop = "df_mapitems:veinstone", - sounds = df_mapitems.sounds.stone, + sounds = df_dependencies.sound_stone(), on_timer = function(pos, elapsed) minetest.swap_node(pos, {name="df_mapitems:veinstone"}) end,