mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-12 07:35:00 +00:00
More Rubocopping
This commit is contained in:
@@ -12,13 +12,13 @@ class PokemonRuleSet
|
||||
|
||||
def copy
|
||||
ret = PokemonRuleSet.new(@number)
|
||||
for rule in @pokemonRules
|
||||
@pokemonRules.each do |rule|
|
||||
ret.addPokemonRule(rule)
|
||||
end
|
||||
for rule in @teamRules
|
||||
@teamRules.each do |rule|
|
||||
ret.addTeamRule(rule)
|
||||
end
|
||||
for rule in @subsetRules
|
||||
@subsetRules.each do |rule|
|
||||
ret.addSubsetRule(rule)
|
||||
end
|
||||
return ret
|
||||
@@ -51,7 +51,7 @@ class PokemonRuleSet
|
||||
minLevel = 1
|
||||
maxLevel = GameData::GrowthRate.max_level
|
||||
num = self.suggestedNumber
|
||||
for rule in @pokemonRules
|
||||
@pokemonRules.each do |rule|
|
||||
case rule
|
||||
when MinimumLevelRestriction
|
||||
minLevel = rule.level
|
||||
@@ -60,7 +60,7 @@ class PokemonRuleSet
|
||||
end
|
||||
end
|
||||
totalLevel = maxLevel * num
|
||||
for rule in @subsetRules
|
||||
@subsetRules.each do |rule|
|
||||
totalLevel = rule.level if rule.is_a?(TotalLevelRestriction)
|
||||
end
|
||||
return [maxLevel, minLevel].max if totalLevel >= maxLevel * num
|
||||
@@ -126,7 +126,7 @@ class PokemonRuleSet
|
||||
|
||||
def isPokemonValid?(pkmn)
|
||||
return false if !pkmn
|
||||
for rule in @pokemonRules
|
||||
@pokemonRules.each do |rule|
|
||||
return false if !rule.isValid?(pkmn)
|
||||
end
|
||||
return true
|
||||
@@ -149,16 +149,16 @@ class PokemonRuleSet
|
||||
return false if !team || team.length < self.minTeamLength
|
||||
return false if team.length > self.maxTeamLength
|
||||
teamNumber = [self.maxLength, team.length].min
|
||||
for pkmn in team
|
||||
team.each do |pkmn|
|
||||
return false if !isPokemonValid?(pkmn)
|
||||
end
|
||||
for rule in @teamRules
|
||||
@teamRules.each do |rule|
|
||||
return false if !rule.isValid?(team)
|
||||
end
|
||||
if @subsetRules.length > 0
|
||||
pbEachCombination(team, teamNumber) { |comb|
|
||||
isValid = true
|
||||
for rule in @subsetRules
|
||||
@subsetRules.each do |rule|
|
||||
next if rule.isValid?(comb)
|
||||
isValid = false
|
||||
break
|
||||
@@ -177,7 +177,7 @@ class PokemonRuleSet
|
||||
return false if !team || team.length < self.minTeamLength
|
||||
teamNumber = [self.maxLength, team.length].min
|
||||
validPokemon = []
|
||||
for pkmn in team
|
||||
team.each do |pkmn|
|
||||
validPokemon.push(pkmn) if isPokemonValid?(pkmn)
|
||||
end
|
||||
return false if validPokemon.length < teamNumber
|
||||
@@ -200,7 +200,7 @@ class PokemonRuleSet
|
||||
error.push(_INTL("No more than {1} Pokémon may enter.", self.maxLength)) if error
|
||||
return false
|
||||
end
|
||||
for pkmn in team
|
||||
team.each do |pkmn|
|
||||
next if isPokemonValid?(pkmn)
|
||||
if pkmn
|
||||
error.push(_INTL("{1} is not allowed.", pkmn.name)) if error
|
||||
@@ -209,12 +209,12 @@ class PokemonRuleSet
|
||||
end
|
||||
return false
|
||||
end
|
||||
for rule in @teamRules
|
||||
@teamRules.each do |rule|
|
||||
next if rule.isValid?(team)
|
||||
error.push(rule.errorMessage) if error
|
||||
return false
|
||||
end
|
||||
for rule in @subsetRules
|
||||
@subsetRules.each do |rule|
|
||||
next if rule.isValid?(team)
|
||||
error.push(rule.errorMessage) if error
|
||||
return false
|
||||
|
||||
Reference in New Issue
Block a user