X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=5a45c1b18b41fbd2b56956e3fb069c6d2c5d003e;hb=3598b2537f135ff7b7635e22a823661c6bdb9ff5;hp=d5745edb20046f9ae4276c8c2d20f8ece96b3f6a;hpb=99a7dbd09989520d9d2a3fe6a9f95749ab92f7b4;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index d5745ed..5a45c1b 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:
@@ -120,6 +120,7 @@ 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"],
+                 "PLAYER_TYPE " + str(world_db["PLAYER_TYPE"]) + "\n" +
                  "TURN " + str(world_db["TURN"]) + "\n" +
                  "SEED_RANDOMNESS " + str(world_db["SEED_RANDOMNESS"]) + "\n" +
                  "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n")
@@ -206,7 +207,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
@@ -237,6 +238,25 @@ def play_game():
         obey(read_command(), "in file", do_record=True)
 
 
+def remake_map():
+    # DUMMY.
+    print("I'd (re-)make the map 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():
     """Send PONG line to server output file."""
     io_db["file_out"].write("PONG\n")
@@ -248,47 +268,34 @@ def command_quit():
     raise SystemExit("received QUIT command")
 
 
-def command_turn(turn_string):
-    """Set turn to what's described in turn_string."""
-    try:
-        turn = int(turn_string)
-        min = 0
-        max = 65535
-        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_seedmap(seed_string):
+    """Set world_db["SEED_MAP"] to int(seed_string), then (re-)make map."""
+    worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
+    remake_map()
 
 
 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) '.")
+    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, command_seedmap),
+    "SEED_RANDOMNESS": (1, False, worlddb_value_setter("SEED_RANDOMNESS", 0,
+                                                       4294967295)),
+    "TURN": (1, False, worlddb_value_setter("TURN", 0, 65535)),
+    "PLAYER_TYPE": (1, False, worlddb_value_setter("PLAYER_TYPE", 0, 255))
 }
 
 
@@ -296,7 +303,8 @@ commands_db = {
 world_db = {
     "TURN": 0,
     "SEED_MAP": 0,
-    "SEED_RANDOMNESS": 0
+    "SEED_RANDOMNESS": 0,
+    "PLAYER_TYPE": 0
 }