mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Resolved many Rubocop warnings
This commit is contained in:
@@ -209,7 +209,6 @@ def pbIsUnlosableItem?(item,species,ability)
|
||||
:KYOGRE => [:BLUEORB],
|
||||
:GROUDON => [:REDORB]
|
||||
}
|
||||
ret = false
|
||||
combos.each do |comboSpecies, items|
|
||||
next if !isConst?(species,PBSpecies,comboSpecies)
|
||||
items.each { |i| return true if isConst?(item,PBItems,i) }
|
||||
@@ -363,7 +362,6 @@ def pbChangeLevel(pkmn,newlevel,scene)
|
||||
spatkdiff = pkmn.spatk
|
||||
spdefdiff = pkmn.spdef
|
||||
totalhpdiff = pkmn.totalhp
|
||||
oldlevel = pkmn.level
|
||||
pkmn.level = newlevel
|
||||
pkmn.changeHappiness("vitamin")
|
||||
pkmn.calcStats
|
||||
@@ -677,7 +675,6 @@ end
|
||||
# Use an item from the Bag and/or on a Pokémon
|
||||
#===============================================================================
|
||||
def pbUseItem(bag,item,bagscene=nil)
|
||||
found = false
|
||||
useType = pbGetItemData(item,ITEM_FIELD_USE)
|
||||
if pbIsMachine?(item) # TM or HM
|
||||
if $Trainer.pokemonCount==0
|
||||
@@ -808,7 +805,7 @@ def pbUseItemMessage(item)
|
||||
end
|
||||
end
|
||||
|
||||
def pbCheckUseOnPokemon(item,pkmn,screen)
|
||||
def pbCheckUseOnPokemon(_item,pkmn,_screen)
|
||||
return pkmn && !pkmn.egg?
|
||||
end
|
||||
|
||||
@@ -905,7 +902,7 @@ end
|
||||
#===============================================================================
|
||||
# Choose an item from the Bag
|
||||
#===============================================================================
|
||||
def pbChooseItem(var=0,*args)
|
||||
def pbChooseItem(var=0,_args)
|
||||
ret = 0
|
||||
pbFadeOutIn {
|
||||
scene = PokemonBag_Scene.new
|
||||
|
||||
@@ -90,7 +90,7 @@ def pbFindPhoneTrainer(trtype,trname) # Ignores whether visible or not
|
||||
end
|
||||
|
||||
def pbHasPhoneTrainer?(trtype,trname)
|
||||
return pbFindPhoneTrainer!=nil
|
||||
return pbFindPhoneTrainer(trtype,trname)!=nil
|
||||
end
|
||||
|
||||
def pbPhoneBattleCount(trtype,trname)
|
||||
@@ -133,7 +133,7 @@ end
|
||||
#===============================================================================
|
||||
# Phone-related counters
|
||||
#===============================================================================
|
||||
Events.onMapUpdate += proc { |sender,e|
|
||||
Events.onMapUpdate += proc { |_sender,_e|
|
||||
next if !$Trainer || !$Trainer.pokegear
|
||||
# Reset time to next phone call if necessary
|
||||
if !$PokemonGlobal.phoneTime || $PokemonGlobal.phoneTime<=0
|
||||
@@ -207,7 +207,6 @@ end
|
||||
# Generate phone message
|
||||
#===============================================================================
|
||||
def pbPhoneGenerateCall(phonenum)
|
||||
call = ""
|
||||
phoneData = pbLoadPhoneData
|
||||
# Choose random greeting depending on time of day
|
||||
call = pbRandomPhoneItem(phoneData.greetings)
|
||||
|
||||
@@ -190,7 +190,7 @@ EncounterModifier.register(proc { |encounter|
|
||||
next encounter
|
||||
})
|
||||
|
||||
Events.onWildPokemonCreate += proc { |sender,e|
|
||||
Events.onWildPokemonCreate += proc { |_sender,e|
|
||||
pokemon = e[0]
|
||||
next if !$PokemonTemp.pokeradar
|
||||
grasses = $PokemonTemp.pokeradar[3]
|
||||
@@ -202,7 +202,7 @@ Events.onWildPokemonCreate += proc { |sender,e|
|
||||
end
|
||||
}
|
||||
|
||||
Events.onWildBattleEnd += proc { |sender,e|
|
||||
Events.onWildBattleEnd += proc { |_sender,e|
|
||||
species = e[0]
|
||||
level = e[1]
|
||||
decision = e[2]
|
||||
@@ -221,7 +221,7 @@ Events.onWildBattleEnd += proc { |sender,e|
|
||||
end
|
||||
}
|
||||
|
||||
Events.onStepTaken += proc { |sender,e|
|
||||
Events.onStepTaken += proc { |_sender,_e|
|
||||
if $PokemonGlobal.pokeradarBattery && $PokemonGlobal.pokeradarBattery>0 &&
|
||||
!$PokemonTemp.pokeradar
|
||||
$PokemonGlobal.pokeradarBattery -= 1
|
||||
@@ -232,11 +232,11 @@ Events.onStepTaken += proc { |sender,e|
|
||||
end
|
||||
}
|
||||
|
||||
Events.onMapUpdate += proc { |sender,e|
|
||||
Events.onMapUpdate += proc { |_sender,_e|
|
||||
pbPokeRadarCancel if $PokemonGlobal.bicycle
|
||||
}
|
||||
|
||||
Events.onMapChange += proc { |sender,e|
|
||||
Events.onMapChange += proc { |_sender,_e|
|
||||
pbPokeRadarCancel
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ def pbStoreMail(pkmn,item,message,poke1=nil,poke2=nil,poke3=nil)
|
||||
pkmn.mail = PokemonMail.new(item,message,$Trainer.name,poke1,poke2,poke3)
|
||||
end
|
||||
|
||||
def pbDisplayMail(mail,bearer=nil)
|
||||
def pbDisplayMail(mail,_bearer=nil)
|
||||
sprites = {}
|
||||
viewport = Viewport.new(0,0,Graphics.width,Graphics.height)
|
||||
viewport.z = 99999
|
||||
@@ -95,7 +95,7 @@ def pbWriteMail(item,pkmn,pkmnid,scene)
|
||||
"",false,256,Graphics.width) { scene.pbUpdate }
|
||||
if message!=""
|
||||
# Store mail if a message was written
|
||||
poke1 = poke2 = poke3 = nil
|
||||
poke1 = poke2 = nil
|
||||
if $Trainer.party[pkmnid+2]
|
||||
p = $Trainer.party[pkmnid+2]
|
||||
poke1 = [p.species,p.gender,p.shiny?,(p.form rescue 0),p.shadowPokemon?]
|
||||
@@ -110,8 +110,7 @@ def pbWriteMail(item,pkmn,pkmnid,scene)
|
||||
poke3.push(true) if pkmn.egg?
|
||||
pbStoreMail(pkmn,item,message,poke1,poke2,poke3)
|
||||
return true
|
||||
else
|
||||
return false if scene.pbConfirm(_INTL("Stop giving the Pokémon Mail?"))
|
||||
end
|
||||
return false if scene.pbConfirm(_INTL("Stop giving the Pokémon Mail?"))
|
||||
end
|
||||
end
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#===============================================================================
|
||||
class PokemonBag
|
||||
attr_accessor :lastpocket
|
||||
attr_reader :pockets
|
||||
|
||||
def self.pocketNames
|
||||
return pbPocketNames
|
||||
@@ -92,7 +91,6 @@ class PokemonBag
|
||||
item = getID(PBItems,item)
|
||||
if !item || item<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",item))
|
||||
return 0
|
||||
end
|
||||
pocket = pbGetPocket(item)
|
||||
maxsize = maxPocketSize(pocket)
|
||||
@@ -108,7 +106,6 @@ class PokemonBag
|
||||
item = getID(PBItems,item)
|
||||
if !item || item<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",item))
|
||||
return false
|
||||
end
|
||||
pocket = pbGetPocket(item)
|
||||
maxsize = maxPocketSize(pocket)
|
||||
@@ -121,7 +118,6 @@ class PokemonBag
|
||||
item = getID(PBItems,item)
|
||||
if !item || item<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",item))
|
||||
return false
|
||||
end
|
||||
pocket = pbGetPocket(item)
|
||||
maxsize = maxPocketSize(pocket)
|
||||
@@ -134,7 +130,6 @@ class PokemonBag
|
||||
item = getID(PBItems,item)
|
||||
if !item || item<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",item))
|
||||
return false
|
||||
end
|
||||
pocket = pbGetPocket(item)
|
||||
maxsize = maxPocketSize(pocket)
|
||||
@@ -148,10 +143,8 @@ class PokemonBag
|
||||
newitem = getID(PBItems,newitem)
|
||||
if !olditem || olditem<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",olditem))
|
||||
return false
|
||||
elsif !newitem || newitem<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",newitem))
|
||||
return false
|
||||
end
|
||||
pocket = pbGetPocket(olditem)
|
||||
maxsize = maxPocketSize(pocket)
|
||||
@@ -179,7 +172,6 @@ class PokemonBag
|
||||
item = getID(PBItems,item)
|
||||
if !item || item<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",item))
|
||||
return false
|
||||
end
|
||||
pocket = pbGetPocket(item)
|
||||
maxsize = maxPocketSize(pocket)
|
||||
@@ -209,7 +201,6 @@ class PokemonBag
|
||||
item = getID(PBItems,item)
|
||||
if !item || item<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",item))
|
||||
return
|
||||
end
|
||||
registeredlist = self.registeredItems
|
||||
registeredlist.push(item) if !registeredlist.include?(item)
|
||||
@@ -220,7 +211,6 @@ class PokemonBag
|
||||
item = getID(PBItems,item)
|
||||
if !item || item<1
|
||||
raise ArgumentError.new(_INTL("Item number {1} is invalid.",item))
|
||||
return
|
||||
end
|
||||
registeredlist = self.registeredItems
|
||||
if registeredlist.include?(item)
|
||||
|
||||
Reference in New Issue
Block a user