X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=70b6649f1c0f5d9cc15796d5131b5fba5996f9ae;hb=7d0f78a38b268446ad5d62b1e388487d3e3e121f;hp=a398822241b635c656170b6d91c11504667fd3a8;hpb=dfa13933d877a92982f747a69defee4f2d8f1f7e;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index a398822..70b6649 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -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"]): @@ -279,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() @@ -301,10 +310,10 @@ 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) \ + 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["position"][i] * (i + 1) \ + 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 @@ -315,6 +324,13 @@ def win_map(): 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 == " " \ @@ -369,11 +385,57 @@ 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}, @@ -387,20 +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_center": [-1, -1], "map_size": 0, "mem_map": "", - "position": [-1, -1], "satiation": -1, "turn": -1 }