Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename mapgen variables

Browse source
This commit is contained in:
Wuzzy 2017-03-04 23:00:23 +01:00
parent 19150ddddb
commit 2495676e54
5 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mods/CORE/mcl_init/init.lua
View file

@ -8,21 +8,29 @@ mcl_vars.gui_bg_img = ""
mcl_vars.inventory_header = mcl_vars.gui_slots .. mcl_vars.gui_bg
-- Mapgen variables
local mg_name = minetest.get_mapgen_setting("mg_name")
local minecraft_height_limit = 256
if mg_name ~= "flat" then
mcl_vars.mg_overworld_min = -62
mcl_vars.mg_overworld_max = mcl_vars.mg_overworld_min + minecraft_height_limit
-- 1 flat bedrock layer with 4 rough layers above
mcl_vars.bedrock_overworld_min = -62
mcl_vars.bedrock_overworld_max = mcl_vars.bedrock_overworld_min + 4
mcl_vars.bedrock_is_rough = true
mcl_vars.mg_bedrock_overworld_min = mcl_vars.mg_overworld_min
mcl_vars.mg_bedrock_overworld_max = mcl_vars.mg_bedrock_overworld_min + 4
mcl_vars.mg_bedrock_is_rough = true
else
-- 1 perfectly flat bedrock layer
local ground = minetest.get_mapgen_setting("mgflat_ground_level")
if not ground then
ground = 8
end
mcl_vars.bedrock_overworld_min = ground - 3
mcl_vars.bedrock_overworld_max = mcl_vars.bedrock_overworld_min
mcl_vars.bedrock_is_rough = false
mcl_vars.mg_overworld_min = ground - 1
mcl_vars.mg_overworld_max = mcl_vars.mg_overworld_min + minecraft_height_limit
-- 1 perfectly flat bedrock layer
mcl_vars.mg_bedrock_overworld_min = mcl_vars.mg_overworld_min
mcl_vars.mg_bedrock_overworld_max = mcl_vars.mg_bedrock_overworld_min
mcl_vars.mg_bedrock_is_rough = false
end
-- Set default stack sizes

10
mods/CORE/mcl_util/init.lua
View file

@ -200,8 +200,8 @@ end
-- 2nd return value: true if it is in the deadly part of the void
function mcl_util.is_in_void(pos)
local void, void_deadly
void = pos.y < mcl_vars.bedrock_overworld_min
void_deadly = pos.y < mcl_vars.bedrock_overworld_min - 65
void = pos.y < mcl_vars.mg_overworld_min
void_deadly = pos.y < mcl_vars.mg_overworld_min - 64
return void, void_deadly
end
@ -213,8 +213,8 @@ end
-- If the Y coordinate is not located in any dimension, it will return:
-- nil, "void"
function mcl_util.y_to_layer(y)
if y >= mcl_vars.bedrock_overworld_min then
return y - mcl_vars.bedrock_overworld_min, "overworld"
if y >= mcl_vars.mg_overworld_min then
return y - mcl_vars.mg_overworld_min, "overworld"
else
return nil, "void"
end
@ -226,5 +226,5 @@ end
-- minecraft_dimension parameter is ignored at the moment
-- TODO: Implement dimensions
function mcl_util.layer_to_y(layer, minecraft_dimension)
return layer + mcl_vars.bedrock_overworld_min
return layer + mcl_vars.mg_overworld_min
end