From 7896bacadc7fb9c7a70afb32cf9c1a9e2dbc596b Mon Sep 17 00:00:00 2001 From: HybridDog Date: Thu, 16 Apr 2015 16:56:32 +0200 Subject: [PATCH] changes --- weather/Kopie von weather_rain.png | Bin 0 -> 3312 bytes weather/Kopie von weather_snow.png | Bin 0 -> 2120 bytes weather/init.lua | 9 ++-- weather/rain.lua | 37 ++++++++----- weather/snow.lua | 51 +++++++++--------- weather/textures/weather_rain.png | Bin 3312 -> 101 bytes weather/textures/weather_snow.png | Bin 2120 -> 106 bytes weather/textures/weather_snow2.png | Bin 0 -> 109 bytes weather/{textures => }/weather_snow_cover.png | Bin 9 files changed, 55 insertions(+), 42 deletions(-) create mode 100644 weather/Kopie von weather_rain.png create mode 100644 weather/Kopie von weather_snow.png create mode 100644 weather/textures/weather_snow2.png rename weather/{textures => }/weather_snow_cover.png (100%) diff --git a/weather/Kopie von weather_rain.png b/weather/Kopie von weather_rain.png new file mode 100644 index 0000000000000000000000000000000000000000..39b153c44b72695e7c44e5ee1ca2c0d71146c1a7 GIT binary patch literal 3312 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 literal 0 HcmV?d00001 diff --git a/weather/Kopie von weather_snow.png b/weather/Kopie von weather_snow.png new file mode 100644 index 0000000000000000000000000000000000000000..8c44f7aff36360439073745ed99ede620c8093d4 GIT binary patch literal 2120 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4H!+#K5uy^@npa^Gy zM`SSr1Gg{;GcwGYBLNg-FY)wsWxvZT!Kr3`guwil(-P*aT6O)<_q?}``x>V_`tVtBLVf|0fRXGB zA%}ervu3MG+{m@%YC6R5iPw+8X*r84(-UckK@HU(rs_|~SJ-2rA*67BbKz30nn;zX z;;ZH-%oCg#o=Bh26l$nBe`F&YkDkU_%OIAYY)Z>Hm$NC{_hV4Vu`*C?sJY)boAKa^ zyxV7!9QMs+aQHT50Vl)HYYY#1StjKFFthMqE#5AvuU5<`^GWxRmV>8BY2Ponqj-0*M<%Z^tPFyCMa9DG6#Qtk@f@eaNE`smBMubDsb z&P=TI(&Dq12if1Z?XIQHdA^3s5OJvmsAd;XZczbWXg_KP+9hTJDK7hc4f{`+T3?vH&B3Ihg6h_b#(& z#(O2l`zAVxFkEE;5}T zoLC=OzhS=*M*@(xD6Ic_RV;a%--=bMzTcbQzs)o~CFz@{OGO3!|(Kc7|1R(-JT?#smr8axX3Ef^I_yk;!*_z@!vipUJR>nuOZ zm>3oc_i8de`TZ`2nZdp63RLiBaFZG^17WukMKqx(H1zlJ$oYpShl@Os{;|R0jKl`f zdCVu;YCiAHE$_5(O)6$FF>ODkx%l4RgIN zpPrs#>VEr^<|n@2+;+2zWlaRbs#WuZ3*PTtZpNr^U#emH-$gf*&cw+43uO?x56l|C z%)dvM@3(8PN<`%?-)iG2`A?)fwE5nvwJgbIaM-7xcW7^k!8VT>Ob+`Pfo?t4VY{p# z2AKO=#MtjUvi)RJXIOao;0w)zDNH~yUk){4P+3;6So2}m%Lgm==RN|a_(N*K!t5u^ zEf_iG_^kW02B;!oVkh&2{5cE)7KOm%jU@;`LI>XO*vTSa+$;o45nC*FxN4p-_haCg x%jd(XaQ{s9W|o>erjVrGD~wu7GBmvY!zdWFSn=4BY5E|OJYD@<);T3K0RU0DKWP8} literal 0 HcmV?d00001 diff --git a/weather/init.lua b/weather/init.lua index 37777d7..9e1b3df 100644 --- a/weather/init.lua +++ b/weather/init.lua @@ -26,17 +26,18 @@ end weather = read_weather() minetest.register_globalstep(function(dtime) - if weather == "rain" or weather == "snow" then + if weather == "rain" + or weather == "snow" then if math.random(1, 10000) == 1 then weather = "none" save_weather() end else - if math.random(1, 50000) == 1 then + local ran = math.random(1, 5000000) + if ran == 1 then weather = "rain" save_weather() - end - if math.random(1, 50000) == 2 then + elseif ran == 2 then weather = "snow" save_weather() end diff --git a/weather/rain.lua b/weather/rain.lua index 4b20da1..c426f3a 100644 --- a/weather/rain.lua +++ b/weather/rain.lua @@ -1,24 +1,35 @@ -- Rain +local spawnerdef = { + amount = 25, + time = 0.5, + minexptime = 0.8, + maxexptime = 0.8, + minsize = 0.8, + maxsize = 1.2, + collisiondetection = true, + vertical = true, + texture = "weather_rain.png", +} minetest.register_globalstep(function(dtime) - if weather ~= "rain" then return end + if weather ~= "rain" then + return + end for _, player in ipairs(minetest.get_connected_players()) do local ppos = player:getpos() -- Make sure player is not in a cave/house... - if minetest.env:get_node_light(ppos, 0.5) ~= 15 then return end + --if minetest.get_node_light(ppos, 0.5) ~= 15 then return end - local minp = addvectors(ppos, {x=-9, y=7, z=-9}) - local maxp = addvectors(ppos, {x= 9, y=7, z= 9}) + spawnerdef.minpos = addvectors(ppos, {x=-9, y=7, z=-9}) + spawnerdef.maxpos = addvectors(ppos, {x= 9, y=7, z= 9}) - local vel = {x=0, y= -4, z=0} - local acc = {x=0, y=-9.81, z=0} + spawnerdef.minvel = {x=0, y= -40, z=0} + spawnerdef.maxvel = spawnerdef.minvel + spawnerdef.minacc = {x=0, y= 0, z=0} + spawnerdef.maxacc = spawnerdef.minacc - minetest.add_particlespawner({amount=25, time=0.5, - minpos=minp, maxpos=maxp, - minvel=vel, maxvel=vel, - minacc=acc, maxacc=acc, - minexptime=0.8, maxexptime=0.8, - minsize=25, maxsize=25, - collisiondetection=false, vertical=true, texture="weather_rain.png", player=player:get_player_name()}) + spawnerdef.playername = player:get_player_name() + + minetest.add_particlespawner(spawnerdef) end end) diff --git a/weather/snow.lua b/weather/snow.lua index cbd5586..9e2e193 100644 --- a/weather/snow.lua +++ b/weather/snow.lua @@ -1,40 +1,41 @@ -- Snow +local spawnerdef = { + amount = 8, + time = 0.5, + minexptime = 3, + maxexptime = 15, + minsize = 0.8, + maxsize = 1.2, + collisiondetection = true, +} minetest.register_globalstep(function(dtime) - if weather ~= "snow" then return end + if weather ~= "snow" then + return + end for _, player in ipairs(minetest.get_connected_players()) do local ppos = player:getpos() -- Make sure player is not in a cave/house... - if minetest.env:get_node_light(ppos, 0.5) ~= 15 then return end + --if minetest.get_node_light(ppos, 0.5) ~= 15 then return end - local minp = addvectors(ppos, {x=-9, y=7, z=-9}) - local maxp = addvectors(ppos, {x= 9, y=7, z= 9}) + spawnerdef.minpos = addvectors(ppos, {x=-9, y=7, z=-9}) + spawnerdef.maxpos = addvectors(ppos, {x= 9, y=7, z= 9}) - local minp_deep = addvectors(ppos, {x=-10, y=3.2, z=-10}) - local maxp_deep = addvectors(ppos, {x= 10, y=2.6, z= 10}) + spawnerdef.minvel = {x=0, y= -1, z=0} + spawnerdef.maxvel = spawnerdef.minvel + spawnerdef.minacc = {x=0, y= 0, z=0} + spawnerdef.maxacc = spawnerdef.minacc - local vel = {x=0, y= -0.5, z=0} - local acc = {x=0, y= -0.5, z=0} + spawnerdef.playername = player:get_player_name() - minetest.add_particlespawner(5, 0.5, - minp, maxp, - vel, vel, - acc, acc, - 5, 5, - 25, 25, - false, "weather_snow.png", player:get_player_name()) - - minetest.add_particlespawner(4, 0.5, - minp_deep, maxp_deep, - vel, vel, - acc, acc, - 4, 4, - 25, 25, - false, "weather_snow.png", player:get_player_name()) + for _,i in ipairs({"", "2"}) do + spawnerdef.texture = "weather_snow"..i..".png" + minetest.add_particlespawner(spawnerdef) + end end end) -local snow_box = +--[[local snow_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5} @@ -51,7 +52,7 @@ minetest.register_node("weather:snow_cover", { drop = {} }) ---[[ Enable this section if you have a very fast PC +--[ Enable this section if you have a very fast PC minetest.register_abm({ nodenames = {"group:crumbly", "group:snappy", "group:cracky", "group:choppy"}, neighbors = {"default:air"}, diff --git a/weather/textures/weather_rain.png b/weather/textures/weather_rain.png index 39b153c44b72695e7c44e5ee1ca2c0d71146c1a7..f77d5f49b4be51e9e50adbef5be7ccdc213b17d1 100644 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~jKx9jP7LeL$-D$|(s6Jqf6k!PC{xWt~$(697H+8R`H4 literal 3312 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 diff --git a/weather/textures/weather_snow.png b/weather/textures/weather_snow.png index 8c44f7aff36360439073745ed99ede620c8093d4..0eab70faf366d874d95eadb94f46bbe53ba9a245 100644 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=#^NA%Cx&(BWL^R}DxNNmAsp9p zdp2@181OWF`M>z>tqDF&9Sk9VV-}qXWLTA6sVB#GTKg8yicTY-dInEdKbLh*2~7Z8 Csvjc& literal 2120 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4H!+#K5uy^@npa^Gy zM`SSr1Gg{;GcwGYBLNg-FY)wsWxvZT!Kr3`guwil(-P*aT6O)<_q?}``x>V_`tVtBLVf|0fRXGB zA%}ervu3MG+{m@%YC6R5iPw+8X*r84(-UckK@HU(rs_|~SJ-2rA*67BbKz30nn;zX z;;ZH-%oCg#o=Bh26l$nBe`F&YkDkU_%OIAYY)Z>Hm$NC{_hV4Vu`*C?sJY)boAKa^ zyxV7!9QMs+aQHT50Vl)HYYY#1StjKFFthMqE#5AvuU5<`^GWxRmV>8BY2Ponqj-0*M<%Z^tPFyCMa9DG6#Qtk@f@eaNE`smBMubDsb z&P=TI(&Dq12if1Z?XIQHdA^3s5OJvmsAd;XZczbWXg_KP+9hTJDK7hc4f{`+T3?vH&B3Ihg6h_b#(& z#(O2l`zAVxFkEE;5}T zoLC=OzhS=*M*@(xD6Ic_RV;a%--=bMzTcbQzs)o~CFz@{OGO3!|(Kc7|1R(-JT?#smr8axX3Ef^I_yk;!*_z@!vipUJR>nuOZ zm>3oc_i8de`TZ`2nZdp63RLiBaFZG^17WukMKqx(H1zlJ$oYpShl@Os{;|R0jKl`f zdCVu;YCiAHE$_5(O)6$FF>ODkx%l4RgIN zpPrs#>VEr^<|n@2+;+2zWlaRbs#WuZ3*PTtZpNr^U#emH-$gf*&cw+43uO?x56l|C z%)dvM@3(8PN<`%?-)iG2`A?)fwE5nvwJgbIaM-7xcW7^k!8VT>Ob+`Pfo?t4VY{p# z2AKO=#MtjUvi)RJXIOao;0w)zDNH~yUk){4P+3;6So2}m%Lgm==RN|a_(N*K!t5u^ zEf_iG_^kW02B;!oVkh&2{5cE)7KOm%jU@;`LI>XO*vTSa+$;o45nC*FxN4p-_haCg x%jd(XaQ{s9W|o>erjVrGD~wu7GBmvY!zdWFSn=4BY5E|OJYD@<);T3K0RU0DKWP8} diff --git a/weather/textures/weather_snow2.png b/weather/textures/weather_snow2.png new file mode 100644 index 0000000000000000000000000000000000000000..61412eac2aaab964bf8aed3a9cb76b8e2eac24e1 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=#^NA%Cx&(BWL^R}>Ygr+Asp9} zQxXyqe*FLczn)DaAtfcHg#(XC6yaV^HG}|JSsj24paUr>mdKI;Vst E0L3>S@&Et; literal 0 HcmV?d00001 diff --git a/weather/textures/weather_snow_cover.png b/weather/weather_snow_cover.png similarity index 100% rename from weather/textures/weather_snow_cover.png rename to weather/weather_snow_cover.png