From 6783e131255ff9ab2e1aa2e1c52950ed232d5878 Mon Sep 17 00:00:00 2001
From: DaforLynx <darwinsez@gmail.com>
Date: Wed, 25 Nov 2020 08:25:40 +0000
Subject: [PATCH] Added two new songs along with edits to the .ron

comma
---
 assets/voxygen/audio/soundtrack.ron           | 33 +++++++++++++++++++
 assets/voxygen/audio/soundtrack/oceania.ogg   |  4 +--
 .../audio/soundtrack/short_meandering.ogg     |  3 ++
 .../voxygen/audio/soundtrack/winter_falls.ogg |  3 ++
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 assets/voxygen/audio/soundtrack/short_meandering.ogg
 create mode 100644 assets/voxygen/audio/soundtrack/winter_falls.ogg

diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron
index e45161a316..7d7ac559b9 100644
--- a/assets/voxygen/audio/soundtrack.ron
+++ b/assets/voxygen/audio/soundtrack.ron
@@ -8,6 +8,27 @@
 
 (
     tracks: [
+		(
+			title: "Winter Falls",
+			path: "voxygen.audio.soundtrack.winter_falls",
+			length: 215.0,
+			timing: None,
+			biomes: [
+				(Mountain, 1),
+				(Snowland, 1),
+			],
+			site: Some(Void),
+			artist: "DaforLynx"
+		),
+		(
+			title: "Short Meandering",
+			path: "voxygen.audio.soundtrack.short_meandering",
+			length: 147.0,
+			timing: Some(Night),
+			biomes: [],
+			site: Some(Void),
+			artist: "Ap1evideogame"
+		),
         (
             title: "Oceania",
             path: "voxygen.audio.soundtrack.oceania",
@@ -45,6 +66,16 @@
             ],
             site: Some(Void),
             artist: "Aeronic",
+        ),
+		(
+			//Repeat for site
+            title: "Into The Dark Forest",
+            path: "voxygen.audio.soundtrack.into_the_dark_forest",
+            length: 184.0,
+            timing: Some(Night),
+            biomes: [],
+            site: Some(Cave),
+            artist: "Aeronic",
         ),
         (
             title: "Field Grazing",
@@ -53,6 +84,7 @@
             timing: Some(Day),
             biomes: [
                 (Grassland, 1),
+				(Forest, 1)
             ],
             site: Some(Void),
             artist: "Aeronic",
@@ -112,6 +144,7 @@
             timing: Some(Night),
             biomes: [
                 (Grassland, 1),
+				(Forest, 1),
             ],
             site: Some(Void),
             artist: "Aeronic",
diff --git a/assets/voxygen/audio/soundtrack/oceania.ogg b/assets/voxygen/audio/soundtrack/oceania.ogg
index 944155f4df..de1e135c76 100644
--- a/assets/voxygen/audio/soundtrack/oceania.ogg
+++ b/assets/voxygen/audio/soundtrack/oceania.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14d11b545dc71ecf168aa90f488a158020aa535141f08978b5e9e5049595b03e
-size 7520524
+oid sha256:2cad1ae1441be4e4f94919e39733acb4eb7767373d86e0a89439e83d0a29c1a7
+size 2141446
diff --git a/assets/voxygen/audio/soundtrack/short_meandering.ogg b/assets/voxygen/audio/soundtrack/short_meandering.ogg
new file mode 100644
index 0000000000..09bbc6f4bf
--- /dev/null
+++ b/assets/voxygen/audio/soundtrack/short_meandering.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:505279e8495c88a51efe3691243d69791fac12f51868bb8932a3ab603d31d1a8
+size 2596340
diff --git a/assets/voxygen/audio/soundtrack/winter_falls.ogg b/assets/voxygen/audio/soundtrack/winter_falls.ogg
new file mode 100644
index 0000000000..1e4f78bf8a
--- /dev/null
+++ b/assets/voxygen/audio/soundtrack/winter_falls.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5abe4f38cfa9b9f72e404fce11789107357eea8849838ac2e53da836e64b798
+size 3683399