Add option to show true LastArea in FileSelect

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

@@ -100,7 +100,9 @@
 	MODOPTIONS_COREMODULE_WARNONEVERESTYAMLERRORS=			Warn On everest.yaml Errors
 	MODOPTIONS_COREMODULE_WARNONEVERESTYAMLERRORS_DESC=		Useful for mod makers
 	MODOPTIONS_COREMODULE_COLORIZEDLOGGING=			        Colorized Console Logging
-    MODOPTIONS_COREMODULE_COLORIZEDLOGGING_DESC=		    Useful for mod developers
+	MODOPTIONS_COREMODULE_COLORIZEDLOGGING_DESC=		    Useful for mod developers
+	MODOPTIONS_COREMODULE_TRUELASTAREAINFILESELECT=			Show True LastArea in FileSelect
+	MODOPTIONS_COREMODULE_TRUELASTAREAINFILESELECT_DESC=		When a map is unavailable, show its SID instead of defaulting to Vanilla levels
 	MODOPTIONS_COREMODULE_MENUNAV_SUBHEADER=				MENU NAVIGATION
 	MODOPTIONS_COREMODULE_MENUPAGEUP=						Page Up in Menus
 	MODOPTIONS_COREMODULE_MENUPAGEDOWN=						Page Down in Menus

Celeste.Mod.mm/Mod/Core/CoreModuleSettings.cs

@@ -282,6 +282,10 @@ public bool ColorizedLogging {
             }
         }
 
+        [SettingSubText("MODOPTIONS_COREMODULE_TRUELASTAREAINFILESELECT_DESC")]
+        [SettingInGame(false)]
+        public bool TrueLastAreaInFileSelect { get; set; } = false;
+
         // Keep in sync with https://github.com/EverestAPI/Olympus/blob/main/src/scenes/options.lua :: mirrorPreferences
         public string MirrorPreferences { get; set; } = "gb,jade,otobot,wegfan";
 

Celeste.Mod.mm/Patches/OuiFileSelectSlot.cs

@@ -300,6 +300,34 @@ public override void Render() {
             }
         }
 
+        public string GetFurthestAreaName() {
+            if (!CoreModule.Settings.TrueLastAreaInFileSelect || string.IsNullOrEmpty(SaveData.TrueLastAreaSID)) {
+                return Dialog.Clean(AreaData.Areas[FurthestArea].Name);
+            }
+
+            float maxSize = 580;
+            float fullnameExtraSize = ActiveFont.Measure('[').X + ActiveFont.Measure(']').X;
+            float truncatedExtraSize = 3f * ActiveFont.Measure('.').X + fullnameExtraSize;
+
+            int truncatedStart = SaveData.TrueLastAreaSID.Length;
+            float size = 0f;
+
+            while (truncatedStart > 0) {
+                float newSize = size + ActiveFont.Measure(SaveData.TrueLastAreaSID[truncatedStart - 1]).X;
+                if (newSize + truncatedExtraSize > maxSize)
+                    break;
+                size = newSize;
+                truncatedStart -= 1;
+            }
+
+            for (int i = 0; i < truncatedStart; i++) {
+                size += ActiveFont.Measure(SaveData.TrueLastAreaSID[i]).X;
+                if (size + fullnameExtraSize > maxSize)
+                    return "[..." + SaveData.TrueLastAreaSID[truncatedStart..] + "]";
+            }
+            return "[" + SaveData.TrueLastAreaSID + "]";
+        }
+
         // very similar to MoveTo, except the easing is different if the slot was already moving.
         // used for scrolling, since using MoveTo can look weird if holding up or down in file select.
         internal void ScrollTo(float x, float y) {
@@ -350,6 +378,7 @@ public static void PatchFileSelectSlotRender(ILContext context, CustomAttribute
             FieldDefinition f_totalGoldenStrawberries = declaringType.FindField("totalGoldenStrawberries");
             FieldDefinition f_totalHeartGems = declaringType.FindField("totalHeartGems");
             FieldDefinition f_totalCassettes = declaringType.FindField("totalCassettes");
+            MethodDefinition m_GetFurthestAreaName = declaringType.FindMethod("GetFurthestAreaName");
 
             ILCursor cursor = new ILCursor(context);
             // SaveData.TotalStrawberries replaced by SaveData.TotalStrawberries_Safe with MonoModLinkFrom
@@ -407,6 +436,16 @@ public static void PatchFileSelectSlotRender(ILContext context, CustomAttribute
             cursor.RemoveRange(8);
             // Replace with `this.farewellStamp`
             cursor.Emit(OpCodes.Ldfld, f_farewellStamp);
+
+            // Replace Dialog.Clean(AreaData.Areas[FurthestArea].Name)
+            cursor.GotoNext(instr => instr.MatchLdfld("Celeste.AreaData", "Name"),
+                instr => instr.MatchLdnull(),
+                instr => instr.MatchCall("Celeste.Dialog", "Clean"));
+            cursor.Index -= 4;
+            cursor.RemoveRange(7);
+            // Replace with this.GetFurthestAreaName()
+            cursor.Emit(OpCodes.Ldarg_0);
+            cursor.Emit(OpCodes.Callvirt, m_GetFurthestAreaName);
         }
 
         public static void PatchOuiFileSelectSlotOnContinueSelected(ILContext context, CustomAttribute attrib) {

Celeste.Mod.mm/Patches/SaveData.cs

@@ -65,6 +65,9 @@ public LevelSetStats LevelSetStats {
         [MonoModLinkFrom("Celeste.AreaKey Celeste.SaveData::LastArea")]
         public AreaKey LastArea_Safe;
 
+        [XmlIgnore]
+        public string TrueLastAreaSID = null;
+
         // We want use CurrentSession_Safe instead of CurrentSession to avoid breaking vanilla Celeste.
 
         [MonoModLinkFrom("Celeste.Session Celeste.SaveData::CurrentSession_Unsafe")]
@@ -499,8 +502,10 @@ public static bool TryDeleteModSaveData(int slot) {
             CurrentSession_Unsafe = null;
 
             // Fix areas with missing SID (f.e. deleted or renamed maps).
-            if (AreaData.Get(LastArea) == null)
+            if (AreaData.Get(LastArea) == null) {
+                TrueLastAreaSID = LastArea.GetSID();
                 LastArea = AreaKey.Default;
+            }
 
             // Fix out of bounds areas.
             if (LastArea.ID < 0 || LastArea.ID >= AreaData.Areas.Count)