From ed258092599598639eb8c75b73529a29b13a70a6 Mon Sep 17 00:00:00 2001
From: Kevin Hockey <Blitzkev@gmail.com>
Date: Thu, 05 Aug 2010 15:11:09 +0000
Subject: added battle timer functionality

---
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index e9ae66e..bce9512 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -54,8 +54,9 @@ class BattleEngine(GameEngineElement):
             self.game_engine.get_scene().addObject(self.__drawableObjects[i])
 
         self.__drawableObjects['hp'] = DrawableObject(Spritesheet( HUD_PATH + "hp.gif" ).img_extract(11,1,100,100,[255,0,255]), '')
-        self.__drawableObjects['bt'] = DrawableObject(Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25), '', True)
+        self.__drawableObjects['bt'] = DrawableObject(Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25, [255,0,255]), '', True)
         self.__drawableObjects['hp'].setColorKey((255,0,255))
+        self.__drawableObjects['bt'].setColorKey((255,0,255))
         self.game_engine.get_scene().addObject(self.__drawableObjects['hp'])
         self.game_engine.get_scene().addObject(self.__drawableObjects['bt'])
 
@@ -435,7 +436,11 @@ class BattleEngine(GameEngineElement):
         
         #Battle Timer
         if(self.battleTimer > 0):
+            self.__drawableObjects['bt'].makeTransparent(False)
+            self.__drawableObjects['bt'].setPosition(25,130)
             tIndex = int(time.time() - self.battleTimer)
             if tIndex > 10:
                 tIndex = 10
-            #screen.blit(self.__images['bt'][tIndex], (25,130))
+            self.__drawableObjects['bt'].goToFrame(tIndex)
+        else:
+            self.__drawableObjects['bt'].makeTransparent(True)
diff --git a/MAFH2/Enemy.py b/MAFH2/Enemy.py
index 477fef9..539e0df 100644
--- a/MAFH2/Enemy.py
+++ b/MAFH2/Enemy.py
@@ -32,7 +32,7 @@ class Enemy(Actor):
         self.inv_Ar = []
         self.attacks_Ar = []
         col,row,width,height = ENEMY[id]['sprite']
-        self.sprite = DynamicDrawableObject( Spritesheet(CHAR_PATH + ENEMY[id]['img'] ).img_extract(col,row,width,height) , "", 30)
+        self.sprite = DynamicDrawableObject( Spritesheet(CHAR_PATH + ENEMY[id]['img'] ).img_extract(col,row,width,height) , "", 24)
         self.place=0
         self.alive = True
 
diff --git a/MAFH2/MafhActivity.py b/MAFH2/MafhActivity.py
index 584d83d..014bd4f 100755
--- a/MAFH2/MafhActivity.py
+++ b/MAFH2/MafhActivity.py
@@ -7,7 +7,7 @@ from Comic import Comic
 from Profile import Profile
 from MafhGameManager import MafhGameManager
 
-ge = GameEngine(width=1200, height=900, always_draw=True, fps_cap=15)
+ge = GameEngine(width=1200, height=900, always_draw=True, fps_cap=24)
 
 def start_game():
     ge.add_object('manager', MafhGameManager() )
--
cgit v0.9.1