diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.png b/MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.png index bf4293f2..6d402a51 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.png and b/MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.webp b/MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.webp new file mode 100644 index 00000000..f4764c5f Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.png b/MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.png index 842e8ea5..f8d65500 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.png and b/MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.webp b/MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.webp new file mode 100644 index 00000000..13840efd Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.png b/MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.png index 8b9fb4f1..a3c9f6c8 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.png and b/MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.webp b/MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.webp new file mode 100644 index 00000000..87bbe3d3 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.png b/MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.png index c0e9a9e4..3a295066 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.png and b/MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.webp b/MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.webp new file mode 100644 index 00000000..87e67912 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.png b/MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.png index d6943ebe..2c6ca688 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.png and b/MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.webp b/MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.webp new file mode 100644 index 00000000..082ef167 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/rathalos.png b/MHFZ_Overlay/Assets/Icons/png/monster/rathalos.png index e3b1bb02..baa4cf39 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/rathalos.png and b/MHFZ_Overlay/Assets/Icons/png/monster/rathalos.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/rathalos.webp b/MHFZ_Overlay/Assets/Icons/png/monster/rathalos.webp new file mode 100644 index 00000000..9fc2a520 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/rathalos.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/rathian.png b/MHFZ_Overlay/Assets/Icons/png/monster/rathian.png index 3abb2cf6..1922e43e 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/rathian.png and b/MHFZ_Overlay/Assets/Icons/png/monster/rathian.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/rathian.webp b/MHFZ_Overlay/Assets/Icons/png/monster/rathian.webp new file mode 100644 index 00000000..644c56e9 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/rathian.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shantien.png b/MHFZ_Overlay/Assets/Icons/png/monster/shantien.png index 70504cfd..57e9b072 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/shantien.png and b/MHFZ_Overlay/Assets/Icons/png/monster/shantien.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shantien.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shantien.webp new file mode 100644 index 00000000..afcfbc55 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shantien.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.png index bc8650a7..9f68a205 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.png and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.webp new file mode 100644 index 00000000..19c055f5 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.gif b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.gif new file mode 100644 index 00000000..482eb985 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.gif differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.png index 2ab2da42..7c919ef3 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.png and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.webp new file mode 100644 index 00000000..e4c140ef Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase2.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase2.png new file mode 100644 index 00000000..0594fd6f Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase2.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase2.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase2.webp new file mode 100644 index 00000000..d33df936 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase2.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase3.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase3.png new file mode 100644 index 00000000..730abe64 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase3.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase3.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase3.webp new file mode 100644 index 00000000..17c23a06 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase3.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase4.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase4.png new file mode 100644 index 00000000..1eb716b0 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase4.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase4.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase4.webp new file mode 100644 index 00000000..6ccdf93c Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase4.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase5.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase5.png new file mode 100644 index 00000000..da26ddd5 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase5.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase5.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase5.webp new file mode 100644 index 00000000..f89d07e9 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase5.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase6.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase6.png new file mode 100644 index 00000000..471c846f Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase6.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase6.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase6.webp new file mode 100644 index 00000000..3a47bbd6 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase6.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase7.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase7.png new file mode 100644 index 00000000..59409905 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase7.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase7.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase7.webp new file mode 100644 index 00000000..f3662259 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase7.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase8.png b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase8.png new file mode 100644 index 00000000..21442b3f Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase8.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase8.webp b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase8.webp new file mode 100644 index 00000000..f7bd6f5d Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown_phase8.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.png b/MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.png index a43afd33..c096936e 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.png and b/MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.webp b/MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.webp new file mode 100644 index 00000000..545b7aaf Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.webp differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/unknown.png b/MHFZ_Overlay/Assets/Icons/png/monster/unknown.png index 76267bfc..0467c9a3 100644 Binary files a/MHFZ_Overlay/Assets/Icons/png/monster/unknown.png and b/MHFZ_Overlay/Assets/Icons/png/monster/unknown.png differ diff --git a/MHFZ_Overlay/Assets/Icons/png/monster/unknown.webp b/MHFZ_Overlay/Assets/Icons/png/monster/unknown.webp new file mode 100644 index 00000000..99ab3763 Binary files /dev/null and b/MHFZ_Overlay/Assets/Icons/png/monster/unknown.webp differ diff --git a/MHFZ_Overlay/Services/FileService.cs b/MHFZ_Overlay/Services/FileService.cs index 96bbfec8..7d7e9ed3 100644 --- a/MHFZ_Overlay/Services/FileService.cs +++ b/MHFZ_Overlay/Services/FileService.cs @@ -38,7 +38,41 @@ public sealed class FileService public static TimeSpan SnackbarTimeOut { get; set; } = TimeSpan.FromSeconds(5); - public static bool OpenApplicationFolder(SnackbarPresenter snackbarPresenter, Style snackbarStyle, TimeSpan snackbarTimeout) + public static bool GenerateSpeedrunFiles(SnackbarPresenter snackbarPresenter, Style snackbarStyle, TimeSpan snackbarTimeout) + { + try + { + var snackbar = new Snackbar(snackbarPresenter) + { + Style = snackbarStyle, + Title = Messages.ErrorTitle, + Content = "Could not generate speedrun files", + Icon = new SymbolIcon(SymbolRegular.ErrorCircle24), + Appearance = ControlAppearance.Danger, + Timeout = snackbarTimeout, + }; + snackbar.Show(); + return true; + } + catch (Exception ex) + { + // TODO maybe a snackbar helper class? + Logger.Error(ex); + var snackbar = new Snackbar(snackbarPresenter) + { + Style = snackbarStyle, + Title = Messages.ErrorTitle, + Content = "Could not generate speedrun files", + Icon = new SymbolIcon(SymbolRegular.ErrorCircle24), + Appearance = ControlAppearance.Danger, + Timeout = snackbarTimeout, + }; + snackbar.Show(); + return false; + } + } + + public static bool OpenApplicationFolder(SnackbarPresenter snackbarPresenter, Style snackbarStyle, TimeSpan snackbarTimeout) { try { diff --git a/MHFZ_Overlay/ViewModels/Windows/AddressModel.cs b/MHFZ_Overlay/ViewModels/Windows/AddressModel.cs index 3277abcc..072eb516 100644 --- a/MHFZ_Overlay/ViewModels/Windows/AddressModel.cs +++ b/MHFZ_Overlay/ViewModels/Windows/AddressModel.cs @@ -4314,7 +4314,7 @@ public string Monster1HP } /// - /// Gets the name of the rank. + /// Gets the name of the rank.TODO: In database the spaces are there. /// /// The identifier. /// diff --git a/MHFZ_Overlay/Views/Windows/ConfigWindow.xaml b/MHFZ_Overlay/Views/Windows/ConfigWindow.xaml index b818139d..5f653f8e 100644 --- a/MHFZ_Overlay/Views/Windows/ConfigWindow.xaml +++ b/MHFZ_Overlay/Views/Windows/ConfigWindow.xaml @@ -1543,38 +1543,42 @@ + - + - + + + + - - + + - - + + - + - + - + Current Final - +