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 6c1aab802de6dea0f11b8d93e997767e842d41ca..661d3022acefdeba50460ff4134d4adf3c61084f 100644 (file)
--- a/server/ai.py
+++ b/server/ai.py
@@ -84,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:
-            targets = [Thing for Thing in animates_in_fov(maplength)
-                       if good_attack_target(Thing)]
-            if len(targets):
-                return True
+            return exists(Thing for Thing in animates_in_fov(maplength)
+                                if good_attack_target(Thing))
         elif t["fovmap"] and "f" == filter:
-            targets = [Thing for Thing in animates_in_fov(maplength)
-                       if good_flee_target(Thing)]
-            if len(targets):
-                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():
@@ -139,9 +140,8 @@ 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: