More Rubocop changes

Data/Scripts/003_Game processing/001_StartGame.rb

@@ -4,15 +4,15 @@ module Game
   def self.initialize
     $game_temp          = Game_Temp.new
     $game_system        = Game_System.new
-    $data_animations    = load_data('Data/Animations.rxdata')
-    $data_tilesets      = load_data('Data/Tilesets.rxdata')
-    $data_common_events = load_data('Data/CommonEvents.rxdata')
-    $data_system        = load_data('Data/System.rxdata')
+    $data_animations    = load_data("Data/Animations.rxdata")
+    $data_tilesets      = load_data("Data/Tilesets.rxdata")
+    $data_common_events = load_data("Data/CommonEvents.rxdata")
+    $data_system        = load_data("Data/System.rxdata")
     pbLoadBattleAnimations
     GameData.load_all
-    map_file = sprintf('Data/Map%03d.rxdata', $data_system.start_map_id)
+    map_file = sprintf("Data/Map%03d.rxdata", $data_system.start_map_id)
     if $data_system.start_map_id == 0 || !pbRgssExists?(map_file)
-      raise _INTL('No starting position was set in the map editor.')
+      raise _INTL("No starting position was set in the map editor.")
     end
   end
 
@@ -31,7 +31,7 @@ module Game
     # Set language (and choose language if there is no save file)
     if Settings::LANGUAGES.length >= 2
       $PokemonSystem.language = pbChooseLanguage if save_data.empty?
-      pbLoadMessages('Data/' + Settings::LANGUAGES[$PokemonSystem.language][1])
+      pbLoadMessages("Data/" + Settings::LANGUAGES[$PokemonSystem.language][1])
     end
   end
 
@@ -81,13 +81,13 @@ module Game
         $map_factory.setup($game_map.map_id)
       rescue Errno::ENOENT
         if $DEBUG
-          pbMessage(_INTL('Map {1} was not found.', $game_map.map_id))
+          pbMessage(_INTL("Map {1} was not found.", $game_map.map_id))
           map = pbWarpToMap
           exit unless map
           $map_factory.setup(map[0])
           $game_player.moveto(map[1], map[2])
         else
-          raise _INTL('The map was not found. The game cannot continue.')
+          raise _INTL("The map was not found. The game cannot continue.")
         end
       end
       $game_player.center($game_player.x, $game_player.y)
@@ -95,7 +95,7 @@ module Game
       $map_factory.setMapChanged($game_map.map_id)
     end
     if $game_map.events.nil?
-      raise _INTL('The map is corrupt. The game cannot continue.')
+      raise _INTL("The map is corrupt. The game cannot continue.")
     end
     $PokemonEncounters = PokemonEncounters.new
     $PokemonEncounters.setup($game_map.map_id)

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]
-    @spritesets.values.each do |i|
+    @spritesets.each_value do |i|
       return i if i.map == $game_map
     end
     return @spritesets.values[0]
@@ -36,7 +36,7 @@ class Scene_Map
 
   def disposeSpritesets
     return if !@spritesets
-    @spritesets.keys.each do |i|
+    @spritesets.each_key do |i|
       next if !@spritesets[i]
       @spritesets[i].dispose
       @spritesets[i] = nil

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

@@ -22,7 +22,7 @@ class Interpreter
 
   def inspect
     str = super.chop
-    str << sprintf(' @event_id: %d>', @event_id)
+    str << sprintf(" @event_id: %d>", @event_id)
     return str
   end
 
@@ -62,7 +62,7 @@ class Interpreter
       return
     end
     # Check all map events for one that wants to start, and set it up
-    $game_map.events.values.each do |event|
+    $game_map.events.each_value do |event|
       next if !event.starting
       if event.trigger < 3   # Isn't autorun or parallel processing
         event.lock
@@ -80,7 +80,7 @@ class Interpreter
   end
 
   def running?
-    return @list != nil
+    return !@list.nil?
   end
   #-----------------------------------------------------------------------------
   # * Frame Update
@@ -109,7 +109,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
-        $game_map.events.values.each do |event|
+        $game_map.events.each_value do |event|
           return if event.move_route_forcing
         end
         $game_temp.followers.each_follower do |event, follower|

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

@@ -1019,7 +1019,7 @@ class Interpreter
       $player.name = pbEnterPlayerName(_INTL("Your name?"), 1, @parameters[1], $player.name)
       return true
     end
-    if $game_actors && $data_actors && $data_actors[@parameters[0]] != nil
+    if $game_actors && $data_actors && $data_actors[@parameters[0]]
       $game_temp.battle_abort = true
       pbFadeOutIn {
         sscene = PokemonEntryScene.new