Merge pull request #192 from TeamWheelWizard/dev

patchzyy · web-flow · commit e37531e541b8 · 2025-09-15T08:33:25.000+02:00
2.3.3
diff --git a/Flatpak/io.github.TeamWheelWizard.WheelWizard.metainfo.xml b/Flatpak/io.github.TeamWheelWizard.WheelWizard.metainfo.xml
@@ -55,6 +55,7 @@
   </provides>
 
   <releases>
+    <release version="2.3.3" date="2025-09-14"/>
     <release version="2.3.2" date="2025-07-01"/>
     <release version="2.3.1" date="2025-06-30"/>
     <release version="2.3.0" date="2025-06-28"/>
diff --git a/WheelWizard/Models/RRInfo/RrRoom.cs b/WheelWizard/Models/RRInfo/RrRoom.cs
@@ -26,9 +26,11 @@ public class RrRoom
             "vs_10" => "RR",
             "vs_11" => "TT",
             "vs_12" => "200",
+            "vs_13" => "IR",
+            "vs_14" => "BT",
+            "vs_15" => "EBT",
             "vs_20" => "RR Ct",
-            "vs_21" => "TT Ct",
-            "vs_22" => "200 Ct",
+            "vs_21" => "RR V",
 
             // CTGP_C
             "vs_668" => "CTGP-C",
@@ -52,6 +54,7 @@ public class RrRoom
 
             // Luminous
             "vs_666" => "Lumi",
+            "vs_667" => "Lumi TT",
 
             // OptPack
             "vs_875" => "OP 150",
@@ -65,6 +68,8 @@ public class RrRoom
             "vs_1312" => "WTP 150",
             "vs_1313" => "WTP 200",
             "vs_1314" => "WTP TT",
+            "vs_1315" => "WTP IR",
+            "vs_1316" => "STYD",
 
             // Generic Versus
             "vs_751" => "VS",
@@ -82,9 +87,11 @@ public class RrRoom
             "vs_10" => "RR 150CC",
             "vs_11" => "RR Time Tr",
             "vs_12" => "RR 200CC",
+            "vs_13" => "RR Item Rain",
+            "vs_14" => "RR Battle",
+            "vs_15" => "RR Elim Battle",
             "vs_20" => "RR 150CC CTs",
-            "vs_21" => "RR TT CTs",
-            "vs_22" => "RR 200CC CTs",
+            "vs_21" => "RR Vanilla",
 
             // CTGP
             "vs_668" => "CTGP-C",
@@ -108,6 +115,7 @@ public class RrRoom
 
             // Luminous
             "vs_666" => "Luminous",
+            "vs_667" => "Luminous TT",
 
             // OptPack
             "vs_875" => "OP 150",
@@ -121,6 +129,8 @@ public class RrRoom
             "vs_1312" => "WTP 150CC",
             "vs_1313" => "WTP 200CC",
             "vs_1314" => "WTP Time Trial",
+            "vs_1315" => "WTP Item Rain",
+            "vs_1316" => "WTP STYD",
 
             // Generic
             "vs_751" => "Versus",
diff --git a/WheelWizard/Resources/Languages/Phrases.Designer.cs b/WheelWizard/Resources/Languages/Phrases.Designer.cs
diff --git a/WheelWizard/Resources/Languages/Phrases.cs.resx b/WheelWizard/Resources/Languages/Phrases.cs.resx
@@ -90,8 +90,8 @@
     <data name="EmptyContent_NoRooms" xml:space="preserve">
         <value>Možná nemáš připojení k internetu, nebo nikdo nehraje.</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>Jméno tvůrce musí být kratší než 10 znaků.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>Jméno tvůrce musí být kratší než 11 znaků.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Jména musí mít délku 3 až 10 znaků.</value>
diff --git a/WheelWizard/Resources/Languages/Phrases.de.resx b/WheelWizard/Resources/Languages/Phrases.de.resx
@@ -235,8 +235,8 @@ Um einem bestimmten Raum beizutreten, musst du entweder über einen Freund treff
     <data name="EmptyContent_NoMiis_Title" xml:space="preserve">
         <value>Noch keine Miis erstellt!</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>Name des Ersteller muss weniger als 10 Zeichen lang sein.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>Name des Ersteller muss weniger als 11 Zeichen lang sein.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Namen müssen zwischen 3 und 10 Zeichen lang sein.</value>
