X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/ledger2?a=blobdiff_plain;f=plomrogue-server.py;h=871398068afad43523b8a4a60aec7b3eb480f250;hb=5cab9d91ffd4e2d2f94fe4c6455a612bb99498e2;hp=b6196c3c18100c94e57dd261928f38d6ba9a5d18;hpb=51bb20d7100ecf918d027ffff8ea6a5f3de7a6d6;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index b6196c3..8713980 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -120,10 +120,11 @@ def save_world():
     # Dummy for saving all commands to reconstruct current world state.
     # Misses same optimizations as record() from the original record().
     ta_string = ""
-    for id in world_db["thing actions"]:
-        ta = world_db["thing actions"][id]
+    for id in world_db["ThingActions"]:
+        ta = world_db["ThingActions"][id]
         ta_string = ta_string + "TA_ID " + str(id) + "\n" + \
-                                "TA_EFFORT " + str(ta["TA_EFFORT"]) + "\n"
+                                "TA_EFFORT " + str(ta["TA_EFFORT"]) + "\n" + \
+                                "TA_NAME " + ta["TA_NAME"] + "\n"
     atomic_write(io_db["path_save"],
                  "WORLD_ACTIVE " + str(world_db["WORLD_ACTIVE"]) + "\n" +
                  "MAP_LENGTH " + str(world_db["MAP_LENGTH"]) + "\n" +
@@ -343,19 +344,19 @@ def command_taid(id_string):
     """
     id = integer_test(id_string, 0, 255)
     if id:
-        if id in world_db["thing actions"]:
+        if id in world_db["ThingActions"]:
             command_taid.id = id
         else:
             if 0 == id:
                 while 1:
                     id = id + 1
-                    if id not in world_db["thing actions"]:
+                    if id not in world_db["ThingActions"]:
                         break
                 if id > 255:
                     print("Ignoring: "
                           "No unused ID available to add to ID list.")
                     return
-            world_db["thing actions"][id] = {
+            world_db["ThingActions"][id] = {
                 "TA_EFFORT": 1,
                 "TA_NAME": "wait"
             }
@@ -367,7 +368,34 @@ def command_taeffort(str_int):
     if hasattr(command_taid, "id"):
         val = integer_test(str_int, 0, 255)
         if val:
-            world_db["thing actions"][command_taid.id]["TA_EFFORT"] = val
+            world_db["ThingActions"][command_taid.id]["TA_EFFORT"] = val
+    else:
+        print("Ignoring: No thing action defined to manipulate yet.")
+
+
+def command_taname(name):
+    """Set to name name value of ThingAction of command_taid.id.
+
+    The name must match a valid thing action function. If after the name
+    setting no ThingAction with name "wait" remains, call set_world_inactive().
+    """
+    if hasattr(command_taid, "id"):
+        if name == "wait" or name == "move" or name == "use" \
+           or name == "drop" or name == "pick_up":
+            world_db["ThingActions"][command_taid.id]["TA_NAME"] = name
+            if 1 == world_db["WORLD_ACTIVE"]:
+                wait_defined = False
+                for id in world_db["ThingActions"]:
+                    if "wait" == world_db["ThingActions"][id]["TA_NAME"]:
+                        wait_defined = True
+                        break
+                if not wait_defined:
+                    set_world_inactive()
+        else:
+            print("Ignoring: Invalid action name.")
+    else:
+        print("No thing action defined to manipulate yet.")
+    # In contrast to the original,naming won't map a function to a ThingAction.
 
 
 """Commands database.
@@ -389,7 +417,8 @@ commands_db = {
     "MAP_LENGTH": (1, False, command_maplength),
     "WORLD_ACTIVE": (1, False, command_worldactive),
     "TA_ID": (1, False, command_taid),
-    "TA_EFFORT": (1, False, command_taeffort)
+    "TA_EFFORT": (1, False, command_taeffort),
+    "TA_NAME": (1, False, command_taname)
 }
 
 
@@ -401,9 +430,9 @@ world_db = {
     "PLAYER_TYPE": 0,
     "MAP_LENGTH": 64,
     "WORLD_ACTIVE": 0,
-    "thing actions": {},
-    "thing types": {},
-    "things": {}
+    "ThingActions": {},
+    "ThingTypes": {},
+    "Things": {}
 }