Yet more Rubocopping

Data/Scripts/013_Items/001_Item_Utilities.rb

@@ -212,7 +212,7 @@ def pbTopRightWindow(text, scene = nil)
     Graphics.update
     Input.update
     window.update
-    scene.pbUpdate if scene
+    scene&.pbUpdate
     break if Input.trigger?(Input::USE)
   end
   window.dispose
@@ -702,7 +702,7 @@ def pbUseItem(bag, item, bagscene = nil)
         end
       end
       screen.pbEndScene
-      bagscene.pbRefresh if bagscene
+      bagscene&.pbRefresh
     }
     return (ret) ? 1 : 0
   elsif useType == 2   # Item is usable from Bag
@@ -845,12 +845,12 @@ def pbTakeItemFromPokemon(pkmn, scene)
     scene.pbDisplay(_INTL("The Bag is full. The Pokémon's item could not be removed."))
   elsif pkmn.mail
     if scene.pbConfirm(_INTL("Save the removed mail in your PC?"))
-      if !pbMoveToMailbox(pkmn)
-        scene.pbDisplay(_INTL("Your PC's Mailbox is full."))
-      else
+      if pbMoveToMailbox(pkmn)
         scene.pbDisplay(_INTL("The mail was saved in your PC."))
         pkmn.item = nil
         ret = true
+      else
+        scene.pbDisplay(_INTL("Your PC's Mailbox is full."))
       end
     elsif scene.pbConfirm(_INTL("If the mail is removed, its message will be lost. OK?"))
       $bag.add(pkmn.item)

Data/Scripts/013_Items/002_Item_Effects.rb

