From e577c1710ef36bda672f80cb0962fb31c28985d5 Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Wed, 19 Jun 2024 15:02:13 +0700
Subject: [PATCH 01/20] Force enable repair and cache on debug

---
 CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs b/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs
index 513f2d0ef..978c85576 100644
--- a/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs
+++ b/CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs
@@ -195,12 +195,19 @@ internal class PresetConfig
         public List<string>? GameDispatchArrayURL { get; init; }
 
         public bool? IsPluginUpdateEnabled      { get; init; } = false;
-        public bool? IsCacheUpdateEnabled       { get; init; }
+        
         public bool? IsConvertible              { get; init; }
         public bool? IsExperimental             { get; init; }
         public bool? IsGenshin                  { get; init; }
         public bool? IsHideSocMedDesc           { get; init; } = true;
+        
+        #if !DEBUG
         public bool? IsRepairEnabled            { get; init; }
+        public bool? IsCacheUpdateEnabled       { get; init; }
+        #else
+        public bool? IsRepairEnabled      = true;
+        public bool? IsCacheUpdateEnabled = true;
+        #endif
         public bool? LauncherSpriteURLMultiLang { get; init; }
 
         public byte? CachesListGameVerID { get; init; }

From f3d3fb25cbe71f4dfe9cdc78e67444e4ff857a62 Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Wed, 19 Jun 2024 15:02:38 +0700
Subject: [PATCH 02/20] Fix SR cache and repair

---
 .../GameVersion/StarRail/VersionCheck.cs              | 11 ++++++++---
 Hi3Helper.EncTool                                     |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CollapseLauncher/Classes/GameManagement/GameVersion/StarRail/VersionCheck.cs b/CollapseLauncher/Classes/GameManagement/GameVersion/StarRail/VersionCheck.cs
index 20197b38c..cdeb16df4 100644
--- a/CollapseLauncher/Classes/GameManagement/GameVersion/StarRail/VersionCheck.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameVersion/StarRail/VersionCheck.cs
@@ -1,4 +1,5 @@
 using CollapseLauncher.Interfaces;
+using Hi3Helper;
 using Hi3Helper.EncTool.Parser.AssetMetadata;
 using Hi3Helper.EncTool.Proto.StarRail;
 using Microsoft.UI.Xaml;
