mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-09 14:14:59 +00:00
Renamed all battle-related classes and modules
This commit is contained in:
@@ -524,12 +524,12 @@ class AnimationCanvas < Sprite
|
||||
@sprites["pokemon_1"].bitmap=@target
|
||||
@sprites["pokemon_1"].z=16
|
||||
pbSpriteSetAnimFrame(@sprites["pokemon_0"],
|
||||
pbCreateCel(PokeBattle_SceneConstants::FOCUSUSER_X,
|
||||
PokeBattle_SceneConstants::FOCUSUSER_Y,-1,2),
|
||||
pbCreateCel(Battle::Scene::FOCUSUSER_X,
|
||||
Battle::Scene::FOCUSUSER_Y,-1,2),
|
||||
@sprites["pokemon_0"],@sprites["pokemon_1"])
|
||||
pbSpriteSetAnimFrame(@sprites["pokemon_1"],
|
||||
pbCreateCel(PokeBattle_SceneConstants::FOCUSTARGET_X,
|
||||
PokeBattle_SceneConstants::FOCUSTARGET_Y,-2,1),
|
||||
pbCreateCel(Battle::Scene::FOCUSTARGET_X,
|
||||
Battle::Scene::FOCUSTARGET_Y,-2,1),
|
||||
@sprites["pokemon_0"],@sprites["pokemon_1"])
|
||||
usersprite=@sprites["pokemon_#{oppmove ? 1 : 0}"]
|
||||
targetsprite=@sprites["pokemon_#{oppmove ? 0 : 1}"]
|
||||
@@ -540,8 +540,8 @@ class AnimationCanvas < Sprite
|
||||
@player=PBAnimationPlayerX.new(@animation,
|
||||
@battle.battlers[oppmove ? 1 : 0],@battle.battlers[oppmove ? 0 : 1],self,oppmove,true)
|
||||
@player.setLineTransform(
|
||||
PokeBattle_SceneConstants::FOCUSUSER_X,PokeBattle_SceneConstants::FOCUSUSER_Y,
|
||||
PokeBattle_SceneConstants::FOCUSTARGET_X,PokeBattle_SceneConstants::FOCUSTARGET_Y,
|
||||
Battle::Scene::FOCUSUSER_X,Battle::Scene::FOCUSUSER_Y,
|
||||
Battle::Scene::FOCUSTARGET_X,Battle::Scene::FOCUSTARGET_Y,
|
||||
olduserx,oldusery,
|
||||
oldtargetx,oldtargety)
|
||||
@player.start
|
||||
|
||||
@@ -104,17 +104,17 @@ def pbConvertAnimToNewFormat(textdata)
|
||||
textdata[i][j][AnimFrame::PRIORITY]=1 if textdata[i][j][AnimFrame::PRIORITY]==nil
|
||||
if j==0 # User battler
|
||||
textdata[i][j][AnimFrame::FOCUS]=2
|
||||
textdata[i][j][AnimFrame::X]=PokeBattle_SceneConstants::FOCUSUSER_X
|
||||
textdata[i][j][AnimFrame::Y]=PokeBattle_SceneConstants::FOCUSUSER_Y
|
||||
textdata[i][j][AnimFrame::X]=Battle::Scene::FOCUSUSER_X
|
||||
textdata[i][j][AnimFrame::Y]=Battle::Scene::FOCUSUSER_Y
|
||||
elsif j==1 # Target battler
|
||||
textdata[i][j][AnimFrame::FOCUS]=1
|
||||
textdata[i][j][AnimFrame::X]=PokeBattle_SceneConstants::FOCUSTARGET_X
|
||||
textdata[i][j][AnimFrame::Y]=PokeBattle_SceneConstants::FOCUSTARGET_Y
|
||||
textdata[i][j][AnimFrame::X]=Battle::Scene::FOCUSTARGET_X
|
||||
textdata[i][j][AnimFrame::Y]=Battle::Scene::FOCUSTARGET_Y
|
||||
else
|
||||
textdata[i][j][AnimFrame::FOCUS]=(textdata.position || 4)
|
||||
if textdata.position==1
|
||||
textdata[i][j][AnimFrame::X]+=PokeBattle_SceneConstants::FOCUSTARGET_X
|
||||
textdata[i][j][AnimFrame::Y]+=PokeBattle_SceneConstants::FOCUSTARGET_Y-2
|
||||
textdata[i][j][AnimFrame::X]+=Battle::Scene::FOCUSTARGET_X
|
||||
textdata[i][j][AnimFrame::Y]+=Battle::Scene::FOCUSTARGET_Y-2
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user