Server/py: Undummify try_healing().

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 59b1af3af34c5dcb0f45c14c6d2c6ec7ec4a6db4..82e2cbc87c2823f4ce3bc1164a4b74fdc64bc4e8 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -341,12 +341,11 @@ def try_worldstate_update():
         string = write_map(string, fov)
         mem = world_db["Things"][0]["T_MEMMAP"][:]
         for i in range(2):
-            for memthing in world_db["Things"][0]["T_MEMTHING"]:
-                type = world_db["Things"][memthing[0]]["T_TYPE"]
-                consumable = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
+            for mt in world_db["Things"][0]["T_MEMTHING"]:
+                consumable = world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]
                 if (i == 0 and not consumable) or (i == 1 and consumable):
-                    c = world_db["ThingTypes"][type]["TT_SYMBOL"]
-                    mem[(memthing[1] * length) + memthing[2]] = ord(c)
+                    c = world_db["ThingTypes"][mt[0]]["TT_SYMBOL"]
+                    mem[(mt[1] * length) + mt[2]] = ord(c)
         string = write_map(string, mem)
         atomic_write(io_db["path_worldstate"], string)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
@@ -475,12 +474,14 @@ def update_map_memory(t):
             if " " == chr(t["T_MEMMAP"][pos]):
                 t["T_MEMMAP"][pos] = world_db["MAP"][pos]
             continue
-        # TODO: Aging of MEMDEPTHMAP.
-    for memthing in t["T_MEMTHING"]:
-        y = world_db["Things"][memthing[0]]["T_POSY"]
-        x = world_db["Things"][memthing[0]]["T_POSX"]
-        if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]):
-            t["T_MEMTHING"].remove(memthing)
+        if ord('0') <= t["T_MEMDEPTHMAP"][pos] \
+           and ord('9') >= t["T_MEMDEPTHMAP"][pos] \
+           and not rand.next() % (2 ** (t["T_MEMDEPTHMAP"][pos] - 48)):
+            t["T_MEMDEPTHMAP"][pos] += 1
+    for mt in [mt for mt in t["T_MEMTHING"]
+               if "v" == chr(t["fovmap"][(mt[1] * world_db["MAP_LENGTH"])
+                                         + mt[2]])]:
+            t["T_MEMTHING"].remove(mt)
     for id in world_db["Things"]:
         type = world_db["Things"][id]["T_TYPE"]
         if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]:
@@ -705,6 +706,27 @@ def thingproliferation(t):
             world_db["Things"][id] = newT
 
 
+def try_healing(t):
+    """Grow t's HP to a 1/32 chance if < HP max, satiation > 0, and waiting.
+
+    On success, decrease satiation score by 32.
+    """
+    if t["T_SATIATION"] > 0 \
+       and t["T_LIFEPOINTS"] < \
+           world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] \
+       and 0 == (rand.next() % 31) \
+       and t["T_COMMAND"] == [id for id in world_db["ThingActions"]
+                              if world_db["ThingActions"][id]["TA_NAME"] ==
+                                 "wait"][0]:
+        t["T_LIFEPOINTS"] += 1
+        t["T_SATIATION"] -= 32
+        if t == world_db["Things"][0]:
+            strong_write(io_db["file_out"], "LOG You heal.\n")
+        else:
+            name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
+            strong_write(io_db["file_out"], "LOG " + name + "heals.\n")
+
+
 def hunger(t):
     """Decrement t's satiation, dependent on it trigger lifepoint dec chance."""
     if t["T_SATIATION"] > -32768:
@@ -738,7 +760,7 @@ def turn_over():
                         break
                     # DUMMY: ai(thing)
                     Thing["T_COMMAND"] = 1
-                # DUMMY: try_healing
+                try_healing(Thing)
                 Thing["T_PROGRESS"] += 1
                 taid = [a for a in world_db["ThingActions"]
                           if a == Thing["T_COMMAND"]][0]