string = ""
for key in world_db:
- if dict != type(world_db[key]) and key != "MAP":
+ if dict != type(world_db[key]) and key != "MAP" and \
+ key != "WORLD_ACTIVE" and key != "SEED_MAP":
string = string + key + " " + str(world_db[key]) + "\n"
+ string = string + "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n"
string = string + helper("ThingActions", "TA_ID")
string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False})
for id in world_db["ThingTypes"]:
# This all-too-precise replica of the original C code misses iter_limit().
-def update_map_memory(t):
+def update_map_memory(t, age_map=True):
"""Update t's T_MEMMAP with what's in its FOV now,age its T_MEMMEPTHMAP."""
if not t["T_MEMMAP"]:
t["T_MEMMAP"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
if " " == chr(t["T_MEMMAP"][pos]):
t["T_MEMMAP"][pos] = world_db["MAP"][pos]
continue
- if ord('0') <= t["T_MEMDEPTHMAP"][pos] \
- and ord('9') >= t["T_MEMDEPTHMAP"][pos] \
+ if age_map and 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"]:
+ for id in [id for id in world_db["Things"]
+ if not world_db["Things"][id]["carried"]]:
type = world_db["Things"][id]["T_TYPE"]
if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]:
y = world_db["Things"][id]["T_POSY"]
def actor_move(t):
"""If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
passable = False
- move_result = mv_yx_in_dir_legal(t["T_ARGUMENT"], t["T_POSY"], t["T_POSX"])
+ move_result = mv_yx_in_dir_legal(chr(t["T_ARGUMENT"]),
+ t["T_POSY"], t["T_POSX"])
if 1 == move_result[0]:
pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
passable = "." == chr(world_db["MAP"][pos])
decrement_lifepoints(world_db["Things"][hit_id])
return
dir = [dir for dir in directions_db
- if directions_db[dir] == t["T_ARGUMENT"]][0]
+ if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
if passable:
t["T_POSY"] = move_result[1]
t["T_POSX"] = move_result[2]
def set_command_and_argument_movestring(str_arg):
if str_arg in directions_db:
- world_db["Things"][0]["T_ARGUMENT"] = directions_db[str_arg]
+ world_db["Things"][0]["T_ARGUMENT"] = ord(directions_db[str_arg])
set_command()
else:
print("Ignoring: Argument must be valid direction string.")
"""World state database. With sane default values. (Randomness is in rand.)"""
world_db = {
"TURN": 0,
+ "MAP_LENGTH": 64,
"SEED_MAP": 0,
"PLAYER_TYPE": 0,
- "MAP_LENGTH": 64,
"WORLD_ACTIVE": 0,
"ThingActions": {},
"ThingTypes": {},