Danya Vodogonez

Danya Vodovoz is out, Dieter van der Westen is in. It was time for a change :) Also adds a hand full new Jukebox tracks.
Simple-Station · Nov 1, 2023 · 32d684c · 32d684c
1 parent 5618361
commit 32d684c
Show file tree

Hide file tree

Showing 58 changed files with 79 additions and 78 deletions.
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/Guacamole.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/Guacamole.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/a_night_in_brazil.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/a_night_in_brazil.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/funk_o_matic.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/funk_o_matic.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/goin'_on.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/goin'_on.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/jazz_funk_my_soul.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/jazz_funk_my_soul.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/moth_to_a_flame.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/moth_to_a_flame.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/off_the_grid.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/off_the_grid.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/planet_of_the_amazons.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DanyaVodovoz/planet_of_the_amazons.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/african_dreamland.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/african_dreamland.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/attributions.yml b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["african_dreamland.ogg", "bangkok_taxi_drive.ogg", "berlin_through_the_night.ogg", "heading_for_bamako.ogg", "mississippi_farewell.ogg", "paris_gipsy_swing.ogg", "sicilian_sundown.ogg", "the_balkan_night_train.ogg"]
+  license: "CC-BY-NC-ND-4.0"
+  copyright: "Dieter van der Westen on the Free Music Archive."
+  source: "https://freemusicarchive.org/music/dieter-van-der-westen/"
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/bangkok_taxi_drive.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/bangkok_taxi_drive.ogg
diff --git a/...urces/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_through_the_night.ogg b/...urces/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_through_the_night.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/headingfor_bamako.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/headingfor_bamako.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/mississippi_farewell.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/mississippi_farewell.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/paris_gipsy_swing.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/paris_gipsy_swing.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/sicilian_sundown.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/sicilian_sundown.ogg
diff --git a/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/the_balkan_night_train.ogg b/Resources/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/the_balkan_night_train.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/01 The Gamble.ogg b/Resources/Audio/SimpleStation14/Lobby/01 The Gamble.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/02 Guilty Pleasures.ogg b/Resources/Audio/SimpleStation14/Lobby/02 Guilty Pleasures.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/03 Jazzcuzzi.ogg b/Resources/Audio/SimpleStation14/Lobby/03 Jazzcuzzi.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/04 The Walk.ogg b/Resources/Audio/SimpleStation14/Lobby/04 The Walk.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/05 Velvet Bossa.ogg b/Resources/Audio/SimpleStation14/Lobby/05 Velvet Bossa.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/06 Colors.ogg b/Resources/Audio/SimpleStation14/Lobby/06 Colors.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/07 Midnight Jam.ogg b/Resources/Audio/SimpleStation14/Lobby/07 Midnight Jam.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/08 Miles Ahead.ogg b/Resources/Audio/SimpleStation14/Lobby/08 Miles Ahead.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/09 Moody.ogg b/Resources/Audio/SimpleStation14/Lobby/09 Moody.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/10 Flying Away.ogg b/Resources/Audio/SimpleStation14/Lobby/10 Flying Away.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/11 Take It Easy.ogg b/Resources/Audio/SimpleStation14/Lobby/11 Take It Easy.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/african_dreamland_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/african_dreamland_stereo.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/attributions.yml b/Resources/Audio/SimpleStation14/Lobby/attributions.yml
@@ -1,4 +1,4 @@
-- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "All songs used are produced by Danya Vodovoz, royalty free."
-  source: "https://soundcloud.com/danyavodovoz"
+- files: ["african_dreamland_stereo.ogg", "bangkok_taxi_drive_stereo.ogg", "berlin_through_the_night_stereo.ogg", "heading_for_bamako_stereo.ogg", "mississippi_farewell_stereo.ogg", "paris_gipsy_swing_stereo.ogg", "sicilian_sundown_stereo.ogg", "the_balkan_night_train_stereo.ogg"]
+  license: "CC-BY-NC-ND-4.0"
+  copyright: "Dieter van der Westen on the Free Music Archive."
+  source: "https://freemusicarchive.org/music/dieter-van-der-westen/"
diff --git a/Resources/Audio/SimpleStation14/Lobby/bangkok_taxi_drive_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/bangkok_taxi_drive_stereo.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/berlin_through_the_night_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/berlin_through_the_night_stereo.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/heading_for_bamako_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/heading_for_bamako_stereo.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/mississippi_farewell_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/mississippi_farewell_stereo.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/paris_gipsy_swing_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/paris_gipsy_swing_stereo.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/sicilian_sundown_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/sicilian_sundown_stereo.ogg
diff --git a/Resources/Audio/SimpleStation14/Lobby/the_balkan_night_train_stereo.ogg b/Resources/Audio/SimpleStation14/Lobby/the_balkan_night_train_stereo.ogg
diff --git a/Resources/Prototypes/SimpleStation14/Entities/Structures/Machines/Fun/jukebox.yml b/Resources/Prototypes/SimpleStation14/Entities/Structures/Machines/Fun/jukebox.yml
@@ -39,14 +39,6 @@
         density: 200
   - type: Jukebox
     songs:
