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

Changed battle victory MEs to BGMs

Browse Source
This commit is contained in:
Maruno17
2022-04-21 21:43:11 +01:00
parent 77f9547687
commit a85ec1e51a
12 changed files with 181 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Data/Scripts/003_Game processing/004_Interpreter_Commands.rb
View File

@@ -664,10 +664,7 @@ class Interpreter
#-----------------------------------------------------------------------------
# * Change Battle End ME
#-----------------------------------------------------------------------------
def command_133
($PokemonGlobal.nextBattleME = @parameters[0]) ? @parameters[0].clone : nil
return true
end
def command_133; command_dummy; end
#-----------------------------------------------------------------------------
# * Change Save Access
#-----------------------------------------------------------------------------

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

@@ -8,7 +8,7 @@ module GameData
attr_reader :flags
attr_reader :intro_BGM
attr_reader :battle_BGM
attr_reader :victory_ME
attr_reader :victory_BGM
DATA = {}
DATA_FILENAME = "trainer_types.dat"
@@ -24,7 +24,7 @@ module GameData
"Flags" => [:flags, "*s"],
"IntroBGM" => [:intro_BGM, "s"],
"BattleBGM" => [:battle_BGM, "s"],
"VictoryME" => [:victory_ME, "s"]
"VictoryBGM" => [:victory_BGM, "s"]
}
extend ClassMethodsSymbols
@@ -88,7 +88,7 @@ module GameData
@flags = hash[:flags] || []
@intro_BGM = hash[:intro_BGM]
@battle_BGM = hash[:battle_BGM]
@victory_ME = hash[:victory_ME]
@victory_BGM = hash[:victory_BGM]
end
# @return [String] the translated name of this trainer type

20
Data/Scripts/010_Data/002_PBS data/016_Metadata.rb
View File

@@ -7,8 +7,8 @@ module GameData
attr_reader :real_storage_creator
attr_reader :wild_battle_BGM
attr_reader :trainer_battle_BGM
attr_reader :wild_victory_ME
attr_reader :trainer_victory_ME
attr_reader :wild_victory_BGM
attr_reader :trainer_victory_BGM
attr_reader :wild_capture_ME
attr_reader :surf_BGM
attr_reader :bicycle_BGM
@@ -23,8 +23,8 @@ module GameData
"StorageCreator" => [4, "s"],
"WildBattleBGM" => [5, "s"],
"TrainerBattleBGM" => [6, "s"],
"WildVictoryME" => [7, "s"],
"TrainerVictoryME" => [8, "s"],
"WildVictoryBGM" => [7, "s"],
"TrainerVictoryBGM" => [8, "s"],
"WildCaptureME" => [9, "s"],
"SurfBGM" => [10, "s"],
"BicycleBGM" => [11, "s"]
@@ -41,8 +41,8 @@ module GameData
["StorageCreator", StringProperty, _INTL("Name of the Pokémon Storage creator (the storage option is named \"XXX's PC\").")],
["WildBattleBGM", BGMProperty, _INTL("Default BGM for wild Pokémon battles.")],
["TrainerBattleBGM", BGMProperty, _INTL("Default BGM for Trainer battles.")],
["WildVictoryME", MEProperty, _INTL("Default ME played after winning a wild Pokémon battle.")],
["TrainerVictoryME", MEProperty, _INTL("Default ME played after winning a Trainer battle.")],
["WildVictoryBGM", BGMProperty, _INTL("Default BGM played after winning a wild Pokémon battle.")],
["TrainerVictoryBGM", BGMProperty, _INTL("Default BGM played after winning a Trainer battle.")],
["WildCaptureME", MEProperty, _INTL("Default ME played after catching a Pokémon.")],
["SurfBGM", BGMProperty, _INTL("BGM played while surfing.")],
["BicycleBGM", BGMProperty, _INTL("BGM played while on a bicycle.")]
@@ -61,8 +61,8 @@ module GameData
@real_storage_creator = hash[:storage_creator]
@wild_battle_BGM = hash[:wild_battle_BGM]
@trainer_battle_BGM = hash[:trainer_battle_BGM]
@wild_victory_ME = hash[:wild_victory_ME]
@trainer_victory_ME = hash[:trainer_victory_ME]
@wild_victory_BGM = hash[:wild_victory_BGM]
@trainer_victory_BGM = hash[:trainer_victory_BGM]
@wild_capture_ME = hash[:wild_capture_ME]
@surf_BGM = hash[:surf_BGM]
@bicycle_BGM = hash[:bicycle_BGM]
@@ -82,8 +82,8 @@ module GameData
when "StorageCreator" then return @real_storage_creator
when "WildBattleBGM" then return @wild_battle_BGM
when "TrainerBattleBGM" then return @trainer_battle_BGM
when "WildVictoryME" then return @wild_victory_ME
when "TrainerVictoryME" then return @trainer_victory_ME
when "WildVictoryBGM" then return @wild_victory_BGM
when "TrainerVictoryBGM" then return @trainer_victory_BGM
when "WildCaptureME" then return @wild_capture_ME
when "SurfBGM" then return @surf_BGM
when "BicycleBGM" then return @bicycle_BGM

