Server: Fix AI bug (searching too costly consumable when not player).

[plomrogue] / server / ai.py

diff --git a/server/ai.py b/server/ai.py
index 0d1effce2262a6f0473d270e4a37ad3128cc19de..661d3022acefdeba50460ff4134d4adf3c61084f 100644 (file)
--- 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, maplength):
-        if not Thing["T_LIFEPOINTS"] or Thing["carried"] or Thing == t:
-            return False
-        pos = Thing["T_POSY"] * maplength + Thing["T_POSX"]
-        if 118 == t["fovmap"][pos]: # optimization: 118 = ord("v")
-            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,27 +84,28 @@ def get_dir_to_target(t, filter):
         return False
 
     def seeing_thing():
+        def exists(gen):
+            try:
+                next(gen)
+            except StopIteration:
+                return False
+            return True
         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], maplength):
-                    if good_attack_target(world_db["Things"][id]):
-                        return True
+            return exists(Thing for Thing in animates_in_fov(maplength)
+                                if good_attack_target(Thing))
         elif t["fovmap"] and "f" == filter:
-            for id in world_db["Things"]:
-                if animate_in_fov(world_db["Things"][id], maplength):
-                    if good_flee_target(world_db["Things"][id]):
-                        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(" ")
-            for mt in t["T_MEMTHING"]:
-                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:
-                    return True
+            map_len = world_db["MAP_LENGTH"]
+            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():
@@ -132,38 +127,30 @@ def get_dir_to_target(t, filter):
         ord_v = ord("v")
         ord_blank = ord(" ")
         set_cells_passable_on_memmap_to_65534_on_scoremap()
-        maplength = world_db["MAP_LENGTH"]
+        maplen = world_db["MAP_LENGTH"]
         if "a" == filter:
-            [set_map_score_at_thingpos(id, 0)
-             for id in world_db["Things"]
-             if animate_in_fov(world_db["Things"][id], maplength)
-             if good_attack_target(world_db["Things"][id])]
+            [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:
-            [set_map_score_at_thingpos(id, 0)
-             for id in world_db["Things"]
-             if animate_in_fov(world_db["Things"][id], maplength)
-             if good_flee_target(world_db["Things"][id])]
+            [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"])
             ord_blank = ord(" ")
-            [set_map_score(mt[1] * maplength + mt[2], 0)
+            [set_map_score(mt[1] * maplen + mt[2], 0)
              for mt in t["T_MEMTHING"]
-             if ord_blank != t["T_MEMMAP"][mt[1] * maplength + 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 ord_blank != t["T_MEMMAP"][mt[1] * maplen + mt[2]]
+             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_at_thingpos(id, 65535)
-             for id in world_db["Things"]
-             if animate_in_fov(world_db["Things"][id], maplength)
-             if get_map_score(world_db["Things"][id]["T_POSY"] * maplength
-                              + world_db["Things"][id]["T_POSX"])]
+            [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_at_thingpos(id, 65535)
-             for id in world_db["Things"]
-             if animate_in_fov(world_db["Things"][id], maplength)]
+            [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 = []