X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=2121c75ad2cf15988c240544b10da159e37d0d0c;hb=c19590f615bb7c2482e1e9da91e46f6d1f50fc1a;hp=7d4532108afdd14d76a513dc45603085b018e4de;hpb=0e8f9d67473a7fc8a9784abfb111e9dd95a2d742;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 7d45321..2121c75 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -449,6 +449,47 @@ def build_fov_map(t):
     # DUMMY so far. Just builds an all-visible map.
 
 
+def turn_over():
+    """Run game world and its inhabitants until new player input expected."""
+    id = 0
+    print("turning over")
+    whilebreaker = False
+    while world_db["Things"][0]["T_LIFEPOINTS"]:
+        for id in [id for id in world_db["Things"]
+                      if not world_db["Things"][id]["carried"]
+                      if world_db["Things"][id]["T_LIFEPOINTS"]]:
+            print(str(id))
+            Thing = world_db["Things"][id]
+            if Thing["T_LIFEPOINTS"]:
+                print("  evaluating thing")
+                if not Thing["T_COMMAND"]:
+                    print("    thing needs new command")
+                    update_map_memory(Thing)
+                    if 0 == id:
+                        whilebreaker = True
+                        break
+                    # DUMMY: ai(thing)
+                    print("    run AI")
+                    Thing["T_COMMAND"] = 1
+                # DUMMY: try_healing
+                Thing["T_PROGRESS"] += 1
+                taid = [a for a in world_db["ThingActions"]
+                          if a == Thing["T_COMMAND"]][0]
+                ThingAction = world_db["ThingActions"][taid]
+                if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
+                    print("  running thing action")
+                    # run_thing_action(action["TA_NAME"])
+                    Thing["T_COMMAND"] = 0
+                    Thing["T_PROGRESS"] = 0
+                # DUMMY: hunger
+            # DUMMY: thingproliferation
+        if whilebreaker:
+            break
+        print("  turn finished")
+        world_db["TURN"] += 1
+        print("  new turn " + str(world_db["TURN"]))
+
+
 def new_Thing(type):
     """Return Thing of type T_TYPE, with fovmap if alive and world active."""
     thing = {
@@ -545,6 +586,44 @@ 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 and T_ARGUMENT, then calling turn_over().
+
+    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
+        turn_over()
+        # 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)
@@ -913,6 +992,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)),
 }