Server/py: Some refactoring.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 10f613cf7cb8e860316d61e45249d569dfdbdcf0..3b8639bfb3883bf7c3a3e5acec324b0f1c5bd4a2 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -126,6 +126,8 @@ def save_world():
                  "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):
@@ -245,17 +247,33 @@ 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 integer_test(val_string, min, max):
+    """Return val_string if possible integer >= min and <= max, else False."""
+    try:
+        val = int(val_string)
+        if val < min or val > max:
+            raise ValueError
+        return val
+    except ValueError:
+        print("Ignoring: Please use integer >= " + str(min) + " and <= " +
+              str(max) + ".")
+        return False
+
+
 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
+        val = integer_test(val_string, min, max)
+        if val:
             world_db[key] = val
-        except ValueError:
-            print("Ignoring: Please use integer >= " + str(min) + " and <= " +
-                  str(max) + ".")
     return func
 
 
@@ -280,16 +298,54 @@ 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.
-    worlddb_value_setter("WORLD_ACTIVE", 0, 255)(worldactive_string)
+    val = integer_test(worldactive_string, 0, 1)
+    if val:
+        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
+
+
+def command_taid(id_string):
+    # DUMMY
+    def new(id):
+        """Add new ThingAction to world_db["thing_actions"]."""
+        if 0 == id:
+            while 1:
+                id = id + 1
+                if id not in world_db["thing actions"]:
+                    break
+            if id > 255:
+                print("Ignoring: No unused ID available to add to ID list.")
+                return
+        world_db["thing actions"][id] = { "TA_EFFORT": 1, "TA_NAME": "wait" }
+    val = integer_test(id_string, 0, 255)
+    if val:
+        if id in world_db["thing actions"]:
+            pass # TODO: Assign ID to work on in other TA_ commands …
+        else:
+            new(id)
 
 
 """Commands database.
@@ -309,18 +365,22 @@ commands_db = {
     "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_ACTIVE": (1, False, command_worldactive),
+    "TA_ID": (1, False, command_taid)
 }
 
 
-"""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,
-    "WORLD_ACTIVE": 0
+    "WORLD_ACTIVE": 0,
+    "thing actions": {},
+    "thing types": {},
+    "things": {}
 }