Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Flatpak/io.github.TeamWheelWizard.WheelWizard.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace WheelWizard.CustomDistributions;
public interface ICustomDistributionSingletonService
{
List<IDistribution> GetAllDistributions();

// FIXME: Abstract this reference away. A generic Distributions service kinda loses its purpose when you still have to reference a distribution by name (like done here)
// Instead you would want something like DistService.GetCurrentDistro()
// The rest of the application should not have to know what distribution is currently active.
Expand Down
2 changes: 1 addition & 1 deletion WheelWizard/Features/CustomDistributions/RetroRewind.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private async Task<OperationResult> DownloadAndExtractRetroRewind(ProgressWindow

//where all distributions are stored
var destinationParentDir = _fileSystem.DirectoryInfo.New(PathManager.RiivolutionWhWzFolderPath);

OperationResult? result = null;
try
{
Expand Down
3 changes: 3 additions & 0 deletions WheelWizard/Features/WheelWizardData/Domain/BadgeVariant.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ public enum BadgeVariant
SummitShowdown_GoldWinner,
SummitShowdown_SilverWinner,
SummitShowdown_BronzeWinner,
Leafstruck_GoldWinner,
Leafstruck_SilverWinner,
Leafstruck_BronzeWinner,
}
18 changes: 14 additions & 4 deletions WheelWizard/Models/RRInfo/RrRoom.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -52,6 +54,7 @@ public class RrRoom

// Luminous
"vs_666" => "Lumi",
"vs_667" => "Lumi TT",

// OptPack
"vs_875" => "OP 150",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -108,6 +115,7 @@ public class RrRoom

// Luminous
"vs_666" => "Luminous",
"vs_667" => "Luminous TT",

// OptPack
"vs_875" => "OP 150",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions WheelWizard/Resources/Languages/Phrases.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.cs.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.es.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.fr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WheelWizard/Resources/Languages/Phrases.it.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion WheelWizard/Resources/Languages/Phrases.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion WheelWizard/Resources/Languages/Phrases.ko.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.nl.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.ru.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Resources/Languages/Phrases.tr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WheelWizard/Services/Launcher/RrLauncher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions WheelWizard/Services/ModManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.");

Expand Down
67 changes: 66 additions & 1 deletion WheelWizard/Views/Components/WhWzLibrary/Badge.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
</Setter>
</Style>

<!-- SUMMIT SHOWDOWN BADGES -->
<!-- SUMMIT SHOWDOWN BADGES -->
<Style Selector="controls|Badge.SummitShowdown_GoldWinner">
<Setter Property="Template">
<ControlTemplate>
Expand Down Expand Up @@ -279,4 +279,69 @@
</ControlTemplate>
</Setter>
</Style>



<!-- LEAFSTRUCK BADGES -->
<Style Selector="controls|Badge.Leafstruck_GoldWinner">
<Setter Property="Template">
<ControlTemplate>
<Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
<Border Grid.Row="1" Grid.Column="1"
CornerRadius="999" Background="{StaticResource Warning100}" />

<Path Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" Grid.ColumnSpan="3"
Fill="{StaticResource Warning600}" Data="{StaticResource Award}"
Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path.RenderTransform>
<TransformGroup>
<RotateTransform Angle="21"/>
</TransformGroup>
</Path.RenderTransform>
</Path>
</Grid>
</ControlTemplate>
</Setter>
</Style>

<Style Selector="controls|Badge.Leafstruck_SilverWinner">
<Setter Property="Template">
<ControlTemplate>
<Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
<Border Grid.Row="1" Grid.Column="1"
CornerRadius="999" Background="{StaticResource Neutral50}" />

<Path Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" Grid.ColumnSpan="3"
Fill="{StaticResource Neutral400}" Data="{StaticResource Award}"
Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path.RenderTransform>
<TransformGroup>
<RotateTransform Angle="21"/>
</TransformGroup>
</Path.RenderTransform>
</Path>
</Grid>
</ControlTemplate>
</Setter>
</Style>

<Style Selector="controls|Badge.Leafstruck_BronzeWinner">
<Setter Property="Template">
<ControlTemplate>
<Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
<Border Grid.Row="1" Grid.Column="1" CornerRadius="999" Background="#FFD19D" />

<Path Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" Grid.ColumnSpan="3"
Fill="#EC5616" Data="{StaticResource Award}"
Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path.RenderTransform>
<TransformGroup>
<RotateTransform Angle="21"/>
</TransformGroup>
</Path.RenderTransform>
</Path>
</Grid>
</ControlTemplate>
</Setter>
</Style>
</Styles>
9 changes: 6 additions & 3 deletions WheelWizard/Views/Components/WhWzLibrary/Badge.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ public class Badge : TemplatedControl
{ BadgeVariant.Firestarter_GoldWinner, "Firestarter Tournament Winner" },
{ BadgeVariant.Firestarter_SilverWinner, "Firestarter Tournament Runner-Up" },
{ BadgeVariant.Firestarter_BronzeWinner, "Firestarter Tournament Runner-Up" },
{ BadgeVariant.SummitShowdown_GoldWinner, "Summit Showdown Tourney Winner" },
{ BadgeVariant.SummitShowdown_SilverWinner, "Summit Showdown Tourney Runner-Up" },
{ BadgeVariant.SummitShowdown_BronzeWinner, "Summit Showdown Tourney Runner-Up" },
{ BadgeVariant.SummitShowdown_GoldWinner, "Summit Showdown Tournament Winner" },
{ BadgeVariant.SummitShowdown_SilverWinner, "Summit Showdown Tournament Runner-Up" },
{ BadgeVariant.SummitShowdown_BronzeWinner, "Summit Showdown Tournament Runner-Up" },
{ BadgeVariant.Leafstruck_GoldWinner, "Leafstruck Tournament Winner" },
{ BadgeVariant.Leafstruck_SilverWinner, "Leafstruck Tournament Runner-Up" },
{ BadgeVariant.Leafstruck_BronzeWinner, "Leafstruck Tournament Runner-Up" },
};

public static readonly StyledProperty<string> HoverTipProperty = AvaloniaProperty.Register<Badge, string>(
Expand Down
1 change: 1 addition & 0 deletions WheelWizard/Views/Pages/UserProfilePage.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions WheelWizard/Views/Popups/Generic/TextInputWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion WheelWizard/WheelWizard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading