Simplify hunger() with Python's built-in abs().

[plomrogue] / roguelike-server

diff --git a/roguelike-server b/roguelike-server
index 9bc55ad815bb6fe788720016b05c1e6c1979ef02..41506c0800e22f2e115d4a86c3d5936188ddba3c 100755 (executable)
--- a/roguelike-server
+++ b/roguelike-server
@@ -360,22 +360,52 @@ def try_worldstate_update():
              mem[(mt[1] * length) + mt[2]] = ord(c)
         string = write_map(string, mem)
 
-        stacksmap = bytearray(b'0' * (length ** 2))  # #
+        metamapA = bytearray(b'0' * (length ** 2))  # #
         for id in [id for id in world_db["Things"]  # #
                       if not world_db["Things"][id]["carried"]  # #
+                      if world_db["Things"][id]["T_LIFEPOINTS"]  # #
                       if world_db["Things"][0]["fovmap"][  # #
                            world_db["Things"][id]["T_POSY"] * length  # #
                            + world_db["Things"][id]["T_POSX"]] == ord_v]:  # #
             pos = (world_db["Things"][id]["T_POSY"] * length  # #
                   + world_db["Things"][id]["T_POSX"])  # #
-            if stacksmap[pos] < ord('2'):  # #
-                stacksmap[pos] += 1  # #
+            if id == 0 or world_db["EMPATHY"]:  # #
+                type = world_db["Things"][id]["T_TYPE"]  # #
+                max_hp = world_db["ThingTypes"][type]["TT_LIFEPOINTS"]  # #
+                third_of_hp = max_hp / 3  # #
+                hp = world_db["Things"][id]["T_LIFEPOINTS"]  # #
+                add = 0  # #
+                if hp > 2 * third_of_hp:  # #
+                     add = 2  # #
+                elif hp > third_of_hp:  # #
+                    add = 1  # #
+                metamapA[pos] = ord('a') + add # #
+            else:  # #
+                metamapA[pos] = ord('X')  # #
         for mt in world_db["Things"][0]["T_MEMTHING"]:  # #
             pos = mt[1] * length + mt[2]  # #
-            if stacksmap[pos] < ord('2'):  # #
-                stacksmap[pos] += 1  # #
-        string = write_map(string, stacksmap)  # #
+            if metamapA[pos] < ord('2'):  # #
+                metamapA[pos] += 1  # #
+        string = write_map(string, metamapA)  # #
         
+        metamapB = bytearray(b' ' * (length ** 2))  # #
+        for id in [id for id in world_db["Things"]  # #
+                      if not world_db["Things"][id]["carried"]  # #
+                      if world_db["Things"][id]["T_LIFEPOINTS"]  # #
+                      if world_db["Things"][0]["fovmap"][  # #
+                           world_db["Things"][id]["T_POSY"] * length  # #
+                           + world_db["Things"][id]["T_POSX"]] == ord_v]:  # #
+            pos = (world_db["Things"][id]["T_POSY"] * length  # #
+                  + world_db["Things"][id]["T_POSX"])  # #
+            if id == 0 or world_db["EMPATHY"]:  # #
+                action = world_db["Things"][id]["T_COMMAND"]  # #
+                if 0 != action:  # #
+                    name = world_db["ThingActions"][action]["TA_NAME"]  # #
+                else:  # #
+                    name = " "  # #
+                metamapB[pos] = ord(name[0]) # #
+        string = write_map(string, metamapB)  # #
+
         atomic_write(io_db["path_worldstate"], string, delete=False)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
         io_db["worldstate_updateable"] = False
@@ -1062,13 +1092,17 @@ def hunger(t):
     """Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
     if t["T_SATIATION"] > -32768:
         t["T_SATIATION"] -= 1
-    testbase = t["T_SATIATION"] if t["T_SATIATION"] >= 0 else -t["T_SATIATION"]
     if not world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]:
         raise RuntimeError("A thing that should not hunger is hungering.")
     stomach = int(32767 / world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"])
-    if int(int(testbase / stomach) / ((rand.next() % stomach) + 1)):
+    if int(int(abs(t["T_SATIATION"]) / stomach)
+           / ((rand.next() % stomach) + 1)):
         if t == world_db["Things"][0]:
-            strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
+            if t["T_SATIATION"] < 0:
+                strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
+            else:
+                strong_write(io_db["file_out"],
+                             "LOG You suffer from over-eating.\n")
         decrement_lifepoints(t)
 
 
@@ -1975,6 +2009,7 @@ commands_db = {
     "PLANT_1": (1, False, specialtypesetter("PLANT_1")),  # #
     "LUMBER": (1, False, specialtypesetter("LUMBER")),  # #
     "TOOL_0": (1, False, specialtypesetter("TOOL_0")),  # #
+    "EMPATHY": (1, False, setter(None, "EMPATHY", 0, 1)),  # #
     "TA_ID": (1, False, command_taid),
     "TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
     "TA_NAME": (1, False, command_taname),
@@ -2029,6 +2064,7 @@ world_db = {
     "PLANT_1": 0,  # #
     "LUMBER": 0,  # #
     "TOOL_0": 0,  # #
+    "EMPATHY": 1,  # #
     "ThingActions": {},
     "ThingTypes": {},
     "Things": {}