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

Minor refactoring to kill various Rubocop warnings

Browse Source
This commit is contained in:
Maruno17
2021-12-17 20:29:47 +00:00
parent b5ee1b211d
commit 5dc64f1709
46 changed files with 145 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ class HallOfFame_Scene
def slowFadeOut(sprites,exponent) # 2 exponent
# To handle values above 8
extraWaitExponent=exponent-9
exponent=8 if 8<exponent
exponent=8 if exponent > 8
max=2**exponent
speed=(2**8)/max
for j in 0..max
@@ -181,18 +181,18 @@ class HallOfFame_Scene
def moveSprite(i)
spritename=(i>-1) ? "pokemon#{i}" : "trainer"
speed = (i>-1) ? ANIMATIONSPEED : 2
if(!ANIMATION) # Skips animation
if !ANIMATION # Skips animation
@sprites[spritename].x-=speed*@xmovement[i]
@xmovement[i]=0
@sprites[spritename].y-=speed*@ymovement[i]
@ymovement[i]=0
end
if(@xmovement[i]!=0)
if @xmovement[i] != 0
direction = (@xmovement[i]>0) ? -1 : 1
@sprites[spritename].x+=speed*direction
@xmovement[i]+=direction
end
if(@ymovement[i]!=0)
if @ymovement[i] != 0
direction = (@ymovement[i]>0) ? -1 : 1
@sprites[spritename].y+=speed*direction
@ymovement[i]+=direction
@@ -260,7 +260,7 @@ class HallOfFame_Scene
end
@xmovement[@battlerIndex]=0
@ymovement[@battlerIndex]=0
if(ANIMATION && !SINGLEROW) # Trainer Animation
if ANIMATION && !SINGLEROW # Trainer Animation
startpoint=Graphics.width/2
# 2 is the trainer speed
@xmovement[@battlerIndex]=(startpoint-@sprites["trainer"].x)/2

4
Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
View File

@@ -377,8 +377,8 @@ class PokemonPokedex_Scene
dexlist[0] = nil if dexlist[0][5] && !$player.seen?(dexlist[0][0])
# Remove unseen species from the end of the list
i = dexlist.length-1
loop do break unless i>=0
break if !dexlist[i] || $player.seen?(dexlist[i][0])
loop do
break if i < 0 || !dexlist[i] || $player.seen?(dexlist[i][0])
dexlist[i] = nil
i -= 1
end

6
Data/Scripts/016_UI/022_UI_PurifyChamber.rb
View File

@@ -711,8 +711,7 @@ class DirectFlowDiagram
@points[j]=BitmapSprite.new(8,8,@viewport)
@points[j].bitmap.fill_rect(0,0,8,8,Color.new(0,0,0))
end
@points[j].tone=(@strength==2) ? Tone.new(232,232,248) :
Tone.new(16,16,232)
@points[j].tone = (@strength == 2) ? Tone.new(232, 232, 248) : Tone.new(16, 16, 232)
@points[j].visible=(@strength!=0)
end
@@ -786,8 +785,7 @@ class FlowDiagram
@points[j]=BitmapSprite.new(8,8,@viewport)
@points[j].bitmap.fill_rect(0,0,8,8,Color.new(0,0,0))
end
@points[j].tone=(@strength==2) ? Tone.new(232,232,248) :
Tone.new(16,16,232)
@points[j].tone = (@strength == 2) ? Tone.new(232, 232, 248) : Tone.new(16, 16, 232)
@points[j].visible=(@strength!=0)
end