X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=daff24f17310169c77de8d7c1a8767b3f95bb16d;hb=1e1a494473e7a9fde51e14b80f807f90140eb997;hp=9eee167dee3d9bb1faada199c53a2ec48f931082;hpb=92ad0f41b0f924d7cd377bc7a0898dc78d592b68;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 9eee167..daff24f 100755 --- 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"]: @@ -603,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 @@ -654,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"]] @@ -663,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," + @@ -686,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 @@ -705,8 +707,29 @@ 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.""" + """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"] @@ -718,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) @@ -738,7 +761,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] @@ -754,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"], @@ -842,7 +865,7 @@ def command_thingshere(str_y, str_x): for id in world_db["Things"]: write_thing_if_here() else: - for id in world_db["Things"][id]["T_MEMTHING"]: + for id in world_db["Things"][0]["T_MEMTHING"]: write_thing_if_here() strong_write(io_db["file_out"], "THINGS_HERE END\n") else: