Restore pull request #899

Author: maddie480

Celeste.Mod.mm/Content/Dialog/English.txt

@@ -187,6 +187,8 @@
 	LEVELSET_CELESTE= 		Celeste
 	LEVELSET_= 				Uncategorized
 
+	MISSING_VANILLA_DATA= Missing Vanilla data :(
+
 # Updater
 	UPDATER_TITLE= 					UPDATER
 	UPDATER_LEGACYREF_TITLE=		LEGACYREF SETUP

Celeste.Mod.mm/Patches/OuiFileSelect.cs

@@ -8,12 +8,31 @@
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using MonoMod.Cil;
+using Celeste.Mod;
 
 namespace Celeste {
     class patch_OuiFileSelect : OuiFileSelect {
 
         internal bool startingNewFile;
 
+        public extern void orig_LoadThread();
+        public new void LoadThread() {
+            orig_LoadThread();
+
+            string saveFilePath = patch_UserIO.GetSaveFilePath();
+            if (!Directory.Exists(saveFilePath))
+                return;
+
+            for (int i = 0; i < Slots.Count() - 1; i++) { // - 1, last slot is always empty
+                if (!Slots[i].Exists && Directory.GetFiles(saveFilePath, $"{i}-mod*.celeste").Length > 0) {
+                    Logger.Warn("OuiFileSelect", $"Save slot {i} has modded data but no vanilla save data, flagging as corrupted");
+                    ((patch_OuiFileSelectSlot) Slots[i]).MissingVanillaData = true;
+                    Slots[i].Corrupted = true;
+                    Slots[i].Exists = true; // both `Corrupted` and `Exists` flags must be set
+                }
+            }
+        }
+
         [PatchOuiFileSelectSubmenuChecks] // we want to manipulate the orig method with MonoModRules
         public extern IEnumerator orig_Enter(Oui from);
         public new IEnumerator Enter(Oui from) {
@@ -28,12 +47,16 @@ class patch_OuiFileSelect : OuiFileSelect {
                     maxSaveFile = 1; // we're adding 2 later, so there will be at least 3 slots.
                     string saveFilePath = patch_UserIO.GetSaveFilePath();
                     if (Directory.Exists(saveFilePath)) {
-                        foreach (string filePath in Directory.GetFiles(saveFilePath)) {
+                        foreach (string filePath in Directory.GetFiles(saveFilePath, "*.celeste")) {
                             string fileName = Path.GetFileName(filePath);
                             // is the file named [number].celeste?
-                            if (fileName.EndsWith(".celeste") && int.TryParse(fileName.Substring(0, fileName.Length - 8), out int fileIndex)) {
+                            if (int.TryParse(fileName.Substring(0, fileName.Length - 8), out int fileIndex)) {
                                 maxSaveFile = Math.Max(maxSaveFile, fileIndex);
                             }
+                            // or is the file mod data named [number]-mod[save|session]-[modname].celeste?
+                            if (fileName.Contains("-mod") && int.TryParse(fileName.Substring(0, fileName.IndexOf('-')), out int modFileIndex)) {
+                                maxSaveFile = Math.Max(maxSaveFile, modFileIndex);
+                            }
                         }
                     }
 

Celeste.Mod.mm/Patches/OuiFileSelectSlot.cs

@@ -44,6 +44,8 @@ public interface ISubmenu { }
 
         private OuiFileSelectSlotLevelSetPicker newGameLevelSetPicker;
 
+        public bool MissingVanillaData;
+
         // computed maximums for stamp rendering
         private int maxStrawberryCount;
         private int maxGoldenStrawberryCount;
@@ -204,8 +206,6 @@ private void OnExistingFileRenameSelected() {
 
         public extern void orig_OnNewGameSelected();
         public void OnNewGameSelected() {
-            patch_SaveData.TryDeleteModSaveData(FileSlot);
-
             orig_OnNewGameSelected();
 
             string newGameLevelSet = newGameLevelSetPicker?.NewGameLevelSet;
@@ -291,6 +291,7 @@ public class Button {
             public float Scale = 1f;
         }
 
+        [PatchFileSelectSlotRenderMissingVanillaDataDialog]
         [PatchFileSelectSlotRender] // manually manipulate the method via MonoModRules
         public extern void orig_Render();
         public override void Render() {
@@ -354,6 +355,12 @@ class PatchFileSelectSlotRenderAttribute : Attribute { }
     [MonoModCustomMethodAttribute(nameof(MonoModRules.PatchOuiFileSelectSlotOnContinueSelected))]
     class PatchOuiFileSelectSlotOnContinueSelectedAttribute : Attribute { }
 
+    /// <summary>
+    /// Patches the method to differentiate between Corrupted and MissingVanillaData.
+    /// </summary>
+    [MonoModCustomMethodAttribute(nameof(MonoModRules.PatchFileSelectSlotRenderMissingVanillaDataDialog))]
+    class PatchFileSelectSlotRenderMissingVanillaDataDialog : Attribute { }
+
     static partial class MonoModRules {
 
         public static void PatchOuiFileSelectSlotUpdate(ILContext context, CustomAttribute attrib) {
@@ -370,6 +377,48 @@ public static void PatchOuiFileSelectSlotUpdate(ILContext context, CustomAttribu
             cursor.Next.OpCode = OpCodes.Brfalse;
         }
 
+        public static void PatchFileSelectSlotRenderMissingVanillaDataDialog(ILContext context, CustomAttribute attrib) {
+            TypeDefinition declaringType = context.Method.DeclaringType;
+            FieldDefinition f_MissingVanillaData = declaringType.FindField("MissingVanillaData");
+
+            ILCursor cursor = new ILCursor(context);
+
+            // C# change:
+            // [...]
+            // else if (Corrupted)
+            // {
+            // -    ActiveFont.Draw(Dialog.Clean("file_corrupted"), slide2, new Vector2(0.5f, 0.5f), Vector2.One, Color.Black * 0.8f);
+            // +    ActiveFont.Draw(Dialog.Clean((!MissingVanillaData) ? "file_corrupted" : "MISSING_VANILLA_DATA"), vector3, new Vector2(0.5f, 0.5f), Vector2.One, Color.Black * 0.8f);
+            // }
+            // [...]
+
+            // IL change:
+            // [...]
+            //          ldfld System.Boolean Celeste.OuiFileSelectSlot::Corrupted
+            //          brfalse.s (...)
+            // +        ldarg.0
+            // +        ldfld bool Celeste.OuiFileSelectSlot::MissingVanillaData
+            // +        brfalse.s ldstr
+            // +        ldstr "MISSING_VANILLA_DATA"
+            // +        br.s ldnull
+            // ldstr  : ldstr "file_corrupted"
+            // ldnull : ldnull
+            //          call string Celeste.Dialog::Clean(string, class Celeste.Language)
+            // [...]
+
+            cursor.GotoNext(MoveType.Before, instr => instr.MatchLdstr("file_corrupted"));
+            ILLabel ldstr = cursor.MarkLabel();
+            cursor.GotoNext();
+            ILLabel ldnull = cursor.MarkLabel();
+
+            cursor.GotoLabel(ldstr, MoveType.Before);
+            cursor.EmitLdarg0();
+            cursor.EmitLdfld(f_MissingVanillaData);
+            cursor.EmitBrfalse(ldstr);
+            cursor.EmitLdstr("MISSING_VANILLA_DATA");
+            cursor.EmitBr(ldnull);
+        }
+
         public static void PatchFileSelectSlotRender(ILContext context, CustomAttribute attrib) {
             TypeDefinition declaringType = context.Method.DeclaringType;
             FieldDefinition f_maxStrawberryCount = declaringType.FindField("maxStrawberryCount");

Celeste.Mod.mm/Patches/SaveData.cs

@@ -6,6 +6,7 @@
 using MonoMod;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Xml;
@@ -297,8 +298,19 @@ public static void LoadModSaveData(int slot) {
 
         public static extern bool orig_TryDelete(int slot);
         public static new bool TryDelete(int slot) {
-            if (!orig_TryDelete(slot))
-                return false;
+            bool vanillaExists = false;
+            string saveFilePath = patch_UserIO.GetSaveFilePath();
+            if (Directory.Exists(saveFilePath))
+                vanillaExists = File.Exists(Path.Combine(saveFilePath, $"{slot}.celeste"));
+
+            if (vanillaExists) {
+                if (!orig_TryDelete(slot)) {
+                    return false;
+                }
+            }
+            else
+                Logger.Warn("SaveData", $"Deleting save data for slot {slot} which has no vanilla data");
+
             return TryDeleteModSaveData(slot);
         }