X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-logo.png?a=blobdiff_plain;f=plomrogue-server.py;h=daff24f17310169c77de8d7c1a8767b3f95bb16d;hb=1e1a494473e7a9fde51e14b80f807f90140eb997;hp=82e2cbc87c2823f4ce3bc1164a4b74fdc64bc4e8;hpb=2ad562cb7cdf2dc2cf93c5e8996209884a2e02d9;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 82e2cbc..daff24f 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -604,7 +604,7 @@ def actor_move(t): hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"] hitted = "you" if hit_id == 0 else hitted_name verb = " wound " if hitter == "You" else " wounds " - strong_write(io_db["file_out"], "LOG " + hitter + verb + hitted + \ + strong_write(io_db["file_out"], "LOG " + hitter + verb + hitted + ".\n") decrement_lifepoints(world_db["Things"][hit_id]) return @@ -655,7 +655,6 @@ def actor_drop(t): def actor_use(t): """Make t use (for now: consume) T_ARGUMENT-indexed Thing in inventory.""" - # Original wrongly featured lifepoints increase through consumable! # TODO: Handle case where T_ARGUMENT matches nothing. if len(t["T_CARRIES"]): id = t["T_CARRIES"][t["T_ARGUMENT"]] @@ -664,6 +663,8 @@ def actor_use(t): t["T_CARRIES"].remove(id) del world_db["Things"][id] t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_CONSUMABLE"] + t["T_LIFEPOINTS"] += 1 + # Wrongly increment HPs is a replica of the original code. strong_write(io_db["file_out"], "LOG You consume this object.\n") else: strong_write(io_db["file_out"], "LOG You try to use this object," + @@ -687,7 +688,7 @@ def thingproliferation(t): if y == world_db["Things"][id]["T_POSY"] if x == world_db["Things"][id]["T_POSX"] if (t["T_TYPE"] == world_db["Things"][id]["T_TYPE"]) - or (t["T_LIFEPOINTS"] and + or (t["T_LIFEPOINTS"] and world_db["Things"][id]["T_LIFEPOINTS"])]: return False return True @@ -728,7 +729,7 @@ def try_healing(t): def hunger(t): - """Decrement t's satiation, dependent on it trigger lifepoint dec chance.""" + """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"] @@ -740,7 +741,7 @@ def hunger(t): strong_write(io_db["file_out"], "LOG You suffer from hunger.\n") else: name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"] - strong_write(io_db["file_out"], "LOG " + name + \ + strong_write(io_db["file_out"], "LOG " + name + " suffers from hunger.\n") decrement_lifepoints(t) @@ -776,7 +777,7 @@ def turn_over(): world_db["TURN"] += 1 -def new_Thing(type, pos=(0,0)): +def new_Thing(type, pos=(0, 0)): """Return Thing of type T_TYPE, with fovmap if alive and world active.""" thing = { "T_LIFEPOINTS": world_db["ThingTypes"][type]["TT_LIFEPOINTS"],