diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1bb4614 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.code-workspace \ No newline at end of file diff --git a/README.md b/README.md index feaa55f..288d742 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,6 @@ The entire source code is available on [Github](https://github.com/t-affeldt/reg - Light Rain sounds: *CC BY 3.0* by Arctura from https://freesound.org/people/Arctura/sounds/34065/ - Wind sound: *CC BY (3.0)* by InspectorJ from https://freesound.org/people/InspectorJ/sounds/376415/ - Hail sound: *CC0* by ikayuka from https://freesound.org/people/ikayuka/sounds/240742/ -- Puddle footstep sound: *CC0* by swordofkings128 from https://freesound.org/people/swordofkings128/sounds/398032/ ### HUD Overlays - Frost HUD: *CC BY-SA (3.0)* by Cap diff --git a/abms/puddle.lua b/abms/puddle.lua index f279bff..010a2fb 100644 --- a/abms/puddle.lua +++ b/abms/puddle.lua @@ -80,13 +80,7 @@ for i = 1, VARIANT_COUNT do water = apply_water_group, weather_puddle = 1 }, - drop = "", - sounds = { - footstep = { - name = "weather_puddle", - gain = 0.8 - } - } + drop = "" }) end end diff --git a/ca_weathers/fog.lua b/ca_weathers/fog.lua index f078fdc..b7005f8 100644 --- a/ca_weathers/fog.lua +++ b/ca_weathers/fog.lua @@ -3,17 +3,26 @@ local name = "regional_weather:fog" local conditions = { min_height = regional_weather.settings.min_height, max_height = regional_weather.settings.max_height, - min_humidity = 40, + min_humidity = 25, max_humidity = 50, max_windspeed = 2, - min_heat = 40, - max_heat = 50 + max_heat = 50, + min_time = 4 / 24, + max_time = 8 / 24 } local effects = {} +effects["climate_api:hud_overlay"] = { + file = "weather_hud_fog.png^[opacity:100", + z_index = -200, + color_correction = true +} + effects["climate_api:skybox"] = { sky_data = { + type = "plain", + base_color = "#c0c0c08f", clouds = true }, cloud_data = { @@ -22,6 +31,10 @@ effects["climate_api:skybox"] = { thickness = 40, speed = {x=0,y=0,z=0} }, + light_data = { + shadow_intensity = 0.1, + saturation = 0.5 + }, priority = 50 } diff --git a/ca_weathers/fog_heavy.lua b/ca_weathers/fog_heavy.lua deleted file mode 100644 index c7ef644..0000000 --- a/ca_weathers/fog_heavy.lua +++ /dev/null @@ -1,32 +0,0 @@ -local name = "regional_weather:fog_heavy" - -local conditions = { - min_height = regional_weather.settings.min_height * 0.9, - max_height = regional_weather.settings.max_height * 0.9, - min_humidity = 43, - max_humidity = 47, - max_windspeed = 1.5, - min_heat = 43, - max_heat = 47 -} - -local effects = {} - -effects["climate_api:hud_overlay"] = { - file = "weather_hud_fog.png^[opacity:100", - z_index = -200, - color_correction = true -} - -effects["climate_api:skybox"] = { - sky_data = { - type = "plain", - base_color = "#c0c0c08f" - }, - cloud_data = { - color = "#ffffffc0", - }, - priority = 51 -} - -climate_api.register_weather(name, conditions, effects) diff --git a/init.lua b/init.lua index 3ae9273..4a4a2f8 100644 --- a/init.lua +++ b/init.lua @@ -41,7 +41,6 @@ regional_weather.i18n = S dofile(modpath.."/ca_weathers/ambient.lua") dofile(modpath.."/ca_weathers/deep_cave.lua") dofile(modpath.."/ca_weathers/fog.lua") -dofile(modpath.."/ca_weathers/fog_heavy.lua") dofile(modpath.."/ca_weathers/hail.lua") dofile(modpath.."/ca_weathers/pollen.lua") dofile(modpath.."/ca_weathers/rain.lua") diff --git a/sounds/weather_puddle.ogg b/sounds/weather_puddle.ogg deleted file mode 100644 index a0efdfb..0000000 Binary files a/sounds/weather_puddle.ogg and /dev/null differ