diff options
| -rw-r--r-- | MAFH2/BattleEngine.py | 7 | ||||
| -rw-r--r-- | MAFH2/Dungeon.py | 2 | ||||
| -rw-r--r-- | MAFH2/MagicMenu.py | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index dc10291..66dbbe1 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -322,10 +322,13 @@ class BattleEngine(GameEngineElement): def __end_battle(self, menu): #Give items if any + room = self.game_engine.get_object('dungeon').get_current_room() + for item in room.item: + self.game_engine.get_object('profile').hero.addInventory(item) + room.has_enemy = False #self terminate - print 'end battle called' + #print 'end battle called' self.remove_from_engine() - #self.game_engine.remove_object('battlemenu') self.game_engine.get_object('battlemenu').remove_from_engine() self.game_engine.remove_object('battle') diff --git a/MAFH2/Dungeon.py b/MAFH2/Dungeon.py index ecd26ec..ee031c1 100644 --- a/MAFH2/Dungeon.py +++ b/MAFH2/Dungeon.py @@ -166,7 +166,7 @@ class Dungeon(GameEngineElement): self.game_engine.get_object('map').update_macro() self.check_for_enemies() else: - #Entrance or exit may be on a boarder of the grid + #Entrance or exit may be on a border of the grid door_flag = self.rooms[profile.position].get_door( dc ) if door_flag == EXIT_DOOR or door_flag == ENTRANCE_DOOR: if self.move_permissions( door_flag ): diff --git a/MAFH2/MagicMenu.py b/MAFH2/MagicMenu.py index 781148e..e973751 100644 --- a/MAFH2/MagicMenu.py +++ b/MAFH2/MagicMenu.py @@ -20,8 +20,7 @@ class MagicMenuHolder( GameEngineElement ): def draw(self,screen,time_delta): screen.blit(self.background,(0,286,452,414)) - #draw the boxes with the specific magic icons randomly - + def menu_called(self, id): self.callback(id, self) @@ -35,9 +34,7 @@ class MagicMenuHolder( GameEngineElement ): self.clear_menu() else: self.add_to_engine() - - - #example of what will come + if id == "fire": spell_type = 0 menu_options = [ |