Many more Rubocop-inspired code improvements

This commit is contained in:
Maruno17
2021-12-18 19:06:22 +00:00
parent d17fc40a47
commit 13a238cc6a
107 changed files with 651 additions and 652 deletions

View File

@@ -145,10 +145,10 @@ def pbChangeLevel(pkmn, new_level, scene)
old_special_attack = pkmn.spatk
old_special_defense = pkmn.spdef
old_speed = pkmn.speed
if pkmn.level > new_level
pkmn.level = new_level
pkmn.calc_stats
scene.pbRefresh
pkmn.level = new_level
pkmn.calc_stats
scene.pbRefresh
if old_level > new_level
if scene.is_a?(PokemonPartyScreen)
scene.pbDisplay(_INTL("{1} dropped to Lv. {2}!", pkmn.name, pkmn.level))
else
@@ -165,10 +165,7 @@ def pbChangeLevel(pkmn, new_level, scene)
pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
else
pkmn.level = new_level
pkmn.changeHappiness("vitamin")
pkmn.calc_stats
scene.pbRefresh
if scene.is_a?(PokemonPartyScreen)
scene.pbDisplay(_INTL("{1} grew to Lv. {2}!", pkmn.name, pkmn.level))
else
@@ -898,7 +895,7 @@ def pbChooseApricorn(var = 0)
pbFadeOutIn {
scene = PokemonBag_Scene.new
screen = PokemonBagScreen.new(scene, $bag)
ret = screen.pbChooseItemScreen(Proc.new { |item| GameData::Item.get(item).is_apricorn? })
ret = screen.pbChooseItemScreen(proc { |item| GameData::Item.get(item).is_apricorn? })
}
$game_variables[var] = ret || :NONE if var > 0
return ret
@@ -909,7 +906,7 @@ def pbChooseFossil(var = 0)
pbFadeOutIn {
scene = PokemonBag_Scene.new
screen = PokemonBagScreen.new(scene, $bag)
ret = screen.pbChooseItemScreen(Proc.new { |item| GameData::Item.get(item).is_fossil? })
ret = screen.pbChooseItemScreen(proc { |item| GameData::Item.get(item).is_fossil? })
}
$game_variables[var] = ret || :NONE if var > 0
return ret

View File

@@ -127,7 +127,7 @@ Events.onStepTaken += proc {
pbFadeOutIn {
scene = PokemonBag_Scene.new
screen = PokemonBagScreen.new(scene, $bag)
ret = screen.pbChooseItemScreen(Proc.new { |item|
ret = screen.pbChooseItemScreen(proc { |item|
[:REPEL, :SUPERREPEL, :MAXREPEL].include?(item)
})
}

View File

@@ -208,7 +208,7 @@ Events.onWildBattleEnd += proc { |_sender, e|
species = e[0]
level = e[1]
decision = e[2]
if $game_temp.poke_radar_data && (decision == 1 || decision == 4) # Defeated/caught
if $game_temp.poke_radar_data && [1, 4].include?(decision) # Defeated/caught
$game_temp.poke_radar_data[0] = species
$game_temp.poke_radar_data[1] = level
$game_temp.poke_radar_data[2] += 1