Server/py: In SERVER_COMMANDS, mirror Python variant more precisely.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 322357485f0e264e9013ff2f65f377802c7e64f3..276903fa471d3d5c9444c61b8eb4cf32d148476b 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -120,11 +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):
@@ -244,6 +247,14 @@ def remake_map():
     print("I'd (re-)make the map now, if only I knew how.")
 
 
+def set_world_inactive():
+    """Set world_db["WORLD_ACTIVE"] to 0 and remove worldstate file."""
+    server_test()
+    if os.access(io_db["path_worldstate"], os.F_OK):
+        os.remove(io_db["path_worldstate"])
+    world_db["WORLD_ACTIVE"] = 0
+
+
 def worlddb_value_setter(key, min, max):
     """Generate: Set world_db[key] to int(val_string) if >= min and <= max."""
     def func(val_string):
@@ -254,7 +265,7 @@ def worlddb_value_setter(key, min, max):
             world_db[key] = val
         except ValueError:
             print("Ignoring: Please use integer >= " + str(min) + " and <= " +
-                  "str(max)+ '.")
+                  str(max) + ".")
     return func
 
 
@@ -279,13 +290,40 @@ def command_makeworld(seed_string):
     # DUMMY.
     worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
     worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string)
+    # TODO: Test for existence of player thing and 'wait' thing action?
 
 
 def command_maplength(maplength_string):
     # DUMMY.
+    set_world_inactive()
+    # TODO: remove things, map
     worlddb_value_setter("MAP_LENGTH", 1, 256)(maplength_string)
 
 
+def command_worldactive(worldactive_string):
+    # DUMMY.
+    try:
+        val = int(worldactive_string)
+        if not (0 == val or 1 == val):
+            raise ValueError
+    except ValueError:
+        print("Ignoring: Please use integer 0 or 1.")
+        return
+    if 0 != world_db["WORLD_ACTIVE"] and 0 == val:
+        set_world_inactive()
+    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]) number of expected command arguments, ([1])
@@ -302,17 +340,22 @@ commands_db = {
                                                        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)
+    "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,
     "PLAYER_TYPE": 0,
-    "MAP_LENGTH": 64
+    "MAP_LENGTH": 64,
+    "WORLD_ACTIVE": 0,
+    "thing actions": {},
+    "thing types": {},
+    "things": {}
 }