Fix buggy healthy_addch().

[plomrogue] / server / ai.py

diff --git a/server/ai.py b/server/ai.py
index 71961a33c401d3ec6d5be95318d61f811f43f6f9..eca980fb726f7142c10891c45e309924b0884961 100644 (file)
--- a/server/ai.py
+++ b/server/ai.py
@@ -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.
 
@@ -32,8 +23,10 @@ def get_dir_to_target(t, filter):
     "c": Thing in memorized map is consumable of sufficient nutrition for t
     "s": memory map cell with greatest-reachable degree of unexploredness
     """
-    from server.utils import rand, libpr, c_pointer_to_bytearray
+    from server.utils import rand, libpr, c_pointer_to_bytearray, \
+            c_pointer_to_string
     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:
@@ -59,15 +52,10 @@ def get_dir_to_target(t, filter):
     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"]])
+                and 118 == t["fovmap"][Thing["pos"]] and not Thing == t]
 
     def good_attack_target(v):
-        eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+        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"] \
@@ -77,13 +65,12 @@ def get_dir_to_target(t, filter):
         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
 
@@ -102,7 +89,7 @@ def get_dir_to_target(t, filter):
             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(" ")
             map_len = world_db["MAP_LENGTH"]
             return exists(mt for mt in t["T_MEMTHING"]
@@ -118,9 +105,10 @@ def get_dir_to_target(t, filter):
         # for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
         #            if memmap[i] in symbols_passable]:
         #     set_map_score(i, 65534) # i.e. 65535-1
-        map = c_pointer_to_bytearray(t["T_MEMMAP"])
-        if libpr.set_cells_passable_on_memmap_to_65534_on_scoremap(map,
-                    symbols_passable):
+        scoremap = c_pointer_to_bytearray(t["T_MEMMAP"])
+        passable_string = c_pointer_to_string(symbols_passable)
+        if libpr.set_cells_passable_on_memmap_to_65534_on_scoremap(scoremap,
+                    passable_string):
             raise RuntimeError("No score map allocated for set_cells_passable"
                                "_on_memmap_to_65534_on_scoremap().")
 
@@ -139,7 +127,7 @@ def get_dir_to_target(t, filter):
             [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] * maplen + mt[2], 0)
              for mt in t["T_MEMTHING"]
@@ -231,7 +219,8 @@ 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]["pos"] == t["pos"]
@@ -248,7 +237,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" \