More Rubocopping

Data/Scripts/005_Sprites/003_Sprite_Character.rb

@@ -28,7 +28,7 @@ class BushBitmap
     ret = Bitmap.new(bitmap.width, bitmap.height)
     charheight = ret.height / 4
     cy = charheight - depth - 2
-    for i in 0...4
+    4.times do |i|
       y = i * charheight
       if cy >= 0
         ret.blt(0, y, bitmap, Rect.new(0, y, ret.width, cy))

Data/Scripts/005_Sprites/006_Spriteset_Global.rb

@@ -8,7 +8,7 @@ class Spriteset_Global
     @follower_sprites = FollowerSprites.new(Spriteset_Map.viewport)
     @playersprite = Sprite_Character.new(Spriteset_Map.viewport, $game_player)
     @picture_sprites = []
-    for i in 1..100
+    (1..100).each do |i|
       @picture_sprites.push(Sprite_Picture.new(@@viewport2, $game_screen.pictures[i]))
     end
     @timer_sprite = Sprite_Timer.new

Data/Scripts/005_Sprites/007_Spriteset_Map.rb

@@ -54,7 +54,7 @@ class Spriteset_Map
     @fog = AnimatedPlane.new(@@viewport1)
     @fog.z = 3000
     @character_sprites = []
-    for i in @map.events.keys.sort
+    @map.events.keys.sort.each do |i|
       sprite = Sprite_Character.new(@@viewport1, @map.events[i])
       @character_sprites.push(sprite)
     end
@@ -119,7 +119,7 @@ class Spriteset_Map
     @fog.tone       = @map.fog_tone
     @panorama.update
     @fog.update
-    for sprite in @character_sprites
+    @character_sprites.each do |sprite|
       sprite.update
     end
     if self.map != $game_map

Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb

@@ -56,29 +56,24 @@ class Spriteset_Map
     return sprite
   end
 
-  def addUserSprite(sprite)
-    for i in 0...@usersprites.length
-      if @usersprites[i] == nil || @usersprites[i].disposed?
-        @usersprites[i] = sprite
-        return
-      end
+  def addUserSprite(new_sprite)
+    @usersprites.each_with_index do |sprite, i|
+      next if sprite && !sprite.disposed?
+      @usersprites[i] = new_sprite
+      return
     end
-    @usersprites.push(sprite)
+    @usersprites.push(new_sprite)
   end
 
   def dispose
     _animationSprite_dispose
-    for i in 0...@usersprites.length
-      @usersprites[i].dispose
-    end
+    @usersprites.each { |sprite| sprite.dispose }
     @usersprites.clear
   end
 
   def update
     @@viewport3.tone.set(0, 0, 0, 0)
     _animationSprite_update
-    for i in 0...@usersprites.length
-      @usersprites[i].update if !@usersprites[i].disposed?
-    end
+    @usersprites.each { |sprite| sprite.update if !sprite.disposed? }
   end
 end

Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb

@@ -135,14 +135,14 @@ class Sprite_Character < RPG::Sprite
     if character.is_a?(Game_Event) && shadows.length > 0
       params = XPML_read(map, "Shadow", @character, 4)
       if params != nil
-        for i in 0...shadows.size
-          @ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows[i]))
+        shadows.each do |shadow|
+          @ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows))
         end
       end
     end
     if character.is_a?(Game_Player) && shadows.length > 0
-      for i in 0...shadows.size
-        @ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadows[i]))
+      shadows.each do |shadow|
+        @ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadow))
       end
     end
     update
@@ -157,11 +157,7 @@ class Sprite_Character < RPG::Sprite
 
   def update
     shadow_update
-    if @ombrelist.length > 0
-      for i in 0...@ombrelist.size
-        @ombrelist[i].update
-      end
-    end
+    @ombrelist.each { |ombre| ombre.update }
   end
 end
 
@@ -187,7 +183,7 @@ class Spriteset_Map
     @shadows = []
     warn = false
     map = $game_map if !map
