X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=2312ab4f6e0b268fa32254c9b5815e713623887c;hb=bf8653594beb9ee94b8e7c4139b2891425a6367b;hp=8b831313c9d69a14f5b92b9f81273a13274e27b3;hpb=7faae7c97770388f0067c541d27e21573008115d;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 8b83131..2312ab4 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -76,24 +76,29 @@ class Task_FLATTEN_SURROUNDINGS(Task): class Task_PICK_UP(Task): + argtypes = 'int:pos' def check(self): if self.thing.carrying: raise PlayError('already carrying something') - nothing_to_pick_up = True - for t in [t for t in self.thing.game.things - if t.portable - and t != self.thing and t.position == self.thing.position and - t.type_ != 'Player']: - nothing_to_pick_up = False - break - if nothing_to_pick_up: - raise PlayError('nothing to pick up') + to_pick_up = self.thing.game.get_thing(self.args[0]) + neighbors = self.thing.game.map_geometry.\ + get_neighbors_yxyx(self.thing.position).values() + reach = [self.thing.position] + list(neighbors) + if to_pick_up is None: + raise PlayError('no such thing exists') + elif to_pick_up == self.thing: + raise PlayError('cannot pick up oneself') + elif to_pick_up.type_ == 'Player': + raise PlayError('cannot pick up player') + elif to_pick_up.position not in reach: + raise PlayError('thing not in reach') + elif not to_pick_up.portable: + raise PlayError('thing not portable') def do(self): - to_pick_up = [t for t in self.thing.game.things - if t.portable - and t != self.thing and t.position == self.thing.position][0] + to_pick_up = self.thing.game.get_thing(self.args[0]) + to_pick_up.position = self.thing.position[:] self.thing.carrying = to_pick_up @@ -103,8 +108,26 @@ class Task_DROP(Task): def check(self): if not self.thing.carrying: raise PlayError('nothing to drop') + 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 == self.thing.position]: + raise PlayError('cannot drop full bottle into bottle deposit') def do(self): + if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full: + for t in [t for t in self.thing.game.things + if t.type_ == 'BottleDeposit' + and t.position == self.thing.position]: + t.accept() + self.thing.game.things.remove(self.thing.carrying) + break + elif self.thing.carrying.type_ == 'Hat': + for t in [t for t in self.thing.game.things + if t.type_ == 'HatRemixer' + and t.position == self.thing.position]: + t.accept(self.thing.carrying) + break self.thing.carrying = None @@ -128,15 +151,93 @@ class Task_INTOXICATE(Task): def check(self): if self.thing.carrying is None: - raise PlayError('nothing to consume') - if self.thing.carrying.type_ != 'Consumable': - raise PlayError('cannot consume non-consumable') + 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('bottle is empty') def do(self): - self.thing.game.things.remove(self.thing.carrying) - self.thing.carrying = None - for c_id in self.thing.game.sessions: - if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_: - self.thing.game.io.send('RANDOM_COLORS', c_id) - self.thing.game.io.send('CHAT "You are drunk now."', c_id) + 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 + + + +class Task_COMMAND(Task): + argtypes = 'string' + + def check(self): + if self.thing.carrying is None: + raise PlayError('nothing to command') + if not self.thing.carrying.commandable: + raise PlayError('cannot command this item type') + + def do(self): + from plomrogue.misc import quote + reply_lines = self.thing.carrying.interpret(self.args[0]) + for line in reply_lines: + self.thing.send_msg('REPLY ' + quote(line)) + + + +class Task_INSTALL(Task): + + def _get_uninstallables(self): + return [t for t in self.thing.game.things + if t != self.thing + and hasattr(t, 'installable') and t.installable + and (not t.portable) + and t.position == self.thing.position] + + def check(self): + if self.thing.carrying: + if not hasattr(self.thing.carrying, 'installable')\ + or not self.thing.carrying.installable: + raise PlayError('carried thing not installable') + elif len(self._get_uninstallables()) == 0: + raise PlayError('nothing to uninstall here') + + def do(self): + if self.thing.carrying: + self.thing.carrying.install() + self.thing.carrying = None + self.thing.send_msg('CHAT "You install the thing you carry."') + else: + self._get_uninstallables()[0].uninstall() + self.thing.send_msg('CHAT "You uninstall the thing here."') + + + +class Task_WEAR(Task): + + def check(self): + if self.thing.name in self.thing.game.hats: + return + if not self.thing.carrying: + raise PlayError('carrying nothing to wear') + if self.thing.name in self.thing.game.hats: + raise PlayError('already wearing a hat') + if self.thing.carrying.type_ != 'Hat': + raise PlayError('can only wear a hat') + + def do(self): + if self.thing.name in self.thing.game.hats: + t = self.thing.game.thing_types['Hat'](self.thing.game, + position=self.thing.position) + self.thing.game.things += [t] + t.design = self.thing.game.hats[self.thing.name] + del self.thing.game.hats[self.thing.name] + self.thing.send_msg('CHAT "You drop your hat."') + for t in [t for t in self.thing.game.things + if t.type_ == 'HatRemixer' + and t.position == self.thing.position]: + t.accept(t) + break + else: + self.thing.game.hats[self.thing.name] = self.thing.carrying.design + self.thing.game.things.remove(self.thing.carrying) + self.thing.carrying = None + self.thing.send_msg('CHAT "You put on a hat."')