X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=56c0044f15603a35b695c74ea7e80f78c379be55;hb=225927eddf3c5b50d1dc6d30e87031bf93a7bac5;hp=b08899a5a67d40c4ab8aafcacc7012732578898c;hpb=48f541330d16b71141136d929b78a44a7afeb5d5;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index b08899a..56c0044 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -26,7 +26,8 @@ def prep_library(): """Prepare ctypes library at ./libplomrogue.so""" libpath = ("./libplomrogue.so") if not os.access(libpath, os.F_OK): - raise SystemExit("No library " + libpath + ", run ./compile.sh first?") + raise SystemExit("No library " + libpath + + ", run ./compile-server.sh first?") libpr = ctypes.cdll.LoadLibrary(libpath) libpr.seed_rrand.argtypes = [ctypes.c_uint8, ctypes.c_uint32] libpr.seed_rrand.restype = ctypes.c_uint32 @@ -42,14 +43,23 @@ def prep_library(): libpr.build_fov_map.argtypes = [ctypes.c_uint8, ctypes.c_uint8, ctypes.c_char_p, ctypes.c_char_p] libpr.build_fov_map.restype = ctypes.c_uint8 + libpr.init_score_map.restype = ctypes.c_uint8 + libpr.set_map_score.argtypes = [ctypes.c_uint16, ctypes.c_uint16] + libpr.set_map_score.restype = ctypes.c_uint8 + libpr.get_map_score.argtypes = [ctypes.c_uint16] + libpr.get_map_score.restype = ctypes.c_int32 + libpr.get_neighbor_score.argtypes = [ctypes.c_uint8] + libpr.get_neighbor_score.restype = ctypes.c_uint16 + libpr.ready_neighbor_scores.argtpes = [ctypes.c_uint16] + libpr.ready_neighbor_scores.restype = ctypes.c_uint8 + libpr.dijkstra_map.restype = ctypes.c_uint8 return libpr def strong_write(file, string): - """Apply write(string), flush(), and os.fsync() to file.""" + """Apply write(string), then flush().""" file.write(string) file.flush() - os.fsync(file) def setup_server_io(): @@ -69,6 +79,9 @@ def setup_server_io(): if os.access(path_tmp, os.F_OK): raise SystemExit(msg) io_db["teststring"] = str(os.getpid()) + " " + str(time.time()) + io_db["save_wait"] = 0 + io_db["verbose"] = False + io_db["record_chunk"] = "" os.makedirs(io_db["path_server"], exist_ok=True) io_db["file_out"] = open(io_db["path_out"], "w") strong_write(io_db["file_out"], io_db["teststring"] + "\n") @@ -86,11 +99,11 @@ def cleanup_server_io(): def helper(file_key, path_key): if file_key in io_db: io_db[file_key].close() - if not io_db["kicked_by_rival"] \ - and os.access(io_db[path_key], os.F_OK): - os.remove(io_db[path_key]) - helper("file_out", "path_out") + if not io_db["kicked_by_rival"] \ + and os.access(io_db[path_key], os.F_OK): + os.remove(io_db[path_key]) helper("file_in", "path_in") + helper("file_out", "path_out") helper("file_worldstate", "path_worldstate") if "file_record" in io_db: io_db["file_record"].close() @@ -103,12 +116,15 @@ def obey(command, prefix, replay=False, do_record=False): a non-meta command from the commands_db merely triggers obey() on the next command from the records file. If not, non-meta commands set io_db["worldstate_updateable"] to world_db["WORLD_EXISTS"], and, if - do_record is set, are recorded via record(), and save_world() is called. - The prefix string is inserted into the server's input message between its - beginning 'input ' & ':'. All activity is preceded by a server_test() call. + do_record is set, are recorded to io_db["record_chunk"], and save_world() + is called (and io_db["record_chunk"] written) if 15 seconds have passed + since the last time it was called. The prefix string is inserted into the + server's input message between its beginning 'input ' and ':'. All activity + is preceded by a server_test() call. """ server_test() - print("input " + prefix + ": " + command) + if io_db["verbose"]: + print("input " + prefix + ": " + command) try: tokens = shlex.split(command, comments=True) except ValueError as err: @@ -130,8 +146,13 @@ def obey(command, prefix, replay=False, do_record=False): else: commands_db[tokens[0]][2](*tokens[1:]) if do_record: - record(command) - save_world() + io_db["record_chunk"] += command + "\n" + if time.time() > io_db["save_wait"] + 15: + atomic_write(io_db["path_record"], io_db["record_chunk"], + do_append=True) + save_world() + io_db["record_chunk"] = "" + io_db["save_wait"] = time.time() io_db["worldstate_updateable"] = world_db["WORLD_ACTIVE"] elif 0 != len(tokens): print("Invalid command/argument, or bad number of tokens.") @@ -153,17 +174,8 @@ def atomic_write(path, text, do_append=False): os.rename(path_tmp, path) -def record(command): - """Append command string plus newline to record file. (Atomic.)""" - # This misses some optimizations from the original record(), namely only - # finishing the atomic write with expensive flush() and fsync() every 15 - # seconds unless explicitely forced. Implement as needed. - atomic_write(io_db["path_record"], command + "\n", do_append=True) - - def save_world(): """Save all commands needed to reconstruct current world state.""" - # TODO: Misses same optimizations as record() from the original record(). def quote(string): string = string.replace("\u005C", '\u005C\u005C') @@ -244,6 +256,7 @@ def parse_command_line_arguments(): parser = argparse.ArgumentParser() parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1, action='store') + parser.add_argument('-v', dest='verbose', action='store_true') opts, unknown = parser.parse_known_args() return opts @@ -622,8 +635,9 @@ def actor_move(t): world_db["Things"][id]["T_POSY"] = move_result[1] world_db["Things"][id]["T_POSX"] = move_result[2] build_fov_map(t) - strong_write(io_db["file_out"], "LOG You move " + dir + ".\n") - else: + if t == world_db["Things"][0]: + strong_write(io_db["file_out"], "LOG You move " + dir + ".\n") + elif t == world_db["Things"][0]: strong_write(io_db["file_out"], "LOG You fail to move " + dir + ".\n") @@ -755,9 +769,181 @@ def hunger(t): decrement_lifepoints(t) -def get_dir_to_nearest_target(t, c): - # Dummy - return False +def get_dir_to_target(t, filter): + """Try to set T_COMMAND/T_ARGUMENT for move to "filter"-determined target. + + The path-wise nearest target is chosen, via the shortest available path. + Target must not be t. On succcess, return positive value, else False. + Filters: + "a": Thing in FOV is below a certain distance, animate, but of ThingType + that is not t's, and starts out weaker than t is; build path as + avoiding things of t's ThingType + "f": neighbor cell (not inhabited by any animate Thing) further away from + animate Thing not further than x steps away and in FOV and of a + ThingType that is not t's, and starts out stronger or as strong as t + is currently; or (cornered), if no such flight cell, but Thing of + above criteria is too near,1 a cell closer to it, or, if less near, + just wait + "c": Thing in memorized map is consumable + "s": memory map cell with greatest-reachable degree of unexploredness + """ + + def set_map_score(pos, score): + test = libpr.set_map_score(pos, score) + if test: + raise RuntimeError("No score map allocated for set_map_score().") + + def get_map_score(pos): + result = libpr.get_map_score(pos) + if result < 0: + raise RuntimeError("No score map allocated for get_map_score().") + return result + + def seeing_thing(): + if t["fovmap"] and ("a" == filter or "f" == filter): + for id in world_db["Things"]: + Thing = world_db["Things"][id] + if Thing != t and Thing["T_LIFEPOINTS"] and \ + t["T_TYPE"] != Thing["T_TYPE"] and \ + 'v' == chr(t["fovmap"][(Thing["T_POSY"] + * world_db["MAP_LENGTH"]) + + Thing["T_POSX"]]): + ThingType = world_db["ThingTypes"][Thing["T_TYPE"]] + if ("f" == filter and ThingType["TT_LIFEPOINTS"] >= + t["T_LIFEPOINTS"]) \ + or ("a" == filter and ThingType["TT_LIFEPOINTS"] < + t["T_LIFEPOINTS"]): + return True + elif t["T_MEMMAP"] and "c" == filter: + for mt in t["T_MEMTHING"]: + if ' ' != chr(t["T_MEMMAP"][(mt[1] * world_db["MAP_LENGTH"]) + + mt[2]]) \ + and world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]: + return True + return False + + def init_score_map(): + test = libpr.init_score_map() + if test: + raise RuntimeError("Malloc error in init_score_map().") + for i in [i for i in range(world_db["MAP_LENGTH"] ** 2) + if '.' == chr(t["T_MEMMAP"][i])]: + set_map_score(i, 65535 - 1) + if "a" == filter: + for id in world_db["Things"]: + Thing = world_db["Things"][id] + pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] \ + + Thing["T_POSX"] + if t != Thing and Thing["T_LIFEPOINTS"] and \ + t["T_TYPE"] != Thing["T_TYPE"] and \ + 'v' == chr(t["fovmap"][pos]) and \ + t["T_LIFEPOINTS"] > \ + world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]: + set_map_score(pos, 0) + elif t["T_TYPE"] == Thing["T_TYPE"]: + set_map_score(pos, 65535) + elif "f" == filter: + for id in [id for id in world_db["Things"] + if world_db["Things"][id]["T_LIFEPOINTS"]]: + Thing = world_db["Things"][id] + pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] \ + + Thing["T_POSX"] + if t["T_TYPE"] != Thing["T_TYPE"] and \ + 'v' == chr(t["fovmap"][pos]) and \ + t["T_LIFEPOINTS"] <= \ + world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]: + set_map_score(pos, 0) + elif "c" == filter: + for mt in [mt for mt in t["T_MEMTHING"] + if ' ' != chr(t["T_MEMMAP"][mt[1] + * world_db["MAP_LENGTH"] + + mt[2]]) + if world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]]: + set_map_score(mt[1] * world_db["MAP_LENGTH"] + mt[2], 0) + elif "s" == filter: + for i in [i for i in range(world_db["MAP_LENGTH"] ** 2) + if t["T_MEMDEPTHMAP"][i] == mem_depth_c[0]]: + set_map_score(i, 0) + + def rand_target_dir(neighbors, cmp, dirs): + candidates = [] + n_candidates = 0 + for i in range(len(dirs)): + if cmp == neighbors[i]: + candidates.append(dirs[i]) + n_candidates += 1 + return candidates[rand.next() % n_candidates] if n_candidates else 0 + + def get_neighbor_scores(dirs, eye_pos): + scores = [] + if libpr.ready_neighbor_scores(eye_pos): + raise RuntimeError("No score map allocated for " + + "ready_neighbor_scores.()") + for i in range(len(dirs)): + scores.append(libpr.get_neighbor_score(i)) + return scores + + def get_dir_from_neighbors(): + dir_to_target = False + dirs = "edcxsw" + eye_pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"] + neighbors = get_neighbor_scores(dirs, eye_pos) + if "f" == filter: + inhabited = [world_db["Things"][id]["T_POSY"] + * world_db["MAP_LENGTH"] + + world_db["Things"][id]["T_POSX"] + for id in world_db["Things"] + if world_db["Things"][id]["T_LIFEPOINTS"]] + for i in range(len(dirs)): + mv_yx_in_dir_legal(dirs[i], t["T_POSY"], t["T_POSX"]) + pos_cmp = libpr.result_y() * world_db["MAP_LENGTH"] \ + + libpr.result_x() + for pos in [pos for pos in inhabited if pos == pos_cmp]: + neighbors[i] = 65535 + break + minmax_start = 0 if "f" == filter else 65535 - 1 + minmax_neighbor = minmax_start + for i in range(len(dirs)): + if ("f" == filter and get_map_score(eye_pos) < neighbors[i] and + minmax_neighbor < neighbors[i] and 65535 != neighbors[i]) \ + or ("f" != filter and minmax_neighbor > neighbors[i]): + minmax_neighbor = neighbors[i] + if minmax_neighbor != minmax_start: + dir_to_target = rand_target_dir(neighbors, minmax_neighbor, dirs) + if "f" == filter: + if not dir_to_target: + if 1 == get_map_score(eye_pos): + dir_to_target = rand_target_dir(neighbors, 0, dirs) + elif 3 >= get_map_score(eye_pos): + t["T_COMMAND"] = [id for id in world_db["ThingActions"] + if + world_db["ThingActions"][id]["TA_NAME"] + == "wait"][0] + return 1 + elif dir_to_target and 3 < get_map_score(eye_pos): + dir_to_target = 0 + elif "a" == filter and 10 <= get_map_score(eye_pos): + dir_to_target = 0 + return dir_to_target + + dir_to_target = False + mem_depth_c = b' ' + run_i = 9 + 1 if "s" == filter else 1 + while run_i and not dir_to_target and ("s" == filter or seeing_thing()): + run_i -= 1 + init_score_map() + mem_depth_c = b'9' if b' ' == mem_depth_c \ + else bytes([mem_depth_c[0] - 1]) + if libpr.dijkstra_map(): + raise RuntimeError("No score map allocated for dijkstra_map().") + dir_to_target = get_dir_from_neighbors() + libpr.free_score_map() + if dir_to_target and str == type(dir_to_target): + t["T_COMMAND"] = [id for id in world_db["ThingActions"] + if world_db["ThingActions"][id]["TA_NAME"] + == "move"][0] + t["T_ARGUMENT"] = ord(dir_to_target) + return dir_to_target def standing_on_consumable(t): @@ -798,7 +984,7 @@ def ai(t): """ t["T_COMMAND"] = [id for id in world_db["ThingActions"] if world_db["ThingActions"][id]["TA_NAME"] == "wait"][0] - if not get_dir_to_nearest_target(t, "f"): + if not get_dir_to_target(t, "f"): sel = get_inventory_slot_to_consume(t) if -1 != sel: t["T_COMMAND"] = [id for id in world_db["ThingActions"] @@ -809,9 +995,9 @@ def ai(t): t["T_COMMAND"] = [id for id in world_db["ThingActions"] if world_db["ThingActions"][id]["TA_NAME"] == "pick_up"][0] - elif (not get_dir_to_nearest_target(t, "c")) and \ - (not get_dir_to_nearest_target(t, "a")): - get_dir_to_nearest_target(t, "s") + elif (not get_dir_to_target(t, "c")) and \ + (not get_dir_to_target(t, "a")): + get_dir_to_target(t, "s") def turn_over(): @@ -819,9 +1005,10 @@ def turn_over(): id = 0 whilebreaker = False while world_db["Things"][0]["T_LIFEPOINTS"]: - for id in [id for id in world_db["Things"]]: - if not id in world_db["Things"]: # Thing may have been consumed - continue # during turn … + for id in [id for id in world_db["Things"]]: # Only what's from start! + if not id in world_db["Things"] or \ + world_db["Things"][id]["carried"]: # May have been consumed or + continue # picked up during turn … Thing = world_db["Things"][id] if Thing["T_LIFEPOINTS"]: if not Thing["T_COMMAND"]: @@ -830,7 +1017,6 @@ def turn_over(): whilebreaker = True break ai(Thing) - Thing["T_COMMAND"] = 1 try_healing(Thing) Thing["T_PROGRESS"] += 1 taid = [a for a in world_db["ThingActions"] @@ -912,6 +1098,8 @@ def command_ping(): def command_quit(): """Abort server process.""" + save_world() + atomic_write(io_db["path_record"], io_db["record_chunk"], do_append=True) raise SystemExit("received QUIT command") @@ -926,7 +1114,6 @@ def command_thingshere(str_y, str_x): strong_write(io_db["file_out"], "THINGS_HERE START\n") if "v" == chr(world_db["Things"][0]["fovmap"][pos]): for id in world_db["Things"]: - # write_thing_if_here() if y == world_db["Things"][id]["T_POSY"] \ and x == world_db["Things"][id]["T_POSX"] \ and not world_db["Things"][id]["carried"]: @@ -1105,7 +1292,7 @@ def command_worldactive(worldactive_string): if world_db["Things"][id]["T_LIFEPOINTS"]: build_fov_map(world_db["Things"][id]) if 0 == id: - update_map_memory(world_db["Things"][id]) + update_map_memory(world_db["Things"][id], False) world_db["WORLD_ACTIVE"] = 1 @@ -1427,8 +1614,10 @@ io_db = { try: libpr = prep_library() rand = RandomnessIO() - opts = parse_command_line_arguments() setup_server_io() + opts = parse_command_line_arguments() + if opts.verbose: + io_db["verbose"] = True if None != opts.replay: replay_game() else: