X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=roguelike-server;h=a70b590356eae8f20f2868e38b45bea2a6859333;hb=d5c3c09f3cfdc5e00128b1fc630a641a4e6d48d4;hp=9bc55ad815bb6fe788720016b05c1e6c1979ef02;hpb=5987599c7531fb17ad174824335d99339200f306;p=plomrogue

diff --git a/roguelike-server b/roguelike-server
index 9bc55ad..a70b590 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -363,13 +363,25 @@ def try_worldstate_update():
         stacksmap = 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  # #
+                stacksmap[pos] = ord('a') + add # #
+            else:  # #
+                stacksmap[pos] = ord('X')  # #
         for mt in world_db["Things"][0]["T_MEMTHING"]:  # #
             pos = mt[1] * length + mt[2]  # #
             if stacksmap[pos] < ord('2'):  # #
@@ -1975,6 +1987,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 +2042,7 @@ world_db = {
     "PLANT_1": 0,  # #
     "LUMBER": 0,  # #
     "TOOL_0": 0,  # #
+    "EMPATHY": 0,  # #
     "ThingActions": {},
     "ThingTypes": {},
     "Things": {}