X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/gitweb.js?a=blobdiff_plain;f=roguelike-server;h=c51b65de6a9eeb5f830caef517ffef1efc6027fb;hb=294144fde53ac36b9f5e03fa9557dbb384863e47;hp=29fe11994b79c15bca1ac95536f788cb16345e21;hpb=49679df70be008106ba63448b5ea66297c134bea;p=plomrogue

diff --git a/roguelike-server b/roguelike-server
index 29fe119..c51b65d 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -903,6 +903,7 @@ def actor_pick_up(t):
     Define topmostness by how low the thing's type ID is.
     """
     # 7DRL: Non-player picking up player-dropped consumable -> GOD_FAVOR gain.
+    # 7DRL: Only player picks up non-food.
     used_slots = len(t["T_CARRIES"]) # #
     if used_slots < world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]: # #
         ids = [id for id in world_db["Things"] if world_db["Things"][id] != t
@@ -914,6 +915,9 @@ def actor_pick_up(t):
             for iid in ids:
                 tid = world_db["Things"][iid]["T_TYPE"] 
                 if lowest_tid == -1 or tid < lowest_tid:
+                    if (t != world_db["Things"][0] and  # #
+                        world_db["ThingTypes"][tid]["TT_TOOL"] != "food"):
+                        continue
                     id = iid
                     lowest_tid = tid
             world_db["Things"][id]["carried"] = True
@@ -1085,11 +1089,16 @@ def try_healing(t):
                 strong_write(io_db["file_out"], "LOG You heal.\n")
 
 
+def hunger_per_turn(type_id):
+    """The amount of satiation score lost per turn for things of given type."""
+    return int(math.sqrt(world_db["ThingTypes"][type_id]["TT_LIFEPOINTS"]))
+
+
 def hunger(t):
     """Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
     if t["T_SATIATION"] > -32768:
-        max_hp = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]
-        t["T_SATIATION"] -= int(math.sqrt(max_hp))
+        #max_hp = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]
+        t["T_SATIATION"] -= hunger_per_turn(t["T_TYPE"]) # int(math.sqrt(max_hp))
     if 0 != t["T_SATIATION"] and 0 == int(rand.next() / abs(t["T_SATIATION"])):
         if t == world_db["Things"][0]:
             if t["T_SATIATION"] < 0:
@@ -1310,16 +1319,20 @@ def standing_on_food(t):
 
 
 def get_inventory_slot_to_consume(t):
-    """Return slot Id of healthiest consumable in t's inventory, else -1."""
+    """Return invent. slot of healthiest consumable(if any healthy),else -1."""
     cmp_food = -1
     selection = -1
     i = 0
+    hunger_u = hunger_per_turn(t["T_TYPE"])
+    type = [id for id in world_db["ThingActions"]
+               if world_db["ThingActions"][id]["TA_NAME"] == "use"][0]
+    consume_hungering =  world_db["ThingActions"][type]["TA_EFFORT"] * hunger_u
     for id in t["T_CARRIES"]:
         type = world_db["Things"][id]["T_TYPE"]
         if world_db["ThingTypes"][type]["TT_TOOL"] == "food" \
            and world_db["ThingTypes"][type]["TT_TOOLPOWER"]:
             nutvalue = world_db["ThingTypes"][type]["TT_TOOLPOWER"]
-            tmp_cmp = abs(t["T_SATIATION"] + nutvalue)
+            tmp_cmp = abs(t["T_SATIATION"] + nutvalue - consume_hungering)
             if (cmp_food < 0 and tmp_cmp < abs(t["T_SATIATION"])) \
             or tmp_cmp < cmp_food:
                 cmp_food = tmp_cmp