Delete Lux ore (replace by stone); No more sandstone y < -84; More cacti

mods/watershed/init.lua

@@ -52,8 +52,9 @@ local flora = {
 	GRACHA = 36, -- Grassland grasses
 	JUTCHA = 16, -- Jungletree
 	JUGCHA = 16, -- Junglegrass
-	CACCHA = 2209, -- Cactus
-	DRYCHA = 121, -- Dry shrub
+	CACCHA = 800, -- Cactus
+	CACCHA_DRYGRASS = 1600,
+	DRYCHA = 150, -- Dry shrub
 	ACACHA = 1369, -- Acacia tree
 	GOGCHA = 9, -- Golden grass
 	PAPCHA = 4, -- Papyrus
@@ -466,7 +467,13 @@ function watershed_chunkgen(x0, y0, z0, x1, y1, z1, area, data)
 						or (densityper >= 0.77 and densityper <= 0.79)
 						or (densityper >= 0.84 and densityper <= 0.87)
 						or (densityper >= 0.95 and densityper <= 0.98) then
+							if y < -80 then
 								data[vi] = c_sandstone
+							elseif y < -80 and y > -84 and math.random() > 0.5 then
+								data[vi] = c_sandstone
+							else
+								data[vi] = c_wsstone
+							end
 						elseif biome == 7 and density < TSTONE * 3 then -- desert stone as surface layer
 							data[vi] = c_wsredstone
 						elseif math.abs(n_seam) < TSEAM then
@@ -580,7 +587,9 @@ function watershed_chunkgen(x0, y0, z0, x1, y1, z1, area, data)
 							end
 						elseif under[si] == 4 then
 							data[viu] = c_wsdrygrass
-							if math.random(flora.DRYCHA) == 2 then
+							if math.random(flora.CACCHA_DRYGRASS) == 2 then
+								watershed_cactus(x, y, z, area, data)
+							elseif math.random(flora.DRYCHA) == 2 then
 								data[vi] = c_dryshrub
 							end
 						elseif under[si] == 5 then

mods/watershed/nodes.lua

@@ -66,25 +66,9 @@ minetest.override_item("default:cloud", {
 	groups = {not_in_creative_inventory=1},
 })
 
-minetest.register_node("watershed:luxore", {
-	description = "Lux ore",
-	tiles = {"watershed_luxore.png"},
-	paramtype = "light",
-	light_source = 14,
-	groups = {cracky=3},
-	drop = "watershed:luxcrystal",
-	sounds = default.node_sound_glass_defaults(),
-})
+minetest.register_alias("watershed:luxore", "default:stone")
 
-minetest.register_node("watershed:light", {
-	description = "Light",
-	drawtype = "glasslike_framed_optional",
-	tiles = {"default_glass.png^watershed_luxcrystal_glass.png", "default_glass_detail.png^watershed_luxcrystal_glass.png"},
-	paramtype = "light",
-	light_source = 14,
-	groups = {cracky=3},
-	sounds = default.node_sound_glass_defaults(),
-})
+minetest.register_alias("watershed:light", "lantern:lamp")
 
 minetest.register_alias("watershed:acaciawood", "moretrees:acacia_wood")
 
@@ -105,16 +89,7 @@ minetest.register_alias("watershed:mixwaterflow", "default:river_water_flowing")
 
 -- Items
 
-minetest.register_craftitem("watershed:luxcrystal", {
-	description = "Lux crystal",
-	inventory_image = "watershed_luxcrystal.png",
-})
+minetest.register_alias("watershed:luxcrystal", "default:cobble")
 
 -- Crafting
 
-minetest.register_craft({
-	output = "watershed:light",
-	type = "shapeless",
-	recipe = {"default:glass", "watershed:luxcrystal"},
-})
-