From c712764c500b180c9a6669de09e8cf9e0a240ddc Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Mon, 5 Apr 2021 20:16:24 +0200 Subject: [PATCH] Update Presence.vb --- P3D/Network/Discord/Presence.vb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/P3D/Network/Discord/Presence.vb b/P3D/Network/Discord/Presence.vb index b750e279d..82cd58333 100644 --- a/P3D/Network/Discord/Presence.vb +++ b/P3D/Network/Discord/Presence.vb @@ -104,9 +104,7 @@ Public Class Presence CurrentMapLevelFileNames.Add(Path.GetFileName(RPC_Image).Replace(".png", "").Replace(".jpg", "").Replace(".jpeg", "")) Next - If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then - CurrentMapLevel = Screen.Level.MapName - End If + CurrentMapLevel = GetCurrentMapLevel() Logger.Log(Logger.LogTypes.Debug, "Presence.vb: PreviousScreen: " & PreviousScreen) Logger.Log(Logger.LogTypes.Debug, "Presence.vb: CurrentScreen: " & CurrentScreen) @@ -118,7 +116,7 @@ Public Class Presence If CurrentMapLevel <> PreviousMapLevel Then PreviousMapLevel = CurrentMapLevel End If - CurrentMapLevelFileName = CurrentMapLevel.ToLower.Replace(" ", "_").Replace(".", "") + CurrentMapLevelFileName = GetCurrentMapLevelFileName() If CurrentMapLevel = "Pokemon Center" Or CurrentMapLevel = "Pokemon Mart" Then CurrentMapLevel = "a " & CurrentMapLevel End If @@ -175,4 +173,15 @@ Public Class Presence End Sub + Public Function GetCurrentMapLevel() As String + If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then + Return Screen.Level.MapName + End If + Return "" + End Function + + Public Function GetCurrentMapLevelFileName() As String + Return GetCurrentMapLevel.ToLower.Replace(" ", "_").Replace(".", "").Replace("'", "") + End Function + End Class