Server/py: Add rump for player action handling.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 140da879b96e2098a21c400ac8f3ea56ba886ecd..010db5fae3d38ca16c83f9be91c5de7288046471 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -294,20 +294,19 @@ def try_worldstate_update():
         length = world_db["MAP_LENGTH"]
         fov = bytearray(b' ' * (length ** 2))
         for pos in range(length ** 2):
-            fovflag = world_db["Things"][0]["fovmap"][pos]
-            if 'v' == chr(fovflag):
+            if 'v' == chr(world_db["Things"][0]["fovmap"][pos]):
                 fov[pos] = world_db["MAP"][pos]
         for i in range(3):
             draw_visible_Things(fov, i)
         string = write_map(string, fov)
         mem = world_db["Things"][0]["T_MEMMAP"][:]
         for i in range(2):
-            for id in world_db["Things"][0]["T_MEMTHING"]:
-                type = world_db["Things"][id]["T_TYPE"]
+            for memthing in world_db["Things"][0]["T_MEMTHING"]:
+                type = world_db["Things"][memthing[0]]["T_TYPE"]
                 consumable = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
                 if (i == 0 and not consumable) or (i == 1 and consumable):
-                        c = world_db["ThingTypes"][type]["TT_SYMBOL"]
-                        mem[(y * length) + x] = ord(c)
+                    c = world_db["ThingTypes"][type]["TT_SYMBOL"]
+                    mem[(memthing[1] * length) + memthing[2]] = ord(c)
         string = write_map(string, mem)
         atomic_write(io_db["path_worldstate"], string)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
@@ -383,18 +382,18 @@ def update_map_memory(t):
                 t["T_MEMMAP"][pos] = world_db["MAP"][pos]
             continue
         # TODO: Aging of MEMDEPTHMAP.
-    for id in t["T_MEMTHING"]:
-        y = world_db["Things"][id]["T_POSY"]
-        x = world_db["Things"][id]["T_POSY"]
+    for memthing in t["T_MEMTHING"]:
+        y = world_db["Things"][memthing[0]]["T_POSY"]
+        x = world_db["Things"][memthing[1]]["T_POSY"]
         if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]):
-            t["T_MEMTHING"].remove(id)
+            t["T_MEMTHING"].remove(memthing)
     for id in world_db["Things"]:
         type = world_db["Things"][id]["T_TYPE"]
         if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]:
             y = world_db["Things"][id]["T_POSY"]
             x = world_db["Things"][id]["T_POSY"]
             if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]):
-                t["T_MEMTHING"] = (type, y, x)
+                t["T_MEMTHING"].append((type, y, x))
 
 
 def set_world_inactive():
@@ -546,6 +545,43 @@ def command_thingshere(str_y, str_x):
         print("Ignoring: Command only works on existing worlds.")
 
 
+def play_commander(action, args=False):
+    """Setter for player's T_COMMAND (to "action") and T_ARGUMENT.
+
+    T_ARGUMENT is set to direction char if action=="wait",or 8-bit int if args.
+    """
+
+    def set_command():
+        id = [x for x in world_db["ThingActions"]
+                if world_db["ThingActions"][x]["TA_NAME"] == action][0]
+        world_db["Things"][0]["T_COMMAND"] = id
+        # TODO: call turn_over()
+
+    def set_command_and_argument_int(str_arg):
+        val = integer_test(str_arg, 0, 255)
+        if None != val:
+            world_db["Things"][0]["T_ARGUMENT"] = val
+            set_command()
+        else:
+            print("Ignoring: Argument must be integer >= 0 <=255.")
+
+    def set_command_and_argument_movestring(str_arg):
+        dirs = {"east": "d", "south-east": "c", "south-west": "x",
+                "west": "s", "north-west": "w", "north-east": "e"}
+        if str_arg in dirs:
+            world_db["Things"][0]["T_ARGUMENT"] = dirs[str_arg]
+            set_command()
+        else:
+            print("Ignoring: Argument must be valid direction string.")
+
+    if action == "move":
+        return set_command_and_argument_movestring
+    elif args:
+        return set_command_and_argument_int
+    else:
+        return set_command
+
+
 def command_seedmap(seed_string):
     """Set world_db["SEED_MAP"] to int(seed_string), then (re-)make map."""
     setter(None, "SEED_MAP", 0, 4294967295)(seed_string)
@@ -914,6 +950,11 @@ commands_db = {
     "T_MEMTHING": (3, False, command_tmemthing),
     "T_POSY": (1, False, setter_tpos("Y")),
     "T_POSX": (1, False, setter_tpos("X")),
+    "wait": (0, False, play_commander("wait")),
+    "move": (1, False, play_commander("move")),
+    "pick_up": (0, False, play_commander("pick_up")),
+    "drop": (1, False, play_commander("drop", True)),
+    "use": (1, False, play_commander("use", True)),
 }
 
 
@@ -949,7 +990,6 @@ io_db = {
 try:
     opts = parse_command_line_arguments()
     setup_server_io()
-    # print("DUMMY: Run game.")
     if None != opts.replay:
         replay_game()
     else:
@@ -961,4 +1001,3 @@ except:
     raise
 finally:
     cleanup_server_io()
-    # print("DUMMY: (Clean up C heap.)")