X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=eb9d31ac3bdd72852eeb664f70d7fd3b49fd1c27;hb=bf3698bd7e0837d8b9ead6126435a3b5f1896230;hp=09e9c56702083cefbff105268a5c7a241f20d8fb;hpb=3e0f898a8bc308e6b7d06573a90c197eff8d82f3;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 09e9c56..eb9d31a 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -42,16 +42,42 @@ class Task_MOVE(Task):
raise PlayError('blocked by impassable tile')
def do(self):
+ if self.thing.type_ == 'Player' and not self.thing.standing:
+ self.thing.standing = True
+ self.thing.send_msg('CHAT "You get up."')
self.thing.game.record_change(self.thing.position, 'other')
if self.thing.blocks_light:
self.thing.game.record_change(self.thing.position, 'fov')
self.thing.position = self._get_move_target()
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'Player' and not t == self.thing
+ and t.position == self.thing.position]:
+ self.thing.send_msg('CHAT %s' %
+ quote('You get awkwardly close to %s.' % t.name))
+ for c_id in self.thing.game.sessions:
+ if self.thing.game.sessions[c_id]['thing_id'] == t.id_:
+ t.send_msg('CHAT %s' %
+ quote('%s gets awkwardly close to you.' %
+ self.thing.name))
+ break
self.thing.game.record_change(self.thing.position, 'other')
+ terrain = \
+ self.thing.game.maps[self.thing.position[0]][self.thing.position[1]]
+ if terrain in self.thing.game.terrains:
+ 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. '
+ 'Staying here will reduce your weariness."'
+ % 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
@@ -116,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')
@@ -127,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 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_ == 'BottleDeposit':
+ target.accept()
+ self.thing.game.remove_thing(dropped)
+ break
+ 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')
@@ -165,6 +206,23 @@ class Task_DROP(Task):
class Task_DOOR(Task):
+ def check(self):
+ action_radius = list(self.thing.game.map_geometry.
+ get_neighbors_yxyx(self.thing.position).values())
+ reachable_doors = [t for t in self.thing.game.things if
+ t.type_ == 'Door' and t.position in action_radius]
+ if len(reachable_doors) == 0:
+ raise PlayError('not standing next to a door to open/close')
+ for door in reachable_doors:
+ if not door.blocks_movement:
+ return
+ if not door.locked:
+ return
+ if self.thing.carrying and self.thing.carrying.type_ == 'DoorKey'\
+ and self.thing.carrying.door == door:
+ return
+ raise PlayError('cannot open locked door without its key')
+
def do(self):
action_radius = list(self.thing.game.map_geometry.
get_neighbors_yxyx(self.thing.position).values())
@@ -174,6 +232,11 @@ class Task_DOOR(Task):
t.open()
else:
t.close()
+ if self.thing.carrying and\
+ self.thing.carrying.type_ == 'DoorKey' and\
+ self.thing.carrying.door == t:
+ self.thing.send_msg('CHAT "You lock the door."')
+ t.lock()
self.thing.game.record_change(t.position, 'other')
self.thing.game.record_change(t.position, 'fov')
@@ -195,7 +258,6 @@ 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 *= 2
self.thing.need_for_toilet += 1
self.thing.drunk = 10000
self.thing.invalidate('fov')