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

Renamed all battle-related classes and modules

Browse Source
This commit is contained in:
Maruno17
2021-11-16 23:05:16 +00:00
parent 6dacd6a139
commit 1c4819e5f0
79 changed files with 1270 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
#===============================================================================
class BattleType
def pbCreateBattle(scene, trainer1, trainer2)
return PokeBattle_Battle.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
return Battle.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
end
end
@@ -12,7 +12,7 @@ end
#===============================================================================
class BattleTower < BattleType
def pbCreateBattle(scene, trainer1, trainer2)
return PokeBattle_RecordedBattle.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
return RecordedBattle.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
end
end
@@ -21,7 +21,7 @@ end
#===============================================================================
class BattlePalace < BattleType
def pbCreateBattle(scene, trainer1, trainer2)
return PokeBattle_RecordedBattlePalace.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
return RecordedBattle::BattlePalaceBattle.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
end
end
@@ -30,7 +30,7 @@ end
#===============================================================================
class BattleArena < BattleType
def pbCreateBattle(scene, trainer1, trainer2)
return PokeBattle_RecordedBattleArena.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
return RecordedBattle::BattleArenaBattle.new(scene, trainer1.party, trainer2.party, trainer1, trainer2)
end
end
@@ -119,13 +119,13 @@ def pbPlayBattle(battledata)
lastbattle = Marshal.restore(battledata)
case lastbattle[0]
when BattleChallenge::BattleTowerID
battleplayer = PokeBattle_BattlePlayer.new(scene, lastbattle)
battleplayer = RecordedBattle::PlaybackBattle.new(scene, lastbattle)
when BattleChallenge::BattlePalaceID
battleplayer = PokeBattle_BattlePalacePlayer.new(scene, lastbattle)
battleplayer = RecordedBattle::BattlePalacePlaybackBattle.new(scene, lastbattle)
when BattleChallenge::BattleArenaID
battleplayer = PokeBattle_BattleArenaPlayer.new(scene, lastbattle)
battleplayer = RecordedBattle::BattleArenaPlaybackBattle.new(scene, lastbattle)
end
bgm = BattlePlayerHelper.pbGetBattleBGM(lastbattle)
bgm = RecordedBattle::PlaybackHelper.pbGetBattleBGM(lastbattle)
pbBattleAnimation(bgm) {
pbSceneStandby {
battleplayer.pbStartBattle

2
Data/Scripts/018_Alternate battle modes/001_SafariZone.rb
View File

@@ -108,7 +108,7 @@ def pbSafariBattle(species,level)
# Create the battle scene (the visual side of it)
scene = pbNewBattleScene
# Create the battle class (the mechanics side of it)
battle = PokeBattle_SafariZone.new(scene,playerTrainer,foeParty)
battle = SafariBattle.new(scene,playerTrainer,foeParty)
battle.ballCount = pbSafariState.ballcount
pbPrepareBattle(battle)
# Perform the battle itself

2
Data/Scripts/018_Alternate battle modes/002_BugContest.rb
View File

@@ -362,7 +362,7 @@ def pbBugContestBattle(species,level)
# Create the battle scene (the visual side of it)
scene = pbNewBattleScene
# Create the battle class (the mechanics side of it)
battle = PokeBattle_BugContestBattle.new(scene,playerParty,foeParty,playerTrainer,nil)
battle = BugContestBattle.new(scene,playerParty,foeParty,playerTrainer,nil)
battle.party1starts = playerPartyStarts
battle.ballCount = pbBugContestState.ballcount
setBattleRule("single")

2
Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/004_ChallengeGenerator_BattleSim.rb
View File

@@ -402,7 +402,7 @@ def pbRuledBattle(team1, team2, rule)
items2[i] = p.item_id
trainer2.party.push(p)
end
scene = PokeBattle_DebugSceneNoLogging.new
scene = Battle::DebugSceneNoLogging.new
battle = rule.createBattle(scene, trainer1, trainer2)
battle.debug = true
battle.controlPlayer = true