mirror of
https://github.com/P3D-Legacy/P3D-Legacy.git
synced 2025-07-27 07:44:31 +02:00
Fixed wrong bugcatchingconstest item pickup type..
By adding the IsOutside map Property
This commit is contained in:
parent
ba07491069
commit
17ef30605c
@ -1,5 +1,5 @@
|
|||||||
{"Level"{LEV[{"Name"{str[National Park]}}{"MusicLoop"{str[bugcontest]}}]}}
|
{"Level"{LEV[{"Name"{str[National Park]}}{"MusicLoop"{str[bugcontest]}}]}}
|
||||||
{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BugCatchingContest"{str[nationalpark\end_contest_menu,nationalpark\sport_balls,Sport Balls]}}]}}
|
{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"IsOutside"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BugCatchingContest"{str[nationalpark\end_contest_menu,nationalpark\sport_balls,Sport Balls]}}]}}
|
||||||
|
|
||||||
Floor:
|
Floor:
|
||||||
Grass:
|
Grass:
|
||||||
|
@ -1062,7 +1062,7 @@
|
|||||||
#Region "Checks"
|
#Region "Checks"
|
||||||
|
|
||||||
Private Shared Function IsOutside() As Boolean
|
Private Shared Function IsOutside() As Boolean
|
||||||
If Screen.Level.CanFly = True And Screen.Level.CanDig = False And Screen.Level.CanTeleport = True Then
|
If Screen.Level.IsOutside = True OrElse Screen.Level.CanFly = True And Screen.Level.CanDig = False And Screen.Level.CanTeleport = True Then
|
||||||
Return True
|
Return True
|
||||||
End If
|
End If
|
||||||
Return False
|
Return False
|
||||||
|
@ -51,6 +51,7 @@ Public Class Level
|
|||||||
Private _hiddenabilitychance As Integer = 0
|
Private _hiddenabilitychance As Integer = 0
|
||||||
Private _lightingType As Integer = 0
|
Private _lightingType As Integer = 0
|
||||||
Private _isSafariZone As Boolean = False
|
Private _isSafariZone As Boolean = False
|
||||||
|
Private _isOutside As Boolean = False
|
||||||
Private _isBugCatchingContest As Boolean = False
|
Private _isBugCatchingContest As Boolean = False
|
||||||
|
|
||||||
Private _bugCatchingContestData As String = ""
|
Private _bugCatchingContestData As String = ""
|
||||||
@ -538,6 +539,18 @@ Public Class Level
|
|||||||
End Set
|
End Set
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
''' <summary>
|
||||||
|
''' Overrides whether the map is outside. Affects item pickup interaction.
|
||||||
|
''' </summary>
|
||||||
|
Public Property IsOutside As Boolean
|
||||||
|
Get
|
||||||
|
Return Me._isOutside
|
||||||
|
End Get
|
||||||
|
Set(value As Boolean)
|
||||||
|
Me._isOutside = value
|
||||||
|
End Set
|
||||||
|
End Property
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' Whether the map is a part of the Bug Catching Contest. This changes the Battle Menu and the Menu Screen.
|
''' Whether the map is a part of the Bug Catching Contest. This changes the Battle Menu and the Menu Screen.
|
||||||
''' </summary>
|
''' </summary>
|
||||||
|
@ -1086,6 +1086,12 @@
|
|||||||
Screen.Level.IsSafariZone = False
|
Screen.Level.IsSafariZone = False
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
If TagExists(Tags, "IsOutside") = True Then
|
||||||
|
Screen.Level.IsOutside = CBool(GetTag(Tags, "IsOutside"))
|
||||||
|
Else
|
||||||
|
Screen.Level.IsOutside = False
|
||||||
|
End If
|
||||||
|
|
||||||
If TagExists(Tags, "BugCatchingContest") = True Then
|
If TagExists(Tags, "BugCatchingContest") = True Then
|
||||||
Screen.Level.IsBugCatchingContest = True
|
Screen.Level.IsBugCatchingContest = True
|
||||||
Screen.Level.BugCatchingContestData = CStr(GetTag(Tags, "BugCatchingContest"))
|
Screen.Level.BugCatchingContestData = CStr(GetTag(Tags, "BugCatchingContest"))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user