clean up some TODOs

df_caverns/lava_sea.lua

@@ -57,7 +57,6 @@ df_caverns.register_biome_check(function(pos, heat, humidity)
 	if pos.y > y_max or pos.y < y_min then
 		return
 	end
-	-- TODO: account for perlin noise
 	return "lava_sea"
 end)
 

df_caverns/oil_sea.lua

@@ -50,7 +50,6 @@ df_caverns.register_biome_check(function(pos, heat, humidity)
 	if pos.y > y_max or pos.y < y_min then
 		return
 	end
-	-- TODO: account for perlin noise
 	return "oil_sea"
 end)
 

df_caverns/underworld.lua

@@ -338,7 +338,6 @@ df_caverns.register_biome_check(function(pos, heat, humidity)
 	if pos.y > y_max or pos.y < y_min then
 		return
 	end
-	-- TODO: account for perlin noise
 	return "underworld"
 end)
 
@@ -560,7 +559,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 			local ceiling_height =  math.floor(abs_cave * ceiling_mult + median + ceiling_displace + wave)
 			if floor_height < ceiling_height then
 				local zone = math.abs(nvals_zone[index2d])
-				if math.random() < zone then -- bones are more common in the built-up areas
+				if math.random() < zone/2 then -- bones are more common in the built-up areas
 					local floor_node = minetest.get_node({x=x, y=floor_height, z=z})
 					local floor_node_def = minetest.registered_nodes[floor_node.name]
 					if floor_node_def and not floor_node_def.buildable_to then
@@ -571,7 +570,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 							if target_node.name == "air" then
 								bones_loot.place_bones(target_pos, "underworld_warrior", math.random(3, 10), nil, true)
 								break
-							elseif target_node.name == "bones:bones" then
+							elseif target_node.name == bones_node then
 								-- don't stack bones on bones, it looks silly
 								break
 							end

df_dependencies/misc.lua

@@ -27,7 +27,8 @@ if minetest.get_modpath("default") then
 elseif minetest.get_modpath("mcl_core") then
 	df_dependencies.data_iron_containing_nodes = {"mcl_core:stone_with_iron", "mcl_core:ironblock"}
 	df_dependencies.data_copper_containing_nodes = {"mcl_core:stone_with_copper", "mcl_copper:block", "mcl_copper:block_raw", "mcl_copper:block_exposed", "mcl_copper:block_oxidized", "mcl_copper:block_weathered"}
-	df_dependencies.data_mese_containing_nodes = {} -- TODO
+	df_dependencies.data_mese_containing_nodes = {"mcl_deepslate:deepslate_with_redstone", "mcl_deepslate:deepslate_with_redstone_lit",
+		"mcl_core:stone_with_redstone", "mcl_core:stone_with_redstone_lit", "group:mesecon_conductor_craftable", "group:mesecon", "group:mesecon_effector_off"}
 end
 
 -- common nodes that can be found next to pit plasma, triggering matter degradation

df_dependencies/nodes.lua

@@ -46,7 +46,7 @@ df_dependencies.node_name_gravel = select_required("default:gravel", "mcl_core:g
 df_dependencies.node_name_ice = select_required("default:ice", "mcl_core:ice")
 df_dependencies.node_name_junglewood = select_required("default:junglewood", "mcl_core:junglewood")
 df_dependencies.node_name_lava_source = select_required("default:lava_source", "mcl_core:lava_source")
-df_dependencies.node_name_mese_crystal = select_required("default:mese_crystal", "mesecons:redstone")
+df_dependencies.node_name_mese_crystal = select_required("default:mese_crystal", "mesecons:wire_00000000_off") --make sure default:mese_crystal is first, so that default will be checked for before mesecons is checked for.
 df_dependencies.node_name_mossycobble = select_required("default:mossycobble", "mcl_core:mossycobble")
 df_dependencies.node_name_obsidian = select_required("default:obsidian", "mcl_core:obsidian")
 df_dependencies.node_name_paper = select_required("default:paper", "mcl_core:paper")
@@ -107,8 +107,7 @@ df_dependencies.node_name_slab_slade_block_top = select_optional("mcl_stairs:sla
 
 -- from "tnt"
 
--- TODO: make optional
+df_dependencies.node_name_gunpowder = select_optional("tnt:gunpowder", "mcl_mobitems:gunpowder")
-df_dependencies.node_name_gunpowder = select_required("tnt:gunpowder", "mcl_mobitems:gunpowder")
 
 local modpath = minetest.get_modpath(minetest.get_current_modname())
 

df_mapitems/crystals_mese.lua

@@ -46,7 +46,7 @@ minetest.register_node("df_mapitems:mese_crystal", {
 })
 
 minetest.register_craft({
-	output = df_dependencies.node_name_mese_crystal .. ' 9',
+	output = df_dependencies.node_name_mese_crystal .. ' 18',
 	recipe = {
 		{'df_mapitems:mese_crystal'},
 	}

df_primordial_items/jungle_tree.lua

@@ -131,7 +131,6 @@ minetest.register_craft({
 ----------------------------
 -- Spawn
 
--- TODO: make use of the variant trunk and leaf nodes
 local c_leaves = minetest.get_content_id("df_primordial_items:jungle_leaves")
 local c_leaves_glow  = minetest.get_content_id("df_primordial_items:jungle_leaves_glowing")
 local c_trunk  = minetest.get_content_id("df_primordial_items:jungle_tree")

df_trees/tunnel_tube.lua

@@ -191,6 +191,27 @@ if df_trees.config.enable_tnt then
 	local tnt_def = {radius = tnt_radius, damage_radius = tnt_radius * 2}
 	local torch_item = df_dependencies.node_name_torch
 	
+	local drop_items = {
+			max_items = 1,
+			items = {
+				{
+					items = {'df_trees:tunnel_tube_sapling'},
+					rarity = 2,
+				},
+			}
+		}
+	if gunpowder then
+		drop_items.max_items = 3
+		table.insert(drop_items.items, {
+					items = {'df_trees:tunnel_tube_sapling', gunpowder},
+					rarity = 2,
+				})
+		table.insert(drop_items.items, {
+					items = {'df_trees:tunnel_tube_sapling', gunpowder .. ' 2'},
+					rarity = 2,
+				})
+	end
+
 	local on_burn = function(pos)
 		minetest.swap_node(pos, {name = "df_trees:tunnel_tube_fruiting_body_burning"})
 		minetest.registered_nodes["df_trees:tunnel_tube_fruiting_body_burning"].on_construct(pos)
@@ -206,23 +227,7 @@ if df_trees.config.enable_tnt then
 		groups = {choppy = 3, oddly_breakable_by_hand=1, flammable = 2, tnt = 1, handy=1, hoey=1, shearsy=1, swordy=1, deco_block=1, dig_by_piston=1, fire_encouragement=15, fire_flammability=30},
 		sounds = df_dependencies.sound_wood(),
 		on_place = minetest.rotate_node,
-		drop = {
+		drop = drop_items,
-			max_items = 3,
-			items = {
-				{
-					items = {'df_trees:tunnel_tube_sapling'},
-					rarity = 2,
-				},
-				{
-					items = {'df_trees:tunnel_tube_sapling', gunpowder},
-					rarity = 2,
-				},
-				{
-					items = {'df_trees:tunnel_tube_sapling', gunpowder .. ' 2'},
-					rarity = 2,
-				},
-			},
-		},
 		_mcl_blast_resistance = 12,
 		_mcl_hardness = 2,