--- darkage.old/glass.lua +++ darkage/glass.lua @@ -34,7 +34,7 @@ use_texture_alpha=true, paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "darkage_palette.png", sunlight_propagates = true, groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1}, sounds = default.node_sound_glass_defaults(), @@ -120,7 +120,7 @@ use_texture_alpha=true, paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "darkage_palette.png", sunlight_propagates = true, groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1}, sounds = default.node_sound_glass_defaults(), @@ -174,7 +174,7 @@ use_texture_alpha=true, paramtype = "light", paramtype2 = "color", - palette = "unifieddyes_palette.png", + palette = "darkage_palette.png", sunlight_propagates = true, groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1}, sounds = default.node_sound_glass_defaults(), --- darkage.old/mapgen.lua +++ darkage/mapgen.lua @@ -1,3 +1,7 @@ +local darkage_ore_rules = + minetest.setting_getbool ("darkage_ore_rules" ) +local enable_wonder = + minetest.setting_getbool ("enable_wonder" ) -- Some local constants to use for mapgen local c_air = minetest.CONTENT_AIR @@ -11,6 +15,9 @@ local stone_and_air_assoc = {[c_stone]=true,[c_air]=true} --associative array +local y_max +local y_min + --Makes a stratus of rocks --name of the rock to generate --c_wherein id of node to replace, for example minetest.get_content_id("default:stone") @@ -156,6 +163,16 @@ local mgparams = minetest.get_mapgen_params() local seed = mgparams.seed +if enable_wonder then + y_max = -10 + y_min = -128 +elseif darkage_ore_rules then + y_max = 200 + y_min = -1 +else + y_max = -10 + y_min = -128 +end -- Generate desert stone with iron in derset. minetest.register_ore({ @@ -165,19 +182,30 @@ clust_scarcity = 12 * 12 * 12, clust_num_ores = 3, clust_size = 2, - y_min = -1, - y_max = 200, + y_max = y_max , + y_min = y_min , }) --- Generate chalk inside mountains +if enable_wonder then + y_max = -10 + y_min = -128 +elseif darkage_ore_rules then + y_max = 50 + y_min = -20 +else + y_max = -10 + y_min = -128 +end + +-- Generate chalk inside (or not inside) mountains minetest.register_ore({ ore_type = "sheet", ore = "darkage:chalk", wherein = {"default:stone"}, column_height_max = 30, column_height_min = 20, - y_min = -20, - y_max = 50, + y_max = y_max , + y_min = y_min , noise_threshold = 0.45, noise_params = { offset = 0.35, @@ -188,14 +216,25 @@ }, }) +if enable_wonder then + y_max = -10 + y_min = -128 +elseif darkage_ore_rules then + y_max = 200 + y_min = -200 +else + y_max = -10 + y_min = -128 +end + minetest.register_ore({ ore_type = "sheet", ore = "darkage:tuff", wherein = {"default:stone", "default:needs_dirt", "default:gravel", "default:stone_with_coal"}, column_height_max = 20, column_height_min = 15, - y_min = -200, - y_max = 200, + y_max = y_max , + y_min = y_min , noise_threshold = 0.5, noise_params = { offset = 0.35, @@ -207,14 +246,25 @@ }, }) +if enable_wonder then + y_max = -200 + y_min = -2000 +elseif darkage_ore_rules then + y_max = 200 + y_min = -2000 +else + y_max = -200 + y_min = -2000 +end + minetest.register_ore({ ore_type = "sheet", ore = "darkage:rhyolitic_tuff", wherein = {"default:stone", "default:needs_dirt", "default:gravel", "default:stone_with_coal"}, column_height_max = 20, column_height_min = 15, - y_min = -2000, - y_max = 200, + y_max = y_max , + y_min = y_min , noise_threshold = 0.53, noise_params = { offset = 0.35, @@ -226,6 +276,17 @@ }, }) +if enable_wonder then + y_max = -10 + y_min = -128 +elseif darkage_ore_rules then + y_max = 500 + y_min = -200 +else + y_max = -10 + y_min = -128 +end + --old red sandstone minetest.register_ore({ ore_type = "sheet", @@ -233,8 +294,8 @@ wherein = {"default:stone", "default:dirt", "default:gravel", "default:stone_with_coal"}, column_height_max = 8, column_height_min = 6, - y_min = -200, - y_max = 500, + y_max = y_max , + y_min = y_min , noise_threshold = 0.49, noise_params = { offset = 0.28, @@ -247,9 +308,9 @@ }) --- Generate strati +-- Generate stratums local dbuf = {} --for mapgen -local function generate_strati(minp, maxp, seed) +local function generate_stratums(minp, maxp, seed) local t1 = os.clock() @@ -257,9 +318,12 @@ local area = VoxelArea:new({MinEdge = emin, MaxEdge = emax}) local data = vm:get_data(dbuf) - - generate_claylike(data, area, "darkage:mud", minp, maxp, seed+1, 4, 0, 2, false) - generate_claylike(data, area, "darkage:silt", minp, maxp, seed+2, 4, -1, 1, true) + if darkage_ore_rules then + generate_claylike (data, + area, "darkage:mud", minp, maxp, seed+1, 4, 0, 2, false) + generate_claylike (data, + area, "darkage:silt", minp, maxp, seed+2, 4, -1, 1, true) + end -- TODO: Maybe realize the following stuff with register ore. somehow. generate_stratus(data, area, "darkage:shale", @@ -303,4 +367,4 @@ minetest.log("info", string.format("[darkage] Generated Strati after %.2fs.", os.clock() - t1)) end -minetest.register_on_generated(generate_strati) +minetest.register_on_generated(generate_stratums) diff -ruN darkage/README.md darkage.old/README.md --- darkage.old/mapgen.lua +++ darkage/mapgen.lua @@ -367,4 +367,9 @@ minetest.log("info", string.format("[darkage] Generated Strati after %.2fs.", os.clock() - t1)) end -minetest.register_on_generated(generate_stratums) +local enable_darkage_mapgen = + minetest.setting_getbool ("enable_darkage_mapgen") + +if enable_darkage_mapgen then + minetest.register_on_generated (generate_stratums) +end