X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fcommands.py;h=3717202e38354c7b38eb585ac2d948870dae5b69;hb=3a9b266ee5f6bdecab5b1c895923c3373cca7dca;hp=9a103372d91fd8aae96bf403dc93d7fc881a80d8;hpb=c8f535af53bd1478065ee5daf1ff4230fe423249;p=plomrogue

diff --git a/server/commands.py b/server/commands.py
index 9a10337..3717202 100644
--- a/server/commands.py
+++ b/server/commands.py
@@ -7,8 +7,9 @@ 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):
@@ -83,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):
@@ -149,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)
 
 
@@ -488,7 +489,7 @@ def play_use(str_arg):
 def play_move(str_arg):
     """Try "move" as player's T_COMMAND, str_arg as T_ARGUMENT / direction."""
     if action_exists("move"):
-        from server.config.world_data import directions_db
+        from server.config.world_data import directions_db, symbols_passable
         t = world_db["Things"][0]
         if not str_arg in directions_db:
             print("Illegal move direction string.")
@@ -498,7 +499,10 @@ def play_move(str_arg):
         move_result = mv_yx_in_dir_legal(chr(dir), t["T_POSY"], t["T_POSX"])
         if 1 == move_result[0]:
             pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
-            if ord(".") == world_db["MAP"][pos]:
+            if ord("~") == world_db["MAP"][pos]:
+                log("You can't SWIM.")
+                return
+            if chr(world_db["MAP"][pos]) in symbols_passable:
                 world_db["Things"][0]["T_ARGUMENT"] = dir
                 set_command("move")
                 return