diff options
| author | davesilver <nibor123@gmail.com> | 2010-07-27 20:54:12 (GMT) |
|---|---|---|
| committer | davesilver <nibor123@gmail.com> | 2010-07-27 20:54:12 (GMT) |
| commit | c76e1f68622e5e3028ee0689f1346b93db554eb7 (patch) | |
| tree | 6ebfa6cba4aaf7b9d8b4a00b589a0eafa6ac6f88 /MAFH2/BattleEngine.py | |
| parent | 49795234d706b31c5963a61b34249e25c8f2964f (diff) | |
Trying to get AE integrated.
Diffstat (limited to 'MAFH2/BattleEngine.py')
| -rw-r--r-- | MAFH2/BattleEngine.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index 709a1f5..5bc9261 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -42,14 +42,16 @@ class BattleEngine(GameEngineElement): if e_index != '0': self.enemy_list.append( get_enemy( e_index ) ) + self.get_engine.get_scene().addObjects([get_enemy(e_index)]) # Preload images - self.__images = {} + self.__drawableObjects = {} for i in ['arrow_select']: - self.__images[i] = pygame.image.load( HUD_PATH + i + ".gif" ) #----------------------------------------------------------------------------- + self.__drawableObjects[i] = DrawableObject([pygame.image.load( HUD_PATH + i + ".gif" )],'') - self.__images['hp'] = Spritesheet( HUD_PATH + "hp.gif" ).img_extract(11,1,100,100) #------------------------------------------------------------ - self.__images['bt'] = Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25) #------------------------------------------------------------- + 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.get_engine.get_scene().addObjects(self.__drawableObjects) self.add_to_engine() self.game_engine.add_object('battlemenu', BattleMenuHolder( self.menu_callback ) ) @@ -385,11 +387,10 @@ class BattleEngine(GameEngineElement): # Draw Enemy and Item Selection for enemy in self.enemy_list: if enemy.alive and self.active_target == i: -# screen.blit(self.__images['arrow_select'], (x+(i*200),y-25)) #1 orig - _dirtyList.append(self.__images['arrow_select'].get_rect().move((x+(i*200),y-25))) #1 new - enemy.sprite.updateAnim( tick_time ) #2 orig -# screen.blit(enemy.sprite.image, (x+(i*200),y) ) #3 orig - _dirtyList.append(enemy.sprite.image.get_rect().move( (x+(i*200),y) )) #3 new + self.__drawableObjects['arrow_select'].setPosition(x+(i*200),y-25) #1 orig + #enemy.sprite.updateAnim( tick_time ) #DO SOMETHING + enemy.get_sprite().setPosition(x+(i*200),y) + #screen.blit(enemy.sprite.image, (x+(i*200),y) ) #DO SOMETHING i = i+1 # Draw Hud @@ -398,8 +399,10 @@ class BattleEngine(GameEngineElement): # Player Health health = 10 - profile.hero.healthLevel() # screen.blit(self.__images['hp'][health], (25,25)) #4 orig - _dirtyList.append( self.__images['hp'][health].get_rect().move((25,25)) ) #4 new - enemy.sprite.updateAnim( tick_time ) #2 new + self.__drawableObjects['hp'].goToAnim(heatlh) #4 new + self.__drawableObjects['hp'].setPosition(25,25) + #enemy.sprite.updateAnim( tick_time ) #2 new #what the hell does ^^ do?? # pygame.display.update(_dirtyList) #5 new - return _dirtyList + + self.get_engine.get_scene().update(clock.get_time()) |