Changeset 374:150332d6c1fb
- Timestamp:
- Sep 6, 2013, 8:44:14 PM (7 years ago)
- Branch:
- default
- Location:
- nagslang
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
nagslang/game_object.py
r371 r374 502 502 503 503 def _collect(self, protagonist): 504 protagonist. inventory.add(self._name)504 protagonist.add_item(self._name) 505 505 # TODO: Make this less hacky. 506 506 self.physicser.remove_from_space() -
nagslang/protagonist.py
r371 r374 73 73 self._make_physics(space, position), self._make_renderer()) 74 74 self.world = world 75 self.inventory = set()76 75 self.health_level = PROTAGONIST_HEALTH_MAX_LEVEL 77 76 … … 257 256 self.form = old_protagonist.form 258 257 self.angle = old_protagonist.angle 259 self.inventory = old_protagonist.inventory260 258 261 259 def toggle_form(self): … … 323 321 324 322 def has_item(self, item): 325 return item in self.inventory 323 return item in self.world.inventory 324 325 def add_item(self, item): 326 self.world.inventory.add(item) 326 327 327 328 def environmental_movement(self, dx, dy): -
nagslang/world.py
r373 r374 26 26 'kills': 0, 27 27 'rooms': 0, 28 'protagonist': Protagonist(pymunk.Space(), self,29 starting_position),30 28 'level': (first_level, starting_position), 31 29 'level_state': {}, 30 'inventory': set(), 32 31 } 32 self.__dict__['protagonist'] = Protagonist( 33 pymunk.Space(), self, starting_position) 33 34 34 35 def __getattr__(self, name): … … 55 56 def save(self): 56 57 data = self._data.copy() 57 data['inventory'] = sorted(data .pop('protagonist').inventory)58 data['inventory'] = sorted(data['inventory']) 58 59 fn = self._save_location() 59 60 if not os.path.isdir(os.path.dirname(fn)): … … 68 69 with open(fn) as f: 69 70 data = load(f) 70 self.protagonist.inventory = set(data.pop('inventory', [])) 71 for k, v in data.iteritems(): 72 setattr(self, k, v) 71 data['inventory'] = set(data['inventory']) 72 self.__dict__['_data'] = data 73 73 return True 74 74
Note: See TracChangeset
for help on using the changeset viewer.