From 1a63831ecde6a2e5675ed3afe863d5641af27794 Mon Sep 17 00:00:00 2001
From: Juraj Vajda <juraj.vajda@gmail.com>
Date: Wed, 22 Feb 2023 10:17:30 -0500
Subject: [PATCH] Add new suns, fix skybox colors when changing between biomes

---
 LICENSE.txt                                   |   2 +
 skybox.lua                                    |  67 +++++++++++-------
 textures/everness_forsaken_desert_sun.png     | Bin 211 -> 174 bytes
 .../everness_forsaken_desert_sun_tonemap.png  | Bin 141 -> 150 bytes
 textures/everness_forsaken_tundra_sun.png     | Bin 0 -> 211 bytes
 .../everness_forsaken_tundra_sun_tonemap.png  | Bin 0 -> 141 bytes
 6 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 textures/everness_forsaken_tundra_sun.png
 create mode 100644 textures/everness_forsaken_tundra_sun_tonemap.png

diff --git a/LICENSE.txt b/LICENSE.txt
index 568e945..d5e2b12 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -815,6 +815,8 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file)
 - everness_forsaken_desert_sun_tonemap.png
 - everness_coral_forest_sun_tonemap.png
 - everness_coral_forest_sun.png
+- everness_forsaken_tundra_sun.png
+- everness_forsaken_tundra_sun_tonemap.png
 
 **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated
 
diff --git a/skybox.lua b/skybox.lua
index ce753e5..5e5bfe4 100644
--- a/skybox.lua
+++ b/skybox.lua
@@ -177,7 +177,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#c492a5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#e4b2c5',
                 dawn_sky = '#e0aec1',
                 dawn_horizon = '#e5b3c6',
@@ -199,7 +199,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#c492a5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#e4b2c5',
                 dawn_sky = '#e0aec1',
                 dawn_horizon = '#e5b3c6',
@@ -221,7 +221,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#c492a5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#e4b2c5',
                 dawn_sky = '#e0aec1',
                 dawn_horizon = '#e5b3c6',
@@ -243,7 +243,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#c492a5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#e4b2c5',
                 dawn_sky = '#e0aec1',
                 dawn_horizon = '#e5b3c6',
@@ -260,13 +260,13 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#5dd35d',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#7df37d',
                 -- dawn_sky = '#79ef79',
-                dawn_sky = '',
+                dawn_sky = '#B4BAFA',
                 dawn_horizon = '#7ef47e',
                 -- night_sky = '#158b15',
-                night_sky = '',
+                night_sky = '#006BFF',
                 night_horizon = '#3eb43e',
                 indoors = '#1e941e',
                 fog_sun_tint = '#50c650',
@@ -279,13 +279,13 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#5dd35d',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#7df37d',
                 -- dawn_sky = '#79ef79',
-                dawn_sky = '',
+                dawn_sky = '#B4BAFA',
                 dawn_horizon = '#7ef47e',
                 -- night_sky = '#158b15',
-                night_sky = '',
+                night_sky = '#006BFF',
                 night_horizon = '#3eb43e',
                 indoors = '#1e941e',
                 fog_sun_tint = '#50c650',
@@ -346,7 +346,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#b992c5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#d9b2e5',
                 dawn_sky = '#d5aee1',
                 dawn_horizon = '#dab3e6',
@@ -371,7 +371,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#b992c5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#d9b2e5',
                 dawn_sky = '#d5aee1',
                 dawn_horizon = '#dab3e6',
@@ -396,7 +396,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#b992c5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#d9b2e5',
                 dawn_sky = '#d5aee1',
                 dawn_horizon = '#dab3e6',
@@ -421,7 +421,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#b992c5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#d9b2e5',
                 dawn_sky = '#d5aee1',
                 dawn_horizon = '#dab3e6',
