diff options
| author | Kevin Hockey <Blitzkev@gmail.com> | 2010-06-30 23:18:50 (GMT) |
|---|---|---|
| committer | Kevin Hockey <Blitzkev@gmail.com> | 2010-06-30 23:18:50 (GMT) |
| commit | 2e2834a83bf5f6d2a2e6075181b6cfa447e868b9 (patch) | |
| tree | a196da128bea231b574cccb5ea013b3abaee41f6 /MAFH2/BattleEngine.py | |
| parent | d49874ca5aa21fd8c0e648821d429bfcc48e5ded (diff) | |
commit for merging
Diffstat (limited to 'MAFH2/BattleEngine.py')
| -rw-r--r-- | MAFH2/BattleEngine.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index 8ae89aa..85b1fe6 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -51,8 +51,8 @@ class BattleEngine(GameEngineElement): def menu_callback(self, selection, menu): if selection == 'attack_show': - menu.set_sec_disp('0') - self.player_input = '0' + menu.set_sec_disp('') + self.player_input = '' self.isMagic = False random.seed() isCrit = random.randint(0,100) @@ -71,6 +71,7 @@ class BattleEngine(GameEngineElement): menu.show_menu('selection') menu.set_sec_disp('') self.__attack_phase(menu) + elif self.state == PLAYER_MULT: if selection == 'enter': @@ -80,13 +81,13 @@ class BattleEngine(GameEngineElement): else: menu.set_disp('Incorrect') - menu.set_sec_disp('0') - self.player_input = '0' + menu.set_sec_disp('') + self.player_input = '' self.__attack_phase(menu) elif selection == 'clear': - self.player_input = '0' - menu.set_sec_disp('0') + self.player_input = '' + menu.set_sec_disp('') else: self.player_input = self.player_input + selection @@ -272,6 +273,7 @@ class BattleEngine(GameEngineElement): # Check to see how much hp enemy has left. # Enemy Attack # Check player health + self.state = PLAYER_WAIT print("in __attack_phase") self.__end_battle(menu) |