pushing

3 files changed, 19 insertions, 10 deletions

diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index 93a58ff..4b17877 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -52,7 +52,7 @@ 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), '')
-        self.__drawableObjects['bt'] = DrawableObject(Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25), '')
+        self.__drawableObjects['bt'] = DrawableObject(Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25), '', True)
         self.game_engine.get_scene().addObject(self.__drawableObjects['hp'])
         self.game_engine.get_scene().addObject(self.__drawableObjects['bt'])
 
@@ -307,6 +307,7 @@ class BattleEngine(GameEngineElement):
             if enemy.HP <= 0:
                 enemy.alive = False
                 self.enemy_list.remove(enemy)
+                enemy.makeTransparent(True)
                 self.active_target = 1
             if enemy.alive:
                 random.seed()
@@ -350,6 +351,10 @@ class BattleEngine(GameEngineElement):
         #self terminate
         #print 'end battle called'
         self.remove_from_engine()
+        self.game_engine.get_scene().removeObject(self.background)
+        for object in self.__drawableObjects:
+            self.game_engine.get_scene().removeObject(object)
+            
         self.game_engine.get_object('battlemenu').remove_from_engine()
         self.game_engine.remove_object('battle')
         
@@ -376,9 +381,7 @@ class BattleEngine(GameEngineElement):
 
         # We don't want to allow other things to run during battle
         return True
-#-------------------------------------------------------------------------------------------------------------------------------------------------------
-# \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/
-#
+
     def draw(self,screen,time_delta):
         x=250
         y=150
diff --git a/MAFH2/Dungeon.py b/MAFH2/Dungeon.py
index 997cfa7..bb5f099 100644
--- a/MAFH2/Dungeon.py
+++ b/MAFH2/Dungeon.py
@@ -42,11 +42,11 @@ class Dungeon(GameEngineElement):
         self.doorsList = []
 
         self.game_engine.get_scene().addObject(DrawableObject([self.__images['Room']], ''))
-        self.doorsList.append(DrawableObject([self.__images['L']], '', False, 0 ,0))
-        self.doorsList.append(DrawableObject([self.__images['F']], '', False, 360 ,0))
-        self.doorsList.append(DrawableObject([pygame.transform.flip(self.__images['L'], True, False)], '', False, 990 ,0))
+        self.doorsList.append(DrawableObject([self.__images['L']], '', True, 0 ,0))
+        self.doorsList.append(DrawableObject([self.__images['F']], '', True, 360 ,0))
+        self.doorsList.append(DrawableObject([pygame.transform.flip(self.__images['L'], True, False)], '', True, 990 ,0))
         
-        for door in self.doorsList: door.makeTransparent(True)
+        #for door in self.doorsList: door.makeTransparent(True)
 
         self.game_engine.get_scene().addObjects(self.doorsList)
         
@@ -55,8 +55,8 @@ class Dungeon(GameEngineElement):
         for i in range(4):
             surf = pygame.Surface((10,10))
             surf.fill((0,0,0))
-            self.blueRect = DrawableObject([surf],"", True)
-            self.itemsList.append(self.blueRect)
+            tempItem = DrawableObject([surf],"", True)
+            self.itemsList.append(tempItem)
             
         self.itemsList[0].setPosition(self.game_engine.art_scale(270, 1200, True), self.game_engine.art_scale(330, 900, False))
         self.itemsList[1].setPosition(self.game_engine.art_scale(100, 1200, True),self.game_engine.art_scale(600, 900, False))
diff --git a/MAFH2/fortuneengine/DrawableObject.py b/MAFH2/fortuneengine/DrawableObject.py
index cda99a0..7700881 100644
--- a/MAFH2/fortuneengine/DrawableObject.py
+++ b/MAFH2/fortuneengine/DrawableObject.py
@@ -10,6 +10,12 @@ class DrawableObject(pygame.sprite.Sprite):
         for i in range(len(images)):

             self._images.append(images[i].convert_alpha())

             self._origImages.append(images[i].convert_alpha())

+            

+        self.blank = pygame.Surface((0,0))

+        

+        if(transparent):

+            for i in range(len(images)):

+                self._images[i] = self.blank

 

         self._start = pygame.time.get_ticks()

         self.image = self._images[0]