X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;ds=sidebyside;f=client_prototype.py;h=cf8aea63399feb23c1b2278f0d7bff453af4db1d;hb=f6b3078f4e3aea23f310e863c05a21d31c60cb2e;hp=582df073688bd4a9a7f43314a30ae820cc51768a;hpb=177f9281c875a37b62793771e5b38564faac0e89;p=plomrogue
diff --git a/client_prototype.py b/client_prototype.py
index 582df07..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 ."""
+ """Workaround for ."""
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)
@@ -209,8 +209,11 @@ 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"]):
@@ -298,15 +301,34 @@ 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["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.A_REVERSE
+ attribute = curses.color_pair(1) if char == " " \
+ else curses.color_pair(2)
winmap += [(char, attribute), (" ", attribute)]
else:
winmap += char + " "
@@ -362,6 +384,10 @@ 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},
@@ -375,6 +401,7 @@ io = {
"path_worldstate": "server/worldstate"
}
commands = {
+ "l": command_toggle_look_mode,
"Q": command_quit
}
message_queue = {
@@ -382,13 +409,15 @@ message_queue = {
"messages": []
}
world_data = {
+ "avatar_position": [-1, -1],
"fov_map": "",
"inventory": [],
"lifepoints": -1,
+ "look_mode": False,
"log": [],
+ "map_center": [-1, -1],
"map_size": 0,
"mem_map": "",
- "position": [-1, -1],
"satiation": -1,
"turn": -1
}