X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=plomrogue-server.py;h=447382f571fcf2681a97df72c0a832099ff54af9;hb=0994f215bc01a8817592eff5e5261b3d48ec0f0d;hp=d71d1d363bc5d7f5ea220bcb02919e182731dd43;hpb=3bdf187e744251e62800513b0a19efdb3227132c;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index d71d1d3..447382f 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -247,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):
@@ -282,16 +290,68 @@ 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)
+    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
+
+
+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" }
+    min = 0
+    max = 255
+    try:
+        id = int(id_string)
+        if id < min or id > max:
+            raise ValueError
+    except ValueError:
+        print("Ignoring: Please use integer >= " + str(min) + " and <= " +
+              str(max) + ".")
+        return
+    if id in world_db["thing actions"]:
+        pass # TODO: Assign ID to work on in other TA_ commands …
+    else:
+        new(id)
+    print(world_db)
 
 
 """Commands database.
@@ -311,7 +371,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)
 }
 
 
@@ -322,7 +383,10 @@ world_db = {
     "SEED_RANDOMNESS": 0,
     "PLAYER_TYPE": 0,
     "MAP_LENGTH": 64,
-    "WORLD_ACTIVE": 0
+    "WORLD_ACTIVE": 0,
+    "thing actions": {},
+    "thing types": {},
+    "things": {}
 }