home · contact · privacy
Server: Optimize thing position calculation.
[plomrogue] / server / ai.py
index 88b087939f5ca2cd49c428f30fe1420b110c36c1..71961a33c401d3ec6d5be95318d61f811f43f6f9 100644 (file)
@@ -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,18 +56,21 @@ 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["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
@@ -90,25 +88,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]):
-                    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]):
-                    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"])
-            for mt in t["T_MEMTHING"]:
-                if ' ' != 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
+            ord_blank = ord(" ")
+            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():
@@ -130,38 +131,30 @@ 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["pos"], 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["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"])
-            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 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 "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["pos"], 65535)
+             for Thing in animates_in_fov(maplen)
+             if get_map_score(Thing["pos"])]
+        elif "a" != filter:
+            [set_map_score(Thing["pos"], 65535)
+             for Thing in animates_in_fov(maplen)]
 
     def rand_target_dir(neighbors, cmp, dirs):
         candidates = []
@@ -185,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
@@ -241,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"]]
@@ -283,12 +275,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]