X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fclient%2FTheCrawlingEater.py;h=0f4b9a2613ed761a09bd33a7f0172b2bc028faa8;hb=757c2d72e97a023f1806760aff4259579e0ba3e3;hp=86115e38ee3ed429299c8f9a8e9ec0c47e8e3ec1;hpb=fb371877bc9f844e1c85161f4fef8319b9ee677f;p=plomrogue

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index 86115e3..0f4b9a2 100644
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -3,6 +3,7 @@
 # see the file NOTICE in the root directory of the PlomRogue source package.
 
 
+curses.init_pair(76, curses.COLOR_BLACK, curses.COLOR_WHITE)
 curses.init_pair(77, curses.COLOR_WHITE, curses.COLOR_GREEN)
 curses.init_pair(78, curses.COLOR_BLACK, curses.COLOR_RED)
 curses.init_pair(79, curses.COLOR_WHITE, curses.COLOR_BLUE)
@@ -13,6 +14,8 @@ def win_bar_maker(color_number, symbol, title):
     def win_bar(self):
         winmap = []
         for i in range(world_data[title]):
+            if i == 32:
+                break
             winmap += [(symbol, curses.color_pair(color_number))]
         winmap_size = [1, len(winmap)]
         offset = [0, 0]
@@ -28,7 +31,8 @@ def win_map(self):
         "3": "%",
         "4": "#",
         "5": "X",
-        "-": "O",
+        "*": "O",
+        "&": "0",
     }
     win_size = self.size
     offset = [0, 0]
@@ -47,22 +51,22 @@ def win_map(self):
     winmap = []
     curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLACK)
     #curses.init_pair(2, curses.COLOR_BLUE, curses.COLOR_BLACK)
-    #curses.init_pair(3, curses.COLOR_CYAN, curses.COLOR_BLACK)
+    curses.init_pair(3, curses.COLOR_CYAN, curses.COLOR_BLACK)
     curses.init_pair(4, curses.COLOR_GREEN, curses.COLOR_BLACK)
     curses.init_pair(5, curses.COLOR_YELLOW, curses.COLOR_BLACK)
     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)
+    col_altar = curses.color_pair(3)
     earth_colors = [
         curses.color_pair(4),
         curses.color_pair(5),
@@ -72,10 +76,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,12 +106,18 @@ 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
+                elif char == "$":
+                    attribute = col_altar
                 if char in charmap:
                     char = charmap[char]
                 elif char == "@":
@@ -122,6 +132,7 @@ def win_map(self):
 
 
 from client.config.world_data import world_data
+world_data["grace"] = 0
 world_data["kidney"] = 0
 world_data["stomach"] = 0
 world_data["bowel"] = 0
@@ -135,26 +146,37 @@ io["worldstate_read_order"] += [["bowel", "int"]]
 io["worldstate_read_order"] += [["bladder", "int"]]
 io["worldstate_read_order"] += [["wetmap", "map"]]
 io["worldstate_read_order"] += [["soundmap", "map"]]
+io["worldstate_read_order"] += [["grace", "int"]]
 from client.config.windows import windows_config
 from client.windows import win_log
 windows_config[:] = [
-    {"config": [0, -34],
+    {"config": [0, -33],
      "func": win_map,
-      "title": "The Crawling Eater"},
-    {"config": [1, 33],
+     "scroll_hints": False,
+      "title": "THE CRAWLING EATER"},
+    {"config": [1, 32],
      "func": win_bar_maker(77, "%", "stomach"),
+     "scroll_hints": False,
      "title": "stomach"},
-    {"config": [1, 33],
+    {"config": [1, 32],
      "func": win_bar_maker(79, "~", "kidney"),
+     "scroll_hints": False,
       "title": "kidney"},
-    {"config": [1, 33],
+    {"config": [1, 32],
      "func": win_bar_maker(78, "%", "bowel"),
+     "scroll_hints": False,
      "title": "bowel"},
-    {"config": [1, 33],
+    {"config": [1, 32],
      "func": win_bar_maker(80, "~", "bladder"),
+     "scroll_hints": False,
       "title": "bladder"},
-    {"config": [-8, 33],
+    {"config": [1, 32],
+     "func": win_bar_maker(76, "+", "grace"),
+     "scroll_hints": False,
+      "title": "grace"},
+    {"config": [-10, 32],
      "func": win_log,
+     "scroll_hints": False,
      "title": "log"}
 ]
 from client.window_management import set_windows