X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=0802d1f4f8928f4d1805812aa16d838c2252cab1;hb=b90d2d0d4a1357bfdaf3244886e66bd6ac400ed4;hp=c28f4def769ed6b6518009c6d9c0e690daa12aae;hpb=a8a6d44854996263da1b20f76dd24b1444fadb5c;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index c28f4de..0802d1f 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -120,9 +120,14 @@ 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"],
+                 "WORLD_ACTIVE " + str(world_db["WORLD_ACTIVE"]) + "\n" +
+                 "MAP_LENGTH " + str(world_db["MAP_LENGTH"]) + "\n" +
+                 "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")
+    # TODO: If all this ever does is just writing down what's in world_db, some
+    # loop over its entries should be all that's needed.
 
 
 def obey_lines_in_file(path, name, do_record=False):
@@ -206,7 +211,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 +242,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,55 +272,76 @@ 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_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.
-    min = 0
-    max = 4294967295
+    # DUMMY.
+    worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
+    worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string)
+
+
+def command_maplength(maplength_string):
+    # DUMMY.
+    worlddb_value_setter("MAP_LENGTH", 1, 256)(maplength_string)
+
+
+def command_worldactive(worldactive_string):
+    # DUMMY.
     try:
-        seed = int(seed_string)
-        if seed < min or seed > max:
+        val = int(worldactive_string)
+        if not (0 == val or 1 == val):
             raise ValueError
-        world_db["SEED_RANDOMNESS"] = seed
-        world_db["SEED_MAP"] = seed
     except ValueError:
-        print("Ignoring: Please use integer >= " + str(min) + " and <= " +
-               "str(max) '.")
+        print("Ignoring: Please use integer 0 or 1.")
+        return
+    if 0 != world_db["WORLD_ACTIVE"] and 0 == val:
+        world_db["WORLD_ACTIVE"] = 0
+    elif 0 == world_db["WORLD_ACTIVE"]:
+        wait_exists = False
+        player_exists = False
+        map_exists = False
+        # TODO: perform tests:
+        # Is there thing action of name 'wait'?
+        # Is there a player thing?
+        # Is there a map?
+        if wait_exists and player_exists and map_exists:
+            # TODO: rebuild al things' FOVs, map memories
+            world_db["WORLD_ACTIVE"] = 1
 
 
 """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)),
+    "MAP_LENGTH": (1, False, command_maplength),
+    "WORLD_ACTIVE": (1, False, command_worldactive)
 }
 
 
-"""World state database,"""
+"""World state database. With sane default values."""
 world_db = {
-    "TURN": 0,
+    "TURN": 1,
     "SEED_MAP": 0,
-    "SEED_RANDOMNESS": 0
+    "SEED_RANDOMNESS": 0,
+    "PLAYER_TYPE": 0,
+    "MAP_LENGTH": 64,
+    "WORLD_ACTIVE": 0
 }