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 cc375272c1edd941aeafbbb4117a3d30db142d8c..10e4055e4c3799745757c6f3a8bf9d001eb0d49c 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-247,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:
@@
-259,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()
@@
-273,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)