home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix remixer drop bug.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index 9fccbc33450f2c50fe5caf6269d0ba171bc7e644..9d3c23e7b69359da3dd9cdcd23a6cf853eb4ebbc 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-122,6
+122,12
@@
class Task_DROP(Task):
t.accept()
self.thing.game.things.remove(self.thing.carrying)
break
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
self.thing.carrying = None
@@
-224,7
+230,15
@@
class Task_WEAR(Task):
self.thing.game.things += [t]
t.design = self.thing.game.hats[self.thing.name]
del self.thing.game.hats[self.thing.name]
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 remixer in [t for t in self.thing.game.things
+ if t.type_ == 'HatRemixer'
+ and t.position == self.thing.position]:
+ remixer.accept(t)
+ break
else:
else:
+ from plomrogue.misc import quote
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.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."')