updates due skylayer api changes

master
Artūras Norkus 2017-04-16 20:36:28 +03:00
parent 574f94aa67
commit a02b43783d
6 changed files with 50 additions and 45 deletions

View File

@ -1,3 +1,3 @@
happy_weather_api
skycolor
skylayer
lightning

View File

@ -39,15 +39,19 @@ heavy_rain.is_ending = function(dtime)
return false
end
local set_sky_box = function()
skycolor.add_layer(
SKYCOLOR_LAYER,
{{r=0, g=0, b=0},
local set_sky_box = function(player_name)
local sl = {}
sl.layer_type = skylayer.SKY_PLAIN
sl.name = SKYCOLOR_LAYER
sl.data = {gradient_data={}}
sl.data.gradient_data.colors = {
{r=0, g=0, b=0},
{r=65, g=66, b=78},
{r=112, g=110, b=119},
{r=65, g=66, b=78},
{r=0, g=0, b=0}})
skycolor.active = true
{r=0, g=0, b=0}
}
skylayer.add_layer(player_name, sl)
end
local set_rain_sound = function(player)
@ -68,12 +72,12 @@ end
heavy_rain.add_player = function(player)
sound_handlers[player:get_player_name()] = set_rain_sound(player)
set_sky_box()
set_sky_box(player:get_player_name())
end
heavy_rain.remove_player = function(player)
remove_rain_sound(player)
skycolor.remove_layer(SKYCOLOR_LAYER)
skylayer.remove_layer(player:get_player_name(), SKYCOLOR_LAYER)
end
local rain_drop_texture = "happy_weather_heavy_rain_drops.png"

View File

@ -39,15 +39,19 @@ light_rain.is_ending = function(dtime)
return false
end
local set_sky_box = function()
skycolor.add_layer(
SKYCOLOR_LAYER,
{{r=0, g=0, b=0},
local set_sky_box = function(player_name)
local sl = {}
sl.layer_type = skylayer.SKY_PLAIN
sl.name = SKYCOLOR_LAYER
sl.data = {gradient_data={}}
sl.data.gradient_data.colors = {
{r=0, g=0, b=0},
{r=85, g=86, b=98},
{r=152, g=150, b=159},
{r=85, g=86, b=98},
{r=0, g=0, b=0}})
skycolor.active = true
{r=0, g=0, b=0}
}
skylayer.add_layer(player_name, sl)
end
local set_rain_sound = function(player)
@ -68,12 +72,12 @@ end
light_rain.add_player = function(player)
sound_handlers[player:get_player_name()] = set_rain_sound(player)
set_sky_box()
set_sky_box(player:get_player_name())
end
light_rain.remove_player = function(player)
remove_rain_sound(player)
skycolor.remove_layer(SKYCOLOR_LAYER)
skylayer.remove_layer(player:get_player_name(), SKYCOLOR_LAYER)
end
-- Random texture getter

View File

@ -36,21 +36,25 @@ light_snow.is_ending = function(dtime)
return false
end
local set_sky_box = function()
skycolor.add_layer(
SKYCOLOR_LAYER,
{{r=0, g=0, b=0},
local set_sky_box = function(player_name)
local sl = {}
sl.layer_type = skylayer.SKY_PLAIN
sl.name = SKYCOLOR_LAYER
sl.data = {gradient_data={}}
sl.data.gradient_data.colors = {
{r=0, g=0, b=0},
{r=241, g=244, b=249},
{r=0, g=0, b=0}})
skycolor.active = true
{r=0, g=0, b=0}
}
skylayer.add_layer(player_name, sl)
end
light_snow.add_player = function(player)
set_sky_box()
set_sky_box(player:get_player_name())
end
light_snow.remove_player = function(player)
skycolor.remove_layer(SKYCOLOR_LAYER)
skylayer.remove_layer(player:get_player_name(), SKYCOLOR_LAYER)
end
-- Random texture getter

View File

@ -55,25 +55,29 @@ snowstorm.is_ending = function(dtime)
return false
end
local set_sky_box = function()
skycolor.add_layer(
SKYCOLOR_LAYER,
{{r=0, g=0, b=0},
local set_sky_box = function(player_name)
local sl = {}
sl.layer_type = skylayer.SKY_PLAIN
sl.name = SKYCOLOR_LAYER
sl.data = {gradient_data={}}
sl.data.gradient_data.colors = {
{r=0, g=0, b=0},
{r=70, g=70, b=85},
{r=120, g=120, b=125},
{r=70, g=70, b=85},
{r=0, g=0, b=0}})
skycolor.active = true
{r=0, g=0, b=0}
}
skylayer.add_layer(player_name, sl)
end
snowstorm.add_player = function(player)
sound_handlers[player:get_player_name()] = set_weather_sound(player)
set_sky_box()
set_sky_box(player:get_player_name())
end
snowstorm.remove_player = function(player)
remove_weather_sound(player)
skycolor.remove_layer(SKYCOLOR_LAYER)
skylayer.remove_layer(player:get_player_name(), SKYCOLOR_LAYER)
end
local rain_drop_texture = "happy_weather_snowstorm.png"

View File

@ -34,14 +34,7 @@ thunder.is_starting = function(dtime)
manual_trigger_start = false
return true
end
if happy_weather.is_weather_active(thunder_target_weather_code) then
local random_roll = math.random(0,100)
thunder_weather_next_check = os.time() + thunder_weather_check_delay
if random_roll <= thunder_weather_chance then
return true
end
end
return false
end
@ -51,10 +44,6 @@ thunder.is_ending = function(dtime)
return true
end
if happy_weather.is_weather_active(thunder_target_weather_code) == false then
return true
end
return false
end