Mercurial > nagslang
changeset 379:e2cebabf87e8
Collected collectables stay collected
| author | Stefano Rivera <stefano@rivera.za.net> |
|---|---|
| date | Fri, 06 Sep 2013 23:11:37 +0200 |
| parents | 8069c9be1c3e |
| children | a106d7e1415b c22784701143 |
| files | data/levels/level1 nagslang/level.py |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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):