diff options
| author | Kevin Hockey <Blitzkev@gmail.com> | 2010-06-28 20:41:56 (GMT) |
|---|---|---|
| committer | Kevin Hockey <Blitzkev@gmail.com> | 2010-06-28 20:41:56 (GMT) |
| commit | cd3aa78d36a7fb427733dd3c9a5047547a5b2134 (patch) | |
| tree | d1ca3b21a9ef1d6d865d13e993264552949233e4 /MAFH2/BattleEngine.py | |
| parent | d424029151f9cc316a0cadcc6ac2a6d9e407d3ae (diff) | |
Updated magicmenu and fixed if statements in battleengine
Diffstat (limited to 'MAFH2/BattleEngine.py')
| -rw-r--r-- | MAFH2/BattleEngine.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index 55051d6..fe6cc39 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -83,35 +83,37 @@ class BattleEngine(GameEngineElement): menu.set_sec_disp('0') self.__attack_phase(menu) - elif selection == 'clear': - self.player_input = '0' + elif selection == 'clear': + self.player_input = '0' - elif selection == 'fire': - menu.set_disp('Fire Cast!') - self.__attack_phase(menu) + elif selection == 'fire': + menu.set_disp('Fire Cast!') + self.game_engine.add_object('firemenu', MagicMenuHolder( self.menu_callback ) ) + self.game_engine.get_object('firemenu').show_menu('fire') + #self.__attack_phase(menu) - elif selection == 'heal': + elif selection == 'heal': menu.set_disp('Heal Cast!') self.__attack_phase(menu) - elif selection == 'lightning': + elif selection == 'lightning': menu.set_disp('Lightning Cast!') self.__attack_phase(menu) - elif selection == 'missile': + elif selection == 'missile': menu.set_disp('Missile Cast!') self.__attack_phase(menu) - elif selection == 'scan': + elif selection == 'scan': menu.set_disp('Enemy Scanned!') self.__attack_phase(menu) - else: + else: #MUST BE A NUMBER if self.player_input == '0': self.player_input = selection else: self.player_input = self.player_input + selection - menu.set_sec_disp( self.player_input ) + menu.set_sec_disp( self.player_input ) def __attack_phase(self, menu): # Check to see how much hp enemy has left. |