X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=f5fc336791e5245518da7503a54d72f3610b6a76;hb=87a95c28348a0d8ee25aa4c2faac3aebb39674c0;hp=41693d80273251f20b19028624d613dbc5d0c520;hpb=151f73dab0a496254f71a95506e46e055e81dbc7;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index 41693d8..f5fc336 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -128,6 +128,12 @@ def draw_screen(): def draw_window_contents(): def draw_winmap(): + """Draw winmap in area delimited by offset, winmap_size. + + The individuall cell of a winmap is interpreted as either a single + character element, or as a tuple of character and attribute, + depending on the size len(cell) spits out. + """ stop = [0, 0] for i in range(2): stop[i] = win["size"][i] + offset[i] @@ -229,12 +235,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,8 +300,8 @@ 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() @@ -298,14 +323,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] @@ -315,6 +332,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] @@ -325,7 +344,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] @@ -344,12 +363,42 @@ def win_map(): def win_inventory(): - winmap = "" - winmap_size = [0, 0] + win_size = next(win["size"] for win in windows + if win["func"] == win_inventory) + winmap = [] + winmap_size = [0, win_size[1]] for line in world_data["inventory"]: winmap_size[1] = winmap_size[1] if len(line) <= winmap_size[1] \ else len(line) + count = 0 for line in world_data["inventory"]: + padding_size = winmap_size[1] - len(line) + line += (" " * padding_size) + if count == world_data["inventory_selection"]: + line_new = [] + for x in range(len(line)): + line_new += [(line[x], curses.A_REVERSE)] + line = line_new + winmap += line + winmap_size[0] = winmap_size[0] + 1 + count += 1 + offset = [0, 0] + if world_data["inventory_selection"] > win_size[0]/2: + if world_data["inventory_selection"] < len(world_data["inventory"]) \ + - win_size[0]/2: + offset[0] = world_data["inventory_selection"] - int(win_size[0]/2) + else: + offset[0] = len(world_data["inventory"]) - win_size[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 @@ -395,11 +444,15 @@ def command_toggle_look_mode(): else: world_data["look_mode"] = False world_data["map_center"] = world_data["avatar_position"] + query_mapcell() -def command_sender(string): +def command_sender(string, int_field=None): def command_send(): - io["file_out"].write(string + "\n") + int_string = "" + if int_field: + int_string = " " + str(world_data[int_field]) + io["file_out"].write(string + int_string + "\n") io["file_out"].flush() return command_send @@ -433,14 +486,28 @@ def command_looker(string): < world_data["map_size"] - 1: world_data["map_center"][0] += 1 world_data["map_center"][1] += y_unevenness + query_mapcell() return command_look +def command_inventory_selector(string): + def command_inventory_select(): + logfile = open("logfile", "a") + logfile.write(string + "\n") + logfile.close() + if string == "up" and world_data["inventory_selection"] > 0: + world_data["inventory_selection"] -= 1 + elif string == "down" and world_data["inventory_selection"] \ + < len(world_data["inventory"]) - 1: + world_data["inventory_selection"] += 1 + return command_inventory_select + + 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 = { @@ -449,10 +516,16 @@ io = { "path_worldstate": "server/worldstate" } commands = { + "D": (command_sender("drop", "inventory_selection"),), + "P": (command_sender("pick_up"),), "Q": (command_quit,), + "U": (command_sender("use", "inventory_selection"),), + "W": (command_sender("wait"),), "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")), + "j": (command_inventory_selector("down"),), + "k": (command_inventory_selector("up"),), "l": (command_toggle_look_mode,), "s": (command_sender("move west"), command_looker("west")), "w": (command_sender("move north-west"), command_looker("north-west")), @@ -466,7 +539,9 @@ world_data = { "avatar_position": [-1, -1], "fov_map": "", "inventory": [], + "inventory_selection": 0, "lifepoints": -1, + "look": [], "look_mode": False, "log": [], "map_center": [-1, -1],