TCE: Minor refactor of client coloring.

[plomrogue] / plugins / client / TheCrawlingEater.py

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index 3e95e524317654310b88c426891892185473ec7c..c91f16dc89a58b7b668c85db2f0cb874f4b2f3bb 100644 (file)
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -61,7 +61,6 @@ def win_map(self):
     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 = [
@@ -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")
@@ -128,12 +124,14 @@ 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[:] = [
@@ -143,12 +141,12 @@ windows_config[:] = [
     {"config": [1, 33],
      "func": win_bar_maker(77, "%", "stomach"),
      "title": "stomach"},
-    {"config": [1, 33],
-     "func": win_bar_maker(78, "%", "bowel"),
-     "title": "bowel"},
     {"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"},
@@ -163,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"),)