More Rubocop changes

Data/Scripts/005_Sprites/003_Sprite_Character.rb

@@ -117,9 +117,9 @@ class Sprite_Character < RPG::Sprite
         self.oy = @ch
       else
         @charbitmap = AnimatedBitmap.new(
-          'Graphics/Characters/' + @character_name, @character_hue
+          "Graphics/Characters/" + @character_name, @character_hue
         )
-        RPG::Cache.retain('Graphics/Characters/', @character_name, @character_hue) if @character == $game_player
+        RPG::Cache.retain("Graphics/Characters/", @character_name, @character_hue) if @character == $game_player
         @charbitmapAnimated = true
         @bushbitmap&.dispose
         @bushbitmap = nil

Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb

@@ -45,7 +45,7 @@ class Sprite_Shadow < RPG::Sprite
         self.ox = 16
         self.oy = 32
       else
-        @chbitmap = AnimatedBitmap.new('Graphics/Characters/' + @character.character_name,
+        @chbitmap = AnimatedBitmap.new("Graphics/Characters/" + @character.character_name,
                                        @character.character_hue)
         @cw = @chbitmap.width / 4
         @ch = @chbitmap.height / 4
@@ -134,7 +134,7 @@ class Sprite_Character < RPG::Sprite
   def setShadows(map, shadows)
     if character.is_a?(Game_Event) && shadows.length > 0
       params = XPML_read(map, "Shadow", @character, 4)
-      if params != nil
+      if params
         shadows.each do |shadow|
           @ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows))
         end
@@ -186,10 +186,10 @@ class Spriteset_Map
     map = $game_map if !map
     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 &&
+      warn = true if ev.list && ev.list.length > 0 && ev.list[0].code == 108 &&
                      (ev.list[0].parameters == ["s"] || ev.list[0].parameters == ["o"])
       params = XPML_read(map, "Shadow Source", ev, 4)
-      @shadows.push([ev] + params) if params != nil
+      @shadows.push([ev] + params) if params
     end
     if warn == true
       p "Warning : At least one event on this map uses the obsolete way to add shadows"
@@ -227,26 +227,19 @@ def XPML_read(map, markup, event, max_param_number = 0)
   parameter_list = nil
   return nil if !event || event.list.nil?
   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?
-      ((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"
-            if parts[1].to_i != 0 || parts[1] == "0"
-              parameter_list.push(parts[1].to_i)
-            else
-              parameter_list.push(parts[1])
-            end
-          else
-            return parameter_list
-          end
-        else
-          return parameter_list
-        end
-        return parameter_list if max_param_number != 0 && j == i + max_param_number
+    next unless event.list[i].code == 108 &&
+                event.list[i].parameters[0].downcase == "begin " + markup.downcase
+    parameter_list = [] if parameter_list.nil?
+    ((i + 1)...event.list.size).each do |j|
+      return parameter_list if event.list[j].code != 108
+      parts = event.list[j].parameters[0].split
+      return parameter_list if parts.size == 1 || parts[0].downcase == "begin"
+      if parts[1].to_i != 0 || parts[1] == "0"
+        parameter_list.push(parts[1].to_i)
+      else
+        parameter_list.push(parts[1])
       end
+      return parameter_list if max_param_number != 0 && j == i + max_param_number
     end
   end
   return parameter_list

Data/Scripts/005_Sprites/010_ParticleEngine.rb

@@ -80,7 +80,7 @@ class Particle_Engine
   def update
     if @firsttime
       @firsttime = false
-      @map.events.values.each do |event|
+      @map.events.each_value do |event|
         remove_effect(event)
         add_effect(event)
       end
@@ -349,7 +349,7 @@ class ParticleEffect_Event < ParticleEffect
     @particles.each do |particle|
       particle.dispose
     end
-    @bitmaps.values.each do |bitmap|
+    @bitmaps.each_value do |bitmap|
       bitmap.dispose
     end
     @particles.clear

Data/Scripts/005_Sprites/011_PictureEx.rb

@@ -436,12 +436,11 @@ class PictureEx
       end
       # Increase frame counter
       process[3] += 1
-      if process[3] > process[2]
-        # Process has ended, erase it
-        callback(process[4]) if process[4]
-        @processes[i] = nil
-        procEnded = true
-      end
+      next if process[3] <= process[2]
+      # Process has ended, erase it
+      callback(process[4]) if process[4]
+      @processes[i] = nil
+      procEnded = true
     end
     # Clear out empty spaces in @processes array caused by finished processes
     @processes.compact! if procEnded