X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=client_prototype.py;h=6328c8b64990f5cb65157168139e136974109dcd;hb=5edd97c0cc10eb7421634be903851142fbdcbb91;hp=cf8aea63399feb23c1b2278f0d7bff453af4db1d;hpb=f6b3078f4e3aea23f310e863c05a21d31c60cb2e;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index cf8aea6..6328c8b 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -177,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() @@ -229,12 +229,31 @@ read_worldstate.last_checked_mtime = -1 def read_message_queue(): while (len(message_queue["messages"]) > 1 - or (len(message_queue["messages"]) == 0 + or (len(message_queue["messages"]) == 1 and not message_queue["open_end"])): message = message_queue["messages"].pop(0) - if message[0:4] == "LOG ": + if message == "THINGS_HERE START": + read_message_queue.parse_thingshere = True + world_data["look"] = [] + elif message == "THINGS_HERE END": + read_message_queue.parse_thingshere = False + if world_data["look"] == []: + world_data["look"] = ["(none known)"] + cursed_main.redraw = True + elif read_message_queue.parse_thingshere: + world_data["look"] += [message] + elif message[0:4] == "LOG ": world_data["log"] += [message[4:]] cursed_main.redraw = True + elif message == "WORLD_UPDATED": + query_mapcell() +read_message_queue.parse_thingshere = False + + +def query_mapcell(): + command_sender("THINGS_HERE " + str(world_data["map_center"][0]) + " " + + str(world_data["map_center"][1]))() + world_data["look"] = ["(polling)"] def cursed_main(stdscr): @@ -275,16 +294,22 @@ def cursed_main(stdscr): set_window_geometries() delay = 1 while True: - stdscr.timeout(delay) - delay = delay * 2 if delay < 1000 else delay + stdscr.timeout(int(delay)) + delay = delay * 1.1 if delay < 1000 else delay if cursed_main.redraw: delay = 1 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() @@ -292,14 +317,6 @@ def cursed_main(stdscr): read_message_queue() -def win_foo(): - 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] @@ -309,6 +326,8 @@ def win_map(): < world_data["map_size"] * (i + 1) - win_size[i] / 2: offset[i] = world_data["map_center"][i] * (i + 1) \ - int(win_size[i] / 2) + if i == 1: + offset[1] = offset[1] + world_data["map_center"][0] % 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] @@ -319,7 +338,7 @@ def win_map(): 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]: + and x == world_data["map_center"][1]: if char == " ": char = \ world_data["mem_map"][y * world_data["map_size"] + x] @@ -351,6 +370,34 @@ def win_inventory(): return offset, winmap_size, winmap +def win_look(): + winmap = "" + winmap_size = [0, 0] + for line in world_data["look"]: + winmap_size[1] = winmap_size[1] if len(line) <= winmap_size[1] \ + else len(line) + for line in world_data["look"]: + padding_size = winmap_size[1] - len(line) + winmap += line + (" " * padding_size) + winmap_size[0] = winmap_size[0] + 1 + offset = [0, 0] + return offset, winmap_size, winmap + + +def win_look(): + winmap = "" + winmap_size = [0, 0] + for line in world_data["look"]: + winmap_size[1] = winmap_size[1] if len(line) <= winmap_size[1] \ + else len(line) + for line in world_data["look"]: + padding_size = winmap_size[1] - len(line) + winmap += line + (" " * padding_size) + winmap_size[0] = winmap_size[0] + 1 + offset = [0, 0] + return offset, winmap_size, winmap + + def win_info(): winmap = "T: " + str(world_data["turn"]) \ + " H: " + str(world_data["lifepoints"]) \ @@ -379,20 +426,64 @@ 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(): - world_data["look_mode"] = False if world_data["look_mode"] else True + 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"] + query_mapcell() + + +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 + query_mapcell() + 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": [4, 16], "func": win_look}, {"config": [0, -34], "func": win_map} ] io = { @@ -401,8 +492,14 @@ io = { "path_worldstate": "server/worldstate" } commands = { - "l": command_toggle_look_mode, - "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, @@ -413,6 +510,7 @@ world_data = { "fov_map": "", "inventory": [], "lifepoints": -1, + "look": [], "look_mode": False, "log": [], "map_center": [-1, -1],