tuned lava/universal damage code

[oweals/minetest.git] / src / light.cpp

diff --git a/src/light.cpp b/src/light.cpp
index c0255f7fbb1b8b01b23d4aadb2841606ffd03aa8..f214d6ea06615f1c5512600e66ca80e395a99b35 100644 (file)
--- a/src/light.cpp
+++ b/src/light.cpp
@@ -19,14 +19,97 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "light.h"
 
-/*u32 daynight_cache_ratios[DAYNIGHT_CACHE_COUNT] =
+#if 1
+// This is good
+// a_n+1 = a_n * 0.786
+// Length of LIGHT_MAX+1 means LIGHT_MAX is the last value.
+// LIGHT_SUN is read as LIGHT_MAX from here.
+u8 light_decode_table[LIGHT_MAX+1] = 
+{
+8,
+11,
+14,
+18,
+22,
+29,
+37,
+47,
+60,
+76,
+97,
+123,
+157,
+200,
+255,
+};
+#else
+// Use for debugging in dark
+u8 light_decode_table[LIGHT_MAX+1] = 
+{
+58,
+64,
+72,
+80,
+88,
+98,
+109,
+121,
+135,
+150,
+167,
+185,
+206,
+229,
+255,
+};
+#endif
+
+// This is reasonable with classic lighting with a light source
+/*u8 light_decode_table[LIGHT_MAX+1] = 
+{
+2,
+3,
+4,
+6,
+9,
+13,
+18,
+25,
+32,
+35,
+45,
+57,
+69,
+79,
+255
+};*/
+
+
+// As in minecraft, a_n+1 = a_n * 0.8
+// NOTE: This doesn't really work that well because this defines
+//       LIGHT_MAX as dimmer than LIGHT_SUN
+// NOTE: Uh, this has had 34 left out; forget this.
+/*u8 light_decode_table[LIGHT_MAX+1] = 
 {
-       1000,
-       600,
-       300
+8,
+11,
+14,
+17,
+21,
+27,
+42,
+53,
+66,
+83,
+104,
+130,
+163,
+204,
+255,
 };*/
 
-u8 light_decode_table[LIGHT_MAX+1] = 
+// This was a quick try of more light, manually quickly made
+/*u8 light_decode_table[LIGHT_MAX+1] = 
 {
 0,
 7,
@@ -43,7 +126,9 @@ u8 light_decode_table[LIGHT_MAX+1] =
 167,
 205,
 255,
-};
+};*/
+
+// This was used for a long time, manually made
 /*u8 light_decode_table[LIGHT_MAX+1] = 
 {
 0,
@@ -62,6 +147,7 @@ u8 light_decode_table[LIGHT_MAX+1] =
 191,
 255,
 };*/
+
 /*u8 light_decode_table[LIGHT_MAX+1] = 
 {
 0,