mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-10 06:34:59 +00:00
6.4 update (minus sprites)
This commit is contained in:
@@ -174,7 +174,9 @@ class PokeBattle_Scene
|
||||
y = 410
|
||||
|
||||
sprite = IconSprite.new(x,y,@viewport)
|
||||
sprite.setBitmapDirectly(generate_front_trainer_sprite_bitmap())
|
||||
|
||||
allowEasterEggPokeball = pbInSafari? #Never allow except in Safari Zone - add more conditions if needed
|
||||
sprite.setBitmapDirectly(generate_front_trainer_sprite_bitmap(allowEasterEggPokeball))
|
||||
sprite.zoom_x=2
|
||||
sprite.zoom_y=2
|
||||
sprite.z=100 + idxTrainer
|
||||
@@ -211,6 +213,9 @@ class PokeBattle_Scene
|
||||
|
||||
spriteX, spriteY = PokeBattle_SceneConstants.pbTrainerPosition(1, idxTrainer, numTrainers)
|
||||
trainer = pbAddSprite("trainer_#{idxTrainer + 1}", spriteX, spriteY, trainerFile, @viewport)
|
||||
spriteOverrideBitmap = setTrainerSpriteOverrides(trainerType)
|
||||
trainer.bitmap = spriteOverrideBitmap if spriteOverrideBitmap
|
||||
|
||||
return if !trainer.bitmap
|
||||
# Alter position of sprite
|
||||
trainer.z = 7 + idxTrainer
|
||||
@@ -218,6 +223,12 @@ class PokeBattle_Scene
|
||||
trainer.oy = trainer.bitmap.height
|
||||
end
|
||||
|
||||
def setTrainerSpriteOverrides(trainer_type)
|
||||
if TYPE_EXPERTS_APPEARANCES.keys.include?(trainer_type)
|
||||
return generate_front_trainer_sprite_bitmap_from_appearance(TYPE_EXPERTS_APPEARANCES[trainer_type]).bitmap
|
||||
end
|
||||
end
|
||||
|
||||
def pbCreatePokemonSprite(idxBattler)
|
||||
sideSize = @battle.pbSideSize(idxBattler)
|
||||
batSprite = PokemonBattlerSprite.new(@viewport, sideSize, idxBattler, @animations)
|
||||
|
||||
Reference in New Issue
Block a user