X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=roguelike-server;h=b72b9f530b950dd8200a5f870c4c0c2f2a901cb9;hb=a70d391e1d00758bad946ab0a11c6c63ccb450ea;hp=41506c0800e22f2e115d4a86c3d5936188ddba3c;hpb=fd9a37455ebccd94d981be866223b2a203a817df;p=plomrogue
diff --git a/roguelike-server b/roguelike-server
index 41506c0..b72b9f5 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -1069,34 +1069,28 @@ def thingproliferation(t, prol_map):
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's HP < max, increment them if well-nourished, maybe waiting."""
# 7DRL: Successful heals increment God's mood.
- 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
- world_db["GOD_MOOD"] += 1 # #
- t["T_SATIATION"] -= 32
- if t == world_db["Things"][0]:
- strong_write(io_db["file_out"], "LOG You heal.\n")
+ if t["T_LIFEPOINTS"] < \
+ world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]:
+ wait_id = [id for id in world_db["ThingActions"]
+ if world_db["ThingActions"][id]["TA_NAME"] == "wait"][0]
+ wait_divider = 8 if t["T_COMMAND"] == wait_id else 1
+ testval = int(abs(t["T_SATIATION"]) / wait_divider)
+ if (testval <= 1 or 1 == (rand.next() % testval)):
+ t["T_LIFEPOINTS"] += 1
+ if t != world_db["Things"][0]: # #
+ world_db["GOD_MOOD"] += 1 # #
+ if t == world_db["Things"][0]:
+ strong_write(io_db["file_out"], "LOG You heal.\n")
def hunger(t):
"""Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
if t["T_SATIATION"] > -32768:
- t["T_SATIATION"] -= 1
- 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(abs(t["T_SATIATION"]) / stomach)
- / ((rand.next() % stomach) + 1)):
+ max_hp = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]
+ t["T_SATIATION"] -= 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:
strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")