X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=41693d80273251f20b19028624d613dbc5d0c520;hb=151f73dab0a496254f71a95506e46e055e81dbc7;hp=a6256294c40a8c0ecb3b19cc53ee836658789018;hpb=07aa70614961f46cf93830f2f3d7a33f9c4ef6c1;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index a625629..41693d8 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -85,6 +85,16 @@ def set_window_geometries(): def draw_screen(): + def healthy_addch(y, x, char, attr=0): + """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) + stdscr.insstr(y, x - 1, " ") + stdscr.addch(y, x - 1, char_before) + else: + stdscr.addch(y, x, char, attr) + def draw_window_border_lines(): for win in windows: for k in range(2): @@ -95,9 +105,9 @@ def draw_screen(): end = win["start"][k] + win["size"][k] end = end if end < screen_size[k] else screen_size[k] if k: - [stdscr.addch(j, i, '-') for i in range(start, end)] + [healthy_addch(j, i, '-') for i in range(start, end)] else: - [stdscr.addch(i, j, '|') for i in range(start, end)] + [healthy_addch(i, j, '|') for i in range(start, end)] def draw_window_border_corners(): for win in windows: @@ -107,14 +117,14 @@ def draw_screen(): right = win["start"][1] + win["size"][1] if (up >= 0 and up < screen_size[0]): if (left >= 0 and left < screen_size[1]): - stdscr.addch(up, left, '+') + healthy_addch(up, left, '+') if (right >= 0 and right < screen_size[1]): - stdscr.addch(up, right, '+') + healthy_addch(up, right, '+') if (down >= 0 and down < screen_size[0]): if (left >= 0 and left < screen_size[1]): - stdscr.addch(down, left, '+') + healthy_addch(down, left, '+') if (right >= 0 and right < screen_size[1]): - stdscr.addch(down, right, '+') + healthy_addch(down, right, '+') def draw_window_contents(): def draw_winmap(): @@ -126,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]): - stdscr.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 + ' ' @@ -140,12 +154,12 @@ def draw_screen(): for j in range(win["size"][ni] - non_hint_space): pos_2 = win["start"][ni] + hint_offset + j x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) - stdscr.addch(y, x, hint[j], curses.A_REVERSE) + healthy_addch(y, x, hint[j], curses.A_REVERSE) def draw_scroll_arrows(ar1, ar2): for j in range(win["size"][ni]): pos_2 = win["start"][ni] + j x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) - stdscr.addch(y, x, ar1 if ni else ar2, curses.A_REVERSE) + healthy_addch(y, x, ar1 if ni else ar2, curses.A_REVERSE) for i in range(2): ni = int(i == 0) unit = 'rows' if ni else 'columns' @@ -163,7 +177,7 @@ def draw_screen(): draw_winmap() draw_scroll_hints() - stdscr.clear() + stdscr.erase() draw_window_border_lines() draw_window_border_corners() draw_window_contents() @@ -195,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 @@ -257,9 +282,15 @@ def cursed_main(stdscr): draw_screen() cursed_main.redraw = False char = stdscr.getch() - if char >= 0 and chr(char) in commands: - commands[chr(char)]() - cursed_main.redraw = True + if char >= 0: + char = chr(char) + if char in commands: + if len(commands[char]) == 1 or not world_data["look_mode"]: + commands[char][0]() + cursed_main.redraw = True + else: + commands[char][1]() + cursed_main.redraw = True new_data_from_server = io["file_in"].read() ping_test() read_into_message_queue() @@ -268,12 +299,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] @@ -316,17 +385,63 @@ def win_log(): def command_quit(): - io["file_out"].write("QUIT\n") - io["file_out"].flush() + command_sender("QUIT")() raise SystemExit("Received QUIT command, forwarded to server, leaving.") +def command_toggle_look_mode(): + if not world_data["look_mode"]: + world_data["look_mode"] = True + else: + world_data["look_mode"] = False + world_data["map_center"] = world_data["avatar_position"] + + +def command_sender(string): + def command_send(): + io["file_out"].write(string + "\n") + io["file_out"].flush() + return command_send + + +def command_looker(string): + def command_look(): + if string == "west" \ + and world_data["map_center"][1] > 0: + world_data["map_center"][1] -= 1 + elif string == "east" \ + and world_data["map_center"][1] < world_data["map_size"] - 1: + world_data["map_center"][1] += 1 + else: + y_unevenness = world_data["map_center"][0] % 2 + y_evenness = int(not(y_unevenness)) + if string[6:] == "west" and \ + world_data["map_center"][1] > -y_unevenness: + if string[:5] == "north" and world_data["map_center"][0] > 0: + world_data["map_center"][0] -= 1 + world_data["map_center"][1] -= y_evenness + if string[:5] == "south" and world_data["map_center"][0] \ + < world_data["map_size"] - 1: + world_data["map_center"][0] += 1 + world_data["map_center"][1] -= y_evenness + elif string[6:] == "east" and world_data["map_center"][1] \ + < world_data["map_size"] - y_unevenness: + if string[:5] == "north" and world_data["map_center"][0] > 0: + world_data["map_center"][0] -= 1 + world_data["map_center"][1] += y_unevenness + if string[:5] == "south" and world_data["map_center"][0] \ + < world_data["map_size"] - 1: + world_data["map_center"][0] += 1 + world_data["map_center"][1] += y_unevenness + return command_look + + 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", @@ -334,18 +449,29 @@ io = { "path_worldstate": "server/worldstate" } commands = { - "Q": command_quit + "Q": (command_quit,), + "c": (command_sender("move south-east"), command_looker("south-east")), + "d": (command_sender("move east"), command_looker("east")), + "e": (command_sender("move north-east"), command_looker("north-east")), + "l": (command_toggle_look_mode,), + "s": (command_sender("move west"), command_looker("west")), + "w": (command_sender("move north-west"), command_looker("north-west")), + "x": (command_sender("move south-west"), command_looker("south-west")), } message_queue = { "open_end": False, "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 }