home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f6a1bf0
)
Server: Don't keep player from moving over passable symbols.
author
Christian Heller
<c.heller@plomlompom.de>
Mon, 22 Feb 2016 23:01:31 +0000
(
00:01
+0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Mon, 22 Feb 2016 23:01:31 +0000
(
00:01
+0100)
server/commands.py
patch
|
blob
|
history
diff --git
a/server/commands.py
b/server/commands.py
index f55400b4b8595f7113702a523952ba47a013934f..f20297d31da9041562a4acd9cdf44ecd130f3ba4 100644
(file)
--- a/
server/commands.py
+++ b/
server/commands.py
@@
-489,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"):
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.")
@@
-499,7
+499,7
@@
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
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