Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Fix dark day right and light night rain' (#3592) from rain_light_level_fix into master 

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3592
callable-tool-rightclick-functions
ancientmarinerdev 2023-03-29 02:45:39 +00:00
parent ce1393af0c 61a4595c1b
commit 12b9def9ad
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mods/ENVIRONMENT/mcl_weather/skycolor.lua
View File

@ -1,6 +1,8 @@
local mods_loaded = false local mods_loaded = false
local NIGHT_VISION_RATIO = 0.45 local NIGHT_VISION_RATIO = 0.45
local MINIMUM_LIGHT_LEVEL = 0.2
local water_color = "#3F76E4" local water_color = "#3F76E4"
local mg_name = minetest.get_mapgen_setting("mg_name") local mg_name = minetest.get_mapgen_setting("mg_name")
@ -45,6 +47,24 @@ function mcl_weather.set_sky_color(player, def)
}) })
end end
-- Function to work out light modifier at different times
-- Noon is brightest, midnight is darkest, 0600 and 18000 is in the middle of this
local function get_light_modifier(time)
-- 0.1 = 0.2
-- 0.4 = 0.8
-- 0.5 = 1
-- 0.6 = 0.8
-- 0.9 = 0.2
local light_multiplier = time * 2
if time > 0.5 then
light_multiplier = 2 * (1 - time)
else
light_multiplier = time / 0.5
end
return light_multiplier
end
mcl_weather.skycolor = { mcl_weather.skycolor = {
-- Should be activated before do any effect. -- Should be activated before do any effect.
active = true, active = true,
@ -211,17 +231,14 @@ mcl_weather.skycolor = {
player:set_moon({visible = false}) player:set_moon({visible = false})
player:set_stars({visible = false}) player:set_stars({visible = false})
local lf = mcl_weather.get_current_light_factor() local light_factor = mcl_weather.get_current_light_factor()
if mcl_weather.skycolor.current_layer_name() == "lightning" then if mcl_weather.skycolor.current_layer_name() == "lightning" then
mcl_weather.skycolor.override_day_night_ratio(player, 1) mcl_weather.skycolor.override_day_night_ratio(player, 1)
elseif lf then elseif light_factor then
local w = minetest.get_timeofday() local time = minetest.get_timeofday()
local light = (w * (lf*2)) local light_multiplier = get_light_modifier(time)
if light > 1 then local new_light = math.max(light_factor * light_multiplier, MINIMUM_LIGHT_LEVEL)
light = 1 - (light - 1) mcl_weather.skycolor.override_day_night_ratio(player, new_light)
end
light = (light * lf) + 0.15
mcl_weather.skycolor.override_day_night_ratio(player, light)
else else
mcl_weather.skycolor.override_day_night_ratio(player, nil) mcl_weather.skycolor.override_day_night_ratio(player, nil)
end end