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

Turned trainer intro MEs into BGMs

Browse Source
This commit is contained in:
Maruno17
2022-04-20 22:11:04 +01:00
parent 144ad91bc1
commit d3b61a64ef
9 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/003_Game processing/003_Interpreter.rb
View File

@@ -438,7 +438,7 @@ class Interpreter
return true if $DEBUG && !GameData::TrainerType.exists?(symbol) return true if $DEBUG && !GameData::TrainerType.exists?(symbol)
tr_type = GameData::TrainerType.get(symbol).id tr_type = GameData::TrainerType.get(symbol).id
pbGlobalLock pbGlobalLock
pbPlayTrainerIntroME(tr_type) pbPlayTrainerIntroBGM(tr_type)
return true return true
end end

4
Data/Scripts/004_Game classes/001_Switches and Variables/001_Game_Temp.rb
View File

@@ -42,6 +42,8 @@ class Game_Temp
attr_accessor :begun_new_game # new game flag (true fron new game until saving) attr_accessor :begun_new_game # new game flag (true fron new game until saving)
attr_accessor :menu_beep # menu: play sound effect flag attr_accessor :menu_beep # menu: play sound effect flag
attr_accessor :menu_last_choice # pause menu: index of last selection attr_accessor :menu_last_choice # pause menu: index of last selection
attr_accessor :memorized_bgm # set when trainer intro BGM is played
attr_accessor :memorized_bgm_position # set when trainer intro BGM is played
attr_accessor :darkness_sprite # DarknessSprite or nil attr_accessor :darkness_sprite # DarknessSprite or nil
attr_accessor :mart_prices attr_accessor :mart_prices
@@ -80,6 +82,8 @@ class Game_Temp
# Other # Other
@begun_new_game = false @begun_new_game = false
@menu_beep = false @menu_beep = false
@memorized_bgm = nil
@memorized_bgm_position = 0
@menu_last_choice = 0 @menu_last_choice = 0
@mart_prices = {} @mart_prices = {}
end end

6
Data/Scripts/010_Data/002_PBS data/014_TrainerType.rb
View File

@@ -6,7 +6,7 @@ module GameData
attr_reader :base_money attr_reader :base_money
attr_reader :skill_level attr_reader :skill_level
attr_reader :flags attr_reader :flags
attr_reader :intro_ME attr_reader :intro_BGM
attr_reader :battle_BGM attr_reader :battle_BGM
attr_reader :victory_ME attr_reader :victory_ME
@@ -22,7 +22,7 @@ module GameData
"BaseMoney" => [:base_money, "u"], "BaseMoney" => [:base_money, "u"],
"SkillLevel" => [:skill_level, "u"], "SkillLevel" => [:skill_level, "u"],
"Flags" => [:flags, "*s"], "Flags" => [:flags, "*s"],
"IntroME" => [:intro_ME, "s"], "IntroBGM" => [:intro_BGM, "s"],
"BattleBGM" => [:battle_BGM, "s"], "BattleBGM" => [:battle_BGM, "s"],
"VictoryME" => [:victory_ME, "s"] "VictoryME" => [:victory_ME, "s"]
} }
@@ -86,7 +86,7 @@ module GameData
@base_money = hash[:base_money] || 30 @base_money = hash[:base_money] || 30
@skill_level = hash[:skill_level] || @base_money @skill_level = hash[:skill_level] || @base_money
@flags = hash[:flags] || [] @flags = hash[:flags] || []
@intro_ME = hash[:intro_ME] @intro_BGM = hash[:intro_BGM]
@battle_BGM = hash[:battle_BGM] @battle_BGM = hash[:battle_BGM]
@victory_ME = hash[:victory_ME] @victory_ME = hash[:victory_ME]
end end

2
Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
View File

