X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_free?a=blobdiff_plain;f=plomrogue-server.py;h=7b1fefbaa2c0c3a004c87def831f097846acdaee;hb=1f530d9bf745036092ef4c344137ced7bafbd153;hp=d5745edb20046f9ae4276c8c2d20f8ece96b3f6a;hpb=99a7dbd09989520d9d2a3fe6a9f95749ab92f7b4;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index d5745ed..7b1fefb 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:
@@ -206,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
@@ -248,33 +248,38 @@ def command_quit():
     raise SystemExit("received QUIT command")
 
 
-def command_turn(turn_string):
-    """Set turn to what's described in turn_string."""
+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:
-        turn = int(turn_string)
-        min = 0
-        max = 65535
-        if turn < min or turn > max:
+        val = int(val_string)
+        if val < min or val > max:
             raise ValueError
-        world_db["TURN"] = turn
+        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."""
+    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.
-    try:
-        seed = int(seed_string)
-        min = 0
-        max = 4294967295
-        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) '.")
+    set_world_db_integer_value("SEED_MAP", seed_string, 0, 4294967295)
+    set_world_db_integer_value("SEED_RANDOMNESS", seed_string, 0, 4294967295)
 
 
 """Commands database.
@@ -288,6 +293,8 @@ commands_db = {
     "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)
 }