20
Data/Scripts/010_Data/002_PBS data/018_MapMetadata.rb
View File

@@ -17,8 +17,8 @@ module GameData
attr_reader :battle_background
attr_reader :wild_battle_BGM
attr_reader :trainer_battle_BGM
attr_reader :wild_victory_ME
attr_reader :trainer_victory_ME
attr_reader :wild_victory_BGM
attr_reader :trainer_victory_BGM
attr_reader :wild_capture_ME
attr_reader :town_map_size
attr_reader :battle_environment
@@ -44,8 +44,8 @@ module GameData
"BattleBack" => [14, "s"],
"WildBattleBGM" => [15, "s"],
"TrainerBattleBGM" => [16, "s"],
"WildVictoryME" => [17, "s"],
"TrainerVictoryME" => [18, "s"],
"WildVictoryBGM" => [17, "s"],
"TrainerVictoryBGM" => [18, "s"],
"WildCaptureME" => [19, "s"],
"MapSize" => [20, "us"],
"Environment" => [21, "e", :Environment],
@@ -73,8 +73,8 @@ module GameData
["BattleBack", StringProperty, _INTL("PNG files named 'XXX_bg', 'XXX_base0', 'XXX_base1', 'XXX_message' in Battlebacks folder, where XXX is this property's value.")],
["WildBattleBGM", BGMProperty, _INTL("Default BGM for wild Pokémon battles on this map.")],
["TrainerBattleBGM", BGMProperty, _INTL("Default BGM for trainer battles on this map.")],
["WildVictoryME", MEProperty, _INTL("Default ME played after winning a wild Pokémon battle on this map.")],
["TrainerVictoryME", MEProperty, _INTL("Default ME played after winning a Trainer battle on this map.")],
["WildVictoryBGM", BGMProperty, _INTL("Default BGM played after winning a wild Pokémon battle on this map.")],
["TrainerVictoryBGM", BGMProperty, _INTL("Default BGM played after winning a Trainer battle on this map.")],
["WildCaptureME", MEProperty, _INTL("Default ME played after catching a wild Pokémon on this map.")],
["MapSize", MapSizeProperty, _INTL("The width of the map in Town Map squares, and a string indicating which squares are part of this map.")],
["Environment", GameDataProperty.new(:Environment), _INTL("The default battle environment for battles on this map.")],
@@ -100,8 +100,8 @@ module GameData
@battle_background = hash[:battle_background]
@wild_battle_BGM = hash[:wild_battle_BGM]
@trainer_battle_BGM = hash[:trainer_battle_BGM]
@wild_victory_ME = hash[:wild_victory_ME]
@trainer_victory_ME = hash[:trainer_victory_ME]
@wild_victory_BGM = hash[:wild_victory_BGM]
@trainer_victory_BGM = hash[:trainer_victory_BGM]
@wild_capture_ME = hash[:wild_capture_ME]
@town_map_size = hash[:town_map_size]
@battle_environment = hash[:battle_environment]
@@ -126,8 +126,8 @@ module GameData
when "BattleBack" then return @battle_background
when "WildBattleBGM" then return @wild_battle_BGM
when "TrainerBattleBGM" then return @trainer_battle_BGM
when "WildVictoryME" then return @wild_victory_ME
when "TrainerVictoryME" then return @trainer_victory_ME
when "WildVictoryBGM" then return @wild_victory_BGM
when "TrainerVictoryBGM" then return @trainer_victory_BGM
when "WildCaptureME" then return @wild_capture_ME
when "MapSize" then return @town_map_size
when "Environment" then return @battle_environment

4
Data/Scripts/011_Battle/004_Scene/001_Battle_Scene.rb
View File

@@ -410,13 +410,13 @@ class Battle::Scene
# This method can change the battle's music for example.
def pbWildBattleSuccess
@battleEnd = true
pbBGMPlay(pbGetWildVictoryME)
pbBGMPlay(pbGetWildVictoryBGM)
end
# This method is called when the player wins a trainer battle.
# This method can change the battle's music for example.
def pbTrainerBattleSuccess
@battleEnd = true
pbBGMPlay(pbGetTrainerVictoryME(@battle.opponent))
pbBGMPlay(pbGetTrainerVictoryBGM(@battle.opponent))
end
end

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

