Server/py: Fix KeyError-triggering typo.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 6f51078710609f13bcc7b5067ae391d7fbf0e3d9..25e2ce41d7f1147c00fb2df46a02a545d2457d3f 100755 (executable)
--- 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:
@@ -82,7 +82,7 @@ def obey(command, prefix, replay=False, do_record=False):
             else:
                 print("Reached end of record file.")
         else:
-            commands_db[tokens[0]][2]()
+            commands_db[tokens[0]][2](*tokens[1:])
             if do_record:
                 record(command)
                 save_world()
@@ -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"], "bla\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,11 +237,6 @@ def play_game():
         obey(read_command(), "in file", do_record=True)
 
 
-def command_makeworld():
-    """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")
@@ -250,6 +248,35 @@ def command_quit():
     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.
+    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) '.")
+
+
 """Commands database.
 
 Map command start tokens to ([0]) minimum number of expected command arguments,
@@ -260,13 +287,16 @@ function to be called on it.
 commands_db = {
     "QUIT": (0, True, command_quit),
     "PING": (0, True, command_ping),
-    "MAKE_WORLD": (1, False, command_makeworld)
+    "MAKE_WORLD": (1, False, command_makeworld),
+    "TURN": (1, False, command_turn)
 }
 
 
 """World state database,"""
 world_db = {
-    "turn": 0
+    "TURN": 0,
+    "SEED_MAP": 0,
+    "SEED_RANDOMNESS": 0
 }