Fix conflicting dependencies, add technic.

Zinc, Chromium, Uranium, Marble, and Granite now spawn in SkyTest.

mods/bucket/depends.txt

@@ -1,3 +1 @@
-default
-
-skylands
+default

mods/farming/depends.txt

@@ -1,4 +1,3 @@
 default
 
-wool
-skylands
+wool

mods/skylands/abms.lua

@@ -46,6 +46,18 @@ minetest.register_abm({
 			orename = "moreores:mineral_mithril"
 			orerad = 1
 		end
+		if node.name == "skylands:mineral_uranium" then
+			orename = "technic:mineral_uranium"
+			orerad = 1
+		end
+		if node.name == "skylands:mineral_chromium" then
+			orename = "technic:mineral_chromium"
+			orerad = 1
+		end
+		if node.name == "skylands:mineral_zinc" then
+			orename = "technic:mineral_zinc"
+			orerad = 1
+		end
 		if node.name == "skylands:sky_silicon" then
 			orename = "skylands:mineral_silicon"
 			orerad = 1

mods/skylands/depends.txt

@@ -1,6 +1,7 @@
 default
 fire
 stairs
+technic_worldgen
 mesecons?
 moreblocks?
 moreores?

mods/skylands/init.lua

@@ -41,6 +41,8 @@ local ORECHA = 1 / (6 * 6 * 6)
 local PILCHA = 0.002
 local PARCHA = 0.0001
 
+local VEINTHR = 0.25 -- threshold for veins of marble and granite. - higher = wider and more common
+
 local HEAVEN = 8000 --altitude at which "heaven" islands begin appearing
 local HEAVINT = 800 --interval between "heaven" layers; also determines layer width
 
@@ -121,6 +123,28 @@ local np_humid = {
 	persist = 0.5
 }
 
+-- 3D noise for marble generation
+
+local np_marble = {
+	offset = 0,
+	scale = 15,
+	spread = {x=130, y=130, z=130},
+	seed = 23,
+	octaves = 3,
+	persist = 0.70
+}
+
+-- 3D noise for granite generation
+
+local np_granite = {
+	offset = 0,
+	scale = 15,
+	spread = {x=130, y=130, z=130},
+	seed = 24,
+	octaves = 3,
+	persist = 0.70
+}
+
 -- Stuff
 
 skylands = {}
@@ -207,6 +231,12 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	local c_stotin = minetest.get_content_id("skylands:mineral_tin")
 	local c_stomithril = minetest.get_content_id("skylands:mineral_mithril")
 	local c_stosilver = minetest.get_content_id("skylands:mineral_silver")
+	--technic
+	local c_stouranium = minetest.get_content_id("skylands:mineral_uranium")
+	local c_stozinc = minetest.get_content_id("skylands:mineral_zinc")
+	local c_stochrom = minetest.get_content_id("skylands:mineral_chromium")
+	local c_marble = minetest.get_content_id("technic:marble")
+	local c_granite = minetest.get_content_id("technic:granite")
 
 	local c_flistone = minetest.get_content_id("skylands:stone")
 	local c_flidestone = minetest.get_content_id("skylands:desertstone")
@@ -241,6 +271,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	local nvals_temp = minetest.get_perlin_map(np_temp, chulens):get3dMap_flat(minposxyz)
 	local nvals_humid = minetest.get_perlin_map(np_humid, chulens):get3dMap_flat(minposxyz)
 	
+	local nvals_granite = minetest.get_perlin_map(np_granite, chulens):get3dMap_flat(minposxyz)
+	local nvals_marble = minetest.get_perlin_map(np_marble, chulens):get3dMap_flat(minposxyz)
+	
 	local lakepoints = {}  --table to store points to scan for lake generation
 	local li = 1 --index for lakepoints
 	
@@ -420,8 +453,14 @@ minetest.register_on_generated(function(minp, maxp, seed)
 									data[vi] = c_flistone
 								end
 							elseif math.random() < ORECHA then
-								local osel = math.random(40)
-								if osel >= 38 then
+								local osel = math.random(46)
+								if osel >= 44 then
+									data[vi] = c_stozinc
+								elseif osel >= 42 then --life the universe and everything
+									data[vi] = c_stouranium --or not.
+								elseif osel >= 40 then
+									data[vi] = c_stochrom
+								elseif osel >= 38 then
 									if mcons then
 										data[vi] = c_stosil
 									else
@@ -469,6 +508,12 @@ minetest.register_on_generated(function(minp, maxp, seed)
 							else
 								data[vi] = c_flistone
 							end
+							if nvals_marble[nixyz] >= -VEINTHR and nvals_marble[nixyz] <= VEINTHR then
+								data[vi] = c_marble
+							end
+							if nvals_granite[nixyz] >= -VEINTHR and nvals_granite[nixyz] <= VEINTHR then
+								data[vi] = c_granite
+							end
 							stable[si] = stable[si] + 1
 						end
 						

mods/skylands/nodes.lua

@@ -330,6 +330,34 @@ minetest.register_node("skylands:mineral_mithril", {
 	drop = "moreores:mithril_lump"
 })
 
+--technic ores
+minetest.register_node( "skylands:mineral_uranium", {
+	description = "Uranium Ore",
+	tiles = { "default_stone.png^technic_mineral_uranium.png" },
+	is_ground_content = true,
+	groups = {cracky=3, radioactive=1, skyores=1},
+	sounds = default.node_sound_stone_defaults(),
+	drop = 'craft "technic:uranium" 1',
+}) 
+
+minetest.register_node( "skylands:mineral_chromium", {
+	description = "Chromium Ore",
+	tiles = { "default_stone.png^technic_mineral_chromium.png" },
+	is_ground_content = true,
+	groups = {cracky=3, skyores=1},
+	sounds = default.node_sound_stone_defaults(),
+	drop = 'craft "technic:chromium_lump" 1',
+}) 
+
+minetest.register_node( "skylands:mineral_zinc", {
+	description = "Zinc Ore",
+	tile_images = { "default_stone.png^technic_mineral_zinc.png" },
+	is_ground_content = true,
+	groups = {cracky=3, skyores=1},
+	sounds = default.node_sound_stone_defaults(),
+	drop = 'craft "technic:zinc_lump" 1',
+})
+
 --Skylands-specific ores
 
 --Silicon