TCE: Minor refactor of client coloring.

[plomrogue] / plugins / client / TheCrawlingEater.py

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index 3d13d2c3d22e5af95c3f03fc1d4e3b74640cc96c..c91f16dc89a58b7b668c85db2f0cb874f4b2f3bb 100644 (file)
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -3,24 +3,21 @@
 # see the file NOTICE in the root directory of the PlomRogue source package.
 
 
-def win_bladder(self):
-    winmap = []
-    curses.init_pair(79, curses.COLOR_WHITE, curses.COLOR_BLUE)
-    for i in range(world_data["bladder"]):
-        winmap += [("~", curses.color_pair(79))]
-    winmap_size = [1, len(winmap)]
-    offset = [0, 0]
-    return offset, winmap_size, winmap
+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)
+curses.init_pair(80, curses.COLOR_BLACK, curses.COLOR_YELLOW)
 
 
-def win_bowel(self):
-    winmap = []
-    curses.init_pair(80, curses.COLOR_YELLOW, curses.COLOR_RED)
-    for i in range(world_data["bowel"]):
-        winmap += [("#", curses.color_pair(80))]
-    winmap_size = [1, len(winmap)]
-    offset = [0, 0]
-    return offset, winmap_size, winmap
+def win_bar_maker(color_number, symbol, title):
+    def win_bar(self):
+        winmap = []
+        for i in range(world_data[title]):
+            winmap += [(symbol, curses.color_pair(color_number))]
+        winmap_size = [1, len(winmap)]
+        offset = [0, 0]
+        return offset, winmap_size, winmap
+    return win_bar
 
 
 def win_map(self):
@@ -31,6 +28,7 @@ def win_map(self):
         "3": "%",
         "4": "#",
         "5": "X",
+        "-": "O",
     }
     win_size = self.size
     offset = [0, 0]
@@ -61,8 +59,9 @@ def win_map(self):
     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_mem = curses.color_pair(1)
+    col_creature = curses.color_pair(15)
     col_player = curses.color_pair(8)
     earth_colors = [
         curses.color_pair(4),
@@ -89,19 +88,16 @@ def win_map(self):
                     char = world_data["mem_map"][pos]
                 winmap += [(char, curses.A_REVERSE), ("?", curses.A_REVERSE)]
                 continue
+            bonus = " "
+            attribute = col_unknown
             if char == " ":
+                if world_data["soundmap"][pos] != "0":
+                    bonus = "?"
                 char = world_data["mem_map"][pos]
-                if char == " ":
-                    attribute = col_unknown
-                else:
-                    attribute = col_mem
                 if char in charmap:
                     char = charmap[char]
-                bonus = (" ", attribute)
                 winmap += [(char, attribute), bonus]
             else:
-                bonus = " "
-                attribute = col_unknown
                 wetval = ord(world_data["wetmap"][pos]) - ord("0")
                 if ord("0") <= ord(char) <= ord("5"):
                     mapval = ord(char) - ord("0")
@@ -112,7 +108,10 @@ def win_map(self):
                 if char in charmap:
                     char = charmap[char]
                 elif char == "@":
-                    attribute = col_player
+                    attribute = col_creature
+                    av_pos = world_data["avatar_position"]
+                    if pos == av_pos[0] * world_data["map_size"] + av_pos[1]:
+                        attribute = col_player
                 winmap += [(char, attribute), bonus]
         if y % 2 == 0:
             winmap += "  "
@@ -120,20 +119,40 @@ def win_map(self):
 
 
 from client.config.world_data import world_data
+world_data["kidney"] = 0
+world_data["stomach"] = 0
 world_data["bowel"] = 0
 world_data["bladder"] = 0
 world_data["wetmap"] = " " * (world_data["map_size"] ** 2)
+world_data["soundmap"] = " " * (world_data["map_size"] ** 2)
 from client.config.io import io
+io["worldstate_read_order"] += [["stomach", "int"]]
+io["worldstate_read_order"] += [["kidney", "int"]]
 io["worldstate_read_order"] += [["bowel", "int"]]
 io["worldstate_read_order"] += [["bladder", "int"]]
 io["worldstate_read_order"] += [["wetmap", "map"]]
+io["worldstate_read_order"] += [["soundmap", "map"]]
 from client.config.windows import windows_config
 from client.windows import win_log
 windows_config[:] = [
-    {"config": [0, -34], "func": win_map, "title": "The Crawling Eater"},
-    {"config": [1, 33], "func": win_bowel, "title": "bowel"},
-    {"config": [1, 33], "func": win_bladder, "title": "bladder"},
-    {"config": [-4, 33], "func": win_log, "title": "log"}
+    {"config": [0, -34],
+     "func": win_map,
+      "title": "The Crawling Eater"},
+    {"config": [1, 33],
+     "func": win_bar_maker(77, "%", "stomach"),
+     "title": "stomach"},
+    {"config": [1, 33],
+     "func": win_bar_maker(79, "~", "kidney"),
+      "title": "kidney"},
+    {"config": [1, 33],
+     "func": win_bar_maker(78, "%", "bowel"),
+     "title": "bowel"},
+    {"config": [1, 33],
+     "func": win_bar_maker(80, "~", "bladder"),
+      "title": "bladder"},
+    {"config": [-8, 33],
+     "func": win_log,
+     "title": "log"}
 ]
 from client.window_management import set_windows
 set_windows()
@@ -142,3 +161,7 @@ from client.config.commands import commands
 commands["S"] = (command_sender("drop"),)
 commands["D"] = (command_sender("drink"),)
 commands["P"] = (command_sender("pee"),)
+commands["1"] = (command_sender("HELP 1"),)
+commands["2"] = (command_sender("HELP 2"),)
+commands["3"] = (command_sender("HELP 3"),)
+commands["4"] = (command_sender("HELP 4"),)