X-Git-Url: https://plomlompom.com/repos/?p=plomrogue;a=blobdiff_plain;f=server%2Fai.py;h=71961a33c401d3ec6d5be95318d61f811f43f6f9;hp=854340958c54a3e2873231176187b44865ccf01a;hb=5cdce6d500080008b097435e2891674c16fde208;hpb=9db0640a4cebff6c709ede4d3c360a9bcd74cc3f diff --git a/server/ai.py b/server/ai.py index 8543409..71961a3 100644 --- a/server/ai.py +++ b/server/ai.py @@ -59,14 +59,18 @@ def get_dir_to_target(t, filter): def animates_in_fov(maplength): return [Thing for Thing in world_db["Things"].values() if Thing["T_LIFEPOINTS"] and not Thing["carried"] - and not Thing == t and 118 == t["fovmap"][Thing["T_POSY"] * - maplength + Thing["T_POSX"]]] + and not Thing == t and 118 == t["fovmap"][Thing["pos"]]] + + #def animates_in_fov_gen(maplength): + # return (Thing for Thing in world_db["Things"].values() + # if Thing["T_LIFEPOINTS"] and not Thing["carried"] + # and not Thing == t and 118 == t["fovmap"][Thing["pos"]]) def good_attack_target(v): eat_cost = eat_vs_hunger_threshold(t["T_TYPE"]) - type = world_db["ThingTypes"][v["T_TYPE"]] - type_corpse = world_db["ThingTypes"][type["TT_CORPSE_ID"]] - if t["T_LIFEPOINTS"] > type["TT_LIFEPOINTS"] \ + ty = world_db["ThingTypes"][v["T_TYPE"]] + type_corpse = world_db["ThingTypes"][ty["TT_CORPSE_ID"]] + if t["T_LIFEPOINTS"] > ty["TT_LIFEPOINTS"] \ and type_corpse["TT_TOOL"] == "food" \ and type_corpse["TT_TOOLPOWER"] > eat_cost: return True @@ -84,35 +88,28 @@ def get_dir_to_target(t, filter): return False def seeing_thing(): - maplength = world_db["MAP_LENGTH"] - if t["fovmap"] and "a" == filter: + def exists(gen): try: - next((Thing for Thing in animates_in_fov(maplength) - if good_attack_target(Thing))) + next(gen) except StopIteration: return False return True + maplength = world_db["MAP_LENGTH"] + if t["fovmap"] and "a" == filter: + return exists(Thing for Thing in animates_in_fov(maplength) + if good_attack_target(Thing)) elif t["fovmap"] and "f" == filter: - try: - next((Thing for Thing in animates_in_fov(maplength) - if good_flee_target(Thing))) - except StopIteration: - return False - return True + return exists(Thing for Thing in animates_in_fov(maplength) + if good_flee_target(Thing)) elif t["T_MEMMAP"] and "c" == filter: eat_cost = eat_vs_hunger_threshold(t["T_TYPE"]) ord_blank = ord(" ") map_len = world_db["MAP_LENGTH"] - try: - next(mt for mt in t["T_MEMTHING"] - if ord_blank != t["T_MEMMAP"][mt[1] * map_len + mt[2]] - and world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food" - and world_db["ThingTypes"][mt[0]]["TT_TOOLPOWER"] - > eat_cost) - except StopIteration: - return False - return True - + return exists(mt for mt in t["T_MEMTHING"] + if ord_blank != t["T_MEMMAP"][mt[1] * map_len + mt[2]] + and world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food" + and world_db["ThingTypes"][mt[0]]["TT_TOOLPOWER"] + > eat_cost) return False def set_cells_passable_on_memmap_to_65534_on_scoremap(): @@ -136,10 +133,10 @@ def get_dir_to_target(t, filter): set_cells_passable_on_memmap_to_65534_on_scoremap() maplen = world_db["MAP_LENGTH"] if "a" == filter: - [set_map_score(Thing["T_POSY"] * maplen + Thing["T_POSX"], 0) for + [set_map_score(Thing["pos"], 0) for Thing in animates_in_fov(maplen) if good_attack_target(Thing)] elif "f" == filter: - [set_map_score(Thing["T_POSY"] * maplen + Thing["T_POSX"], 0) for + [set_map_score(Thing["pos"], 0) for Thing in animates_in_fov(maplen) if good_flee_target(Thing)] elif "c" == filter: eat_cost = eat_vs_hunger_threshold(t["T_TYPE"]) @@ -147,18 +144,17 @@ def get_dir_to_target(t, filter): [set_map_score(mt[1] * maplen + mt[2], 0) for mt in t["T_MEMTHING"] if ord_blank != t["T_MEMMAP"][mt[1] * maplen + mt[2]] - if t != world_db["Things"][0] or - (world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food" and - world_db["ThingTypes"][mt[0]]["TT_TOOLPOWER"] > eat_cost)] + if world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food" + if world_db["ThingTypes"][mt[0]]["TT_TOOLPOWER"] > eat_cost] elif "s" == filter: zero_score_map_where_char_on_memdepthmap(mem_depth_c[0]) if "f" == filter: - [set_map_score(Thing["T_POSY"] * maplen + Thing["T_POSX"], 65535) - for Thing in animates_in_fov(maplen) if get_map_score( - Thing["T_POSY"] * maplen + Thing["T_POSX"])] + [set_map_score(Thing["pos"], 65535) + for Thing in animates_in_fov(maplen) + if get_map_score(Thing["pos"])] elif "a" != filter: - [set_map_score(Thing["T_POSY"] * maplen + Thing["T_POSX"], - 65535) for Thing in animates_in_fov(maplen)] + [set_map_score(Thing["pos"], 65535) + for Thing in animates_in_fov(maplen)] def rand_target_dir(neighbors, cmp, dirs): candidates = [] @@ -182,7 +178,7 @@ def get_dir_to_target(t, filter): import math dir_to_target = False dirs = "edcxsw" - eye_pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"] + eye_pos = t["pos"] neighbors = get_neighbor_scores(dirs, eye_pos) minmax_start = 0 if "f" == filter else 65535 - 1 minmax_neighbor = minmax_start @@ -238,8 +234,7 @@ def standing_on_food(t): eat_cost = eat_vs_hunger_threshold(t["T_TYPE"]) for id in [id for id in world_db["Things"] if world_db["Things"][id] != t if not world_db["Things"][id]["carried"] - if world_db["Things"][id]["T_POSY"] == t["T_POSY"] - if world_db["Things"][id]["T_POSX"] == t["T_POSX"] + if world_db["Things"][id]["pos"] == t["pos"] if world_db["ThingTypes"][world_db["Things"][id]["T_TYPE"]] ["TT_TOOL"] == "food" if world_db["ThingTypes"][world_db["Things"][id]["T_TYPE"]]