Compare commits

..

72 Commits

Author SHA1 Message Date
Vladimir Sokolov
38c5211f99 Merge 88bf2f0941 into 3ffcc72117 2025-02-22 23:51:21 -06:00
Vladimir Sokolov
88bf2f0941 Merge branch 'master' into master 2025-02-23 09:21:53 +10:00
Evan Husted
d1efa27592 Merge branch 'master' into master 2025-02-20 21:25:32 -06:00
Vladimir Sokolov
c4817b7588 Merge branch 'master' into master 2025-02-21 11:52:43 +10:00
Vladimir Sokolov
7f08469dc5 Merge branch 'master' into master 2025-02-21 11:41:33 +10:00
Vladimir Sokolov
ee886e54b5 Merge branch 'master' into master 2025-02-19 20:23:58 +10:00
Vladimir Sokolov
313847eefe Merge branch 'master' into master 2025-02-19 13:12:43 +10:00
Vladimir Sokolov
b61ca0640c Merge branch 'master' into master 2025-02-19 12:38:07 +10:00
Vladimir Sokolov
43e5553113 Merge branch 'master' into master 2025-02-17 19:20:30 +10:00
Evan Husted
01ef3872d3 Merge branch 'master' into master 2025-02-17 01:48:53 -06:00
Evan Husted
65527cfb69 Reload configuration from global & reload app list at the end of the render loop (when it's done) 2025-02-17 01:48:11 -06:00
Evan Husted
ced618d9a1 Enabled per-game configuration of discord presence 2025-02-17 01:47:17 -06:00
Vladimir Sokolov
1ec039060e Merge branch 'master' into master 2025-02-16 20:42:03 +10:00
Vladimir Sokolov
6b48836c62 Merge branch 'master' into master 2025-02-16 18:09:23 +10:00
Vladimir Sokolov
5d4052f289 Merge branch 'master' into master 2025-02-16 13:39:51 +10:00
Vova
4461a7c471 Removed extra line added by mistake 2025-02-15 21:44:30 +10:00
Vova
edfd58bbe4 small fix 2025-02-15 21:24:48 +10:00
Vova
e7c991349e Removed unused library 2025-02-15 20:02:47 +10:00
Vova
24867ec9b6 Code refinement. Added UI menu to user settings
Added markers to menu for settings related to global settings
2025-02-15 19:59:23 +10:00
Vladimir Sokolov
af00ca6ed8 Merge branch 'master' into master 2025-02-15 19:36:22 +10:00
Vova
931da5e1d2 fix update 2025-02-15 15:56:45 +10:00
Vladimir Sokolov
451525e424 Merge branch 'master' into master 2025-02-15 15:42:02 +10:00
Vladimir Sokolov
f73c9ac4de Merge branch 'master' into master 2025-02-15 13:45:40 +10:00
Vladimir Sokolov
7f2dfac352 Merge branch 'master' into master 2025-02-14 17:59:09 +10:00
Evan Husted
139e86915b Merge branch 'master' into master 2025-02-13 19:42:56 -06:00
Vladimir Sokolov
ca8329d3da Merge branch 'master' into master 2025-02-13 19:38:29 +10:00
Vladimir Sokolov
4f02b6a6de Merge branch 'master' into master 2025-02-13 18:11:07 +10:00
Vova
1dedf4c8d5 fixed: when loading a game with a custom configuration via a shortcut or rebooting, when entering the settings menu, a menu for global configuration was displayed. 2025-02-13 16:34:03 +10:00
Vladimir Sokolov
3f185f580c Merge branch 'master' into master 2025-02-13 16:12:19 +10:00
Vova
2dd787fb7b Changed: Hid.DisableInputWhenOutOfFocus only for global config 2025-02-12 16:00:37 +10:00
Vladimir Sokolov
42bd99193f Merge branch 'master' into master 2025-02-12 15:18:56 +10:00
Vladimir Sokolov
22299e69c6 Merge branch 'master' into master 2025-02-12 13:27:41 +10:00
Vladimir Sokolov
acc06a8430 Merge branch 'master' into master 2025-02-12 12:45:34 +10:00
Vova
5d061a1871 Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2025-02-12 12:44:46 +10:00
Vova
c21e63eb02 Removed irrelevant functions.
Renamed variables to correct names
2025-02-12 12:44:38 +10:00
Vladimir Sokolov
32f9b3357a Merge branch 'master' into master 2025-02-12 11:27:19 +10:00
Vladimir Sokolov
7f7055a037 Merge branch 'master' into master 2025-02-11 17:27:56 +10:00
Vova
af13f4bb3b fix latest changes 2025-02-11 15:32:17 +10:00
Vladimir Sokolov
03692e6072 Merge branch 'master' into master 2025-02-11 15:24:48 +10:00
Vova
6f4930d547 Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2025-02-11 14:07:03 +10:00
Vova
1ca5407c22 Added autorestart of the emulator if it is necessary to change the graphic multi-thread.
Code cleaning
2025-02-11 14:06:31 +10:00
Vladimir Sokolov
8efceb3c28 Merge branch 'master' into master 2025-02-11 08:56:57 +10:00
Vova
0399af0ff9 Replace the "delete" button with "apply" during the game in the custom configuration. 2025-02-10 21:02:26 +10:00
Vladimir Sokolov
3e40532dee Merge branch 'master' into master 2025-02-10 15:36:15 +10:00
Vova
1d68546aa0 Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2025-02-10 15:26:21 +10:00
Vova
966860a464 Change: initialization of user configuration is now a separate function 2025-02-10 15:25:19 +10:00
Vladimir Sokolov
b9982c02e3 Merge branch 'master' into master 2025-02-09 16:51:11 +10:00
Vladimir Sokolov
a301a14074 Merge branch 'master' into master 2025-02-09 16:50:08 +10:00
Vova
7568dd4d7a Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2025-02-09 15:30:57 +10:00
Vova
4bbcec2076 Fixed a bug where control would not return after changing settings.
Added a function to update the gamelist status after the game is released
2025-02-09 15:30:33 +10:00
Vladimir Sokolov
57ac90a55b Merge branch 'master' into master 2025-02-09 15:20:03 +10:00
Vladimir Sokolov
cdc4557d82 Merge branch 'master' into master 2025-02-09 09:15:26 +10:00
Vova
ae16360685 Code cleaning 2025-02-08 22:27:38 +10:00
Vova
45b1794a45 Returned an erroneously modified Convert time string 2025-02-08 20:41:16 +10:00
Vova
39fbbb39e0 Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2025-02-08 20:19:23 +10:00
Vova
11a68a204f Fixed bug crash due to incorrect System.SystemTimeOffset.Value,
hotkeys should now also be read from the global configuration file
2025-02-08 20:16:38 +10:00
Vladimir Sokolov
e4e38c4bdd Merge branch 'master' into master 2025-02-08 18:30:35 +10:00
Vova
5f5c76107c Fixed a ban where a custom setting was mistakenly created when starting the game if it did not exist.
Now when starting the game, if a custom setting was created, the current game will be displayed in the settings window.
Code cleanup.
2025-02-08 18:29:31 +10:00
Vova
a92475b8fd Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2025-02-08 10:51:57 +10:00
Vova
4d5ae23b0b Added game name to user settings window 2025-02-08 10:51:39 +10:00
Vladimir Sokolov
4cb2170ad1 Merge branch 'master' into master 2025-02-08 10:49:55 +10:00
Vladimir Sokolov
fc01f7b58f Merge branch 'master' into master 2025-02-08 10:17:13 +10:00
Vova
fa463c51f8 code cleaning 2025-02-07 23:37:35 +10:00
Vova
3a8e6e3117 Added gamepad configuration for custom configuration 2025-02-07 21:48:51 +10:00
Vladimir Sokolov
7f4a161ca5 Merge branch 'master' into master 2025-02-07 20:48:10 +10:00
Vova
df1c7613e8 returned the deleted field 2025-02-06 23:24:52 +10:00
Vova
6d37d79cc7 Ops 2025-02-06 22:58:43 +10:00
Vova
afdfcc1720 fix 2025-02-06 22:54:45 +10:00
Vova
fe94224d01 keys returned to their place, minor fixes, local ones added 2025-02-06 22:51:08 +10:00
Vova
fbe1a7d966 Added custom setting function for each game 2025-02-06 04:54:00 -06:00
Vova
5dc7fb4495 Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2025-02-06 20:34:31 +10:00
Vova
2640f083b6 Added custom setting function for each game 2025-02-06 20:34:15 +10:00
13 changed files with 124 additions and 262 deletions

View File

@@ -24,7 +24,7 @@ namespace ARMeilleure.Translation.Cache
private static JitCacheInvalidation _jitCacheInvalidator;
private static List<CacheMemoryAllocator> _cacheAllocators = [];
private static CacheMemoryAllocator _cacheAllocator;
private static readonly List<CacheEntry> _cacheEntries = [];
@@ -40,48 +40,37 @@ namespace ARMeilleure.Translation.Cache
public static void Initialize(IJitMemoryAllocator allocator)
{
if (_initialized)
{
return;
}
lock (_lock)
{
if (_initialized)
{
if (OperatingSystem.IsWindows())
{
JitUnwindWindows.RemoveFunctionTableHandler(
_jitRegions[0].Pointer);
}
for (int i = 0; i < _jitRegions.Count; i++)
{
_jitRegions[i].Dispose();
}
_jitRegions.Clear();
_cacheAllocators.Clear();
return;
}
else
{
_initialized = true;
}
_activeRegionIndex = 0;
ReservedRegion firstRegion = new(allocator, CacheSize);
_jitRegions.Add(firstRegion);
CacheMemoryAllocator firstCacheAllocator = new(CacheSize);
_cacheAllocators.Add(firstCacheAllocator);
_activeRegionIndex = 0;
if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
{
_jitCacheInvalidator = new JitCacheInvalidation(allocator);
}
_cacheAllocator = new CacheMemoryAllocator(CacheSize);
if (OperatingSystem.IsWindows())
{
JitUnwindWindows.InstallFunctionTableHandler(
firstRegion.Pointer, CacheSize, firstRegion.Pointer + Allocate(_pageSize)
);
}
_initialized = true;
}
}
@@ -147,7 +136,7 @@ namespace ARMeilleure.Translation.Cache
if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
{
_cacheAllocators[_activeRegionIndex].Free(funcOffset, AlignCodeSize(entry.Size));
_cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
_cacheEntries.RemoveAt(entryIndex);
}
@@ -178,24 +167,30 @@ namespace ARMeilleure.Translation.Cache
{
codeSize = AlignCodeSize(codeSize);
int allocOffset = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
if (allocOffset >= 0)
for (int i = _activeRegionIndex; i < _jitRegions.Count; i++)
{
_jitRegions[_activeRegionIndex].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
return allocOffset;
int allocOffset = _cacheAllocator.Allocate(codeSize);
if (allocOffset >= 0)
{
_jitRegions[i].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
_activeRegionIndex = i;
return allocOffset;
}
}
int exhaustedRegion = _activeRegionIndex;
ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
_jitRegions.Add(newRegion);
_activeRegionIndex = _jitRegions.Count - 1;
int newRegionNumber = _activeRegionIndex;
Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {_activeRegionIndex} ({((long)(_activeRegionIndex + 1) * CacheSize).Bytes()} Total Allocation).");
Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
_cacheAllocator = new CacheMemoryAllocator(CacheSize);
_cacheAllocators.Add(new CacheMemoryAllocator(CacheSize));
int allocOffsetNew = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
int allocOffsetNew = _cacheAllocator.Allocate(codeSize);
if (allocOffsetNew < 0)
{
throw new OutOfMemoryException("Failed to allocate in new Cache Region!");

View File

@@ -52,11 +52,6 @@ namespace ARMeilleure.Translation.Cache
nint context,
[MarshalAs(UnmanagedType.LPWStr)] string outOfProcessCallbackDll);
[LibraryImport("kernel32.dll")]
[return: MarshalAs(UnmanagedType.Bool)]
private static unsafe partial bool RtlDeleteFunctionTable(
ulong tableIdentifier);
private static GetRuntimeFunctionCallback _getRuntimeFunctionCallback;
private static int _sizeOfRuntimeFunction;
@@ -96,23 +91,6 @@ namespace ARMeilleure.Translation.Cache
}
}
public static void RemoveFunctionTableHandler(nint codeCachePointer)
{
ulong codeCachePtr = (ulong)codeCachePointer.ToInt64();
bool result;
unsafe
{
result = RtlDeleteFunctionTable(codeCachePtr | 3);
}
if (!result)
{
throw new InvalidOperationException("Failure removing function table callback.");
}
}
private static unsafe RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
{
int offset = (int)((long)controlPc - context.ToInt64());

View File

@@ -5,34 +5,15 @@ using System.Runtime.InteropServices;
namespace Ryujinx.Common.Helper
{
public enum OperatingSystemType
{
MacOS,
Linux,
Windows
}
public static class RunningPlatform
{
public static readonly OperatingSystemType CurrentOS
= IsMacOS
? OperatingSystemType.MacOS
: IsWindows
? OperatingSystemType.Windows
: IsLinux
? OperatingSystemType.Linux
: throw new PlatformNotSupportedException();
public static Architecture Architecture => RuntimeInformation.OSArchitecture;
public static Architecture CurrentProcessArchitecture => RuntimeInformation.ProcessArchitecture;
public static bool IsMacOS => OperatingSystem.IsMacOS();
public static bool IsWindows => OperatingSystem.IsWindows();
public static bool IsLinux => OperatingSystem.IsLinux();
public static bool IsArm => Architecture is Architecture.Arm64;
public static bool IsArm => RuntimeInformation.OSArchitecture is Architecture.Arm64;
public static bool IsX64 => Architecture is Architecture.X64;
public static bool IsX64 => RuntimeInformation.OSArchitecture is Architecture.X64;
public static bool IsIntelMac => IsMacOS && IsX64;
public static bool IsArmMac => IsMacOS && IsArm;

View File

@@ -343,7 +343,7 @@
<Setter Property="Foreground" Value="SeaGreen"/>
<Setter Property="Margin" Value="5,0,0,0"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Text" Value="{ext:Locale GameSpecificConfigurationGlobal}"/>
<Setter Property="Text" Value="(Global)"/>
</Style>
<Style Selector="StackPanel.globalConfigMarker">
</Style>

View File

@@ -2748,53 +2748,28 @@
}
},
{
"ID": "GameListContextMenuCreateCustomConfiguration",
"ID": "GameListContextMenuEditGameConfiguration",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Create Custom Configuration",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{
"ID": "GameListContextMenuEditCustomConfiguration",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Edit Custom Configuration",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
"ar_SA": "تعديل تكوين اللعبة",
"de_DE": "Spielkonfiguration bearbeiten",
"el_GR": "Επεξεργασία ρυθμίσεων παιχνιδιού",
"en_US": "Edit Game Configuration",
"es_ES": "Editar configuración del juego",
"fr_FR": "Modifier la configuration du jeu",
"he_IL": "ערוך את הגדרת המשחק",
"it_IT": "Modifica configurazione gioco",
"ja_JP": "ゲーム設定を編集",
"ko_KR": "게임 설정 편집",
"no_NO": "Rediger spillkonfig.",
"pl_PL": "Edytuj konfigurację gry",
"pt_BR": "Editar configuração do jogo",
"ru_RU": "Редактировать конфигурацию игры",
"sv_SE": "Redigera spelkonfiguration",
"th_TH": "แก้ไขการตั้งค่าเกม",
"tr_TR": "Oyunun yapılandırmasını düzenle",
"uk_UA": "Редагувати конфігурацію гри",
"zh_CN": "编辑游戏配置",
"zh_TW": "編輯遊戲設定"
}
},
{
@@ -2823,12 +2798,12 @@
}
},
{
"ID": "CreateCustomConfigurationToolTip",
"ID": "EditGameConfigurationToolTip",
"Translations": {
"ar_SA": "ينشئ تكوينًا مستقلًا للعبة الحالية",
"de_DE": "Erstellt eine unabhängige Konfiguration für das aktuelle Spiel",
"el_GR": "Δημιουργεί μια ανεξάρτητη διαμόρφωση για το τρέχον παιχνίδι",
"en_US": "Creates an independent configuration for the selected game",
"en_US": "Creates an independent configuration for the current game",
"es_ES": "Crea una configuración independiente para el juego actual",
"fr_FR": "Crée une configuration indépendante pour le jeu en cours",
"he_IL": "יוצר תצורה עצמאית למשחק הנוכחי",
@@ -2847,31 +2822,6 @@
"zh_TW": "為當前遊戲創建獨立的配置"
}
},
{
"ID": "EditCustomConfigurationToolTip",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Edit your existing independent configuration for the selected game",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{
"ID": "GameListContextMenuShowCompatEntry",
"Translations": {
@@ -24173,37 +24123,12 @@
}
},
{
"ID": "GameSpecificConfigurationHeader",
"ID": "UserConfigurationHeader",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Custom Config",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{
"ID": "GameSpecificConfigurationGlobal",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "(Global)",
"en_US": "User Config",
"es_ES": "",
"fr_FR": "",
"he_IL": "",

View File

@@ -42,33 +42,52 @@ namespace Ryujinx.Ava
List<string> arguments = CommandLineState.Arguments.ToList();
string executableDirectory = AppDomain.CurrentDomain.BaseDirectory;
var dialogTask = taskDialog.ShowAsync(true);
await Task.Delay(500);
// Find the process name.
string ryuName = Path.GetFileName(Environment.ProcessPath) ?? string.Empty;
// Fallback if the executable could not be found.
if (ryuName.Length == 0 || !Path.Exists(Path.Combine(executableDirectory, ryuName)))
// On macOS we perform the update at relaunch.
if (OperatingSystem.IsMacOS())
{
ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx";
string baseBundlePath = Path.GetFullPath(Path.Combine(executableDirectory, "..", ".."));
string newBundlePath = Path.Combine(_updateDir, "Ryujinx.app");
string updaterScriptPath = Path.Combine(newBundlePath, "Contents", "Resources", "updater.sh");
string currentPid = Environment.ProcessId.ToString();
arguments.InsertRange(0, new List<string> { updaterScriptPath, baseBundlePath, newBundlePath, currentPid });
Process.Start("/bin/bash", arguments);
}
ProcessStartInfo processStart = new(ryuName)
else
{
UseShellExecute = true,
WorkingDirectory = executableDirectory,
};
var dialogTask = taskDialog.ShowAsync(true);
await Task.Delay(500);
foreach (var arg in args)
{
processStart.ArgumentList.Add(arg);
// Find the process name.
string ryuName = Path.GetFileName(Environment.ProcessPath) ?? string.Empty;
// Some operating systems can see the renamed executable, so strip off the .ryuold if found.
if (ryuName.EndsWith(".ryuold"))
{
ryuName = ryuName[..^7];
}
// Fallback if the executable could not be found.
if (ryuName.Length == 0 || !Path.Exists(Path.Combine(executableDirectory, ryuName)))
{
ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx";
}
ProcessStartInfo processStart = new(ryuName)
{
UseShellExecute = true,
WorkingDirectory = executableDirectory,
};
foreach (var arg in args)
{
processStart.ArgumentList.Add(arg);
}
processStart.ArgumentList.Add(gamePath);
Process.Start(processStart);
}
processStart.ArgumentList.Add(gamePath);
Process.Start(processStart);
Environment.Exit(0);
}
}

