From 7cee7fa5abf4d7f5b1b5d33b7923e30149ae8932 Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Fri, 22 Dec 2023 16:27:52 +0000 Subject: [PATCH] fixed attributions, fixed extension. moved directory. --- .../Ambience}/01-Radiation_Storm.ogg | Bin .../Ambience}/02-Industrial_Junk.ogg | Bin .../03-Khans_Of_The_New_California.ogg | Bin .../Ambience}/04-Metallic_Monks.ogg | Bin .../Ambience}/05-Followers_Credo.ogg | Bin .../Ambience}/06-Vats_Of_Goo.ogg | Bin .../Ambience}/07-A_Traders_Life.ogg | Bin .../Ambience}/08-Moribund_World.ogg | Bin .../Ambience}/09-The_Vault_Of_The_Future.ogg | Bin .../Ambience}/10-Second_Chance.ogg | Bin .../Ambience}/11-City_Of_The_Dead.ogg | Bin .../Ambience}/12-Underground_Trouble.ogg | Bin .../Ambience}/13-City_Of_Lost_Angels.ogg | Bin .../14-Flame_Of_The_Ancient_World.ogg | Bin .../Ambience}/15-Many_Contrasts.ogg | Bin .../Ambience}/16-Gold_Slouch.ogg | Bin .../Ambience}/17-My_Chrysalis_Highwayman.ogg | Bin .../Ambience}/18-Beyond_The_Canyon.ogg | Bin .../19-Biggest_Little_City_In_The_World.ogg | Bin .../Ambience}/20-Dream_Town.ogg | Bin .../Ambience}/21-California_Revisited.ogg | Bin .../Ambience}/22-All-Clear_Signal.ogg | Bin .../Ambience}/23-Acolytes_Of_The_New_God.ogg | Bin .../Ambience}/24-Desert_Wind.ogg | Bin .../Ambience}/attributions.yml | 2 +- Resources/Prototypes/Nuclear14/audio.yml | 48 +++++++++--------- 26 files changed, 25 insertions(+), 25 deletions(-) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/01-Radiation_Storm.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/02-Industrial_Junk.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/03-Khans_Of_The_New_California.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/04-Metallic_Monks.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/05-Followers_Credo.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/06-Vats_Of_Goo.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/07-A_Traders_Life.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/08-Moribund_World.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/09-The_Vault_Of_The_Future.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/10-Second_Chance.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/11-City_Of_The_Dead.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/12-Underground_Trouble.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/13-City_Of_Lost_Angels.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/14-Flame_Of_The_Ancient_World.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/15-Many_Contrasts.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/16-Gold_Slouch.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/17-My_Chrysalis_Highwayman.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/18-Beyond_The_Canyon.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/19-Biggest_Little_City_In_The_World.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/20-Dream_Town.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/21-California_Revisited.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/22-All-Clear_Signal.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/23-Acolytes_Of_The_New_God.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/24-Desert_Wind.ogg (100%) rename Resources/Audio/{Ambience/Nuclear14 => Nuclear14/Ambience}/attributions.yml (97%) diff --git a/Resources/Audio/Ambience/Nuclear14/01-Radiation_Storm.ogg b/Resources/Audio/Nuclear14/Ambience/01-Radiation_Storm.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/01-Radiation_Storm.ogg rename to Resources/Audio/Nuclear14/Ambience/01-Radiation_Storm.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/02-Industrial_Junk.ogg b/Resources/Audio/Nuclear14/Ambience/02-Industrial_Junk.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/02-Industrial_Junk.ogg rename to Resources/Audio/Nuclear14/Ambience/02-Industrial_Junk.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/03-Khans_Of_The_New_California.ogg b/Resources/Audio/Nuclear14/Ambience/03-Khans_Of_The_New_California.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/03-Khans_Of_The_New_California.ogg rename to Resources/Audio/Nuclear14/Ambience/03-Khans_Of_The_New_California.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/04-Metallic_Monks.ogg b/Resources/Audio/Nuclear14/Ambience/04-Metallic_Monks.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/04-Metallic_Monks.ogg rename to Resources/Audio/Nuclear14/Ambience/04-Metallic_Monks.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/05-Followers_Credo.ogg b/Resources/Audio/Nuclear14/Ambience/05-Followers_Credo.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/05-Followers_Credo.ogg rename to Resources/Audio/Nuclear14/Ambience/05-Followers_Credo.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/06-Vats_Of_Goo.ogg b/Resources/Audio/Nuclear14/Ambience/06-Vats_Of_Goo.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/06-Vats_Of_Goo.ogg rename to Resources/Audio/Nuclear14/Ambience/06-Vats_Of_Goo.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/07-A_Traders_Life.ogg b/Resources/Audio/Nuclear14/Ambience/07-A_Traders_Life.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/07-A_Traders_Life.ogg rename to Resources/Audio/Nuclear14/Ambience/07-A_Traders_Life.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/08-Moribund_World.ogg b/Resources/Audio/Nuclear14/Ambience/08-Moribund_World.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/08-Moribund_World.ogg rename to Resources/Audio/Nuclear14/Ambience/08-Moribund_World.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/09-The_Vault_Of_The_Future.ogg b/Resources/Audio/Nuclear14/Ambience/09-The_Vault_Of_The_Future.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/09-The_Vault_Of_The_Future.ogg rename to Resources/Audio/Nuclear14/Ambience/09-The_Vault_Of_The_Future.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/10-Second_Chance.ogg b/Resources/Audio/Nuclear14/Ambience/10-Second_Chance.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/10-Second_Chance.ogg rename to Resources/Audio/Nuclear14/Ambience/10-Second_Chance.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/11-City_Of_The_Dead.ogg b/Resources/Audio/Nuclear14/Ambience/11-City_Of_The_Dead.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/11-City_Of_The_Dead.ogg rename to Resources/Audio/Nuclear14/Ambience/11-City_Of_The_Dead.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/12-Underground_Trouble.ogg b/Resources/Audio/Nuclear14/Ambience/12-Underground_Trouble.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/12-Underground_Trouble.ogg rename to Resources/Audio/Nuclear14/Ambience/12-Underground_Trouble.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/13-City_Of_Lost_Angels.ogg b/Resources/Audio/Nuclear14/Ambience/13-City_Of_Lost_Angels.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/13-City_Of_Lost_Angels.ogg rename to Resources/Audio/Nuclear14/Ambience/13-City_Of_Lost_Angels.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/14-Flame_Of_The_Ancient_World.ogg b/Resources/Audio/Nuclear14/Ambience/14-Flame_Of_The_Ancient_World.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/14-Flame_Of_The_Ancient_World.ogg rename to Resources/Audio/Nuclear14/Ambience/14-Flame_Of_The_Ancient_World.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/15-Many_Contrasts.ogg b/Resources/Audio/Nuclear14/Ambience/15-Many_Contrasts.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/15-Many_Contrasts.ogg rename to Resources/Audio/Nuclear14/Ambience/15-Many_Contrasts.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/16-Gold_Slouch.ogg b/Resources/Audio/Nuclear14/Ambience/16-Gold_Slouch.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/16-Gold_Slouch.ogg rename to Resources/Audio/Nuclear14/Ambience/16-Gold_Slouch.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/17-My_Chrysalis_Highwayman.ogg b/Resources/Audio/Nuclear14/Ambience/17-My_Chrysalis_Highwayman.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/17-My_Chrysalis_Highwayman.ogg rename to Resources/Audio/Nuclear14/Ambience/17-My_Chrysalis_Highwayman.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/18-Beyond_The_Canyon.ogg b/Resources/Audio/Nuclear14/Ambience/18-Beyond_The_Canyon.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/18-Beyond_The_Canyon.ogg rename to Resources/Audio/Nuclear14/Ambience/18-Beyond_The_Canyon.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/19-Biggest_Little_City_In_The_World.ogg b/Resources/Audio/Nuclear14/Ambience/19-Biggest_Little_City_In_The_World.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/19-Biggest_Little_City_In_The_World.ogg rename to Resources/Audio/Nuclear14/Ambience/19-Biggest_Little_City_In_The_World.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/20-Dream_Town.ogg b/Resources/Audio/Nuclear14/Ambience/20-Dream_Town.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/20-Dream_Town.ogg rename to Resources/Audio/Nuclear14/Ambience/20-Dream_Town.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/21-California_Revisited.ogg b/Resources/Audio/Nuclear14/Ambience/21-California_Revisited.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/21-California_Revisited.ogg rename to Resources/Audio/Nuclear14/Ambience/21-California_Revisited.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/22-All-Clear_Signal.ogg b/Resources/Audio/Nuclear14/Ambience/22-All-Clear_Signal.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/22-All-Clear_Signal.ogg rename to Resources/Audio/Nuclear14/Ambience/22-All-Clear_Signal.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/23-Acolytes_Of_The_New_God.ogg b/Resources/Audio/Nuclear14/Ambience/23-Acolytes_Of_The_New_God.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/23-Acolytes_Of_The_New_God.ogg rename to Resources/Audio/Nuclear14/Ambience/23-Acolytes_Of_The_New_God.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/24-Desert_Wind.ogg b/Resources/Audio/Nuclear14/Ambience/24-Desert_Wind.ogg similarity index 100% rename from Resources/Audio/Ambience/Nuclear14/24-Desert_Wind.ogg rename to Resources/Audio/Nuclear14/Ambience/24-Desert_Wind.ogg diff --git a/Resources/Audio/Ambience/Nuclear14/attributions.yml b/Resources/Audio/Nuclear14/Ambience/attributions.yml similarity index 97% rename from Resources/Audio/Ambience/Nuclear14/attributions.yml rename to Resources/Audio/Nuclear14/Ambience/attributions.yml index 0ce8eb4ba04..fec2e2f43ef 100644 --- a/Resources/Audio/Ambience/Nuclear14/attributions.yml +++ b/Resources/Audio/Nuclear14/Ambience/attributions.yml @@ -21,7 +21,7 @@ 21-California_Revisited.ogg, 22-All-Clear_Signal.ogg, 23-Acolytes_Of_The_New_God.ogg, - 24-Desert_Wind.ogg + 24-Desert_Wind.ogg"] license: "CC-BY-SA-3.0" copyright: "By Mark Morgan, actual license is Public Domain according to archive.org see below" source: "https://archive.org/details/AURAL01" diff --git a/Resources/Prototypes/Nuclear14/audio.yml b/Resources/Prototypes/Nuclear14/audio.yml index ab57cf724c1..463bcbda97d 100644 --- a/Resources/Prototypes/Nuclear14/audio.yml +++ b/Resources/Prototypes/Nuclear14/audio.yml @@ -41,30 +41,30 @@ - type: soundCollection id: AmbienceWasteland files: - - /Audio/Ambience/Nuclear14/01-Radiation_Storm.mp3 - - /Audio/Ambience/Nuclear14/02-Industrial_Junk.mp3 - - /Audio/Ambience/Nuclear14/03-Khans_Of_The_New_California.mp3 - - /Audio/Ambience/Nuclear14/04-Metallic_Monks.mp3 # epic, maybe change to roads or towns - - /Audio/Ambience/Nuclear14/05-Follower's_Credo.mp3 - - /Audio/Ambience/Nuclear14/06-Vats_Of_Goo.mp3 - - /Audio/Ambience/Nuclear14/07-A_Trader's_Life.mp3 - - /Audio/Ambience/Nuclear14/08-Moribund_World.mp3 - - /Audio/Ambience/Nuclear14/09-The_Vault_Of_The_Future.mp3 - - /Audio/Ambience/Nuclear14/10-Second_Chance.mp3 - - /Audio/Ambience/Nuclear14/11-City_Of_The_Dead.mp3 - - /Audio/Ambience/Nuclear14/12-Underground_Trouble.mp3 - - /Audio/Ambience/Nuclear14/13-City_Of_Lost_Angels.mp3 - - /Audio/Ambience/Nuclear14/14-Flame_Of_The_Ancient_World.mp3 - - /Audio/Ambience/Nuclear14/15-Many_Contrasts.mp3 - - /Audio/Ambience/Nuclear14/16-Gold_Slouch.mp3 -# - /Audio/Ambience/Nuclear14/17-My_Chrysalis_Highwayman.mp3 car travel song, maybe change to road tiles - - /Audio/Ambience/Nuclear14/18-Beyond_The_Canyon.mp3 - - /Audio/Ambience/Nuclear14/19-Biggest_Little_City_In_The_World.mp3 - - /Audio/Ambience/Nuclear14/20-Dream_Town.mp3 # another one for towns - - /Audio/Ambience/Nuclear14/21-California_Revisited.mp3 - - /Audio/Ambience/Nuclear14/22-All-Clear_Signal.mp3 - - /Audio/Ambience/Nuclear14/23-Acolytes_Of_The_New_God.mp3 - - /Audio/Ambience/Nuclear14/24-Desert_Wind.mp3 + - /Audio/Nuclear14/Ambience/01-Radiation_Storm.ogg + - /Audio/Nuclear14/Ambience/02-Industrial_Junk.ogg + - /Audio/Nuclear14/Ambience/03-Khans_Of_The_New_California.ogg + - /Audio/Nuclear14/Ambience/04-Metallic_Monks.ogg # epic, maybe change to roads or towns + - /Audio/Nuclear14/Ambience/05-Follower's_Credo.ogg + - /Audio/Nuclear14/Ambience/06-Vats_Of_Goo.ogg + - /Audio/Nuclear14/Ambience/07-A_Trader's_Life.ogg + - /Audio/Nuclear14/Ambience/08-Moribund_World.ogg + - /Audio/Nuclear14/Ambience/09-The_Vault_Of_The_Future.ogg + - /Audio/Nuclear14/Ambience/10-Second_Chance.ogg + - /Audio/Nuclear14/Ambience/11-City_Of_The_Dead.ogg + - /Audio/Nuclear14/Ambience/12-Underground_Trouble.ogg + - /Audio/Nuclear14/Ambience/13-City_Of_Lost_Angels.ogg + - /Audio/Nuclear14/Ambience/14-Flame_Of_The_Ancient_World.ogg + - /Audio/Nuclear14/Ambience/15-Many_Contrasts.ogg + - /Audio/Nuclear14/Ambience/16-Gold_Slouch.ogg +# - /Audio/Nuclear14/Ambience/17-My_Chrysalis_Highwayman.ogg car travel song, maybe change to road tiles + - /Audio/Nuclear14/Ambience/18-Beyond_The_Canyon.ogg + - /Audio/Nuclear14/Ambience/19-Biggest_Little_City_In_The_World.ogg + - /Audio/Nuclear14/Ambience/20-Dream_Town.ogg # another one for towns + - /Audio/Nuclear14/Ambience/21-California_Revisited.ogg + - /Audio/Nuclear14/Ambience/22-All-Clear_Signal.ogg + - /Audio/Nuclear14/Ambience/23-Acolytes_Of_The_New_God.ogg + - /Audio/Nuclear14/Ambience/24-Desert_Wind.ogg #- type: soundCollection