X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;f=client_prototype.py;h=1801da1072f2cff77e5e1ca0e71420d5555c1ed8;hb=aad061535f0856757bcc84f64c6847cf11914ee6;hp=c828f7dee0ab584124630f52ca71fe56a17b2d20;hpb=56eea48c45b4702bc32a6615b676f7e8966089f4;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index c828f7d..1801da1 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -167,13 +167,34 @@ 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 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 +206,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]
@@ -218,17 +239,28 @@ def cursed_main(stdscr):
             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()
 
 
-def foo():
+def win_foo():
     winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
     size = [4, 3]
     offset = [0, 0]
     return offset, size, winmap
 
 
+def win_info():
+    size = [1, 33]
+    winmap = "T: " + str(world_data["turn"]) \
+        + " H: " + str(world_data["lifepoints"]) \
+        + " S: " + str(world_data["satiation"])
+    winmap = str(winmap).ljust(size[1])
+    offset = [0, 0]
+    return offset, size, winmap
+
+
 def command_quit():
     io["file_out"].write("QUIT\n")
     io["file_out"].flush()
@@ -236,15 +268,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_foo},
+    {"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
@@ -253,6 +286,11 @@ message_queue = {
     "open_end": False,
     "messages": []
 }
+world_data = {
+    "lifepoints": -1,
+    "satiation": -1,
+    "turn": -1
+}
 sep_size = 1  # Width of inter-window borders and title bars.
 stdscr = None
 screen_size = [0,0]
@@ -271,9 +309,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: