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

51
Data/Scripts/018_Alternate battle modes/001_Battle Frontier/001_Challenge_BattleChallenge.rb
View File

@@ -4,10 +4,10 @@
class BattleChallenge
attr_reader :currentChallenge
BattleTowerID = 0
BattlePalaceID = 1
BattleArenaID = 2
BattleFactoryID = 3
BATTLE_TOWER_ID = 0
BATTLE_PALACE_ID = 1
BATTLE_ARENA_ID = 2
BATTLE_FACTORY_ID = 3
def initialize
@bc = BattleChallengeData.new
@@ -20,17 +20,17 @@ class BattleChallenge
@numRounds = numrounds
@rules = rules
register(id, id[/double/], 3,
id[/^factory/] ? BattleFactoryID : BattleTowerID,
id[/^factory/] ? BATTLE_FACTORY_ID : BATTLE_TOWER_ID,
id[/open$/] ? 1 : 0)
pbWriteCup(id, rules)
end
def register(id, doublebattle, numPokemon, battletype, mode = 1)
ensureType(id)
if battletype == BattleFactoryID
if battletype == BATTLE_FACTORY_ID
@bc.setExtraData(BattleFactoryData.new(@bc))
numPokemon = 3
battletype = BattleTowerID
battletype = BATTLE_TOWER_ID
end
@rules = modeToRules(doublebattle, numPokemon, battletype, mode) if !@rules
end
@@ -47,9 +47,9 @@ class BattleChallenge
rules = PokemonChallengeRules.new
# Set the battle type
case battletype
when BattlePalaceID
when BATTLE_PALACE_ID
rules.setBattleType(BattlePalace.new)
when BattleArenaID
when BATTLE_ARENA_ID
rules.setBattleType(BattleArena.new)
doublebattle = false
else # Factory works the same as Tower
@@ -82,8 +82,7 @@ class BattleChallenge
@bc.pbStart(t, @numRounds)
end
def pbStart(challenge)
end
def pbStart(challenge); end
def pbEnd
if @currentChallenge != -1
@@ -98,8 +97,8 @@ class BattleChallenge
opponent = pbGenerateBattleTrainer(self.nextTrainer, self.rules)
bttrainers = pbGetBTTrainers(@id)
trainerdata = bttrainers[self.nextTrainer]
opponent.lose_text = pbGetMessageFromHash(MessageTypes::FrontierEndSpeechesLose, trainerdata[4])
opponent.win_text = pbGetMessageFromHash(MessageTypes::FrontierEndSpeechesWin, trainerdata[3])
opponent.lose_text = pbGetMessageFromHash(MessageTypes::FRONTIER_END_SPEECHES_LOSE, trainerdata[4])
opponent.win_text = pbGetMessageFromHash(MessageTypes::FRONTIER_END_SPEECHES_WIN, trainerdata[3])
ret = pbOrganizedBattleEx(opponent, self.rules)
return ret
end
@@ -166,6 +165,8 @@ class BattleChallenge
return ensureType(challenge).maxSwaps
end
#-----------------------------------------------------------------------------
private
def ensureType(id)
@@ -284,6 +285,8 @@ class BattleChallengeData
return @trainers[@battleNumber - 1]
end
#-----------------------------------------------------------------------------
private
def reset
@@ -373,23 +376,23 @@ class BattleFactoryData
bttrainers = pbGetBTTrainers(pbBattleChallenge.currentChallenge)
trainerdata = bttrainers[@trainerid]
@opponent = NPCTrainer.new(
pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
pbGetMessageFromHash(MessageTypes::TRAINER_NAMES, trainerdata[1]),
trainerdata[0]
)
@opponent.lose_text = pbGetMessageFromHash(MessageTypes::FrontierEndSpeechesLose, trainerdata[4])
@opponent.win_text = pbGetMessageFromHash(MessageTypes::FrontierEndSpeechesWin, trainerdata[3])
@opponent.lose_text = pbGetMessageFromHash(MessageTypes::FRONTIER_END_SPEECHES_LOSE, trainerdata[4])
@opponent.win_text = pbGetMessageFromHash(MessageTypes::FRONTIER_END_SPEECHES_WIN, trainerdata[3])
opponentPkmn = pbBattleFactoryPokemon(pbBattleChallenge.rules, @bcdata.wins, @bcdata.swaps, @rentals)
@opponent.party = opponentPkmn.sample(3)
end
def pbChooseRentals
pbFadeOutIn {
pbFadeOutIn do
scene = BattleSwapScene.new
screen = BattleSwapScreen.new(scene)
@rentals = screen.pbStartRent(@rentals)
@bcdata.pbAddSwap
@bcdata.setParty(@rentals)
}
end
end
def pbPrepareSwaps
@@ -398,11 +401,11 @@ class BattleFactoryData
bttrainers = pbGetBTTrainers(pbBattleChallenge.currentChallenge)
trainerdata = bttrainers[trainerid]
@opponent = NPCTrainer.new(
pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
pbGetMessageFromHash(MessageTypes::TRAINER_NAMES, trainerdata[1]),
trainerdata[0]
)
@opponent.lose_text = pbGetMessageFromHash(MessageTypes::FrontierEndSpeechesLose, trainerdata[4])
@opponent.win_text = pbGetMessageFromHash(MessageTypes::FrontierEndSpeechesWin, trainerdata[3])
@opponent.lose_text = pbGetMessageFromHash(MessageTypes::FRONTIER_END_SPEECHES_LOSE, trainerdata[4])
@opponent.win_text = pbGetMessageFromHash(MessageTypes::FRONTIER_END_SPEECHES_WIN, trainerdata[3])
opponentPkmn = pbBattleFactoryPokemon(pbBattleChallenge.rules, @bcdata.wins, @bcdata.swaps,
[].concat(@rentals).concat(@oldopponent))
@opponent.party = opponentPkmn.sample(3)
@@ -410,19 +413,17 @@ class BattleFactoryData
def pbChooseSwaps
swapMade = true
pbFadeOutIn {
pbFadeOutIn do
scene = BattleSwapScene.new
screen = BattleSwapScreen.new(scene)
swapMade = screen.pbStartSwap(@rentals, @oldopponent)
@bcdata.pbAddSwap if swapMade
@bcdata.setParty(@rentals)
}
end
return swapMade
end
def pbBattle(challenge)
bttrainers = pbGetBTTrainers(pbBattleChallenge.currentChallenge)
trainerdata = bttrainers[@trainerid]
return pbOrganizedBattleEx(@opponent, challenge.rules)
end
end

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

