home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server/py: Refactoring.
[plomrogue]
/
plomrogue-server.py
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index 25e2ce41d7f1147c00fb2df46a02a545d2457d3f..0098e472c22dee6857343892b3ef4e521015b79d 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-237,6
+237,20
@@
def play_game():
obey(read_command(), "in file", do_record=True)
obey(read_command(), "in file", do_record=True)
+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():
"""Send PONG line to server output file."""
io_db["file_out"].write("PONG\n")
def command_ping():
"""Send PONG line to server output file."""
io_db["file_out"].write("PONG\n")
@@
-248,47
+262,27
@@
def command_quit():
raise SystemExit("received QUIT command")
raise SystemExit("received QUIT command")
-def command_turn(turn_string):
- """Set turn to what's described in turn_string."""
- min = 0
- max = 65535
- try:
- turn = int(turn_string)
- if turn < min or turn > max:
- raise ValueError
- world_db["TURN"] = turn
- except ValueError:
- print("Ignoring: Please use integer >= " + str(min) + " and <= " +
- "str(max)+ '.")
-
-
def command_makeworld(seed_string):
# Mere dummy so far.
def command_makeworld(seed_string):
# Mere dummy so far.
- min = 0
- max = 4294967295
- try:
- seed = int(seed_string)
- if seed < min or seed > max:
- raise ValueError
- world_db["SEED_RANDOMNESS"] = seed
- world_db["SEED_MAP"] = seed
- except ValueError:
- print("Ignoring: Please use integer >= " + str(min) + " and <= " +
- "str(max) '.")
+ worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
+ worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string)
"""Commands database.
"""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),
"""
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))
}
}