home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server, plugin: Minor language improvements.
[plomrogue]
/
server
/
commands.py
diff --git
a/server/commands.py
b/server/commands.py
index 71094e3b2c953e5d122df611a314cd0756c46fe2..d002ab3210b35100c2b63cb2784251f2abefc2ca 100644
(file)
--- 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.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
from server.build_fov_map import build_fov_map
@@
-48,6
+49,9
@@
def command_thingshere(str_y, str_x):
if None != y and None != x and y < length and x < length:
pos = (y * world_db["MAP_LENGTH"]) + x
strong_write(io_db["file_out"], "THINGS_HERE START\n")
if None != y and None != x and y < length and x < length:
pos = (y * world_db["MAP_LENGTH"]) + x
strong_write(io_db["file_out"], "THINGS_HERE START\n")
+ terrain = chr(world_db["Things"][0]["T_MEMMAP"][pos])
+ terrain_name = world_db["terrain_names"][terrain]
+ strong_write(io_db["file_out"], "terrain: " + terrain_name + "\n")
if "v" == chr(world_db["Things"][0]["fovmap"][pos]):
for id in [id for tid in sorted(list(world_db["ThingTypes"]))
for id in world_db["Things"]
if "v" == chr(world_db["Things"][0]["fovmap"][pos]):
for id in [id for tid in sorted(list(world_db["ThingTypes"]))
for id in world_db["Things"]
@@
-83,8
+87,8
@@
def command_makeworld(seed_string):
"""Call make_world()."""
val = integer_test(seed_string, 0, 4294967295)
if None != val:
"""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):
def command_maplength(maplength_string):
@@
-488,7
+492,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"):
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.")
t = world_db["Things"][0]
if not str_arg in directions_db:
print("Illegal move direction string.")
@@
-498,7
+502,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]
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
world_db["Things"][0]["T_ARGUMENT"] = dir
set_command("move")
return