More Rubocopping

Data/Scripts/013_Items/001_Item_Utilities.rb

@@ -183,7 +183,7 @@ def pbChangeLevel(pkmn, new_level, scene)
                            pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
     # Learn new moves upon level up
     movelist = pkmn.getMoveList
-    for i in movelist
+    movelist.each do |i|
       next if i[0] <= old_level || i[0] > pkmn.level
       pbLearnMove(pkmn, i[1], true) { scene.pbUpdate }
     end
@@ -292,7 +292,7 @@ def pbChangeExp(pkmn, new_exp, scene)
                            pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
     # Learn new moves upon level up
     movelist = pkmn.getMoveList
-    for i in movelist
+    movelist.each do |i|
       next if i[0] <= old_level || i[0] > pkmn.level
       pbLearnMove(pkmn, i[1], true) { scene.pbUpdate }
     end
@@ -551,7 +551,7 @@ def pbClosestHiddenItem
   result = []
   playerX = $game_player.x
   playerY = $game_player.y
-  for event in $game_map.events.values
+  $game_map.events.values.each do |event|
     next if !event.name[/hiddenitem/i]
     next if (playerX - event.x).abs >= 8
     next if (playerY - event.y).abs >= 6
@@ -561,7 +561,7 @@ def pbClosestHiddenItem
   return nil if result.length == 0
   ret = nil
   retmin = 0
-  for event in result
+  result.each do |event|
     dist = (playerX - event.x).abs + (playerY - event.y).abs
     next if ret && retmin <= dist
     ret = event
@@ -663,7 +663,7 @@ def pbUseItem(bag, item, bagscene = nil)
     annot = nil
     if itm.is_evolution_stone?
       annot = []
-      for pkmn in $player.party
+      $player.party.each do |pkmn|
         elig = pkmn.check_evolution_on_use_item(item)
         annot.push((elig) ? _INTL("ABLE") : _INTL("NOT ABLE"))
       end
@@ -909,7 +909,7 @@ end
 def pbChooseItemFromList(message, variable, *args)
   commands = []
   itemid   = []
-  for item in args
+  args.each do |item|
     next if !GameData::Item.exists?(item)
     itm = GameData::Item.get(item)
     next if !$bag.has?(itm)

Data/Scripts/013_Items/002_Item_Effects.rb

