X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=82e2cbc87c2823f4ce3bc1164a4b74fdc64bc4e8;hb=2ad562cb7cdf2dc2cf93c5e8996209884a2e02d9;hp=bd89f8b02bff3e64a965add1e57a4af2cb3ec38e;hpb=b366e1f88c64e11f4e6e0cc088b89dd7ffcab25b;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index bd89f8b..82e2cbc 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"]: @@ -545,7 +546,7 @@ def build_fov_map(t): maptype.from_buffer(t["fovmap"]), maptype.from_buffer(world_db["MAP"])) if test: - raise SystemExit("Malloc error in build_fov_Map().") + raise RuntimeError("Malloc error in build_fov_Map().") def decrement_lifepoints(t): @@ -573,7 +574,7 @@ def mv_yx_in_dir_legal(dir, y, x): dir_c = dir.encode("ascii")[0] test = libpr.mv_yx_in_dir_legal_wrap(dir_c, y, x) if -1 == test: - raise SystemExit("Too much wrapping in mv_yx_in_dir_legal_wrap()!") + raise RuntimeError("Too much wrapping in mv_yx_in_dir_legal_wrap()!") return (test, libpr.result_y(), libpr.result_x()) @@ -705,6 +706,45 @@ 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.""" + 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 t == world_db["Things"][0]: + 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 + \ + " suffers from hunger.\n") + decrement_lifepoints(t) + + def turn_over(): """Run game world and its inhabitants until new player input expected.""" id = 0 @@ -720,7 +760,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] @@ -729,7 +769,7 @@ def turn_over(): eval("actor_" + ThingAction["TA_NAME"])(Thing) Thing["T_COMMAND"] = 0 Thing["T_PROGRESS"] = 0 - # DUMMY: hunger + hunger(Thing) thingproliferation(Thing) if whilebreaker: break @@ -824,7 +864,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: