add spindlestems to cavern level 1, most level 1 warrens are now lit up

df_caverns/level1.lua

@@ -6,6 +6,8 @@ local c_dirt_moss = minetest.get_content_id("df_mapitems:dirt_with_cave_moss")
 local c_wet_flowstone = minetest.get_content_id("df_mapitems:wet_flowstone")
 local c_dry_flowstone = minetest.get_content_id("df_mapitems:dry_flowstone")
 
+local c_spindleshroom_white = minetest.get_content_id("df_trees:spindleshroom_cap_white")
+
 local tower_cap_shrublist
 local fungiwood_shrublist
 
@@ -51,8 +53,12 @@ local tower_cap_cavern_floor = function(abs_cracks, vert_rand, vi, area, data, d
 
 		if math.random() < 0.1 then
 			df_caverns.place_shrub(vi+ystride, area, data, data_param2, tower_cap_shrublist)
-		elseif math.random() < 0.01 and abs_cracks > 0.25 then
-			df_trees.spawn_tower_cap_vm(vi+ystride, area, data)
+		elseif abs_cracks > 0.25 then
+			if math.random() < 0.01 then
+				df_trees.spawn_tower_cap_vm(vi+ystride, area, data)
+			elseif math.random() < 0.03 then
+				df_trees.spawn_spindleshroom_vm(vi+ystride, area, data, data_param2, c_spindleshroom_white)
+			end
 		end
 	end
 end
@@ -203,6 +209,7 @@ local decorate_level_1 = function(minp, maxp, seed, vm, node_arrays, area, data)
 		local index2d = mapgen_helper.index2di(minp, maxp, area, vi)
 		local biome_name = get_biome(heatmap[index2d], humiditymap[index2d])
 		local flooded_caverns = nvals_cave[cave_area:transform(area, vi)] < 0 -- this indicates if we're in the "flooded" set of caves or not.
+		local ystride = area.ystride
 
 		if not (flooded_caverns and minp.y < subsea_level and area:get_y(vi) < subsea_level) then
 			if flooded_caverns or biome_name ~= "barren" then		
@@ -211,6 +218,26 @@ local decorate_level_1 = function(minp, maxp, seed, vm, node_arrays, area, data)
 			else
 				df_caverns.tunnel_floor(minp, maxp, area, vi, nvals_cracks, data, data_param2, false)
 			end
+			
+			if (not flooded_caverns) and biome_name ~= "barren" then
+				local cracks = nvals_cracks[index2d]
+				if cracks > 0.25 then
+					local rand = math.random()
+					if rand > cracks then
+						if math.random() < 0.25 then
+							data[vi] = c_dirt_moss
+						else
+							data[vi] = c_dirt
+						end
+						if data[vi+ystride] == c_air and math.random() < 0.25 then
+							df_caverns.place_shrub(vi+ystride, area, data, data_param2, tower_cap_shrublist)
+						end
+					end
+					if rand > cracks*2 then
+						df_trees.spawn_spindleshroom_vm(vi+ystride, area, data, data_param2)
+					end
+				end
+			end
 		end
 	end
 	

df_trees/spindleshroom.lua

@@ -4,9 +4,6 @@ local S, NS = dofile(MP.."/intllib.lua")
 
 local vessels = minetest.get_modpath("vessels")
 
--- pre-declare
-local get_cap_type
-
 -- Copied from subterrane's features.lua
 -- Figured that was nicer than adding a dependency for just this little bit
 local stem_on_place = function(itemstack, placer, pointed_thing)
@@ -215,22 +212,6 @@ local register_spindleshroom_type = function(item_suffix, colour_name, colour_co
 			}
 		})
 	end
-
-	-- mapgen function
-	return function(vi, area, data, data_param2)
-		local stem_height = math.random(1,5)-1
-		local param2 = math.random(1,4)-1
-		local i = 0
-		while i < stem_height do
-			index = vi + i * area.ystride
-			data[index] = c_stem
-			data_param2[index] = param2
-			i = i + 1
-		end
-		index = vi + i * area.ystride
-		data[index] = c_cap
-		data_param2[index] = param2	
-	end
 end
 
 local seedling_construct = function(pos)
