diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu
index 386337ffb..ab89c149e 100644
--- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu
+++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu
@@ -3667,7 +3667,7 @@
-
+
@@ -3705,7 +3705,7 @@
-
+
@@ -5895,24 +5895,54 @@
-
+
-
+
-
-
+
+
+
+ 2.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -200
+ 5
+
+
+ 1
+ 0
+ 37
+
+
+
+
+
+
-
+
-
+
@@ -5962,34 +5992,33 @@
-
+
-
- 2.8
+ -24.4
-
+
-
+
-
+
0
- -200
- 5
+ -0.36655
+ 21
1
- 0
- 37
+ -200
+ 53
@@ -6006,40 +6035,7 @@
-
-
-
-
- -24.4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -0.36655
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
+
@@ -6049,425 +6045,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1288.95283
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
+
-
-
- -4.4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -6.69195
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
0
- 0
+ 1000
5
-
- 71.81706
- 0.12559
- 0
-
100
- 0.23097
+ 1288.95283
37
@@ -6475,56 +6075,36 @@
-
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
-
+
0
- 0.641
- 5
-
-
- 1
- 0.23866
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0.174
- 5
+ -96
+ 21
1
0
- 37
+ 53
@@ -6533,110 +6113,19 @@
SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
- 3.6
+ -4.4
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -6.46329
- 21
-
-
- 1
- -11.55271
- 53
-
-
-
-
-
@@ -6648,145 +6137,279 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 1000
+ 5
+
+
+ 100
+ 1156.09239
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -96
+ 21
+
+
+ 1
+ 0
+ 53
+
+
+
+
+
+
SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
- -3.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -0.07208
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 1000
+ 5
+
+
+ 100
+ 1156.09239
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -96
+ 21
+
+
+ 1
+ 0
+ 53
+
+
+
+
+
+
+
SFX
- Flamethrower SOUND.wav
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 1000
+ 5
+
+
+ 100
+ 1156.09239
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -96
+ 21
+
+
+ 1
+ 0
+ 53
+
+
+
+
+
+
+
+ SFX
+
+
+
+
+
-
+
+
-
- 2.8
-
-
+
-
+
-
+
0
- -200
- 5
+ -6.69195
+ 21
1
- 0
- 37
+ -200
+ 53
@@ -6803,33 +6426,91 @@
-
+
-
-
- -24.4
-
+
-
+
-
+
-
+
-
+
0
- -0.21807
- 21
+ 0
+ 5
+
+
+ 71.81706
+ 0.12559
+ 0
+
+
+ 100
+ 0.23097
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0.641
+ 5
1
- -200
- 53
+ 0.23866
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0.174
+ 5
+
+
+ 1
+ 0
+ 37
@@ -6837,698 +6518,106 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1288.95283
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
- -4.4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -6.38715
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 71.81706
- 0.12559
- 0
-
-
- 100
- 0.23097
- 37
-
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3.6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -5.70471
- 21
-
-
- 1
- -22.60668
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -3.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -2.57085
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Flamethrower SOUND.wav
-
-
-
-
-
-
-
-
-
-
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
- 2.8
+ 3.6
-
+
-
+
-
+
0
- -200
- 5
+ -6.46329
+ 21
1
- 0
- 37
+ -11.55271
+ 53
@@ -7545,709 +6634,121 @@
-
+
-
-
- -24.4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0.36655
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1288.95283
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
- -4.4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1000
- 5
-
-
- 100
- 1156.09239
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -6.38715
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 71.81706
- 0.12559
- 0
-
-
- 100
- 0.23097
- 37
-
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3.6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -6.38715
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -3.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0.07208
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Flamethrower SOUND.wav
-
-
-
-
-
-
-
-
-
-
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ -3.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -0.07208
+ 21
+
+
+ 1
+ -200
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Flamethrower SOUND.wav
+
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
index c7b7750ea..71e571cb5 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
@@ -5,48 +5,55 @@
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
+
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
index c3c0e4738..0e9799fec 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
@@ -14,9 +14,11 @@
+
+
@@ -31,6 +33,9 @@
+
+
+
@@ -38,14 +43,18 @@
+
+
+
+
@@ -53,10 +62,12 @@
+
+
@@ -91,9 +102,11 @@
-
+
-
+
+
+
@@ -113,9 +126,9 @@
-
+
-
+
@@ -124,7 +137,7 @@
-
+
@@ -135,12 +148,12 @@
-
-
-
+
+
+
-
+
@@ -163,7 +176,7 @@
-
+
diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj
index 81c10524c..87589946d 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj
@@ -1,5 +1,5 @@
-
+
@@ -33,7 +33,37 @@
256
-
+
@@ -11927,7 +11957,7 @@
-
+
@@ -12837,7 +12867,7 @@
-
+
diff --git a/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu
index 10bb768a1..bbc60a019 100644
--- a/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu
@@ -167,6 +167,18 @@
+
+ 462899
+
+
+
+
+
+ 462899
+
+
+
+
462899
diff --git a/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu
index e07075f0c..8b84230e8 100644
--- a/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu
@@ -1,208 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/Aetheria-Economy_WwiseProject/Events/Menu_Music.wwu b/Aetheria-Economy_WwiseProject/Events/Menu_Music.wwu
deleted file mode 100644
index 76b58d5af..000000000
--- a/Aetheria-Economy_WwiseProject/Events/Menu_Music.wwu
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Events/Music.wwu b/Aetheria-Economy_WwiseProject/Events/Music.wwu
new file mode 100644
index 000000000..3418acd67
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/Events/Music.wwu
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Events/SFX.wwu b/Aetheria-Economy_WwiseProject/Events/SFX.wwu
index be1c170b6..034828f90 100644
--- a/Aetheria-Economy_WwiseProject/Events/SFX.wwu
+++ b/Aetheria-Economy_WwiseProject/Events/SFX.wwu
@@ -3,63 +3,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -172,7 +115,7 @@
-
+
@@ -433,7 +376,7 @@
-
+
@@ -483,6 +426,13 @@
+
+
+
+
+
+
+
@@ -490,16 +440,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -514,43 +454,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -603,16 +506,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -627,6 +520,13 @@
+
+
+
+
+
+
+
@@ -641,33 +541,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -720,70 +593,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -791,7 +603,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -799,36 +622,233 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -836,17 +856,6 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Events/UI.wwu b/Aetheria-Economy_WwiseProject/Events/UI.wwu
deleted file mode 100644
index 1ef79d3b6..000000000
--- a/Aetheria-Economy_WwiseProject/Events/UI.wwu
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Ambience SB Unit.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Ambience SB Unit.wwu
index 4a9fc7098..b52bb65c3 100644
--- a/Aetheria-Economy_WwiseProject/SoundBanks/Ambience SB Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/SoundBanks/Ambience SB Unit.wwu
@@ -6,6 +6,7 @@
+
diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu
index fdf242b59..82a803dc7 100644
--- a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu
@@ -1,87 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Music.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Music.wwu
new file mode 100644
index 000000000..8cdb8b89a
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/SoundBanks/Music.wwu
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/SFX.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/SFX.wwu
new file mode 100644
index 000000000..ddbd31c35
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/SoundBanks/SFX.wwu
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Weapons.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Weapons.wwu
deleted file mode 100644
index 8a4c2c71d..000000000
--- a/Aetheria-Economy_WwiseProject/SoundBanks/Weapons.wwu
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu
index 7c0258d53..5f11a406d 100644
--- a/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu
@@ -10,33 +10,17 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -201,7 +185,7 @@
- 0
+ 0.19
@@ -213,7 +197,7 @@
- 0
+ 100
@@ -233,7 +217,7 @@
- 0
+ 0.86
@@ -241,11 +225,11 @@
- 0
+ 0.71
- 0
+ 0.5
diff --git a/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu
index 7b1d1a644..60360b0fb 100644
--- a/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu
@@ -1,6 +1,10 @@
-
+
+
+
+
+
diff --git a/Assets/Scripts/WwiseMetadata.cs b/Assets/Scripts/WwiseMetadata.cs
index ba23d880f..fccb08c76 100644
--- a/Assets/Scripts/WwiseMetadata.cs
+++ b/Assets/Scripts/WwiseMetadata.cs
@@ -26,4 +26,5 @@ public class WwiseMetaObject
{
public int Id;
public string Name;
+ public string ObjectPath;
}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h
index 4807f61af..a9916b0e1 100644
--- a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h
+++ b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h
@@ -13,19 +13,41 @@ namespace AK
{
namespace EVENTS
{
+ static const AkUniqueID AMB_BASEDRONE = 1831661317U;
+ static const AkUniqueID AMB_LOW_ONESHOTS = 1514387320U;
+ static const AkUniqueID AMB_MID_AND_HIGH_ONESHOTS = 2618651523U;
+ static const AkUniqueID AMB_WEATHERLIKE_ONESHOTS = 2667303365U;
+ static const AkUniqueID BUY = 714721615U;
+ static const AkUniqueID CANNON_FIRE = 155513425U;
+ static const AkUniqueID CANNON_HIT = 1290210792U;
+ static const AkUniqueID CANNON_MISS = 3449722753U;
+ static const AkUniqueID CANNON_SHIP_DESTROYED = 582170835U;
static const AkUniqueID DOCK = 1944958176U;
static const AkUniqueID DOCK_FAIL = 2820966551U;
static const AkUniqueID DROP = 1878686274U;
+ static const AkUniqueID ELECTRIC_DRIVE_PLAY = 3691930898U;
+ static const AkUniqueID ELECTRIC_DRIVE_STOP = 1108521100U;
static const AkUniqueID EQUIP = 2412608643U;
+ static const AkUniqueID IONCANNON_CHARGE_START = 3397460648U;
+ static const AkUniqueID IONCANNON_CHARGE_STOP = 3179453300U;
+ static const AkUniqueID IONCANNON_FAIL = 216684405U;
+ static const AkUniqueID IONCANNON_FIRE = 299292453U;
+ static const AkUniqueID IONCANNON_HIT = 1028672300U;
+ static const AkUniqueID IONCANNON_MISS = 4133048765U;
+ static const AkUniqueID IONCANNON_SHIP_DESTROYED = 3465139343U;
static const AkUniqueID LIGHTNINGGUN_CHARGE_START = 1965329713U;
static const AkUniqueID LIGHTNINGGUN_CHARGE_STOP = 62119851U;
static const AkUniqueID LIGHTNINGGUN_FAIL = 1293013044U;
static const AkUniqueID LIGHTNINGGUN_FIRE = 1744728900U;
static const AkUniqueID LIGHTNINGGUN_HIT = 2258493327U;
+ static const AkUniqueID LIGHTNINGGUN_HIT_SHIP_DESTROYED = 386277016U;
static const AkUniqueID LIGHTNINGGUN_MISS = 2164260064U;
static const AkUniqueID MACHINEGUN_FIRE = 631099533U;
static const AkUniqueID MACHINEGUN_HIT = 4216521780U;
static const AkUniqueID MACHINEGUN_MISS = 475195381U;
+ static const AkUniqueID MACHINEGUN_SHIP_DESTROYED = 2124104919U;
+ static const AkUniqueID NUCLEAR_DRIVE_PLAY = 1323767629U;
+ static const AkUniqueID NUCLEAR_DRIVE_STOP = 2440961691U;
static const AkUniqueID PICKUP = 3978245845U;
static const AkUniqueID PLAY_GEN_COMBAT_1 = 3953921183U;
static const AkUniqueID PLAY_GEN_OW_01 = 3855478249U;
@@ -39,7 +61,14 @@ namespace AK
static const AkUniqueID RAILGUN_FAIL = 3475584168U;
static const AkUniqueID RAILGUN_FIRE = 3929859736U;
static const AkUniqueID RAILGUN_HIT = 528420227U;
+ static const AkUniqueID RAILGUN_HIT_SHIP_DESTROYED = 4052131076U;
static const AkUniqueID RAILGUN_MISS = 3546217468U;
+ static const AkUniqueID REACTOR_PLAY = 2609391158U;
+ static const AkUniqueID REACTOR_STOP = 3339928520U;
+ static const AkUniqueID SELL = 836804705U;
+ static const AkUniqueID SENSOR_PING = 2815033830U;
+ static const AkUniqueID SHIELD_DOWN = 1612530229U;
+ static const AkUniqueID SHIELD_UP_ACTIVE = 1310505943U;
static const AkUniqueID STOP_GEN_COMBAT_1 = 13315505U;
static const AkUniqueID STOP_GEN_OW_01 = 1938548259U;
static const AkUniqueID STOP_KAWAII_FUTURE_BASS = 3844053294U;
@@ -47,12 +76,8 @@ namespace AK
static const AkUniqueID STOP_METAL_BOSS_01 = 2121112483U;
static const AkUniqueID STOP_METAL_COMBAT_01 = 1055950810U;
static const AkUniqueID STOP_METAL_OW_01 = 3159624164U;
- static const AkUniqueID THRUSTER_LARGE = 2370087034U;
- static const AkUniqueID THRUSTER_LARGE_STOP = 1006509321U;
- static const AkUniqueID THRUSTER_MEDIUM = 2528260676U;
- static const AkUniqueID THRUSTER_MEDIUM_STOP = 2044992675U;
- static const AkUniqueID THRUSTER_SMALL = 1944968294U;
- static const AkUniqueID THRUSTER_SMALL_STOP = 1154341749U;
+ static const AkUniqueID THRUSTER_PLAY = 3178854387U;
+ static const AkUniqueID THRUSTER_STOP = 2308976345U;
static const AkUniqueID UI_FAIL = 3050276906U;
static const AkUniqueID UI_SUCCESS = 981465891U;
static const AkUniqueID UNDOCK = 2826728501U;
@@ -62,6 +87,19 @@ namespace AK
static const AkUniqueID WORMHOLE_TRAVEL_LOOP = 3842220822U;
} // namespace EVENTS
+ namespace SWITCHES
+ {
+ namespace SFX_DRIVE_TYPE
+ {
+ static const AkUniqueID GROUP = 2546207706U;
+
+ namespace SWITCH
+ {
+ } // namespace SWITCH
+ } // namespace SFX_DRIVE_TYPE
+
+ } // namespace SWITCHES
+
namespace GAME_PARAMETERS
{
static const AkUniqueID CHARGE_LEVEL = 1574608066U;
@@ -89,22 +127,35 @@ namespace AK
namespace BANKS
{
static const AkUniqueID INIT = 1355168291U;
+ static const AkUniqueID AETHERIC_DRIVE = 2492857755U;
+ static const AkUniqueID AMBIENCE = 85412153U;
static const AkUniqueID BOSS = 1560169506U;
+ static const AkUniqueID CANNON = 2393348022U;
static const AkUniqueID COMBAT = 2764240573U;
+ static const AkUniqueID GENERAL = 133642231U;
+ static const AkUniqueID IONCANNON = 3364802794U;
static const AkUniqueID LIGHTNINGGUN = 772093933U;
static const AkUniqueID MACHINEGUN = 3678545986U;
- static const AkUniqueID MUSIC = 3991942870U;
+ static const AkUniqueID MAIN_MENU = 2005704188U;
static const AkUniqueID OVERWORLD = 1562068129U;
static const AkUniqueID RAILGUN = 639519169U;
- static const AkUniqueID SHIP = 284967655U;
+ static const AkUniqueID REACTOR = 2204642885U;
+ static const AkUniqueID THRUSTER = 1758897770U;
static const AkUniqueID UI = 1551306167U;
} // namespace BANKS
namespace BUSSES
{
+ static const AkUniqueID AMBIENCE_BUS = 4202237879U;
+ static const AkUniqueID DEPTH_REVERB = 2717115764U;
static const AkUniqueID MASTER_AUDIO_BUS = 3803692087U;
} // namespace BUSSES
+ namespace AUX_BUSSES
+ {
+ static const AkUniqueID SPACE_REVERB = 1273427816U;
+ } // namespace AUX_BUSSES
+
namespace AUDIO_DEVICES
{
static const AkUniqueID NO_OUTPUT = 2317455096U;