From d096936348fd95d52c0948acb7e81e202003ed39 Mon Sep 17 00:00:00 2001 From: sprunk Date: Sat, 7 Oct 2023 19:42:10 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Add=20spooky=20map=20confi?= =?UTF-8?q?gs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spooky/Ansatz v1.0.lua | 57 +++++++++++++++++++ .../spooky/Highway 95 v7.lua | 33 +++++++++++ .../spooky/IsisDelta_v02.lua | 57 +++++++++++++++++++ .../spooky/LimeQuat Republic v1.24.lua | 33 +++++++++++ .../spooky/Mercurial v1.1.lua | 57 +++++++++++++++++++ .../spooky/Onyx Cauldron 2.1.lua | 57 +++++++++++++++++++ .../spooky/Sphagnum Bog v1.1.lua | 57 +++++++++++++++++++ .../spooky/TheBeachBeta.lua | 57 +++++++++++++++++++ .../spooky/Thornford 2.lua | 54 ++++++++++++++++++ .../spooky/TitanDuel 2.2.lua | 57 +++++++++++++++++++ .../spooky/Tombstone Desert V2.lua | 33 +++++++++++ .../spooky/White Rabbit v2.1.lua | 57 +++++++++++++++++++ LuaUI/Widgets/gfx_sun_and_atmosphere.lua | 17 +++++- 13 files changed, 623 insertions(+), 3 deletions(-) create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/Ansatz v1.0.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/Highway 95 v7.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/IsisDelta_v02.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/LimeQuat Republic v1.24.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/Mercurial v1.1.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/Onyx Cauldron 2.1.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/Sphagnum Bog v1.1.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/TheBeachBeta.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/Thornford 2.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/TitanDuel 2.2.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/Tombstone Desert V2.lua create mode 100644 LuaUI/Configs/MapSettingsOverride/spooky/White Rabbit v2.1.lua diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/Ansatz v1.0.lua b/LuaUI/Configs/MapSettingsOverride/spooky/Ansatz v1.0.lua new file mode 100644 index 0000000000..4eafef0ab6 --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/Ansatz v1.0.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {0, 0.03015075, 0.02512563, 1}, + ["fresnelMin"]= 0.22, + ["blurExponent"]= 3.27999997, + ["reflectionDistortion"]= 3, + ["specularColor"]= {0.64824122, 0.20100503, 0.09547739, 0.99497485}, + ["fresnelPower"]= 9.76000023, + ["specularPower"]= 50, + ["perlinStartFreq"]= 4.19999981, + ["absorb"]= {0.1356784, 0.16080402, 0.16080402, 1}, + ["fresnelMax"]= 1.30999994, + ["diffuseColor"]= {0.09547739, 0.14070351, 0.18090452, 1}, + ["perlinAmplitude"]= 1.15999997, + ["perlinLacunarity"]= 2.87999988, + ["specularFactor"]= 0.82999998, + ["minColor"]= {0.09045226, 0.21105528, 0.37185928, 1}, + ["planeColor"]= {0.14070351, 0.39698493, 0.37688443, 1}, + ["surfaceAlpha"]= 0.12, + ["blurBase"]= 10, + ["diffuseFactor"]= 0.51999998, + ["repeatX"]= 0, + ["ambientFactor"]= 0.58999997, + ["repeatY"]= 0, + ["baseColor"]= {0.08542714, 0.13065326, 0.1557789, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.14070351, 0.12060302, 0.38693467, 1}, + ["groundAmbientColor"]= {0.18090452, 0.10552764, 0.2914573, 1}, + ["unitSpecularColor"]= {0.72864324, 0.29648241, 0.18592964, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.28140703, 0, 0, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.33668342, 0.25628141, 0.46231157, 1}, + ["unitAmbientColor"]= {0.2361809, 0.20603015, 0.28643215, 1}, + }, + ["direction"]= { + ["sunDir"]= 5.02999973, + ["sunPitch"]= 0.35999998, + }, + ["fog"]= { + ["sunColor"]= {0.04285714, 0.06190476, 0.04761905, 0.87142855}, + ["fogStart"]= 0.25999999, + ["fogColor"]= { + [0] = 0, + [1] = 0.23333333, + [2] = 0.11904762, + [3] = 0.32380953, + [4] = 0.89999998, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0.06190476, 0.05714286, 0.80000001, 0.96666664}, + ["skyColor"]= {0.06190476, 0.07142857, 0.06190476, 0.99523807}, + ["fogEnd"]= 1, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/Highway 95 v7.lua b/LuaUI/Configs/MapSettingsOverride/spooky/Highway 95 v7.lua new file mode 100644 index 0000000000..7f7a02c2d7 --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/Highway 95 v7.lua @@ -0,0 +1,33 @@ +return { + ["water"]= false, + ["sun"]= { + ["groundDiffuseColor"]= {0.3316583, 0.26633167, 0.11055277, 1}, + ["groundAmbientColor"]= {0.2361809, 0.05025126, 0.04522613, 1}, + ["unitSpecularColor"]= {0.99497485, 0.18592964, 0.20100503, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.99497485, 0, 0, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.69999999, 0.1758794, 0.18592964, 1}, + ["unitAmbientColor"]= {0.5, 0.18592964, 0.18090452, 1}, + }, + ["direction"]= { + ["sunDir"]= 5.23000002, + ["sunPitch"]= 0.17999999, + }, + ["fog"]= { + ["sunColor"]= {0.05238095, 0, 0, 0.87142855}, + ["fogStart"]= 0.99000001, + ["fogColor"]= { + [0] = 0, + [1] = 0.20952381, + [2] = 0.05714286, + [3] = 0.05238095, + [4] = 0, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0, 0, 0.80000001, 0.96666664}, + ["skyColor"]= {0.07142857, 0, 0, 0.99523807}, + ["fogEnd"]= -0.41, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/IsisDelta_v02.lua b/LuaUI/Configs/MapSettingsOverride/spooky/IsisDelta_v02.lua new file mode 100644 index 0000000000..5185a92f3b --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/IsisDelta_v02.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {0, 0.82412058, 0.48241207, 1}, + ["fresnelMin"]= 0.22, + ["blurExponent"]= 3.27999997, + ["reflectionDistortion"]= 2.95000005, + ["specularColor"]= {0.15075377, 0.29648241, 0.46231157, 0.99497485}, + ["fresnelPower"]= 9.76000023, + ["specularPower"]= 50, + ["perlinStartFreq"]= 4.19999981, + ["absorb"]= {0.21105528, 0.2361809, 0.25628141, 1}, + ["fresnelMax"]= 1.30999994, + ["diffuseColor"]= {0.01507538, 0.28643215, 0.42713568, 1}, + ["perlinAmplitude"]= 1.15999997, + ["perlinLacunarity"]= 2.87999988, + ["specularFactor"]= 1.13999999, + ["minColor"]= {0.19095477, 0.34673366, 0.18592964, 1}, + ["planeColor"]= {0.14070351, 0.50753766, 0.21105528, 1}, + ["surfaceAlpha"]= 0.81, + ["blurBase"]= 8.84000015, + ["diffuseFactor"]= 0.79999995, + ["repeatX"]= 0, + ["ambientFactor"]= 0.48999998, + ["repeatY"]= 0, + ["baseColor"]= {0.16582915, 0.22110553, 0.2361809, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.18592964, 0.22613065, 0.2160804, 1}, + ["groundAmbientColor"]= {0.18090452, 0.28643215, 0.33668342, 1}, + ["unitSpecularColor"]= {0.18090452, 0.72361809, 0.42713568, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.0201005, 0.05527638, 0.09547739, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.36180905, 0.53768843, 0.50753766, 1}, + ["unitAmbientColor"]= {0.11055277, 0.12060302, 0.19095477, 1}, + }, + ["direction"]= { + ["sunDir"]= 1.63, + ["sunPitch"]= 0.51999998, + }, + ["fog"]= { + ["sunColor"]= {0.04285714, 0.06190476, 0.04761905, 0.87142855}, + ["fogStart"]= 0.19, + ["fogColor"]= { + [0] = 0, + [1] = 0.05714286, + [2] = 0.30000001, + [3] = 0.40952381, + [4] = 0.89999998, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0.06190476, 0.05714286, 0.80000001, 0.96666664}, + ["skyColor"]= {0.06190476, 0.07142857, 0.06190476, 0.99523807}, + ["fogEnd"]= 1, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/LimeQuat Republic v1.24.lua b/LuaUI/Configs/MapSettingsOverride/spooky/LimeQuat Republic v1.24.lua new file mode 100644 index 0000000000..e215a36d5b --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/LimeQuat Republic v1.24.lua @@ -0,0 +1,33 @@ +return { + ["water"]= false, + ["sun"]= { + ["groundDiffuseColor"]= {0.69849247, 0.33668342, 0, 1}, + ["groundAmbientColor"]= {0.21105528, 0.03015075, 0, 1}, + ["unitSpecularColor"]= {0.69999999, 0.39698493, 0, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {1, 0, 0, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.69999999, 0.31658292, 0, 1}, + ["unitAmbientColor"]= {0.5, 0, 0, 1}, + }, + ["direction"]= { + ["sunDir"]= 2.58999991, + ["sunPitch"]= 1.05999994, + }, + ["fog"]= { + ["sunColor"]= {0.05238095, 0, 0, 0.87142855}, + ["fogStart"]= 0.85999995, + ["fogColor"]= { + [0] = 0, + [1] = 0.15238096, + [2] = 0.05238095, + [3] = 0.05714286, + [4] = 0, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0, 0, 0.80000001, 0.96666664}, + ["skyColor"]= {0.07142857, 0, 0, 0.99523807}, + ["fogEnd"]= -0.55, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/Mercurial v1.1.lua b/LuaUI/Configs/MapSettingsOverride/spooky/Mercurial v1.1.lua new file mode 100644 index 0000000000..d7a84353a4 --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/Mercurial v1.1.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {1, 1, 1, 1}, + ["fresnelMin"]= 0, + ["blurExponent"]= 9.23999977, + ["reflectionDistortion"]= 3, + ["specularColor"]= {0.98994976, 0.99497485, 1, 0.99497485}, + ["fresnelPower"]= 9.76000023, + ["specularPower"]= 50, + ["perlinStartFreq"]= 0.59999996, + ["absorb"]= {0.99497485, 0.98994976, 0.99497485, 1}, + ["fresnelMax"]= 1.38999999, + ["diffuseColor"]= {0.98994976, 1, 1, 1}, + ["perlinAmplitude"]= 0.51999998, + ["perlinLacunarity"]= 0, + ["specularFactor"]= 0, + ["minColor"]= {0.98994976, 1, 1, 1}, + ["planeColor"]= {0.99497485, 0.99497485, 0.99497485, 1}, + ["surfaceAlpha"]= 0.37, + ["blurBase"]= 10, + ["diffuseFactor"]= 3, + ["repeatX"]= 0, + ["ambientFactor"]= 3, + ["repeatY"]= 0, + ["baseColor"]= {0.99497485, 1, 1, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.17085427, 0.19597989, 0.25628141, 1}, + ["groundAmbientColor"]= {0.26633167, 0.28643215, 0.35175881, 1}, + ["unitSpecularColor"]= {0.22613065, 0.22613065, 0.2914573, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.07537688, 0.1356784, 0.2914573, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.21105528, 0.22613065, 0.3115578, 1}, + ["unitAmbientColor"]= {0.14572865, 0.1557789, 0.22110553, 1}, + }, + ["direction"]= { + ["sunDir"]= 3.36999989, + ["sunPitch"]= 0.16, + }, + ["fog"]= { + ["sunColor"]= {0.05238095, 0, 0, 0.87142855}, + ["fogStart"]= 1, + ["fogColor"]= { + [0] = 0, + [1] = 0.16190477, + [2] = 0.16190477, + [3] = 0.16666667, + [4] = 0, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0, 0, 0.80000001, 0.96666664}, + ["skyColor"]= {0.07142857, 0, 0, 0.99523807}, + ["fogEnd"]= -0.13, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/Onyx Cauldron 2.1.lua b/LuaUI/Configs/MapSettingsOverride/spooky/Onyx Cauldron 2.1.lua new file mode 100644 index 0000000000..836e7b668d --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/Onyx Cauldron 2.1.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {0.01005025, 0.79899496, 0.01507538, 1}, + ["fresnelMin"]= 0.12, + ["blurExponent"]= 3.07999992, + ["reflectionDistortion"]= 2.92999983, + ["specularColor"]= {0.96984923, 0.2160804, 0.16582915, 0.99497485}, + ["fresnelPower"]= 9.88000011, + ["specularPower"]= 50, + ["perlinStartFreq"]= 1, + ["absorb"]= {0.01507538, 0.57788944, 0.02512563, 1}, + ["fresnelMax"]= 0.62, + ["diffuseColor"]= {0, 1, 0.03517588, 1}, + ["perlinAmplitude"]= 1.15999997, + ["perlinLacunarity"]= 2.87999988, + ["specularFactor"]= 0.89999998, + ["minColor"]= {0.07537688, 0.49748743, 0.10050251, 1}, + ["planeColor"]= {0.10552764, 0.48743719, 0.18592964, 1}, + ["surfaceAlpha"]= 0.19999999, + ["blurBase"]= 9.35999966, + ["diffuseFactor"]= 0.96999997, + ["repeatX"]= 0, + ["ambientFactor"]= 0, + ["repeatY"]= 0, + ["baseColor"]= {0.05527638, 0.5276382, 0.09045226, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.53768843, 0.33668342, 0.49748743, 1}, + ["groundAmbientColor"]= {0.18090452, 0.13065326, 0.3115578, 1}, + ["unitSpecularColor"]= {0.46231157, 0.37185928, 0.3316583, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.65829146, 0.29648241, 0.18090452, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.48743719, 0.35175881, 0.32663316, 1}, + ["unitAmbientColor"]= {0.19597989, 0.15075377, 0.37688443, 1}, + }, + ["direction"]= { + ["sunDir"]= 1.55999994, + ["sunPitch"]= 0.7812801, + }, + ["fog"]= { + ["sunColor"]= {0.04285714, 0.06190476, 0.04761905, 0.87142855}, + ["fogStart"]= 0.28, + ["fogColor"]= { + [0] = 0, + [1] = 0.33809525, + [2] = 0.17619048, + [3] = 0.40952381, + [4] = 0.89999998, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0.06190476, 0.05714286, 0.80000001, 0.96666664}, + ["skyColor"]= {0.06190476, 0.07142857, 0.06190476, 0.99523807}, + ["fogEnd"]= 1, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/Sphagnum Bog v1.1.lua b/LuaUI/Configs/MapSettingsOverride/spooky/Sphagnum Bog v1.1.lua new file mode 100644 index 0000000000..f9fd0af912 --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/Sphagnum Bog v1.1.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {0.09045226, 0.08040201, 0.08040201, 1}, + ["fresnelMin"]= 0.04, + ["blurExponent"]= 1.5999999, + ["reflectionDistortion"]= 3, + ["specularColor"]= {0.35678393, 0.39698493, 0.34170854, 0.99497485}, + ["fresnelPower"]= 0.12, + ["specularPower"]= 12.5999994, + ["perlinStartFreq"]= 19.6000004, + ["absorb"]= {0.14572865, 0.1356784, 0.14070351, 1}, + ["fresnelMax"]= 0.02, + ["diffuseColor"]= {0.09547739, 0.09045226, 0.08040201, 1}, + ["perlinAmplitude"]= 0.51999998, + ["perlinLacunarity"]= 0, + ["specularFactor"]= 0.22999999, + ["minColor"]= {0.11055277, 0.11055277, 0.09045226, 1}, + ["planeColor"]= {0.18090452, 0.18090452, 0.18090452, 1}, + ["surfaceAlpha"]= 0.14, + ["blurBase"]= 9.39999962, + ["diffuseFactor"]= 0.19999999, + ["repeatX"]= 0, + ["ambientFactor"]= 0.02, + ["repeatY"]= 0, + ["baseColor"]= {0.11557789, 0.12060302, 0.11557789, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.33668342, 0.3316583, 0.34170854, 1}, + ["groundAmbientColor"]= {0.38190955, 0.38693467, 0.39195979, 1}, + ["unitSpecularColor"]= {0, 0, 0, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.72864324, 0.75879395, 0.76884425, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.46231157, 0.44723618, 0.49748743, 1}, + ["unitAmbientColor"]= {0.40703517, 0.40703517, 0.44221106, 1}, + }, + ["direction"]= { + ["sunDir"]= 1.80999994, + ["sunPitch"]= 0.16, + }, + ["fog"]= { + ["sunColor"]= {0.05238095, 0, 0, 0.87142855}, + ["fogStart"]= 0.99000001, + ["fogColor"]= { + [0] = 0, + [1] = 0.13809524, + [2] = 0.14285715, + [3] = 0.11904762, + [4] = 0, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0, 0, 0.80000001, 0.96666664}, + ["skyColor"]= {0.07142857, 0, 0, 0.99523807}, + ["fogEnd"]= -0.27, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/TheBeachBeta.lua b/LuaUI/Configs/MapSettingsOverride/spooky/TheBeachBeta.lua new file mode 100644 index 0000000000..bb544b1d04 --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/TheBeachBeta.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {0.09045226, 0.08040201, 0.08040201, 1}, + ["fresnelMin"]= 0, + ["blurExponent"]= 5.96000004, + ["reflectionDistortion"]= 3, + ["specularColor"]= {0.35678393, 0.39698493, 0.34170854, 0.99497485}, + ["fresnelPower"]= 0.12, + ["specularPower"]= 12.5999994, + ["perlinStartFreq"]= 14.1999998, + ["absorb"]= {0.14572865, 0.1356784, 0.14070351, 1}, + ["fresnelMax"]= 0, + ["diffuseColor"]= {0.09547739, 0.09045226, 0.08040201, 1}, + ["perlinAmplitude"]= 1.12, + ["perlinLacunarity"]= 8.5199995, + ["specularFactor"]= 0.22999999, + ["minColor"]= {0.11055277, 0.11055277, 0.09045226, 1}, + ["planeColor"]= {0.18090452, 0.18090452, 0.18090452, 1}, + ["surfaceAlpha"]= 0.14, + ["blurBase"]= 9.39999962, + ["diffuseFactor"]= 0.19999999, + ["repeatX"]= 0, + ["ambientFactor"]= 0.02, + ["repeatY"]= 0, + ["baseColor"]= {0.11557789, 0.12060302, 0.11557789, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.2914573, 0.63819093, 0.49748743, 1}, + ["groundAmbientColor"]= {0.09045226, 0.25125629, 0.48241207, 1}, + ["unitSpecularColor"]= {0.5276382, 0.60000002, 0.5276382, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.03517588, 0.02512563, 0.03015075, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.38190955, 0.60000002, 0.34999999, 1}, + ["unitAmbientColor"]= {0.29648241, 0.5, 0.43216079, 1}, + }, + ["direction"]= { + ["sunDir"]= 0.59999996, + ["sunPitch"]= 0.29999998, + }, + ["fog"]= { + ["sunColor"]= {0.05238095, 0, 0, 0.87142855}, + ["fogStart"]= 0.99000001, + ["fogColor"]= { + [0] = 0, + [1] = 0.08571429, + [2] = 0.13809524, + [3] = 0.15714286, + [4] = 0, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0, 0, 0.80000001, 0.96666664}, + ["skyColor"]= {0.07142857, 0, 0, 0.99523807}, + ["fogEnd"]= -0.93, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/Thornford 2.lua b/LuaUI/Configs/MapSettingsOverride/spooky/Thornford 2.lua new file mode 100644 index 0000000000..159587f746 --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/Thornford 2.lua @@ -0,0 +1,54 @@ +return { + ["water"]= { + ["surfaceColor"]= {0.01005025, 0.99497485, 0.01507538, 1}, + ["fresnelMin"]= 0.12, + ["blurExponent"]= 3.03999996, + ["reflectionDistortion"]= 2.91999984, + ["specularColor"]= {0.37185928, 0.06532663, 0.03015075, 1}, + ["fresnelPower"]= 9.88000011, + ["specularPower"]= 19, + ["perlinStartFreq"]= 1, + ["absorb"]= {0.01507538, 0.57788944, 0.02512563, 1}, + ["fresnelMax"]= 0.41999999, + ["diffuseColor"]= {0, 1, 0.03517588, 1}, + ["perlinAmplitude"]= 1.15999997, + ["perlinLacunarity"]= 2.87999988, + ["specularFactor"]= 1.06999993, + ["minColor"]= {0.07537688, 0.49748743, 0.10050251, 1}, + ["planeColor"]= {0.10552764, 0.50251257, 0.18592964, 1}, + ["surfaceAlpha"]= 0.32999998, + ["blurBase"]= 9.35999966, + ["diffuseFactor"]= 3, + ["repeatX"]= 0, + ["ambientFactor"]= 0, + ["repeatY"]= 0, + ["baseColor"]= {0.05527638, 0.56783921, 0.09045226, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.49246231, 0.4723618, 0.77386934, 1}, + ["groundAmbientColor"]= {0.49246231, 0.42713568, 0.6683417, 1}, + ["unitSpecularColor"]= {0.81909549, 0.37688443, 0.31658292, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.4723618, 0.13065326, 0.07035176, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.99497485, 0.41708544, 0.25628141, 1}, + ["unitAmbientColor"]= {0.34673366, 0.29648241, 0.42713568, 1}, + }, + ["direction"]= false, + ["fog"]= { + ["sunColor"]= {0.04285714, 0.06190476, 0.04761905, 0.87142855}, + ["fogStart"]= 0.22999999, + ["fogColor"]= { + [0] = 0, + [1] = 0.33809525, + [2] = 0.17619048, + [3] = 0.46190476, + [4] = 0.89999998, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0.06190476, 0.05714286, 0.80000001, 0.96666664}, + ["skyColor"]= {0.06190476, 0.07142857, 0.05238095, 0.99523807}, + ["fogEnd"]= 1, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/TitanDuel 2.2.lua b/LuaUI/Configs/MapSettingsOverride/spooky/TitanDuel 2.2.lua new file mode 100644 index 0000000000..4d4688545a --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/TitanDuel 2.2.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {0, 0, 0, 1}, + ["fresnelMin"]= 0.02, + ["blurExponent"]= 10, + ["reflectionDistortion"]= 3, + ["specularColor"]= {0.99497485, 0.42713568, 1, 0.99497485}, + ["fresnelPower"]= 9.76000023, + ["specularPower"]= 50, + ["perlinStartFreq"]= 4.4000001, + ["absorb"]= {0.99497485, 0.98994976, 0.99497485, 1}, + ["fresnelMax"]= 2.89999986, + ["diffuseColor"]= {0, 0, 0.10552764, 1}, + ["perlinAmplitude"]= 0.51999998, + ["perlinLacunarity"]= 0, + ["specularFactor"]= 3, + ["minColor"]= {0.98994976, 1, 1, 1}, + ["planeColor"]= {0.99497485, 0.99497485, 0.99497485, 1}, + ["surfaceAlpha"]= 0, + ["blurBase"]= 10, + ["diffuseFactor"]= 3, + ["repeatX"]= 0, + ["ambientFactor"]= 0, + ["repeatY"]= 0, + ["baseColor"]= {0.99497485, 1, 1, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.43216079, 0.51256281, 0.72864324, 1}, + ["groundAmbientColor"]= {0.18592964, 0.19095477, 0.25628141, 1}, + ["unitSpecularColor"]= {0.67336684, 0.68844223, 0.80000001, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.30653265, 0.32663316, 0.42211056, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.64824122, 0.64824122, 0.80000001, 1}, + ["unitAmbientColor"]= {0.44723618, 0.47738692, 0.60000002, 1}, + }, + ["direction"]= { + ["sunDir"]= 2.21000004, + ["sunPitch"]= 1.31999993, + }, + ["fog"]= { + ["sunColor"]= {0.04285714, 0.06190476, 0.04761905, 0.87142855}, + ["fogStart"]= -0.78, + ["fogColor"]= { + [0] = 0, + [1] = 0.25714287, + [2] = 0.2857143, + [3] = 0.28095239, + [4] = 0.89999998, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0.06190476, 0.05714286, 0.80000001, 0.96666664}, + ["skyColor"]= {0.06190476, 0.07142857, 0.05238095, 0.99523807}, + ["fogEnd"]= 1, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/Tombstone Desert V2.lua b/LuaUI/Configs/MapSettingsOverride/spooky/Tombstone Desert V2.lua new file mode 100644 index 0000000000..e4c2d911df --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/Tombstone Desert V2.lua @@ -0,0 +1,33 @@ +return { + ["water"]= false, + ["sun"]= { + ["groundDiffuseColor"]= {0.58291459, 0.68341708, 0.37688443, 1}, + ["groundAmbientColor"]= {0.05025126, 0.48743719, 0.81909549, 1}, + ["unitSpecularColor"]= {0.41708544, 0.52261305, 0.5276382, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.07537688, 0.08040201, 0.09547739, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.35678393, 0.73869348, 0.48743719, 1}, + ["unitAmbientColor"]= {0.17085427, 0.39195979, 0.54271358, 1}, + }, + ["direction"]= { + ["sunDir"]= 3.61999989, + ["sunPitch"]= 0.28999999, + }, + ["fog"]= { + ["sunColor"]= {0.04285714, 0.06190476, 0.04761905, 0.87142855}, + ["fogStart"]= 0.68000001, + ["fogColor"]= { + [0] = 0, + [1] = 0.00952381, + [2] = 0.26666668, + [3] = 0.24761905, + [4] = 0.98571426, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0.06190476, 0.05714286, 0.80000001, 0.96666664}, + ["skyColor"]= {0.06190476, 0.07142857, 0.06190476, 0.99523807}, + ["fogEnd"]= -0.13, + }, +} diff --git a/LuaUI/Configs/MapSettingsOverride/spooky/White Rabbit v2.1.lua b/LuaUI/Configs/MapSettingsOverride/spooky/White Rabbit v2.1.lua new file mode 100644 index 0000000000..9947a2f132 --- /dev/null +++ b/LuaUI/Configs/MapSettingsOverride/spooky/White Rabbit v2.1.lua @@ -0,0 +1,57 @@ +return { + ["water"]= { + ["surfaceColor"]= {0.97989953, 0.05527638, 0.01507538, 1}, + ["fresnelMin"]= 0.02, + ["blurExponent"]= 10, + ["reflectionDistortion"]= 3, + ["specularColor"]= {0.99497485, 0.42713568, 1, 0.99497485}, + ["fresnelPower"]= 9.76000023, + ["specularPower"]= 50, + ["perlinStartFreq"]= 4.4000001, + ["absorb"]= {0.99497485, 0.98994976, 0.99497485, 1}, + ["fresnelMax"]= 2.89999986, + ["diffuseColor"]= {0.99497485, 0.16582915, 0.16080402, 1}, + ["perlinAmplitude"]= 0.51999998, + ["perlinLacunarity"]= 0, + ["specularFactor"]= 3, + ["minColor"]= {0.98994976, 1, 1, 1}, + ["planeColor"]= {0.99497485, 0.99497485, 0.99497485, 1}, + ["surfaceAlpha"]= 0.08, + ["blurBase"]= 10, + ["diffuseFactor"]= 3, + ["repeatX"]= 0, + ["ambientFactor"]= 0.74000001, + ["repeatY"]= 0, + ["baseColor"]= {0.99497485, 1, 1, 1}, + }, + ["sun"]= { + ["groundDiffuseColor"]= {0.36683416, 0.28140703, 0.30150753, 1}, + ["groundAmbientColor"]= {0.1758794, 0.1557789, 0.13065326, 1}, + ["unitSpecularColor"]= {0.69999999, 0.4723618, 0.48241207, 1}, + ["modelShadowDensity"]= 1, + ["specularExponent"]= 50, + ["groundSpecularColor"]= {0.19095477, 0.1356784, 0.14572865, 1}, + ["groundShadowDensity"]= 1, + ["unitDiffuseColor"]= {0.5, 0.41708544, 0.41206029, 1}, + ["unitAmbientColor"]= {0.30000001, 0.22613065, 0.23115578, 1}, + }, + ["direction"]= { + ["sunDir"]= 1.65999997, + ["sunPitch"]= 0.28999999, + }, + ["fog"]= { + ["sunColor"]= {0.05238095, 0, 0, 0.87142855}, + ["fogStart"]= 0.99000001, + ["fogColor"]= { + [0] = 0, + [1] = 0.22380953, + [2] = 0, + [3] = 0, + [4] = 0, + [5] = 0, + }, + ["cloudColor"]= {0.05714286, 0, 0, 0.80000001, 0.96666664}, + ["skyColor"]= {0.07142857, 0, 0, 0.99523807}, + ["fogEnd"]= -0.37, + }, +} diff --git a/LuaUI/Widgets/gfx_sun_and_atmosphere.lua b/LuaUI/Widgets/gfx_sun_and_atmosphere.lua index dcc4a3ca3d..ba4c29b7bf 100644 --- a/LuaUI/Widgets/gfx_sun_and_atmosphere.lua +++ b/LuaUI/Widgets/gfx_sun_and_atmosphere.lua @@ -22,11 +22,22 @@ local waterpath = 'Settings/Graphics/Sun, Fog & Water/Water' local OVERRIDE_DIR = LUAUI_DIRNAME .. 'Configs/MapSettingsOverride/' local MAP_FILE = (Game.mapName or "") .. ".lua" -local MAPSIDE_FILE = "mapconfig/extraMapSettings.lua" +local OVERRIDE_CONFIG + +local today = os.date("*t") +if today.month == 10 and today.day == 31 then + local SPOOKY_DIR = OVERRIDE_DIR .. "spooky/" + local SPOOKY_FILE = SPOOKY_DIR .. MAP_FILE + OVERRIDE_CONFIG = VFS.FileExists(SPOOKY_FILE) and VFS.Include(SPOOKY_FILE) or false +end + +local OVERRIDE_FILE = OVERRIDE_DIR .. MAP_FILE +if not OVERRIDE_CONFIG then + OVERRIDE_CONFIG = VFS.FileExists(OVERRIDE_FILE) and VFS.Include(OVERRIDE_FILE) or false +end -local OVERRIDE_FILE = OVERRIDE_DIR .. MAP_FILE -local OVERRIDE_CONFIG = VFS.FileExists(OVERRIDE_FILE) and VFS.Include(OVERRIDE_FILE) or false if not OVERRIDE_CONFIG then + local MAPSIDE_FILE = "mapconfig/extraMapSettings.lua" OVERRIDE_CONFIG = VFS.FileExists(MAPSIDE_FILE) and VFS.Include(MAPSIDE_FILE) or false end