@@ -37,7 +37,7 @@ end
#===============================================================================
def pbEntryScreen(*arg)
retval = false
pbFadeOutIn {
pbFadeOutIn do
scene = PokemonParty_Scene.new
screen = PokemonPartyScreen.new(scene, $player.party)
ret = screen.pbPokemonMultipleEntryScreenEx(pbBattleChallenge.rules.ruleset)
@@ -45,7 +45,7 @@ def pbEntryScreen(*arg)
pbBattleChallenge.setParty(ret) if ret
# Continue (return true) if Pokémon were chosen
retval = (ret && ret.length > 0)
}
end
return retval
end
@@ -92,7 +92,7 @@ def pbBattleChallengeBeginSpeech
return "..." if !pbBattleChallenge.pbInProgress?
bttrainers = pbGetBTTrainers(pbBattleChallenge.currentChallenge)
tr = bttrainers[pbBattleChallenge.nextTrainer]
return (tr) ? pbGetMessageFromHash(MessageTypes::FrontierIntroSpeeches, tr[2]) : "..."
return (tr) ? pbGetMessageFromHash(MessageTypes::FRONTIER_INTRO_SPEECHES, tr[2]) : "..."
end
#===============================================================================
@@ -184,16 +184,14 @@ class PBPokemon
return "#{species},#{item},#{nature},#{move1},#{move2},#{move3},#{move4},#{ev}"
end
=begin
def _dump(depth)
return [@species, @item, @nature, @move1, @move2, @move3, @move4, @ev].pack("vvCvvvvC")
end
# def _dump(depth)
# return [@species, @item, @nature, @move1, @move2, @move3, @move4, @ev].pack("vvCvvvvC")
# end
def self._load(str)
data = str.unpack("vvCvvvvC")
return self.new(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7])
end
=end
# def self._load(str)
# data = str.unpack("vvCvvvvC")
# return self.new(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7])
# end
def convertMove(move)
move = :FRUSTRATION if move == :RETURN && GameData::Move.exists?(:FRUSTRATION)

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