diff --git a/WheelWizard/Resources/Languages/Phrases.es.resx b/WheelWizard/Resources/Languages/Phrases.es.resx
@@ -234,8 +234,8 @@
     <data name="EmptyContent_NoMiis_Title" xml:space="preserve">
         <value>No hay Miis todavía!</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>El nombre del creador tiene que tener menos de 10 caracteres.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>El nombre del creador tiene que tener menos de 11 caracteres.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Los nombres tienen que tener entre 3 y 10 caracteres.</value>
diff --git a/WheelWizard/Resources/Languages/Phrases.fr.resx b/WheelWizard/Resources/Languages/Phrases.fr.resx
@@ -238,8 +238,8 @@ Voulez-vous réinstaller Retro Rewind ? </value>
     <data name="EmptyContent_NoMiis_Title" xml:space="preserve">
         <value>Aucun Mii!</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>Le nom de l'auteur doit faire moins de 10 caractères.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>Le nom de l'auteur doit faire moins de 11 caractères.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Les noms doivent être composés de 3 à 10 caractères.</value>
diff --git a/WheelWizard/Resources/Languages/Phrases.it.resx b/WheelWizard/Resources/Languages/Phrases.it.resx
@@ -236,7 +236,7 @@ Vuoi svuotare la tua cartella My-Stuff?</value>
     <data name="EmptyContent_NoMiis_Title" xml:space="preserve">
         <value>Ancora nessun Mii!</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
         <value>Il nome dell'autore deve essere lungo al massimo 10 caratteri.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
diff --git a/WheelWizard/Resources/Languages/Phrases.ja.resx b/WheelWizard/Resources/Languages/Phrases.ja.resx
@@ -240,7 +240,7 @@ My Stuffフォルダーをクリアしますか？</value>
     <data name="EmptyContent_NoMiis_Title" xml:space="preserve">
         <value>まだMiiがありません！</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
         <value>作成者の名前の長さは10文字以下にしてください</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
diff --git a/WheelWizard/Resources/Languages/Phrases.ko.resx b/WheelWizard/Resources/Languages/Phrases.ko.resx
@@ -235,7 +235,7 @@
     <data name="EmptyContent_NoMiis_Title" xml:space="preserve">
         <value>아직 Mii가 없어요!</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
         <value>작성자 이름은 반드시 10자 이내여야 합니다.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
diff --git a/WheelWizard/Resources/Languages/Phrases.nl.resx b/WheelWizard/Resources/Languages/Phrases.nl.resx
@@ -358,8 +358,8 @@ Om aan een specifieke kamer deel te nemen, moet je dit óf via een vriend óf vi
     <data name="SnackbarSuccess_ProfileSetPrimary" xml:space="preserve">
         <value>Profiel als hoofdprofiel geselecteerd.</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>Naam moet korter dan 10 tekens zijn.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>Naam moet korter dan 11 tekens zijn.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Naam moet tussen de 3 en 10 tekens lang zijn.</value>
diff --git a/WheelWizard/Resources/Languages/Phrases.resx b/WheelWizard/Resources/Languages/Phrases.resx
@@ -375,8 +375,8 @@ To join a specific room, you'll need to either join through a friend, or hope to
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Names must be between 3 and 10 characters long.</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>Creator name must be less than 10 characters long.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>Creator name must be less than 11 characters long.</value>
     </data>
     <data name="MessageError_FailedChangeName_Title" xml:space="preserve">
         <value>Failed to change name</value>
diff --git a/WheelWizard/Resources/Languages/Phrases.ru.resx b/WheelWizard/Resources/Languages/Phrases.ru.resx
@@ -288,8 +288,8 @@
     <data name="EmptyContent_NoModSelected" xml:space="preserve">
         <value>Выберите мод из списка, чтобы узнать подробности.</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>Имя создателя должно быть длиной в меньше 10 символов.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>Имя создателя должно быть длиной в меньше 11 символов.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Имена должны быть длиной от 3 до 10 символов.</value>
diff --git a/WheelWizard/Resources/Languages/Phrases.tr.resx b/WheelWizard/Resources/Languages/Phrases.tr.resx
@@ -235,8 +235,8 @@ Belirli bir odaya katılmak için bir arkadaşınız aracılığıyla katılman
     <data name="EmptyContent_NoMiis_Title" xml:space="preserve">
         <value>Şimdilik Mii yok!</value>
     </data>
-    <data name="HelperNote_CreatorNameLess10" xml:space="preserve">
-        <value>Yapımcı adı 10 karakterden kısa olması gerekiyor.</value>
+    <data name="HelperNote_CreatorNameLess11" xml:space="preserve">
+        <value>Yapımcı adı 11 karakterden kısa olması gerekiyor.</value>
     </data>
     <data name="HelperNote_NameMustBetween" xml:space="preserve">
         <value>Adın 3 ile 10 karakter arasında olması gerekiyor.</value>
