diff nagslang/protagonist.py @ 374:150332d6c1fb

Move the inventory to world, to slightly reduce overall hackyness
author Stefano Rivera <stefano@rivera.za.net>
date Fri, 06 Sep 2013 22:44:14 +0200
parents 21c1c329f8e3
children 83c29d0a0b9c
line wrap: on
line diff
--- a/nagslang/protagonist.py	Fri Sep 06 22:33:51 2013 +0200
+++ b/nagslang/protagonist.py	Fri Sep 06 22:44:14 2013 +0200
@@ -72,7 +72,6 @@
         super(Protagonist, self).__init__(
             self._make_physics(space, position), self._make_renderer())
         self.world = world
-        self.inventory = set()
         self.health_level = PROTAGONIST_HEALTH_MAX_LEVEL
 
         self.angle = 0
@@ -256,7 +255,6 @@
         self.impulse_factor = old_protagonist.impulse_factor
         self.form = old_protagonist.form
         self.angle = old_protagonist.angle
-        self.inventory = old_protagonist.inventory
 
     def toggle_form(self):
         if self.check_timer('change_delay'):
@@ -322,7 +320,10 @@
         return self.form == self.HUMAN_FORM
 
     def has_item(self, item):
-        return item in self.inventory
+        return item in self.world.inventory
+
+    def add_item(self, item):
+        self.world.inventory.add(item)
 
     def environmental_movement(self, dx, dy):
         if (dx, dy) == (0, 0):