diff --git a/Resources/Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg b/Resources/Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg index 9d3ccc1d88..50432700a9 100644 Binary files a/Resources/Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg and b/Resources/Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg differ diff --git a/Resources/Audio/White/Music/Lobby/Music/Libets_Delay.ogg b/Resources/Audio/White/Music/Lobby/Music/Libets_Delay.ogg index 55f8ead18c..1eacb837cc 100644 Binary files a/Resources/Audio/White/Music/Lobby/Music/Libets_Delay.ogg and b/Resources/Audio/White/Music/Lobby/Music/Libets_Delay.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Battle_Theme_I.ogg b/Resources/Audio/_Honk/Jukebox/Battle_Theme_I.ogg new file mode 100644 index 0000000000..086f798d20 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Battle_Theme_I.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Battle_Theme_II.ogg b/Resources/Audio/_Honk/Jukebox/Battle_Theme_II.ogg new file mode 100644 index 0000000000..244598667f Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Battle_Theme_II.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg b/Resources/Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg new file mode 100644 index 0000000000..c559268a18 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Boss_Theme.ogg b/Resources/Audio/_Honk/Jukebox/Boss_Theme.ogg new file mode 100644 index 0000000000..b65f5f9e49 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Boss_Theme.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Escape_in_the_Night.ogg b/Resources/Audio/_Honk/Jukebox/Escape_in_the_Night.ogg new file mode 100644 index 0000000000..a6e822a05a Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Escape_in_the_Night.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Game_Over.ogg b/Resources/Audio/_Honk/Jukebox/Game_Over.ogg new file mode 100644 index 0000000000..17a0e4781b Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Game_Over.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg b/Resources/Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg new file mode 100644 index 0000000000..a9403323cd Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/The_Unknown.ogg b/Resources/Audio/_Honk/Jukebox/The_Unknown.ogg new file mode 100644 index 0000000000..f035660396 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/The_Unknown.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg b/Resources/Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg new file mode 100644 index 0000000000..89ba6ab4a7 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg b/Resources/Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg new file mode 100644 index 0000000000..22d8a8ade1 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg b/Resources/Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg new file mode 100644 index 0000000000..677e2f2226 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg b/Resources/Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg new file mode 100644 index 0000000000..304da729c1 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Toby_Fox_feat_Lena_Raine_Marcy_Nabors_Attack_of_the_Killer_Queen.ogg b/Resources/Audio/_Honk/Jukebox/Toby_Fox_feat_Lena_Raine_Marcy_Nabors_Attack_of_the_Killer_Queen.ogg new file mode 100644 index 0000000000..3e8d20bafd Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Toby_Fox_feat_Lena_Raine_Marcy_Nabors_Attack_of_the_Killer_Queen.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/Try_Again.ogg b/Resources/Audio/_Honk/Jukebox/Try_Again.ogg new file mode 100644 index 0000000000..0a9fd38b44 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/Try_Again.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg new file mode 100644 index 0000000000..c71553b43c Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Cosmic_Temperance.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Cosmic_Temperance.ogg new file mode 100644 index 0000000000..c1d2f01749 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Cosmic_Temperance.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg new file mode 100644 index 0000000000..3b2aa51a9f Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg new file mode 100644 index 0000000000..29e7f97eb4 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg new file mode 100644 index 0000000000..4026418d47 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg new file mode 100644 index 0000000000..ce06289923 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg b/Resources/Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg new file mode 100644 index 0000000000..04d535cb4d Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg new file mode 100644 index 0000000000..132017182f Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg new file mode 100644 index 0000000000..6ea7d8bdaa Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg differ diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg new file mode 100644 index 0000000000..db8141b819 Binary files /dev/null and b/Resources/Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg differ diff --git a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml index ecec20aa83..24cfec67c6 100644 --- a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml +++ b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml @@ -2,6 +2,8 @@ # К недавно добавленной музыке добавлять [NEW] в название, чтобы привлечь внимание игроков +# При добавлении песенки формата stereo в консоль срёт error'ку, поэтому конвертируйте в mono, i guess? Я уже конвертировал всё то, что было в стерео + # Songs - type: jukebox # WD id: SpaceOddity @@ -125,20 +127,158 @@ path: path: /Audio/Ambience/voyage_neverending.ogg -- type: jukebox +- type: jukebox # HONK id: CosmicTemperance name: Music - Cosmic Temperance path: - path: /Audio/Lobby/White/cosmictemperance.ogg + path: /Audio/_Honk/Jukebox/blinch_Cosmic_Temperance.ogg - type: jukebox # WD id: LibetsDelay - name: "[NEW] Music - Libets Delay" + name: Music - Libets Delay path: path: /Audio/White/Music/Lobby/Music/Libets_Delay.ogg - type: jukebox # WD id: ItsJustABurningMemory - name: "[NEW] Music - Its just a burning memory" + name: Music - Its just a burning memory path: path: /Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg + +- type: jukebox # HONK + id: AnamnesisoftheworldsSin + name: "[NEW] Music - Anamnesis of the world's Sin" + path: + path: /Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg + +- type: jukebox # HONK + id: DarkMatterMoon + name: "[NEW] Music - Dark Matter Moon" + path: + path: /Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg + +- type: jukebox # HONK + id: EmptyOcean + name: "[NEW] Music - Empty Ocean" + path: + path: /Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg + +- type: jukebox # HONK + id: GoldenWinPiano + name: "[NEW] Music - Golden Win Piano" + path: + path: /Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg + +- type: jukebox # HONK + id: KillerXChase + name: "[NEW] Music - Killer X Chase" + path: + path: /Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg + +- type: jukebox # HONK + id: PathLootCrusaders + name: "[NEW] Music - PathLoot Crusaders" + path: + path: /Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg + +- type: jukebox # HONK + id: PristintheMirror + name: "[NEW] Music - Prist in the Mirror" + path: + path: /Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg + +- type: jukebox # HONK + id: StarJudgment + name: "[NEW] Music - Star Judgment" + path: + path: /Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg + +- type: jukebox # HONK + id: WheelofFaith + name: "[NEW] Music - Wheel of Faith" + path: + path: /Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg + +- type: jukebox # HONK + id: TheUnknown + name: "[NEW] Music - The Unknown" + path: + path: /Audio/_Honk/Jukebox/The_Unknown.ogg + +- type: jukebox # HONK + id: EscapeintheNight + name: "[NEW] Music - Escape in the Night" + path: + path: /Audio/_Honk/Jukebox/Escape_in_the_Night.ogg + +- type: jukebox # HONK + id: BossTheme + name: "[NEW] Music - Boss Theme" + path: + path: /Audio/_Honk/Jukebox/Boss_Theme.ogg + +- type: jukebox # HONK + id: BattleThemeII + name: "[NEW] Music - Battle Theme II" + path: + path: /Audio/_Honk/Jukebox/Battle_Theme_II.ogg + +- type: jukebox # HONK + id: GameOver + name: "[NEW] Music - Game_Over..." + path: + path: /Audio/_Honk/Jukebox/Game_Over.ogg + +- type: jukebox # HONK + id: TryAgain + name: "[NEW] Music - Try Again?" + path: + path: /Audio/_Honk/Jukebox/Try_Again.ogg + +- type: jukebox # HONK + id: WheelofFaith + name: "[NEW] Music - Beasts_and_Betrayal" + path: + path: /Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg + +- type: jukebox # HONK + id: BattleThemeI + name: "[NEW] Music - Battle Theme I" + path: + path: /Audio/_Honk/Jukebox/Battle_Theme_I.ogg + +- type: jukebox # HONK + id: HEAVENSAYSMANDELA + name: "[NEW] Music - HEAVEN SAYS MANDELA" + path: + path: /Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg + +- type: jukebox # HONK + id: CYBERSWORLD + name: "[NEW] Music - CYBERS WORLD?" + path: + path: /Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg + +- type: jukebox # HONK + id: BIGSHOT + name: "[NEW] Music - BIG SHOT" + path: + path: /Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg + +- type: jukebox # HONK + id: NOWSYOURCHANCETOBEA + name: "[NEW] Music - NOWS YOUR CHANCE TO BE A" + path: + path: /Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg + +- type: jukebox # HONK + id: Pandora Palace + name: "[NEW] Music - Pandora Palace" + path: + path: /Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg + +- type: jukebox # HONK + id: AttackoftheKillerQueen + name: "[NEW] Music - Attack of the Killer Queen" + path: + path: /Audio/_Honk/Jukebox/Toby_Fox_feat_Lena_Raine_Marcy_Nabors_Attack_of_the_Killer_Queen.ogg