DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Rubocop

Browse Source
This commit is contained in:
Maruno17
2021-12-27 00:26:45 +00:00
parent 4a6324389b
commit aa643a6049
51 changed files with 346 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb
View File

@@ -21,7 +21,7 @@ class PokemonEggHatch_Scene
Color.new(248, 248, 248), @viewport)
# Create egg sprite/Pokémon sprite
@sprites["pokemon"] = PokemonSprite.new(@viewport)
@sprites["pokemon"].setOffset(PictureOrigin::Bottom)
@sprites["pokemon"].setOffset(PictureOrigin::BOTTOM)
@sprites["pokemon"].x = Graphics.width / 2
@sprites["pokemon"].y = 264 + 56 # 56 to offset the egg sprite
@sprites["pokemon"].setSpeciesBitmap(@pokemon.species, @pokemon.gender,

4
Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
View File

@@ -498,12 +498,12 @@ class PokemonEvolutionScene
addBackgroundOrColoredPlane(@sprites, "background", "evolutionbg",
Color.new(248, 248, 248), @bgviewport)
rsprite1 = PokemonSprite.new(@viewport)
rsprite1.setOffset(PictureOrigin::Center)
rsprite1.setOffset(PictureOrigin::CENTER)
rsprite1.setPokemonBitmap(@pokemon, false)
rsprite1.x = Graphics.width / 2
rsprite1.y = (Graphics.height - 64) / 2
rsprite2 = PokemonSprite.new(@viewport)
rsprite2.setOffset(PictureOrigin::Center)
rsprite2.setOffset(PictureOrigin::CENTER)
rsprite2.setPokemonBitmapSpecies(@pokemon, @newspecies, false)
rsprite2.x = rsprite1.x
rsprite2.y = rsprite1.y

12
Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb
View File

@@ -36,14 +36,14 @@ class PokemonTrade_Scene
Color.new(248, 248, 248), @viewport)
@sprites["rsprite1"] = PokemonSprite.new(@viewport)
@sprites["rsprite1"].setPokemonBitmap(@pokemon, false)
@sprites["rsprite1"].setOffset(PictureOrigin::Bottom)
@sprites["rsprite1"].setOffset(PictureOrigin::BOTTOM)
@sprites["rsprite1"].x = Graphics.width / 2
@sprites["rsprite1"].y = 264
@sprites["rsprite1"].z = 10
@pokemon.species_data.apply_metrics_to_sprite(@sprites["rsprite1"], 1)
@sprites["rsprite2"] = PokemonSprite.new(@viewport)
@sprites["rsprite2"].setPokemonBitmap(@pokemon2, false)
@sprites["rsprite2"].setOffset(PictureOrigin::Bottom)
@sprites["rsprite2"].setOffset(PictureOrigin::BOTTOM)
@sprites["rsprite2"].x = Graphics.width / 2
@sprites["rsprite2"].y = 264
@sprites["rsprite2"].z = 10
@@ -63,11 +63,11 @@ class PokemonTrade_Scene
pictureBall.setXY(0, Graphics.width / 2, 48)
pictureBall.setName(0, ballimage)
pictureBall.setSrcSize(0, 32, 64)
pictureBall.setOrigin(0, PictureOrigin::Center)
pictureBall.setOrigin(0, PictureOrigin::CENTER)
pictureBall.setVisible(0, true)
# Starting position of sprite
picturePoke.setXY(0, @sprites["rsprite1"].x, @sprites["rsprite1"].y)
picturePoke.setOrigin(0, PictureOrigin::Bottom)
picturePoke.setOrigin(0, PictureOrigin::BOTTOM)
picturePoke.setVisible(0, true)
# Change Pokémon color
picturePoke.moveColor(2, 5, Color.new(31 * 8, 22 * 8, 30 * 8, 255))
@@ -105,10 +105,10 @@ class PokemonTrade_Scene
pictureBall.setXY(0, Graphics.width / 2, -32)
pictureBall.setName(0, ballimage)
pictureBall.setSrcSize(0, 32, 64)
pictureBall.setOrigin(0, PictureOrigin::Center)
pictureBall.setOrigin(0, PictureOrigin::CENTER)
pictureBall.setVisible(0, true)
# Starting position of sprite
picturePoke.setOrigin(0, PictureOrigin::Bottom)
picturePoke.setOrigin(0, PictureOrigin::BOTTOM)
picturePoke.setZoom(0, 0)
picturePoke.setColor(0, Color.new(31 * 8, 22 * 8, 30 * 8, 255))
picturePoke.setVisible(0, false)

2
Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb
View File

@@ -210,7 +210,7 @@ class HallOfFame_Scene
ypoint = ypointformula(i)
pok = @hallEntry[i]
@sprites["pokemon#{i}"] = PokemonSprite.new(@viewport)
@sprites["pokemon#{i}"].setOffset(PictureOrigin::TopLeft)
@sprites["pokemon#{i}"].setOffset(PictureOrigin::TOP_LEFT)
@sprites["pokemon#{i}"].setPokemonBitmap(pok)
# This method doesn't put the exact coordinates
@sprites["pokemon#{i}"].x = xpoint