TCE: Prefix hole creation with crack hierarchy, fix some bugs.

[plomrogue] / plugins / client / TheCrawlingEater.py

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index 63c4136b9ac9fa7fa4d990be7dbe8e0364ef2b52..1685f33866a5d742e2d75154a5f57d679d763267 100644 (file)
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -28,7 +28,7 @@ def win_map(self):
         "3": "%",
         "4": "#",
         "5": "X",
-        "-": "O",
+        "*": "O",
     }
     win_size = self.size
     offset = [0, 0]
@@ -53,15 +53,14 @@ def win_map(self):
     curses.init_pair(6, curses.COLOR_RED, curses.COLOR_BLACK)
     curses.init_pair(7, curses.COLOR_MAGENTA, curses.COLOR_BLACK)
     curses.init_pair(8, curses.COLOR_BLACK, curses.COLOR_WHITE)
-    #curses.init_pair(9, curses.COLOR_BLACK, curses.COLOR_BLUE)
+    curses.init_pair(9, curses.COLOR_BLACK, curses.COLOR_BLUE)
     curses.init_pair(10, curses.COLOR_BLACK, curses.COLOR_CYAN)
     curses.init_pair(11, curses.COLOR_BLACK, curses.COLOR_GREEN)
     curses.init_pair(12, curses.COLOR_BLACK, curses.COLOR_YELLOW)
     curses.init_pair(13, curses.COLOR_BLACK, curses.COLOR_RED)
     curses.init_pair(14, curses.COLOR_BLACK, curses.COLOR_MAGENTA)
-    curses.init_pair(15, curses.COLOR_RED, curses.COLOR_GREEN)
     col_unknown = curses.color_pair(1)
-    col_creature = curses.color_pair(15)
+    col_creature = curses.color_pair(13)
     col_player = curses.color_pair(8)
     earth_colors = [
         curses.color_pair(4),
@@ -72,10 +71,10 @@ def win_map(self):
         curses.color_pair(7),
     ]
     water_colors = [
+        curses.color_pair(9),
         curses.color_pair(10),
         curses.color_pair(11),
         curses.color_pair(12),
-        curses.color_pair(13),
         curses.color_pair(14),
     ]
     for y in range(world_data["map_size"]):
@@ -102,8 +101,10 @@ def win_map(self):
                 winmap += [(char, attribute), bonus]
             else:
                 wetval = ord(world_data["wetmap"][pos]) - ord("0")
-                if ord("0") <= ord(char) <= ord("5"):
-                    mapval = ord(char) - ord("0")
+                if char in "012345-+":
+                    mapval = 0
+                    if char not in "-+":
+                        mapval = ord(char) - ord("0")
                     if 1 <= wetval <= 5:
                         attribute = water_colors[wetval + (mapval - 1)]
                     else:
@@ -141,7 +142,7 @@ windows_config[:] = [
     {"config": [0, -34],
      "func": win_map,
      "scroll_hints": False,
-      "title": "The Crawling Eater"},
+      "title": "THE CRAWLING EATER"},
     {"config": [1, 33],
      "func": win_bar_maker(77, "%", "stomach"),
      "scroll_hints": False,