More tweaks from the Rubocop overlord

Data/Scripts/021_Compiler/001_Compiler.rb

@@ -321,7 +321,8 @@ module Compiler
   end
 
   def checkEnumField(ret, enumer)
-    if enumer.is_a?(Module)
+    case enumer
+    when Module
       begin
         if nil_or_empty?(ret) || !enumer.const_defined?(ret)
           raise _INTL("Undefined value {1} in {2}\r\n{3}", ret, enumer.name, FileLineData.linereport)
@@ -330,7 +331,7 @@ module Compiler
         raise _INTL("Incorrect value {1} in {2}\r\n{3}", ret, enumer.name, FileLineData.linereport)
       end
       return enumer.const_get(ret.to_sym)
-    elsif enumer.is_a?(Symbol) || enumer.is_a?(String)
+    when Symbol, String
       if !Kernel.const_defined?(enumer.to_sym) && GameData.const_defined?(enumer.to_sym)
         enumer = GameData.const_get(enumer.to_sym)
         begin
@@ -351,13 +352,13 @@ module Compiler
         raise _INTL("Incorrect value {1} in {2}\r\n{3}", ret, enumer.name, FileLineData.linereport)
       end
       return enumer.const_get(ret.to_sym)
-    elsif enumer.is_a?(Array)
+    when Array
       idx = findIndex(enumer) { |item| ret == item }
       if idx < 0
         raise _INTL("Undefined value {1} (expected one of: {2})\r\n{3}", ret, enumer.inspect, FileLineData.linereport)
       end
       return idx
-    elsif enumer.is_a?(Hash)
+    when Hash
       value = enumer[ret]
       if value == nil
         raise _INTL("Undefined value {1} (expected one of: {2})\r\n{3}", ret, enumer.keys.inspect, FileLineData.linereport)
@@ -368,10 +369,11 @@ module Compiler
   end
 
   def checkEnumFieldOrNil(ret, enumer)
-    if enumer.is_a?(Module)
+    case enumer
+    when Module
       return nil if nil_or_empty?(ret) || !(enumer.const_defined?(ret) rescue false)
       return enumer.const_get(ret.to_sym)
-    elsif enumer.is_a?(Symbol) || enumer.is_a?(String)
+    when Symbol, String
       if GameData.const_defined?(enumer.to_sym)
         enumer = GameData.const_get(enumer.to_sym)
         return nil if nil_or_empty?(ret) || !enumer.exists?(ret.to_sym)
@@ -380,11 +382,11 @@ module Compiler
       enumer = Object.const_get(enumer.to_sym)
       return nil if nil_or_empty?(ret) || !(enumer.const_defined?(ret) rescue false)
       return enumer.const_get(ret.to_sym)
-    elsif enumer.is_a?(Array)
+    when Array
       idx = findIndex(enumer) { |item| ret == item }
       return nil if idx < 0
       return idx
-    elsif enumer.is_a?(Hash)
+    when Hash
       return enumer[ret]
     end
     return nil
@@ -568,14 +570,15 @@ module Compiler
           case schema[1][i, 1]
           when "e", "E"   # Enumerable
             enumer = schema[2 + i]
-            if enumer.is_a?(Array)
+            case enumer
+            when Array
               file.write(enumer[value])
-            elsif enumer.is_a?(Symbol) || enumer.is_a?(String)
+            when Symbol, String
               mod = Object.const_get(enumer.to_sym)
               file.write(getConstantName(mod, value))
-            elsif enumer.is_a?(Module)
+            when Module
               file.write(getConstantName(enumer, value))
-            elsif enumer.is_a?(Hash)
+            when Hash
               for key in enumer.keys
                 if enumer[key] == value
                   file.write(key)
@@ -585,18 +588,19 @@ module Compiler
             end
           when "y", "Y"   # Enumerable or integer
             enumer = schema[2 + i]
-            if enumer.is_a?(Array)
+            case enumer
+            when Array
               if enumer[value] != nil
                 file.write(enumer[value])
               else
                 file.write(value)
               end
-            elsif enumer.is_a?(Symbol) || enumer.is_a?(String)
+            when Symbol, String
               mod = Object.const_get(enumer.to_sym)
               file.write(getConstantNameOrValue(mod, value))
-            elsif enumer.is_a?(Module)
+            when Module
               file.write(getConstantNameOrValue(enumer, value))
-            elsif enumer.is_a?(Hash)
+            when Hash
               hasenum = false
               for key in enumer.keys
                 if enumer[key] == value