diff --git a/WheelWizard/Services/Launcher/RrLauncher.cs b/WheelWizard/Services/Launcher/RrLauncher.cs
@@ -46,7 +46,7 @@ public async Task Launch()
             RetroRewindLaunchHelper.GenerateLaunchJson();
             var dolphinLaunchType = (bool)SettingsManager.LAUNCH_WITH_DOLPHIN.Get() ? "" : "-b";
             DolphinLaunchHelper.LaunchDolphin(
-                $"{dolphinLaunchType} -e {EnvHelper.QuotePath(Path.GetFullPath(RrLaunchJsonFilePath))} --config=Dolphin.Core.EnableCheats=False"
+                $"{dolphinLaunchType} -e {EnvHelper.QuotePath(Path.GetFullPath(RrLaunchJsonFilePath))} --config=Dolphin.Core.EnableCheats=False --config=Achievements.Achievements.Enabled=False"
             );
         }
         catch (Exception ex)
diff --git a/WheelWizard/Services/ModManager.cs b/WheelWizard/Services/ModManager.cs
@@ -189,6 +189,7 @@ public void ToggleAllMods(bool enable)
     // TODO: Use this validation method when refactoring the ModManager
     public OperationResult ValidateModName(string? oldName, string newName)
     {
+        newName = newName?.Trim();
         if (string.IsNullOrWhiteSpace(newName))
             return Fail("Mod name cannot be empty.");
 
diff --git a/WheelWizard/Views/Pages/UserProfilePage.axaml.cs b/WheelWizard/Views/Pages/UserProfilePage.axaml.cs
@@ -285,6 +285,7 @@ private void CopyFriendCode_OnClick(object? sender, EventArgs e)
     // But we as team wheel wizard don't think it makes sense to have a mii name shorter than 3, and so from the UI we don't allow it
     private OperationResult ValidateMiiName(string? oldName, string newName)
     {
+        newName = newName?.Trim();
         if (newName.Length is > 10 or < 3)
             return Fail(Phrases.HelperNote_NameMustBetween);
 
diff --git a/WheelWizard/Views/Popups/Generic/TextInputWindow.axaml.cs b/WheelWizard/Views/Popups/Generic/TextInputWindow.axaml.cs
@@ -117,7 +117,7 @@ private void InputField_TextChanged(object sender, TextChangedEventArgs e)
     // Update the Submit button's IsEnabled property based on input
     private void UpdateSubmitButtonState()
     {
-        var inputText = GetTrimmedTextInput();
+        var inputText = GetInputText();
         var validationResultError = inputValidationFunc?.Invoke(_initialText, inputText!).Error?.Message;
 
         SubmitButton.IsEnabled = validationResultError == null;
@@ -132,12 +132,12 @@ private void CustomCharsButton_Click(object sender, EventArgs e)
 
     private void SubmitButton_Click(object sender, RoutedEventArgs e)
     {
-        _result = GetTrimmedTextInput();
+        _result = GetInputText();
         _tcs?.TrySetResult(_result); // Set the result of the task
         Close();
     }
 
-    private string? GetTrimmedTextInput() => InputField.Text?.Trim();
+    private string? GetInputText() => InputField.Text;
 
     private void CancelButton_Click(object sender, RoutedEventArgs e) => Close();
 
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml.cs b/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml.cs
@@ -82,6 +82,7 @@ private void Name_TextChanged(object sender, TextChangedEventArgs e)
 
     private OperationResult ValidateMiiName(string? _, string newName)
     {
+        newName = newName?.Trim();
         if (newName.Length is > 10 or < 3)
             return Fail(Phrases.HelperNote_NameMustBetween);
 
@@ -90,8 +91,9 @@ private OperationResult ValidateMiiName(string? _, string newName)
 
     private OperationResult ValidateCreatorName(string newName)
     {
+        newName = newName?.Trim();
         if (newName.Length > 10)
-            return Fail(Phrases.HelperNote_CreatorNameLess10);
+            return Fail(Phrases.HelperNote_CreatorNameLess11);
 
         return Ok();
     }
diff --git a/WheelWizard/WheelWizard.csproj b/WheelWizard/WheelWizard.csproj
@@ -11,7 +11,7 @@
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
 
         <!-- Program details -->
-        <Version>2.3.2</Version>
+        <Version>2.3.3</Version>
         <Description>This program will manage RetroRewind and mods :)</Description>
         <Copyright>GNU v3.0</Copyright>
         <RepositoryUrl>https://github.com/patchzyy/WheelWizard</RepositoryUrl>