View File

@@ -19,18 +19,11 @@
Header="{ext:Locale GameListContextMenuCreateShortcut}"
Icon="{ext:Icon fa-solid fa-bookmark}"
ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
<MenuItem
Click="EditGameConfiguration_Click"
IsVisible="{Binding SelectedApplication.HasIndependentConfiguration}"
Header="{ext:Locale GameListContextMenuEditCustomConfiguration}"
Icon="{ext:Icon fa-solid fa-gear}"
ToolTip.Tip="{ext:Locale EditCustomConfigurationToolTip}" />
<MenuItem
Click="EditGameConfiguration_Click"
IsVisible="{Binding !SelectedApplication.HasIndependentConfiguration}"
Header="{ext:Locale GameListContextMenuCreateCustomConfiguration}"
Header="{ext:Locale GameListContextMenuEditGameConfiguration}"
Icon="{ext:Icon fa-solid fa-gear}"
ToolTip.Tip="{ext:Locale CreateCustomConfigurationToolTip}" />
ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
<MenuItem
IsVisible="{Binding HasCompatibilityEntry}"
Click="OpenApplicationCompatibility_Click"

View File

@@ -200,7 +200,7 @@ namespace Ryujinx.Ava.UI.Controls
if (backupDir.Exists)
{
cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
cacheFiles.AddRange(backupDir.EnumerateFiles("*.info"));
cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
}
if (cacheFiles.Count > 0)

