X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=8201a75db31b3898dede5e3df87a71769ef776fb;hb=7afd130c2f85eb46bdad2eee652c7e1ce71ca5bc;hp=815ae7eaed3d7bc10fde1530b197edf232d9825d;hpb=f90a635ac962646e62a829fe6dff437ad20ec8f9;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index 815ae7e..8201a75 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -1,4 +1,5 @@ import curses +import math import os import signal import time @@ -120,10 +121,11 @@ def draw_screen(): stop = [0, 0] for i in range(2): stop[i] = win["size"][i] + offset[i] - stop[i] = stop[i] if stop[i] < size[i] else size[i] + if stop[i] >= winmap_size[i]: + stop[i] = winmap_size[i] for y in range(offset[0], stop[0]): for x in range(offset[1], stop[1]): - cell = winmap[y * size[1] + x] + cell = winmap[y * winmap_size[1] + x] 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] @@ -151,12 +153,13 @@ def draw_screen(): pos_1 = win["start"][i] draw_scroll_arrows('^', '<') draw_scroll_string(offset[i]) - if (size[i] > offset[i] + win["size"][i]): + if (winmap_size[i] > offset[i] + win["size"][i]): pos_1 = win["start"][i] + win["size"][i] - 1 draw_scroll_arrows('v', '>') - draw_scroll_string(size[i] - offset[i] - win["size"][i]) + draw_scroll_string(winmap_size[i] - offset[i] + - win["size"][i]) for win in windows: - offset, size, winmap = win["func"]() + offset, winmap_size, winmap = win["func"]() draw_winmap() draw_scroll_hints() @@ -167,13 +170,44 @@ def draw_screen(): stdscr.refresh() +def read_worldstate(): + if not os.access(io["path_worldstate"], os.F_OK): + msg = "No world state file found at " + io["path_worldstate"] + "." + raise SystemExit(msg) + read_anew = False + worldstate_file = open(io["path_worldstate"], "r") + turn_string = worldstate_file.readline() + if int(turn_string) != world_data["turn"]: + read_anew = True + if not read_anew: # In rare cases, world may change, but not turn number. + mtime = os.stat(io["path_worldstate"]) + if mtime != read_worldstate.last_checked_mtime: + read_worldstate.last_checked_mtime = mtime + read_anew = True + if read_anew: + cursed_main.redraw = True + world_data["turn"] = int(turn_string) + world_data["lifepoints"] = int(worldstate_file.readline()) + world_data["satiation"] = int(worldstate_file.readline()) + worldstate_file.close() +read_worldstate.last_checked_mtime = -1 + + +def read_message_queue(): + while (len(message_queue["messages"]) > 1 + or (len(message_queue["messages"]) == 0 + and not message_queue["open_end"])): + message = message_queue["messages"].pop(0) + if message[0:4] == "LOG ": + world_data["log"] += [message[4:]] + cursed_main.redraw = True def cursed_main(stdscr): - def ping_test(server_answered): + def ping_test(): half_wait_time = 5 - if server_answered: + if len(new_data_from_server) > 0: ping_test.sent = False elif ping_test.wait_start + half_wait_time < time.time(): if not ping_test.sent: @@ -185,13 +219,13 @@ def cursed_main(stdscr): raise SystemExit("Server not answering anymore.") ping_test.wait_start = 0 - def read_into_message_queue(string): - if string == "": + def read_into_message_queue(): + if new_data_from_server == "": return new_open_end = False - if string[-1] is not "\n": + if new_data_from_server[-1] is not "\n": new_open_end = True - new_messages = string.splitlines() + new_messages = new_data_from_server.splitlines() if message_queue["open_end"]: message_queue["messages"][-1] += new_messages[0] del new_messages[0] @@ -214,20 +248,48 @@ def cursed_main(stdscr): draw_screen() cursed_main.redraw = False char = stdscr.getch() - if (char >= 0): - if chr(char) in commands: - commands[chr(char)]() - cursed_main.redraw = True + if char >= 0 and chr(char) in commands: + commands[chr(char)]() + cursed_main.redraw = True new_data_from_server = io["file_in"].read() - ping_test(len(new_data_from_server) > 0) - read_into_message_queue(new_data_from_server) + ping_test() + read_into_message_queue() + read_worldstate() + read_message_queue() -def foo(): +def win_foo(): winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x'] - size = [4, 3] + winmap_size = [4, 3] + offset = [0, 0] + return offset, winmap_size, winmap + + +def win_info(): + winmap = "T: " + str(world_data["turn"]) \ + + " H: " + str(world_data["lifepoints"]) \ + + " S: " + str(world_data["satiation"]) + winmap_size = [1, len(winmap)] offset = [0, 0] - return offset, size, winmap + return offset, winmap_size, winmap + + +def win_log(): + win_size = next(win["size"] for win in windows if win["func"] == win_log) + offset = [0, 0] + winmap = "" + number_of_lines = 0 + for line in world_data["log"]: + number_of_lines += math.ceil(len(line) / win_size[1]) + padding_size = win_size[1] - (len(line) % win_size[1]) + winmap += line + (padding_size * " ") + if number_of_lines < win_size[0]: + winmap = (" " * win_size[1] * (win_size[0] - number_of_lines)) + winmap + number_of_lines = win_size[0] + elif number_of_lines > win_size[0]: + offset[0] = number_of_lines - win_size[0] + winmap_size = [number_of_lines, win_size[1]] + return offset, winmap_size, winmap def command_quit(): @@ -237,15 +299,16 @@ def command_quit(): windows = [ - {"config": [1, 33], "func": foo}, - {"config": [-7, 33], "func": foo}, - {"config": [4, 16], "func": foo}, - {"config": [4, 16], "func": foo}, - {"config": [0, -34], "func": foo} + {"config": [1, 33], "func": win_info}, + {"config": [-7, 33], "func": win_log}, + {"config": [4, 16], "func": win_foo}, + {"config": [4, 16], "func": win_foo}, + {"config": [0, -34], "func": win_foo} ] io = { "path_out": "server/in", - "path_in": "server/out" + "path_in": "server/out", + "path_worldstate": "server/worldstate" } commands = { "Q": command_quit @@ -254,6 +317,12 @@ message_queue = { "open_end": False, "messages": [] } +world_data = { + "lifepoints": -1, + "log": [], + "satiation": -1, + "turn": -1 +} sep_size = 1 # Width of inter-window borders and title bars. stdscr = None screen_size = [0,0] @@ -272,9 +341,6 @@ except: print("SOMETHING WENT WRONG IN UNEXPECTED WAYS") raise finally: - logfile = open("log", "a") - logfile.write(str(message_queue)) - logfile.close() if "file_out" in io: io["file_out"].close() if "file_in" in io: