forked from VoxeLibre/VoxeLibre
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
ad0326f752
|
@ -644,6 +644,7 @@ function mob_class:do_env_damage()
|
||||||
end
|
end
|
||||||
|
|
||||||
local nodef = minetest.registered_nodes[self.standing_in]
|
local nodef = minetest.registered_nodes[self.standing_in]
|
||||||
|
local nodef2 = minetest.registered_nodes[self.standing_on]
|
||||||
|
|
||||||
-- rain
|
-- rain
|
||||||
if self.rain_damage > 0 then
|
if self.rain_damage > 0 then
|
||||||
|
@ -675,7 +676,19 @@ function mob_class:do_env_damage()
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
-- magma damage
|
||||||
|
elseif self.fire_damage > 0
|
||||||
|
and (nodef2.groups.fire) then
|
||||||
|
|
||||||
|
if self.fire_damage ~= 0 then
|
||||||
|
|
||||||
|
self.health = self.health - self.fire_damage
|
||||||
|
|
||||||
|
if self:check_for_death("fire", {type = "environment",
|
||||||
|
pos = pos, node = self.standing_in}) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
-- lava damage
|
-- lava damage
|
||||||
elseif self.lava_damage > 0
|
elseif self.lava_damage > 0
|
||||||
and (nodef.groups.lava) then
|
and (nodef.groups.lava) then
|
||||||
|
|
|
@ -11,16 +11,22 @@ function mcl_weather.set_sky_box_clear(player, sky, fog)
|
||||||
local sc = {
|
local sc = {
|
||||||
day_sky = "#7BA4FF",
|
day_sky = "#7BA4FF",
|
||||||
day_horizon = "#C0D8FF",
|
day_horizon = "#C0D8FF",
|
||||||
dawn_sky = "#B4BAFA",
|
dawn_sky = "#7BA4FF",
|
||||||
dawn_horizon = "#BAC1F0",
|
dawn_horizon = "#C0D8FF",
|
||||||
night_sky = "#000000",
|
night_sky = "#000000",
|
||||||
night_horizon = "#4A6790",
|
night_horizon = "#4A6790",
|
||||||
|
indoors = "#C0D8FF",
|
||||||
|
fog_sun_tint = "#ff5f33",
|
||||||
|
fog_moon_tint = nil,
|
||||||
|
fog_tint_type = "custom"
|
||||||
}
|
}
|
||||||
if sky then
|
if sky then
|
||||||
sc.day_sky = sky
|
sc.day_sky = sky
|
||||||
|
sc.dawn_sky = sky
|
||||||
end
|
end
|
||||||
if fog then
|
if fog then
|
||||||
sc.day_horizon = fog
|
sc.day_horizon = fog
|
||||||
|
sc.dawn_horizon = fog
|
||||||
end
|
end
|
||||||
player:set_sky({
|
player:set_sky({
|
||||||
type = "regular",
|
type = "regular",
|
||||||
|
@ -128,8 +134,12 @@ mcl_weather.skycolor = {
|
||||||
dawn_horizon = water_color,
|
dawn_horizon = water_color,
|
||||||
night_sky = water_color,
|
night_sky = water_color,
|
||||||
night_horizon = water_color,
|
night_horizon = water_color,
|
||||||
|
indoors = water_color,
|
||||||
|
fog_sun_tint = water_color,
|
||||||
|
fog_moon_tint = water_color,
|
||||||
|
fog_tint_type = "custom"
|
||||||
},
|
},
|
||||||
clouds = true,
|
clouds = false,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
if dim == "overworld" then
|
if dim == "overworld" then
|
||||||
|
@ -258,6 +268,10 @@ mcl_weather.skycolor = {
|
||||||
dawn_horizon = biomefog,
|
dawn_horizon = biomefog,
|
||||||
night_sky = biomefog,
|
night_sky = biomefog,
|
||||||
night_horizon = biomefog,
|
night_horizon = biomefog,
|
||||||
|
indoors = biomefog,
|
||||||
|
fog_sun_tint = biomefog,
|
||||||
|
fog_moon_tint = biomefog,
|
||||||
|
fog_tint_type = "custom"
|
||||||
},
|
},
|
||||||
clouds = false,
|
clouds = false,
|
||||||
})
|
})
|
||||||
|
|
|
@ -130,7 +130,7 @@ minetest.register_node("mcl_nether:magma", {
|
||||||
is_ground_content = true,
|
is_ground_content = true,
|
||||||
light_source = 3,
|
light_source = 3,
|
||||||
sunlight_propagates = false,
|
sunlight_propagates = false,
|
||||||
groups = {pickaxey=1, building_block=1, material_stone=1},
|
groups = {pickaxey=1, building_block=1, material_stone=1, fire=1},
|
||||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||||
-- From walkover mod
|
-- From walkover mod
|
||||||
on_walk_over = function(loc, nodeiamon, player)
|
on_walk_over = function(loc, nodeiamon, player)
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 106 B |
Loading…
Reference in New Issue