@@ -281,9 +281,7 @@ ItemHandlers::UseInField.add(:SUPERROD, proc { |item|
 ItemHandlers::UseInField.add(:ITEMFINDER, proc { |item|
   $stats.itemfinder_count += 1
   event = pbClosestHiddenItem
-  if !event
-    pbMessage(_INTL("... \\wt[10]... \\wt[10]... \\wt[10]...\\wt[10]Nope! There's no response."))
-  else
+  if event
     offsetX = event.x - $game_player.x
     offsetY = event.y - $game_player.y
     if offsetX == 0 && offsetY == 0   # Standing on the item, spin around
@@ -310,6 +308,8 @@ ItemHandlers::UseInField.add(:ITEMFINDER, proc { |item|
       pbMessage(_INTL("Huh? The {1}'s responding!\1", GameData::Item.get(item).name))
       pbMessage(_INTL("There's an item buried around here!"))
     end
+  else
+    pbMessage(_INTL("... \\wt[10]... \\wt[10]... \\wt[10]...\\wt[10]Nope! There's no response."))
   end
   next true
 })

Data/Scripts/013_Items/003_Item_BattleEffects.rb

@@ -79,7 +79,7 @@ ItemHandlers::CanUseInBattle.add(:AWAKENING, proc { |item, pokemon, battler, mov
 ItemHandlers::CanUseInBattle.copy(:AWAKENING, :CHESTOBERRY)
 
 ItemHandlers::CanUseInBattle.add(:BLUEFLUTE, proc { |item, pokemon, battler, move, firstAction, battle, scene, showMessages|
-  if battler && battler.hasActiveAbility?(:SOUNDPROOF)
+  if battler&.hasActiveAbility?(:SOUNDPROOF)
     scene.pbDisplay(_INTL("It won't have any effect.")) if showMessages
     next false
   end
@@ -365,7 +365,7 @@ ItemHandlers::BattleUseOnPokemon.add(:SITRUSBERRY, proc { |item, pokemon, battle
 
 ItemHandlers::BattleUseOnPokemon.add(:AWAKENING, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
+  battler&.pbCureStatus(false)
   name = (battler) ? battler.pbThis : pokemon.name
   scene.pbRefresh
   scene.pbDisplay(_INTL("{1} woke up.", name))
@@ -375,7 +375,7 @@ ItemHandlers::BattleUseOnPokemon.copy(:AWAKENING, :CHESTOBERRY, :BLUEFLUTE)
 
 ItemHandlers::BattleUseOnPokemon.add(:ANTIDOTE, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
+  battler&.pbCureStatus(false)
   name = (battler) ? battler.pbThis : pokemon.name
   scene.pbRefresh
   scene.pbDisplay(_INTL("{1} was cured of its poisoning.", name))
@@ -385,7 +385,7 @@ ItemHandlers::BattleUseOnPokemon.copy(:ANTIDOTE, :PECHABERRY)
 
 ItemHandlers::BattleUseOnPokemon.add(:BURNHEAL, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
+  battler&.pbCureStatus(false)
   name = (battler) ? battler.pbThis : pokemon.name
   scene.pbRefresh
   scene.pbDisplay(_INTL("{1}'s burn was healed.", name))
@@ -395,7 +395,7 @@ ItemHandlers::BattleUseOnPokemon.copy(:BURNHEAL, :RAWSTBERRY)
 
 ItemHandlers::BattleUseOnPokemon.add(:PARALYZEHEAL, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
+  battler&.pbCureStatus(false)
   name = (battler) ? battler.pbThis : pokemon.name
   scene.pbRefresh
   scene.pbDisplay(_INTL("{1} was cured of paralysis.", name))
@@ -405,7 +405,7 @@ ItemHandlers::BattleUseOnPokemon.copy(:PARALYZEHEAL, :PARLYZHEAL, :CHERIBERRY)
 
 ItemHandlers::BattleUseOnPokemon.add(:ICEHEAL, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
+  battler&.pbCureStatus(false)
   name = (battler) ? battler.pbThis : pokemon.name
   scene.pbRefresh
   scene.pbDisplay(_INTL("{1} was thawed out.", name))
@@ -415,8 +415,8 @@ ItemHandlers::BattleUseOnPokemon.copy(:ICEHEAL, :ASPEARBERRY)
 
 ItemHandlers::BattleUseOnPokemon.add(:FULLHEAL, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
-  battler.pbCureConfusion if battler
+  battler&.pbCureStatus(false)
+  battler&.pbCureConfusion
   name = (battler) ? battler.pbThis : pokemon.name
   scene.pbRefresh
   scene.pbDisplay(_INTL("{1} became healthy.", name))
@@ -429,8 +429,8 @@ ItemHandlers::BattleUseOnPokemon.copy(:FULLHEAL, :RAGECANDYBAR) if Settings::RAG
 
 ItemHandlers::BattleUseOnPokemon.add(:FULLRESTORE, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
-  battler.pbCureConfusion if battler
+  battler&.pbCureStatus(false)
+  battler&.pbCureConfusion
   name = (battler) ? battler.pbThis : pokemon.name
   if pokemon.hp < pokemon.totalhp
     pbBattleHPItem(pokemon, battler, pokemon.totalhp, scene)
@@ -471,8 +471,8 @@ ItemHandlers::BattleUseOnPokemon.add(:ENERGYROOT, proc { |item, pokemon, battler
 
 ItemHandlers::BattleUseOnPokemon.add(:HEALPOWDER, proc { |item, pokemon, battler, choices, scene|
   pokemon.heal_status
-  battler.pbCureStatus(false) if battler
-  battler.pbCureConfusion if battler
+  battler&.pbCureStatus(false)
+  battler&.pbCureConfusion
   pokemon.changeHappiness("powder")
   name = (battler) ? battler.pbThis : pokemon.name
   scene.pbRefresh

Data/Scripts/013_Items/005_Item_PokeRadar.rb

@@ -81,9 +81,9 @@ def pbPokeRadarHighlightGrass(showmessage = true)
         # Choose a rarity for the grass (0=normal, 1=rare, 2=shiny)
         s = (rand(100) < 25) ? 1 : 0
         if $game_temp.poke_radar_data && $game_temp.poke_radar_data[2] > 0
-          v = [(65536 / Settings::SHINY_POKEMON_CHANCE) - ([$game_temp.poke_radar_data[2], 40].min * 200), 200].max
-          v = (65536 / v.to_f).ceil
-          s = 2 if rand(65536) < v
+          v = [(65_536 / Settings::SHINY_POKEMON_CHANCE) - ([$game_temp.poke_radar_data[2], 40].min * 200), 200].max
+          v = (65_536 / v.to_f).ceil
+          s = 2 if rand(65_536) < v
         end
         grasses.push([x, y, i, s])
       end

Data/Scripts/013_Items/007_Item_Sprites.rb

@@ -22,7 +22,7 @@ class ItemIconSprite < SpriteWrapper
   end
 
   def dispose
-    @animbitmap.dispose if @animbitmap
+    @animbitmap&.dispose
     super
   end
 
@@ -70,7 +70,7 @@ class ItemIconSprite < SpriteWrapper
   def item=(value)
     return if @item == value && !@forceitemchange
     @item = value
-    @animbitmap.dispose if @animbitmap
+    @animbitmap&.dispose
     @animbitmap = nil
     if @item || !@blankzero
       @animbitmap = AnimatedBitmap.new(GameData::Item.icon_filename(@item))
@@ -126,7 +126,7 @@ class HeldItemIconSprite < SpriteWrapper
   end
 
   def dispose
-    @animbitmap.dispose if @animbitmap
+    @animbitmap&.dispose
     super
   end
 
@@ -138,7 +138,7 @@ class HeldItemIconSprite < SpriteWrapper
   def item=(value)
     return if @item == value
     @item = value
-    @animbitmap.dispose if @animbitmap
+    @animbitmap&.dispose
     @animbitmap = nil
     if @item
       @animbitmap = AnimatedBitmap.new(GameData::Item.held_icon_filename(@item))