@@ -3,7 +3,7 @@
#===============================================================================
class PokemonGlobalMetadata
attr_accessor :nextBattleBGM
attr_accessor :nextBattleME
attr_accessor :nextBattleVictoryBGM
attr_accessor :nextBattleCaptureME
attr_accessor :nextBattleBack
end
@@ -237,7 +237,7 @@ def pbWildBattleCore(*args)
pbSet(outcomeVar, 1) # Treat it as a win
$game_temp.clear_battle_rules
$PokemonGlobal.nextBattleBGM = nil
$PokemonGlobal.nextBattleME = nil
$PokemonGlobal.nextBattleVictoryBGM = nil
$PokemonGlobal.nextBattleCaptureME = nil
$PokemonGlobal.nextBattleBack = nil
pbMEStop
@@ -382,7 +382,7 @@ def pbTrainerBattleCore(*args)
pbSet(outcomeVar, ($player.able_pokemon_count == 0) ? 0 : 1) # Treat it as undecided/a win
$game_temp.clear_battle_rules
$PokemonGlobal.nextBattleBGM = nil
$PokemonGlobal.nextBattleME = nil
$PokemonGlobal.nextBattleVictoryBGM = nil
$PokemonGlobal.nextBattleCaptureME = nil
$PokemonGlobal.nextBattleBack = nil
pbMEStop

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

@@ -133,7 +133,7 @@ def pbBattleAnimation(bgm = nil, battletype = 0, foe = nil)
$game_temp.memorized_bgm = nil
$game_temp.memorized_bgm_position = 0
$PokemonGlobal.nextBattleBGM = nil
$PokemonGlobal.nextBattleME = nil
$PokemonGlobal.nextBattleVictoryBGM = nil
$PokemonGlobal.nextBattleCaptureME = nil
$PokemonGlobal.nextBattleBack = nil
$PokemonEncounters.reset_step_count

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

@@ -20,23 +20,21 @@ def pbGetWildBattleBGM(_wildParty) # wildParty is an array of Pokémon objects
return ret
end
def pbGetWildVictoryME
if $PokemonGlobal.nextBattleME
return $PokemonGlobal.nextBattleME.clone
def pbGetWildVictoryBGM
if $PokemonGlobal.nextBattleVictoryBGM
return $PokemonGlobal.nextBattleVictoryBGM.clone
end
ret = nil
if !ret
# Check map metadata
music = $game_map.metadata&.wild_victory_ME
music = $game_map.metadata&.wild_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
end
if !ret
# Check global metadata
music = GameData::Metadata.get.wild_victory_ME
music = GameData::Metadata.get.wild_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
end
ret = pbStringToAudioFile("Battle victory") if !ret
ret.name = "../../Audio/ME/" + ret.name
ret.name = "../../Audio/BGM/" + ret.name
return ret
end
@@ -92,9 +90,7 @@ def pbGetTrainerBattleBGM(trainer) # can be a Player, NPCTrainer or an array o
if !ret
# Check global metadata
music = GameData::Metadata.get.trainer_battle_BGM
if music && music != ""
ret = pbStringToAudioFile(music)
end
ret = pbStringToAudioFile(music) if music && music != ""
end
ret = pbStringToAudioFile("Battle trainer") if !ret
return ret
@@ -120,33 +116,29 @@ def pbGetTrainerBattleBGMFromType(trainertype)
return ret
end
def pbGetTrainerVictoryME(trainer) # can be a Player, NPCTrainer or an array of them
if $PokemonGlobal.nextBattleME
return $PokemonGlobal.nextBattleME.clone
def pbGetTrainerVictoryBGM(trainer) # can be a Player, NPCTrainer or an array of them
if $PokemonGlobal.nextBattleVictoryBGM
return $PokemonGlobal.nextBattleVictoryBGM.clone
end
music = nil
trainerarray = (trainer.is_a?(Array)) ? trainer : [trainer]
trainerarray.each do |t|
trainer_type_data = GameData::TrainerType.get(t.trainer_type)
music = trainer_type_data.victory_ME if trainer_type_data.victory_ME
music = trainer_type_data.victory_BGM if trainer_type_data.victory_BGM
end
ret = nil
if music && music != ""
ret = pbStringToAudioFile(music)
end
ret = pbStringToAudioFile(music) if music && music != ""
if !ret
# Check map metadata
music = $game_map.metadata&.trainer_victory_ME
music = $game_map.metadata&.trainer_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
end
if !ret
# Check global metadata
music = GameData::Metadata.get.trainer_victory_ME
if music && music != ""
ret = pbStringToAudioFile(music)
end
music = GameData::Metadata.get.trainer_victory_BGM
ret = pbStringToAudioFile(music) if music && music != ""
end
ret = pbStringToAudioFile("Battle victory") if !ret
ret.name = "../../Audio/ME/" + ret.name
ret.name = "../../Audio/BGM/" + ret.name
return ret
end

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

@@ -355,7 +355,7 @@ def pbTrainerTypeEditor
[_INTL("Flags"), StringListProperty, _INTL("Words/phrases that can be used to make trainers of this type behave differently to others.")],
[_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("VictoryME"), MEProperty, _INTL("ME played when player wins battles against trainers of this type.")]
[_INTL("VictoryBGM"), BGMProperty, _INTL("BGM played when player wins battles against trainers of this type.")]
]
pbListScreenBlock(_INTL("Trainer Types"), TrainerTypeLister.new(0, true)) { |button, tr_type|
if tr_type
@@ -379,7 +379,7 @@ def pbTrainerTypeEditor
t_data.flags,
t_data.intro_BGM,
t_data.battle_BGM,
t_data.victory_ME
t_data.victory_BGM
]
if pbPropertyList(t_data.id.to_s, data, trainer_type_properties, true)
# Construct trainer type hash
@@ -392,7 +392,7 @@ def pbTrainerTypeEditor
:flags => data[5],
:intro_BGM => data[6],
:battle_BGM => data[7],
:victory_ME => data[8]
:victory_BGM => data[8]
}
# Add trainer type's data to records
GameData::TrainerType.register(type_hash)
@@ -744,8 +744,8 @@ def pbEditMetadata
:storage_creator => data[3],
:wild_battle_BGM => data[4],
:trainer_battle_BGM => data[5],
:wild_victory_ME => data[6],
:trainer_victory_ME => data[7],
:wild_victory_BGM => data[6],
:trainer_victory_BGM => data[7],
:wild_capture_ME => data[8],
:surf_BGM => data[9],
:bicycle_BGM => data[10]
@@ -841,8 +841,8 @@ def pbEditMapMetadata(map_id)
:battle_background => data[13],
:wild_battle_BGM => data[14],
:trainer_battle_BGM => data[15],
:wild_victory_ME => data[16],
:trainer_victory_ME => data[17],
:wild_victory_BGM => data[16],
:trainer_victory_BGM => data[17],
:wild_capture_ME => data[18],
:town_map_size => data[19],
:battle_environment => data[20],

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

@@ -1398,7 +1398,7 @@ module Compiler
:name => line[2],
:base_money => line[3],
:battle_BGM => line[4],
:victory_ME => line[5],
:victory_BGM => line[5],
:intro_BGM => line[6],
:gender => line[7],
:skill_level => line[8],
@@ -1707,8 +1707,8 @@ module Compiler
:storage_creator => contents["StorageCreator"],
:wild_battle_BGM => contents["WildBattleBGM"],
:trainer_battle_BGM => contents["TrainerBattleBGM"],
:wild_victory_ME => contents["WildVictoryME"],
:trainer_victory_ME => contents["TrainerVictoryME"],
:wild_victory_BGM => contents["WildVictoryBGM"],
:trainer_victory_BGM => contents["TrainerVictoryBGM"],
:wild_capture_ME => contents["WildCaptureME"],
:surf_BGM => contents["SurfBGM"],
:bicycle_BGM => contents["BicycleBGM"]
@@ -1794,8 +1794,8 @@ module Compiler
:battle_background => contents["BattleBack"],
:wild_battle_BGM => contents["WildBattleBGM"],
:trainer_battle_BGM => contents["TrainerBattleBGM"],
:wild_victory_ME => contents["WildVictoryME"],
:trainer_victory_ME => contents["TrainerVictoryME"],
:wild_victory_BGM => contents["WildVictoryBGM"],
:trainer_victory_BGM => contents["TrainerVictoryBGM"],
:wild_capture_ME => contents["WildCaptureME"],
:town_map_size => contents["MapSize"],
:battle_environment => contents["Environment"],

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

@@ -636,7 +636,7 @@ module Compiler
f.write(sprintf("Flags = %s\r\n", t.flags.join(","))) if t.flags.length > 0
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("VictoryME = %s\r\n", t.victory_ME)) if !nil_or_empty?(t.victory_ME)
f.write(sprintf("VictoryBGM = %s\r\n", t.victory_BGM)) if !nil_or_empty?(t.victory_BGM)
end
}
process_pbs_file_message_end

4
PBS/metadata.txt
View File

@@ -7,8 +7,8 @@ Home = 3,7,5,8
StorageCreator = Bill
WildBattleBGM = Battle wild
TrainerBattleBGM = Battle trainer
WildVictoryME = Battle victory wild
TrainerVictoryME = Battle victory trainer
WildVictoryBGM = Battle victory wild
TrainerVictoryBGM = Battle victory trainer
SurfBGM = Surfing
BicycleBGM = Bicycle
#-------------------------------