X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fcommands.py;h=f55400b4b8595f7113702a523952ba47a013934f;hb=f6a1bf0aa76165c104d74fe8dfaf674d3e63b52d;hp=a3b68bcc62dfc810e22035e06d3b3a5eb0fe8771;hpb=3cfb2d131e570c546d8ed514b0930248a89db41b;p=plomrogue

diff --git a/server/commands.py b/server/commands.py
index a3b68bc..f55400b 100644
--- a/server/commands.py
+++ b/server/commands.py
@@ -7,16 +7,18 @@ from server.config.world_data import world_db
 from server.config.io import io_db
 from server.io import log, strong_write 
 from server.utils import integer_test, id_setter
-from server.world import build_fov_map, update_map_memory, set_world_inactive,\
-        turn_over
+from server.world import set_world_inactive, turn_over
+from server.update_map_memory import update_map_memory
+from server.build_fov_map import build_fov_map
 
 
 def command_plugin(str_plugin):
     """Run code in plugins/[str_plugin]."""
     import os
     if (str_plugin.replace("_", "").isalnum()
-        and os.access("plugins/server/" + str_plugin, os.F_OK)):
-        exec(open("plugins/server/" + 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)
 
@@ -82,8 +84,8 @@ def command_makeworld(seed_string):
     """Call make_world()."""
     val = integer_test(seed_string, 0, 4294967295)
     if None != val:
-        from server.world import make_world
-        make_world(val)
+        from server.config.misc import make_world_func
+        make_world_func(val)
 
 
 def command_maplength(maplength_string):
@@ -148,7 +150,7 @@ def command_tid(id_string):
             print("Ignoring: No ThingType to settle new Thing in.")
             return
         type = list(world_db["ThingTypes"].keys())[0]
-        from server.world import new_Thing
+        from server.new_thing import new_Thing
         world_db["Things"][id] = new_Thing(type)
 
 
@@ -506,6 +508,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()