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

Merge branch 'dev' into ai

Browse Source
This commit is contained in:
Maruno17
2023-04-13 19:36:18 +01:00
parent c654636bdc af5256ae0f
commit 7f6f57dec3
45 changed files with 449 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,9 +238,6 @@ class StandardRules < PokemonRuleSet
end
end
###########################################
# Generation IV Cups
###########################################
#===============================================================================
#
#===============================================================================

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

@@ -48,14 +48,16 @@ class LevelAdjustment
adj1 = nil
adj2 = nil
ret = [getOldExp(team1, team2), getOldExp(team2, team1)]
if @adjustment == BOTH_TEAMS || @adjustment == MY_TEAM
case @adjustment
when BOTH_TEAMS
adj1 = getAdjustment(team1, team2)
elsif @adjustment == BOTH_TEAMS_DIFFERENT
adj1 = getMyAdjustment(team1, team2)
end
if @adjustment == BOTH_TEAMS || @adjustment == ENEMY_TEAM
adj2 = getAdjustment(team2, team1)
elsif @adjustment == BOTH_TEAMS_DIFFERENT
when MY_TEAM
adj1 = getAdjustment(team1, team2)
when ENEMY_TEAM
adj2 = getAdjustment(team2, team1)
when BOTH_TEAMS_DIFFERENT
adj1 = getMyAdjustment(team1, team2)
adj2 = getTheirAdjustment(team2, team1)
end
if adj1