More Rubocopping

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

@@ -77,7 +77,7 @@ class PokemonEggHatch_Scene
     # Fade and change the sprite
     fadeTime = Graphics.frame_rate * 4 / 10
     toneDiff = (255.0 / fadeTime).ceil
-    for i in 1..fadeTime
+    (1..fadeTime).each do |i|
       @sprites["pokemon"].tone = Tone.new(i * toneDiff, i * toneDiff, i * toneDiff)
       @sprites["overlay"].opacity = i * toneDiff
       updateScene
@@ -88,7 +88,7 @@ class PokemonEggHatch_Scene
     @sprites["pokemon"].y = 264
     @pokemon.species_data.apply_metrics_to_sprite(@sprites["pokemon"], 1)
     @sprites["hatch"].visible = false
-    for i in 1..fadeTime
+    (1..fadeTime).each do |i|
       @sprites["pokemon"].tone = Tone.new(255 - (i * toneDiff), 255 - (i * toneDiff), 255 - (i * toneDiff))
       @sprites["overlay"].opacity = 255 - (i * toneDiff)
       updateScene
@@ -220,10 +220,10 @@ def pbHatch(pokemon)
 end
 
 Events.onStepTaken += proc { |_sender, _e|
-  for egg in $player.party
+  $player.party.each do |egg|
     next if egg.steps_to_hatch <= 0
     egg.steps_to_hatch -= 1
-    for i in $player.pokemon_party
+    $player.pokemon_party.each do |i|
       next if ![:FLAMEBODY, :MAGMAARMOR, :STEAMENGINE].include?(i.ability_id)
       egg.steps_to_hatch -= 1
       break

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

@@ -253,12 +253,12 @@ class SpriteMetafilePlayer
 
   def update
     if @playing
-      for j in @index...@metafile.length
+      (@index...@metafile.length).each do |j|
         @index = j + 1
         break if @metafile[j][0] < 0
         code = @metafile[j][0]
         value = @metafile[j][1]
-        for sprite in @sprites
+        @sprites.each do |sprite|
           case code
           when SpriteMetafile::X          then sprite.x = value
           when SpriteMetafile::Y          then sprite.y = value
@@ -379,7 +379,7 @@ class PokemonEvolutionScene
     currenttempo = 25
     maxtempo = 7 * Graphics.frame_rate
     while totaltempo < maxtempo
-      for j in 0...currenttempo
+      currenttempo.times do |j|
         if alpha < 255
           sprite.color.red   = 255
           sprite.color.green = 255
@@ -395,7 +395,7 @@ class PokemonEvolutionScene
       end
       totaltempo += currenttempo
       if totaltempo + currenttempo < maxtempo
-        for j in 0...currenttempo
+        currenttempo.times do |j|
           sprite.zoom  = [1.1 * (j + 1) / currenttempo, 1.0].min
           sprite2.zoom = [1.1 * (currenttempo - j - 1) / currenttempo, 1.0].min
           sprite.update
@@ -542,7 +542,7 @@ class PokemonEvolutionScene
     pbMEPlay("Evolution start")
     pbBGMPlay("Evolution")
     canceled = false
-    begin
+    loop do
       pbUpdateNarrowScreen
       metaplayer1.update
       metaplayer2.update
@@ -555,7 +555,8 @@ class PokemonEvolutionScene
         canceled = true
         break
       end
-    end while metaplayer1.playing? && metaplayer2.playing?
+      break unless metaplayer1.playing? && metaplayer2.playing?
+    end
     pbFlashInOut(canceled, oldstate, oldstate2)
     if canceled
       $stats.evolutions_cancelled += 1
@@ -595,7 +596,7 @@ class PokemonEvolutionScene
     $player.pokedex.set_owned(@newspecies)
     # Learn moves upon evolution for evolved species
     movelist = @pokemon.getMoveList
-    for i in movelist
+    movelist.each do |i|
       next if i[0] != 0 && i[0] != @pokemon.level   # 0 is "learn upon evolution"
       pbLearnMove(@pokemon, i[1], true) { pbUpdate }
     end

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

@@ -8,22 +8,18 @@ class PokemonTrade_Scene
 
   def pbRunPictures(pictures, sprites)
     loop do
-      for i in 0...pictures.length
-        pictures[i].update
-      end
-      for i in 0...sprites.length
-        if sprites[i].is_a?(IconSprite)
-          setPictureIconSprite(sprites[i], pictures[i])
+      pictures.each { |pic| pic.update }
+      sprites.each_with_index do |sprite, i|
+        if sprite.is_a?(IconSprite)
+          setPictureIconSprite(sprite, pictures[i])
         else
-          setPictureSprite(sprites[i], pictures[i])
+          setPictureSprite(sprite, pictures[i])
         end
       end
       Graphics.update
       Input.update
       running = false
-      for i in 0...pictures.length
-        running = true if pictures[i].running?
-      end
+      pictures.each { |pic| running = true if pic.running? }
       break if !running
     end
   end
@@ -119,7 +115,7 @@ class PokemonTrade_Scene
     # Dropping ball
     y = Graphics.height - 96 - 16 - 16   # end point of Poké Ball
     delay = picturePoke.totalDuration + 2
-    for i in 0...4
+    4.times do |i|
       t = [4, 4, 3, 2][i]   # Time taken to rise or fall for each bounce
       d = [1, 2, 4, 8][i]   # Fraction of the starting height each bounce rises to
       delay -= t if i == 0

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

@@ -96,7 +96,7 @@ class HallOfFame_Scene
     exponent = 8 if exponent > 8
     max = 2**exponent
     speed = (2**8) / max
-    for j in 0..max
+    (0..max).each do |j|
       if extraWaitExponent > -1
         (2**extraWaitExponent).times do
           Graphics.update
@@ -117,7 +117,7 @@ class HallOfFame_Scene
 
   # Change the pokémon sprites opacity except the index one
   def setPokemonSpritesOpacity(index, opacity = 255)
-    for n in 0...@hallEntry.size
+    @hallEntry.size.times do |n|
       @sprites["pokemon#{n}"].opacity = (n == index) ? 255 : opacity if @sprites["pokemon#{n}"]
     end
   end
@@ -201,7 +201,7 @@ class HallOfFame_Scene
 
   def createBattlers(hide = true)
     # Movement in animation
-    for i in 0...6
+    6.times do |i|
       # Clear all 6 pokémon sprites and dispose the ones that exists every time
       # that this method is call
       restartSpritePosition(@sprites, "pokemon#{i}")

Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb

@@ -144,17 +144,17 @@ _END_
     @total_height = credit_lines.size * 32
     lines_per_bitmap = @bitmap_height / 32
     num_bitmaps = (credit_lines.size.to_f / lines_per_bitmap).ceil
-    for i in 0...num_bitmaps
+    num_bitmaps.times do |i|
       credit_bitmap = Bitmap.new(Graphics.width, @bitmap_height + 16)
       pbSetSystemFont(credit_bitmap)
-      for j in 0...lines_per_bitmap
+      lines_per_bitmap.times do |j|
         line = credit_lines[(i * lines_per_bitmap) + j]
         next if !line
         line = line.split("<s>")
         xpos = 0
         align = 1   # Centre align
         linewidth = Graphics.width
-        for k in 0...line.length
+        line.length.times do |k|
           if line.length > 1
             xpos = (k == 0) ? 0 : 20 + (Graphics.width / 2)
             align = (k == 0) ? 2 : 0   # Right align : left align