X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/static/git-favicon.png?a=blobdiff_plain;f=client_prototype.py;h=a398822241b635c656170b6d91c11504667fd3a8;hb=dfa13933d877a92982f747a69defee4f2d8f1f7e;hp=2fc7a44aa164261dadb5a7f2d6525076f6575940;hpb=ab7a32f5b502d7424edab86f9ee1c57bba00a70a;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 2fc7a44..a398822 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -298,15 +298,27 @@ def win_foo():
 
 
 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["position"][i] * (i + 1) > win_size[i] / 2:
+            if world_data["position"][i] * (i + 1) \
+                < world_data["map_size"] * (i + 1) - win_size[i] / 2:
+                offset[i] = world_data["position"][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 char == " ":
                 char = world_data["mem_map"][y * world_data["map_size"] + x]
-                attribute = curses.A_REVERSE
+                attribute = curses.color_pair(1) if char == " " \
+                    else curses.color_pair(2)
                 winmap += [(char, attribute), (" ", attribute)]
             else:
                 winmap += char + " "