@@ -756,48 +760,48 @@ module Compiler
     return if !$DEBUG
     begin
       dataFiles = [
-         "abilities.dat",
-         "berry_plants.dat",
-         "encounters.dat",
-         "items.dat",
-         "map_connections.dat",
-         "map_metadata.dat",
-         "metadata.dat",
-         "moves.dat",
-         "phone.dat",
-         "player_metadata.dat",
-         "regional_dexes.dat",
-         "ribbons.dat",
-         "shadow_pokemon.dat",
-         "species.dat",
-         "species_metrics.dat",
-         "town_map.dat",
-         "trainer_lists.dat",
-         "trainer_types.dat",
-         "trainers.dat",
-         "types.dat"
+        "abilities.dat",
+        "berry_plants.dat",
+        "encounters.dat",
+        "items.dat",
+        "map_connections.dat",
+        "map_metadata.dat",
+        "metadata.dat",
+        "moves.dat",
+        "phone.dat",
+        "player_metadata.dat",
+        "regional_dexes.dat",
+        "ribbons.dat",
+        "shadow_pokemon.dat",
+        "species.dat",
+        "species_metrics.dat",
+        "town_map.dat",
+        "trainer_lists.dat",
+        "trainer_types.dat",
+        "trainers.dat",
+        "types.dat"
       ]
       textFiles = [
-         "abilities.txt",
-         "battle_facility_lists.txt",
-         "berry_plants.txt",
-         "encounters.txt",
-         "items.txt",
-         "map_connections.txt",
-         "map_metadata.txt",
-         "metadata.txt",
-         "moves.txt",
-         "phone.txt",
-         "pokemon.txt",
-         "pokemon_forms.txt",
-         "pokemon_metrics.txt",
-         "regional_dexes.txt",
-         "ribbons.txt",
-         "shadow_pokemon.txt",
-         "town_map.txt",
-         "trainer_types.txt",
-         "trainers.txt",
-         "types.txt"
+        "abilities.txt",
+        "battle_facility_lists.txt",
+        "berry_plants.txt",
+        "encounters.txt",
+        "items.txt",
+        "map_connections.txt",
+        "map_metadata.txt",
+        "metadata.txt",
+        "moves.txt",
+        "phone.txt",
+        "pokemon.txt",
+        "pokemon_forms.txt",
+        "pokemon_metrics.txt",
+        "regional_dexes.txt",
+        "ribbons.txt",
+        "shadow_pokemon.txt",
+        "town_map.txt",
+        "trainer_types.txt",
+        "trainers.txt",
+        "types.txt"
       ]
       latestDataTime = 0
       latestTextTime = 0

Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb

@@ -1585,12 +1585,12 @@ module Compiler
   def compile_battle_tower_trainers(filename)
     sections = []
     requiredtypes = {
-       "Type"          => [0, "e", :TrainerType],
-       "Name"          => [1, "s"],
-       "BeginSpeech"   => [2, "s"],
-       "EndSpeechWin"  => [3, "s"],
-       "EndSpeechLose" => [4, "s"],
-       "PokemonNos"    => [5, "*u"]
+      "Type"          => [0, "e", :TrainerType],
+      "Name"          => [1, "s"],
+      "BeginSpeech"   => [2, "s"],
+      "EndSpeechWin"  => [3, "s"],
+      "EndSpeechLose" => [4, "s"],
+      "PokemonNos"    => [5, "*u"]
     }
     trainernames  = []
     beginspeech   = []

Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb

@@ -117,10 +117,10 @@ module Compiler
   def push_move_route(list, character, route, indent = 0)
     route = generate_move_route(route) if route.is_a?(Array)
     for i in 0...route.list.length
-      list.push(RPG::EventCommand.new(
-        (i == 0) ? 209 : 509, indent,
-        (i == 0) ? [character, route] : [route.list[i - 1]]
-      ))
+      list.push(
+        RPG::EventCommand.new((i == 0) ? 209 : 509, indent,
+                              (i == 0) ? [character, route] : [route.list[i - 1]])
+      )
     end
   end
 
@@ -307,7 +307,7 @@ module Compiler
     def getEventFromXY(mapID, x, y)
       return nil if x < 0 || y < 0
       mapPositions = @mapxy[mapID]
-      return mapPositions[y * @mapWidths[mapID] + x] if mapPositions
+      return mapPositions[(y * @mapWidths[mapID]) + x] if mapPositions
       map = getMap(mapID)
       return nil if !map
       @mapWidths[mapID]  = map.width
@@ -315,10 +315,10 @@ module Compiler
       mapPositions = []
       width = map.width
       for e in map.events.values
