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

Lots of rubocop

Browse Source
This commit is contained in:
Maruno17
2023-01-28 15:21:12 +00:00
parent 2d056052ce
commit 13aab8d911
159 changed files with 1679 additions and 1931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/001_Challenge_ChallengeRules.rb
View File

@@ -68,14 +68,14 @@ class PokemonChallengeRules
end
def adjustLevelsBilateral(party1, party2)
if @levelAdjustment && @levelAdjustment.type == LevelAdjustment::BothTeams
if @levelAdjustment && @levelAdjustment.type == LevelAdjustment::BOTH_TEAMS
return @levelAdjustment.adjustLevels(party1, party2)
end
return nil
end
def unadjustLevelsBilateral(party1, party2, adjusts)
if @levelAdjustment && adjusts && @levelAdjustment.type == LevelAdjustment::BothTeams
if @levelAdjustment && adjusts && @levelAdjustment.type == LevelAdjustment::BOTH_TEAMS
@levelAdjustment.unadjustLevels(party1, party2, adjusts)
end
end

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

@@ -134,9 +134,9 @@ class PokemonRuleSet
def hasRegistrableTeam?(list)
return false if !list || list.length < self.minTeamLength
pbEachCombination(list, self.maxTeamLength) { |comb|
pbEachCombination(list, self.maxTeamLength) do |comb|
return true if canRegisterTeam?(comb)
}
end
return false
end
@@ -156,7 +156,7 @@ class PokemonRuleSet
return false if !rule.isValid?(team)
end
if @subsetRules.length > 0
pbEachCombination(team, teamNumber) { |comb|
pbEachCombination(team, teamNumber) do |comb|
isValid = true
@subsetRules.each do |rule|
next if rule.isValid?(comb)
@@ -164,7 +164,7 @@ class PokemonRuleSet
break
end
return true if isValid
}
end
return false
end
return true

30
Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/004_Challenge_LevelAdjustment.rb
View File

@@ -2,10 +2,10 @@
#
#===============================================================================
class LevelAdjustment
BothTeams = 0
EnemyTeam = 1
MyTeam = 2
BothTeamsDifferent = 3
BOTH_TEAMS = 0
ENEMY_TEAM = 1
MY_TEAM = 2
BOTH_TEAMS_DIFFERENT = 3
def initialize(adjustment)
@adjustment = adjustment
@@ -48,14 +48,14 @@ class LevelAdjustment
adj1 = nil
adj2 = nil
ret = [getOldExp(team1, team2), getOldExp(team2, team1)]
if @adjustment == BothTeams || @adjustment == MyTeam
if @adjustment == BOTH_TEAMS || @adjustment == MY_TEAM
adj1 = getAdjustment(team1, team2)
elsif @adjustment == BothTeamsDifferent
elsif @adjustment == BOTH_TEAMS_DIFFERENT
adj1 = getMyAdjustment(team1, team2)
end
if @adjustment == BothTeams || @adjustment == EnemyTeam
if @adjustment == BOTH_TEAMS || @adjustment == ENEMY_TEAM
adj2 = getAdjustment(team2, team1)
elsif @adjustment == BothTeamsDifferent
elsif @adjustment == BOTH_TEAMS_DIFFERENT
adj2 = getTheirAdjustment(team2, team1)
end
if adj1
@@ -81,7 +81,7 @@ end
#===============================================================================
class FixedLevelAdjustment < LevelAdjustment
def initialize(level)
super(LevelAdjustment::BothTeams)
super(LevelAdjustment::BOTH_TEAMS)
@level = level.clamp(1, GameData::GrowthRate.max_level)
end
@@ -97,7 +97,7 @@ end
#===============================================================================
class TotalLevelAdjustment < LevelAdjustment
def initialize(minLevel, maxLevel, totalLevel)
super(LevelAdjustment::EnemyTeam)
super(LevelAdjustment::ENEMY_TEAM)
@minLevel = minLevel.clamp(1, GameData::GrowthRate.max_level)
@maxLevel = maxLevel.clamp(1, GameData::GrowthRate.max_level)
@totalLevel = totalLevel
@@ -129,7 +129,7 @@ end
#===============================================================================
class CombinedLevelAdjustment < LevelAdjustment
def initialize(my, their)
super(LevelAdjustment::BothTeamsDifferent)
super(LevelAdjustment::BOTH_TEAMS_DIFFERENT)
@my = my
@their = their
end
@@ -159,7 +159,7 @@ end
#===============================================================================
class CappedLevelAdjustment < LevelAdjustment
def initialize(level)
super(LevelAdjustment::BothTeams)
super(LevelAdjustment::BOTH_TEAMS)
@level = level.clamp(1, GameData::GrowthRate.max_level)
end
@@ -175,7 +175,7 @@ end
#===============================================================================
class LevelBalanceAdjustment < LevelAdjustment
def initialize(minLevel)
super(LevelAdjustment::BothTeams)
super(LevelAdjustment::BOTH_TEAMS)
@minLevel = minLevel
end
@@ -193,7 +193,7 @@ end
#===============================================================================
class EnemyLevelAdjustment < LevelAdjustment
def initialize(level)
super(LevelAdjustment::EnemyTeam)
super(LevelAdjustment::ENEMY_TEAM)
@level = level.clamp(1, GameData::GrowthRate.max_level)
end
@@ -209,7 +209,7 @@ end
#===============================================================================
class OpenLevelAdjustment < LevelAdjustment
def initialize(minLevel = 1)
super(LevelAdjustment::EnemyTeam)
super(LevelAdjustment::ENEMY_TEAM)
@minLevel = minLevel
end