solve remaining merge conflicts
This commit is contained in:
parent
a90005a9d9
commit
c80c4b1b37
42
init.lua
42
init.lua
|
@ -252,6 +252,13 @@ local oredefs = {
|
||||||
silver = {
|
silver = {
|
||||||
description = "Silver",
|
description = "Silver",
|
||||||
makes = {lump = true, ingot = true, chest = true},
|
makes = {lump = true, ingot = true, chest = true},
|
||||||
|
oredef_high= {
|
||||||
|
clust_scarcity = moreores.silver_chunk_size_high ^ 3,
|
||||||
|
clust_num_ores = moreores.silver_ore_per_chunk_high,
|
||||||
|
clust_size = moreores.silver_clust_size_high,
|
||||||
|
y_min = moreores.silver_min_depth_high,
|
||||||
|
y_max = moreores.silver_max_depth_high,
|
||||||
|
},
|
||||||
oredef = {
|
oredef = {
|
||||||
clust_scarcity = moreores.silver_chunk_size ^ 3,
|
clust_scarcity = moreores.silver_chunk_size ^ 3,
|
||||||
clust_num_ores = moreores.silver_ore_per_chunk,
|
clust_num_ores = moreores.silver_ore_per_chunk,
|
||||||
|
@ -259,6 +266,13 @@ local oredefs = {
|
||||||
y_min = moreores.silver_min_depth,
|
y_min = moreores.silver_min_depth,
|
||||||
y_max = moreores.silver_max_depth,
|
y_max = moreores.silver_max_depth,
|
||||||
},
|
},
|
||||||
|
oredef_deep = {
|
||||||
|
clust_scarcity = moreores.silver_chunk_size_deep ^ 3,
|
||||||
|
clust_num_ores = moreores.silver_ore_per_chunk_deep,
|
||||||
|
clust_size = moreores.silver_clust_size_deep,
|
||||||
|
y_min = moreores.silver_min_depth_deep,
|
||||||
|
y_max = moreores.silver_max_depth_deep,
|
||||||
|
},
|
||||||
mineral = {groups = {cracky = 2}},
|
mineral = {groups = {cracky = 2}},
|
||||||
block = {groups = {cracky = 1, level = 2}},
|
block = {groups = {cracky = 1, level = 2}},
|
||||||
craftingot = {cooktime = 2},
|
craftingot = {cooktime = 2},
|
||||||
|
@ -299,6 +313,13 @@ local oredefs = {
|
||||||
mithril = {
|
mithril = {
|
||||||
description = "Mithril",
|
description = "Mithril",
|
||||||
makes = {lump = true, ingot = true, chest = false},
|
makes = {lump = true, ingot = true, chest = false},
|
||||||
|
oredef_high = {
|
||||||
|
clust_scarcity = moreores.mithril_chunk_size_high ^ 3,
|
||||||
|
clust_num_ores = moreores.mithril_ore_per_chunk_high,
|
||||||
|
clust_size = moreores.mithril_clust_size_high,
|
||||||
|
y_min = moreores.mithril_min_depth_high,
|
||||||
|
y_max = moreores.mithril_max_depth_high,
|
||||||
|
},
|
||||||
oredef = {
|
oredef = {
|
||||||
clust_scarcity = moreores.mithril_chunk_size ^ 3,
|
clust_scarcity = moreores.mithril_chunk_size ^ 3,
|
||||||
clust_num_ores = moreores.mithril_ore_per_chunk,
|
clust_num_ores = moreores.mithril_ore_per_chunk,
|
||||||
|
@ -306,6 +327,13 @@ local oredefs = {
|
||||||
y_min = moreores.mithril_min_depth,
|
y_min = moreores.mithril_min_depth,
|
||||||
y_max = moreores.mithril_max_depth,
|
y_max = moreores.mithril_max_depth,
|
||||||
},
|
},
|
||||||
|
oredef_deep = {
|
||||||
|
clust_scarcity = moreores.mithril_chunk_size_deep ^ 3,
|
||||||
|
clust_num_ores = moreores.mithril_ore_per_chunk_deep,
|
||||||
|
clust_size = moreores.mithril_clust_size_deep,
|
||||||
|
y_min = moreores.mithril_min_depth_deep,
|
||||||
|
y_max = moreores.mithril_max_depth_deep,
|
||||||
|
},
|
||||||
mineral = {groups = {cracky = 1}},
|
mineral = {groups = {cracky = 1}},
|
||||||
block = {groups = {cracky = 1, level = 5}, on_blast = function() end},
|
block = {groups = {cracky = 1, level = 5}, on_blast = function() end},
|
||||||
craftingot = {cooktime = 10},
|
craftingot = {cooktime = 10},
|
||||||
|
@ -362,6 +390,13 @@ else
|
||||||
oredefs.tin = {
|
oredefs.tin = {
|
||||||
description = "Tin",
|
description = "Tin",
|
||||||
makes = {lump = true, ingot = true, chest = false},
|
makes = {lump = true, ingot = true, chest = false},
|
||||||
|
oredef_high = {
|
||||||
|
clust_scarcity = moreores.tin_chunk_size_high ^ 3,
|
||||||
|
clust_num_ores = moreores.tin_ore_per_chunk_high,
|
||||||
|
clust_size = moreores.tin_clust_size_high,
|
||||||
|
y_min = moreores.tin_min_depth_high,
|
||||||
|
y_max = moreores.tin_max_depth_high,
|
||||||
|
},
|
||||||
oredef = {
|
oredef = {
|
||||||
clust_scarcity = moreores.tin_chunk_size ^ 3,
|
clust_scarcity = moreores.tin_chunk_size ^ 3,
|
||||||
clust_num_ores = moreores.tin_ore_per_chunk,
|
clust_num_ores = moreores.tin_ore_per_chunk,
|
||||||
|
@ -369,6 +404,13 @@ else
|
||||||
y_min = moreores.tin_min_depth,
|
y_min = moreores.tin_min_depth,
|
||||||
y_max = moreores.tin_max_depth,
|
y_max = moreores.tin_max_depth,
|
||||||
},
|
},
|
||||||
|
oredef_deep = {
|
||||||
|
clust_scarcity = moreores.tin_chunk_size_deep ^ 3,
|
||||||
|
clust_num_ores = moreores.tin_ore_per_chunk_deep,
|
||||||
|
clust_size = moreores.tin_clust_size_deep,
|
||||||
|
y_min = moreores.tin_min_depth_deep,
|
||||||
|
y_max = moreores.tin_max_depth_deep,
|
||||||
|
},
|
||||||
mineral = {groups = {cracky = 2}},
|
mineral = {groups = {cracky = 2}},
|
||||||
block = {groups = {cracky = 1, level = 2}},
|
block = {groups = {cracky = 1, level = 2}},
|
||||||
craftingot = {cooktime = 3},
|
craftingot = {cooktime = 3},
|
||||||
|
|
Loading…
Reference in New Issue