Remove snowstorm

This commit is contained in:
Wuzzy 2019-09-21 17:56:38 +02:00
parent 7a9a1d95db
commit af2112750a
11 changed files with 7 additions and 63 deletions

View File

@ -5,7 +5,6 @@ By Kaadmy, for Pixture
Texture license: CC BY-SA 4.0 Texture license: CC BY-SA 4.0
Sound license: Sound license:
weather_storm.ogg: GPLv2 (see GPL_v2.txt) weather_storm.ogg: GPLv2 (see GPL_v2.txt)
weather_snowstorm.ogg: GPLv2 (see GPL_v2.txt)
Source license: LGPLv2.1 Source license: LGPLv2.1
Note: The weather sounds sound be replaced in a later version. Note: The weather sounds sound be replaced in a later version.

View File

@ -7,7 +7,7 @@ local S = minetest.get_translator("weather")
weather = {} weather = {}
weather.weather = "clear" weather.weather = "clear"
weather.types = {"storm", "snowstorm", "clear"} weather.types = {"storm", "clear"}
local sound_handles = {} local sound_handles = {}
@ -15,8 +15,6 @@ local function addvec(v1, v2)
return {x = v1.x + v2.x, y = v1.y + v2.y, z = v1.z + v2.z} return {x = v1.x + v2.x, y = v1.y + v2.y, z = v1.z + v2.z}
end end
local snow_enable = minetest.settings:get_bool("weather_snow_enable") or false
local mapseed = minetest.get_mapgen_setting("seed") local mapseed = minetest.get_mapgen_setting("seed")
local weather_pr=PseudoRandom(mapseed + 2387) local weather_pr=PseudoRandom(mapseed + 2387)
@ -41,20 +39,6 @@ local function play_sound()
end end
end end
end end
--[[ elseif weather.weather == "snowstorm" then
for _, player in ipairs(minetest.get_connected_players()) do
if player:get_pos().y > sound_min_height then
weather_soundspec = minetest.sound_play(
{
name = "weather_snowstorm",
to_player = player:get_player_name(),
loop = true,
}
)
end
end
return
]]
else else
for _, player in ipairs(minetest.get_connected_players()) do for _, player in ipairs(minetest.get_connected_players()) do
local name = player:get_player_name() local name = player:get_player_name()
@ -93,14 +77,11 @@ minetest.register_globalstep(
-- on avg., every 1800 frames the weather.weather will change to one of: -- on avg., every 1800 frames the weather.weather will change to one of:
-- 13/20 chance of clear weather -- 13/20 chance of clear weather
-- 6/20 chance or stormy weather -- 6/20 chance or stormy weather
-- 1/20 chance of snowstorm weather
if weathertype < 13 then if weathertype < 13 then
weather.weather = "clear" weather.weather = "clear"
elseif weathertype < 19 then elseif weathertype < 20 then
weather.weather = "storm" weather.weather = "storm"
elseif weathertype < 20 and snow_enable then
weather.weather = "snowstorm"
end end
end end
end end
@ -116,7 +97,7 @@ minetest.register_globalstep(
local skycol = math.floor(light * 190) local skycol = math.floor(light * 190)
for _, player in ipairs(minetest.get_connected_players()) do for _, player in ipairs(minetest.get_connected_players()) do
if weather.weather == "storm" or weather.weather == "snowstorm" then if weather.weather == "storm" then
player:set_sky({r = skycol, g = skycol, b = skycol * 1.2}, "plain", {}, true) player:set_sky({r = skycol, g = skycol, b = skycol * 1.2}, "plain", {}, true)
if default_cloud_state == nil then if default_cloud_state == nil then
@ -169,42 +150,6 @@ minetest.register_globalstep(
} }
) )
end end
elseif weather.weather == "snowstorm" then
if math.random(0, 6000*dtime) <= 1 then
local hp = player:get_hp()
if minetest.get_node_light(p) == 15 then
player:set_hp(hp-1)
end
end
if minetest.get_node_light({x=p.x, y=p.y+15, z=p.z}, 0.5) == 15 then
local minpos = addvec(player:get_pos(), {x = -30, y = 20, z = -30})
local maxpos = addvec(player:get_pos(), {x = 30, y = 15, z = 30})
local vel = {x = 16.0, y = -8, z = 13.0}
local acc = {x = -16.0, y = -8, z = -13.0}
minetest.add_particlespawner(
{
amount = 8,
time = 0.4,
minpos = minpos,
maxpos = maxpos,
minvel = {x=-vel.x, y=vel.y, z=-vel.z},
maxvel = vel,
minacc = acc,
maxacc = acc,
minexptime = 1.0,
maxexptime = 1.4,
minsize = 3,
maxsize = 4,
collisiondetection = true,
collision_removal = true,
vertical = false,
texture = "weather_snowflake.png",
playername = player:get_player_name()
}
)
end
end end
end end
end end
@ -220,13 +165,13 @@ minetest.register_privilege(
minetest.register_chatcommand( minetest.register_chatcommand(
"weather", "weather",
{ {
params = "storm | snowstorm | clear", params = "storm | clear",
description = S("Change the weather"), description = S("Change the weather"),
privs = {weather = true}, privs = {weather = true},
func = function(name, param) func = function(name, param)
local weather_set = setweather_type(param) local weather_set = setweather_type(param)
if not weather_set then if not weather_set then
return false, S("Incorrect weather. Valid weathers are “storm”, “snowstorm” and “clear”.") return false, S("Incorrect weather. Valid weathers are “storm” and “clear”.")
else else
return true, S("Weather changed.") return true, S("Weather changed.")
end end

View File

@ -1,5 +1,5 @@
# textdomain: weather # textdomain: weather
Can change the weather using the /weather command= Can change the weather using the /weather command=
Change the weather= Change the weather=
Incorrect weather. Valid weathers are “storm”, “snowstorm” and “clear”.= Incorrect weather. Valid weathers are “storm” and “clear”.=
Weather changed.= Weather changed.=

View File

@ -1,5 +1,5 @@
# textdomain: weather # textdomain: weather
Can change the weather using the /weather command=Kann das Wetter mit dem „/weather“-Befehl ändern Can change the weather using the /weather command=Kann das Wetter mit dem „/weather“-Befehl ändern
Change the weather=Das Wetter ändern Change the weather=Das Wetter ändern
Incorrect weather. Valid weathers are “storm”, “snowstorm” and “clear”.=Ungültiges Wetter. Gültige Wetter sind „storm“ (Sturm), „sandstorm“ (Sandsturm) und „clear“ (klar) Incorrect weather. Valid weathers are “storm” and “clear”.=Ungültiges Wetter. Gültige Wetter sind „storm“ (Sturm) und „clear“ (klar).
Weather changed.=Wetter geändert. Weather changed.=Wetter geändert.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 549 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B