@@ -453,8 +453,6 @@ def pbTrainerBattleCore(*args)
# Set various other properties in the battle class # Set various other properties in the battle class
pbPrepareBattle(battle) pbPrepareBattle(battle)
$game_temp.clear_battle_rules $game_temp.clear_battle_rules
# End the trainer intro music
Audio.me_stop
# Perform the battle itself # Perform the battle itself
decision = 0 decision = 0
pbBattleAnimation(pbGetTrainerBattleBGM(foeTrainers), (battle.singleBattle?) ? 1 : 3, foeTrainers) { pbBattleAnimation(pbGetTrainerBattleBGM(foeTrainers), (battle.singleBattle?) ? 1 : 3, foeTrainers) {

9
Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb
View File

@@ -68,10 +68,11 @@ def pbBattleAnimation(bgm = nil, battletype = 0, foe = nil)
playingBGM = $game_system.getPlayingBGM playingBGM = $game_system.getPlayingBGM
$game_system.bgm_pause $game_system.bgm_pause
$game_system.bgs_pause $game_system.bgs_pause
if $game_temp.memorized_bgm
playingBGM = $game_temp.memorized_bgm
$game_system.bgm_position = $game_temp.memorized_bgm_position
end
end end
pbMEFade(0.25)
pbWait(Graphics.frame_rate / 4)
pbMEStop
# Play battle music # Play battle music
bgm = pbGetWildBattleBGM([]) if !bgm bgm = pbGetWildBattleBGM([]) if !bgm
pbBGMPlay(bgm) pbBGMPlay(bgm)
@@ -129,6 +130,8 @@ def pbBattleAnimation(bgm = nil, battletype = 0, foe = nil)
$game_system.bgm_resume(playingBGM) $game_system.bgm_resume(playingBGM)
$game_system.bgs_resume(playingBGS) $game_system.bgs_resume(playingBGS)
end end
$game_temp.memorized_bgm = nil
$game_temp.memorized_bgm_position = 0
$PokemonGlobal.nextBattleBGM = nil $PokemonGlobal.nextBattleBGM = nil
$PokemonGlobal.nextBattleME = nil $PokemonGlobal.nextBattleME = nil
$PokemonGlobal.nextBattleCaptureME = nil $PokemonGlobal.nextBattleCaptureME = nil

10
Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb
View File

@@ -63,11 +63,13 @@ end
#=============================================================================== #===============================================================================
# Load/play various trainer battle music # Load/play various trainer battle music
#=============================================================================== #===============================================================================
def pbPlayTrainerIntroME(trainer_type) def pbPlayTrainerIntroBGM(trainer_type)
trainer_type_data = GameData::TrainerType.get(trainer_type) trainer_type_data = GameData::TrainerType.get(trainer_type)
return if nil_or_empty?(trainer_type_data.intro_ME) return if nil_or_empty?(trainer_type_data.intro_BGM)
bgm = pbStringToAudioFile(trainer_type_data.intro_ME) bgm = pbStringToAudioFile(trainer_type_data.intro_BGM)
pbMEPlay(bgm) $game_temp.memorized_bgm = $game_system.getPlayingBGM
$game_temp.memorized_bgm_position = (Audio.bgm_pos rescue 0)
pbBGMPlay(bgm)
end end
def pbGetTrainerBattleBGM(trainer) # can be a Player, NPCTrainer or an array of them def pbGetTrainerBattleBGM(trainer) # can be a Player, NPCTrainer or an array of them

6
Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb
View File

@@ -353,7 +353,7 @@ def pbTrainerTypeEditor
[_INTL("BaseMoney"), LimitProperty.new(9999), _INTL("Player earns this much money times the highest level among the trainer's Pokémon.")], [_INTL("BaseMoney"), LimitProperty.new(9999), _INTL("Player earns this much money times the highest level among the trainer's Pokémon.")],
[_INTL("SkillLevel"), LimitProperty.new(9999), _INTL("Skill level of this Trainer Type.")], [_INTL("SkillLevel"), LimitProperty.new(9999), _INTL("Skill level of this Trainer Type.")],
[_INTL("Flags"), StringListProperty, _INTL("Words/phrases that can be used to make trainers of this type behave differently to others.")], [_INTL("Flags"), StringListProperty, _INTL("Words/phrases that can be used to make trainers of this type behave differently to others.")],
[_INTL("IntroME"), MEProperty, _INTL("ME played before battles against trainers of this type.")], [_INTL("IntroBGM"), BGMProperty, _INTL("BGM played before battles against trainers of this type.")],
[_INTL("BattleBGM"), BGMProperty, _INTL("BGM played in battles against trainers of this type.")], [_INTL("BattleBGM"), BGMProperty, _INTL("BGM played in battles against trainers of this type.")],
[_INTL("VictoryME"), MEProperty, _INTL("ME played when player wins battles against trainers of this type.")] [_INTL("VictoryME"), MEProperty, _INTL("ME played when player wins battles against trainers of this type.")]
] ]
@@ -377,7 +377,7 @@ def pbTrainerTypeEditor
t_data.base_money, t_data.base_money,
t_data.skill_level, t_data.skill_level,
t_data.flags, t_data.flags,
t_data.intro_ME, t_data.intro_BGM,
t_data.battle_BGM, t_data.battle_BGM,
t_data.victory_ME t_data.victory_ME
] ]
@@ -390,7 +390,7 @@ def pbTrainerTypeEditor
:base_money => data[3], :base_money => data[3],
:skill_level => data[4], :skill_level => data[4],
:flags => data[5], :flags => data[5],
:intro_ME => data[6], :intro_BGM => data[6],
:battle_BGM => data[7], :battle_BGM => data[7],
:victory_ME => data[8] :victory_ME => data[8]
} }

2
Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
View File

@@ -1399,7 +1399,7 @@ module Compiler
:base_money => line[3], :base_money => line[3],
:battle_BGM => line[4], :battle_BGM => line[4],
:victory_ME => line[5], :victory_ME => line[5],
:intro_ME => line[6], :intro_BGM => line[6],
:gender => line[7], :gender => line[7],
:skill_level => line[8], :skill_level => line[8],
:flags => line[9] :flags => line[9]

2
Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb
View File

@@ -634,7 +634,7 @@ module Compiler
f.write(sprintf("BaseMoney = %d\r\n", t.base_money)) f.write(sprintf("BaseMoney = %d\r\n", t.base_money))
f.write(sprintf("SkillLevel = %d\r\n", t.skill_level)) if t.skill_level != t.base_money f.write(sprintf("SkillLevel = %d\r\n", t.skill_level)) if t.skill_level != t.base_money
f.write(sprintf("Flags = %s\r\n", t.flags.join(","))) if t.flags.length > 0 f.write(sprintf("Flags = %s\r\n", t.flags.join(","))) if t.flags.length > 0
f.write(sprintf("IntroME = %s\r\n", t.intro_ME)) if !nil_or_empty?(t.intro_ME) f.write(sprintf("IntroBGM = %s\r\n", t.intro_BGM)) if !nil_or_empty?(t.intro_BGM)
f.write(sprintf("BattleBGM = %s\r\n", t.battle_BGM)) if !nil_or_empty?(t.battle_BGM) f.write(sprintf("BattleBGM = %s\r\n", t.battle_BGM)) if !nil_or_empty?(t.battle_BGM)
f.write(sprintf("VictoryME = %s\r\n", t.victory_ME)) if !nil_or_empty?(t.victory_ME) f.write(sprintf("VictoryME = %s\r\n", t.victory_ME)) if !nil_or_empty?(t.victory_ME)
end end