-        mapPositions[e.y * width + e.x] = e if e
+        mapPositions[(e.y * width) + e.x] = e if e
       end
       @mapxy[mapID] = mapPositions
-      return mapPositions[y * width + x]
+      return mapPositions[(y * width) + x]
     end
 
     def getEventFromID(mapID, id)
@@ -783,22 +783,27 @@ module Compiler
         if transferCommand.length == 1 && !list.any? { |cmd| cmd.code == 208 }   # Change Transparent Flag
           # Rewrite penultimate page
           list.clear
-          push_move_route_and_wait(list, 0, [   # Move Route for door opening
-             PBMoveRoute::PlaySE, RPG::AudioFile.new("Door enter"), PBMoveRoute::Wait, 2,
+          push_move_route_and_wait(   # Move Route for door opening
+            list, 0,
+            [PBMoveRoute::PlaySE, RPG::AudioFile.new("Door enter"), PBMoveRoute::Wait, 2,
              PBMoveRoute::TurnLeft, PBMoveRoute::Wait, 2,
              PBMoveRoute::TurnRight, PBMoveRoute::Wait, 2,
-             PBMoveRoute::TurnUp, PBMoveRoute::Wait, 2
-          ])
-          push_move_route_and_wait(list, -1, [   # Move Route for player entering door
-             PBMoveRoute::ThroughOn, PBMoveRoute::Up, PBMoveRoute::ThroughOff
-          ])
+             PBMoveRoute::TurnUp, PBMoveRoute::Wait, 2]
+          )
+          push_move_route_and_wait(   # Move Route for player entering door
+            list, -1,
+            [PBMoveRoute::ThroughOn, PBMoveRoute::Up, PBMoveRoute::ThroughOff]
+          )
           push_event(list, 208, [0])   # Change Transparent Flag (invisible)
           push_script(list, "Followers.follow_into_door")
           push_event(list, 210, [], indent)   # Wait for Move's Completion
-          push_move_route_and_wait(list, 0, [PBMoveRoute::Wait, 2,   # Move Route for door closing
-                                             PBMoveRoute::TurnRight, PBMoveRoute::Wait, 2,
-                                             PBMoveRoute::TurnLeft, PBMoveRoute::Wait, 2,
-                                             PBMoveRoute::TurnDown, PBMoveRoute::Wait, 2])
+          push_move_route_and_wait(   # Move Route for door closing
+            list, 0,
+            [PBMoveRoute::Wait, 2,
+             PBMoveRoute::TurnRight, PBMoveRoute::Wait, 2,
+             PBMoveRoute::TurnLeft, PBMoveRoute::Wait, 2,
+             PBMoveRoute::TurnDown, PBMoveRoute::Wait, 2]
+          )
           push_event(list, 223, [Tone.new(-255, -255, -255), 6])   # Change Screen Color Tone
           push_wait(list, 8)   # Wait
           push_event(list, 208, [1])   # Change Transparent Flag (visible)
@@ -811,17 +816,21 @@ module Compiler
           push_branch(list, "get_self.onEvent?")   # Conditional Branch
           push_event(list, 208, [0], 1)   # Change Transparent Flag (invisible)
           push_script(list, "Followers.hide_followers", 1)
-          push_move_route_and_wait(list, 0, [   # Move Route for setting door to open
-             PBMoveRoute::TurnLeft, PBMoveRoute::Wait, 6
-          ], 1)
+          push_move_route_and_wait(   # Move Route for setting door to open
+            list, 0,
+            [PBMoveRoute::TurnLeft, PBMoveRoute::Wait, 6],
+            1
+          )
           push_event(list, 208, [1], 1)   # Change Transparent Flag (visible)
           push_move_route_and_wait(list, -1, [PBMoveRoute::Down], 1)   # Move Route for player exiting door
           push_script(list, "Followers.put_followers_on_player", 1)
-          push_move_route_and_wait(list, 0, [   # Move Route for door closing
-             PBMoveRoute::TurnUp, PBMoveRoute::Wait, 2,
+          push_move_route_and_wait(   # Move Route for door closing
+            list, 0,
+            [PBMoveRoute::TurnUp, PBMoveRoute::Wait, 2,
              PBMoveRoute::TurnRight, PBMoveRoute::Wait, 2,
-             PBMoveRoute::TurnDown, PBMoveRoute::Wait, 2
-          ], 1)
+             PBMoveRoute::TurnDown, PBMoveRoute::Wait, 2],
+            1
+          )
           push_branch_end(list, 1)
           push_script(list, "setTempSwitchOn(\"A\")")
           push_end(list)