@@ -41,12 +42,16 @@ public GameTypeStarRailVersion(UIElement parentUIElement, RegionResourceProp gam
         public override DeltaPatchProperty GetDeltaPatchInfo() => GameDeltaPatchProp == null ? null : GameDeltaPatchProp;
 
 #nullable enable
-        private void InitializeProtoId()
+        public void InitializeProtoId()
         {
             if (base.GamePreset.GameDataTemplates != null && base.GamePreset.GameDataTemplates.Count != 0)
             {
-                byte[]? data = base.GamePreset.GetGameDataTemplate("MagicSpell", new byte[] { 2, 1, 0, 0 });
-                if (data == null) return;
+                byte[]? data = base.GamePreset.GetGameDataTemplate("MagicSpell", new byte[] { 2, 3, 0, 0 });
+                if (data == null)
+                {
+                    Logger.LogWriteLine("[IGameVersionCheck:InitializeProtoId] data is null!", LogType.Error, true);
+                    return;
+                }
 
                 string jsonResponse = Encoding.UTF8.GetString(data);
                 StarRailDispatchGatewayProps.Deserialize(jsonResponse);
diff --git a/Hi3Helper.EncTool b/Hi3Helper.EncTool
index 99fb0f258..18b1cef15 160000
--- a/Hi3Helper.EncTool
+++ b/Hi3Helper.EncTool
@@ -1 +1 @@
-Subproject commit 99fb0f25889c0a89463bcba41246fb6e63b52310
+Subproject commit 18b1cef1565110202172d98bf93271dcbee1679f

From 16f322592e954630ca90d6bb53c2d93faafc3071 Mon Sep 17 00:00:00 2001
From: Shatyuka <shatyuka@qq.com>
Date: Wed, 19 Jun 2024 21:22:58 +0800
Subject: [PATCH 03/20] Fix ContentDialog crash in install thread

---
 .../MainApp/Pages/Dialogs/SimpleDialogs.cs    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs b/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs
index e9fe1eef3..bab213f94 100644
--- a/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs
+++ b/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs
@@ -6,6 +6,7 @@
 using CollapseLauncher.Statics;
 using CommunityToolkit.WinUI;
 using Hi3Helper;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -1229,21 +1230,24 @@ public static async ValueTask<ContentDialogResult> SpawnDialog(
             string secondaryText = null, ContentDialogButton defaultButton = ContentDialogButton.Primary,
             ContentDialogTheme dialogTheme = ContentDialogTheme.Informational)
         {
-            // Create a new instance of dialog
-            ContentDialogCollapse dialog = new ContentDialogCollapse(dialogTheme)
+            return await DispatcherQueue.GetForCurrentThread().EnqueueAsync(async() =>
             {
-                Title = title,
-                Content = content,
-                CloseButtonText = closeText,
-                PrimaryButtonText = primaryText,
-                SecondaryButtonText = secondaryText,
-                DefaultButton = defaultButton,
-                Style = CollapseUIExt.GetApplicationResource<Style>("CollapseContentDialogStyle"),
-                XamlRoot = (WindowUtility.CurrentWindow is MainWindow mainWindow) ? mainWindow.Content.XamlRoot : Content.XamlRoot
-            };
+                // Create a new instance of dialog
+                ContentDialogCollapse dialog = new ContentDialogCollapse(dialogTheme)
+                {
+                    Title = title,
+                    Content = content,
+                    CloseButtonText = closeText,
+                    PrimaryButtonText = primaryText,
+                    SecondaryButtonText = secondaryText,
+                    DefaultButton = defaultButton,
+                    Style = CollapseUIExt.GetApplicationResource<Style>("CollapseContentDialogStyle"),
+                    XamlRoot = (WindowUtility.CurrentWindow is MainWindow mainWindow) ? mainWindow.Content.XamlRoot : Content.XamlRoot
+                };
 
-            // Queue and spawn the dialog instance
-            return await dialog.QueueAndSpawnDialog();
+                // Queue and spawn the dialog instance
+                return await dialog.QueueAndSpawnDialog();
+            });
         }
 
         public static async ValueTask<ContentDialogResult> QueueAndSpawnDialog(this ContentDialog dialog)

From 93280194775cf21159419a23a854eef8a083b988 Mon Sep 17 00:00:00 2001
From: Shatyuka <shatyuka@qq.com>
Date: Wed, 19 Jun 2024 22:01:48 +0800
Subject: [PATCH 04/20] Get DispatcherQueue from Content

---
 CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs b/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs
index bab213f94..cfd52fcb6 100644
--- a/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs
+++ b/CollapseLauncher/XAMLs/MainApp/Pages/Dialogs/SimpleDialogs.cs
@@ -6,7 +6,6 @@
 using CollapseLauncher.Statics;
 using CommunityToolkit.WinUI;
 using Hi3Helper;
-using Microsoft.UI.Dispatching;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -1230,7 +1229,7 @@ public static async ValueTask<ContentDialogResult> SpawnDialog(
             string secondaryText = null, ContentDialogButton defaultButton = ContentDialogButton.Primary,
             ContentDialogTheme dialogTheme = ContentDialogTheme.Informational)
         {
-            return await DispatcherQueue.GetForCurrentThread().EnqueueAsync(async() =>
+            return await Content.DispatcherQueue.EnqueueAsync(async() =>
             {
                 // Create a new instance of dialog
                 ContentDialogCollapse dialog = new ContentDialogCollapse(dialogTheme)

From 69c3c305dbe21b39dc6cc17e003c5ce62c431ecb Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Wed, 19 Jun 2024 23:35:23 +0700
Subject: [PATCH 05/20] Check for tag EOF

---
 Hi3Helper.EncTool | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Hi3Helper.EncTool b/Hi3Helper.EncTool
index 18b1cef15..96fc60a41 160000
--- a/Hi3Helper.EncTool
+++ b/Hi3Helper.EncTool
@@ -1 +1 @@
-Subproject commit 18b1cef1565110202172d98bf93271dcbee1679f
+Subproject commit 96fc60a414642de34330f6841fb0dbde01bc4cb8

From 82b16c841f4a63ce896274b85db890c0516b9510 Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 00:45:26 +0700
Subject: [PATCH 06/20] Use lookup to add non-existence SR proto values

---
 Hi3Helper.EncTool | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Hi3Helper.EncTool b/Hi3Helper.EncTool
index 96fc60a41..2fc3be162 160000
--- a/Hi3Helper.EncTool
+++ b/Hi3Helper.EncTool
@@ -1 +1 @@
-Subproject commit 96fc60a414642de34330f6841fb0dbde01bc4cb8
+Subproject commit 2fc3be162c840c607192e7dfa919d89bb47344fb

From 2ad1f75757f8c244cd6bc6aa9c776ef22a236a0c Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 00:50:53 +0700
Subject: [PATCH 07/20] Fix debug message on SR proto

---
 Hi3Helper.EncTool | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Hi3Helper.EncTool b/Hi3Helper.EncTool
index 2fc3be162..5e6dc9b47 160000
--- a/Hi3Helper.EncTool
+++ b/Hi3Helper.EncTool
@@ -1 +1 @@
-Subproject commit 2fc3be162c840c607192e7dfa919d89bb47344fb
+Subproject commit 5e6dc9b4709347d8775c9f2dcc92a436cc16e609

From ca3d158dacbe915f50b7ab5a1a44c2b7cf8a8e60 Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 01:09:44 +0700
Subject: [PATCH 08/20] Fix throw on adding other installed VO on Sophon

---
 .../InstallManagement/BaseClass/InstallManagerBase.cs      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
index bf40fbd83..8ebf10bcd 100644
--- a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
+++ b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
@@ -852,7 +852,7 @@ public virtual async Task StartPackageUpdateSophon(GameInstallStateEnum gameStat
                 if (_gameAudioLangListPath != null)
                 {
                     // Add existing voice-over diff data
-                    await AddAdditionalVODiffAssetsToList(httpClient, requestedBaseUrlFrom, requestedBaseUrlTo, sophonUpdateAssetList);
+                    await AddSophonAdditionalVODiffAssetsToList(httpClient, requestedBaseUrlFrom, requestedBaseUrlTo, sophonUpdateAssetList);
                 }
 
                 // Get the remote total size and current total size
@@ -940,7 +940,7 @@ private async Task AddSophonDiffAssetsToList(HttpClient httpClient,
             }
         }
 
-        private async Task AddAdditionalVODiffAssetsToList(HttpClient httpClient,
+        private async Task AddSophonAdditionalVODiffAssetsToList(HttpClient httpClient,
             string requestedUrlFrom, string requestedUrlTo, List<SophonAsset> sophonPreloadAssetList)
         {
             // Get the main VO language name from Id
@@ -963,7 +963,7 @@ private async Task AddAdditionalVODiffAssetsToList(HttpClient httpClient,
                             continue;
 
                         // Get other lang Id, pass it and try add to the list
-                        string otherLangId = GetLanguageStringByLocaleCode(line);
+                        string otherLangId = GetLanguageLocaleCodeByLanguageString(line);
                         // Get the manifest pair for both previous (from) and next (to) version for other VOs
                         await AddSophonDiffAssetsToList(httpClient, requestedUrlFrom, requestedUrlTo, sophonPreloadAssetList, otherLangId);
                     }
@@ -1938,6 +1938,7 @@ public virtual List<PkgVersionProperties> TryGetHDiffList()
         protected virtual string GetLanguageLocaleCodeByLanguageString(string langString) => langString switch
         {
             "Chinese" => "zh-cn",
+            "English" => "en-us",
             "English(US)" => "en-us",
             "Korean" => "ko-kr",
             "Japanese" => "ja-jp",

From e51aca6c0605ba7fdd2cad73a8d12e7654fdb200 Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 01:33:47 +0700
Subject: [PATCH 09/20] Fix persistent file location on HSR game repair

---
 CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
index 8e5cd5be5..581769302 100644
--- a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
@@ -202,7 +202,7 @@ private async ValueTask CheckAssetType(FilePropertiesRemote asset, List<FileProp
             FileInfo fileInfoPersistent = new FileInfo(StarRailRepairExtension.ReplaceStreamingToPersistentPath(asset.N, _execName, asset.FT));
             FileInfo fileInfoStreaming = new FileInfo(asset.N);
 
-            bool UsePersistent = !fileInfoStreaming.Exists;
+            bool UsePersistent = asset.IsPatchApplicable || !fileInfoStreaming.Exists;
             bool IsPersistentExist = fileInfoPersistent.Exists && fileInfoPersistent.Length == asset.S;
             bool IsStreamingExist = fileInfoStreaming.Exists && fileInfoStreaming.Length == asset.S;
 
@@ -237,8 +237,8 @@ private async ValueTask CheckAssetType(FilePropertiesRemote asset, List<FileProp
                 LogWriteLine($"File [T: {asset.FT}]: {asset.N} is redundant (exist both on persistent and streaming)", LogType.Warning, true);
             }
 
-            // If the file has Hash Mark, then create the hash mark file
-            if (asset.IsHasHashMark && UsePersistent) CreateHashMarkFile(asset.N, asset.CRC);
+            // If the file has Hash Mark or is persistent, then create the hash mark file
+            if (asset.IsHasHashMark || UsePersistent) CreateHashMarkFile(asset.N, asset.CRC);
 
             // Check if both location has the file exist or has the size right
             if (UsePersistent && !IsPersistentExist && !IsStreamingExist)

From 83254acf1b1df06e97271271af51c4d640d10c41 Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 01:58:16 +0700
Subject: [PATCH 10/20] Bump version

---
 CollapseLauncher/CollapseLauncher.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
index 3bb008d7d..78c64a69c 100644
--- a/CollapseLauncher/CollapseLauncher.csproj
+++ b/CollapseLauncher/CollapseLauncher.csproj
@@ -15,7 +15,7 @@
         <Authors>$(Company). neon-nyan, Cry0, bagusnl, shatyuka, gablm.</Authors>
         <Copyright>Copyright 2022-2024 $(Company)</Copyright>
         <!-- Versioning -->
-        <Version>1.80.11</Version>
+        <Version>1.80.12</Version>
         <LangVersion>preview</LangVersion>
         <!-- Target Settings -->
         <Platforms>x64</Platforms>

From 395f3a6a84496776f879cfe7cc8a6ec53bdb7a7a Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 02:22:12 +0700
Subject: [PATCH 11/20] Fix crash when data table's column size expands other
 side

---
 .../CommunityToolkit.Labs/DataTable/DataTable.cs              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CollapseLauncher/XAMLs/Theme/CustomControls/CommunityToolkit.Labs/DataTable/DataTable.cs b/CollapseLauncher/XAMLs/Theme/CustomControls/CommunityToolkit.Labs/DataTable/DataTable.cs
index 9499e6ac7..8626a45de 100644
--- a/CollapseLauncher/XAMLs/Theme/CustomControls/CommunityToolkit.Labs/DataTable/DataTable.cs
+++ b/CollapseLauncher/XAMLs/Theme/CustomControls/CommunityToolkit.Labs/DataTable/DataTable.cs
@@ -147,12 +147,12 @@ protected override Size ArrangeOverride(Size finalSize)
             if (column.CurrentWidth.IsStar)
             {
                 width = proportionalAmount * column.CurrentWidth.Value;
-                column.Arrange(new Rect(x, 0, width, finalSize.Height));
+                column.Arrange(new Rect(x, 0, Math.Clamp(width, 0, int.MaxValue), finalSize.Height));
             }
             else if (column.CurrentWidth.IsAbsolute)
             {
                 width = column.CurrentWidth.Value;
-                column.Arrange(new Rect(x, 0, width, finalSize.Height));
+                column.Arrange(new Rect(x, 0, Math.Clamp(width, 0, int.MaxValue), finalSize.Height));
             }
             else
             {

From ab6f276fdafeb70104f1d4711a0cf866a0f1fbfe Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Thu, 20 Jun 2024 04:59:19 +0700
Subject: [PATCH 12/20] Add fallback on SR repair when asset is not in the
 expected folder

---
 .../RepairManagement/StarRail/Check.cs        | 41 +++++++++++++------
 Hi3Helper.EncTool                             |  2 +-
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
index 581769302..ad5df7c7c 100644
--- a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
@@ -278,11 +278,26 @@ private async ValueTask CheckAssetType(FilePropertiesRemote asset, List<FileProp
 
             // Open and read fileInfo as FileStream
             string fileNameToOpen = UsePersistent ? fileInfoPersistent.FullName : fileInfoStreaming.FullName;
+            try
+            {
+                await CheckFile(fileNameToOpen, asset, targetAssetIndex, token);
+            }
+            catch (FileNotFoundException)
+            {
+                LogWriteLine($"File {fileNameToOpen} is not found while UsePersistent is {UsePersistent}. Retrying...");
+                var fileNameToOpen_Retry = !UsePersistent ? fileInfoPersistent.FullName : fileInfoStreaming.FullName;
+                await CheckFile(fileNameToOpen_Retry, asset, targetAssetIndex, token);
+            }
+
+        }
+
+        async ValueTask CheckFile(string fileNameToOpen, FilePropertiesRemote asset, List<FilePropertiesRemote> targetAssetIndex, CancellationToken token)
+        {
             using (FileStream filefs = new FileStream(fileNameToOpen,
-                FileMode.Open,
-                FileAccess.Read,
-                FileShare.Read,
-                _bufferBigLength))
+                                                      FileMode.Open,
+                                                      FileAccess.Read,
+                                                      FileShare.Read,
+                                                      _bufferBigLength))
             {
                 // If pass the check above, then do CRC calculation
                 // Additional: the total file size progress is disabled and will be incremented after this
@@ -295,15 +310,15 @@ private async ValueTask CheckAssetType(FilePropertiesRemote asset, List<FileProp
                     _progressTotalCountFound++;
 
                     Dispatch(() => AssetEntry.Add(
-                        new AssetProperty<RepairAssetType>(
-                            Path.GetFileName(asset.N),
-                            ConvertRepairAssetTypeEnum(asset.FT),
-                            Path.GetDirectoryName(asset.N),
-                            asset.S,
-                            localCRC,
-                            asset.CRCArray
-                        )
-                    ));
+                                                  new AssetProperty<RepairAssetType>(
+                                                       Path.GetFileName(asset.N),
+                                                       ConvertRepairAssetTypeEnum(asset.FT),
+                                                       Path.GetDirectoryName(asset.N),
+                                                       asset.S,
+                                                       localCRC,
+                                                       asset.CRCArray
+                                                      )
+                                                 ));
 
                     // Mark the main block as "need to be repaired"
                     asset.IsBlockNeedRepair = true;
diff --git a/Hi3Helper.EncTool b/Hi3Helper.EncTool
index 5e6dc9b47..e4c93e783 160000
--- a/Hi3Helper.EncTool
+++ b/Hi3Helper.EncTool
@@ -1 +1 @@
-Subproject commit 5e6dc9b4709347d8775c9f2dcc92a436cc16e609
+Subproject commit e4c93e7838b0c12e51d1e8fbbffeffbcf6e33358

From 698eb075017d7ab6efb8a0e376e7a8eaf2f72985 Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Thu, 20 Jun 2024 06:18:46 +0700
Subject: [PATCH 13/20] [SR Repair] Use hard link instead of ignore

---
 .../Classes/RepairManagement/StarRail/Check.cs  | 17 ++++++++++++-----
 .../Classes/ShortcutCreator/SteamShortcut.cs    | 12 +-----------
 CollapseLauncher/Program.cs                     | 11 +++++++++++
 Hi3Helper.Core/Classes/Data/InvokeProp.cs       |  6 ++++++
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
index ad5df7c7c..1e776c6e2 100644
--- a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
@@ -284,16 +284,23 @@ private async ValueTask CheckAssetType(FilePropertiesRemote asset, List<FileProp
             }
             catch (FileNotFoundException)
             {
-                LogWriteLine($"File {fileNameToOpen} is not found while UsePersistent is {UsePersistent}. Retrying...");
-                var fileNameToOpen_Retry = !UsePersistent ? fileInfoPersistent.FullName : fileInfoStreaming.FullName;
-                await CheckFile(fileNameToOpen_Retry, asset, targetAssetIndex, token);
-            }
+                LogWriteLine($"File {fileNameToOpen} is not found while UsePersistent is {UsePersistent}. " +
+                             $"Creating hard link and retrying...", LogType.Warning, true);
+
+                var targetFile = File.Exists(fileInfoPersistent.FullName) ? fileInfoPersistent.FullName : 
+                    File.Exists(fileInfoStreaming.FullName)           ? fileInfoStreaming.FullName : 
+                                                                        throw new FileNotFoundException(fileNameToOpen);
+                
+                string targetLink     = fileNameToOpen;
 
+                InvokeProp.CreateHardLink(targetLink, targetFile, IntPtr.Zero);
+                await CheckFile(fileNameToOpen, asset, targetAssetIndex, token);
+            }
         }
 
         async ValueTask CheckFile(string fileNameToOpen, FilePropertiesRemote asset, List<FilePropertiesRemote> targetAssetIndex, CancellationToken token)
         {
-            using (FileStream filefs = new FileStream(fileNameToOpen,
+            await using (FileStream filefs = new FileStream(fileNameToOpen,
                                                       FileMode.Open,
                                                       FileAccess.Read,
                                                       FileShare.Read,
diff --git a/CollapseLauncher/Classes/ShortcutCreator/SteamShortcut.cs b/CollapseLauncher/Classes/ShortcutCreator/SteamShortcut.cs
index 99ea2aa1f..751a566ac 100644
--- a/CollapseLauncher/Classes/ShortcutCreator/SteamShortcut.cs
+++ b/CollapseLauncher/Classes/ShortcutCreator/SteamShortcut.cs
@@ -6,9 +6,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Hashing;
-using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
+using static CollapseLauncher.MainEntryPoint;
 using static Hi3Helper.Logger;
 using static Hi3Helper.Shared.Region.LauncherConfig;
 
@@ -154,16 +154,6 @@ internal void MoveImages(string path, PresetConfig preset)
             GetImageFromUrl(gridPath, assets["Preview"], "");
         }
 
-        private static string MD5Hash(string path)
-        {
-            if (!File.Exists(path))
-                return "";
-            FileStream stream = File.OpenRead(path);
-            var hash = MD5.Create().ComputeHash(stream);
-            stream.Close();
-            return BitConverter.ToString(hash).Replace("-", string.Empty).ToLower();
-        }
-
         private async void GetImageFromUrl(string gridPath, SteamGameProp asset, string steamSuffix)
         {
             string steamPath = Path.Combine(gridPath, preliminaryAppID + steamSuffix + ".png");
diff --git a/CollapseLauncher/Program.cs b/CollapseLauncher/Program.cs
index 6d53fb5fc..aae2e5342 100644
--- a/CollapseLauncher/Program.cs
+++ b/CollapseLauncher/Program.cs
@@ -10,6 +10,7 @@
 using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using WinRT;
@@ -268,4 +269,14 @@ public static string GetVersionString()
             return $"Windows 11 (build: {version.Build}.{version.Revision})";
         return $"Windows {version.Major} (build: {version.Build}.{version.Revision})";
     }
+    
+    public static string MD5Hash(string path)
+    {
+        if (!File.Exists(path))
+            return "";
+        FileStream stream = File.OpenRead(path);
+        var        hash   = MD5.Create().ComputeHash(stream);
+        stream.Close();
+        return BitConverter.ToString(hash).Replace("-", string.Empty).ToLower();
+    }
 }
\ No newline at end of file
diff --git a/Hi3Helper.Core/Classes/Data/InvokeProp.cs b/Hi3Helper.Core/Classes/Data/InvokeProp.cs
index fd4bc3476..f6fb7f037 100644
--- a/Hi3Helper.Core/Classes/Data/InvokeProp.cs
+++ b/Hi3Helper.Core/Classes/Data/InvokeProp.cs
@@ -133,6 +133,12 @@ private enum ExecutionState : uint
         [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         private static extern ExecutionState SetThreadExecutionState(ExecutionState esFlags);
 
+        [DllImport("Kernel32.dll", CharSet = CharSet.Unicode )]
+        public static extern bool CreateHardLink(
+            string lpFileName,
+            string lpExistingFileName,
+            IntPtr lpSecurityAttributes
+        );
         #endregion
 
         #region User32

From a8a0fd7ada777d358388bb005eb3d1182442f4b9 Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Thu, 20 Jun 2024 07:04:44 +0700
Subject: [PATCH 14/20] (SR GSP) Add new settings

---
 .../StarRail/RegistryClass/Model.cs           | 154 ++++++++++--------
 .../StarRailGameSettingsPage.Ext.cs           |  21 +++
 .../StarRailGameSettingsPage.xaml             |  25 +++
 .../Locale/LangStarRailGameSettingsPage.cs    |   2 +
 Hi3Helper.Core/Lang/en_US.json                |   2 +
 5 files changed, 139 insertions(+), 65 deletions(-)

diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs
index a4ae38d82..db0ff2871 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/StarRail/RegistryClass/Model.cs
@@ -56,87 +56,98 @@ private static Dictionary<int, int> GenerateStaticFPSIndexDict()
         #region Presets
         private static Model _VeryLowPreset = new()
         {
-            FPS               = 60,
-            EnableVSync       = false,
-            RenderScale       = 0.8,
-            ResolutionQuality = Quality.VeryLow,
-            ShadowQuality     = Quality.Low,
-            LightQuality      = Quality.VeryLow,
-            CharacterQuality  = Quality.Low,
-            EnvDetailQuality  = Quality.VeryLow,
-            ReflectionQuality = Quality.VeryLow,
-            SFXQuality        = Quality.VeryLow,
-            BloomQuality      = Quality.VeryLow,
-            AAMode            = AntialiasingMode.TAA,
-            EnableMetalFXSU   = false,
+            FPS                      = 60,
+            EnableVSync              = false,
+            RenderScale              = 0.8,
+            ResolutionQuality        = Quality.VeryLow,
+            ShadowQuality            = Quality.Low,
+            LightQuality             = Quality.VeryLow,
+            CharacterQuality         = Quality.Low,
+            EnvDetailQuality         = Quality.VeryLow,
+            ReflectionQuality        = Quality.VeryLow,
+            SFXQuality               = Quality.VeryLow,
+            BloomQuality             = Quality.VeryLow,
+            AAMode                   = AntialiasingMode.TAA,
+            EnableMetalFXSU          = false,
+            EnableHalfResTransparent = false,
+            EnableSelfShadow         = 2
+            
         };
 
         private static Model _LowPreset = new()
         {
-            FPS               = 60,
-            EnableVSync       = true,
-            RenderScale       = 1.0,
-            ResolutionQuality = Quality.Low,
-            ShadowQuality     = Quality.Low,
-            LightQuality      = Quality.Low,
-            CharacterQuality  = Quality.Low,
-            EnvDetailQuality  = Quality.Low,
-            ReflectionQuality = Quality.Low,
-            SFXQuality        = Quality.Low,
-            BloomQuality      = Quality.Low,
-            AAMode            = AntialiasingMode.TAA,
-            EnableMetalFXSU   = false,
+            FPS                      = 60,
+            EnableVSync              = true,
+            RenderScale              = 1.0,
+            ResolutionQuality        = Quality.Low,
+            ShadowQuality            = Quality.Low,
+            LightQuality             = Quality.Low,
+            CharacterQuality         = Quality.Low,
+            EnvDetailQuality         = Quality.Low,
+            ReflectionQuality        = Quality.Low,
+            SFXQuality               = Quality.Low,
+            BloomQuality             = Quality.Low,
+            AAMode                   = AntialiasingMode.TAA,
+            EnableMetalFXSU          = false,
+            EnableHalfResTransparent = false,
+            EnableSelfShadow         = 2
         };
 
         private static Model _MediumPreset = new()
         {
-            FPS               = 60,
-            EnableVSync       = true,
-            RenderScale       = 1.0,
-            ResolutionQuality = Quality.Medium,
-            ShadowQuality     = Quality.Medium,
-            LightQuality      = Quality.Medium,
-            CharacterQuality  = Quality.Medium,
-            EnvDetailQuality  = Quality.Medium,
-            ReflectionQuality = Quality.Medium,
-            SFXQuality        = Quality.Medium,
-            BloomQuality      = Quality.Medium,
-            AAMode            = AntialiasingMode.TAA,
-            EnableMetalFXSU   = false,
+            FPS                      = 60,
+            EnableVSync              = true,
+            RenderScale              = 1.0,
+            ResolutionQuality        = Quality.Medium,
+            ShadowQuality            = Quality.Medium,
+            LightQuality             = Quality.Medium,
+            CharacterQuality         = Quality.Medium,
+            EnvDetailQuality         = Quality.Medium,
+            ReflectionQuality        = Quality.Medium,
+            SFXQuality               = Quality.Medium,
+            BloomQuality             = Quality.Medium,
+            AAMode                   = AntialiasingMode.TAA,
+            EnableMetalFXSU          = false,
+            EnableHalfResTransparent = false,
+            EnableSelfShadow         = 2
         };
 
         private static Model _HighPreset = new()
         {
-            FPS               = 60,
-            EnableVSync       = true,
-            RenderScale       = 1.2,
-            ResolutionQuality = Quality.High,
-            ShadowQuality     = Quality.High,
-            LightQuality      = Quality.High,
-            CharacterQuality  = Quality.High,
-            EnvDetailQuality  = Quality.High,
-            ReflectionQuality = Quality.High,
-            SFXQuality        = Quality.High,
-            BloomQuality      = Quality.High,
-            AAMode            = AntialiasingMode.TAA,
-            EnableMetalFXSU   = false,
+            FPS                      = 60,
+            EnableVSync              = true,
+            RenderScale              = 1.2,
+            ResolutionQuality        = Quality.High,
+            ShadowQuality            = Quality.High,
+            LightQuality             = Quality.High,
+            CharacterQuality         = Quality.High,
+            EnvDetailQuality         = Quality.High,
+            ReflectionQuality        = Quality.High,
+            SFXQuality               = Quality.High,
+            BloomQuality             = Quality.High,
+            AAMode                   = AntialiasingMode.TAA,
+            EnableMetalFXSU          = false,
+            EnableHalfResTransparent = false,
+            EnableSelfShadow         = 1
         };
 
         private static Model _VeryHighPreset = new()
         {
-            FPS               = 60,
-            EnableVSync       = true,
-            RenderScale       = 1.4,
-            ResolutionQuality = Quality.VeryHigh,
-            ShadowQuality     = Quality.High,
-            LightQuality      = Quality.VeryHigh,
-            CharacterQuality  = Quality.High,
-            EnvDetailQuality  = Quality.VeryHigh,
-            ReflectionQuality = Quality.VeryHigh,
-            SFXQuality        = Quality.High,
-            BloomQuality      = Quality.VeryHigh,
-            AAMode            = AntialiasingMode.TAA,
-            EnableMetalFXSU   = false,
+            FPS                      = 60,
+            EnableVSync              = true,
+            RenderScale              = 1.4,
+            ResolutionQuality        = Quality.VeryHigh,
+            ShadowQuality            = Quality.High,
+            LightQuality             = Quality.VeryHigh,
+            CharacterQuality         = Quality.High,
+            EnvDetailQuality         = Quality.VeryHigh,
+            ReflectionQuality        = Quality.VeryHigh,
+            SFXQuality               = Quality.High,
+            BloomQuality             = Quality.VeryHigh,
+            AAMode                   = AntialiasingMode.TAA,
+            EnableMetalFXSU          = false,
+            EnableHalfResTransparent = false,
+            EnableSelfShadow         = 1
         };
         #endregion
 
@@ -231,6 +242,19 @@ private static Dictionary<int, int> GenerateStaticFPSIndexDict()
         /// Default: false
         /// </summary>
         public bool EnableMetalFXSU { get; set; }
+        
+        /// <summary>
+        /// This controls if the resolution of transparency object is halved. <br/>
+        /// There is no in-game setting for this, and it's also not controlled by preset.
+        /// </summary>
+        public bool EnableHalfResTransparent { get; set; }
+        
+        /// <summary>
+        /// This defines "<c>Real Time Character Shadow in Map Exploration</c>" combobox in-game settings. <br/>
+        /// Options: Off (2), On (1)
+        /// </summary>
+        // dont ask why
+        public int EnableSelfShadow { get; set; }
 
         #endregion
 
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.Ext.cs b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.Ext.cs
index 531eb80a8..f0272189c 100644
--- a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.Ext.cs
+++ b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.Ext.cs
@@ -1,4 +1,5 @@
 using CollapseLauncher.GameSettings.StarRail;
+using Hi3Helper;
 using Hi3Helper.Screen;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -288,6 +289,26 @@ public int AAMode
             get => Math.Clamp((int)Settings.GraphicsSettings.AAMode, 0, 2);
             set => Settings.GraphicsSettings.AAMode = (AntialiasingMode)value;
         }
+        //EnableSelfShadow
+        public bool SelfShadow
+        {
+            get
+            {
+                var v = Settings.GraphicsSettings.EnableSelfShadow;
+                if (v == 1) return true;
+                if (v == 2) return false;
+                Logger.LogWriteLine($"Self Shadow value is unknown! Val: {v}", LogType.Error, true);
+                return false;
+
+            }
+            set => Settings.GraphicsSettings.EnableSelfShadow = value ? 1 : 2;
+        }
+        //HalfResTransparent
+        public bool HalfResTransparent
+        {
+            get => Settings.GraphicsSettings.EnableHalfResTransparent;
+            set => Settings.GraphicsSettings.EnableHalfResTransparent = value;
+        }
         #endregion
 
         #region Audio
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml
index c3cb076ee..6d16133c6 100644
--- a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml
+++ b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml
@@ -486,6 +486,31 @@
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
+                            <StackPanel>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <CheckBox x:Name="ToggleSelfShadow"
+                                              Grid.Column="0"
+                                              HorizontalAlignment="Left"
+                                              VerticalAlignment="Center"
+                                              IsChecked="{x:Bind SelfShadow, Mode=TwoWay}">
+                                        <TextBlock Text="{x:Bind helper:Locale.Lang._StarRailGameSettingsPage.Graphics_SelfShadow}"
+                                                   TextWrapping="WrapWholeWords" />
+                                    </CheckBox>
+                                    <CheckBox x:Name="ToggleHalfResTransparency"
+                                              Grid.Column="1"
+                                              HorizontalAlignment="Left"
+                                              VerticalAlignment="Center"
+                                              IsChecked="{x:Bind HalfResTransparent, Mode=TwoWay}">
+                                        <TextBlock Text="{x:Bind helper:Locale.Lang._StarRailGameSettingsPage.Graphics_HalfResTransparent}"
+                                                   TextWrapping="WrapWholeWords" />
+                                    </CheckBox>
+                                </Grid>
+                            </StackPanel>
                         </StackPanel>
                     </Grid>
                     <MenuFlyoutSeparator Margin="0,4,0,8" />
diff --git a/Hi3Helper.Core/Lang/Locale/LangStarRailGameSettingsPage.cs b/Hi3Helper.Core/Lang/Locale/LangStarRailGameSettingsPage.cs
index dc7bff364..4d97495b7 100644
--- a/Hi3Helper.Core/Lang/Locale/LangStarRailGameSettingsPage.cs
+++ b/Hi3Helper.Core/Lang/Locale/LangStarRailGameSettingsPage.cs
@@ -62,6 +62,8 @@ public sealed class LangStarRailGameSettingsPage
                 public string Graphics_SFXQuality           { get; set; } = LangFallback?._StarRailGameSettingsPage.Graphics_SFXQuality;
                 public string Graphics_AAMode               { get; set; } = LangFallback?._StarRailGameSettingsPage.Graphics_AAMode;
                 public string Graphics_SpecPanel            { get; set; } = LangFallback?._StarRailGameSettingsPage.Graphics_SpecPanel;
+                public string Graphics_SelfShadow           { get; set; } = LangFallback?._StarRailGameSettingsPage.Graphics_SelfShadow;
+                public string Graphics_HalfResTransparent   { get; set; } = LangFallback?._StarRailGameSettingsPage.Graphics_HalfResTransparent;
                 public string SpecEnabled                   { get; set; } = LangFallback?._StarRailGameSettingsPage.SpecEnabled;
                 public string SpecDisabled                  { get; set; } = LangFallback?._StarRailGameSettingsPage.SpecDisabled;
                 public string SpecVeryLow                   { get; set; } = LangFallback?._StarRailGameSettingsPage.SpecVeryLow;
diff --git a/Hi3Helper.Core/Lang/en_US.json b/Hi3Helper.Core/Lang/en_US.json
index 57a84ff20..1a76ab9f3 100644
--- a/Hi3Helper.Core/Lang/en_US.json
+++ b/Hi3Helper.Core/Lang/en_US.json
@@ -1030,6 +1030,8 @@
     "Graphics_BloomQuality": "Bloom Quality",
     "Graphics_AAMode": "Anti-Aliasing Mode",
     "Graphics_SFXQuality": "SFX Quality",
+    "Graphics_SelfShadow": "Character Shadow in Map Exploration",
+    "Graphics_HalfResTransparent": "Half Resolution Transparency",
 
     "Graphics_SpecPanel": "Global Graphics Settings",
     "SpecEnabled": "Enabled",

From 6f7c395e38b3027eb89d2545406efc5d100b9036 Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 11:00:12 +0700
Subject: [PATCH 15/20] Fix invalid location of non-existence persistent file

+ Also fix existing mark files being overwritten
---
 .../Classes/RepairManagement/StarRail/Check.cs             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
index 1e776c6e2..8747f8124 100644
--- a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
@@ -203,6 +203,7 @@ private async ValueTask CheckAssetType(FilePropertiesRemote asset, List<FileProp
             FileInfo fileInfoStreaming = new FileInfo(asset.N);
 
             bool UsePersistent = asset.IsPatchApplicable || !fileInfoStreaming.Exists;
+            bool IsHasMark = asset.IsHasHashMark || UsePersistent;
             bool IsPersistentExist = fileInfoPersistent.Exists && fileInfoPersistent.Length == asset.S;
             bool IsStreamingExist = fileInfoStreaming.Exists && fileInfoStreaming.Length == asset.S;
 
@@ -238,10 +239,11 @@ private async ValueTask CheckAssetType(FilePropertiesRemote asset, List<FileProp
             }
 
             // If the file has Hash Mark or is persistent, then create the hash mark file
-            if (asset.IsHasHashMark || UsePersistent) CreateHashMarkFile(asset.N, asset.CRC);
+            if (IsHasMark) CreateHashMarkFile(asset.N, asset.CRC);
 
             // Check if both location has the file exist or has the size right
-            if (UsePersistent && !IsPersistentExist && !IsStreamingExist)
+            if ((UsePersistent && !IsPersistentExist && !IsStreamingExist)
+             || (UsePersistent && !IsPersistentExist))
             {
                 // Update the total progress and found counter
                 _progressTotalSizeFound += asset.S;
@@ -353,6 +355,7 @@ private void CreateHashMarkFile(string filePath, string hash)
 
             // Re-create the hash file
             string toName = Path.Combine(basePath, $"{baseName}_{hash}.hash");
+            if (File.Exists(toName)) return;
             File.Create(toName).Dispose();
         }
         #endregion

From 743851beb89268714b1616683495dff4589f1845 Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 11:26:53 +0700
Subject: [PATCH 16/20] Adding check to not override files with patch mark
 applied

---
 .../Classes/RepairManagement/StarRail/Fetch.cs            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CollapseLauncher/Classes/RepairManagement/StarRail/Fetch.cs b/CollapseLauncher/Classes/RepairManagement/StarRail/Fetch.cs
index 2723822bb..4d0895392 100644
--- a/CollapseLauncher/Classes/RepairManagement/StarRail/Fetch.cs
+++ b/CollapseLauncher/Classes/RepairManagement/StarRail/Fetch.cs
@@ -29,11 +29,13 @@ internal static partial class StarRailRepairExtension
 
         internal static void AddSanitize(this List<FilePropertiesRemote> assetIndex, FilePropertiesRemote assetProperty)
         {
+            string key = assetProperty.N + assetProperty.IsPatchApplicable;
+
             // Check if the asset has the key
-            if (_hashtable.ContainsKey(assetProperty.N))
+            if (_hashtable.ContainsKey(key))
             {
                 // If yes (exist), then get the index of the asset from hashtable
-                int index = _hashtable[assetProperty.N];
+                int index = _hashtable[key];
 
                 // Get the property of the asset based on index from hashtable
                 FilePropertiesRemote oldAssetProperty = assetIndex[index];
@@ -50,7 +52,7 @@ internal static void AddSanitize(this List<FilePropertiesRemote> assetIndex, Fil
                 return;
             }
 
-            _hashtable.Add(assetProperty.N, assetIndex.Count);
+            _hashtable.Add(key, assetIndex.Count);
             assetIndex.Add(assetProperty);
         }
     }

From c6083af0210dbc1881420a850e00b35c9a93314d Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 11:52:13 +0700
Subject: [PATCH 17/20] Remove badlist.byte before check is performed

---
 .../Classes/RepairManagement/StarRail/Check.cs             | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
index 8747f8124..e46521bbd 100644
--- a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
@@ -51,6 +51,13 @@ internal partial class StarRailRepair
     {
         private async Task Check(List<FilePropertiesRemote> assetIndex, CancellationToken token)
         {
+            // Try to find "badlist.byte" files in the game folder and delete it
+            foreach (string badlistFile in Directory.EnumerateFiles(_gamePath, "*badlist*.byte*", SearchOption.AllDirectories))
+            {
+                LogWriteLine($"Removing bad list mark at: {badlistFile}", LogType.Warning, true);
+                TryDeleteReadOnlyFile(badlistFile);
+            }
+
             List<FilePropertiesRemote> brokenAssetIndex = new List<FilePropertiesRemote>();
 
             // Set Indetermined status as false

From 26c8b5af7909d06f038ae01798067238b88a4cfe Mon Sep 17 00:00:00 2001
From: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com>
Date: Thu, 20 Jun 2024 11:56:28 +0700
Subject: [PATCH 18/20] Remove verify.fail as well :teri_swing:

---
 .../Classes/RepairManagement/StarRail/Check.cs             | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
index e46521bbd..3e6732b73 100644
--- a/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/RepairManagement/StarRail/Check.cs
@@ -58,6 +58,13 @@ private async Task Check(List<FilePropertiesRemote> assetIndex, CancellationToke
                 TryDeleteReadOnlyFile(badlistFile);
             }
 
+            // Try to find "verify.fail" files in the game folder and delete it
+            foreach (string verifFail in Directory.EnumerateFiles(_gamePath, "*verify*.fail*", SearchOption.AllDirectories))
+            {
+                LogWriteLine($"Removing verify.fail mark at: {verifFail}", LogType.Warning, true);
+                TryDeleteReadOnlyFile(verifFail);
+            }
+
             List<FilePropertiesRemote> brokenAssetIndex = new List<FilePropertiesRemote>();
 
             // Set Indetermined status as false

From 120b66b45baa1b648a882fb4aa72b2ebecd75b38 Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Thu, 20 Jun 2024 12:29:58 +0700
Subject: [PATCH 19/20] Change Discord RPC logo

---
 .../Classes/DiscordPresence/DiscordPresenceManager.cs       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs b/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs
index b912c4067..8a0b54925 100644
--- a/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs
+++ b/CollapseLauncher/Classes/DiscordPresence/DiscordPresenceManager.cs
@@ -238,7 +238,7 @@ public void SetActivity(ActivityType activity)
                                 Details = Lang._Misc.DiscordRP_Default,
                                 Assets = new Assets
                                 {
-                                    LargeImageKey = "launcher-logo",
+                                    LargeImageKey = "launcher-logo-new",
                                     LargeImageText =
                                         $"Collapse Launcher v{LauncherUpdateHelper.LauncherCurrentVersionString} {(IsPreview ? "Preview" : "Stable")}"
                                 }
@@ -269,7 +269,7 @@ private void BuildActivityGameStatus(string activityName, bool isGameStatusEnabl
                     {
                         LargeImageKey  = $"game-{LauncherMetadataHelper.CurrentMetadataConfig?.GameType.ToString().ToLower()}-logo",
                         LargeImageText = $"{curGameNameTranslate} - {curGameRegionTranslate}",
-                        SmallImageKey  = "launcher-logo",
+                        SmallImageKey  = "launcher-logo-new",
                         SmallImageText = $"Collapse Launcher v{LauncherUpdateHelper.LauncherCurrentVersionString} " +
                                          $"{(IsPreview ? "Preview" : "Stable")}"
                     },
@@ -303,7 +303,7 @@ private void BuildActivityAppStatus(string activityName)
                     {
                         LargeImageKey  = $"game-{LauncherMetadataHelper.CurrentMetadataConfig?.GameType.ToString().ToLower()}-logo",
                         LargeImageText = $"{curGameNameTranslate}",
-                        SmallImageKey  = "launcher-logo",
+                        SmallImageKey  = "launcher-logo-new",
                         SmallImageText = $"Collapse Launcher v{LauncherUpdateHelper.LauncherCurrentVersionString} " +
                                          $"{(IsPreview ? "Preview" : "Stable")}"
                     }

From b2598a420fa380ad4384edbe790e561d883f7d4e Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 08:08:04 +0000
Subject: [PATCH 20/20] [skip ci] Sync translation Translate en_US.json in
 ja_JP

100% reviewed source file: 'en_US.json'
on 'ja_JP'.
---
 Hi3Helper.Core/Lang/ja_JP.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Hi3Helper.Core/Lang/ja_JP.json b/Hi3Helper.Core/Lang/ja_JP.json
index 2c32717ee..f850017ca 100644
--- a/Hi3Helper.Core/Lang/ja_JP.json
+++ b/Hi3Helper.Core/Lang/ja_JP.json
@@ -1030,6 +1030,8 @@
     "Graphics_BloomQuality": "ブルーム効果",
     "Graphics_AAMode": "アンチエイリアス",
     "Graphics_SFXQuality": "エフェクトのクオリティ",
+    "Graphics_SelfShadow": "マップ探索内のキャラのリアルタイムシャドウ",
+    "Graphics_HalfResTransparent": "透明オブジェクトのハーフ解像度",
 
     "Graphics_SpecPanel": "画質",
     "SpecEnabled": "有効",