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

More tweaks from the Rubocop overlord

Browse Source
This commit is contained in:
Maruno17
2021-12-19 17:28:59 +00:00
parent 33781493f4
commit 65b1a8d6c3
161 changed files with 2839 additions and 2967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/018_Alternate battle modes/001_Battle Frontier/002_Challenge_Data.rb
View File

@@ -203,7 +203,7 @@ class PBPokemon
def createPokemon(level, iv, trainer)
pkmn = Pokemon.new(@species, level, trainer, false)
pkmn.item = @item
pkmn.personalID = rand(2**16) | rand(2**16) << 16
pkmn.personalID = rand(2**16) | (rand(2**16) << 16)
pkmn.nature = nature
pkmn.happiness = 0
pkmn.moves.push(Pokemon::Move.new(self.convertMove(@move1)))

62
Data/Scripts/018_Alternate battle modes/001_Battle Frontier/003_Challenge_ChooseFoes.rb
View File

@@ -7,21 +7,21 @@ def pbBattleChallengeTrainer(win_count, bttrainers)
# This table's start points and lengths are based on a bttrainers size of 300.
# They are scaled based on the actual size of bttrainers later.
table = [ # Each value is [minimum win count, range start point, range length]
[ 0, 0, 100], # 0-100
[ 6, 80, 40], # 80-120
[ 7, 80, 40], # 80-120
[13, 120, 20], # 120-140
[14, 100, 40], # 100-140
[20, 140, 20], # 140-160
[21, 120, 40], # 120-160
[27, 160, 20], # 160-180
[28, 140, 40], # 140-180
[34, 180, 20], # 180-200
[35, 160, 40], # 160-200
[41, 200, 20], # 200-220
[42, 180, 40], # 180-220
[48, 220, 40], # 220-260
[49, 200, 100] # 200-300 - This line is used for all higher win_counts
[ 0, 0, 100], # 0-100
[ 6, 80, 40], # 80-120
[ 7, 80, 40], # 80-120
[13, 120, 20], # 120-140
[14, 100, 40], # 100-140
[20, 140, 20], # 140-160
[21, 120, 40], # 120-160
[27, 160, 20], # 160-180
[28, 140, 40], # 140-180
[34, 180, 20], # 180-200
[35, 160, 40], # 160-200
[41, 200, 20], # 200-220
[42, 180, 40], # 180-220
[48, 220, 40], # 220-260
[49, 200, 100] # 200-300 - This line is used for all higher win_counts
]
slot = nil
table.each { |val| slot = val if val[0] <= win_count && (!slot || slot[0] < val[0]) }
@@ -99,25 +99,25 @@ def pbBattleFactoryPokemon(rules, win_count, swap_count, rentals)
# Group 1 is 0 - 173. Group 2 is 174 - 371. Group 3 is 372 - 881.
if level == GameData::GrowthRate.max_level # Open Level (Level 100)
table = [
[372, 491], # Group 3 (first quarter)
[492, 610], # Group 3 (second quarter)
[611, 729], # Group 3 (third quarter)
[730, 849], # Group 3 (fourth quarter)
[372, 881], # All of Group 3
[372, 881], # All of Group 3
[372, 881], # All of Group 3
[372, 881] # This line is used for all higher sets (all of Group 3)
[372, 491], # Group 3 (first quarter)
[492, 610], # Group 3 (second quarter)
[611, 729], # Group 3 (third quarter)
[730, 849], # Group 3 (fourth quarter)
[372, 881], # All of Group 3
[372, 881], # All of Group 3
[372, 881], # All of Group 3
[372, 881] # This line is used for all higher sets (all of Group 3)
]
else
table = [
[ 0, 173], # Group 1
[174, 272], # Group 2 (first half)
[273, 371], # Group 2 (second half)
[372, 491], # Group 3 (first quarter)
[492, 610], # Group 3 (second quarter)
[611, 729], # Group 3 (third quarter)
[730, 849], # Group 3 (fourth quarter)
[372, 881] # This line is used for all higher sets (all of Group 3)
[ 0, 173], # Group 1
[174, 272], # Group 2 (first half)
[273, 371], # Group 2 (second half)
[372, 491], # Group 3 (first quarter)
[492, 610], # Group 3 (second quarter)
[611, 729], # Group 3 (third quarter)
[730, 849], # Group 3 (fourth quarter)
[372, 881] # This line is used for all higher sets (all of Group 3)
]
end
pokemonNumbers[0] = table[set][0] * btpokemon.length / 881

8
Data/Scripts/018_Alternate battle modes/001_Battle Frontier/005_UI_BattleSwap.rb
View File

@@ -229,12 +229,10 @@ class BattleSwapScreen
end
end
end
else
elsif @scene.pbConfirm(_INTL("Quit swapping?"))
# Canceled
if @scene.pbConfirm(_INTL("Quit swapping?"))
@scene.pbEndScene
return false
end
@scene.pbEndScene
return false
end
end
end