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: Fix bug in savefile write delay calculation.
[plomrogue]
/
server
/
actions.py
diff --git
a/server/actions.py
b/server/actions.py
index f7edb76767d60602a705ac02e57980587d90495d..7222ad871cea7c0f3153cf8a61833dff6691d02d 100644
(file)
--- a/
server/actions.py
+++ b/
server/actions.py
@@
-20,7
+20,7
@@
def actor_move(t):
plus type id of attacked Thing. On move, return mv_yx_in_dir_legal result.
"""
from server.build_fov_map import build_fov_map
plus type id of attacked Thing. On move, return mv_yx_in_dir_legal result.
"""
from server.build_fov_map import build_fov_map
- from server.config.misc import decrement_lifepoints
_func
+ from server.config.misc import decrement_lifepoints
from server.utils import mv_yx_in_dir_legal
from server.config.world_data import directions_db, symbols_passable
passable = False
from server.utils import mv_yx_in_dir_legal
from server.config.world_data import directions_db, symbols_passable
passable = False
@@
-42,7
+42,7
@@
def actor_move(t):
elif 0 == hit_id:
hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
log(hitter_name +" WOUNDS you.")
elif 0 == hit_id:
hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
log(hitter_name +" WOUNDS you.")
- decr_test = decrement_lifepoints
_func
(world_db["Things"][hit_id])
+ decr_test = decrement_lifepoints(world_db["Things"][hit_id])
if decr_test > 0 and t == world_db["Things"][0]:
log(hitted_name + " dies.")
return decr_test, hitted_tid
if decr_test > 0 and t == world_db["Things"][0]:
log(hitted_name + " dies.")
return decr_test, hitted_tid