is called (and io_db["record_chunk"] written) if 15 seconds have passed
since the last time it was called. The prefix string is inserted into the
server's input message between its beginning 'input ' and ':'. All activity
- is preceded by a server_test() call.
+ is preceded by a server_test() call. Commands that start with a lowercase
+ letter are ignored when world_db["WORLD_ACTIVE"] is False/0.
"""
server_test()
if io_db["verbose"]:
and len(tokens) == commands_db[tokens[0]][0] + 1:
if commands_db[tokens[0]][1]:
commands_db[tokens[0]][2](*tokens[1:])
+ elif tokens[0][0].islower() and not world_db["WORLD_ACTIVE"]:
+ print("Ignoring lowercase-starting commands when world inactive.")
elif replay:
print("Due to replay mode, reading command as 'go on in record'.")
line = io_db["file_record"].readline()
return '"' + string.replace('"', '\u005C"') + '"'
def mapsetter(key):
- def helper(id):
+ def helper(id=None):
string = ""
- if world_db["Things"][id][key]:
- map = world_db["Things"][id][key]
+ if key == "MAP" or world_db["Things"][id][key]:
+ map = world_db["MAP"] if key == "MAP" \
+ else world_db["Things"][id][key]
length = world_db["MAP_LENGTH"]
for i in range(length):
line = map[i * length:(i * length) + length].decode()
string = ""
for key in sorted(world_db.keys()):
if (not isinstance(world_db[key], dict)) and key != "MAP" and \
- key != "WORLD_ACTIVE" and key != "SEED_MAP":
+ key != "WORLD_ACTIVE":
string = string + key + " " + str(world_db[key]) + "\n"
- string = string + "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n"
+ string = string + mapsetter("MAP")()
string = string + helper("ThingActions", "TA_ID")
string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False})
for id in sorted(world_db["ThingTypes"].keys()):
to land. The cycle ends when a land cell is due to be created at the map's
border. Then put some trees on the map (TODO: more precise algorithm desc).
"""
+
def is_neighbor(coordinates, type):
y = coordinates[0]
x = coordinates[1]
and type == chr(world_db["MAP"][pos + length - (not ind)])):
return True
return False
- store_seed = rand.seed
- rand.seed = world_db["SEED_MAP"]
+
world_db["MAP"] = bytearray(b'~' * (world_db["MAP_LENGTH"] ** 2))
length = world_db["MAP_LENGTH"]
add_half_width = (not (length % 2)) * int(length / 2)
and ((not single_allowed) or is_neighbor((y, x), "X")):
world_db["MAP"][pos] = ord("X")
i_trees += 1
- rand.seed = store_seed
# This all-too-precise replica of the original C code misses iter_limit().
rand.seed = val
-def command_seedmap(seed_string):
- """Set world_db["SEED_MAP"] to int(seed_string), then (re-)make map."""
- setter(None, "SEED_MAP", 0, 4294967295)(seed_string)
- remake_map()
-
-
def command_makeworld(seed_string):
"""(Re-)build game world, i.e. map, things, to a new turn 1 from seed.
- Seed rand with seed, fill it into world_db["SEED_MAP"]. Do more only with a
- "wait" ThingAction and world["PLAYER_TYPE"] matching ThingType of
- TT_START_NUMBER > 0. Then, world_db["Things"] emptied, call remake_map()
- and set world_db["WORLD_ACTIVE"], world_db["TURN"] to 1. Build new Things
+ Seed rand with seed. Do more only with a "wait" ThingAction and
+ world["PLAYER_TYPE"] matching ThingType of TT_START_NUMBER > 0. Then,
+ world_db["Things"] emptied, call remake_map() and set
+ world_db["WORLD_ACTIVE"], world_db["TURN"] to 1. Build new Things
according to ThingTypes' TT_START_NUMBERS, with Thing of ID 0 to ThingType
of ID = world["PLAYER_TYPE"]. Place Things randomly, and actors not on each
other. Init player's memory map. Write "NEW_WORLD" line to out file.
if None == val:
return
rand.seed = val
- world_db["SEED_MAP"] = val
player_will_be_generated = False
playertype = world_db["PLAYER_TYPE"]
for ThingType in world_db["ThingTypes"]:
player_will_be_generated = True
break
if not player_will_be_generated:
- print("Ignoring beyond SEED_MAP: " +
- "No player type with start number >0 defined.")
+ print("Ignoring: No player type with start number >0 defined.")
return
wait_action = False
for ThingAction in world_db["ThingActions"]:
"""Toggle world_db["WORLD_ACTIVE"] if possible.
An active world can always be set inactive. An inactive world can only be
- set active with a "wait" ThingAction, and a player Thing (of ID 0). On
- activation, rebuild all Things' FOVs, and the player's map memory.
+ set active with a "wait" ThingAction, and a player Thing (of ID 0), and a
+ map. On activation, rebuild all Things' FOVs, and the player's map memory.
"""
- # In original version, map existence was also tested (unnecessarily?).
val = integer_test(worldactive_string, 0, 1)
if val:
if 0 != world_db["WORLD_ACTIVE"]:
if 0 == Thing:
player_exists = True
break
- if wait_exists and player_exists:
+ if wait_exists and player_exists and "MAP" in world_db:
for id in world_db["Things"]:
if world_db["Things"][id]["T_LIFEPOINTS"]:
build_fov_map(world_db["Things"][id])
if 0 == id:
update_map_memory(world_db["Things"][id], False)
world_db["WORLD_ACTIVE"] = 1
+ else:
+ print("Ignoring: Not all conditions for world activation met.")
def test_for_id_maker(object, category):
def setter_map(maptype):
- """Set selected Thing's map of maptype's int(str_int)-th line to mapline.
+ """Set (world or Thing's) map of maptype's int(str_int)-th line to mapline.
- If Thing has no map of maptype yet, initialize it with ' ' bytes first.
+ If no map of maptype exists yet, initialize it with ' ' bytes first.
"""
- @test_Thing_id
- def helper(str_int, mapline):
+
+ def valid_map_line(str_int, mapline):
val = integer_test(str_int, 0, 255)
if None != val:
if val >= world_db["MAP_LENGTH"]:
elif len(mapline) != world_db["MAP_LENGTH"]:
print("Map line length is unequal map width.")
else:
- length = world_db["MAP_LENGTH"]
- map = None
- if not world_db["Things"][command_tid.id][maptype]:
- map = bytearray(b' ' * (length ** 2))
- else:
- map = world_db["Things"][command_tid.id][maptype]
- map[val * length:(val * length) + length] = mapline.encode()
+ return val
+ return None
+
+ def nonThingMap_helper(str_int, mapline):
+ val = valid_map_line(str_int, mapline)
+ if None != val:
+ length = world_db["MAP_LENGTH"]
+ if not "MAP" in world_db:
+ map = bytearray(b' ' * (length ** 2))
+ else:
+ map = world_db["MAP"]
+ map[val * length:(val * length) + length] = mapline.encode()
+ if not "MAP" in world_db:
+ world_db["MAP"] = map
+
+ @test_Thing_id
+ def ThingMap_helper(str_int, mapline):
+ val = valid_map_line(str_int, mapline)
+ if None != val:
+ length = world_db["MAP_LENGTH"]
+ if not world_db["Things"][command_tid.id][maptype]:
+ map = bytearray(b' ' * (length ** 2))
+ else:
+ map = world_db["Things"][command_tid.id][maptype]
+ map[val * length:(val * length) + length] = mapline.encode()
+ if not world_db["Things"][command_tid.id][maptype]:
world_db["Things"][command_tid.id][maptype] = map
- return helper
+
+ return nonThingMap_helper if maptype == "MAP" else ThingMap_helper
+
def setter_tpos(axis):
"PING": (0, True, command_ping),
"THINGS_HERE": (2, True, command_thingshere),
"MAKE_WORLD": (1, False, command_makeworld),
- "SEED_MAP": (1, False, command_seedmap),
"SEED_RANDOMNESS": (1, False, command_seedrandomness),
"TURN": (1, False, setter(None, "TURN", 0, 65535)),
"PLAYER_TYPE": (1, False, setter(None, "PLAYER_TYPE", 0)),
"MAP_LENGTH": (1, False, command_maplength),
"WORLD_ACTIVE": (1, False, command_worldactive),
+ "MAP": (2, False, setter_map("MAP")),
"TA_ID": (1, False, command_taid),
"TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
"TA_NAME": (1, False, command_taname),
world_db = {
"TURN": 0,
"MAP_LENGTH": 64,
- "SEED_MAP": 0,
"PLAYER_TYPE": 0,
"WORLD_ACTIVE": 0,
"ThingActions": {},
projects / plomrogue / blobdiff