X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plugins%2Fclient%2FTheCrawlingEater.py;h=6798e9c23f5d022eb47d475a7b54354857c23e69;hb=dfd04a4d5f8736535b5118fd94eff1de6a627830;hp=c91f16dc89a58b7b668c85db2f0cb874f4b2f3bb;hpb=690cfb4d09e6a058b7c5b59d76035dfbc114ec85;p=plomrogue

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index c91f16d..6798e9c 100644
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -28,7 +28,8 @@ def win_map(self):
         "3": "%",
         "4": "#",
         "5": "X",
-        "-": "O",
+        "*": "O",
+        "&": "0",
     }
     win_size = self.size
     offset = [0, 0]
@@ -53,15 +54,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 +72,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"]):
@@ -85,8 +85,11 @@ def win_map(self):
             if world_data["look_mode"] and y == world_data["map_center"][0] \
                     and x == world_data["map_center"][1]:
                 if char == " ":
-                    char = world_data["mem_map"][pos]
-                winmap += [(char, curses.A_REVERSE), ("?", curses.A_REVERSE)]
+                    bonus = "?"
+                else:
+                    bonus = world_data["wetmap"][pos]
+                char = world_data["mem_map"][pos]
+                winmap += [(char, curses.A_REVERSE), (bonus, curses.A_REVERSE)]
                 continue
             bonus = " "
             attribute = col_unknown
@@ -99,12 +102,16 @@ 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:
                         attribute = earth_colors[mapval]
+                if char == "&":
+                    attribute = col_player
                 if char in charmap:
                     char = charmap[char]
                 elif char == "@":
@@ -137,21 +144,27 @@ from client.windows import win_log
 windows_config[:] = [
     {"config": [0, -34],
      "func": win_map,
-      "title": "The Crawling Eater"},
+     "scroll_hints": False,
+      "title": "THE CRAWLING EATER"},
     {"config": [1, 33],
      "func": win_bar_maker(77, "%", "stomach"),
+     "scroll_hints": False,
      "title": "stomach"},
     {"config": [1, 33],
      "func": win_bar_maker(79, "~", "kidney"),
+     "scroll_hints": False,
       "title": "kidney"},
     {"config": [1, 33],
      "func": win_bar_maker(78, "%", "bowel"),
+     "scroll_hints": False,
      "title": "bowel"},
     {"config": [1, 33],
      "func": win_bar_maker(80, "~", "bladder"),
+     "scroll_hints": False,
       "title": "bladder"},
     {"config": [-8, 33],
      "func": win_log,
+     "scroll_hints": False,
      "title": "log"}
 ]
 from client.window_management import set_windows