-      - DanyaVodovozFunkOMatic
-      - DanyaVodovozGoinOn
-      - DanyaVodovozOffTheGrid
-      - DanyaVodovozPlanetOfTheAmazons
-      - DanyaVodovozGuacamole
-      - DanyaVodovozJazzFunkMySoul
-      - DanyaVodovozMothToAFlame
-      - DanyaVodovozNightInBrazil
       - JonShuemakerAgartha
       - JonShuemakerDancersAndFloaters
       - JonShuemakerSha
@@ -87,6 +79,14 @@
       - ApelsinsaftTheWanderersSailWithoutWind
       - ApelsinsaftWrenchTheGasCanisterDown
       - ApelsinsaftYourStayAboardTheStation
+      - DieterVanDerWestenAfricanDreamland
+      - DieterVanDerWestenBangkokTaxiDrive
+      - DieterVanDerWestenBerlinThroughTheNight
+      - DieterVanDerWestenHeadingForBamako
+      - DieterVanDerWestenMississippiFarewell
+      - DieterVanDerWestenParisGipsySwing
+      - DieterVanDerWestenSicilianSundown
+      - DieterVanDerWestenTheBalkanNightTrain
     queueSizeUpgradePart: Capacitor
     maxQueuedDefault: 3
     uiColorBG: "#602C00"

diff --git a/Resources/Prototypes/SimpleStation14/JukeboxTracks/danya_vodovoz.yml b/Resources/Prototypes/SimpleStation14/JukeboxTracks/danya_vodovoz.yml
diff --git a/Resources/Prototypes/SimpleStation14/JukeboxTracks/dieter_van_der_westen.yml b/Resources/Prototypes/SimpleStation14/JukeboxTracks/dieter_van_der_westen.yml
@@ -0,0 +1,55 @@
+- type: jukeboxTrack
+  id: DieterVanDerWestenAfricanDreamland
+  name: african dreamland
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/african_dreamland.ogg"
+  duration: 4:32
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/african_dreamland.png"
+
+- type: jukeboxTrack
+  id: DieterVanDerWestenBangkokTaxiDrive
+  name: bangkok taxi drive
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/bangkok_taxi_drive.ogg"
+  duration: 3:39
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/bangkok_taxi_drive.png"
+
+- type: jukeboxTrack
+  id: DieterVanDerWestenBerlinThroughTheNight
+  name: berlin through the night
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_through_the_night.ogg"
+  duration: 3:01
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_through_the_night.png"
+
+- type: jukeboxTrack
+  id: DieterVanDerWestenHeadingForBamako
+  name: heading for bamako
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/heading_for_bamako.ogg"
+  duration: 3:38
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/heading_for_bamako.png"
+
+- type: jukeboxTrack
+  id: DieterVanDerWestenMississippiFarewell
+  name: mississippi farewell
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/mississippi_farewell.ogg"
+  duration: 4:05
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/mississippi_farewell.png"
+
+- type: jukeboxTrack
+  id: DieterVanDerWestenParisGipsySwing
+  name: paris gipsy swing
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/paris_gipsy_swing.ogg"
+  duration: 3:27
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/paris_gipsy_swing.png"
+
+- type: jukeboxTrack
+  id: DieterVanDerWestenSicilianSundown
+  name: sicilian sundown
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/sicilian_sundown.ogg"
+  duration: 2:58
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/sicilian_sundown.png"
+
+- type: jukeboxTrack
+  id: DieterVanDerWestenTheBalkanNightTrain
+  name: the balkan night train
+  path: "/Audio/SimpleStation14/JukeboxTracks/DieterVanDerWesten/the_balkan_night_train.ogg"
+  duration: 2:52
+  artPath: "/Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/the_balkan_night_train.png"
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -1,14 +1,11 @@
 - type: soundCollection
   id: LobbyMusic
   files:
