X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fai.py;h=6c1aab802de6dea0f11b8d93e997767e842d41ca;hb=cfcbae34d0f447e51b6174071fd14d4b147505ad;hp=88b087939f5ca2cd49c428f30fe1420b110c36c1;hpb=2d78939fd39c64a41742a73558708628e38e282d;p=plomrogue diff --git a/server/ai.py b/server/ai.py index 88b0879..6c1aab8 100644 --- a/server/ai.py +++ b/server/ai.py @@ -45,11 +45,6 @@ def get_dir_to_target(t, filter): raise RuntimeError("No score map allocated for " "zero_score_map_where_char_on_memdepthmap().") - def set_map_score_at_thingpos(id, score): - pos = world_db["Things"][id]["T_POSY"] * world_db["MAP_LENGTH"] \ - + world_db["Things"][id]["T_POSX"] - set_map_score(pos, score) - def set_map_score(pos, score): test = libpr.set_map_score(pos, score) if test: @@ -61,12 +56,11 @@ def get_dir_to_target(t, filter): raise RuntimeError("No score map allocated for get_map_score().") return result - def animate_in_fov(Thing): - if Thing["carried"] or Thing == t or not Thing["T_LIFEPOINTS"]: - return False - pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] + Thing["T_POSX"] - if ord("v") == t["fovmap"][pos]: - return True + 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"]]] def good_attack_target(v): eat_cost = eat_vs_hunger_threshold(t["T_TYPE"]) @@ -90,21 +84,23 @@ def get_dir_to_target(t, filter): return False def seeing_thing(): + maplength = world_db["MAP_LENGTH"] if t["fovmap"] and "a" == filter: - for id in world_db["Things"]: - if animate_in_fov(world_db["Things"][id]): - if good_attack_target(world_db["Things"][id]): - return True + targets = [Thing for Thing in animates_in_fov(maplength) + if good_attack_target(Thing)] + if len(targets): + return True elif t["fovmap"] and "f" == filter: - for id in world_db["Things"]: - if animate_in_fov(world_db["Things"][id]): - if good_flee_target(world_db["Things"][id]): - return True + targets = [Thing for Thing in animates_in_fov(maplength) + if good_flee_target(Thing)] + if len(targets): + return True elif t["T_MEMMAP"] and "c" == filter: eat_cost = eat_vs_hunger_threshold(t["T_TYPE"]) + ord_blank = ord(" ") for mt in t["T_MEMTHING"]: - if ' ' != chr(t["T_MEMMAP"][(mt[1] * world_db["MAP_LENGTH"]) - + mt[2]]) \ + if ord_blank != chr(t["T_MEMMAP"][(mt[1] * \ + world_db["MAP_LENGTH"]) + mt[2]]) \ and world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food" \ and world_db["ThingTypes"][mt[0]]["TT_TOOLPOWER"] \ > eat_cost: @@ -130,38 +126,31 @@ def get_dir_to_target(t, filter): ord_v = ord("v") ord_blank = ord(" ") set_cells_passable_on_memmap_to_65534_on_scoremap() + maplen = world_db["MAP_LENGTH"] if "a" == filter: - for id in world_db["Things"]: - if animate_in_fov(world_db["Things"][id]) \ - and good_attack_target(world_db["Things"][id]): - set_map_score_at_thingpos(id, 0) + [set_map_score(Thing["T_POSY"] * maplen + Thing["T_POSX"], 0) for + Thing in animates_in_fov(maplen) if good_attack_target(Thing)] elif "f" == filter: - for id in world_db["Things"]: - if animate_in_fov(world_db["Things"][id]) \ - and good_flee_target(world_db["Things"][id]): - set_map_score_at_thingpos(id, 0) + [set_map_score(Thing["T_POSY"] * maplen + Thing["T_POSX"], 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"]) - for mt in [mt for mt in t["T_MEMTHING"] - if ord_blank != t["T_MEMMAP"][mt[1] - * world_db["MAP_LENGTH"] - + mt[2]] - if world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food" - if world_db["ThingTypes"][mt[0]]["TT_TOOLPOWER"] - > eat_cost]: - set_map_score(mt[1] * world_db["MAP_LENGTH"] + mt[2], 0) + ord_blank = ord(" ") + [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)] elif "s" == filter: zero_score_map_where_char_on_memdepthmap(mem_depth_c[0]) - if "a" != filter: - for id in world_db["Things"]: - if animate_in_fov(world_db["Things"][id]): - if "f" == filter: - pos = world_db["Things"][id]["T_POSY"] \ - * world_db["MAP_LENGTH"] \ - + world_db["Things"][id]["T_POSX"] - if 0 == get_map_score(pos): - continue - set_map_score_at_thingpos(id, 65535) + 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"])] + elif "a" != filter: + [set_map_score(Thing["T_POSY"] * maplen + Thing["T_POSX"], + 65535) for Thing in animates_in_fov(maplen)] def rand_target_dir(neighbors, cmp, dirs): candidates = [] @@ -283,12 +272,13 @@ def ai(t): if get_dir_to_target(t, "f"): return sel = get_inventory_slot_to_consume(t) + from server.config.ai import ai_hook_pickup_test if -1 != sel: t["T_COMMAND"] = [id for id in world_db["ThingActions"] if world_db["ThingActions"][id]["TA_NAME"] == "use"][0] t["T_ARGUMENT"] = sel - elif standing_on_food(t): + elif standing_on_food(t) and ai_hook_pickup_test(t): t["T_COMMAND"] = [id for id in world_db["ThingActions"] if world_db["ThingActions"][id]["TA_NAME"] == "pickup"][0]