X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=server%2Fcommands.py;h=3717202e38354c7b38eb585ac2d948870dae5b69;hb=0ba8f0d73efe88bb1d99d973fdbec420465e447c;hp=71094e3b2c953e5d122df611a314cd0756c46fe2;hpb=d29cadf50b9a1daed21fa1d68a5c86ca5d953856;p=plomrogue
diff --git a/server/commands.py b/server/commands.py
index 71094e3..3717202 100644
--- a/server/commands.py
+++ b/server/commands.py
@@ -7,7 +7,8 @@ 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 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
@@ -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):
@@ -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