TCE: Use wetness map separate from terrain map.

[plomrogue] / plugins / client / TheCrawlingEater.py

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index b2acb06eb8c4c25f9745f275e7b5cbd707fc288a..081960ab8e8fe8f96eda9afa18cdb7b900342ac5 100644 (file)
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -43,16 +43,41 @@ def win_map(self):
     curses.init_pair(2, curses.COLOR_BLUE, curses.COLOR_BLACK)
     curses.init_pair(3, curses.COLOR_RED, curses.COLOR_BLACK)
     curses.init_pair(4, curses.COLOR_YELLOW, curses.COLOR_BLACK)
-    curses.init_pair(5, curses.COLOR_MAGENTA, curses.COLOR_BLACK)
-    curses.init_pair(6, curses.COLOR_BLACK, curses.COLOR_BLUE)
+    curses.init_pair(5, curses.COLOR_CYAN, curses.COLOR_BLACK)
+    curses.init_pair(6, curses.COLOR_MAGENTA, curses.COLOR_BLACK)
+    curses.init_pair(7, curses.COLOR_GREEN, curses.COLOR_BLACK)
+    curses.init_pair(8, curses.COLOR_BLACK, curses.COLOR_MAGENTA)
+    curses.init_pair(9, curses.COLOR_BLACK, curses.COLOR_BLUE)
+    curses.init_pair(10, curses.COLOR_BLACK, curses.COLOR_CYAN)
     col_unknown = curses.color_pair(1)
     col_mem_obstacle = curses.color_pair(2)
     col_mem = curses.color_pair(2)
     col_stone = curses.color_pair(1)
-    col_dirt = curses.color_pair(4)
-    col_earth = curses.color_pair(3)
     col_player = curses.color_pair(5)
-    col_water = curses.color_pair(6)
+    col_ground = curses.color_pair(6)
+    col_ground_wet = curses.color_pair(8)
+    col_ground_wetter = curses.color_pair(9)
+    col_ground_wettest = curses.color_pair(10)
+    col_dirt = curses.color_pair(3)
+    col_dirt_wet = curses.color_pair(8)
+    col_dirt_wetter = curses.color_pair(9)
+    col_dirt_wettest = curses.color_pair(10)
+    col_earth = curses.color_pair(3)
+    col_earth_wet = curses.color_pair(8)
+    col_earth_wetter = curses.color_pair(9)
+    col_earth_wettest = curses.color_pair(10)
+    col_wall_dirt = curses.color_pair(4)
+    col_wall_dirt_wet = curses.color_pair(8)
+    col_wall_dirt_wetter = curses.color_pair(9)
+    col_wall_dirt_wettest = curses.color_pair(10)
+    col_wall_earth = curses.color_pair(4)
+    col_wall_earth_wet = curses.color_pair(8)
+    col_wall_earth_wetter = curses.color_pair(9)
+    col_wall_earth_wettest = curses.color_pair(10)
+    col_wall_stone = curses.color_pair(1)
+    col_wall_stone_wet = curses.color_pair(8)
+    col_wall_stone_wetter = curses.color_pair(9)
+    col_wall_stone_wettest = curses.color_pair(10)
     for y in range(world_data["map_size"]):
         for x in range(world_data["map_size"]):
             pos = y * world_data["map_size"] + x
@@ -68,26 +93,64 @@ def win_map(self):
                 attribute = col_mem
                 if char == " ":
                     attribute = col_unknown
-                elif char == "X" or char == "#":
+                elif char in "%#X":
                     attribute = col_mem_obstacle
                 bonus = (" ", attribute)
                 winmap += [(char, attribute), bonus]
             else:
                 attribute = col_stone
                 bonus = " "
+                if char == "_":
+                    attribute = col_ground
+                elif char == "~":
+                    if world_data["wetmap"][pos] == "1":
+                        attribute = col_ground_wet
+                    if world_data["wetmap"][pos] == "2":
+                        attribute = col_ground_wetter
+                    if world_data["wetmap"][pos] == "3":
+                        attribute = col_ground_wettest
                 if char == ".":
                     attribute = col_dirt
+                    if world_data["wetmap"][pos] == "1":
+                        attribute = col_dirt_wet
+                    if world_data["wetmap"][pos] == "2":
+                        attribute = col_dirt_wetter
+                    if world_data["wetmap"][pos] == "3":
+                        attribute = col_dirt_wettest
                 elif char == ":":
                     attribute = col_earth
+                    if world_data["wetmap"][pos] == "1":
+                        attribute = col_earth_wet
+                    if world_data["wetmap"][pos] == "2":
+                        attribute = col_earth_wetter
+                    if world_data["wetmap"][pos] == "3":
+                        attribute = col_earth_wettest
                 elif char == "%":
-                    attribute = col_earth
+                    attribute = col_wall_dirt
+                    if world_data["wetmap"][pos] == "1":
+                        attribute = col_wall_dirt_wet
+                    if world_data["wetmap"][pos] == "2":
+                        attribute = col_wall_dirt_wetter
+                    if world_data["wetmap"][pos] == "3":
+                        attribute = col_wall_dirt_wettest
                 elif char == "#":
-                    attribute = col_dirt
-                elif char == "~":
-                    attribute = col_water
+                    attribute = col_wall_earth
+                    if world_data["wetmap"][pos] == "1":
+                        attribute = col_wall_earth_wet
+                    if world_data["wetmap"][pos] == "2":
+                        attribute = col_wall_earth_wetter
+                    if world_data["wetmap"][pos] == "3":
+                        attribute = col_wall_earth_wettest
+                elif char == "X":
+                    attribute = col_wall_stone
+                    if world_data["wetmap"][pos] == "1":
+                        attribute = col_wall_stone_wet
+                    if world_data["wetmap"][pos] == "2":
+                        attribute = col_wall_stone_wetter
+                    if world_data["wetmap"][pos] == "3":
+                        attribute = col_wall_stone_wettest
                 elif char == "@":
                     attribute = col_player
-                    bonus = (char, attribute)
                 winmap += [(char, attribute), bonus]
         if y % 2 == 0:
             winmap += "  "
@@ -96,9 +159,11 @@ def win_map(self):
 from client.config.world_data import world_data
 world_data["bowel"] = 0
 world_data["bladder"] = 0
+world_data["wetmap"] = " " * (world_data["map_size"] ** 2)
 from client.config.io import io
 io["worldstate_read_order"] += [["bowel", "int"]]
 io["worldstate_read_order"] += [["bladder", "int"]]
+io["worldstate_read_order"] += [["wetmap", "map"]]
 from client.config.windows import windows_config
 from client.windows import win_log
 windows_config[:] = [