X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=4a0e147ee358f7a1623a4adb3844110887bbe4e6;hb=cf2a7a164c24e82a5efc4cfe9c56c4b4f2c442df;hp=6ee273164f19dd33422c99c21d708f71cab21dc8;hpb=5cd44408532e23648ddcd1d59004a9dae59694af;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 6ee2731..4a0e147 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -67,13 +67,17 @@ class Task_MOVE(Task):
terrain_type = self.thing.game.terrains[terrain]
if 'sittable' in terrain_type.tags:
self.thing.standing = False
- self.thing.send_msg('CHAT "You sink into the %s."'
+ self.thing.send_msg('CHAT "You sink into the %s. '
+ 'Staying here will replenish your energy."'
% terrain_type.description)
self.thing.invalidate('fov')
if self.thing.blocks_light:
self.thing.game.record_change(self.thing.position, 'fov')
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
+ if self.thing.carrying.type_ == 'Crate':
+ for t in self.thing.carrying.content:
+ t.position = self.thing.position
@@ -138,6 +142,11 @@ class Task_PICK_UP(Task):
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
to_pick_up.carried = True
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'Crate' and to_pick_up in t.content]:
+ t.remove_from_crate(to_pick_up)
+ self.thing.send_msg('CHAT "You take the item out of the crate."')
+ break
self.thing.game.record_change(self.thing.position, 'other')
@@ -149,36 +158,46 @@ class Task_DROP(Task):
if not self.thing.carrying:
raise PlayError('nothing to drop')
target_position = self._get_move_target()
- if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
- for t in [t for t in self.thing.game.things
- if t.type_ == 'BottleDeposit'
- and t.position == target_position]:
- raise PlayError('cannot drop full bottle into bottle deposit')
+ targets = [t for t in self.thing.game.things
+ if t.position == target_position
+ and not t == self.thing.carrying]
+ for target in targets:
+ if target.type_ == 'CookieSpawner' and\
+ not self.thing.carrying.cookable:
+ raise PlayError('cannot cook items of this type')
+ elif target.type_ == 'BottleDeposit':
+ if not self.thing.carrying.type_ == 'Bottle':
+ raise PlayError('cannot only put bottle into bottle deposit')
+ if self.thing.carrying.full:
+ raise PlayError('cannot drop full '
+ 'bottle into bottle deposit')
+ elif target.type_ == 'Crate' and\
+ self.thing.carrying.type_ == 'Crate':
+ raise PlayError('cannot put crate into crate')
def do(self):
target_position = self._get_move_target()
dropped = self.thing.uncarry()
dropped.position = target_position
- over_cookie_spawner = None
- for t in [t for t in self.thing.game.things
- if t.type_ == 'CookieSpawner'
- and t.position == dropped.position]:
- over_cookie_spawner = t
- break
- if over_cookie_spawner:
- over_cookie_spawner.accept(dropped)
- self.thing.game.remove_thing(dropped)
- elif dropped.type_ == 'Bottle' and not dropped.full:
- for t in [t for t in self.thing.game.things
- if t.type_ == 'BottleDeposit'
- and t.position == dropped.position]:
- t.accept()
+ 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:
+ if target.type_ == 'CookieSpawner':
+ target.accept(dropped)
+ self.thing.game.remove_thing(dropped)
+ break
+ elif target.type_ == 'BottleDeposit':
+ target.accept()
self.thing.game.remove_thing(dropped)
break
- elif dropped.type_ == 'Hat':
- for t in [t for t in self.thing.game.things
- if t.type_ == 'HatRemixer'
- and t.position == dropped.position]:
+ elif target.type_ == 'Crate':
+ target.accept(dropped)
+ self.thing.send_msg('CHAT "You put the item into the crate."')
+ break
+ elif target.type_ == 'HatRemixer':
t.accept(dropped)
break
self.thing.game.record_change(self.thing.position, 'other')
@@ -228,7 +247,7 @@ class Task_INTOXICATE(Task):
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:
@@ -239,12 +258,12 @@ class Task_INTOXICATE(Task):
self.thing.carrying.full = False
self.thing.carrying.empty()
self.thing.send_msg('CHAT "You are drunk now."')
- self.thing.need_for_toilet += 10000
- self.thing.drunk = 10000
+ self.thing.need_for_toilet += 1
+ 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.tripping = 10000
+ self.thing.tripping += 10000
self.thing.send_msg('CHAT "You start tripping."')
self.thing.send_msg('RANDOM_COLORS')
eaten = self.thing.uncarry()
@@ -254,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)
+ elif self.thing.carrying.type_ == 'Stimulant':
+ self.thing.send_msg('CHAT "You feel a flash of energy."')
+ self.thing.energy += 100
+ eaten = self.thing.uncarry()
+ self.thing.game.remove_thing(eaten)
@@ -355,3 +379,12 @@ class Task_SPIN(Task):
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