tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Custom Phone Contacts are possible in GameModes

This commit is contained in:
JappaWakka 2023-04-28 09:17:10 +02:00
parent 09da089212
commit fc1ff4854d
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
P3D/Content/Data/Scripts/phone/contacts.dat → P3D/Content/Data/contacts.dat
View File

2
P3D/P3D.vbproj
View File

@ -5789,7 +5789,7 @@
<Content Include="Content\Data\Scripts\phone\035.dat"> <Content Include="Content\Data\Scripts\phone\035.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Data\Scripts\phone\contacts.dat"> <Content Include="Content\Data\contacts.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Data\Scripts\powerplant\call.dat"> <Content Include="Content\Data\Scripts\powerplant\call.dat">

30
P3D/Screens/Inventory/PokegearScreen.vb
View File

@ -1369,7 +1369,7 @@
Dim reg() As String = Core.Player.RegisterData.Split(CChar(",")) Dim reg() As String = Core.Player.RegisterData.Split(CChar(","))
Dim contactData() As String = System.IO.File.ReadAllLines(GameController.GamePath & "\Content\Data\Scripts\phone\contacts.dat") Dim contactData() As String = System.IO.File.ReadAllLines(GameModeManager.GetContentFilePath("Data\contacts.dat"))
For Each r As String In reg For Each r As String In reg
If r.StartsWith("phone_contact_") = True Then If r.StartsWith("phone_contact_") = True Then
@ -1401,10 +1401,12 @@
Public Shared Sub CallID(ByVal ID As String, ByVal checkRegistered As Boolean, ByVal checkLocation As Boolean) Public Shared Sub CallID(ByVal ID As String, ByVal checkRegistered As Boolean, ByVal checkLocation As Boolean)
Dim reg() As String = Core.Player.RegisterData.Split(CChar(",")) Dim reg() As String = Core.Player.RegisterData.Split(CChar(","))
Security.FileValidation.CheckFileValid(GameController.GamePath & "\Content\Data\Scripts\phone\contacts.dat", False, "PokegearScreen.vb") Dim file As String = GameModeManager.GetContentFilePath("Data\contacts.dat")
Dim contactData() As String = System.IO.File.ReadAllLines(GameController.GamePath & "\Content\Data\Scripts\phone\contacts.dat")
Dim tempContacs As New List(Of Contact) Security.FileValidation.CheckFileValid(file, False, "PokegearScreen.vb")
Dim contactData() As String = System.IO.File.ReadAllLines(file)
Dim tempContacts As New List(Of Contact)
For Each r As String In reg For Each r As String In reg
If r.StartsWith("phone_contact_") = True Then If r.StartsWith("phone_contact_") = True Then
@ -1417,7 +1419,7 @@
Dim newContact As New Contact With {.ID = NCD(0), .Name = NCD(1), .Texture = NCD(2), .Location = NCD(3), .CanRandomCall = CBool(NCD(4))} Dim newContact As New Contact With {.ID = NCD(0), .Name = NCD(1), .Texture = NCD(2), .Location = NCD(3), .CanRandomCall = CBool(NCD(4))}
tempContacs.Add(newContact) tempContacts.Add(newContact)
End If End If
Next Next
End If End If
@ -1425,7 +1427,7 @@
Next Next
Dim countPossibleContacts As Integer = 0 Dim countPossibleContacts As Integer = 0
For Each c As Contact In tempContacs For Each c As Contact In tempContacts
If c.Location.ToLower() <> Level.MapName.ToLower() Or checkLocation = False Then If c.Location.ToLower() <> Level.MapName.ToLower() Or checkLocation = False Then
countPossibleContacts += 1 countPossibleContacts += 1
End If End If
@ -1434,7 +1436,7 @@
If countPossibleContacts > 0 Then If countPossibleContacts > 0 Then
Dim chosenID As String = "-1" Dim chosenID As String = "-1"
While chosenID = "-1" While chosenID = "-1"
Dim nC As Contact = tempContacs(Core.Random.Next(0, tempContacs.Count)) Dim nC As Contact = tempContacts(Core.Random.Next(0, tempContacts.Count))
If nC.Location.ToLower() <> Level.MapName.ToLower() Or checkLocation = False Then If nC.Location.ToLower() <> Level.MapName.ToLower() Or checkLocation = False Then
chosenID = nC.ID chosenID = nC.ID
@ -1454,10 +1456,12 @@
Dim reg() As String = Core.Player.RegisterData.Split(CChar(",")) Dim reg() As String = Core.Player.RegisterData.Split(CChar(","))
Security.FileValidation.CheckFileValid(GameController.GamePath & "\Content\Data\Scripts\phone\contacts.dat", False, "PokegearScreen.vb") Dim file As String = GameModeManager.GetContentFilePath("Data\contacts.dat")
Dim contactData() As String = System.IO.File.ReadAllLines(GameController.GamePath & "\Content\Data\Scripts\phone\contacts.dat")
Dim tempContacs As New List(Of Contact) Security.FileValidation.CheckFileValid(file, False, "PokegearScreen.vb")
Dim contactData() As String = System.IO.File.ReadAllLines(file)
Dim tempContacts As New List(Of Contact)
For Each r As String In reg For Each r As String In reg
If r.StartsWith("phone_contact_") = True Then If r.StartsWith("phone_contact_") = True Then
@ -1469,14 +1473,14 @@
Dim newContact As New Contact With {.ID = NCD(0), .Name = NCD(1), .Texture = NCD(2), .Location = NCD(3), .CanRandomCall = CBool(NCD(4))} Dim newContact As New Contact With {.ID = NCD(0), .Name = NCD(1), .Texture = NCD(2), .Location = NCD(3), .CanRandomCall = CBool(NCD(4))}
tempContacs.Add(newContact) tempContacts.Add(newContact)
End If End If
Next Next
End If End If
Next Next
Dim countPossibleContacts As Integer = 0 Dim countPossibleContacts As Integer = 0
For Each c As Contact In tempContacs For Each c As Contact In tempContacts
If c.CanRandomCall = True And c.Location.ToLower() <> Level.MapName.ToLower() Then If c.CanRandomCall = True And c.Location.ToLower() <> Level.MapName.ToLower() Then
countPossibleContacts += 1 countPossibleContacts += 1
End If End If
@ -1485,7 +1489,7 @@
If countPossibleContacts > 0 Then If countPossibleContacts > 0 Then
Dim chosenID As String = "-1" Dim chosenID As String = "-1"
While chosenID = "-1" While chosenID = "-1"
Dim nC As Contact = tempContacs(Core.Random.Next(0, tempContacs.Count)) Dim nC As Contact = tempContacts(Core.Random.Next(0, tempContacts.Count))
If nC.CanRandomCall = True And nC.Location.ToLower() <> Level.MapName.ToLower() Then If nC.CanRandomCall = True And nC.Location.ToLower() <> Level.MapName.ToLower() Then
chosenID = nC.ID chosenID = nC.ID