X-Git-Url: https://plomlompom.com/repos/todo?a=blobdiff_plain;f=plugins%2Fserver%2FTheCrawlingEater.py;h=b97328d1068f12aa3c2fb11fad5cb0467eae95cf;hb=e826743a976ba3ea9fd47a9731c02612956368da;hp=5558e0bfb972855a00fc8c95c8c8b0d40589af45;hpb=246673e37355603c042088d55879a7160ea63c0e;p=plomrogue diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py index 5558e0b..b97328d 100644 --- a/plugins/server/TheCrawlingEater.py +++ b/plugins/server/TheCrawlingEater.py @@ -183,9 +183,7 @@ def actor_move(t): t["T_POSY"] = move_result[1] t["T_POSX"] = move_result[2] t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2] - build_fov_map(t) - #if t != world_db["Things"][0]: - # world_db["Things"][0]["T_MEMMAP"][t["pos"]] = ord("?") + world_db["soundmap"][t["pos"]] = ord("9") elif t == world_db["Things"][0]: log("You try to MOVE there, but fail.") @@ -275,6 +273,7 @@ def turn_over(): from server.io import try_worldstate_update from server.config.io import io_db from server.utils import rand + from server.build_fov_map import build_fov_map while world_db["Things"][0]["T_LIFEPOINTS"]: for tid in [tid for tid in world_db["Things"]]: if not tid in world_db["Things"]: @@ -285,6 +284,7 @@ def turn_over(): continue if not t["T_COMMAND"]: update_map_memory(t) + build_fov_map(t) if 0 == tid: return world_db["ai"](t) @@ -353,6 +353,9 @@ def turn_over(): world_db["wetmap"][pos] += 1 positions_to_wet.remove(pos) world_db["HUMIDITY"] -= 1 + for pos in range(world_db["MAP_LENGTH"] ** 2): + if world_db["soundmap"][pos] > ord("0"): + world_db["soundmap"][pos] -= 1 world_db["TURN"] += 1 io_db["worldstate_updateable"] = True try_worldstate_update() @@ -382,15 +385,42 @@ def play_wait(): world_db["set_command"]("wait") -def save_wetmap(): +def save_maps(): length = world_db["MAP_LENGTH"] string = "" for i in range(length): line = world_db["wetmap"][i * length:(i * length) + length].decode() string = string + "WETMAP" + " " + str(i) + " " + line + "\n" + for i in range(length): + line = world_db["soundmap"][i * length:(i * length) + length].decode() + string = string + "SOUNDMAP" + " " + str(i) + " " + line + "\n" return string +def soundmapset(str_int, mapline): + def valid_map_line(str_int, mapline): + from server.utils import integer_test + val = integer_test(str_int, 0, 255) + if None != val: + if val >= world_db["MAP_LENGTH"]: + print("Illegal value for map line number.") + elif len(mapline) != world_db["MAP_LENGTH"]: + print("Map line length is unequal map width.") + else: + return val + return None + val = valid_map_line(str_int, mapline) + if None != val: + length = world_db["MAP_LENGTH"] + if not world_db["soundmap"]: + m = bytearray(b' ' * (length ** 2)) + else: + m = world_db["soundmap"] + m[val * length:(val * length) + length] = mapline.encode() + if not world_db["soundmap"]: + world_db["soundmap"] = m + + def wetmapset(str_int, mapline): def valid_map_line(str_int, mapline): from server.utils import integer_test @@ -414,6 +444,13 @@ def wetmapset(str_int, mapline): if not world_db["wetmap"]: world_db["wetmap"] = m + +def write_soundmap(): + from server.worldstate_write_helpers import write_map + length = world_db["MAP_LENGTH"] + return write_map(world_db["soundmap"], world_db["MAP_LENGTH"]) + + def write_wetmap(): from server.worldstate_write_helpers import write_map length = world_db["MAP_LENGTH"] @@ -460,8 +497,8 @@ def get_dir_to_target(t, target): def animates_in_fov(maplength): return [Thing for Thing in world_db["Things"].values() - if Thing["T_LIFEPOINTS"] if 118 == t["fovmap"][Thing["pos"]] - if not Thing == t] + if Thing["T_LIFEPOINTS"] and 118 == t["fovmap"][Thing["pos"]] + and (not Thing == t)] def seeing_thing(): def exists(gen): @@ -488,7 +525,7 @@ def get_dir_to_target(t, target): if ord("0") <= t["T_MEMMAP"][pos] <= ord("2") if (t["fovmap"] != ord("v") or world_db["terrain_fullness"](pos) < 5)) - elif target == "flee" and t["fovmap"]: + elif target in {"hunt", "flee"} and t["fovmap"]: return exists(Thing for Thing in animates_in_fov(world_db["MAP_LENGTH"])) return False @@ -518,7 +555,7 @@ def get_dir_to_target(t, target): or world_db["terrain_fullness"](pos) < 5)] elif target == "search": zero_score_map_where_char_on_memdepthmap(mem_depth_c[0]) - elif target == "flee": + elif target in {"hunt", "flee"}: [set_map_score(Thing["pos"], 0) for Thing in animates_in_fov(world_db["MAP_LENGTH"])] @@ -563,13 +600,6 @@ def get_dir_to_target(t, target): if attack_distance >= distance: dir_to_target = rand_target_dir(neighbors, distance - 1, dirs) - elif fear_distance >= distance: - t["T_COMMAND"] = [taid for - taid in world_db["ThingActions"] - if - world_db["ThingActions"][taid]["TA_NAME"] - == "wait"][0] - return 1, 0 elif dir_to_target and fear_distance < distance: dir_to_target = 0 return dir_to_target, minmax_neighbor @@ -670,11 +700,15 @@ def ai(t): world_db["get_dir_to_target"](t, "food")[0]: return continue - if world_db["get_dir_to_target"](t, need[0])[0]: - return - elif t["T_STOMACH"] < 32 and \ - need[0] in {"fluid_certain", "fluid_potential"} and \ - world_db["get_dir_to_target"](t, "food")[0]: + if need[0] in {"fluid_certain", "fluid_potential", "food"}: + if world_db["get_dir_to_target"](t, need[0])[0]: + return + elif world_db["get_dir_to_target"](t, "hunt")[0]: + return + elif need[0] != "food" and t["T_STOMACH"] < 32 and \ + world_db["get_dir_to_target"](t, "food")[0]: + return + elif world_db["get_dir_to_target"](t, need[0])[0]: return world_db["ai"] = ai @@ -685,6 +719,7 @@ io_db["worldstate_write_order"] += [["T_KIDNEY", "player_int"]] io_db["worldstate_write_order"] += [["T_BOWEL", "player_int"]] io_db["worldstate_write_order"] += [["T_BLADDER", "player_int"]] io_db["worldstate_write_order"] += [[write_wetmap, "func"]] +io_db["worldstate_write_order"] += [[write_soundmap, "func"]] import server.config.world_data server.config.world_data.symbols_hide = "345" server.config.world_data.symbols_passable = "012-" @@ -692,12 +727,13 @@ server.config.world_data.thing_defaults["T_STOMACH"] = 16 server.config.world_data.thing_defaults["T_BOWEL"] = 0 server.config.world_data.thing_defaults["T_KIDNEY"] = 16 server.config.world_data.thing_defaults["T_BLADDER"] = 0 +world_db["soundmap"] = bytearray(b"0" * world_db["MAP_LENGTH"] ** 2) world_db["wetmap"] = bytearray(b"0" * world_db["MAP_LENGTH"] ** 2) if not "NEW_SPAWN" in world_db: world_db["NEW_SPAWN"] = 0 if not "HUMIDITY" in world_db: world_db["HUMIDITY"] = 0 -io_db["hook_save"] = save_wetmap +io_db["hook_save"] = save_maps import server.config.make_world_helpers server.config.make_world_helpers.make_map = make_map from server.config.commands import commands_db @@ -718,6 +754,7 @@ commands_db["T_KIDNEY"] = (1, False, setter("Thing", "T_KIDNEY", 0, 255)) commands_db["T_BOWEL"] = (1, False, setter("Thing", "T_BOWEL", 0, 255)) commands_db["T_BLADDER"] = (1, False, setter("Thing", "T_BLADDER", 0, 255)) commands_db["WETMAP"] = (2, False, wetmapset) +commands_db["SOUNDMAP"] = (2, False, soundmapset) from server.actions import actor_wait import server.config.actions server.config.actions.action_db = {