-    - /Audio/SimpleStation14/Lobby/01 The Gamble.ogg
-    - /Audio/SimpleStation14/Lobby/02 Guilty Pleasures.ogg
-    - /Audio/SimpleStation14/Lobby/03 Jazzcuzzi.ogg
-    - /Audio/SimpleStation14/Lobby/04 The Walk.ogg
-    - /Audio/SimpleStation14/Lobby/05 Velvet Bossa.ogg
-    - /Audio/SimpleStation14/Lobby/06 Colors.ogg
-    - /Audio/SimpleStation14/Lobby/07 Midnight Jam.ogg
-    - /Audio/SimpleStation14/Lobby/08 Miles Ahead.ogg
-    - /Audio/SimpleStation14/Lobby/09 Moody.ogg
-    - /Audio/SimpleStation14/Lobby/10 Flying Away.ogg
-    - /Audio/SimpleStation14/Lobby/11 Take It Easy.ogg
+    - /Audio/SimpleStation14/Lobby/african_dreamland_stereo.ogg
+    - /Audio/SimpleStation14/Lobby/bangkok_taxi_drive_stereo.ogg
+    - /Audio/SimpleStation14/Lobby/berlin_through_the_night_stereo.ogg
+    - /Audio/SimpleStation14/Lobby/heading_for_bamako_stereo.ogg
+    - /Audio/SimpleStation14/Lobby/mississippi_farewell_stereo.ogg
+    - /Audio/SimpleStation14/Lobby/paris_gipsy_swing_stereo.ogg
+    - /Audio/SimpleStation14/Lobby/sicilian_sundown_stereo.ogg
+    - /Audio/SimpleStation14/Lobby/the_balkan_night_train_stereo.ogg
diff --git a/...urces/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/a_night_in_brazil.png b/...urces/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/a_night_in_brazil.png
diff --git a/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/funk_o_matic.png b/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/funk_o_matic.png
diff --git a/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/goin'_on.png b/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/goin'_on.png
diff --git a/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/guacamole.png b/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/guacamole.png
diff --git a/...urces/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/jazz_funk_my_soul.png b/...urces/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/jazz_funk_my_soul.png
diff --git a/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/moth_to_a_flame.png b/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/moth_to_a_flame.png
diff --git a/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/off_the_grid.png b/Resources/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/off_the_grid.png
diff --git a/...s/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/planet_of_the_amazons.png b/...s/Textures/SimpleStation14/JukeboxTracks/DanyaVodovoz/planet_of_the_amazons.png
diff --git a/.../Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/africa_dreamland.png b/.../Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/africa_dreamland.png
diff --git a/...extures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/balkan_night_train.png b/...extures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/balkan_night_train.png
diff --git a/...extures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/bangkok_taxi_drive.png b/...extures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/bangkok_taxi_drive.png
diff --git a/...s/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_through_the_night.png b/...s/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_through_the_night.png
diff --git a/.../Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_to_bamako.png b/.../Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/berlin_to_bamako.png
diff --git a/...extures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/heading_for_bamako.png b/...extures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/heading_for_bamako.png
diff --git a/...tures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/mississippi_farewell.png b/...tures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/mississippi_farewell.png
diff --git a/...Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/paris_gipsy_swing.png b/...Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/paris_gipsy_swing.png
diff --git a/.../Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/sicilian_sundown.png b/.../Textures/SimpleStation14/JukeboxTracks/DieterVanDerWesten/sicilian_sundown.png