DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-22 14:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed all battle-related classes and modules

Browse Source
This commit is contained in:
Maruno17
2021-11-16 23:05:16 +00:00
parent 6dacd6a139
commit 1c4819e5f0
79 changed files with 1270 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/020_Debug/001_Editor screens/004_EditorScreens_SpritePositioning.rb
View File

@@ -54,13 +54,13 @@ class SpritePositioner
@sprites["battle_bg"] = AnimatedPlane.new(@viewport)
@sprites["battle_bg"].setBitmap(battlebg)
@sprites["battle_bg"].z = 0
baseX, baseY = PokeBattle_SceneConstants.pbBattlerPosition(0)
baseX, baseY = Battle::Scene.pbBattlerPosition(0)
@sprites["base_0"] = IconSprite.new(baseX, baseY, @viewport)
@sprites["base_0"].setBitmap(playerbase)
@sprites["base_0"].x -= @sprites["base_0"].bitmap.width / 2 if @sprites["base_0"].bitmap
@sprites["base_0"].y -= @sprites["base_0"].bitmap.height if @sprites["base_0"].bitmap
@sprites["base_0"].z = 1
baseX, baseY = PokeBattle_SceneConstants.pbBattlerPosition(1)
baseX, baseY = Battle::Scene.pbBattlerPosition(1)
@sprites["base_1"] = IconSprite.new(baseX, baseY, @viewport)
@sprites["base_1"].setBitmap(enemybase)
@sprites["base_1"].x -= @sprites["base_1"].bitmap.width / 2 if @sprites["base_1"].bitmap
@@ -118,7 +118,7 @@ class SpritePositioner
end
metrics_data = GameData::SpeciesMetrics.get_species_form(@species, @form)
for i in 0...2
pos = PokeBattle_SceneConstants.pbBattlerPosition(i, 1)
pos = Battle::Scene.pbBattlerPosition(i, 1)
@sprites["pokemon_#{i}"].x = pos[0]
@sprites["pokemon_#{i}"].y = pos[1]
metrics_data.apply_metrics_to_sprite(@sprites["pokemon_#{i}"], i)

12
Data/Scripts/020_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb
View File

@@ -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

12
Data/Scripts/020_Debug/002_Animation editor/004_AnimEditor_ExportImport.rb
View File

@@ -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