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

Make it possible to define custom itemdata mapname

This commit is contained in:
JappaWakka 2023-09-21 17:46:12 +02:00
parent dce892eda9
commit ca3ddfa441
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
P3D/Entites/Enviroment/ItemObject.vb
View File

@ -6,6 +6,7 @@
Dim AnimationName As String = "" Dim AnimationName As String = ""
Dim Animation As Animation = Nothing Dim Animation As Animation = Nothing
Dim LevelName As String = ""
Dim Item As Item Dim Item As Item
Dim ItemID As Integer = 0 Dim ItemID As Integer = 0
Dim checkedExistence As Boolean = False Dim checkedExistence As Boolean = False
@ -19,6 +20,9 @@
Me.Item = Item.GetItemByID(Me.AdditionalValue.GetSplit(1)) Me.Item = Item.GetItemByID(Me.AdditionalValue.GetSplit(1))
Me.ItemID = CInt(Me.AdditionalValue.GetSplit(0)) Me.ItemID = CInt(Me.AdditionalValue.GetSplit(0))
If Me.AdditionalValue.Split(",").Count > 1 Then
Me.LevelName = Me.AdditionalValue.GetSplit(2)
End If
Me.Textures(0) = Me.Item.Texture Me.Textures(0) = Me.Item.Texture
If Me.ActionValue = 0 Then If Me.ActionValue = 0 Then
@ -89,7 +93,10 @@
checkedExistence = True checkedExistence = True
If ItemExists(Me) = True Then If ItemExists(Me) = True Then
RemoveItem(Me) If Me.LevelName = "" Then
Me.LevelName = Screen.Level.LevelFile
End If
RemoveItem(Me, Me.LevelName)
End If End If
End If End If
@ -139,7 +146,10 @@
Public Overrides Sub ClickFunction() Public Overrides Sub ClickFunction()
If CanInteractWith Then If CanInteractWith Then
RemoveItem(Me) If Me.LevelName = "" Then
Me.LevelName = Screen.Level.LevelFile
End If
RemoveItem(Me, Me.LevelName)
If Me.Item.OriginalName.Contains("HM") Then If Me.Item.OriginalName.Contains("HM") Then
SoundManager.PlaySound("Receive_HM", True) SoundManager.PlaySound("Receive_HM", True)
Else Else
@ -191,15 +201,15 @@
End If End If
End Function End Function
Public Shared Sub RemoveItem(ByVal ItemObject As ItemObject) Public Shared Sub RemoveItem(ByVal ItemObject As ItemObject, ByVal LevelName As String)
Screen.Level.Entities.Remove(ItemObject) Screen.Level.Entities.Remove(ItemObject)
If Core.Player.ItemData = "" Then If Core.Player.ItemData = "" Then
Core.Player.ItemData = (Screen.Level.LevelFile & "|" & ItemObject.ItemID.ToString()).ToLower() Core.Player.ItemData = (LevelName & "|" & ItemObject.ItemID.ToString()).ToLower()
Else Else
Dim IDs() As String = Core.Player.ItemData.Split(CChar(",")) Dim IDs() As String = Core.Player.ItemData.Split(CChar(","))
If IDs.Contains((Screen.Level.LevelFile & "|" & ItemObject.ItemID.ToString()).ToLower()) = False Then If IDs.Contains((LevelName & "|" & ItemObject.ItemID.ToString()).ToLower()) = False Then
Core.Player.ItemData &= "," & (Screen.Level.LevelFile & "|" & ItemObject.ItemID.ToString()).ToLower() Core.Player.ItemData &= "," & (LevelName & "|" & ItemObject.ItemID.ToString()).ToLower()
End If End If
End If End If
End Sub End Sub