@@ -264,7 +245,7 @@ minetest.register_node("df_trees:spindleshroom_seedling", {
 	on_construct = seedling_construct,
 	
 	on_timer = function(pos, elapsed)
-		local cap_item = "df_trees:spindleshroom_cap_"..get_cap_type(pos)
+		local cap_item = minetest.get_name_from_content_id(df_trees.get_spindleshroom_cap_type(pos))
 		local node = minetest.get_node(pos)
 		minetest.set_node(pos, {name=cap_item, param2 = node.param2})
 		local meta = minetest.get_meta(pos)
@@ -280,30 +261,66 @@ minetest.register_node("df_trees:spindleshroom_seedling", {
 	end,
 })
 
-df_trees.spawn_spindleshroom_white_vm = register_spindleshroom_type("white", S("White"), "FFFFFF", 0)
-df_trees.spawn_spindleshroom_red_vm = register_spindleshroom_type("red", S("Red"), "FFC3C3", 3)
-df_trees.spawn_spindleshroom_green_vm = register_spindleshroom_type("green", S("Green"), "C3FFC3", 4)
-df_trees.spawn_spindleshroom_cyan_vm = register_spindleshroom_type("cyan", S("Cyan"), "C3FFFF", 6)
-df_trees.spawn_spindleshroom_red_vm = register_spindleshroom_type("golden", S("Golden"), "FFFFC3", 12)
+register_spindleshroom_type("white", S("White"), "FFFFFF", 0)
+register_spindleshroom_type("red", S("Red"), "FFC3C3", 3)
+register_spindleshroom_type("green", S("Green"), "C3FFC3", 4)
+register_spindleshroom_type("cyan", S("Cyan"), "C3FFFF", 6)
+register_spindleshroom_type("golden", S("Golden"), "FFFFC3", 12)
 
-get_cap_type = function(pos)
+local c_air = minetest.get_content_id("air")
+local c_stem = minetest.get_content_id("df_trees:spindleshroom_stem")
+
+df_trees.spawn_spindleshroom_vm = function(vi, area, data, data_param2, c_cap)
+	if data[vi] ~= c_air then return end
+	
+	if c_cap == nil then
+		-- note: this won't account for rock removed by subterrane, so may not be entirely accurate. Good enough!
+		c_cap = df_trees.get_spindleshroom_cap_type(area:position(vi))
+	end
+	
+	local stem_height = math.random(1,3)
+	local param2 = math.random(1,4)-1
+	local i = 0
+	local top = 0
+	while i <= stem_height do
+		index = vi + i * area.ystride
+		if data[index] == c_air then
+			data[index] = c_stem
+			data_param2[index] = param2
+			top = i
+		else
+			i = 100
+		end
+		i = i + 1
+	end
+	index = vi + top * area.ystride
+	data[index] = c_cap
+end
+
+local c_white = minetest.get_content_id("df_trees:spindleshroom_cap_white")
+local c_red = minetest.get_content_id("df_trees:spindleshroom_cap_red")
+local c_green = minetest.get_content_id("df_trees:spindleshroom_cap_green")
+local c_cyan = minetest.get_content_id("df_trees:spindleshroom_cap_cyan")
+local c_golden = minetest.get_content_id("df_trees:spindleshroom_cap_golden")
+
+df_trees.get_spindleshroom_cap_type = function(pos)
 	if pos.y > -100 then
-		return "white"
+		return c_white
 	end
 	local iron = minetest.find_node_near(pos, 10, {"default:stone_with_iron", "default:steelblock"})
 	local copper = minetest.find_node_near(pos, 10, {"default:stone_with_copper", "default:copperblock"})
 	local mese = minetest.find_node_near(pos, 10, {"default:stone_with_mese", "default:mese"})
 	local possibilities = {}
 
-	if mese then table.insert(possibilities, "golden") end
-	if copper then table.insert(possibilities, "green") end
-	if iron then table.insert(possibilities, "red") end
-	if iron and copper then table.insert(possibilities, "cyan") end
+	if mese then table.insert(possibilities, c_golden) end
+	if copper then table.insert(possibilities, c_green) end
+	if iron then table.insert(possibilities, c_red) end
+	if iron and copper then table.insert(possibilities, c_cyan) end
 	
 	if #possibilities == 0 then
-		return "white"
+		return c_white
 	else
 		local pick = math.random(1, #possibilities)
 		return possibilities[pick]
 	end	
-end
+end