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

Yet more Rubocopping

Browse Source
This commit is contained in:
Maruno17
2021-12-23 00:27:17 +00:00
parent 514fe13ca2
commit 132a16950d
171 changed files with 1455 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/002_Challenge_Rulesets.rb
View File

@@ -197,13 +197,13 @@ class PokemonRuleSet
error.push(_INTL("{1} Pokémon are needed.", self.minLength)) if error && self.minLength > 1
return false
elsif team.length > self.maxLength
error.push(_INTL("No more than {1} Pokémon may enter.", self.maxLength)) if error
error&.push(_INTL("No more than {1} Pokémon may enter.", self.maxLength))
return false
end
team.each do |pkmn|
next if isPokemonValid?(pkmn)
if pkmn
error.push(_INTL("{1} is not allowed.", pkmn.name)) if error
error&.push(_INTL("{1} is not allowed.", pkmn.name))
elsif error
error.push(_INTL("This team is not allowed."))
end
@@ -211,12 +211,12 @@ class PokemonRuleSet
end
@teamRules.each do |rule|
next if rule.isValid?(team)
error.push(rule.errorMessage) if error
error&.push(rule.errorMessage)
return false
end
@subsetRules.each do |rule|
next if rule.isValid?(team)
error.push(rule.errorMessage) if error
error&.push(rule.errorMessage)
return false
end
return true

2
Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/003_Challenge_EntryRestrictions.rb
View File

@@ -153,7 +153,7 @@ end
#===============================================================================
class AblePokemonRestriction
def isValid?(pkmn)
return pkmn && pkmn.able?
return pkmn&.able?
end
end