tuned lava/universal damage code

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

diff --git a/src/light.cpp b/src/light.cpp
index 03821a672ad9e8ca50adef3a5d5f981c81dee186..f214d6ea06615f1c5512600e66ca80e395a99b35 100644 (file)
--- a/src/light.cpp
+++ b/src/light.cpp
@@ -19,15 +19,124 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "light.h"
 
-// LIGHT_MAX is 15, 0-15 is 16 values
+#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] = 
 {
-0,
+2,
+3,
+4,
+6,
 9,
-12,
+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] = 
+{
+8,
+11,
 14,
-16,
-20,
+17,
+21,
+27,
+42,
+53,
+66,
+83,
+104,
+130,
+163,
+204,
+255,
+};*/
+
+// This was a quick try of more light, manually quickly made
+/*u8 light_decode_table[LIGHT_MAX+1] = 
+{
+0,
+7,
+11,
+15,
+21,
+29,
+42,
+53,
+69,
+85,
+109,
+135,
+167,
+205,
+255,
+};*/
+
+// This was used for a long time, manually made
+/*u8 light_decode_table[LIGHT_MAX+1] = 
+{
+0,
+6,
+8,
+11,
+14,
+19,
 26,
 34,
 45,
@@ -38,7 +147,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 191,
 255,
 };*/
-u8 light_decode_table[LIGHT_MAX+1] = 
+
+/*u8 light_decode_table[LIGHT_MAX+1] = 
+{
+0,
+3,
+6,
+10,
+18,
+25,
+35,
+50,
+75,
+95,
+120,
+150,
+185,
+215,
+255,
+};*/
+/*u8 light_decode_table[LIGHT_MAX+1] = 
 {
 0,
 5,
@@ -55,7 +183,26 @@ u8 light_decode_table[LIGHT_MAX+1] =
 185,
 215,
 255,
-};
+};*/
+// LIGHT_MAX is 14, 0-14 is 15 values
+/*u8 light_decode_table[LIGHT_MAX+1] = 
+{
+0,
+9,
+12,
+14,
+16,
+20,
+26,
+34,
+45,
+61,
+81,
+108,
+143,
+191,
+255,
+};*/
 
 #if 0
 /*