X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;f=client_prototype.py;h=cf8aea63399feb23c1b2278f0d7bff453af4db1d;hb=f6b3078f4e3aea23f310e863c05a21d31c60cb2e;hp=1fd3061a23b62bc468b14a702d9a0188835f9318;hpb=3d023370bff381684e545b1fd232401d69ff9968;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 1fd3061..cf8aea6 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -86,7 +86,7 @@ def set_window_geometries():
 def draw_screen():
 
     def healthy_addch(y, x, char, attr=0):
-    """Bizarre workaround for <http://stackoverflow.com/questions/7063128/>."""
+        """Workaround for <http://stackoverflow.com/questions/7063128/>."""
         if y == screen_size[0] - 1 and x == screen_size[1] - 1:
             char_before = stdscr.inch(y, x - 1)
             stdscr.addch(y, x - 1, char, attr)
@@ -136,11 +136,15 @@ def draw_screen():
             for y in range(offset[0], stop[0]):
                 for x in range(offset[1], stop[1]):
                     cell = winmap[y * winmap_size[1] + x]
+                    attr = 0
+                    if len(cell) > 1:
+                        attr = cell[1]
+                        cell = cell[0]
                     y_in_screen = win["start"][0] + (y - offset[0])
                     x_in_screen = win["start"][1] + (x - offset[1])
                     if (y_in_screen < screen_size[0]
                             and x_in_screen < screen_size[1]):
-                        healthy_addch(y_in_screen, x_in_screen, cell)
+                        healthy_addch(y_in_screen, x_in_screen, cell, attr)
         def draw_scroll_hints():
             def draw_scroll_string(n_lines_outside):
                 hint = ' ' + str(n_lines_outside + 1) + ' more ' + unit + ' '
@@ -205,9 +209,20 @@ def read_worldstate():
             if line == '%':
                 break
             world_data["inventory"] += [line]
-        world_data["position"][0] = int(worldstate_file.readline())
-        world_data["position"][1] = int(worldstate_file.readline())
+        world_data["avatar_position"][0] = int(worldstate_file.readline())
+        world_data["avatar_position"][1] = int(worldstate_file.readline())
+        if not world_data["look_mode"]:
+            world_data["map_center"][0] = world_data["avatar_position"][0]
+            world_data["map_center"][1] = world_data["avatar_position"][1]
         world_data["map_size"] = int(worldstate_file.readline())
+        world_data["fov_map"] = ""
+        for i in range(world_data["map_size"]):
+            line = worldstate_file.readline().replace("\n", "")
+            world_data["fov_map"] += line
+        world_data["mem_map"] = ""
+        for i in range(world_data["map_size"]):
+            line = worldstate_file.readline().replace("\n", "")
+            world_data["mem_map"] += line
     worldstate_file.close()
 read_worldstate.last_checked_mtime = -1
 
@@ -278,12 +293,50 @@ def cursed_main(stdscr):
 
 
 def win_foo():
-    winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
+    winmap = [('.', 0), ('o', 0), ('.', 0), ('o', 0), ('O', 0), ('o', 0),
+        ('.', 0), ('o', 0), ('.', 0), ('x', 0), ('y', 0), ('x', 0)]
     winmap_size = [4, 3]
     offset = [0, 0]
     return offset, winmap_size, winmap
 
 
+def win_map():
+    win_size = next(win["size"] for win in windows if win["func"] == win_map)
+    offset = [0, 0]
+    for i in range(2):
+        if world_data["map_center"][i] * (i + 1) > win_size[i] / 2:
+            if world_data["map_center"][i] * (i + 1) \
+                < world_data["map_size"] * (i + 1) - win_size[i] / 2:
+                offset[i] = world_data["map_center"][i] * (i + 1) \
+                    - int(win_size[i] / 2)
+            else:
+                offset[i] = world_data["map_size"] * (i + 1) - win_size[i] + i
+    winmap_size = [world_data["map_size"], world_data["map_size"] * 2 + 1]
+    winmap = []
+    curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLUE)
+    curses.init_pair(2, curses.COLOR_BLUE, curses.COLOR_BLACK)
+    for y in range(world_data["map_size"]):
+        for x in range(world_data["map_size"]):
+            char = world_data["fov_map"][y * world_data["map_size"] + x]
+            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"][y * world_data["map_size"] + x]
+                winmap += [(char, curses.A_REVERSE), (" ", curses.A_REVERSE)]
+                continue
+            if char == " ":
+                char = world_data["mem_map"][y * world_data["map_size"] + x]
+                attribute = curses.color_pair(1) if char == " " \
+                    else curses.color_pair(2)
+                winmap += [(char, attribute), (" ", attribute)]
+            else:
+                winmap += char + " "
+        if y % 2 == 0:
+            winmap += "  "
+    return offset, winmap_size, winmap
+
+
 def win_inventory():
     winmap = ""
     winmap_size = [0, 0]
@@ -331,12 +384,16 @@ def command_quit():
     raise SystemExit("Received QUIT command, forwarded to server, leaving.")
 
 
+def command_toggle_look_mode():
+    world_data["look_mode"] = False if world_data["look_mode"] else True
+
+
 windows = [
     {"config": [1, 33], "func": win_info},
     {"config": [-7, 33], "func": win_log},
     {"config": [4, 16], "func": win_inventory},
     {"config": [4, 16], "func": win_foo},
-    {"config": [0, -34], "func": win_foo}
+    {"config": [0, -34], "func": win_map}
 ]
 io = {
     "path_out": "server/in",
@@ -344,6 +401,7 @@ io = {
     "path_worldstate": "server/worldstate"
 }
 commands = {
+    "l": command_toggle_look_mode,
     "Q": command_quit
 }
 message_queue = {
@@ -351,11 +409,15 @@ message_queue = {
     "messages": []
 }
 world_data = {
+    "avatar_position": [-1, -1],
+    "fov_map": "",
     "inventory": [],
     "lifepoints": -1,
+    "look_mode": False,
     "log": [],
-    "map_size": -1,
-    "position": [-1, -1],
+    "map_center": [-1, -1],
+    "map_size": 0,
+    "mem_map": "",
     "satiation": -1,
     "turn": -1
 }