diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
index bbdcfd7e2..fe63891b8 100644
--- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
@@ -1,216 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- blip1.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- blip2.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- equip.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- mouseover.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- pickup.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- putdown.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- unequip.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Aetheria_docking_spaceship_V2.1.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Aetheria_undocking_spaceship_V2.1.wav
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Spaceship_Aetheric_drivers.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu
similarity index 69%
rename from Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Spaceship_Aetheric_drivers.wwu
rename to Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu
index d8c3ba70e..386337ffb 100644
--- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Spaceship_Aetheric_drivers.wwu
+++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu
@@ -1,1603 +1,9 @@
-
+
-
+
-
-
-
-
-
-
-
- 7
-
-
-
-
- 8.5
-
-
-
-
- True
-
-
-
-
- -1.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -200
- 5
-
-
- 1
- 0
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -8.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 5558.379
- 5
- Exp1
-
-
- 1
- 12034.8799
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 100
- 84
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 43.52732
- 523.61146
- 0
-
-
- 100
- 336
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SoundSeed Grain
- rotor_2.wav
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
- 2.6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 100
- -209
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr02.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr01.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr03.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr04.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr05.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr06.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr07.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr08.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr09.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_thrst_electr10.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.3
-
-
-
-
-
-
-
-
-
-
- -2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 20000
- 5
- Log2
-
-
- 1
- 2748.07916
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 1
- 43.09133
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 1
- 36.70878
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
- Exp1
-
-
- 100
- 169.606
- 37
-
-
-
-
-
-
-
-
-
- SoundSeed Grain
- sfx_spcp_drives_nuclr01.wav
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -0.117
- 5
- Exp1
-
-
- 1
- 0.114
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 100
- 176.47059
- 37
-
-
-
-
-
-
-
-
-
- SoundSeed Grain
- sfx_spcp_drives_dc_scifi_electric.wav
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -8.2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_dc_start.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt01.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt02.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt03.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt04.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt05.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt06.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt07.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_shrt08.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -16.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Aetheria_spaceship_Drivers_nuclear_start.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -7.6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_long01.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_long02.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_long03.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_long04.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_long05.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_long06.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- sfx_spcp_drives_nuc_steam_long07.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1699,7 +105,7 @@
-
+
@@ -1737,7 +143,7 @@
-
+
@@ -2215,9 +621,9 @@
-
+
-
+
@@ -2246,7 +652,7 @@
-
+
@@ -2320,7 +726,7 @@
-
+
@@ -2391,7 +797,7 @@
-
+
@@ -2598,7 +1004,7 @@
-
+
@@ -2726,7 +1132,7 @@
-
+
@@ -3032,7 +1438,7 @@
-
+
@@ -3351,7 +1757,7 @@
-
+
@@ -3508,7 +1914,7 @@
-
+
@@ -3541,7 +1947,7 @@
-
+
@@ -3570,7 +1976,7 @@
-
+
@@ -3633,7 +2039,7 @@
-
+
@@ -3675,7 +2081,7 @@
-
+
@@ -3763,7 +2169,7 @@
-
+
@@ -3828,7 +2234,7 @@
-
+
@@ -5136,7 +3542,7 @@
-
+
@@ -5204,7 +3610,7 @@
-
+
@@ -5299,7 +3705,1601 @@
-
+
+
+
+
+
+
+
+ 7
+
+
+
+
+ 8.5
+
+
+
+
+ True
+
+
+
+
+ -1.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -200
+ 5
+
+
+ 1
+ 0
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -8.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 5558.379
+ 5
+ Exp1
+
+
+ 1
+ 12034.8799
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+
+
+ 100
+ 84
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -96
+ 21
+
+
+ 1
+ 0
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+
+
+ 43.52732
+ 523.61146
+ 0
+
+
+ 100
+ 336
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SoundSeed Grain
+ rotor_2.wav
+
+
+
+
+
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+
+
+ 100
+ -209
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr02.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr01.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr03.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr04.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr05.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr06.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr07.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr08.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr09.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_thrst_electr10.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.3
+
+
+
+
+
+
+
+
+
+
+ -2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 20000
+ 5
+ Log2
+
+
+ 1
+ 2748.07916
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+
+
+ 1
+ 43.09133
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+
+
+ 1
+ 36.70878
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -96
+ 21
+
+
+ 1
+ 0
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+ Exp1
+
+
+ 100
+ 169.606
+ 37
+
+
+
+
+
+
+
+
+
+ SoundSeed Grain
+ sfx_spcp_drives_nuclr01.wav
+
+
+
+
+
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -96
+ 21
+
+
+ 1
+ 0
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -0.117
+ 5
+ Exp1
+
+
+ 1
+ 0.114
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+
+
+ 100
+ 176.47059
+ 37
+
+
+
+
+
+
+
+
+
+ SoundSeed Grain
+ sfx_spcp_drives_dc_scifi_electric.wav
+
+
+
+
+
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -8.2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_dc_start.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -7
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt01.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt02.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt03.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt04.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt05.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt06.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt07.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_shrt08.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -16.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Aetheria_spaceship_Drivers_nuclear_start.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -7.6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_long01.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_long02.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_long03.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_long04.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_long05.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_long06.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ sfx_spcp_drives_nuc_steam_long07.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5315,7 +5315,7 @@
-
+
@@ -5339,7 +5339,7 @@
-
+
@@ -5355,11 +5355,6 @@
1
-5
- 0
-
-
- 10
- -2.80358
37
@@ -5377,14 +5372,14 @@
-
+
-
+
@@ -5415,7 +5410,7 @@
-
+
@@ -5473,7 +5468,7 @@
-
+
@@ -5501,7 +5496,7 @@
-
+
@@ -5574,7 +5569,7 @@
-
+
@@ -5630,55 +5625,7 @@
-
-
-
-
-
-
-
- -3.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX__ship_sensor_ping.wav
-
-
-
-
-
- SFX
- SFX__ship_sensor_ping3.wav
-
-
-
-
-
-
-
-
-
-
-
+
@@ -5900,6 +5847,2499 @@
+
+
+
+
+
+
+
+ -3.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ SFX__ship_sensor_ping.wav
+
+
+
+
+
+ SFX
+ SFX__ship_sensor_ping3.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+ Log3
+
+
+ 2000
+ -200
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -200
+ 5
+
+
+ 1
+ 0
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -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.69195
+ 21
+
+
+ 1
+ -200
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+
+
+ 71.81706
+ 0.12559
+ 0
+
+
+ 100
+ 0.23097
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0.641
+ 5
+
+
+ 1
+ 0.23866
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0.174
+ 5
+
+
+ 1
+ 0
+ 37
+
+
+
+
+
+
+
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3.6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -6.46329
+ 21
+
+
+ 1
+ -11.55271
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -3.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -0.07208
+ 21
+
+
+ 1
+ -200
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Flamethrower SOUND.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -200
+ 5
+
+
+ 1
+ 0
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -24.4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -0.21807
+ 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
+ -5.70471
+ 21
+
+
+ 1
+ -22.60668
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -3.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -2.57085
+ 21
+
+
+ 1
+ -200
+ 53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Flamethrower SOUND.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ -200
+ 5
+
+
+ 1
+ 0
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -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
+ Aetheria_Wormhole_travel_jumpin.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Aetheria_Wormhole_travel_jumpout.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 7.9
+
+
+
+ SFX
+ Aetheria_Wormhole_travel.wav
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX_Defirm_Unit.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX_Defirm_Unit.wwu
deleted file mode 100644
index 91846a805..000000000
--- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX_Defirm_Unit.wwu
+++ /dev/null
@@ -1,3201 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
- Log3
-
-
- 2000
- -200
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -200
- 5
-
-
- 1
- 0
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -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.69195
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 71.81706
- 0.12559
- 0
-
-
- 100
- 0.23097
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0.641
- 5
-
-
- 1
- 0.23866
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0.174
- 5
-
-
- 1
- 0
- 37
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3.6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -6.46329
- 21
-
-
- 1
- -11.55271
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -3.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -0.07208
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Flamethrower SOUND.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -200
- 5
-
-
- 1
- 0
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -24.4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -0.21807
- 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
- -5.70471
- 21
-
-
- 1
- -22.60668
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -3.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -2.57085
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Flamethrower SOUND.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -200
- 5
-
-
- 1
- 0
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -12.14909
- 5
-
-
- 1
- -5
- 0
-
-
- 10
- -2.80358
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 5.93877
- 21
-
-
- 1
- -200
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 1
- 100
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 115.44484
- 5
-
-
- 1
- 20
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 93.44537
- 5
-
-
- 0.19461
- 86.25361
- 0
-
-
- 0.35774
- 44.70588
- 0
-
-
- 0.67468
- 44.65156
- 0
-
-
- 0.69242
- 3.37148
- 0
-
-
- 1
- 4.20168
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 129.076
- 5
-
-
- 1
- 0
- 37
-
-
-
-
-
-
-
-
-
- SoundSeed Grain
- SFX_Spcshp_reactor_extended_V2.0.wav
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -15
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -4.88957
- 5
-
-
- 0.49826
- -200
- 0
-
-
- 1
- -200
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Aetheia_Overheat_Alarm.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX__railgun_fire.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 0.10095
- -32.41752
- 0
-
-
- 1
- -55.73771
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 5
-
-
- 1
- 79.6253
- 37
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- -96
- 21
-
-
- 1
- 0
- 53
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SoundSeed Grain
- SFX__railgun_charging.wav
-
-
-
-
-
- SFX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX__railgun_charginf_failure.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX__railgun_charginf_failure.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX_railgun_hit2.wav
-
-
-
-
-
- SFX
- SFX_railgun_hit3.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -2.3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX__ship_sensor_ping.wav
-
-
-
-
-
- SFX
- SFX__ship_sensor_ping3.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Aetheria_Wormhole_travel_jumpin.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Aetheria_Wormhole_travel_jumpout.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 7.9
-
-
-
- SFX
- Aetheria_Wormhole_travel.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX__inventory_menu_trade_item_buy.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- SFX__inventory_menu_trade_item_sell.wav
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX_defirm_aeth_drive.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX_defirm_aeth_drive.wwu
deleted file mode 100644
index 2b8039cc9..000000000
--- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX_defirm_aeth_drive.wwu
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/UI.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/UI.wwu
new file mode 100644
index 000000000..e10416a96
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/UI.wwu
@@ -0,0 +1,262 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ blip2.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ mouseover.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ putdown.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ unequip.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Aetheria_docking_spaceship_V2.1.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ blip1.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ equip.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ pickup.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Aetheria_undocking_spaceship_V2.1.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ SFX__inventory_menu_trade_item_sell.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ SFX__inventory_menu_trade_item_buy.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
index ea94e0a30..c7b7750ea 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
@@ -1,45 +1,52 @@
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
+
+
diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
index 34081257b..c3c0e4738 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
@@ -4,25 +4,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -51,9 +91,9 @@
-
+
-
+
@@ -64,13 +104,23 @@
+
+
+
+
+
+
-
-
+
+
+
-
+
+
+
+
@@ -84,33 +134,36 @@
+
-
-
+
+
-
-
-
+
+
+
+
-
+
+
+
-
-
+
+
-
-
-
+
+
-
-
+
+
@@ -142,6 +195,7 @@
+
diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj
index c9cb4168a..81c10524c 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj
@@ -22,15 +22,22 @@
- GeneratedSoundBanks\Mac\
- GeneratedSoundBanks\Windows\
+ GeneratedSoundBanks\Mac
+ GeneratedSoundBanks\Windows
+
+
+
+
+
+ 256
+ 256
-
+
GeneratedSoundBanks\Mac\
@@ -61,8 +68,18 @@
+
+
+ -80
+ -80
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu
index 7b8c46090..10bb768a1 100644
--- a/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu
@@ -55,7 +55,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
@@ -167,6 +167,12 @@
+
+ 462899
+
+
+
+
462899
diff --git a/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu
index daf96948f..e07075f0c 100644
--- a/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu
@@ -3,127 +3,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Events/SFX.wwu b/Aetheria-Economy_WwiseProject/Events/SFX.wwu
new file mode 100644
index 000000000..be1c170b6
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/Events/SFX.wwu
@@ -0,0 +1,853 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Events/SFX_Defirm_unit.wwu b/Aetheria-Economy_WwiseProject/Events/SFX_Defirm_unit.wwu
deleted file mode 100644
index 0eceaa4a4..000000000
--- a/Aetheria-Economy_WwiseProject/Events/SFX_Defirm_unit.wwu
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Events/SFX_defirm_aeth_drive_model.wwu b/Aetheria-Economy_WwiseProject/Events/SFX_defirm_aeth_drive_model.wwu
deleted file mode 100644
index 95a6cfbcb..000000000
--- a/Aetheria-Economy_WwiseProject/Events/SFX_defirm_aeth_drive_model.wwu
+++ /dev/null
@@ -1,631 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu b/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu
deleted file mode 100644
index d2ec12e7d..000000000
--- a/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Events/UI.wwu b/Aetheria-Economy_WwiseProject/Events/UI.wwu
new file mode 100644
index 000000000..1ef79d3b6
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/Events/UI.wwu
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Game Parameters/SFX.wwu b/Aetheria-Economy_WwiseProject/Game Parameters/SFX.wwu
new file mode 100644
index 000000000..23230789b
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/Game Parameters/SFX.wwu
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu b/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu
deleted file mode 100644
index c6f7216bf..000000000
--- a/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Game Parameters/ship_technology_parameters.wwu b/Aetheria-Economy_WwiseProject/Game Parameters/ship_technology_parameters.wwu
deleted file mode 100644
index 2f1a0dc24..000000000
--- a/Aetheria-Economy_WwiseProject/Game Parameters/ship_technology_parameters.wwu
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Game Parameters/weapon_events.wwu b/Aetheria-Economy_WwiseProject/Game Parameters/weapon_events.wwu
deleted file mode 100644
index d41e69a4b..000000000
--- a/Aetheria-Economy_WwiseProject/Game Parameters/weapon_events.wwu
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aetheria-Economy_WwiseProject/Modulators/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Modulators/Default Work Unit.wwu
index c1375d2ca..eaf0174a4 100644
--- a/Aetheria-Economy_WwiseProject/Modulators/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Modulators/Default Work Unit.wwu
@@ -10,7 +10,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
@@ -63,14 +63,14 @@
-
+
-
+
@@ -98,7 +98,7 @@
-
+
diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu
index 21d6a19d9..fdf242b59 100644
--- a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu
@@ -5,33 +5,30 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Weapons.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Weapons.wwu
new file mode 100644
index 000000000..8a4c2c71d
--- /dev/null
+++ b/Aetheria-Economy_WwiseProject/SoundBanks/Weapons.wwu
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu
index 708cf1243..7c0258d53 100644
--- a/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu
@@ -6,85 +6,49 @@
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
@@ -100,29 +64,13 @@
0
-
+
1
0
-
-
- 0.74
-
-
-
- 0.99
-
-
-
- 0
-
-
-
- 0.99
-
0
@@ -150,7 +98,7 @@
-
+
@@ -162,11 +110,11 @@
-
+
-
+
@@ -174,15 +122,15 @@
-
+
-
+
-
+
@@ -190,15 +138,15 @@
-
+
-
+
-
+
@@ -206,31 +154,39 @@
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+ 1
+
+
+
+ 1
+
0
+
+
+ 1
+
0
@@ -240,7 +196,7 @@
0
-
+
0
@@ -248,7 +204,11 @@
0
-
+
+ 1
+
+
+
1
@@ -256,37 +216,21 @@
0
-
- 0
-
-
-
- 0.78
-
-
-
+
1
+
+
+ 0
+
0.01
-
+
0
-
-
- 10
-
-
-
- 0
-
-
-
- 1
-
0
diff --git a/Aetheria-Economy_WwiseProject/Switches/def_test.wwu b/Aetheria-Economy_WwiseProject/Switches/def_test.wwu
deleted file mode 100644
index 63feb615d..000000000
--- a/Aetheria-Economy_WwiseProject/Switches/def_test.wwu
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity
index 94bf44fb5..4417d6c40 100644
--- a/Assets/Scenes/ARPG.unity
+++ b/Assets/Scenes/ARPG.unity
@@ -1778,8 +1778,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 134113271}
- - component: {fileID: 134113273}
- - component: {fileID: 134113272}
m_Layer: 0
m_Name: Weapon Effects
m_TagString: Untagged
@@ -1801,61 +1799,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &134113272
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 134113270}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: e6a98c45007fbec48b47b122c40889c3, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- triggerList:
- useOtherObject: 0
- actionOnEventType: 0
- curveInterpolation: 4
- enableActionOnEvent: 0
- data:
- idInternal: 0
- valueGuidInternal:
- WwiseObjectReference: {fileID: 0}
- useCallbacks: 0
- Callbacks: []
- playingId: 0
- soundEmitterObject: {fileID: 0}
- transitionDuration: 0
- eventIdInternal: 0
- valueGuidInternal:
- m_callbackDataInternal: {fileID: 0}
- MultiPositionType: 1
- multiPositionTypeLabel: 0
- LargeModePositions: []
- multiPositionArray: []
---- !u!114 &134113273
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 134113270}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f27db6b94e477054e96392f94dc50c9d, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_listeners:
- initialListenerList: []
- useDefaultListeners: 1
- isEnvironmentAware: 0
- isStaticObject: 0
- m_positionOffsetData:
- KeepMe: 0
- positionOffset: {x: 0, y: 0, z: 0}
- m_posOffsetData: {fileID: 0}
- listenerMask: 1
--- !u!1 &146394774
GameObject:
m_ObjectHideFlags: 0
@@ -23550,12 +23493,12 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
@@ -23575,7 +23518,7 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
@@ -24762,12 +24705,12 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
@@ -24787,7 +24730,7 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
diff --git a/Assets/Scripts/WwiseMetadata.cs b/Assets/Scripts/WwiseMetadata.cs
new file mode 100644
index 000000000..ba23d880f
--- /dev/null
+++ b/Assets/Scripts/WwiseMetadata.cs
@@ -0,0 +1,29 @@
+using Newtonsoft.Json;
+
+[JsonObject]
+public class WwiseMetadataFile
+{
+ public WwiseMetaSoundBanksInfo SoundBanksInfo;
+}
+
+[JsonObject]
+public class WwiseMetaSoundBanksInfo
+{
+ public WwiseMetaSoundBank[] SoundBanks;
+}
+
+[JsonObject]
+public class WwiseMetaSoundBank
+{
+ public int Id;
+ public string ShortName;
+ public WwiseMetaObject[] IncludedEvents;
+ public WwiseMetaObject[] GameParameters;
+}
+
+[JsonObject]
+public class WwiseMetaObject
+{
+ public int Id;
+ public string Name;
+}
\ No newline at end of file
diff --git a/Assets/Scripts/WwiseMetadata.cs.meta b/Assets/Scripts/WwiseMetadata.cs.meta
new file mode 100644
index 000000000..d9deda43b
--- /dev/null
+++ b/Assets/Scripts/WwiseMetadata.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0a12363ee8ef43b399bf91ca099947a9
+timeCreated: 1619664281
\ 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 0ceae0f33..4807f61af 100644
--- a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h
+++ b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h
@@ -17,6 +17,15 @@ namespace AK
static const AkUniqueID DOCK_FAIL = 2820966551U;
static const AkUniqueID DROP = 1878686274U;
static const AkUniqueID EQUIP = 2412608643U;
+ 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_MISS = 2164260064U;
+ static const AkUniqueID MACHINEGUN_FIRE = 631099533U;
+ static const AkUniqueID MACHINEGUN_HIT = 4216521780U;
+ static const AkUniqueID MACHINEGUN_MISS = 475195381U;
static const AkUniqueID PICKUP = 3978245845U;
static const AkUniqueID PLAY_GEN_COMBAT_1 = 3953921183U;
static const AkUniqueID PLAY_GEN_OW_01 = 3855478249U;
@@ -25,10 +34,12 @@ namespace AK
static const AkUniqueID PLAY_METAL_BOSS_01 = 826124593U;
static const AkUniqueID PLAY_METAL_COMBAT_01 = 2406196U;
static const AkUniqueID PLAY_METAL_OW_01 = 1885982954U;
- static const AkUniqueID RAILGUN_CHARGING = 4073466121U;
- static const AkUniqueID REACTOR_TYPE01 = 108700025U;
- static const AkUniqueID REACTOR_TYPE01_STOP = 1226299660U;
- static const AkUniqueID SENSOR_PING = 2815033830U;
+ static const AkUniqueID RAILGUN_CHARGE_START = 3058694461U;
+ static const AkUniqueID RAILGUN_CHARGE_STOP = 2686405055U;
+ static const AkUniqueID RAILGUN_FAIL = 3475584168U;
+ static const AkUniqueID RAILGUN_FIRE = 3929859736U;
+ static const AkUniqueID RAILGUN_HIT = 528420227U;
+ static const AkUniqueID RAILGUN_MISS = 3546217468U;
static const AkUniqueID STOP_GEN_COMBAT_1 = 13315505U;
static const AkUniqueID STOP_GEN_OW_01 = 1938548259U;
static const AkUniqueID STOP_KAWAII_FUTURE_BASS = 3844053294U;
@@ -54,24 +65,25 @@ namespace AK
namespace GAME_PARAMETERS
{
static const AkUniqueID CHARGE_LEVEL = 1574608066U;
- static const AkUniqueID PERFORMANCE_DURABILITY = 965148665U;
- static const AkUniqueID PERFORMANCE_QUALITY = 875134311U;
- static const AkUniqueID PERFORMANCE_THERMAL = 3835443961U;
- static const AkUniqueID REACTOR_LOAD = 3735272724U;
- static const AkUniqueID SFX_REACTOR_DISTORTION2_DRYWET = 1552130417U;
+ static const AkUniqueID SFX_REACTOR_ALARM = 2441699439U;
+ static const AkUniqueID SFX_REACTOR_DISTORTION1 = 364563454U;
+ static const AkUniqueID SFX_REACTOR_DISTORTION2 = 364563453U;
static const AkUniqueID SFX_REACTOR_GRAIN_SPEED = 1663874485U;
static const AkUniqueID SFX_REACTOR_PITCH = 12206642U;
+ static const AkUniqueID SFX_SHARED_INTENSITY = 211338040U;
+ static const AkUniqueID SFX_SHARED_LFO_FREQUENCY = 3222479589U;
+ static const AkUniqueID SFX_SHARED_LFO_INTENSITY = 561757932U;
static const AkUniqueID SFX_SHIP_DRIVE_ELECTRIC_FUZZBOX_FILTER = 2008207144U;
static const AkUniqueID SFX_SHIP_DRIVE_NUCLEAR_FILTERDURATION = 255764574U;
static const AkUniqueID SFX_SHIP_DRIVE_NUCLEAR_GRAIN_SPEED_MOD = 675480480U;
static const AkUniqueID SFX_SHIP_ELECTRIC_SPEED = 2808571831U;
static const AkUniqueID SFX_SHIP_ROTOR_PLATES_GRAIN_FILTER = 1345552351U;
- static const AkUniqueID SFX_SHIP_WEAPON_LIGHT_DISHI_PITCH = 1246165564U;
- static const AkUniqueID SFX_SHIP_WEAPON_LIGHTING_GRAIN_FILTER = 4216139142U;
- static const AkUniqueID SFX_SHIP_WEAPON_LIGHTING_PITCH = 1027880318U;
+ static const AkUniqueID SFX_THRUSTER_GUSTINESS = 3456618280U;
+ static const AkUniqueID SFX_THRUSTER_VARIABILITY = 706470053U;
+ static const AkUniqueID SFX_WEAPON_LIGHTNING_GRAIN_FILTER = 3528347615U;
+ static const AkUniqueID SFX_WEAPON_LIGHTNING_PITCH = 1365951697U;
static const AkUniqueID SHIP_VELOCITY = 3579545711U;
static const AkUniqueID TARGET_LOCKING = 3288537160U;
- static const AkUniqueID THRUSTER_THROTTLE = 4116566921U;
} // namespace GAME_PARAMETERS
namespace BANKS
@@ -79,8 +91,11 @@ namespace AK
static const AkUniqueID INIT = 1355168291U;
static const AkUniqueID BOSS = 1560169506U;
static const AkUniqueID COMBAT = 2764240573U;
+ static const AkUniqueID LIGHTNINGGUN = 772093933U;
+ static const AkUniqueID MACHINEGUN = 3678545986U;
static const AkUniqueID MUSIC = 3991942870U;
static const AkUniqueID OVERWORLD = 1562068129U;
+ static const AkUniqueID RAILGUN = 639519169U;
static const AkUniqueID SHIP = 284967655U;
static const AkUniqueID UI = 1551306167U;
} // namespace BANKS
diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
index c864fbeb1..81e40d67e 100644
--- a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
+++ b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2fb05de6a0f372d490cc82216ef444ca6f2d7cdba759d5cd52e59c4a2267b594
-size 15006
+oid sha256:bdae72f5501fc0b5e4e66478c97e698db0f4dba2452b40443f00c061dd661a12
+size 39446
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 29995cccf..bc307be86 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ddf9f0c22847dc8893a39a7d9afc9b90b2fa13176fb5c4da0a1d8f16a85ee649
+oid sha256:caf20eb516bc53f1774f3a147124ab3b7e9869c889cf6083eba3f4507444845a
size 1699