Consistent use of "pickup" instead of "pickup" as command name.

[plomrogue] / server / commands.py

diff --git a/server/commands.py b/server/commands.py
index 31bbea633023bca3d5edff3e5e29b7fedc9d12f4..346661a5db11d342ad2133f3e68f110e8754b56b 100644 (file)
--- a/server/commands.py
+++ b/server/commands.py
@@ -305,7 +305,7 @@ def command_taname(name):
     setting no ThingAction with name "wait" remains, call set_world_inactive().
     """
     if name == "wait" or name == "move" or name == "use" or name == "drop" \
-       or name == "pick_up":
+       or name == "pickup":
         world_db["ThingActions"][command_taid.id]["TA_NAME"] = name
         if 1 == world_db["WORLD_ACTIVE"]:
             wait_defined = False
@@ -429,14 +429,14 @@ def play_wait():
 def action_exists(action):
     matching_actions = [x for x in world_db["ThingActions"]
                         if world_db["ThingActions"][x]["TA_NAME"] == action]
-    if len(matching_actions) > 1:
+    if len(matching_actions) >= 1:
         return True
     print("No appropriate ThingAction defined.")
     return False
 
 
 def play_pickup():
-    """Try "pick_up" as player's T_COMMAND"."""
+    """Try "pickup" as player's T_COMMAND"."""
     if action_exists("pickup"):
         t = world_db["Things"][0]
         ids = [id for id in world_db["Things"] if id
@@ -446,7 +446,7 @@ def play_pickup():
         if not len(ids):
              log("NOTHING to pick up.")
         else:
-            set_command("pick_up")
+            set_command("pickup")
 
 
 def play_drop(str_arg):