More tweaks from the Rubocop overlord

Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb

@@ -813,12 +813,10 @@ DebugMenuCommands.register("dexlists", {
       dexindex = dexescmd - 1
       if dexindex < 0   # Toggle Pokédex ownership
         $player.has_pokedex = !$player.has_pokedex
-      else   # Toggle Regional Dex accessibility
-        if $player.pokedex.unlocked?(dexindex)
-          $player.pokedex.lock(dexindex)
-        else
-          $player.pokedex.unlock(dexindex)
-        end
+      elsif $player.pokedex.unlocked?(dexindex)   # Toggle Regional Dex accessibility
+        $player.pokedex.lock(dexindex)
+      else
+        $player.pokedex.unlock(dexindex)
       end
     end
   }
@@ -888,7 +886,7 @@ DebugMenuCommands.register("randomid", {
   "name"        => _INTL("Randomize Player ID"),
   "description" => _INTL("Generate a random new ID for the player."),
   "effect"      => proc {
-    $player.id = rand(2**16) | rand(2**16) << 16
+    $player.id = rand(2**16) | (rand(2**16) << 16)
     pbMessage(_INTL("The player's ID was changed to {1} (full ID: {2}).", $player.public_ID, $player.id))
   }
 })

Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb

@@ -127,7 +127,8 @@ def pbDebugSetVariable(id, diff)
 end
 
 def pbDebugVariableScreen(id)
-  if $game_variables[id].is_a?(Numeric)
+  case $game_variables[id]
+  when Numeric
     value = $game_variables[id]
     params = ChooseNumberParams.new
     params.setDefaultValue(value)
@@ -137,7 +138,7 @@ def pbDebugVariableScreen(id)
     $game_variables[id] = [value, 99999999].min
     $game_variables[id] = [$game_variables[id], -99999999].max
     $game_map.need_refresh = true
-  elsif $game_variables[id].is_a?(String)
+  when String
     value = pbMessageFreeText(_INTL("Set variable {1}.", id),
                               $game_variables[id], false, 250, Graphics.width)
     $game_variables[id] = value
@@ -184,9 +185,10 @@ def pbDebugVariables(mode)
         when ""
           $game_variables[current_id] = 0
         else
-          if $game_variables[current_id].is_a?(Numeric)
+          case $game_variables[current_id]
+          when Numeric
             $game_variables[current_id] = 0
-          elsif $game_variables[current_id].is_a?(String)
+          when String
             $game_variables[current_id] = ""
           end
         end
@@ -739,7 +741,7 @@ def pbCheckTileValidity(tile_id, map, tilesets, passages)
   return false if !tile_id
   if tile_id > 0 && tile_id < 384
     # Check for defined autotile
-    autotile_id = tile_id / 48 - 1
+    autotile_id = (tile_id / 48) - 1
     autotile_name = tilesets[map.tileset_id].autotile_names[autotile_id]
     return true if autotile_name && autotile_name != ""
   else

Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb

@@ -358,7 +358,7 @@ PokemonDebugMenuCommands.register("hiddenvalues", {
           end
         end
       when 2   # Randomise pID
-        pkmn.personalID = rand(2**16) | rand(2**16) << 16
+        pkmn.personalID = rand(2**16) | (rand(2**16) << 16)
         pkmn.calc_stats
         screen.pbRefreshSingle(pkmnid)
       end
@@ -1034,7 +1034,7 @@ PokemonDebugMenuCommands.register("ownership", {
         val = pbMessageChooseNumber(
           _INTL("Set the new ID (max. 65535)."), params
         ) { screen.pbUpdate }
-        pkmn.owner.id = val | val << 16
+        pkmn.owner.id = val | (val << 16)
       end
     end
     next false
@@ -1173,11 +1173,12 @@ PokemonDebugMenuCommands.register("duplicate", {
   "effect"      => proc { |pkmn, pkmnid, heldpoke, settingUpBattle, screen|
     if screen.pbConfirm(_INTL("Are you sure you want to copy this Pokémon?"))
       clonedpkmn = pkmn.clone
-      if screen.is_a?(PokemonPartyScreen)
+      case screen
+      when PokemonPartyScreen
         pbStorePokemon(clonedpkmn)
         screen.pbHardRefresh
         screen.pbDisplay(_INTL("The Pokémon was duplicated."))
-      elsif screen.is_a?(PokemonStorageScreen)
+      when PokemonStorageScreen
         if screen.storage.pbMoveCaughtToParty(clonedpkmn)
           if pkmnid[0] != -1
             screen.pbDisplay(_INTL("The duplicated Pokémon was moved to your party."))
@@ -1205,10 +1206,11 @@ PokemonDebugMenuCommands.register("delete", {
   "name"        => _INTL("Delete"),
   "effect"      => proc { |pkmn, pkmnid, heldpoke, settingUpBattle, screen|
     if screen.pbConfirm(_INTL("Are you sure you want to delete this Pokémon?"))
-      if screen.is_a?(PokemonPartyScreen)
+      case screen
+      when PokemonPartyScreen
         screen.party.delete_at(pkmnid)
         screen.pbHardRefresh
-      elsif screen.is_a?(PokemonStorageScreen)
+      when PokemonStorageScreen
         screen.scene.pbRelease(pkmnid, heldpoke)
         (heldpoke) ? screen.heldpkmn = nil : screen.storage.pbDelete(pkmnid[0], pkmnid[1])
         screen.scene.pbRefresh

Data/Scripts/020_Debug/003_Debug menus/008_Debug_BattlerCommands.rb

@@ -411,12 +411,10 @@ BattlerDebugMenuCommands.register("settypes", {
             end
             battler.types.compact!
           end
+        elsif cmd < max_main_types
+          battler.types[cmd] = new_type
         else
-          if cmd < max_main_types
-            battler.types[cmd] = new_type
-          else
-            battler.effects[PBEffects::Type3] = new_type
-          end
+          battler.effects[PBEffects::Type3] = new_type
         end
       end
     end

Data/Scripts/020_Debug/003_Debug menus/009_Debug_BattleExtraCode.rb

@@ -124,44 +124,44 @@ module Battle::DebugVariables
   }
 
   SIDE_EFFECTS = {
-     PBEffects::AuroraVeil         => { name: "Aurora Veil duration",                   default: 0 },
-     PBEffects::CraftyShield       => { name: "Crafty Shield applies this round",       default: false },
-     PBEffects::EchoedVoiceCounter => { name: "Echoed Voice rounds used (max. 5)",      default: 0, max: 5 },
-     PBEffects::EchoedVoiceUsed    => { name: "Echoed Voice used this round",           default: false },
-     PBEffects::LastRoundFainted   => { name: "Round when side's battler last fainted", default: -2 },   # Treated as -1, isn't a battler index
-     PBEffects::LightScreen        => { name: "Light Screen duration",                  default: 0 },
-     PBEffects::LuckyChant         => { name: "Lucky Chant duration",                   default: 0 },
-     PBEffects::MatBlock           => { name: "Mat Block applies this round",           default: false },
-     PBEffects::Mist               => { name: "Mist duration",                          default: 0 },
-     PBEffects::QuickGuard         => { name: "Quick Guard applies this round",         default: false },
-     PBEffects::Rainbow            => { name: "Rainbow duration",                       default: 0 },
-     PBEffects::Reflect            => { name: "Reflect duration",                       default: 0 },
-     PBEffects::Round              => { name: "Round was used this round",              default: false },
-     PBEffects::Safeguard          => { name: "Safeguard duration",                     default: 0 },
-     PBEffects::SeaOfFire          => { name: "Sea Of Fire duration",                   default: 0 },
-     PBEffects::Spikes             => { name: "Spikes layers (0-3)",                    default: 0, max: 3 },
-     PBEffects::StealthRock        => { name: "Stealth Rock exists",                    default: false },
-     PBEffects::StickyWeb          => { name: "Sticky Web exists",                      default: false },
-     PBEffects::Swamp              => { name: "Swamp duration",                         default: 0 },
-     PBEffects::Tailwind           => { name: "Tailwind duration",                      default: 0 },
-     PBEffects::ToxicSpikes        => { name: "Toxic Spikes layers (0-2)",              default: 0, max: 2 },
-     PBEffects::WideGuard          => { name: "Wide Guard applies this round",          default: false }
+    PBEffects::AuroraVeil         => { name: "Aurora Veil duration",                   default: 0 },
+    PBEffects::CraftyShield       => { name: "Crafty Shield applies this round",       default: false },
+    PBEffects::EchoedVoiceCounter => { name: "Echoed Voice rounds used (max. 5)",      default: 0, max: 5 },
+    PBEffects::EchoedVoiceUsed    => { name: "Echoed Voice used this round",           default: false },
+    PBEffects::LastRoundFainted   => { name: "Round when side's battler last fainted", default: -2 },   # Treated as -1, isn't a battler index
+    PBEffects::LightScreen        => { name: "Light Screen duration",                  default: 0 },
+    PBEffects::LuckyChant         => { name: "Lucky Chant duration",                   default: 0 },
+    PBEffects::MatBlock           => { name: "Mat Block applies this round",           default: false },
+    PBEffects::Mist               => { name: "Mist duration",                          default: 0 },
+    PBEffects::QuickGuard         => { name: "Quick Guard applies this round",         default: false },
+    PBEffects::Rainbow            => { name: "Rainbow duration",                       default: 0 },
+    PBEffects::Reflect            => { name: "Reflect duration",                       default: 0 },
+    PBEffects::Round              => { name: "Round was used this round",              default: false },
+    PBEffects::Safeguard          => { name: "Safeguard duration",                     default: 0 },
+    PBEffects::SeaOfFire          => { name: "Sea Of Fire duration",                   default: 0 },
+    PBEffects::Spikes             => { name: "Spikes layers (0-3)",                    default: 0, max: 3 },
+    PBEffects::StealthRock        => { name: "Stealth Rock exists",                    default: false },
+    PBEffects::StickyWeb          => { name: "Sticky Web exists",                      default: false },
+    PBEffects::Swamp              => { name: "Swamp duration",                         default: 0 },
+    PBEffects::Tailwind           => { name: "Tailwind duration",                      default: 0 },
+    PBEffects::ToxicSpikes        => { name: "Toxic Spikes layers (0-2)",              default: 0, max: 2 },
+    PBEffects::WideGuard          => { name: "Wide Guard applies this round",          default: false }
   }
 
   FIELD_EFFECTS = {
-     PBEffects::AmuletCoin      => { name: "Amulet Coin doubling prize money", default: false },
-     PBEffects::FairyLock       => { name: "Fairy Lock trapping duration",     default: 0 },
-     PBEffects::FusionBolt      => { name: "Fusion Bolt was used",             default: false },
-     PBEffects::FusionFlare     => { name: "Fusion Flare was used",            default: false },
-     PBEffects::Gravity         => { name: "Gravity duration",                 default: 0 },
-     PBEffects::HappyHour       => { name: "Happy Hour doubling prize money",  default: false },
-     PBEffects::IonDeluge       => { name: "Ion Deluge making moves Electric", default: false },
-     PBEffects::MagicRoom       => { name: "Magic Room duration",              default: 0 },
-     PBEffects::MudSportField   => { name: "Mud Sport duration (Gen 6+)",      default: 0 },
-     PBEffects::PayDay          => { name: "Pay Day additional prize money",   default: 0, max: Settings::MAX_MONEY },
-     PBEffects::TrickRoom       => { name: "Trick Room duration",              default: 0 },
-     PBEffects::WaterSportField => { name: "Water Sport duration (Gen 6+)",    default: 0 },
-     PBEffects::WonderRoom      => { name: "Wonder Room duration",             default: 0 }
+    PBEffects::AmuletCoin      => { name: "Amulet Coin doubling prize money", default: false },
+    PBEffects::FairyLock       => { name: "Fairy Lock trapping duration",     default: 0 },
+    PBEffects::FusionBolt      => { name: "Fusion Bolt was used",             default: false },
+    PBEffects::FusionFlare     => { name: "Fusion Flare was used",            default: false },
+    PBEffects::Gravity         => { name: "Gravity duration",                 default: 0 },
+    PBEffects::HappyHour       => { name: "Happy Hour doubling prize money",  default: false },
+    PBEffects::IonDeluge       => { name: "Ion Deluge making moves Electric", default: false },
+    PBEffects::MagicRoom       => { name: "Magic Room duration",              default: 0 },
+    PBEffects::MudSportField   => { name: "Mud Sport duration (Gen 6+)",      default: 0 },
+    PBEffects::PayDay          => { name: "Pay Day additional prize money",   default: 0, max: Settings::MAX_MONEY },
+    PBEffects::TrickRoom       => { name: "Trick Room duration",              default: 0 },
+    PBEffects::WaterSportField => { name: "Water Sport duration (Gen 6+)",    default: 0 },
+    PBEffects::WonderRoom      => { name: "Wonder Room duration",             default: 0 }
   }
 end