X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike-server;h=7e59152c112ce735ccd004d14dc8a0716b505906;hb=bcc49cb62e6e4495db8c1826f8ab651c4eea988d;hp=adba9bcd586d5873ecd4ed8c2bfec32682401604;hpb=bfff0b6dfed59009ecf7b0ed2f9dabf3aac6f0a7;p=plomrogue diff --git a/roguelike-server b/roguelike-server index adba9bc..7e59152 100755 --- a/roguelike-server +++ b/roguelike-server @@ -139,7 +139,8 @@ def obey(command, prefix, replay=False, do_record=False): if time.time() > io_db["save_wait"] + 15: atomic_write(io_db["path_record"], io_db["record_chunk"], do_append=True) - save_world() + if world_db["WORLD_ACTIVE"]: + save_world() io_db["record_chunk"] = "" io_db["save_wait"] = time.time() io_db["worldstate_updateable"] = world_db["WORLD_ACTIVE"] @@ -500,10 +501,9 @@ def update_map_memory(t, age_map=True): t["T_MEMMAP"][pos] = world_db["MAP"][pos] if age_map: age_some_memdepthmap_on_nonfov_cells() - for mt in [mt for mt in t["T_MEMTHING"] - if ord_v == t["fovmap"][(mt[1] * world_db["MAP_LENGTH"]) - + mt[2]]]: - t["T_MEMTHING"].remove(mt) + t["T_MEMTHING"] = [mt for mt in t["T_MEMTHING"] + if ord_v != t["fovmap"][(mt[1] * world_db["MAP_LENGTH"]) + + mt[2]]] for id in [id for id in world_db["Things"] if not world_db["Things"][id]["carried"]]: type = world_db["Things"][id]["T_TYPE"] @@ -578,9 +578,15 @@ def decrement_lifepoints(t): If t is the player avatar, only blank its fovmap, so that the client may still display memory data. On non-player things, erase fovmap and memory. + Dying actors drop all their things. """ t["T_LIFEPOINTS"] -= 1 if 0 == t["T_LIFEPOINTS"]: + for id in t["T_CARRIES"]: + t["T_CARRIES"].remove(id) + world_db["Things"][id]["T_POSY"] = t["T_POSY"] + world_db["Things"][id]["T_POSX"] = t["T_POSX"] + world_db["Things"][id]["carried"] = False t["T_TYPE"] = world_db["ThingTypes"][t["T_TYPE"]]["TT_CORPSE_ID"] if world_db["Things"][0] == t: t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2)) @@ -625,8 +631,8 @@ def actor_move(t): if t == world_db["Things"][0]: hitted_type = world_db["Things"][hit_id]["T_TYPE"] hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"] - strong_write(io_db["file_out"], "LOG You wound " + hitted + - ".\n") + strong_write(io_db["file_out"], "LOG You wound " + + hitted_name + ".\n") elif 0 == hit_id: hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"] strong_write(io_db["file_out"], "LOG " + hitter_name + @@ -650,15 +656,18 @@ def actor_move(t): def actor_pick_up(t): """Make t pick up (topmost?) Thing from ground into inventory.""" - # Topmostness is actually not defined so far. Picks Thing with highest ID. + # Topmostness is actually not defined so far. Picks most nutritious Thing. ids = [id for id in world_db["Things"] if world_db["Things"][id] != t if not world_db["Things"][id]["carried"] if world_db["Things"][id]["T_POSY"] == t["T_POSY"] if world_db["Things"][id]["T_POSX"] == t["T_POSX"]] if len(ids): - highest_id = 0 + highest_id = ids[0] + nutritious = 0 for id in ids: - if id > highest_id: + type = world_db["Things"][id]["T_TYPE"] + if world_db["ThingTypes"][type]["TT_CONSUMABLE"] > nutritious: + nutritious = world_db["ThingTypes"][type]["TT_CONSUMABLE"] highest_id = id world_db["Things"][highest_id]["carried"] = True t["T_CARRIES"].append(highest_id) @@ -704,31 +713,21 @@ def actor_use(t): "LOG You try to use an object, but you own none.\n") -def thingproliferation(t): - """To chance of 1/TT_PROLIFERATE, create t offspring in neighbor cell. +def thingproliferation(t, prol_map): + """To chance of 1/TT_PROLIFERATE, create t offspring in open neighbor cell. - Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be - passable and not be inhabited by a Thing of the same type, or, if Thing is - animate, any other animate Thing. If there are several map cell candidates, - one is selected randomly. + Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be be + marked '.' in prol_map. If there are several map cell candidates, one is + selected randomly. """ - def test_cell(t, y, x): - if "." == chr(world_db["MAP"][(y * world_db["MAP_LENGTH"]) + x]): - for id in [id for id in world_db["Things"] - 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 - world_db["Things"][id]["T_LIFEPOINTS"])]: - return False - return True - return False prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"] if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)): candidates = [] for dir in [directions_db[key] for key in directions_db]: mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"]) - if mv_result[0] and test_cell(t, mv_result[1], mv_result[2]): + if mv_result[0] and ord('.') == prol_map[mv_result[1] + * world_db["MAP_LENGTH"] + + mv_result[2]]: candidates.append((mv_result[1], mv_result[2])) if len(candidates): i = rand.next() % len(candidates) @@ -1025,6 +1024,12 @@ def turn_over(): id = 0 whilebreaker = False while world_db["Things"][0]["T_LIFEPOINTS"]: + proliferable_map = world_db["MAP"][:] + for id in [id for id in world_db["Things"] + if not world_db["Things"][id]["carried"]]: + y = world_db["Things"][id]["T_POSY"] + x = world_db["Things"][id]["T_POSX"] + proliferable_map[y * world_db["MAP_LENGTH"] + x] = ord('X') for id in [id for id in world_db["Things"]]: # Only what's from start! if not id in world_db["Things"] or \ world_db["Things"][id]["carried"]: # May have been consumed or @@ -1047,7 +1052,7 @@ def turn_over(): Thing["T_COMMAND"] = 0 Thing["T_PROGRESS"] = 0 hunger(Thing) - thingproliferation(Thing) + thingproliferation(Thing, proliferable_map) if whilebreaker: break world_db["TURN"] += 1 @@ -1111,8 +1116,10 @@ def command_ping(): def command_quit(): """Abort server process.""" - save_world() - atomic_write(io_db["path_record"], io_db["record_chunk"], do_append=True) + if None == opts.replay: + if world_db["WORLD_ACTIVE"]: + save_world() + atomic_write(io_db["path_record"], io_db["record_chunk"], do_append=True) raise SystemExit("received QUIT command")