home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Invert weariness metric into energy metric.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index 95945055e0f7e15923bc34780a985c2b3a5ea556..6f42109362fc7aaf7e2810921e65ffe66d74a3d2 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-68,7
+68,7
@@
class Task_MOVE(Task):
if 'sittable' in terrain_type.tags:
self.thing.standing = False
self.thing.send_msg('CHAT "You sink into the %s. '
if 'sittable' in terrain_type.tags:
self.thing.standing = False
self.thing.send_msg('CHAT "You sink into the %s. '
- 'Staying here will re
duce your weariness
."'
+ 'Staying here will re
plenish your energy
."'
% terrain_type.description)
self.thing.invalidate('fov')
if self.thing.blocks_light:
% terrain_type.description)
self.thing.invalidate('fov')
if self.thing.blocks_light:
@@
-179,6
+179,9
@@
class Task_DROP(Task):
target_position = self._get_move_target()
dropped = self.thing.uncarry()
dropped.position = target_position
target_position = self._get_move_target()
dropped = self.thing.uncarry()
dropped.position = target_position
+ if dropped.type_ == 'Crate':
+ for item in dropped.content:
+ item.position = target_position
targets = [t for t in self.thing.game.things
if t.position == dropped.position and not t == dropped]
for target in targets:
targets = [t for t in self.thing.game.things
if t.position == dropped.position and not t == dropped]
for target in targets: