From 2a935e7c20574449e5f1e2683ffd65312624fdf9 Mon Sep 17 00:00:00 2001
From: Kevin Hockey <Blitzkev@gmail.com>
Date: Fri, 02 Jul 2010 16:49:08 +0000
Subject: buttons draw correctly from 1 image, overlay works correctly

---
(limited to 'MAFH2/BattleEngine.py')

diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index fe79d22..4eee528 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -124,146 +124,146 @@ class BattleEngine(GameEngineElement):
             self.magicWin = False
             
         elif selection == 'scan':
-                menu.set_disp('Enemy Scanned!')
-                self.isMagic = False
-                self.__attack_phase(menu)
+            menu.set_disp('Enemy Scanned!')
+            self.isMagic = False
+            self.__attack_phase(menu)
                 
         elif selection == 'fire1':
-            if(1 in self.magic_list):
+            if(0 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(1)
+                self.magic_list.append(0)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'fire2':
-            if(2 in self.magic_list):
+            if(1 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(2)
+                self.magic_list.append(1)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
         elif selection == 'fire3':
-            if(3 in self.magic_list):
+            if(2 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(3)
+                self.magic_list.append(2)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'fire4':
-            if(4 in self.magic_list):
+            if(3 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(4)
+                self.magic_list.append(3)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'lig1':
-            if(1 in self.magic_list):
+            if(0 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(1)
+                self.magic_list.append(0)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
         elif selection == 'lig2':
-            if(2 in self.magic_list):
+            if(1 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(2)
+                self.magic_list.append(1)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
         elif selection == 'lig3':
-            if(3 in self.magic_list):
+            if(2 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(3)
+                self.magic_list.append(2)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
         elif selection == 'lig4':
-            if(4 in self.magic_list):
+            if(3 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(4)
+                self.magic_list.append(3)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'miss1':
-            if(1 in self.magic_list):
+            if(0 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(1)
+                self.magic_list.append(0)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'miss2':
-            if(2 in self.magic_list):
+            if(1 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(2)
+                self.magic_list.append(1)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'miss3':
-            if(3 in self.magic_list):
+            if(2 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(3)
+                self.magic_list.append(2)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'miss4':
-            if(4 in self.magic_list):
+            if(3 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(4)
+                self.magic_list.append(3)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'heal1':
-            if(1 in self.magic_list):
+            if(0 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(1)
+                self.magic_list.append(0)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'heal2':
-            if(2 in self.magic_list):
+            if(1 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(2)
+                self.magic_list.append(1)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'heal3':
-            if(1 in self.magic_list):
+            if(2 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(3)
+                self.magic_list.append(2)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
                     
         elif selection == 'heal4':
-            if(4 in self.magic_list):
+            if(3 in self.magic_list):
                 self.__attack_phase(menu)
             else:
-                self.magic_list.append(4)
+                self.magic_list.append(3)
                 if(len(self.magic_list) > 3):
                     self.magicWin = True
                     self.__attack_phase(menu)
--
cgit v0.9.1