tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-09-23 09:59:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

General improvements for MapLevelFiles

Browse Source
This commit is contained in:
Daniel S. Billing 2021-04-07 21:18:48 +02:00
parent a11d54cf9f
commit e35ca9abe9
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
P3D/Network/Discord/Presence.vb
View File

@ -15,12 +15,24 @@ Public Class Presence
Private PreviousScreen As String = "" Private PreviousScreen As String = ""
Private PreviousMapLevel As String = "" Private PreviousMapLevel As String = ""
Private StartTimestamp As Long = Nothing Private StartTimestamp As Long = Nothing
Dim MapLevelFiles As New List(Of String)
Public Sub Initialize() Public Sub Initialize()
' Checking valid filenames, in directory. These files also needs to be uploaded to the application
' https://discord.com/developers/applications/*APPLICATION_ID_HERE*/rich-presence/assets
' DanielRTRD has access here, ask if you need access!
For Each RPC_Image In Directory.GetFiles(GameController.GamePath & "\Content\DiscordRPC\")
MapLevelFiles.Add(Path.GetFileName(RPC_Image).Replace(".png", "").Replace(".jpg", "").Replace(".jpeg", ""))
'Logger.Log(Logger.LogTypes.Debug, "Presence.vb: Adding file to MapLevelFiles: '" & RPC_Image & "'")
Next
' Start Discord
If Discord_App_ID IsNot Nothing And Environment.Is64BitProcess = False Then If Discord_App_ID IsNot Nothing And Environment.Is64BitProcess = False Then
Discord_Initialize(Discord_App_ID, Handlers, 1, "") Discord_Initialize(Discord_App_ID, Handlers, 1, "")
Update() Update()
StartTimestamp = CLng(DateTime.UtcNow.Subtract(New DateTime(1970, 1, 1)).TotalMilliseconds) StartTimestamp = CLng(DateTime.UtcNow.Subtract(New DateTime(1970, 1, 1)).TotalMilliseconds)
Logger.Log(Logger.LogTypes.Message, "Presence.vb: Discord RPC Initialized!")
End If End If
End Sub End Sub
@ -95,22 +107,14 @@ Public Class Presence
Dim InventoryScreens() As String = {"NewInventoryScreen"} Dim InventoryScreens() As String = {"NewInventoryScreen"}
Dim CurrentMapLevel As String = "" Dim CurrentMapLevel As String = ""
Dim CurrentMapLevelFileName As String = "" Dim CurrentMapLevelFileName As String = ""
Dim CurrentMapLevelFileNames As New List(Of String)
' Checking valid filenames, in directory. These files also needs to be uploaded to the application
' https://discord.com/developers/applications/*APPLICATION_ID_HERE*/rich-presence/assets
' DanielRTRD has access here, ask if you need access!
For Each RPC_Image In Directory.GetFiles(GameController.GamePath & "\Content\DiscordRPC\")
CurrentMapLevelFileNames.Add(Path.GetFileName(RPC_Image).Replace(".png", "").Replace(".jpg", "").Replace(".jpeg", ""))
Next
CurrentMapLevel = GetCurrentMapLevel() CurrentMapLevel = GetCurrentMapLevel()
Logger.Log(Logger.LogTypes.Debug, "Presence.vb: PreviousScreen: " & PreviousScreen) 'Logger.Log(Logger.LogTypes.Debug, "Presence.vb: PreviousScreen: " & PreviousScreen)
Logger.Log(Logger.LogTypes.Debug, "Presence.vb: CurrentScreen: " & CurrentScreen) 'Logger.Log(Logger.LogTypes.Debug, "Presence.vb: CurrentScreen: " & CurrentScreen)
Logger.Log(Logger.LogTypes.Debug, "Presence.vb: PreviousMapLevel: " & PreviousMapLevel) 'Logger.Log(Logger.LogTypes.Debug, "Presence.vb: PreviousMapLevel: " & PreviousMapLevel)
Logger.Log(Logger.LogTypes.Debug, "Presence.vb: CurrentMapLevel: " & CurrentMapLevel) 'Logger.Log(Logger.LogTypes.Debug, "Presence.vb: CurrentMapLevel: " & CurrentMapLevel)
If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
If CurrentMapLevel <> PreviousMapLevel Then If CurrentMapLevel <> PreviousMapLevel Then
@ -121,8 +125,8 @@ Public Class Presence
CurrentMapLevel = "a " & CurrentMapLevel CurrentMapLevel = "a " & CurrentMapLevel
End If End If
Presence_Details = "In " & CurrentMapLevel Presence_Details = "In " & CurrentMapLevel
Logger.Log(Logger.LogTypes.Debug, "Presence.vb: CurrentMapLevelFileName: " & CurrentMapLevelFileName) Logger.Log(Logger.LogTypes.Debug, "Presence.vb: CurrentMapLevelFileName: '" & CurrentMapLevelFileName & "'")
If CurrentMapLevelFileNames.Contains(CurrentMapLevelFileName) Then If MapLevelFiles.Contains(CurrentMapLevelFileName) Then
Presence_LargeImageName = CurrentMapLevelFileName Presence_LargeImageName = CurrentMapLevelFileName
Presence_LargeImageText = CurrentMapLevel Presence_LargeImageText = CurrentMapLevel
Presence_SmallImageName = Default_LargeImageName ' When a map is show, icon should be moved to small Presence_SmallImageName = Default_LargeImageName ' When a map is show, icon should be moved to small