@@ -43,7 +43,7 @@ def pbGenerateBattleTrainer(idxTrainer, rules)
# Create the trainer
trainerdata = bttrainers[idxTrainer]
opponent = NPCTrainer.new(
pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
pbGetMessageFromHash(MessageTypes::TRAINER_NAMES, trainerdata[1]),
trainerdata[0]
)
# Determine how many IVs the trainer's Pokémon will have

26
Data/Scripts/018_Alternate battle modes/001_Battle Frontier/004_Challenge_Battles.rb
View File

@@ -62,11 +62,9 @@ def pbOrganizedBattleEx(opponent, challengedata)
BattleCreationHelperMethods.prepare_battle(battle)
# Perform the battle itself
decision = 0
pbBattleAnimation(pbGetTrainerBattleBGM(opponent)) {
pbSceneStandby {
decision = battle.pbStartBattle
}
}
pbBattleAnimation(pbGetTrainerBattleBGM(opponent)) do
pbSceneStandby { decision = battle.pbStartBattle }
end
Input.update
# Restore both parties to their original levels
challengedata.unadjustLevels($player.party, opponent.party, oldlevels)
@@ -116,19 +114,17 @@ def pbPlayBattle(battledata)
scene.abortable = true
lastbattle = Marshal.restore(battledata)
case lastbattle[0]
when BattleChallenge::BattleTowerID
when BattleChallenge::BATTLE_TOWER_ID
battleplayer = RecordedBattle::PlaybackBattle.new(scene, lastbattle)
when BattleChallenge::BattlePalaceID
when BattleChallenge::BATTLE_PALACE_ID
battleplayer = RecordedBattle::BattlePalacePlaybackBattle.new(scene, lastbattle)
when BattleChallenge::BattleArenaID
when BattleChallenge::BATTLE_ARENA_ID
battleplayer = RecordedBattle::BattleArenaPlaybackBattle.new(scene, lastbattle)
end
bgm = RecordedBattle::PlaybackHelper.pbGetBattleBGM(lastbattle)
pbBattleAnimation(bgm) {
pbSceneStandby {
battleplayer.pbStartBattle
}
}
pbBattleAnimation(bgm) do
pbSceneStandby { battleplayer.pbStartBattle }
end
end
#===============================================================================
@@ -140,9 +136,7 @@ def pbDebugPlayBattle
params.setInitialValue(0)
params.setCancelValue(-1)
num = pbMessageChooseNumber(_INTL("Choose a battle."), params)
if num >= 0
pbPlayBattleFromFile(sprintf("Battles/Battle%03d.dat", num))
end
pbPlayBattleFromFile(sprintf("Battles/Battle%03d.dat", num)) if num >= 0
end
def pbPlayBattleFromFile(filename)

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

@@ -91,7 +91,7 @@ class BattleSwapScene
# Processes the scene
def pbChoosePokemon(canCancel)
pbActivateWindow(@sprites, "list") {
pbActivateWindow(@sprites, "list") do
loop do
Graphics.update
Input.update
@@ -109,7 +109,7 @@ class BattleSwapScene
end
end
end
}
end
end
def pbUpdateChoices(choices)