home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use default player_id that cannot be mixed up.
[plomrogue2-experiments]
/
new
/
plomrogue
/
tasks.py
diff --git
a/new/plomrogue/tasks.py
b/new/plomrogue/tasks.py
index 11d4ba33ca69b125366f4262f4a65bfc8816617f..d97b92335e3e8c40dfefe79541340bdca8dd644a 100644
(file)
--- a/
new/plomrogue/tasks.py
+++ b/
new/plomrogue/tasks.py
@@
-68,7
+68,8
@@
class Task_PICKUP(Task):
% self.args[0])
def do(self):
% self.args[0])
def do(self):
- to_pick_up = self.thing.game.get_thing(self.args[0])
+ to_pick_up = self.thing.game.get_thing(self.args[0],
+ create_unfound=False)
self.thing.inventory += [self.args[0]]
to_pick_up.in_inventory = True
to_pick_up.position = self.thing.position
self.thing.inventory += [self.args[0]]
to_pick_up.in_inventory = True
to_pick_up.position = self.thing.position
@@
-87,7
+88,7
@@
class TaskOnInventoryItem(Task):
return item
def _eliminate_from_inventory(self):
return item
def _eliminate_from_inventory(self):
- item = self.thing.game.get_thing(self.args[0])
+ item = self.thing.game.get_thing(self.args[0]
, create_unfound=False
)
del self.thing.inventory[self.thing.inventory.index(item.id_)]
item.in_inventory = False
return item
del self.thing.inventory[self.thing.inventory.index(item.id_)]
item.in_inventory = False
return item