print("Can't tokenize command string: " + str(err) + ".")
return
if len(tokens) > 0 and tokens[0] in commands_db \
- and len(tokens) >= commands_db[tokens[0]][0] + 1:
+ and len(tokens) == commands_db[tokens[0]][0] + 1:
if commands_db[tokens[0]][1]:
commands_db[tokens[0]][2]()
elif replay:
def save_world():
# Dummy for saving all commands to reconstruct current world state.
# Misses same optimizations as record() from the original record().
- atomic_write(io_db["path_save"], "TURN " + str(world_db["TURN"]) + "\n")
+ atomic_write(io_db["path_save"],
+ "TURN " + str(world_db["TURN"]) + "\n" +
+ "SEED_RANDOMNESS " + str(world_db["SEED_RANDOMNESS"]) + "\n" +
+ "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n")
def obey_lines_in_file(path, name, do_record=False):
io_db["file_record"] = open(io_db["path_record"], "r")
io_db["file_record"].prefix = "record file line "
io_db["file_record"].line_n = 1
- while world_db["turn"] < opts.replay:
+ while world_db["TURN"] < opts.replay:
line = io_db["file_record"].readline()
if "" == line:
break
obey(read_command(), "in file", do_record=True)
-def command_makeworld(seed):
- """Mere dummy so far."""
- print("I would build a whole world now if only I knew how.")
-
-
def command_ping():
"""Send PONG line to server output file."""
io_db["file_out"].write("PONG\n")
raise SystemExit("received QUIT command")
+def set_world_db_integer_value(key, val_string, min, max):
+ """Set world_db[key] to int(val_string) if legal value >= min & <= max."""
+ try:
+ val = int(val_string)
+ if val < min or val > max:
+ raise ValueError
+ world_db[key] = val
+ except ValueError:
+ print("Ignoring: Please use integer >= " + str(min) + " and <= " +
+ "str(max)+ '.")
+
+
def command_turn(turn_string):
"""Set turn to what's described in turn_string."""
- world_db["TURN"] = int(turn_string)
+ set_world_db_integer_value("TURN", turn_string, 0, 65535)
+
+
+def command_seedmap(mapseed_string):
+ """Set map seed to what's described in mapseed_string."""
+ set_world_db_integer_value("SEED_MAP", mapseed_string, 0, 4294967295)
+
+
+def command_seedrandomness(randseed_string):
+ """Set randomness seed to what's described in randseed_string."""
+ set_world_db_integer_value("SEED_RANDOMNESS", randseed_string, 0,
+ 4294967295)
+
+
+def command_makeworld(seed_string):
+ # Mere dummy so far.
+ set_world_db_integer_value("SEED_MAP", seed_string, 0, 4294967295)
+ set_world_db_integer_value("SEED_RANDOMNESS", seed_string, 0, 4294967295)
"""Commands database.
"QUIT": (0, True, command_quit),
"PING": (0, True, command_ping),
"MAKE_WORLD": (1, False, command_makeworld),
+ "SEED_MAP": (1, False, command_seedmap),
+ "SEED_RANDOMNESS": (1, False, command_seedrandomness),
"TURN": (1, False, command_turn)
}
"""World state database,"""
world_db = {
- "TURN": 0
+ "TURN": 0,
+ "SEED_MAP": 0,
+ "SEED_RANDOMNESS": 0
}