X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=roguelike-client;h=5d140640ac1a739ccda084f41f01aa6ae372f174;hb=9859bec5bd856c98f8d970966d867d99f6be9bf9;hp=8e18515354b05267c441b9349d9fff36ec4a41cc;hpb=9bcbd39430580783f9ec32a30d4998fca7309a20;p=plomrogue
diff --git a/roguelike-client b/roguelike-client
index 8e18515..5d14064 100755
--- a/roguelike-client
+++ b/roguelike-client
@@ -36,30 +36,30 @@ def read_worldstate():
read_worldstate.last_checked_mtime = mtime
read_anew = True
if read_anew:
+ # TODO: Hardcore order of necessary fields, ensure dependency order.
redraw_windows = True
world_data["turn"] = int(turn_string)
- world_data["lifepoints"] = int(worldstate_file.readline())
- world_data["satiation"] = int(worldstate_file.readline())
- world_data["inventory"] = []
- while True:
- line = worldstate_file.readline().replace("\n", "")
- if line == '%':
- break
- world_data["inventory"] += [line]
- world_data["avatar_position"][0] = int(worldstate_file.readline())
- world_data["avatar_position"][1] = int(worldstate_file.readline())
+ for entry in io["worldstate_read_order"]:
+ if entry[1] == "int":
+ if 2 == len(entry):
+ world_data[entry[0]] = int(worldstate_file.readline())
+ elif 3 == len(entry):
+ world_data[entry[0]][entry[2]] = \
+ int(worldstate_file.readline())
+ elif entry[1] == "lines":
+ world_data[entry[0]] = []
+ while True:
+ line = worldstate_file.readline().replace("\n", "")
+ if line == '%':
+ break
+ world_data[entry[0]] += [line]
+ elif entry[1] == "map":
+ world_data[entry[0]] = ""
+ for i in range(world_data["map_size"]):
+ line = worldstate_file.readline().replace("\n", "")
+ world_data[entry[0]] += line
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"]):
- line = worldstate_file.readline().replace("\n", "")
- world_data["fov_map"] += line
- world_data["mem_map"] = ""
- for i in range(world_data["map_size"]):
- line = worldstate_file.readline().replace("\n", "")
- world_data["mem_map"] += line
+ world_data["map_center"] = world_data["avatar_position"][:]
worldstate_file.close()
read_worldstate.last_checked_mtime = -1