More Rubocopping

Data/Scripts/003_Game processing/002_Scene_Map.rb

@@ -9,7 +9,7 @@ class Scene_Map
 
   def spriteset(map_id = -1)
     return @spritesets[map_id] if map_id > 0 && @spritesets[map_id]
-    for i in @spritesets.values
+    @spritesets.values.each do |i|
       return i if i.map == $game_map
     end
     return @spritesets.values[0]
@@ -19,7 +19,7 @@ class Scene_Map
     @map_renderer = TilemapRenderer.new(Spriteset_Map.viewport)
     @spritesetGlobal = Spriteset_Global.new
     @spritesets = {}
-    for map in $map_factory.maps
+    $map_factory.maps.each do |map|
       @spritesets[map.map_id] = Spriteset_Map.new(map)
     end
     $map_factory.setSceneStarted(self)
@@ -36,7 +36,7 @@ class Scene_Map
 
   def disposeSpritesets
     return if !@spritesets
-    for i in @spritesets.keys
+    @spritesets.keys.each do |i|
       next if !@spritesets[i]
       @spritesets[i].dispose
       @spritesets[i] = nil
@@ -132,7 +132,7 @@ class Scene_Map
   end
 
   def updateMaps
-    for map in $map_factory.maps
+    $map_factory.maps.each do |map|
       map.update
     end
     $map_factory.updateMaps(self)
@@ -140,11 +140,11 @@ class Scene_Map
 
   def updateSpritesets
     @spritesets = {} if !@spritesets
-    for map in $map_factory.maps
+    $map_factory.maps.each do |map|
       @spritesets[map.map_id] = Spriteset_Map.new(map) if !@spritesets[map.map_id]
     end
     keys = @spritesets.keys.clone
-    for i in keys
+    keys.each do |i|
       if !$map_factory.hasMap?(i)
         @spritesets[i].dispose if @spritesets[i]
         @spritesets[i] = nil

Data/Scripts/003_Game processing/003_Interpreter.rb

@@ -60,7 +60,7 @@ class Interpreter
       return
     end
     # Check all map events for one that wants to start, and set it up
-    for event in $game_map.events.values
+    $game_map.events.values.each do |event|
       next if !event.starting
       if event.trigger < 3   # Isn't autorun or parallel processing
         event.lock
@@ -70,7 +70,7 @@ class Interpreter
       return
     end
     # Check all common events for one that is autorun, and set it up
-    for common_event in $data_common_events.compact
+    $data_common_events.compact.each do |common_event|
       next if common_event.trigger != 1 || !$game_switches[common_event.switch_id]
       setup(common_event.list, 0)
       return
@@ -107,7 +107,7 @@ class Interpreter
       # Do nothing if any event or the player is in the middle of a move route
       if @move_route_waiting
         return if $game_player.move_route_forcing
-        for event in $game_map.events.values
+        $game_map.events.values.each do |event|
           return if event.move_route_forcing
         end
         $game_temp.followers.each_follower do |event, follower|
@@ -386,7 +386,7 @@ class Interpreter
     time = time.to_i
     pbSetSelfSwitch(@event_id, "A", true)
     $PokemonGlobal.eventvars[[@map_id, @event_id]] = time
-    for otherevt in arg
+    arg.each do |otherevt|
       pbSetSelfSwitch(otherevt, "A", true)
       $PokemonGlobal.eventvars[[@map_id, otherevt]] = time
     end

Data/Scripts/003_Game processing/004_Interpreter_Commands.rb

@@ -190,7 +190,7 @@ class Interpreter
     @message_waiting = true   # Lets parallel process events work while a message is displayed
     if commands
       cmd_texts = []
-      for cmd in commands[0]
+      commands[0].each do |cmd|
         cmd_texts.push(_MAPINTL($game_map.map_id, cmd))
       end
       command = pbMessage(message + message_end, cmd_texts, commands[1])
@@ -272,7 +272,7 @@ class Interpreter
       Input.update
       pbUpdateSceneMap
       # Check for input and break if there is one
-      for i in 1..18
+      (1..18).each do |i|
         ret = i if Input.trigger?(i)
       end
       break if ret != 0
