From a4d6418c83f31940dc1fd8ead38edc9b53fda92a Mon Sep 17 00:00:00 2001 From: Marcin Date: Sun, 8 Jan 2017 20:54:17 +0100 Subject: [PATCH] Do not pollute global namespace --- _config.txt | 24 ++++++++++++------------ init.lua | 32 +++++++++++++++++--------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/_config.txt b/_config.txt index e716b2e..42e7b37 100644 --- a/_config.txt +++ b/_config.txt @@ -7,21 +7,21 @@ ------------------------------------------------------------------------------ -- Chunk sizes for ore generation (bigger = ore deposits are more scattered around) -moreores_tin_chunk_size = 7 -moreores_silver_chunk_size = 11 -moreores_mithril_chunk_size = 11 +moreores.tin_chunk_size = 7 +moreores.silver_chunk_size = 11 +moreores.mithril_chunk_size = 11 -- Amount of ore per chunk (higher = bigger ore deposits) -moreores_tin_ore_per_chunk = 3 -moreores_silver_ore_per_chunk = 4 -moreores_mithril_ore_per_chunk = 1 +moreores.tin_ore_per_chunk = 3 +moreores.silver_ore_per_chunk = 4 +moreores.mithril_ore_per_chunk = 1 -- Minimal depths of ore generation (Y coordinate, 0 being sea level by default) -moreores_tin_min_depth = -31000 -moreores_silver_min_depth = -31000 -moreores_mithril_min_depth = -31000 +moreores.tin_min_depth = -31000 +moreores.silver_min_depth = -31000 +moreores.mithril_min_depth = -31000 -- Maximal depths of ore generation (Y coordinate, 0 being sea level by default) -moreores_tin_max_depth = 8 -moreores_silver_max_depth = -2 -moreores_mithril_max_depth = -512 +moreores.tin_max_depth = 8 +moreores.silver_max_depth = -2 +moreores.mithril_max_depth = -512 diff --git a/init.lua b/init.lua index 6eee227..7af91bc 100644 --- a/init.lua +++ b/init.lua @@ -8,6 +8,8 @@ Licensed under the zlib license. See LICENSE.md for more information. ===================================================================== --]] +moreores = {} + local S if minetest.get_modpath("intllib") then S = intllib.Getter() @@ -235,11 +237,11 @@ local oredefs = { silver = { description = "Silver", makes = {ore = true, block = true, lump = true, ingot = true, chest = true}, - oredef = {clust_scarcity = moreores_silver_chunk_size * moreores_silver_chunk_size * moreores_silver_chunk_size, - clust_num_ores = moreores_silver_ore_per_chunk, - clust_size = moreores_silver_chunk_size, - y_min = moreores_silver_min_depth, - y_max = moreores_silver_max_depth + oredef = {clust_scarcity = moreores.silver_chunk_size * moreores.silver_chunk_size * moreores.silver_chunk_size, + clust_num_ores = moreores.silver_ore_per_chunk, + clust_size = moreores.silver_chunk_size, + y_min = moreores.silver_min_depth, + y_max = moreores.silver_max_depth }, tools = { pick = { @@ -267,22 +269,22 @@ local oredefs = { tin = { description = "Tin", makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, - oredef = {clust_scarcity = moreores_tin_chunk_size * moreores_tin_chunk_size * moreores_tin_chunk_size, - clust_num_ores = moreores_tin_ore_per_chunk, - clust_size = moreores_tin_chunk_size, - y_min = moreores_tin_min_depth, - y_max = moreores_tin_max_depth + oredef = {clust_scarcity = moreores.tin_chunk_size * moreores.tin_chunk_size * moreores.tin_chunk_size, + clust_num_ores = moreores.tin_ore_per_chunk, + clust_size = moreores.tin_chunk_size, + y_min = moreores.tin_min_depth, + y_max = moreores.tin_max_depth }, tools = {}, }, mithril = { description = "Mithril", makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, - oredef = {clust_scarcity = moreores_mithril_chunk_size * moreores_mithril_chunk_size * moreores_mithril_chunk_size, - clust_num_ores = moreores_mithril_ore_per_chunk, - clust_size = moreores_mithril_chunk_size, - y_min = moreores_mithril_min_depth, - y_max = moreores_mithril_max_depth + oredef = {clust_scarcity = moreores.mithril_chunk_size * moreores.mithril_chunk_size * moreores.mithril_chunk_size, + clust_num_ores = moreores.mithril_ore_per_chunk, + clust_size = moreores.mithril_chunk_size, + y_min = moreores.mithril_min_depth, + y_max = moreores.mithril_max_depth }, tools = { pick = {