-    for k in map.events.keys.sort
+    map.events.keys.sort.each do |k|
       ev = map.events[k]
       warn = true if (ev.list != nil && ev.list.length > 0 &&
          ev.list[0].code == 108 &&
@@ -199,7 +195,7 @@ class Spriteset_Map
       p "Warning : At least one event on this map uses the obsolete way to add shadows"
     end
     shadow_initialize(map)
-    for sprite in @character_sprites
+    @character_sprites.each do |sprite|
       sprite.setShadows(map, @shadows)
     end
     $scene.spritesetGlobal.playersprite.setShadows(map, @shadows)
@@ -230,11 +226,11 @@ end
 def XPML_read(map, markup, event, max_param_number = 0)
   parameter_list = nil
   return nil if !event || event.list == nil
-  for i in 0...event.list.size
+  event.list.size.times do |i|
     if event.list[i].code == 108 &&
        event.list[i].parameters[0].downcase == "begin " + markup.downcase
       parameter_list = [] if parameter_list == nil
-      for j in (i + 1)...event.list.size
+      ((i + 1)...event.list.size).each do |j|
         if event.list[j].code == 108
           parts = event.list[j].parameters[0].split
           if parts.size != 1 && parts[0].downcase != "begin"

Data/Scripts/005_Sprites/010_ParticleEngine.rb

@@ -31,7 +31,7 @@ class Particle_Engine
 
   def dispose
     return if disposed?
-    for particle in @effect
+    @effect.each do |particle|
       next if particle.nil?
       particle.dispose
     end
@@ -80,13 +80,12 @@ class Particle_Engine
   def update
     if @firsttime
       @firsttime = false
-      for event in @map.events.values
+      @map.events.values.each do |event|
         remove_effect(event)
         add_effect(event)
       end
     end
-    for i in 0...@effect.length
-      particle = @effect[i]
+    @effect.each_with_index do |particle, i|
       next if particle.nil?
       if particle.event.pe_refresh
         event = particle.event
@@ -217,7 +216,7 @@ class ParticleEffect_Event < ParticleEffect
     @zoffset   = zOffset
     @bmwidth   = 32
     @bmheight  = 32
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particlex[i] = -@xoffset
       @particley[i] = -@yoffset
       @particles[i] = ParticleSprite.new(@viewport)
@@ -275,7 +274,7 @@ class ParticleEffect_Event < ParticleEffect
       end
     end
     particleZ = selfZ + @zoffset
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particles[i].z = particleZ
       if @particles[i].y <= @ytop
         @particles[i].y = @startingy + @yoffset
@@ -347,10 +346,10 @@ class ParticleEffect_Event < ParticleEffect
   end
 
   def dispose
-    for particle in @particles
+    @particles.each do |particle|
       particle.dispose
     end
-    for bitmap in @bitmaps.values
+    @bitmaps.values.each do |bitmap|
       bitmap.dispose
     end
     @particles.clear
@@ -388,7 +387,7 @@ class Particle_Engine::Teleport < ParticleEffect_Event
     setParameters([1, 1, 1, 10, rand(360), 1, -64,
                    Graphics.height, -64, Graphics.width, 0, 3, -8, -15, 20, 0])
     initParticles("wideportal", 250)
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particles[i].ox = 16
       @particles[i].oy = 16
     end
@@ -447,7 +446,7 @@ class Particle_Engine::SootSmoke < ParticleEffect_Event
     setParameters([0, 0, 0, 30, 0, 0.5, -64,
                    Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -15, 5, 80])
     initParticles("smoke", 100, 0)
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particles[i].blend_type = rand(6) < 3 ? 1 : 2
     end
   end
@@ -472,7 +471,7 @@ class Particle_Engine::FixedTeleport < ParticleEffect_Event
     setParameters([1, 0, 1, 10, rand(360), 1,
                    -Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 20, 0])
     initParticles("wideportal", 250)
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particles[i].ox = 16
       @particles[i].oy = 16
     end
@@ -488,7 +487,7 @@ class Particle_Engine::StarTeleport < ParticleEffect_Event
     setParameters([0, 0, 1, 10, 0, 1,
                    -Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 10, 0])
     initParticles("star", 250)
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particles[i].ox = 48
       @particles[i].oy = 48
     end
@@ -503,7 +502,7 @@ class Particle_Engine::Smokescreen < ParticleEffect_Event
     setParameters([0, 0, 0, 250, 0, 0.2, -64,
                    Graphics.height, -64, Graphics.width, 0.8, 0.8, -5, -15, 5, 80])
     initParticles(nil, 100)
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       rnd = rand(3)
       @opacity[i] = (rnd == 0) ? 1 : 100
       filename = (rnd == 0) ? "explosionsmoke" : "smoke"
@@ -555,7 +554,7 @@ class Particle_Engine::Splash < ParticleEffect_Event
 
   def update
     super
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particles[i].opacity = 50
       @particles[i].update
     end

Data/Scripts/005_Sprites/011_PictureEx.rb

@@ -142,7 +142,7 @@ class PictureEx
 
   def totalDuration
     ret = 0
-    for process in @processes
+    @processes.each do |process|
       dur = process[1] + process[2]
       ret = dur if dur > ret
     end
@@ -186,7 +186,7 @@ class PictureEx
   end
 
   def adjustPosition(xOffset, yOffset)
-    for process in @processes
+    @processes.each do |process|
       next if process[0] != Processes::XY
       process[5] += xOffset
       process[6] += yOffset
@@ -345,8 +345,7 @@ class PictureEx
   def update
     procEnded = false
     @frameUpdates.clear
-    for i in 0...@processes.length
-      process = @processes[i]
+    @processes.each_with_index do |process, i|
       # Decrease delay of processes that are scheduled to start later
       if process[1] >= 0
         # Set initial values if the process will start this frame
@@ -465,8 +464,8 @@ end
 #===============================================================================
 def setPictureSprite(sprite, picture, iconSprite = false)
   return if picture.frameUpdates.length == 0
-  for i in 0...picture.frameUpdates.length
-    case picture.frameUpdates[i]
+  picture.frameUpdates.each do |type|
+    case type
     when Processes::XY, Processes::DeltaXY
       sprite.x = picture.x.round
       sprite.y = picture.y.round

Data/Scripts/005_Sprites/012_Interpolators.rb

@@ -25,7 +25,7 @@ class Interpolator
       @frames = frames
       @step = 0
       @sprite = sprite
-      for item in items
+      items.each do |item|
         case item[0]
         when ZOOM_X
           @tweensteps[item[0]] = [sprite.zoom_x, item[1] - sprite.zoom_x]
@@ -52,7 +52,7 @@ class Interpolator
   def update
     if @tweening
       t = @step.to_f / @frames
-      for i in 0...@tweensteps.length
+      @tweensteps.length.times do |i|
         item = @tweensteps[i]
         next if !item
         case i