mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-11 23:24:59 +00:00
Migration - more progress
This commit is contained in:
@@ -55,7 +55,7 @@ class Battle::Scene
|
||||
partyBar = pbAddSprite("partyBar_#{side}", 0, 0,
|
||||
"Graphics/UI/Battle/overlay_lineup", @viewport)
|
||||
partyBar.z = 10120
|
||||
partyBar.mirror = true if side == 0 # Player's lineup bar only
|
||||
partyBar.mirror = true if side == 0 # Overrides's lineup bar only
|
||||
partyBar.visible = false
|
||||
NUM_BALLS.times do |i|
|
||||
ball = pbAddSprite("partyBall_#{side}_#{i}", 0, 0, nil, @viewport)
|
||||
@@ -67,7 +67,7 @@ class Battle::Scene
|
||||
@sprites["abilityBar_#{side}"] = AbilitySplashBar.new(side, @viewport)
|
||||
end
|
||||
end
|
||||
# Player's and partner trainer's back sprite
|
||||
# Overrides's and partner trainer's back sprite
|
||||
@battle.player.each_with_index do |p, i|
|
||||
pbCreateTrainerBackSprite(i, p.trainer_type, @battle.player.length)
|
||||
end
|
||||
@@ -155,7 +155,7 @@ class Battle::Scene
|
||||
end
|
||||
|
||||
def pbCreateTrainerBackSprite(idxTrainer, trainerType, numTrainers = 1)
|
||||
if idxTrainer == 0 # Player's sprite
|
||||
if idxTrainer == 0 # Overrides's sprite
|
||||
trainerFile = GameData::TrainerType.player_back_sprite_filename(trainerType)
|
||||
else # Partner trainer's sprite
|
||||
trainerFile = GameData::TrainerType.back_sprite_filename(trainerType)
|
||||
|
||||
@@ -17,7 +17,7 @@ class Battle::Scene::Animation::Intro < Battle::Scene::Animation
|
||||
# Bases
|
||||
makeSlideSprite("base_0", 1, appearTime, PictureOrigin::BOTTOM)
|
||||
makeSlideSprite("base_1", -1, appearTime, PictureOrigin::CENTER)
|
||||
# Player sprite, partner trainer sprite
|
||||
# Overrides sprite, partner trainer sprite
|
||||
@battle.player.each_with_index do |_p, i|
|
||||
makeSlideSprite("player_#{i + 1}", 1, appearTime, PictureOrigin::BOTTOM)
|
||||
end
|
||||
@@ -96,7 +96,7 @@ class Battle::Scene::Animation::LineupAppear < Battle::Scene::Animation
|
||||
def resetGraphics(sprites)
|
||||
bar = sprites["partyBar_#{@side}"]
|
||||
case @side
|
||||
when 0 # Player's lineup
|
||||
when 0 # Overrides's lineup
|
||||
barX = Graphics.width - BAR_DISPLAY_WIDTH
|
||||
barY = Graphics.height - 142
|
||||
ballX = barX + 44
|
||||
@@ -124,7 +124,7 @@ class Battle::Scene::Animation::LineupAppear < Battle::Scene::Animation
|
||||
end
|
||||
|
||||
def getPartyIndexFromBallIndex(idxBall)
|
||||
# Player's lineup (just show balls for player's party)
|
||||
# Overrides's lineup (just show balls for player's party)
|
||||
if @side == 0
|
||||
return idxBall if @partyStarts.length < 2
|
||||
return idxBall if idxBall < @partyStarts[1]
|
||||
|
||||
Reference in New Issue
Block a user