Fix bugs, tweak weather configs, fix noise generator

This commit is contained in:
Till Affeldt 2020-04-13 13:40:05 +02:00
parent 49242573f2
commit 47530bb07e
9 changed files with 77 additions and 61 deletions

View file

@ -1,20 +1,23 @@
local world = {}
local WIND_SPREAD = 600
local WIND_SCALE = 3
local HEAT_SPREAD = 2400
local HEAT_SCALE = 0.2
local HUMIDITY_SPREAD = 1200
local HUMIDITY_SCALE = 0.18
local WIND_SCALE = 2
local HEAT_SPREAD = 200
local HEAT_SCALE = 0.3
local HUMIDITY_SPREAD = 60
local HUMIDITY_SCALE = 0.5
local HUMIDITY_BASE_SPREAD = 600
local HUMIDITY_BASE_SCALE = 40
local nobj_wind_x
local nobj_wind_z
local nobj_heat
local nobj_humidity
local nobj_humidity_base
local pn_wind_speed_x = {
offset = 0,
scale = WIND_SCALE,
scale = WIND_SCALE * climate_mod.settings.time_spread,
spread = {x = WIND_SPREAD, y = WIND_SPREAD, z = WIND_SPREAD},
seed = 31441,
octaves = 2,
@ -24,7 +27,7 @@ local pn_wind_speed_x = {
local pn_wind_speed_z = {
offset = 0,
scale = WIND_SCALE,
scale = WIND_SCALE * climate_mod.settings.time_spread,
spread = {x = WIND_SPREAD, y = WIND_SPREAD, z = WIND_SPREAD},
seed = 938402,
octaves = 2,
@ -33,8 +36,8 @@ local pn_wind_speed_z = {
}
local pn_heat = {
offset = 0,
scale = HEAT_SCALE,
offset = 1,
scale = HEAT_SCALE * climate_mod.settings.time_spread,
spread = {x = HEAT_SPREAD, y = HEAT_SPREAD, z = HEAT_SPREAD},
seed = 24,
octaves = 2,
@ -43,8 +46,8 @@ local pn_heat = {
}
local pn_humidity = {
offset = 0,
scale = HUMIDITY_SCALE,
offset = 1,
scale = HUMIDITY_SCALE * climate_mod.settings.time_spread,
spread = {x = HUMIDITY_SPREAD, y = HUMIDITY_SPREAD, z = HUMIDITY_SPREAD},
seed = 8374061,
octaves = 3,
@ -52,38 +55,41 @@ local pn_humidity = {
lacunarity = 2
}
local pn_humidity_base = {
offset = 50,
scale = HUMIDITY_BASE_SCALE * climate_mod.settings.time_spread,
spread = {x = HUMIDITY_BASE_SPREAD, y = HUMIDITY_BASE_SPREAD, z = HUMIDITY_BASE_SPREAD},
seed = 3803465,
octaves = 2,
persist = 0.5,
lacunarity = 2
}
local function update_wind(timer)
nobj_wind_x = nobj_wind_x or minetest.get_perlin(pn_wind_speed_x)
nobj_wind_z = nobj_wind_z or minetest.get_perlin(pn_wind_speed_z)
local n_wind_x = nobj_wind_x:get_2d({x = timer, y = 0})
local n_wind_z = nobj_wind_z:get_2d({x = timer, y = 0})
climate_mod.state:set_int("wind_x", n_wind_x)
climate_mod.state:set_int("wind_z", n_wind_z)
climate_mod.state:set_float("wind_x", n_wind_x)
climate_mod.state:set_float("wind_z", n_wind_z)
end
local function update_heat(timer)
nobj_heat = nobj_heat or minetest.get_perlin(pn_heat)
local n_heat = nobj_heat:get_2d({x = timer, y = 0})
climate_mod.state:set_int("heat_random", n_heat)
climate_mod.state:set_float("heat_random", n_heat)
end
local function update_humidity(timer)
nobj_humidity = nobj_humidity or minetest.get_perlin(pn_humidity)
local n_humidity = nobj_humidity:get_2d({x = timer, y = 0})
climate_mod.state:set_int("humidity_random", n_humidity)
end
local function update_date()
local time = minetest.get_timeofday()
if time < climate_mod.state:get_int("time_last_check") then
local day = climate_mod.state:get_int("time_current_day")
climate_mod.state:set_int("time_current_day ", day + 1)
end
climate_mod.state:set_int("time_last_check", time)
climate_mod.state:set_float("humidity_random", n_humidity)
nobj_humidity_base = nobj_humidity_base or minetest.get_perlin(pn_humidity_base)
local n_humidity_base = nobj_humidity_base:get_2d({x = timer, y = 0})
climate_mod.state:set_float("humidity_base", n_humidity_base)
end
function world.update_status(timer)
update_date()
update_wind(timer)
update_heat(timer)
update_humidity(timer)