diff options
| author | Jaime Miller <jlmiller1103@gmail.com> | 2011-02-17 22:19:45 (GMT) |
|---|---|---|
| committer | Jaime Miller <jaime@inspiron.(none)> | 2011-02-17 22:23:19 (GMT) |
| commit | 902cfc1ce5750ae138d1bb62c771bf89a81718a3 (patch) | |
| tree | 3cac1d7faaf5fdf944b08c4317121cadca80f5b0 | |
| parent | 43d46b4597df4ca67439584161a8bb801333bce6 (diff) | |
Edited to fix scan damage bug
Committer: Jaime Miller <jlmiller1103@gmail.com>
| -rw-r--r-- | MAFH2/BattleEngine.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index 43d6fd1..3d76b3a 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -145,7 +145,13 @@ class BattleEngine(GameEngineElement): elif selection == 'scan':
menu.set_disp('Enemy Scanned!')
self.isMagic = False
- self.__attack_phase(menu)
+ #curTarget is the selected enemy
+ curTarget = self.active_target - 1
+ #next two lines write enemy's HP & weakness to message window
+ self.game_engine.get_object('mesg').add_line(_("Remaining HP: "+repr(self.enemy_list[curTarget].HP)))
+ self.game_engine.get_object('mesg').add_line(_("Enemy Weakness: "+repr(self.enemy_list[curTarget].weakness)))
+ #following removed, enemy no longer attacked
+ #self.__attack_phase(menu)
elif selection == 'fire1':
if(0 in self.magic_list):
@@ -314,9 +320,12 @@ class BattleEngine(GameEngineElement): self.enemy_list[curTarget].HP -= int(damage)
self.player_input = "Your attack crits for " + str(int(damage)) + " damage"
else:
- damage = hero.attackPower('basic')
- self.enemy_list[curTarget].HP -= damage
- self.player_input = "You attack for " + str(int(damage)) + " damage"
+# if selection == 'scan':
+# self.player_input = "Enemy has been scanned."
+# else:
+ damage = hero.attackPower('basic')
+ self.enemy_list[curTarget].HP -= damage
+ self.player_input = "You attack for " + str(int(damage)) + " damage"
#generate enemy attack
|