Update Presence.vb

This commit is contained in:
Daniel S. Billing 2021-04-05 20:16:24 +02:00
parent 56e5dc5438
commit c712764c50

View File

@ -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