@@ -193,7 +193,7 @@ ItemHandlers::UseInField.add(:SACREDASH, proc { |item|
     next false
   end
   canrevive = false
-  for i in $player.pokemon_party
+  $player.pokemon_party.each do |i|
     next if !i.fainted?
     canrevive = true
     break
@@ -604,7 +604,7 @@ ItemHandlers::UseOnPokemon.add(:MAXETHER, proc { |item, qty, pkmn, scene|
 
 ItemHandlers::UseOnPokemon.add(:ELIXIR, proc { |item, qty, pkmn, scene|
   pprestored = 0
-  for i in 0...pkmn.moves.length
+  pkmn.moves.length.times do |i|
     pprestored += pbRestorePP(pkmn, i, 10)
   end
   if pprestored == 0
@@ -617,7 +617,7 @@ ItemHandlers::UseOnPokemon.add(:ELIXIR, proc { |item, qty, pkmn, scene|
 
 ItemHandlers::UseOnPokemon.add(:MAXELIXIR, proc { |item, qty, pkmn, scene|
   pprestored = 0
-  for i in 0...pkmn.moves.length
+  pkmn.moves.length.times do |i|
     pprestored += pbRestorePP(pkmn, i, pkmn.moves[i].total_pp - pkmn.moves[i].pp)
   end
   if pprestored == 0
@@ -1027,7 +1027,7 @@ ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE, proc { |item, qty, pkmn, scene|
     abils = pkmn.getAbilityList
     abil1 = nil
     abil2 = nil
-    for i in abils
+    abils.each do |i|
       abil1 = i[0] if i[1] == 0
       abil2 = i[0] if i[1] == 1
     end

Data/Scripts/013_Items/003_Item_BattleEffects.rb

@@ -163,7 +163,7 @@ ItemHandlers::CanUseInBattle.add(:ELIXIR, proc { |item, pokemon, battler, move,
     next false
   end
   canRestore = false
-  for m in pokemon.moves
+  pokemon.moves.each do |m|
     next if m.id == 0
     next if m.total_pp <= 0 || m.pp == m.total_pp
     canRestore = true
@@ -502,14 +502,14 @@ ItemHandlers::BattleUseOnPokemon.add(:MAXETHER, proc { |item, pokemon, battler,
 })
 
 ItemHandlers::BattleUseOnPokemon.add(:ELIXIR, proc { |item, pokemon, battler, choices, scene|
-  for i in 0...pokemon.moves.length
+  pokemon.moves.length.times do |i|
     pbBattleRestorePP(pokemon, battler, i, 10)
   end
   scene.pbDisplay(_INTL("PP was restored."))
 })
 
 ItemHandlers::BattleUseOnPokemon.add(:MAXELIXIR, proc { |item, pokemon, battler, choices, scene|
-  for i in 0...pokemon.moves.length
+  pokemon.moves.length.times do |i|
     pbBattleRestorePP(pokemon, battler, i, pokemon.moves[i].total_pp)
   end
   scene.pbDisplay(_INTL("PP was restored."))

Data/Scripts/013_Items/004_Item_Phone.rb

@@ -67,7 +67,7 @@ def pbRandomPhoneTrainer
   this_map_metadata = $game_map.metadata
   return nil if !this_map_metadata || !this_map_metadata.town_map_position
   currentRegion = this_map_metadata.town_map_position[0]
-  for num in $PokemonGlobal.phoneNumbers
+  $PokemonGlobal.phoneNumbers.each do |num|
     next if !num[0] || num.length != 8   # if not visible or not a trainer
     next if $game_map.map_id == num[6]   # Can't call if on same map
     caller_map_metadata = GameData::MapMetadata.try_get(num[6])
@@ -82,7 +82,7 @@ end
 
 def pbFindPhoneTrainer(tr_type, tr_name)        # Ignores whether visible or not
   return nil if !$PokemonGlobal.phoneNumbers
-  for num in $PokemonGlobal.phoneNumbers
+  $PokemonGlobal.phoneNumbers.each do |num|
     return num if num[1] == tr_type && num[2] == tr_name   # If a match
   end
   return nil
@@ -146,7 +146,7 @@ Events.onMapUpdate += proc { |_sender, _e|
   $PokemonGlobal.phoneTime -= 1
   # Count down time to next can-battle for each trainer contact
   if $PokemonGlobal.phoneTime % Graphics.frame_rate == 0   # Every second
-    for num in $PokemonGlobal.phoneNumbers
+    $PokemonGlobal.phoneNumbers.each do |num|
       next if !num[0] || num.length != 8   # if not visible or not a trainer
       # Reset time to next can-battle if necessary
       if num[4] == 0
@@ -291,7 +291,7 @@ def pbPhoneCall(call, phonenum)
   trainerspecies = pbTrainerSpecies(phonenum)
   trainermap     = pbTrainerMapName(phonenum)
   messages = call.split("\\m")
-  for i in 0...messages.length
+  messages.length.times do |i|
     messages[i].gsub!(/\\TN/, phonenum[2])
     messages[i].gsub!(/\\TP/, trainerspecies)
     messages[i].gsub!(/\\TE/, encspecies)

Data/Scripts/013_Items/005_Item_PokeRadar.rb

@@ -58,7 +58,7 @@ end
 def pbPokeRadarHighlightGrass(showmessage = true)
   grasses = []   # x, y, ring (0-3 inner to outer), rarity
   # Choose 1 random tile from each ring around the player
-  for i in 0...4
+  4.times do |i|
     r = rand((i + 1) * 8)
     # Get coordinates of randomly chosen tile
     x = $game_player.x
@@ -95,7 +95,7 @@ def pbPokeRadarHighlightGrass(showmessage = true)
     pbPokeRadarCancel
   else
     # Show grass rustling animations
-    for grass in grasses
+    grasses.each do |grass|
       case grass[3]
       when 0   # Normal rustle
         $scene.spriteset.addUserAnimation(Settings::RUSTLE_NORMAL_ANIMATION_ID, grass[0], grass[1], true, 1)
@@ -114,7 +114,7 @@ def pbPokeRadarGetShakingGrass
   return -1 if !$game_temp.poke_radar_data
   grasses = $game_temp.poke_radar_data[3]
   return -1 if grasses.length == 0
-  for i in grasses
+  grasses.each do |i|
     return i[2] if $game_player.x == i[0] && $game_player.y == i[1]
   end
   return -1
@@ -197,7 +197,7 @@ Events.onWildPokemonCreate += proc { |_sender, e|
   next if !$game_temp.poke_radar_data
   grasses = $game_temp.poke_radar_data[3]
   next if !grasses
-  for grass in grasses
+  grasses.each do |grass|
     next if $game_player.x != grass[0] || $game_player.y != grass[1]
     pokemon.shiny = true if grass[3] == 2
     break

Data/Scripts/013_Items/008_PokemonBag.rb

@@ -19,7 +19,7 @@ class PokemonBag
     @last_viewed_pocket     = 1
     @pockets                = []
     @last_pocket_selections = []
-    for i in 0..PokemonBag.pocket_count
+    (0..PokemonBag.pocket_count).each do |i|
       @pockets[i] = []
       @last_pocket_selections[i] = 0
     end