TCE: Add movement sound mapping.

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index ffa630e1de7a9f3f66bef853b80fa54a769ed797..1123af2c2ca962249f059273d16f4d3f1690d88a 100644 (file)
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -89,7 +89,10 @@ def win_map(self):
                     char = world_data["mem_map"][pos]
                 winmap += [(char, curses.A_REVERSE), ("?", curses.A_REVERSE)]
                 continue
+            bonus = " "
             if char == " ":
+                if world_data["soundmap"][pos] != "0":
+                    bonus = "?"
                 char = world_data["mem_map"][pos]
                 if char == " ":
                     attribute = col_unknown
@@ -97,10 +100,8 @@ def win_map(self):
                     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"):
@@ -128,12 +129,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[:] = [

diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index 42f9d11956e696def0bc58ef76df19c1483d399b..b97328d1068f12aa3c2fb11fad5cb0467eae95cf 100644 (file)
--- a/plugins/server/TheCrawlingEater.py
+++ b/plugins/server/TheCrawlingEater.py
@@ -183,8 +183,7 @@ def actor_move(t):
         t["T_POSY"] = move_result[1]
         t["T_POSX"] = move_result[2]
         t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
-        #if t != world_db["Things"][0]:
-        #    world_db["Things"][0]["T_MEMMAP"][t["pos"]] = ord("?")
+        world_db["soundmap"][t["pos"]] = ord("9")
     elif t == world_db["Things"][0]:
         log("You try to MOVE there, but fail.")
 
@@ -354,6 +353,9 @@ def turn_over():
                 world_db["wetmap"][pos] += 1
                 positions_to_wet.remove(pos)
                 world_db["HUMIDITY"] -= 1
+        for pos in range(world_db["MAP_LENGTH"] ** 2):
+            if world_db["soundmap"][pos] > ord("0"):
+                world_db["soundmap"][pos] -= 1
         world_db["TURN"] += 1
         io_db["worldstate_updateable"] = True
         try_worldstate_update()
@@ -383,15 +385,42 @@ def play_wait():
         world_db["set_command"]("wait")
 
 
-def save_wetmap():
+def save_maps():
     length = world_db["MAP_LENGTH"]
     string = ""
     for i in range(length):
         line = world_db["wetmap"][i * length:(i * length) + length].decode()
         string = string + "WETMAP" + " "  + str(i) + " " + line + "\n"
+    for i in range(length):
+        line = world_db["soundmap"][i * length:(i * length) + length].decode()
+        string = string + "SOUNDMAP" + " "  + str(i) + " " + line + "\n"
     return string
 
 
+def soundmapset(str_int, mapline):
+    def valid_map_line(str_int, mapline):
+        from server.utils import integer_test
+        val = integer_test(str_int, 0, 255)
+        if None != val:
+            if val >= world_db["MAP_LENGTH"]:
+                print("Illegal value for map line number.")
+            elif len(mapline) != world_db["MAP_LENGTH"]:
+                print("Map line length is unequal map width.")
+            else:
+                return val
+        return None
+    val = valid_map_line(str_int, mapline)
+    if None != val:
+        length = world_db["MAP_LENGTH"]
+        if not world_db["soundmap"]:
+            m = bytearray(b' ' * (length ** 2))
+        else:
+            m = world_db["soundmap"]
+        m[val * length:(val * length) + length] = mapline.encode()
+        if not world_db["soundmap"]:
+            world_db["soundmap"] = m
+
+
 def wetmapset(str_int, mapline):
     def valid_map_line(str_int, mapline):
         from server.utils import integer_test
@@ -415,6 +444,13 @@ def wetmapset(str_int, mapline):
         if not world_db["wetmap"]:
             world_db["wetmap"] = m
 
+
+def write_soundmap():
+    from server.worldstate_write_helpers import write_map
+    length = world_db["MAP_LENGTH"]
+    return write_map(world_db["soundmap"], world_db["MAP_LENGTH"])
+
+
 def write_wetmap():
     from server.worldstate_write_helpers import write_map
     length = world_db["MAP_LENGTH"]
@@ -683,6 +719,7 @@ io_db["worldstate_write_order"] += [["T_KIDNEY", "player_int"]]
 io_db["worldstate_write_order"] += [["T_BOWEL", "player_int"]]
 io_db["worldstate_write_order"] += [["T_BLADDER", "player_int"]]
 io_db["worldstate_write_order"] += [[write_wetmap, "func"]]
+io_db["worldstate_write_order"] += [[write_soundmap, "func"]]
 import server.config.world_data
 server.config.world_data.symbols_hide = "345"
 server.config.world_data.symbols_passable = "012-"
@@ -690,12 +727,13 @@ server.config.world_data.thing_defaults["T_STOMACH"] = 16
 server.config.world_data.thing_defaults["T_BOWEL"] = 0
 server.config.world_data.thing_defaults["T_KIDNEY"] = 16
 server.config.world_data.thing_defaults["T_BLADDER"] = 0
+world_db["soundmap"] = bytearray(b"0" * world_db["MAP_LENGTH"] ** 2)
 world_db["wetmap"] = bytearray(b"0" * world_db["MAP_LENGTH"] ** 2)
 if not "NEW_SPAWN" in world_db:
     world_db["NEW_SPAWN"] = 0
 if not "HUMIDITY" in world_db:
     world_db["HUMIDITY"] = 0
-io_db["hook_save"] = save_wetmap
+io_db["hook_save"] = save_maps
 import server.config.make_world_helpers
 server.config.make_world_helpers.make_map = make_map
 from server.config.commands import commands_db
@@ -716,6 +754,7 @@ commands_db["T_KIDNEY"] = (1, False, setter("Thing", "T_KIDNEY", 0, 255))
 commands_db["T_BOWEL"] = (1, False, setter("Thing", "T_BOWEL", 0, 255))
 commands_db["T_BLADDER"] = (1, False, setter("Thing", "T_BLADDER", 0, 255))
 commands_db["WETMAP"] = (2, False, wetmapset)
+commands_db["SOUNDMAP"] = (2, False, soundmapset)
 from server.actions import actor_wait
 import server.config.actions
 server.config.actions.action_db = {