home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor thing addition / removal.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index edfc3d10efddbd1fc4a9d95031b3fd8ea4101aca..08a4a4f58119d2818a89a18a5b5e2577f230b945 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-103,7
+103,6
@@
class Task_PICK_UP(Task):
to_pick_up = self.thing.game.get_thing(self.args[0])
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
to_pick_up = self.thing.game.get_thing(self.args[0])
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
- #self.thing.game.changed_fovs = True
@@
-124,7
+123,7
@@
class Task_DROP(Task):
if t.type_ == 'BottleDeposit'
and t.position == self.thing.position]:
t.accept()
if t.type_ == 'BottleDeposit'
and t.position == self.thing.position]:
t.accept()
- self.thing.game.
things.remove
(self.thing.carrying)
+ self.thing.game.
remove_thing
(self.thing.carrying)
break
elif self.thing.carrying.type_ == 'Hat':
for t in [t for t in self.thing.game.things
break
elif self.thing.carrying.type_ == 'Hat':
for t in [t for t in self.thing.game.things
@@
-133,7
+132,6
@@
class Task_DROP(Task):
t.accept(self.thing.carrying)
break
self.thing.carrying = None
t.accept(self.thing.carrying)
break
self.thing.carrying = None
- #self.thing.game.changed_fovs = True
@@
-232,9
+230,7
@@
class Task_WEAR(Task):
def do(self):
if self.thing.name in self.thing.game.hats:
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 = self.thing.game.add_thing('Hat', self.thing.position)
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."')
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."')