X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=4f390d47c92a88fbb1782944f623b3c44012d846;hb=a1dff58317110c212b5493e3d1432b06d5058e10;hp=6a886496658f4c228e33563fb6958a09c8efe4cc;hpb=eadcddf7699d5df683d544531b441332d79b6661;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 6a88649..4f390d4 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -34,16 +34,22 @@ class Task_MOVE(Task): def check(self): test_yxyx = self._get_move_target() + move_blockers = self.thing.game.get_movement_blockers() if test_yxyx in [t.position for t in self.thing.game.things - if t.blocking]: + if t.blocks_movement]: raise PlayError('blocked by other thing') - elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] != '.': + elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] in move_blockers: raise PlayError('blocked by impassable tile') def do(self): - self.thing.game.record_fov_change(self.thing.position) + 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() - self.thing.game.record_fov_change(self.thing.position) + self.thing.game.record_change(self.thing.position, 'other') + 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 @@ -61,7 +67,7 @@ class Task_WRITE(Task): big_yx = self.thing.position[0] little_yx = self.thing.position[1] self.thing.game.maps[big_yx][little_yx] = self.args[0] - self.thing.game.record_fov_change((big_yx, little_yx)) + self.thing.game.record_change((big_yx, little_yx), 'fov') @@ -77,8 +83,8 @@ class Task_FLATTEN_SURROUNDINGS(Task): self.thing.position).values()): if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]): continue - self.thing.game.maps[yxyx[0]][yxyx[1]] = '.' - self.thing.game.record_fov_change(yxyx) + self.thing.game.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland() + self.thing.game.record_change(yxyx, 'fov') @@ -110,6 +116,7 @@ class Task_PICK_UP(Task): to_pick_up.position = self.thing.position[:] self.thing.carrying = to_pick_up to_pick_up.carried = True + self.thing.game.record_change(self.thing.position, 'other') @@ -130,7 +137,16 @@ class Task_DROP(Task): target_position = self._get_move_target() dropped = self.thing.uncarry() dropped.position = target_position - if dropped.type_ == 'Bottle' and not dropped.full: + 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]: @@ -143,6 +159,7 @@ class Task_DROP(Task): and t.position == dropped.position]: t.accept(dropped) break + self.thing.game.record_change(self.thing.position, 'other') @@ -153,11 +170,12 @@ class Task_DOOR(Task): get_neighbors_yxyx(self.thing.position).values()) for t in [t for t in self.thing.game.things if t.type_ == 'Door' and t.position in action_radius]: - if t.blocking: + if t.blocks_movement: t.open() else: t.close() - self.thing.game.record_fov_change(t.position) + self.thing.game.record_change(t.position, 'other') + self.thing.game.record_change(t.position, 'fov') @@ -165,19 +183,33 @@ class Task_INTOXICATE(Task): def check(self): if self.thing.carrying is None: - raise PlayError('carrying nothing to drink from') - if self.thing.carrying.type_ != 'Bottle': - raise PlayError('cannot drink from non-bottle') - if not self.thing.carrying.full: + raise PlayError('carrying nothing to consume') + if self.thing.carrying.type_ not in {'Bottle', 'Cookie', 'Psychedelic'}: + raise PlayError('cannot consume this kind of thing') + if self.thing.carrying.type_ == 'Bottle' and\ + not self.thing.carrying.full: raise PlayError('bottle is empty') def do(self): - self.thing.carrying.full = False - self.thing.carrying.empty() - self.thing.send_msg('RANDOM_COLORS') - self.thing.send_msg('CHAT "You are drunk now."') - self.thing.drunk = 10000 - self.thing.invalidate_map_view() + if self.thing.carrying.type_ == 'Bottle': + 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.invalidate('fov') + self.thing.game.record_change(self.thing.position, 'other') + elif self.thing.carrying.type_ == 'Psychedelic': + self.thing.tripping = 10000 + self.thing.send_msg('CHAT "You start tripping."') + self.thing.send_msg('RANDOM_COLORS') + eaten = self.thing.uncarry() + self.thing.game.remove_thing(eaten) + elif self.thing.carrying.type_ == 'Cookie': + self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char)) + self.thing.add_cookie_char(self.thing.carrying.thing_char) + eaten = self.thing.uncarry() + self.thing.game.remove_thing(eaten) @@ -198,6 +230,7 @@ class Task_COMMAND(Task): class Task_INSTALL(Task): + argtypes = 'string' def _get_uninstallables(self): return [t for t in self.thing.game.things @@ -207,6 +240,9 @@ class Task_INSTALL(Task): and t.position == self.thing.position] def check(self): + if not self.thing.game.can_do_tile_with_pw(*self.thing.position, + self.args[0]): + raise GameError('wrong password for tile') if self.thing.carrying: if not hasattr(self.thing.carrying, 'installable')\ or not self.thing.carrying.installable: @@ -222,6 +258,7 @@ class Task_INSTALL(Task): else: self._get_uninstallables()[0].uninstall() self.thing.send_msg('CHAT "You uninstall the thing here."') + self.thing.game.record_change(self.thing.position, 'other') @@ -257,8 +294,9 @@ class Task_WEAR(Task): self.thing.game.hats[self.thing.name] =\ self.thing.carrying.design self.thing.send_msg('CHAT "You put on a hat."') - self.thing.game.remove_thing(self.thing.carrying) - self.thing.carrying = None + dropped = self.thing.uncarry() + self.thing.game.remove_thing(dropped) + self.thing.game.record_change(self.thing.position, 'other') @@ -272,3 +310,4 @@ class Task_SPIN(Task): def do(self): self.thing.carrying.spin() + self.thing.send_msg('CHAT "You spin this object."')