diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 51d8fea..d633f4e 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -3,28 +3,33 @@ -- Mapgen -- +local function on_generated(minp, maxp, blockseed) + for x = minp.x, maxp.x do + if x > 0 then + return + end + + for z = minp.z, maxp.z do + if z > -16 and z < 16 then + for y = minp.y, maxp.y do + minetest.remove_node({x = x, y = y, z = z}) + end + end + end + end +end + +minetest.register_on_generated(on_generated) + -- Aliases for map generator outputs --- Might not be needed with v7, but just in case +-- v7 still needs them.. sigh.. minetest.register_alias("mapgen_stone", "default:stone") -minetest.register_alias("mapgen_tree", "default:tree") -minetest.register_alias("mapgen_leaves", "default:leaves") -minetest.register_alias("mapgen_apple", "default:apple") +minetest.register_alias("mapgen_sandstone", "default:sandstone") + minetest.register_alias("mapgen_water_source", "default:water_source") minetest.register_alias("mapgen_river_water_source", "default:river_water_source") -minetest.register_alias("mapgen_dirt", "default:dirt") -minetest.register_alias("mapgen_sand", "default:sand") -minetest.register_alias("mapgen_desert_sand", "default:sand") -minetest.register_alias("mapgen_desert_stone", "default:sandstone") -minetest.register_alias("mapgen_gravel", "default:gravel") -minetest.register_alias("mapgen_cobble", "default:cobble") -minetest.register_alias("mapgen_mossycobble", "default:reinforced_cobble") -minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") -minetest.register_alias("mapgen_junglegrass", "default:grass") -minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal") -minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron") -minetest.register_alias("mapgen_mese", "default:block_steel") -minetest.register_alias("mapgen_stair_cobble", "default:reinforced_frame") + minetest.register_alias("mapgen_lava_source", "default:water_source") -- Biome setup @@ -691,66 +696,142 @@ minetest.register_decoration( -- Coal ore -minetest.register_ore( +minetest.register_ore( -- Even distribution { ore_type = "scatter", ore = "default:stone_with_coal", wherein = "default:stone", clust_scarcity = 10*10*10, - clust_num_ores = 6, + clust_num_ores = 8, clust_size = 4, y_min = -31000, y_max = 32, }) -minetest.register_ore( +minetest.register_ore( -- Dense sheet { ore_type = "scatter", ore = "default:stone_with_coal", wherein = "default:stone", - clust_scarcity = 8*8*8, - clust_num_ores = 8, - clust_size = 6, - y_min = -31000, + clust_scarcity = 7*7*7, + clust_num_ores = 10, + clust_size = 8, + y_min = -40, y_max = -32, }) -minetest.register_ore( +minetest.register_ore( -- Deep ore sheet { ore_type = "scatter", ore = "default:stone_with_coal", wherein = "default:stone", - clust_scarcity = 9*9*9, - clust_num_ores = 20, - clust_size = 10, - y_min = -31000, - y_max = -64, + clust_scarcity = 6*6*6, + clust_num_ores = 26, + clust_size = 12, + y_min = -130, + y_max = -120, }) -- Iron ore -minetest.register_ore( +minetest.register_ore( -- Even distribution { ore_type = "scatter", ore = "default:stone_with_iron", wherein = "default:stone", - clust_scarcity = 8*8*8, - clust_num_ores = 6, - clust_size = 4, + clust_scarcity = 12*12*12, + clust_num_ores = 4, + clust_size = 3, y_min = -31000, - y_max = 0, + y_max = -8, }) -minetest.register_ore( +minetest.register_ore( -- Dense sheet { ore_type = "scatter", ore = "default:stone_with_iron", wherein = "default:stone", clust_scarcity = 8*8*8, clust_num_ores = 20, - clust_size = 10, + clust_size = 12, + y_min = -32, + y_max = -24, +}) + +minetest.register_ore( -- Dense sheet + { + ore_type = "scatter", + ore = "default:stone_with_iron", + wherein = "default:stone", + clust_scarcity = 7*7*7, + clust_num_ores = 17, + clust_size = 6, + y_min = -80, + y_max = -60, +}) + +-- Tin ore + +minetest.register_ore( -- Even distribution + { + ore_type = "scatter", + ore = "default:stone_with_tin", + wherein = "default:stone", + clust_scarcity = 14*14*14, + clust_num_ores = 8, + clust_size = 4, y_min = -31000, - y_max = -32, + y_max = -100, +}) + +minetest.register_ore( -- Dense sheet + { + ore_type = "scatter", + ore = "default:stone_with_tin", + wherein = "default:stone", + clust_scarcity = 7*7*7, + clust_num_ores = 10, + clust_size = 6, + y_min = -150, + y_max = -140, +}) + +-- Copper ore + +minetest.register_ore( -- Begin sheet + { + ore_type = "scatter", + ore = "default:stone_with_copper", + wherein = "default:stone", + clust_scarcity = 6*6*6, + clust_num_ores = 12, + clust_size = 5, + y_min = -90, + y_max = -80, +}) + +minetest.register_ore( -- Rare even distribution + { + ore_type = "scatter", + ore = "default:stone_with_copper", + wherein = "default:stone", + clust_scarcity = 13*13*13, + clust_num_ores = 10, + clust_size = 5, + y_min = -31000, + y_max = -90, +}) + +minetest.register_ore( -- Large clusters + { + ore_type = "scatter", + ore = "default:stone_with_copper", + wherein = "default:stone", + clust_scarcity = 8*8*8, + clust_num_ores = 22, + clust_size = 10, + y_min = -230, + y_max = -180, }) -- Water diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 2c392b0..0d41fd6 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -25,6 +25,26 @@ minetest.register_node( sounds = default.node_sound_stone_defaults(), }) +minetest.register_node( + "default:stone_with_tin", + { + description = "Stone with Tin", + tiles = {"default_stone.png^default_mineral_tin.png"}, + groups = {cracky = 1, stone = 1, not_in_craftingguide = 1}, + drop = "default:lump_tin", + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node( + "default:stone_with_copper", + { + description = "Stone with Copper", + tiles = {"default_stone.png^default_mineral_copper.png"}, + groups = {cracky = 1, stone = 1, not_in_craftingguide = 1}, + drop = "default:lump_copper", + sounds = default.node_sound_stone_defaults(), +}) + -- Stonelike minetest.register_node( diff --git a/mods/default/textures/default_mineral_coal.png b/mods/default/textures/default_mineral_coal.png index 8f073b0..ee0f971 100644 Binary files a/mods/default/textures/default_mineral_coal.png and b/mods/default/textures/default_mineral_coal.png differ diff --git a/mods/default/textures/default_mineral_coal.xcf b/mods/default/textures/default_mineral_coal.xcf index 23f26c6..d93db50 100644 Binary files a/mods/default/textures/default_mineral_coal.xcf and b/mods/default/textures/default_mineral_coal.xcf differ diff --git a/mods/default/textures/default_mineral_copper.png b/mods/default/textures/default_mineral_copper.png new file mode 100644 index 0000000..dfc18ba Binary files /dev/null and b/mods/default/textures/default_mineral_copper.png differ diff --git a/mods/default/textures/default_mineral_copper.xcf b/mods/default/textures/default_mineral_copper.xcf new file mode 100644 index 0000000..d065c3a Binary files /dev/null and b/mods/default/textures/default_mineral_copper.xcf differ diff --git a/mods/default/textures/default_mineral_iron.png b/mods/default/textures/default_mineral_iron.png index 1bca032..c9464e6 100644 Binary files a/mods/default/textures/default_mineral_iron.png and b/mods/default/textures/default_mineral_iron.png differ diff --git a/mods/default/textures/default_mineral_iron.xcf b/mods/default/textures/default_mineral_iron.xcf index 0036b01..8cd366f 100644 Binary files a/mods/default/textures/default_mineral_iron.xcf and b/mods/default/textures/default_mineral_iron.xcf differ diff --git a/mods/default/textures/default_mineral_tin.png b/mods/default/textures/default_mineral_tin.png new file mode 100644 index 0000000..26a3a02 Binary files /dev/null and b/mods/default/textures/default_mineral_tin.png differ diff --git a/mods/default/textures/default_mineral_tin.xcf b/mods/default/textures/default_mineral_tin.xcf new file mode 100644 index 0000000..4f58c39 Binary files /dev/null and b/mods/default/textures/default_mineral_tin.xcf differ diff --git a/mods/gold/init.lua b/mods/gold/init.lua index 93e8287..eb5c3d3 100644 --- a/mods/gold/init.lua +++ b/mods/gold/init.lua @@ -265,6 +265,33 @@ minetest.register_craftitem( inventory_image = "gold_ingot_gold.png", }) +-- Nodes + +minetest.register_node( + "gold:stone_with_gold", + { + description = "Stone with Gold", + tiles ={"default_stone.png^gold_mineral_gold.png"}, + groups = {cracky=1, stone=1}, + drop = "gold:lump_gold", + is_ground_content = true, + sounds = default.node_sound_stone_defaults(), +}) + +-- Ores + +minetest.register_ore( + { + ore_type = "scatter", + ore = "gold:stone_with_gold", + wherein = "default:stone", + clust_scarcity = 9*9*9, + clust_num_ores = 12, + clust_size = 6, + y_min = -60, + y_max = -45, +}) + -- Crafting crafting.register_craft( @@ -281,34 +308,7 @@ minetest.register_craft( type = "cooking", output = "gold:ingot_gold", recipe = "gold:lump_gold", - cooktime = 6, -}) - --- Nodes - -minetest.register_node( - "gold:ore", - { - description = "Gold Ore", - tiles ={"default_stone.png^gold_mineral.png"}, - groups = {cracky=1, stone=1}, - drop = "gold:lump_gold", - is_ground_content = true, - sounds = default.node_sound_stone_defaults(), -}) - --- Ore - -minetest.register_ore( - { - ore_type = "scatter", - ore = "gold:ore", - wherein = "default:stone", - clust_scarcity = 12*12*12, - clust_num_ores = 10, - clust_size = 10, - y_min = -256, - y_max = -32, + cooktime = 7, }) -- Achievements diff --git a/mods/gold/textures/gold_mineral.png b/mods/gold/textures/gold_mineral.png deleted file mode 100644 index df410ed..0000000 Binary files a/mods/gold/textures/gold_mineral.png and /dev/null differ diff --git a/mods/gold/textures/gold_mineral.xcf b/mods/gold/textures/gold_mineral.xcf deleted file mode 100644 index 7119f28..0000000 Binary files a/mods/gold/textures/gold_mineral.xcf and /dev/null differ diff --git a/mods/gold/textures/gold_mineral_gold.png b/mods/gold/textures/gold_mineral_gold.png new file mode 100644 index 0000000..5b7e69b Binary files /dev/null and b/mods/gold/textures/gold_mineral_gold.png differ diff --git a/mods/gold/textures/gold_mineral_gold.xcf b/mods/gold/textures/gold_mineral_gold.xcf new file mode 100644 index 0000000..4a35314 Binary files /dev/null and b/mods/gold/textures/gold_mineral_gold.xcf differ diff --git a/mods/lumien/init.lua b/mods/lumien/init.lua index b45e552..2eb69b5 100644 --- a/mods/lumien/init.lua +++ b/mods/lumien/init.lua @@ -25,8 +25,16 @@ local function on_globalstep(dtime) local pos = player:getpos() util.nodefunc( - {x = pos.x-lumien_on_radius, y = pos.y-lumien_on_radius, z = pos.z-lumien_on_radius}, - {x = pos.x+lumien_on_radius, y = pos.y+lumien_on_radius, z = pos.z+lumien_on_radius}, + { + x = pos.x-lumien_on_radius, + y = pos.y-lumien_on_radius, + z = pos.z-lumien_on_radius + }, + { + x = pos.x+lumien_on_radius, + y = pos.y+lumien_on_radius, + z = pos.z+lumien_on_radius + }, "lumien:crystal_off", function(pos) local node = minetest.get_node(pos) @@ -104,10 +112,10 @@ minetest.register_node( -- Ores minetest.register_node( - "lumien:ore", + "lumien:stone_with_lumien", { - description = "Lumien Ore", - tiles = {"default_stone.png^lumien_mineral.png"}, + description = "Stone with Lumien", + tiles = {"default_stone.png^lumien_mineral_lumien.png"}, groups = {cracky = 1, stone = 1}, drop = "lumien:block", sounds = default.node_sound_stone_defaults(), @@ -116,13 +124,13 @@ minetest.register_node( minetest.register_ore( { ore_type = "scatter", - ore = "lumien:ore", + ore = "lumien:stone_with_lumien", wherein = "default:stone", - clust_scarcity = 12*12*12, - clust_num_ores = 10, - clust_size = 10, - y_min = -256, - y_max = -64, + clust_scarcity = 5*5*5, + clust_num_ores = 8, + clust_size = 6, + y_min = -107, + y_max = -100, }) -- Update functions diff --git a/mods/lumien/textures/lumien_mineral.png b/mods/lumien/textures/lumien_mineral.png deleted file mode 100644 index c469872..0000000 Binary files a/mods/lumien/textures/lumien_mineral.png and /dev/null differ diff --git a/mods/lumien/textures/lumien_mineral.xcf b/mods/lumien/textures/lumien_mineral.xcf deleted file mode 100644 index b0cd964..0000000 Binary files a/mods/lumien/textures/lumien_mineral.xcf and /dev/null differ diff --git a/mods/lumien/textures/lumien_mineral_lumien.png b/mods/lumien/textures/lumien_mineral_lumien.png new file mode 100644 index 0000000..0abb7be Binary files /dev/null and b/mods/lumien/textures/lumien_mineral_lumien.png differ diff --git a/mods/lumien/textures/lumien_mineral_lumien.xcf b/mods/lumien/textures/lumien_mineral_lumien.xcf new file mode 100644 index 0000000..81b9225 Binary files /dev/null and b/mods/lumien/textures/lumien_mineral_lumien.xcf differ