home · contact · privacy
Server: Minor code simplification.
[plomrogue] / server / ai.py
index 070ecad2258b1e1b3646367e933a38b256af6ebc..21f7115a3e941dd29ebbc3d2cec654e1cb6c540d 100644 (file)
@@ -6,15 +6,6 @@
 from server.config.world_data import world_db
 
 
-def eat_vs_hunger_threshold(thingtype):
-    """Return satiation cost of eating for type. Good food for it must be >."""
-    from server.world import hunger_per_turn
-    hunger_unit = hunger_per_turn(thingtype)
-    actiontype = [id for id in world_db["ThingActions"]
-               if world_db["ThingActions"][id]["TA_NAME"] == "use"][0]
-    return world_db["ThingActions"][actiontype]["TA_EFFORT"] * hunger_unit
-
-
 def get_dir_to_target(t, filter):
     """Try to set T_COMMAND/T_ARGUMENT for move to "filter"-determined target.
 
@@ -34,6 +25,7 @@ def get_dir_to_target(t, filter):
     """
     from server.utils import rand, libpr, c_pointer_to_bytearray
     from server.config.world_data import symbols_passable
+    tt = world_db["ThingTypes"][t["T_TYPE"]]
 
     def zero_score_map_where_char_on_memdepthmap(c):
         # OUTSOURCED FOR PERFORMANCE REASONS TO libplomrogue.so:
@@ -45,11 +37,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,56 +48,54 @@ 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 118 == t["fovmap"][Thing["pos"]] and not Thing == t]
 
     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"] \
+        eat_cost = tt["eat_vs_hunger_threshold"]
+        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
         return False
 
     def good_flee_target(m):
-        own_corpse_id = world_db["ThingTypes"][t["T_TYPE"]]["TT_CORPSE_ID"]
-        corpse_type = world_db["ThingTypes"][own_corpse_id]
+        corpse_type = world_db["ThingTypes"][tt["TT_CORPSE_ID"]]
         targetness = 0 if corpse_type["TT_TOOL"] != "food" \
                        else corpse_type["TT_TOOLPOWER"]
         type = world_db["ThingTypes"][m["T_TYPE"]]
         if t["T_LIFEPOINTS"] < type["TT_LIFEPOINTS"] \
-        and targetness > eat_vs_hunger_threshold(m["T_TYPE"]):
+            and targetness > type["eat_vs_hunger_threshold"]:
             return True
         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"])
+            eat_cost = tt["eat_vs_hunger_threshold"]
             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,45 +117,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["pos"], 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["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"])
+            eat_cost = tt["eat_vs_hunger_threshold"]
             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["pos"], 65535)
+             for Thing in animates_in_fov(maplen)
+             if get_map_score(Thing["pos"])]
         elif "a" != filter:
-            #[set_map_score_at_thingpos(tid, 65535)
-            # for tid in world_db["Things"]
-            # if animate_in_fov(world_db["Things"][tid], maplength)]
-            # ABOVE INLINED FOR PERFORMANCE REASONS BY BLOCK BELOW
-            for Thing in world_db["Things"].values():
-                if Thing["T_LIFEPOINTS"] and not Thing["carried"] and not \
-                        Thing == t:
-                    pos = Thing["T_POSY"] * maplength + Thing["T_POSX"]
-                    if 118 == t["fovmap"][pos]:
-                        set_map_score(pos, 65535)
+            [set_map_score(Thing["pos"], 65535)
+             for Thing in animates_in_fov(maplen)]
 
     def rand_target_dir(neighbors, cmp, dirs):
         candidates = []
@@ -194,7 +164,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
@@ -247,11 +217,11 @@ def get_dir_to_target(t, filter):
 
 def standing_on_food(t):
     """Return True/False whether t is standing on healthy consumable."""
-    eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+    tt = world_db["ThingTypes"][t["T_TYPE"]]
+    eat_cost = tt["eat_vs_hunger_threshold"]
     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"]]
@@ -265,7 +235,8 @@ def get_inventory_slot_to_consume(t):
     cmp_food = -1
     selection = -1
     i = 0
-    eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+    tt = world_db["ThingTypes"][t["T_TYPE"]]
+    eat_cost = tt["eat_vs_hunger_threshold"]
     for id in t["T_CARRIES"]:
         type = world_db["Things"][id]["T_TYPE"]
         if world_db["ThingTypes"][type]["TT_TOOL"] == "food" \