X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=ab91e9ab4f8f2373fde7e187127177a2d4b61b0b;hb=89ec3f0cbfd092942db51d2349ea4c2bb521b353;hp=815ae7eaed3d7bc10fde1530b197edf232d9825d;hpb=f90a635ac962646e62a829fe6dff437ad20ec8f9;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 815ae7e..ab91e9a 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -167,13 +167,32 @@ 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)
+    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 +204,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,18 +233,20 @@ 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()
 
 
 def foo():
-    winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
-    size = [4, 3]
+    #winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
+    #size = [4, 3]
+    winmap = str(world_data["turn"]).rjust(10)
+    size = [1, 10]
     offset = [0, 0]
     return offset, size, winmap
 
@@ -245,7 +266,8 @@ windows = [
 ]
 io = {
     "path_out": "server/in",
-    "path_in": "server/out"
+    "path_in": "server/out",
+    "path_worldstate": "server/worldstate"
 }
 commands = {
     "Q": command_quit
@@ -254,6 +276,9 @@ message_queue = {
     "open_end": False,
     "messages": []
 }
+world_data = {
+    "turn": -1
+}
 sep_size = 1  # Width of inter-window borders and title bars.
 stdscr = None
 screen_size = [0,0]
@@ -272,9 +297,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: