mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 21:54:58 +00:00
Moved battle music filenames to Settings, improved PluginManager's version comparer, removed player bump animation, fixed No Guard not applying to OHKO moves, can reuse the same Repel item quicker
This commit is contained in:
@@ -15,7 +15,7 @@ def pbGetWildBattleBGM(_wildParty)
|
||||
music = GameData::Metadata.get.wild_battle_BGM
|
||||
ret = pbStringToAudioFile(music) if music && music != ""
|
||||
end
|
||||
ret = pbStringToAudioFile("Battle wild") if !ret
|
||||
ret = pbStringToAudioFile(Settings::DEFAULT_WILD_BATTLE_BGM) if !ret
|
||||
return ret
|
||||
end
|
||||
|
||||
@@ -32,7 +32,7 @@ def pbGetWildVictoryBGM
|
||||
music = GameData::Metadata.get.wild_victory_BGM
|
||||
ret = pbStringToAudioFile(music) if music && music != ""
|
||||
end
|
||||
ret = pbStringToAudioFile("Battle victory") if !ret
|
||||
ret = pbStringToAudioFile(Settings::DEFAULT_WILD_VICTORY_BGM) if !ret
|
||||
ret.name = "../../Audio/BGM/" + ret.name
|
||||
return ret
|
||||
end
|
||||
@@ -52,7 +52,7 @@ def pbGetWildCaptureME
|
||||
music = GameData::Metadata.get.wild_capture_ME
|
||||
ret = pbStringToAudioFile(music) if music && music != ""
|
||||
end
|
||||
ret = pbStringToAudioFile("Battle capture success") if !ret
|
||||
ret = pbStringToAudioFile(Settings::DEFAULT_WILD_CAPTURE_ME) if !ret
|
||||
ret.name = "../../Audio/ME/" + ret.name
|
||||
return ret
|
||||
end
|
||||
@@ -98,7 +98,7 @@ def pbGetTrainerBattleBGM(trainer)
|
||||
music = GameData::Metadata.get.trainer_battle_BGM
|
||||
ret = pbStringToAudioFile(music) if music && music != ""
|
||||
end
|
||||
ret = pbStringToAudioFile("Battle trainer") if !ret
|
||||
ret = pbStringToAudioFile(Settings::DEFAULT_TRAINER_BATTLE_BGM) if !ret
|
||||
return ret
|
||||
end
|
||||
|
||||
@@ -116,7 +116,7 @@ def pbGetTrainerBattleBGMFromType(trainertype)
|
||||
music = GameData::Metadata.get.trainer_battle_BGM
|
||||
ret = pbStringToAudioFile(music) if music && music != ""
|
||||
end
|
||||
ret = pbStringToAudioFile("Battle trainer") if !ret
|
||||
ret = pbStringToAudioFile(Settings::DEFAULT_TRAINER_BATTLE_BGM) if !ret
|
||||
return ret
|
||||
end
|
||||
|
||||
@@ -143,7 +143,7 @@ def pbGetTrainerVictoryBGM(trainer)
|
||||
music = GameData::Metadata.get.trainer_victory_BGM
|
||||
ret = pbStringToAudioFile(music) if music && music != ""
|
||||
end
|
||||
ret = pbStringToAudioFile("Battle victory") if !ret
|
||||
ret = pbStringToAudioFile(Settings::DEFAULT_TRAINER_VICTORY_BGM) if !ret
|
||||
ret.name = "../../Audio/BGM/" + ret.name
|
||||
return ret
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user