# HG changeset patch # User Stefano Rivera # Date 1378501897 -7200 # Node ID e2cebabf87e8b5b1b546f4e728e59d6457854093 # Parent 8069c9be1c3e0193bb5d33c1735cb0863061cf5d Collected collectables stay collected diff -r 8069c9be1c3e -r e2cebabf87e8 data/levels/level1 --- a/data/levels/level1 Fri Sep 06 23:07:27 2013 +0200 +++ b/data/levels/level1 Fri Sep 06 23:11:37 2013 +0200 @@ -19,6 +19,7 @@ - args: - [300, 600] classname: collectable.Gun + name: gun - args: - [300, 500] - light_switch diff -r 8069c9be1c3e -r e2cebabf87e8 nagslang/level.py --- a/nagslang/level.py Fri Sep 06 23:07:27 2013 +0200 +++ b/nagslang/level.py Fri Sep 06 23:11:37 2013 +0200 @@ -93,6 +93,9 @@ module = 'game_object' cls = getattr(modules[module], classname) + if module == 'collectable' and name in self.world.inventory: + return + if issubclass(cls, puzzle.Puzzler): gobj = cls(*args) elif issubclass(cls, go.GameObject):