mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-23 16:39:33 +01:00
Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2
This commit is contained in:
Elias Fleckenstein
commit
1274884a9e
3 changed files with 420 additions and 413 deletions
|
|
@ -2043,6 +2043,7 @@ local function register_dimension_ores()
|
|||
})
|
||||
|
||||
-- Nether quartz
|
||||
if minetest.settings:get("mcl_generate_ores") == "true" then
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_nether:quartz_ore",
|
||||
|
|
@ -2063,6 +2064,7 @@ local function register_dimension_ores()
|
|||
y_min = mcl_vars.mg_nether_min,
|
||||
y_max = mcl_vars.mg_nether_max,
|
||||
})
|
||||
end
|
||||
|
||||
-- Lava springs in the Nether
|
||||
minetest.register_ore({
|
||||
|
|
|
|||
|
|
@ -223,12 +223,13 @@ minetest.register_ore({
|
|||
}
|
||||
})
|
||||
|
||||
--
|
||||
-- Coal
|
||||
--
|
||||
if minetest.settings:get("mcl_generate_ores") == "true" then
|
||||
--
|
||||
-- Coal
|
||||
--
|
||||
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -237,8 +238,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(50),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -247,8 +248,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(50),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -257,10 +258,10 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(50),
|
||||
})
|
||||
})
|
||||
|
||||
-- Medium-rare spawn
|
||||
minetest.register_ore({
|
||||
-- Medium-rare spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -269,8 +270,8 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_worlds.layer_to_y(51),
|
||||
y_max = mcl_worlds.layer_to_y(80),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -279,8 +280,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(51),
|
||||
y_max = mcl_worlds.layer_to_y(80),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -289,10 +290,10 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(51),
|
||||
y_max = mcl_worlds.layer_to_y(80),
|
||||
})
|
||||
})
|
||||
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -301,8 +302,8 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_worlds.layer_to_y(81),
|
||||
y_max = mcl_worlds.layer_to_y(128),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -311,8 +312,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(81),
|
||||
y_max = mcl_worlds.layer_to_y(128),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_coal",
|
||||
wherein = stonelike,
|
||||
|
|
@ -321,12 +322,12 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(81),
|
||||
y_max = mcl_worlds.layer_to_y(128),
|
||||
})
|
||||
})
|
||||
|
||||
--
|
||||
-- Iron
|
||||
--
|
||||
minetest.register_ore({
|
||||
--
|
||||
-- Iron
|
||||
--
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_iron",
|
||||
wherein = stonelike,
|
||||
|
|
@ -335,8 +336,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(39),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_iron",
|
||||
wherein = stonelike,
|
||||
|
|
@ -345,14 +346,14 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_worlds.layer_to_y(40),
|
||||
y_max = mcl_worlds.layer_to_y(63),
|
||||
})
|
||||
})
|
||||
|
||||
--
|
||||
-- Gold
|
||||
--
|
||||
--
|
||||
-- Gold
|
||||
--
|
||||
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_gold",
|
||||
wherein = stonelike,
|
||||
|
|
@ -361,8 +362,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(30),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_gold",
|
||||
wherein = stonelike,
|
||||
|
|
@ -371,10 +372,10 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(30),
|
||||
})
|
||||
})
|
||||
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_gold",
|
||||
wherein = stonelike,
|
||||
|
|
@ -383,14 +384,14 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_worlds.layer_to_y(31),
|
||||
y_max = mcl_worlds.layer_to_y(33),
|
||||
})
|
||||
})
|
||||
|
||||
--
|
||||
-- Diamond
|
||||
--
|
||||
--
|
||||
-- Diamond
|
||||
--
|
||||
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_diamond",
|
||||
wherein = stonelike,
|
||||
|
|
@ -399,8 +400,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(12),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_diamond",
|
||||
wherein = stonelike,
|
||||
|
|
@ -409,8 +410,8 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(12),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_diamond",
|
||||
wherein = stonelike,
|
||||
|
|
@ -419,10 +420,10 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(12),
|
||||
})
|
||||
})
|
||||
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_diamond",
|
||||
wherein = stonelike,
|
||||
|
|
@ -431,8 +432,8 @@ minetest.register_ore({
|
|||
clust_size = 1,
|
||||
y_min = mcl_worlds.layer_to_y(13),
|
||||
y_max = mcl_worlds.layer_to_y(15),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_diamond",
|
||||
wherein = stonelike,
|
||||
|
|
@ -441,14 +442,14 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_worlds.layer_to_y(13),
|
||||
y_max = mcl_worlds.layer_to_y(15),
|
||||
})
|
||||
})
|
||||
|
||||
--
|
||||
-- Redstone
|
||||
--
|
||||
--
|
||||
-- Redstone
|
||||
--
|
||||
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
-- Common spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_redstone",
|
||||
wherein = stonelike,
|
||||
|
|
@ -457,8 +458,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(13),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_redstone",
|
||||
wherein = stonelike,
|
||||
|
|
@ -467,10 +468,10 @@ minetest.register_ore({
|
|||
clust_size = 4,
|
||||
y_min = mcl_vars.mg_overworld_min,
|
||||
y_max = mcl_worlds.layer_to_y(13),
|
||||
})
|
||||
})
|
||||
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
-- Rare spawn
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_redstone",
|
||||
wherein = stonelike,
|
||||
|
|
@ -479,8 +480,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(13),
|
||||
y_max = mcl_worlds.layer_to_y(15),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_redstone",
|
||||
wherein = stonelike,
|
||||
|
|
@ -489,13 +490,13 @@ minetest.register_ore({
|
|||
clust_size = 4,
|
||||
y_min = mcl_worlds.layer_to_y(13),
|
||||
y_max = mcl_worlds.layer_to_y(15),
|
||||
})
|
||||
})
|
||||
|
||||
--
|
||||
-- Emerald
|
||||
--
|
||||
--
|
||||
-- Emerald
|
||||
--
|
||||
|
||||
if mg_name == "v6" then
|
||||
if mg_name == "v6" then
|
||||
-- Generate everywhere in v6, but rarely.
|
||||
|
||||
-- Common spawn
|
||||
|
|
@ -520,14 +521,14 @@ if mg_name == "v6" then
|
|||
y_min = mcl_worlds.layer_to_y(30),
|
||||
y_max = mcl_worlds.layer_to_y(32),
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
--
|
||||
-- Lapis Lazuli
|
||||
--
|
||||
--
|
||||
-- Lapis Lazuli
|
||||
--
|
||||
|
||||
-- Common spawn (in the center)
|
||||
minetest.register_ore({
|
||||
-- Common spawn (in the center)
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -536,10 +537,10 @@ minetest.register_ore({
|
|||
clust_size = 4,
|
||||
y_min = mcl_worlds.layer_to_y(14),
|
||||
y_max = mcl_worlds.layer_to_y(16),
|
||||
})
|
||||
})
|
||||
|
||||
-- Rare spawn (below center)
|
||||
minetest.register_ore({
|
||||
-- Rare spawn (below center)
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -548,8 +549,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(10),
|
||||
y_max = mcl_worlds.layer_to_y(13),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -558,8 +559,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(6),
|
||||
y_max = mcl_worlds.layer_to_y(9),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -568,8 +569,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(2),
|
||||
y_max = mcl_worlds.layer_to_y(5),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -578,10 +579,10 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_worlds.layer_to_y(0),
|
||||
y_max = mcl_worlds.layer_to_y(2),
|
||||
})
|
||||
})
|
||||
|
||||
-- Rare spawn (above center)
|
||||
minetest.register_ore({
|
||||
-- Rare spawn (above center)
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -590,8 +591,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(17),
|
||||
y_max = mcl_worlds.layer_to_y(20),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -600,8 +601,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(21),
|
||||
y_max = mcl_worlds.layer_to_y(24),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -610,8 +611,8 @@ minetest.register_ore({
|
|||
clust_size = 3,
|
||||
y_min = mcl_worlds.layer_to_y(25),
|
||||
y_max = mcl_worlds.layer_to_y(28),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -620,8 +621,8 @@ minetest.register_ore({
|
|||
clust_size = 2,
|
||||
y_min = mcl_worlds.layer_to_y(29),
|
||||
y_max = mcl_worlds.layer_to_y(32),
|
||||
})
|
||||
minetest.register_ore({
|
||||
})
|
||||
minetest.register_ore({
|
||||
ore_type = "scatter",
|
||||
ore = "mcl_core:stone_with_lapis",
|
||||
wherein = stonelike,
|
||||
|
|
@ -630,7 +631,8 @@ minetest.register_ore({
|
|||
clust_size = 1,
|
||||
y_min = mcl_worlds.layer_to_y(31),
|
||||
y_max = mcl_worlds.layer_to_y(32),
|
||||
})
|
||||
})
|
||||
end
|
||||
|
||||
if not superflat then
|
||||
-- Water and lava springs (single blocks of lava/water source)
|
||||
|
|
|
|||
|
|
@ -126,6 +126,9 @@ mcl_generate_fallen_logs (Generate fallen logs) bool false
|
|||
# But creating new flat worlds after changing this setting should be safe.
|
||||
mcl_superflat_classic (Classic superflat map generation) bool false
|
||||
|
||||
# If disabled, no ores will be generated.
|
||||
mcl_generate_ores (Generate Ores) bool true
|
||||
|
||||
# Make some blocks emit decorative particles like flames. This setting
|
||||
# specifies the detail level of particles, with higher levels being
|
||||
# more CPU demanding.
|
||||
|
|
|
|||
Loading…
Reference in a new issue