X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server%2Fcommands.py;h=9a103372d91fd8aae96bf403dc93d7fc881a80d8;hb=2d78939fd39c64a41742a73558708628e38e282d;hp=c17635e3f369d7119f10c0c15cd89b308b5d0ef2;hpb=d9387d37c9b9d1bee65694d0eb24bb028f26f32a;p=plomrogue
diff --git a/server/commands.py b/server/commands.py
index c17635e..9a10337 100644
--- a/server/commands.py
+++ b/server/commands.py
@@ -15,8 +15,9 @@ def command_plugin(str_plugin):
"""Run code in plugins/[str_plugin]."""
import os
if (str_plugin.replace("_", "").isalnum()
- and os.access("plugins/" + str_plugin, os.F_OK)):
- exec(open("plugins/" + str_plugin).read())
+ and os.access("plugins/server/" + str_plugin + ".py", os.F_OK)):
+ exec(open("plugins/server/" + str_plugin + ".py").read())
+ world_db["PLUGIN"] += [str_plugin]
return
print("Bad plugin name:", str_plugin)
@@ -305,7 +306,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
@@ -436,7 +437,7 @@ def action_exists(action):
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 +447,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):
@@ -506,6 +507,6 @@ def play_move(str_arg):
def command_ai():
"""Call ai() on player Thing, then turn_over()."""
- from server.ai import ai
- ai(world_db["Things"][0])
+ from server.config.actions import ai_func
+ ai_func(world_db["Things"][0])
turn_over()