home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow toggling of map control preset drawing.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index 95945055e0f7e15923bc34780a985c2b3a5ea556..10e4055e4c3799745757c6f3a8bf9d001eb0d49c 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:
@@
-244,7
+247,7
@@
class Task_INTOXICATE(Task):
def check(self):
if self.thing.carrying is None:
raise PlayError('carrying nothing to consume')
def check(self):
if self.thing.carrying is None:
raise PlayError('carrying nothing to consume')
- if
self.thing.carrying.type_ not in {'Bottle', 'Cookie', 'Psychedelic'}
:
+ if
not self.thing.carrying.consumable
:
raise PlayError('cannot consume this kind of thing')
if self.thing.carrying.type_ == 'Bottle' and\
not self.thing.carrying.full:
raise PlayError('cannot consume this kind of thing')
if self.thing.carrying.type_ == 'Bottle' and\
not self.thing.carrying.full:
@@
-256,11
+259,11
@@
class Task_INTOXICATE(Task):
self.thing.carrying.empty()
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.need_for_toilet += 1
self.thing.carrying.empty()
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.need_for_toilet += 1
- self.thing.drunk = 10000
+ self.thing.drunk
+
= 10000
self.thing.invalidate('fov')
self.thing.game.record_change(self.thing.position, 'other')
elif self.thing.carrying.type_ == 'Psychedelic':
self.thing.invalidate('fov')
self.thing.game.record_change(self.thing.position, 'other')
elif self.thing.carrying.type_ == 'Psychedelic':
- self.thing.tripping = 10000
+ self.thing.tripping
+
= 10000
self.thing.send_msg('CHAT "You start tripping."')
self.thing.send_msg('RANDOM_COLORS')
eaten = self.thing.uncarry()
self.thing.send_msg('CHAT "You start tripping."')
self.thing.send_msg('RANDOM_COLORS')
eaten = self.thing.uncarry()
@@
-270,6
+273,11
@@
class Task_INTOXICATE(Task):
self.thing.add_cookie_char(self.thing.carrying.thing_char)
eaten = self.thing.uncarry()
self.thing.game.remove_thing(eaten)
self.thing.add_cookie_char(self.thing.carrying.thing_char)
eaten = self.thing.uncarry()
self.thing.game.remove_thing(eaten)
+ elif self.thing.carrying.type_ == 'Stimulant':
+ self.thing.send_msg('CHAT "You feel a flash of energy."')
+ self.thing.energy += 50
+ eaten = self.thing.uncarry()
+ self.thing.game.remove_thing(eaten)
@@
-371,3
+379,12
@@
class Task_SPIN(Task):
def do(self):
self.thing.carrying.spin()
self.thing.send_msg('CHAT "You spin this object."')
def do(self):
self.thing.carrying.spin()
self.thing.send_msg('CHAT "You spin this object."')
+
+
+
+class Task_DANCE(Task):
+
+ def do(self):
+ self.thing.send_msg('CHAT "You dance."')
+ self.thing.dancing += 10
+ self.thing.game.changed = True