X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=plomrogue-server.py;h=0098e472c22dee6857343892b3ef4e521015b79d;hb=596fa8650135f6f757fd021f723aef957d5b7a8d;hp=9e4f008a5198d58d3dc937456532eaf1480a482f;hpb=b4e6d1d9288cc3b44c7b524ddd74d2feb0e24b3d;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index 9e4f008..0098e47 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -69,7 +69,7 @@ def obey(command, prefix, replay=False, do_record=False):
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:
@@ -119,7 +119,10 @@ def record(command):
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):
@@ -203,7 +206,7 @@ def replay_game():
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
@@ -234,9 +237,18 @@ def play_game():
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 worlddb_value_setter(key, min, max):
+ """Generate: Set world_db[key] to int(val_string) if >= min and <= max."""
+ def func(val_string):
+ 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)+ '.")
+ return func
def command_ping():
@@ -250,29 +262,35 @@ def command_quit():
raise SystemExit("received QUIT command")
-def command_turn(turn_string):
- """Set turn to what's described in turn_string."""
- world_db["TURN"] = int(turn_string)
+def command_makeworld(seed_string):
+ # Mere dummy so far.
+ worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
+ worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string)
"""Commands database.
-Map command start tokens to ([0]) minimum number of expected command arguments,
-([1]) the command's meta-ness (i.e. is it to be written to the record file, is
-it to be ignored in replay mode if read from server input file), and ([2]) a
-function to be called on it.
+Map command start tokens to ([0]) number of expected command arguments, ([1])
+the command's meta-ness (i.e. is it to be written to the record file, is it to
+be ignored in replay mode if read from server input file), and ([2]) a function
+to be called on it.
"""
commands_db = {
"QUIT": (0, True, command_quit),
"PING": (0, True, command_ping),
"MAKE_WORLD": (1, False, command_makeworld),
- "TURN": (1, False, command_turn)
+ "SEED_MAP": (1, False, worlddb_value_setter("SEED_MAP", 0, 4294967295)),
+ "SEED_RANDOMNESS": (1, False, worlddb_value_setter("SEED_RANDOMNESS", 0,
+ 4294967295)),
+ "TURN": (1, False, worlddb_value_setter("TURN", 0, 65535))
}
"""World state database,"""
world_db = {
- "TURN": 0
+ "TURN": 0,
+ "SEED_MAP": 0,
+ "SEED_RANDOMNESS": 0
}