@@ -446,7 +446,7 @@ local skybox_defs = {
             type = 'regular',
             sky_color = {
                 -- day_sky = '#b992c5',
-                day_sky = '',
+                day_sky = '#61B5F5',
                 day_horizon = '#d9b2e5',
                 dawn_sky = '#d5aee1',
                 dawn_horizon = '#dab3e6',
@@ -479,7 +479,7 @@ local skybox_defs = {
         },
         sun_parameters = {
             texture = 'everness_forsaken_desert_sun.png',
-            scale = 1.57,
+            scale = 3.14,
             tonemap = 'everness_forsaken_desert_sun_tonemap.png'
         },
     },
@@ -500,7 +500,7 @@ local skybox_defs = {
         },
         sun_parameters = {
             texture = 'everness_forsaken_desert_sun.png',
-            scale = 1.57,
+            scale = 3.14,
             tonemap = 'everness_forsaken_desert_sun_tonemap.png'
         },
     },
@@ -552,7 +552,12 @@ local skybox_defs = {
                 fog_sun_tint = '#bd962c',
                 fog_moon_tint = '#be972d'
             }
-        }
+        },
+        sun_parameters = {
+            texture = 'everness_forsaken_tundra_sun.png',
+            scale = 1.57,
+            tonemap = 'everness_forsaken_tundra_sun_tonemap.png'
+        },
     },
     everness_forsaken_tundra_beach = {
         sky_parameters = {
@@ -570,7 +575,12 @@ local skybox_defs = {
                 fog_sun_tint = '#bd962c',
                 fog_moon_tint = '#be972d'
             }
-        }
+        },
+        sun_parameters = {
+            texture = 'everness_forsaken_tundra_sun.png',
+            scale = 1.57,
+            tonemap = 'everness_forsaken_tundra_sun_tonemap.png'
+        },
     },
     everness_forsaken_tundra_ocean = {
         sky_parameters = {
@@ -588,7 +598,12 @@ local skybox_defs = {
                 fog_sun_tint = '#bd962c',
                 fog_moon_tint = '#be972d'
             }
-        }
+        },
+        sun_parameters = {
+            texture = 'everness_forsaken_tundra_sun.png',
+            scale = 1.57,
+            tonemap = 'everness_forsaken_tundra_sun_tonemap.png'
+        },
     },
     everness_forsaken_tundra_under = {
         sky_parameters = {
@@ -617,12 +632,12 @@ local function should_flip(player)
     -- 1 morning
     -- 2 afternoon
     local current_time = minetest.get_timeofday() < 0.5 and 1 or 2
-    local should_flip = current_time ~= player_time
+    local flip = current_time ~= player_time
 
     player_meta:set_int('everness_timeofday', current_time)
 
     return {
-        should_flip = should_flip,
+        should_flip = flip,
         current_time = current_time
     }
 end
@@ -655,15 +670,15 @@ minetest.register_globalstep(function(dtime)
                 return
             end
 
-            local should_flip = should_flip(player)
+            local should_flip_data = should_flip(player)
 
             -- flip sun/moon when morning/afternoon
-            if player_biome_name == biome_name and should_flip then
+            if player_biome_name == biome_name and should_flip_data.should_flip then
                 if skybox_defs[biome_name] then
                     if skybox_defs[biome_name].sun_parameters then
                         local sun_params = table.copy(skybox_defs[biome_name].sun_parameters)
 
-                        if should_flip.current_time == 2 then
+                        if should_flip_data.current_time == 2 then
                             sun_params.texture = sun_params.texture .. '^[transformFY'
                         end
 
@@ -686,7 +701,7 @@ minetest.register_globalstep(function(dtime)
                         local sun_params = table.copy(skybox_defs[biome_name].sun_parameters)
 
                         -- flip sun when afternoon
-                        if should_flip.current_time == 2 then
+                        if should_flip_data.current_time == 2 then
                             sun_params.texture = sun_params.texture .. '^[transformFY'
                         end
 
diff --git a/textures/everness_forsaken_desert_sun.png b/textures/everness_forsaken_desert_sun.png
index c90a4b82df28af8d7a22e19513c02bfb5d8707cd..7141472a0e4ca49a0574313e85193e431396dbd6 100644
GIT binary patch
delta 146
zcmcc2xQ=mxN<DvoPl&5~fzN+1`1<uLke*)lY9|8&19M4`UoZoQXnfHsTOill)5S5Q
z;?~>K-dqP1cvu}i@BBY=scK7`hv37|4Kx343A&(hfTe7+;~9&9LyNZ0ZB+J{&^|RG
vu6dUBj++jA60<C=ECM(f6o0Bsx&O*Wij~3mcE||^ZlJ-Qu6{1-oD!M<g#te|

delta 183
zcmZ3-c$sm6O1)5kPl)S(2zWp9|Fw+&uL{5H_u;S0lVo6EU@8gn3+52LJbm$PATQ6;
z#WAGf*4vAQTn8LDTrTF!+53NLvPj5=SR=8YQ@KBPO<2AC`?<wmWly-?Q*vU7WeN~D
z&zx|T=}2*D!1bh+mCMCApGZxUWBjs!VWU9kVqqbM0)y#y&M=7y9(Z-%f#Gs}%(HC0
jg2z`)#lNsM?+>&!DdO7n;7{jqpw$eXu6{1-oD!M<AB<9?

diff --git a/textures/everness_forsaken_desert_sun_tonemap.png b/textures/everness_forsaken_desert_sun_tonemap.png
index b136f5531a264619fc2af0556a8dd8abd1ca7c3b..706d5c90df13fcde67825c00ef846c795bb2f973 100644
GIT binary patch
delta 121
zcmV-<0EYjK0hR%fBywFzL_t(|0b=~Vw-?Y$8E60uLosmq|Bt>Ic&K$`rw@?qTnxR|
z%Np%J(C|!!<n_Tc6rHO>^4G#1vGRN)(j;Lmc_NOg=MWW{-1z6(FjUcG<gKT4^)1I=
bS2pbpfP4>luuK2600000NkvXXu0mjfet9_{

delta 112
zcmV-$0FVEc0gVBWBxzJhL_t(|0b~6CekQ|U0i%Es8=DbIKq(R#j1UYb32_<m$f8R@
z45w5X!l_hIL)b<NT}7mUc+JEqh1FR6YH%7(SUqMmVM>uM$cUx@H+P`HC;$MP!UF$a
S8l%|&0000<MNUMnLSTX{ASwv}

diff --git a/textures/everness_forsaken_tundra_sun.png b/textures/everness_forsaken_tundra_sun.png
new file mode 100644
index 0000000000000000000000000000000000000000..c90a4b82df28af8d7a22e19513c02bfb5d8707cd
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sLIFM@uKyw6{mlQ@GXB3R{IcJN
zzb;P_D9cn5<QL2#dU^Wd+dy8Pr;B4q#jUp&4Y>|DaJXE|nX~u*)MSy64Y5XIKc{kk
z?wYWA`}cE;zsjC)y{F{F63Y}IaGp8gD$|kT(tztpD=U|aaXyinCdc??0mDXt(8a<+
z3<cBgoM93ZJn-ti1H<L|m}l8~1&^<qihp5i-XCadQpC0C!Jp3KK${snUHx3vIVCg!
E0Ps&#{{R30

literal 0
HcmV?d00001

diff --git a/textures/everness_forsaken_tundra_sun_tonemap.png b/textures/everness_forsaken_tundra_sun_tonemap.png
new file mode 100644
index 0000000000000000000000000000000000000000..b136f5531a264619fc2af0556a8dd8abd1ca7c3b
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0y~yU;;837&$<c`prf~AQj^2;uuoFnEdB|o!a39#>EYS
z(z6A<95jU_djxpYISVB}o>=7V$g?~|^3ckVK<687T(Pc88Y|8o(QLgM@h7W5$}hq;
p%_PxlqTY#)Wen!!3l3^9Fw8#0^gmu|@lBxl44$rjF6*2UngDSbEK>jg

literal 0
HcmV?d00001