Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-28 13:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Enable shadows and waving liquids when supported (5.6)' (#2555) from shadows_waving into master

Browse Source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2555
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
This commit is contained in:
cora 2022-08-12 22:07:55 +00:00
commit 2d35292bc3
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,6 +276,11 @@ minetest.register_globalstep(function(dtime)
end) end)
local function initsky(player) local function initsky(player)
if player.set_lighting then
player:set_lighting({ shadows = { intensity = tonumber(minetest.settings:get("mcl_default_shadow_intensity") or 0.33) } })
end
if (mcl_weather.skycolor.active) then if (mcl_weather.skycolor.active) then
mcl_weather.skycolor.force_update = true mcl_weather.skycolor.force_update = true
end end

2
mods/ITEMS/mcl_core/nodes_liquid.lua
View File

@ -49,6 +49,7 @@ minetest.register_node("mcl_core:water_flowing", {
liquid_alternative_source = "mcl_core:water_source", liquid_alternative_source = "mcl_core:water_source",
liquid_viscosity = WATER_VISC, liquid_viscosity = WATER_VISC,
liquid_range = 7, liquid_range = 7,
waving = 3,
post_effect_color = {a=209, r=0x03, g=0x3C, b=0x5C}, post_effect_color = {a=209, r=0x03, g=0x3C, b=0x5C},
groups = { water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1, freezes=1, melt_around=1, dig_by_piston=1}, groups = { water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1, freezes=1, melt_around=1, dig_by_piston=1},
_mcl_blast_resistance = 100, _mcl_blast_resistance = 100,
@ -67,6 +68,7 @@ S("• When flowing water touches flowing lava either from above or horizontally
S("• When water is directly below lava, the water turns into stone."), S("• When water is directly below lava, the water turns into stone."),
_doc_items_hidden = false, _doc_items_hidden = false,
drawtype = "liquid", drawtype = "liquid",
waving = 3,
tiles = { tiles = {
{name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}} {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}}
}, },

2
mods/ITEMS/mclx_core/init.lua
View File

@ -5,6 +5,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
local source = table.copy(minetest.registered_nodes["mcl_core:water_source"]) local source = table.copy(minetest.registered_nodes["mcl_core:water_source"])
source.description = S("River Water Source") source.description = S("River Water Source")
source.liquid_range = 2 source.liquid_range = 2
source.waving = 3
source.liquid_alternative_flowing = "mclx_core:river_water_flowing" source.liquid_alternative_flowing = "mclx_core:river_water_flowing"
source.liquid_alternative_source = "mclx_core:river_water_source" source.liquid_alternative_source = "mclx_core:river_water_source"
source.liquid_renewable = false source.liquid_renewable = false
@ -28,6 +29,7 @@ source.special_tiles = {
local flowing = table.copy(minetest.registered_nodes["mcl_core:water_flowing"]) local flowing = table.copy(minetest.registered_nodes["mcl_core:water_flowing"])
flowing.description = S("Flowing River Water") flowing.description = S("Flowing River Water")
flowing.liquid_range = 2 flowing.liquid_range = 2
flowing.waving = 3
flowing.liquid_alternative_flowing = "mclx_core:river_water_flowing" flowing.liquid_alternative_flowing = "mclx_core:river_water_flowing"
flowing.liquid_alternative_source = "mclx_core:river_water_source" flowing.liquid_alternative_source = "mclx_core:river_water_source"
flowing.liquid_renewable = false flowing.liquid_renewable = false

3
settingtypes.txt
View File

@ -115,6 +115,9 @@ animated_chests (Animated chests) bool true
# The maximum number of boss bars to simultaniously display on the screen # The maximum number of boss bars to simultaniously display on the screen
max_bossbars (Maximum Boss bars) int 5 max_bossbars (Maximum Boss bars) int 5
# Default intensity of shadows (default: 0.33)
mcl_default_shadow_intensity (Default shadow intensity) float 0.33 0.0 1.0
[Experimental] [Experimental]
# Whether ice is translucent. If disabled, ice is fully opaque. # Whether ice is translucent. If disabled, ice is fully opaque.
# #