@@ -460,7 +460,7 @@ class Interpreter
   #-----------------------------------------------------------------------------
   def command_121
     should_refresh = false
-    for i in @parameters[0]..@parameters[1]
+    (@parameters[0]..@parameters[1]).each do |i|
       next if $game_switches[i] == (@parameters[2] == 0)
       $game_switches[i] = (@parameters[2] == 0)
       should_refresh = true
@@ -506,7 +506,7 @@ class Interpreter
       end
     end
     # Apply value and operation to all specified game variables
-    for i in @parameters[0]..@parameters[1]
+    (@parameters[0]..@parameters[1]).each do |i|
       case @parameters[2]
       when 0   # set
         next if $game_variables[i] == value
@@ -573,7 +573,7 @@ class Interpreter
   # * Change Windowskin
   #-----------------------------------------------------------------------------
   def command_131
-    for i in 0...Settings::SPEECH_WINDOWSKINS.length
+    Settings::SPEECH_WINDOWSKINS.length.times do |i|
       next if Settings::SPEECH_WINDOWSKINS[i] != @parameters[0]
       $PokemonSystem.textskin = i
       MessageConfig.pbSetSpeechFrame("Graphics/Windowskins/" + Settings::SPEECH_WINDOWSKINS[i])

Data/Scripts/003_Game processing/005_Event_Handlers.rb

@@ -39,7 +39,7 @@ class Event
   # proc { |sender,arg0,arg1,...| }
   def trigger(*arg)
     arglist = arg[1, arg.length]
-    for callback in @callbacks
+    @callbacks.each do |callback|
       if callback.arity > 2 && arg.length == callback.arity
         # Retrofitted for callbacks that take three or more arguments
         callback.call(*arg)
@@ -53,7 +53,7 @@ class Event
   # by the code where the event occurred. The first argument is the sender of
   # the event, the other arguments are the event's parameters.
   def trigger2(*arg)
-    for callback in @callbacks
+    @callbacks.each do |callback|
       callback.call(*arg)
     end
   end
@@ -83,7 +83,7 @@ class HandlerHash
     return ret if ret
     mod = Object.const_get(@mod) rescue nil
     return nil if !mod
-    for key in mod.constants
+    mod.constants.each do |key|
       next if mod.const_get(key) != sym
       ret = key.to_sym
       @symbolCache[sym] = ret
@@ -112,7 +112,7 @@ class HandlerHash
   def copy(src, *dests)
     handler = self[src]
     if handler
-      for dest in dests
+      dests.each do |dest|
         self.add(dest, handler)
       end
     end
@@ -125,7 +125,7 @@ class HandlerHash
     symbol = toSymbol(sym)
     ret = @hash[symbol] if symbol && @hash[symbol]   # Symbol or string
     unless ret
-      for addif in @addIfs
+      @addIfs.each do |addif|
         return addif[1] if addif[0].call(id)
       end
     end
@@ -155,7 +155,7 @@ class HandlerHash2
   def [](sym)
     sym = sym.id if !sym.is_a?(Symbol) && sym.respond_to?("id")
     return @hash[sym] if sym && @hash[sym]
-    for add_if in @add_ifs
+    @add_ifs.each do |add_if|
       return add_if[1] if add_if[0].call(sym)
     end
     return nil
@@ -178,7 +178,7 @@ class HandlerHash2
   def copy(src, *dests)
     handler = self[src]
     return if !handler
-    for dest in dests
+    dests.each do |dest|
       self.add(dest, handler)
     end
   end
@@ -209,7 +209,7 @@ class HandlerHashBasic
     ret = nil
     ret = @hash[entry] if entry && @hash[entry]
     unless ret
-      for addif in @addIfs
+      @addIfs.each do |addif|
         return addif[1] if addif[0].call(entry)
       end
     end

Data/Scripts/003_Game processing/006_Event_OverworldEvents.rb

@@ -158,14 +158,14 @@ module EncounterModifier
   end
 
   def self.trigger(encounter)
-    for prc in @@procs
+    @@procs.each do |prc|
       encounter = prc.call(encounter)
     end
     return encounter
   end
 
   def self.triggerEncounterEnd
-    for prc in @@procsEnd
+    @@procsEnd.each do |prc|
       prc.call
     end
   end