diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj index 93982db..87de2e0 100644 --- a/Filtration/Filtration.csproj +++ b/Filtration/Filtration.csproj @@ -144,10 +144,6 @@ False libs\Xceed.Wpf.AvalonDock.Themes.VS2013.dll - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll - True - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll True @@ -457,87 +453,87 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/Filtration/Properties/Resources.resx b/Filtration/Properties/Resources.resx index a8efc84..3d15941 100644 --- a/Filtration/Properties/Resources.resx +++ b/Filtration/Properties/Resources.resx @@ -119,52 +119,52 @@ - ..\Resources\AlertSounds\AlertSound_01.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_01.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_02.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_02.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_03.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_03.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_04.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_04.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_05.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_05.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_06.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_06.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_07.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_07.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_08.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_08.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_09.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_09.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_10.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_10.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_11.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_11.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_12.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_12.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_13.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_13.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_14.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_14.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_15.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_15.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\AlertSound_16.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\AlertSound_16.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\Fontin-SmallCaps.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -173,33 +173,33 @@ ..\Resources\groundtile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\AlertSounds\SH22Alchemy.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Alchemy.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Blessed.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Blessed.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Chaos.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Chaos.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Divine.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Divine.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Exalted.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Exalted.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Fusing.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Fusing.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22General.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22General.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Mirror.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Mirror.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Regal.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Regal.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\AlertSounds\SH22Vaal.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\AlertSounds\SH22Vaal.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Filtration/Resources/AlertSounds/AlertSound_01.mp3 b/Filtration/Resources/AlertSounds/AlertSound_01.mp3 new file mode 100644 index 0000000..d7f6dd1 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_01.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_01.wav b/Filtration/Resources/AlertSounds/AlertSound_01.wav deleted file mode 100644 index 6374b92..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_01.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_02.mp3 b/Filtration/Resources/AlertSounds/AlertSound_02.mp3 new file mode 100644 index 0000000..e92d264 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_02.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_02.wav b/Filtration/Resources/AlertSounds/AlertSound_02.wav deleted file mode 100644 index 65f613d..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_02.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_03.mp3 b/Filtration/Resources/AlertSounds/AlertSound_03.mp3 new file mode 100644 index 0000000..d79a3e8 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_03.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_03.wav b/Filtration/Resources/AlertSounds/AlertSound_03.wav deleted file mode 100644 index 3cd5def..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_03.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_04.mp3 b/Filtration/Resources/AlertSounds/AlertSound_04.mp3 new file mode 100644 index 0000000..120aaa7 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_04.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_04.wav b/Filtration/Resources/AlertSounds/AlertSound_04.wav deleted file mode 100644 index ad7337f..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_04.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_05.mp3 b/Filtration/Resources/AlertSounds/AlertSound_05.mp3 new file mode 100644 index 0000000..25a01b0 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_05.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_05.wav b/Filtration/Resources/AlertSounds/AlertSound_05.wav deleted file mode 100644 index 9a08fb5..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_05.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_06.mp3 b/Filtration/Resources/AlertSounds/AlertSound_06.mp3 new file mode 100644 index 0000000..01b0c1e Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_06.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_06.wav b/Filtration/Resources/AlertSounds/AlertSound_06.wav deleted file mode 100644 index a1b2018..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_06.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_07.mp3 b/Filtration/Resources/AlertSounds/AlertSound_07.mp3 new file mode 100644 index 0000000..0cd0ed6 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_07.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_07.wav b/Filtration/Resources/AlertSounds/AlertSound_07.wav deleted file mode 100644 index 20b0b33..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_07.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_08.mp3 b/Filtration/Resources/AlertSounds/AlertSound_08.mp3 new file mode 100644 index 0000000..13df275 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_08.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_08.wav b/Filtration/Resources/AlertSounds/AlertSound_08.wav deleted file mode 100644 index f748b1a..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_08.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_09.mp3 b/Filtration/Resources/AlertSounds/AlertSound_09.mp3 new file mode 100644 index 0000000..720b89e Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_09.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_09.wav b/Filtration/Resources/AlertSounds/AlertSound_09.wav deleted file mode 100644 index cc3e23d..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_09.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_10.mp3 b/Filtration/Resources/AlertSounds/AlertSound_10.mp3 new file mode 100644 index 0000000..a363fad Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_10.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_10.wav b/Filtration/Resources/AlertSounds/AlertSound_10.wav deleted file mode 100644 index 3025548..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_10.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_11.mp3 b/Filtration/Resources/AlertSounds/AlertSound_11.mp3 new file mode 100644 index 0000000..08fb6b6 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_11.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_11.wav b/Filtration/Resources/AlertSounds/AlertSound_11.wav deleted file mode 100644 index 20b8f47..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_11.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_12.mp3 b/Filtration/Resources/AlertSounds/AlertSound_12.mp3 new file mode 100644 index 0000000..c8e471b Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_12.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_12.wav b/Filtration/Resources/AlertSounds/AlertSound_12.wav deleted file mode 100644 index cdf6752..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_12.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_13.mp3 b/Filtration/Resources/AlertSounds/AlertSound_13.mp3 new file mode 100644 index 0000000..05d5889 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_13.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_13.wav b/Filtration/Resources/AlertSounds/AlertSound_13.wav deleted file mode 100644 index 9ec34aa..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_13.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_14.mp3 b/Filtration/Resources/AlertSounds/AlertSound_14.mp3 new file mode 100644 index 0000000..184f1af Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_14.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_14.wav b/Filtration/Resources/AlertSounds/AlertSound_14.wav deleted file mode 100644 index 5fc0381..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_14.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_15.mp3 b/Filtration/Resources/AlertSounds/AlertSound_15.mp3 new file mode 100644 index 0000000..8148966 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_15.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_15.wav b/Filtration/Resources/AlertSounds/AlertSound_15.wav deleted file mode 100644 index e612283..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_15.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_16.mp3 b/Filtration/Resources/AlertSounds/AlertSound_16.mp3 new file mode 100644 index 0000000..c805d47 Binary files /dev/null and b/Filtration/Resources/AlertSounds/AlertSound_16.mp3 differ diff --git a/Filtration/Resources/AlertSounds/AlertSound_16.wav b/Filtration/Resources/AlertSounds/AlertSound_16.wav deleted file mode 100644 index 513dad1..0000000 Binary files a/Filtration/Resources/AlertSounds/AlertSound_16.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Alchemy.mp3 b/Filtration/Resources/AlertSounds/SH22Alchemy.mp3 new file mode 100644 index 0000000..d023873 Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Alchemy.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Alchemy.wav b/Filtration/Resources/AlertSounds/SH22Alchemy.wav deleted file mode 100644 index 17678ec..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Alchemy.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Blessed.mp3 b/Filtration/Resources/AlertSounds/SH22Blessed.mp3 new file mode 100644 index 0000000..fe913fd Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Blessed.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Blessed.wav b/Filtration/Resources/AlertSounds/SH22Blessed.wav deleted file mode 100644 index 9cfdcfc..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Blessed.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Chaos.mp3 b/Filtration/Resources/AlertSounds/SH22Chaos.mp3 new file mode 100644 index 0000000..356703f Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Chaos.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Chaos.wav b/Filtration/Resources/AlertSounds/SH22Chaos.wav deleted file mode 100644 index dd48006..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Chaos.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Divine.mp3 b/Filtration/Resources/AlertSounds/SH22Divine.mp3 new file mode 100644 index 0000000..10a7454 Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Divine.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Divine.wav b/Filtration/Resources/AlertSounds/SH22Divine.wav deleted file mode 100644 index b78ed0a..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Divine.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Exalted.mp3 b/Filtration/Resources/AlertSounds/SH22Exalted.mp3 new file mode 100644 index 0000000..b7c5796 Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Exalted.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Exalted.wav b/Filtration/Resources/AlertSounds/SH22Exalted.wav deleted file mode 100644 index d747dfc..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Exalted.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Fusing.mp3 b/Filtration/Resources/AlertSounds/SH22Fusing.mp3 new file mode 100644 index 0000000..20e4dd3 Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Fusing.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Fusing.wav b/Filtration/Resources/AlertSounds/SH22Fusing.wav deleted file mode 100644 index cced879..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Fusing.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22General.mp3 b/Filtration/Resources/AlertSounds/SH22General.mp3 new file mode 100644 index 0000000..b4103f4 Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22General.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22General.wav b/Filtration/Resources/AlertSounds/SH22General.wav deleted file mode 100644 index da4782f..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22General.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Mirror.mp3 b/Filtration/Resources/AlertSounds/SH22Mirror.mp3 new file mode 100644 index 0000000..43ef8da Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Mirror.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Mirror.wav b/Filtration/Resources/AlertSounds/SH22Mirror.wav deleted file mode 100644 index 2117a82..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Mirror.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Regal.mp3 b/Filtration/Resources/AlertSounds/SH22Regal.mp3 new file mode 100644 index 0000000..e5ddf50 Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Regal.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Regal.wav b/Filtration/Resources/AlertSounds/SH22Regal.wav deleted file mode 100644 index e1b275d..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Regal.wav and /dev/null differ diff --git a/Filtration/Resources/AlertSounds/SH22Vaal.mp3 b/Filtration/Resources/AlertSounds/SH22Vaal.mp3 new file mode 100644 index 0000000..a501903 Binary files /dev/null and b/Filtration/Resources/AlertSounds/SH22Vaal.mp3 differ diff --git a/Filtration/Resources/AlertSounds/SH22Vaal.wav b/Filtration/Resources/AlertSounds/SH22Vaal.wav deleted file mode 100644 index 9aa00b1..0000000 Binary files a/Filtration/Resources/AlertSounds/SH22Vaal.wav and /dev/null differ diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs index 59bdf3f..8d87c52 100644 --- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs @@ -366,11 +366,11 @@ namespace Filtration.ViewModels { if (x <= 9) { - return "AlertSound_0" + x + ".wav"; + return "AlertSound_0" + x + ".mp3"; } else { - return "AlertSound_" + x + ".wav"; + return "AlertSound_" + x + ".mp3"; } } @@ -382,34 +382,34 @@ namespace Filtration.ViewModels string filePart; switch (identifier) { case "ShGeneral": - filePart = "SH22General.wav"; + filePart = "SH22General.mp3"; break; case "ShBlessed": - filePart = "SH22Blessed.wav"; + filePart = "SH22Blessed.mp3"; break; case "ShChaos": - filePart = "SH22Chaos.wav"; + filePart = "SH22Chaos.mp3"; break; case "ShDivine": - filePart = "SH22Divine.wav"; + filePart = "SH22Divine.mp3"; break; case "ShExalted": - filePart = "SH22Exalted.wav"; + filePart = "SH22Exalted.mp3"; break; case "ShMirror": - filePart = "SH22Mirror.wav"; + filePart = "SH22Mirror.mp3"; break; case "ShAlchemy": - filePart = "SH22Alchemy.wav"; + filePart = "SH22Alchemy.mp3"; break; case "ShFusing": - filePart = "SH22Fusing.wav"; + filePart = "SH22Fusing.mp3"; break; case "ShRegal": - filePart = "SH22Regal.wav"; + filePart = "SH22Regal.mp3"; break; case "ShVaal": - filePart = "SH22Vaal.wav"; + filePart = "SH22Vaal.mp3"; break; default: filePart = ComputeFilePartFromNumber(identifier);