View File

@@ -81,7 +81,7 @@
TextWrapping="Wrap" />
<TextBlock
IsVisible="{Binding HasIndependentConfiguration}"
Text="{ext:Locale GameSpecificConfigurationHeader}"
Text="{ext:Locale UserConfigurationHeader}"
TextAlignment="Center"
TextWrapping="Wrap"
Foreground="{DynamicResource Warning}" />
@@ -110,7 +110,7 @@
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
Text="{ext:Locale GameSpecificConfigurationHeader}"
Text="{ext:Locale UserConfigurationHeader}"
TextAlignment="Center"
TextWrapping="Wrap" />
</Border>

View File

@@ -160,7 +160,7 @@
<TextBlock
HorizontalAlignment="Stretch"
IsVisible="{Binding HasIndependentConfiguration}"
Text="{ext:Locale GameSpecificConfigurationHeader}"
Text="{ext:Locale UserConfigurationHeader}"
TextAlignment="Start"
TextWrapping="Wrap"
Foreground="{DynamicResource Warning}" />

View File

@@ -43,9 +43,17 @@ namespace Ryujinx.Ava
private const int ConnectionCount = 4;
private static string _buildVer;
private static readonly string _platformExt = BuildPlatformExtension();
private static readonly string _platformExt =
RunningPlatform.IsMacOS
? "macos_universal.app.tar.gz"
: RunningPlatform.IsWindows
? "win_x64.zip"
: RunningPlatform.IsX64Linux
? "linux_x64.tar.gz"
: RunningPlatform.IsArmLinux
? "linux_arm64.tar.gz"
: throw new PlatformNotSupportedException();
private static string _buildUrl;
private static long _buildSize;
@@ -772,34 +780,5 @@ namespace Ryujinx.Ava
public static void CleanupUpdate() =>
Directory.GetFiles(_homeDir, "*.ryuold", SearchOption.AllDirectories)
.ForEach(File.Delete);
private static string BuildPlatformExtension()
{
if (RunningPlatform.IsMacOS)
return "macos_universal.app.tar.gz";
#pragma warning disable CS8509 // It is exhaustive for any values this can contain.
string osPrefix = RunningPlatform.CurrentOS switch
{
OperatingSystemType.Linux => "linux",
OperatingSystemType.Windows => "win"
};
string archSuffix = RunningPlatform.Architecture switch
{
Architecture.Arm64 => "arm64",
Architecture.X64 => "x64",
_ => throw new PlatformNotSupportedException($"Unknown architecture {Enum.GetName(RunningPlatform.Architecture)}."),
};
string fileExtension = RunningPlatform.CurrentOS switch
#pragma warning restore CS8509
{
OperatingSystemType.Linux => "tar.gz",
OperatingSystemType.Windows => "zip"
};
return $"{osPrefix}_{archSuffix}.{fileExtension}";
}
}
}

