Changeset 374:150332d6c1fb

Timestamp:

09/06/13 20:44:14 (9 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Message:

Move the inventory to world, to slightly reduce overall hackyness

Location:

nagslang

Files:

• game_object.py (modified) (1 diff)
• protagonist.py (modified) (3 diffs)
• world.py (modified) (3 diffs)

nagslang/game_object.py

@@ -502 +502 @@
 
     def _collect(self, protagonist):
-        protagonist.inventory.add(self._name)
+        protagonist.add_item(self._name)
         # TODO: Make this less hacky.
         self.physicser.remove_from_space()

nagslang/protagonist.py

@@ -73 +73 @@
             self._make_physics(space, position), self._make_renderer())
         self.world = world
-        self.inventory = set()
         self.health_level = PROTAGONIST_HEALTH_MAX_LEVEL
 
@@ -257 +256 @@
         self.form = old_protagonist.form
         self.angle = old_protagonist.angle
-        self.inventory = old_protagonist.inventory
 
     def toggle_form(self):
@@ -323 +321 @@
 
     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):

nagslang/world.py

@@ -26 +26 @@
             'kills': 0,
             'rooms': 0,
-            'protagonist': Protagonist(pymunk.Space(), self,
-                                       starting_position),
             'level': (first_level, starting_position),
             'level_state': {},
+            'inventory': set(),
         }
+        self.__dict__['protagonist'] = Protagonist(
+            pymunk.Space(), self, starting_position)
 
     def __getattr__(self, name):
@@ -55 +56 @@
     def save(self):
         data = self._data.copy()
-        data['inventory'] = sorted(data.pop('protagonist').inventory)
+        data['inventory'] = sorted(data['inventory'])
         fn = self._save_location()
         if not os.path.isdir(os.path.dirname(fn)):
@@ -68 +69 @@
         with open(fn) as f:
             data = load(f)
-        self.protagonist.inventory = set(data.pop('inventory', []))
-        for k, v in data.iteritems():
-            setattr(self, k, v)
+        data['inventory'] = set(data['inventory'])
+        self.__dict__['_data'] = data
         return True