X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=3b8639bfb3883bf7c3a3e5acec324b0f1c5bd4a2;hb=59ce8a7af974dd20b24d4054a57c0f8377e153bb;hp=815e5d7f6680e89ee50aec66a994d1400e442733;hpb=fcd50b57f6a17b2f4957a6231c0982136007d8cc;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 815e5d7..3b8639b 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -255,17 +255,25 @@ def set_world_inactive():
     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
 
 
@@ -302,26 +310,42 @@ def command_maplength(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
+    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.
@@ -341,7 +365,8 @@ 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)
 }
 
 
@@ -352,7 +377,10 @@ world_db = {
     "SEED_RANDOMNESS": 0,
     "PLAYER_TYPE": 0,
     "MAP_LENGTH": 64,
-    "WORLD_ACTIVE": 0
+    "WORLD_ACTIVE": 0,
+    "thing actions": {},
+    "thing types": {},
+    "things": {}
 }