View File

@@ -59,13 +59,12 @@ namespace Ryujinx.Ava.Utilities.PlayReport
"Race" => "Racing",
_ => FormattedValue.ForceReset
};
private static FormattedValue PokemonSV(MultiValue values)
{
string playStatus = values.Matched[0].BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
FormattedValue locations = values.Matched[1].ToString() switch
private static FormattedValue PokemonSVUnionCircle(SingleValue value)
=> value.Matched.BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
private static FormattedValue PokemonSVArea(SingleValue value)
=> value.Matched.StringValue switch
{
// Base Game Locations
"a_w01" => "South Area One",
@@ -93,13 +92,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
"a_w24" => "South Paldean Sea",
"a_w25" => "West Paldean Sea",
"a_w26" => "East Paldean Sea",
"a_w27" => "North Paldean Sea",
"a_w27" => "Nouth Paldean Sea",
//TODO DLC Locations
_ => FormattedValue.ForceReset
};
return$"{playStatus} in {locations}";
}
private static FormattedValue SuperSmashBrosUltimate_Mode(SparseMultiValue values)
{
@@ -119,11 +115,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
return $"Achievement Unlocked - ID: {anniversary}";
}
if (values.Matched.ContainsKey("is_created"))
{
return "Edited a Custom Stage!";
}
if (values.Matched.ContainsKey("adv_slot"))
{
return

View File

@@ -59,8 +59,9 @@ namespace Ryujinx.Ava.Utilities.PlayReport
.AddSpec(
["0100a3d008c5c000", "01008f6008c5e000"],
spec => spec
.WithDescription("based on if you're playing alone or in a group and what area of Paldea you're exploring.")
.AddMultiValueFormatter(["team_circle", "area_no"], PokemonSV)
.WithDescription("based on what area of Paldea you're exploring.")
.AddValueFormatter("area_no", PokemonSVArea)
.AddValueFormatter("team_circle", PokemonSVUnionCircle)
)
.AddSpec(
"01006a800016e000",
@@ -70,7 +71,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
[
// Metadata to figure out what PlayReport we have.
"match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
"adv_slot", "is_created",
"adv_slot",
// List of Fighters
"player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
"player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",