DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 06:34:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved many Rubocop warnings

Browse Source
This commit is contained in:
Maruno17
2020-09-06 17:31:12 +01:00
parent 6c4670eaa3
commit 681a8331ab
137 changed files with 921 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Data/Scripts/019_Other battles/003_PBattle_OrgBattle.rb
View File

@@ -1,7 +1,7 @@
#===============================================================================
# Pokémon Organized Battle
#===============================================================================
def pbHasEligible?(*arg)
def pbHasEligible?(_arg)
return pbBattleChallenge.rules.ruleset.hasValidTeam?($Trainer.party)
end
@@ -483,14 +483,14 @@ class BattleChallenge
pbWriteCup(id,rules)
end
def start(*args)
t=ensureType(@id)
def start(_args)
ensureType(@id)
@currentChallenge=@id # must appear before pbStart
@bc.pbStart(t,@numRounds)
end
def register(id,doublebattle,numrounds,numPokemon,battletype,mode=1)
t=ensureType(id)
ensureType(id)
if battletype==BattleFactoryID
@bc.setExtraData(BattleFactoryData.new(@bc))
numPokemon=3
@@ -622,7 +622,7 @@ def pbPlayBattle(battledata)
bgm = BattlePlayerHelper.pbGetBattleBGM(lastbattle)
pbBattleAnimation(bgm) {
pbSceneStandby {
decision = battleplayer.pbStartBattle
battleplayer.pbStartBattle
}
}
end
@@ -716,7 +716,7 @@ def pbBattleChallengeBeginSpeech
end
end
def pbEntryScreen(*arg)
def pbEntryScreen(_arg)
retval = false
pbFadeOutIn {
scene = PokemonParty_Scene.new
@@ -802,7 +802,7 @@ end
def pbBattleFactoryPokemon(rule,numwins,numswaps,rentals)
def pbBattleFactoryPokemon(rule,numwins,numswaps,_rentals)
table=nil
btpokemon=pbGetBTPokemon(pbBattleChallenge.currentChallenge)
ivtable=[
@@ -873,7 +873,7 @@ def pbBattleFactoryPokemon(rule,numwins,numswaps,rentals)
end
end
party=[]
begin
loop do
party.clear
while party.length<6
rnd=pokemonNumbers[0]+rand(pokemonNumbers[1]-pokemonNumbers[0]+1)
@@ -881,7 +881,8 @@ def pbBattleFactoryPokemon(rule,numwins,numswaps,rentals)
indvalue=(party.length<ivgroups[0]) ? ivs[0] : ivs[1]
party.push(rndpoke.createPokemon(rule.ruleset.suggestedLevel,indvalue,nil))
end
end until rule.ruleset.isValid?(party)
break if rule.ruleset.isValid?(party)
end
return party
end
@@ -911,7 +912,7 @@ def pbGenerateBattleTrainer(trainerid,rule)
end
return opponent
end
begin
loop do
opponent.party.clear
while opponent.party.length<rule.ruleset.suggestedNumber
rnd=pokemonnumbers[rand(pokemonnumbers.length)]
@@ -920,7 +921,8 @@ def pbGenerateBattleTrainer(trainerid,rule)
rule.ruleset.suggestedLevel,indvalues,opponent)
opponent.party.push(pkmn)
end
end until rule.ruleset.isValid?(opponent.party)
break if rule.ruleset.isValid?(opponent.party)
end
return opponent
end