From 8d9f4b7d035db41ff4038aee2b5e7a48307fea83 Mon Sep 17 00:00:00 2001 From: BoiHanny <114599052+BoiHanny@users.noreply.github.com> Date: Fri, 2 Aug 2024 02:58:02 +0200 Subject: [PATCH] Update project version to 0.8.910 The version number of the project has been updated from 0.8.908 to 0.8.910. --- .../Classes/DataAndSecurity/DataController.cs | 5 ++ .../Classes/DataAndSecurity/OSCController.cs | 8 ++- vrcosc-magicchatbox/MagicChatbox.csproj | 2 +- vrcosc-magicchatbox/MainWindow.xaml | 68 +++++++++++++++++++ vrcosc-magicchatbox/MainWindow.xaml.cs | 18 +++++ vrcosc-magicchatbox/ViewModels/ViewModel.cs | 23 +++++++ 6 files changed, 122 insertions(+), 2 deletions(-) diff --git a/vrcosc-magicchatbox/Classes/DataAndSecurity/DataController.cs b/vrcosc-magicchatbox/Classes/DataAndSecurity/DataController.cs index 8851ca27..458dea77 100644 --- a/vrcosc-magicchatbox/Classes/DataAndSecurity/DataController.cs +++ b/vrcosc-magicchatbox/Classes/DataAndSecurity/DataController.cs @@ -333,6 +333,7 @@ public static void LoadComponentStats() { "ScanningInterval", (typeof(double), "Scanning") }, { "ScanPauseTimeout", (typeof(int), "Scanning") }, + { "PrefixIconStatus", (typeof(bool), "Icons") }, { "PrefixIconMusic", (typeof(bool), "Icons") }, { "PauseIconMusic", (typeof(bool), "Icons") }, { "PrefixIconStatus", (typeof(bool), "Icons") }, @@ -763,6 +764,10 @@ private static void CheckForSpecialMessages(ObservableCollection sta { ViewModel.Instance.Egg_Dev = true; } + if(statusList.Any(x => x.msg.Equals("izurubae", StringComparison.OrdinalIgnoreCase))) + { + ViewModel.Instance.IzuruBaeMode = true; + } } private static void InitializeStatusListWithDefaults() diff --git a/vrcosc-magicchatbox/Classes/DataAndSecurity/OSCController.cs b/vrcosc-magicchatbox/Classes/DataAndSecurity/OSCController.cs index 3fa62bde..40c92fea 100644 --- a/vrcosc-magicchatbox/Classes/DataAndSecurity/OSCController.cs +++ b/vrcosc-magicchatbox/Classes/DataAndSecurity/OSCController.cs @@ -367,8 +367,14 @@ public static void AddStatusMessage(List Uncomplete) // Update LastUsed property for the active item activeItem.LastUsed = DateTime.Now; + string icon = "💬"; + if (ViewModel.Instance.IzuruBaeMode && !string.IsNullOrWhiteSpace(ViewModel.Instance.PrefixIconStatusEgg)) + { + icon = ViewModel.Instance.PrefixIconStatusEgg.Substring(0, 1); + } + string? x = ViewModel.Instance.PrefixIconStatus == true - ? "💬 " + activeItem.msg + ? $"{icon} " + activeItem.msg : activeItem.msg; if (x != null) diff --git a/vrcosc-magicchatbox/MagicChatbox.csproj b/vrcosc-magicchatbox/MagicChatbox.csproj index 14e37d5b..6ba08de0 100644 --- a/vrcosc-magicchatbox/MagicChatbox.csproj +++ b/vrcosc-magicchatbox/MagicChatbox.csproj @@ -2,7 +2,7 @@ WinExe - 0.8.908 + 0.8.910 net6.0-windows10.0.22000.0 vrcosc_magicchatbox enable diff --git a/vrcosc-magicchatbox/MainWindow.xaml b/vrcosc-magicchatbox/MainWindow.xaml index bc144f7a..63bf9f34 100644 --- a/vrcosc-magicchatbox/MainWindow.xaml +++ b/vrcosc-magicchatbox/MainWindow.xaml @@ -994,6 +994,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + _IzuruBaeMode; + set + { + _IzuruBaeMode = value; + NotifyPropertyChanged(nameof(IzuruBaeMode)); + } + } + + private string _PrefixIconStatusEgg = ""; + + public string PrefixIconStatusEgg + { + get { return _PrefixIconStatusEgg; } + set + { + _PrefixIconStatusEgg = value; + NotifyPropertyChanged(nameof(PrefixIconStatusEgg)); + } + } + private MediaLinkStyle _SelectedMediaLinkSeekbarStyle;