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

Added @item.select and <inventory.selected> 

@item.select(AllowedPages,AllowedItems)
Opens an item select screen with only the specified item type pages (separated with ";", e.g. "0;1;2" or "standard;medicine;plants") and possible item IDs (single items separated with ";", or with a "-" if you want a range, e.g. "2000-2066"
Both variables are optional. If AllowedPages is empty, all pages are allowed. If AllowItems is empty, all items are allowed.

<inventory.selected>
Returns the ID of the item selected in the screen opened by @item.select(AllowedPages,AllowedItems)
This commit is contained in:
JappaWakka 2023-05-31 12:34:11 +02:00
parent 4e4b1bac73
commit 319ad9b231
4 changed files with 165 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
P3D/Screens/Inventory/NewInventoryScreen.vb
View File

@ -126,12 +126,17 @@ Public Class NewInventoryScreen
Private _messageDelay As Single = 0F
Private _messageText As String = ""
Public Shared SelectedItem As String = "-1"
Private DoReturnItem As Boolean = False
'experiment
Public Delegate Sub DoStuff(ByVal ItemID As Integer)
Dim ReturnItem As DoStuff
Dim AllowedPages() As Integer
Public Sub New(ByVal currentScreen As Screen, ByVal AllowedPages As Integer(), ByVal StartPageIndex As Integer, ByVal DoStuff As DoStuff)
Dim AllowedPages() As Integer
Dim AllowedItems As List(Of String)
Public Sub New(ByVal currentScreen As Screen, ByVal AllowedPages As Integer(), ByVal StartPageIndex As Integer, ByVal DoStuff As DoStuff, Optional ByVal AllowedItems As List(Of String) = Nothing, Optional ByVal DoReturnItem As Boolean = False)
_preScreenTarget = New RenderTarget2D(GraphicsDevice, windowSize.Width, windowSize.Height)
_blur = New Resources.Blur.BlurHandler(windowSize.Width, windowSize.Height)
@ -141,7 +146,9 @@ Public Class NewInventoryScreen
_itemindex = Player.Temp.BagItemIndex
Me.AllowedPages = AllowedPages
Me.AllowedItems = AllowedItems
ReturnItem = DoStuff
Me.DoReturnItem = DoReturnItem
'JSON Stuff
'_translation = New Globalization.Classes.LOCAL_InventoryScreen()
@ -185,12 +192,17 @@ Public Class NewInventoryScreen
LoadItems()
End Sub
Public Sub New(ByVal currentScreen As Screen, ByVal AllowedPages() As Integer, ByVal DoStuff As DoStuff)
Me.New(currentScreen, AllowedPages, Player.Temp.BagIndex, DoStuff)
Public Sub ReturnSelectedItem(ByVal ItemID As String)
SelectedItem = ItemID
_closing = True
End Sub
Public Sub New(ByVal currentScreen As Screen)
Me.New(currentScreen, {}, Player.Temp.BagIndex, Nothing)
Public Sub New(ByVal currentScreen As Screen, ByVal AllowedPages() As Integer, ByVal DoStuff As DoStuff, Optional ByVal AllowedItems As List(Of String) = Nothing, Optional ByVal DoReturnItem As Boolean = False)
Me.New(currentScreen, AllowedPages, Player.Temp.BagIndex, DoStuff, AllowedItems, DoReturnItem)
End Sub
Public Sub New(ByVal currentScreen As Screen, Optional ByVal AllowedItems As List(Of String) = Nothing, Optional ByVal DoReturnItem As Boolean = False)
Me.New(currentScreen, {}, Player.Temp.BagIndex, Nothing, AllowedItems, DoReturnItem)
End Sub
Public Overrides Sub Draw()
@ -284,17 +296,17 @@ Public Class NewInventoryScreen
End If
Next
Dim TabDesriptionWidth As Integer = 176
Dim TabDescriptionWidth As Integer = 176
Dim TbgColor As New Color(128, 128, 128)
If _closing Then
TbgColor = New Color(TbgColor.R, TbgColor.G, TbgColor.B, CInt(CInt(TbgColor.A) * _interfaceFade))
End If
For x = 0 To TabDesriptionWidth Step 16
For x = 0 To TabDescriptionWidth Step 16
For y = 0 To 32 Step 16
SpriteBatch.Draw(_menuTexture, New Rectangle(halfWidth - 400 + x + 384, halfHeight - 200 + y, 16, 16), New Rectangle(0, 0, 4, 4), TbgColor)
Next
Next
Canvas.DrawGradient(Core.SpriteBatch, New Rectangle(halfWidth - 400 + 384 + TabDesriptionWidth + 16, halfHeight - 200, 800 - (384 + TabDesriptionWidth), 48), New Color(0, 0, 0, CInt(TbgColor.A * 0.5)), New Color(0, 0, 0, CInt(TbgColor.A * 0.00)), True, -1)
Canvas.DrawGradient(Core.SpriteBatch, New Rectangle(halfWidth - 400 + 384 + TabDescriptionWidth + 16, halfHeight - 200, 800 - (384 + TabDescriptionWidth), 48), New Color(0, 0, 0, CInt(TbgColor.A * 0.5)), New Color(0, 0, 0, CInt(TbgColor.A * 0.00)), True, -1)
Dim TabName As String = ""
Select Case _tabIndex
Case 0 : TabName = Localization.GetString("item_category_Standard", "Standard")
@ -311,7 +323,7 @@ Public Class NewInventoryScreen
gColor = New Color(gColor.R, gColor.G, gColor.B, CInt(CInt(gColor.A) * _interfaceFade))
End If
Dim fontWidth As Integer = CInt(FontManager.ChatFont.MeasureString(TabName).X)
SpriteBatch.DrawString(FontManager.ChatFont, TabName, New Vector2(halfWidth - 400 + 384 + CInt((TabDesriptionWidth - fontWidth) * 0.5), halfHeight - 200 + 12), gColor)
SpriteBatch.DrawString(FontManager.ChatFont, TabName, New Vector2(halfWidth - 400 + 384 + CInt((TabDescriptionWidth - fontWidth) * 0.5), halfHeight - 200 + 12), gColor)
End Sub
''' <summary>
@ -769,13 +781,18 @@ Public Class NewInventoryScreen
LoadItems()
End If
If _tabInControl Then
If Controls.Dismiss() And CanExit Then
SoundManager.PlaySound("select")
_closing = True
End If
If Controls.Accept() And _items.Length > 0 Then
SoundManager.PlaySound("select")
If AllowedPages.Count = 1 Then
_tabInControl = False
Else
If Controls.Dismiss() And CanExit Then
SoundManager.PlaySound("select")
SelectedItem = "-1"
_closing = True
End If
If Controls.Accept() And _items.Length > 0 Then
SoundManager.PlaySound("select")
_tabInControl = False
End If
End If
End If
End Sub
@ -833,26 +850,39 @@ Public Class NewInventoryScreen
If Controls.Accept() AndAlso _items.Length > 0 Then
Dim cItem As Item = Item.GetItemByID(_items(ItemIndex + PageIndex * 10).ItemID)
SoundManager.PlaySound("select")
If Me.PreScreen.Identification = Screen.Identifications.BattleScreen Then
If cItem.CanBeUsedInBattle = True Then
If DoReturnItem = True Then
If cItem.IsGameModeItem = True Then
ReturnSelectedItem(cItem.gmID)
Else
ReturnSelectedItem(cItem.ID.ToString)
End If
Else
If Me.PreScreen.Identification = Screen.Identifications.BattleScreen Then
If cItem.CanBeUsedInBattle = True Then
_infoItemOptionSelection = 0
_isInfoShowing = True
SetInfoSettings()
SetItemOptions()
Else
TextBox.Show("This item can't~be used in Battle.")
End If
Else
_infoItemOptionSelection = 0
_isInfoShowing = True
SetInfoSettings()
SetItemOptions()
Else
TextBox.Show("This item can't~be used in Battle.")
End If
Else
_infoItemOptionSelection = 0
_isInfoShowing = True
SetInfoSettings()
SetItemOptions()
End If
End If
End If
If Controls.Dismiss() Then
SoundManager.PlaySound("select")
_tabInControl = True
If AllowedPages.Count > 1 Then
SoundManager.PlaySound("select")
_tabInControl = True
Else
_closing = True
End If
End If
End Sub
@ -1042,7 +1072,7 @@ Public Class NewInventoryScreen
''' Reloads the temporary item list.
''' </summary>
Public Sub LoadItems()
_items = Core.Player.Inventory.Where(Function(x) Item.GetItemByID(x.ItemID).ItemType = _visibleItemTypes(_tabIndex)).ToArray()
_items = Core.Player.Inventory.Where(Function(x) Item.GetItemByID(x.ItemID).ItemType = _visibleItemTypes(_tabIndex)).Where(Function(x) IsItemVisible(x.ItemID) = True).ToArray()
If _tabIndex = 4 Then 'TM/HM
_items = (From i In _items Order By Item.GetItemByID(i.ItemID).SortValue Ascending).ToArray()
Else
@ -1200,6 +1230,17 @@ Public Class NewInventoryScreen
Private _mode As ISelectionScreen.ScreenMode = ISelectionScreen.ScreenMode.Default
Private _canExit As Boolean = True
Private _visibleItemTypes As Items.ItemTypes()
Private Function IsItemVisible(ItemID As String) As Boolean
If AllowedItems Is Nothing OrElse AllowedItems.Contains("-1") Then
Return True
Else
If AllowedItems.Contains(ItemID) Then
Return True
Else
Return False
End If
End If
End Function
Public Event SelectedObject(params() As Object) Implements ISelectionScreen.SelectedObject

88
P3D/World/ActionScript/V2/ScriptCommands/DoItem.vb
View File

@ -123,6 +123,94 @@
steps = 250
End Select
Core.Player.RepelSteps += steps
Case "select"
Dim allowedPages As Integer()
Dim allowedItems As New List(Of String)
Dim Inventory As NewInventoryScreen
If argument <> "" Then
Dim data() As String = argument.Split(CChar(","))
Dim pageNumbers As New List(Of Integer)
If data.Length > 0 Then
Dim typeData As String() = data(0).Split(CChar(";"))
If typeData.Count = 0 Or data(0) = "" Then
pageNumbers = {0, 1, 2, 3, 4, 5, 6, 7}.ToList
Else
For i = 0 To typeData.Count - 1
If typeData(i).Contains("-1") Then
pageNumbers = {0, 1, 2, 3, 4, 5, 6, 7}.ToList
Exit For
Else
Select Case typeData(i).ToLower()
Case "standard", "0"
pageNumbers.Add(0)
Case "medicine", "1"
pageNumbers.Add(1)
Case "plants", "2"
pageNumbers.Add(2)
Case "balls", "pokeballs", "3"
pageNumbers.Add(3)
Case "machines", "4"
pageNumbers.Add(4)
Case "keyitems", "5"
pageNumbers.Add(5)
Case "mail", "6"
pageNumbers.Add(6)
Case "battleitems", "7"
pageNumbers.Add(7)
End Select
End If
Next
End If
End If
allowedPages = pageNumbers.ToArray
If data.Length > 1 Then
Dim itemData As String() = data(1).Split(CChar(";"))
If itemData.Count > 0 AndAlso data(1) <> "" Then
For i = 0 To itemData.Count - 1
If itemData(i).Contains(CChar("-")) Then
Dim MinMax As String() = itemData(i).Split(CChar("-"))
Dim gmMinMax As String()
If MinMax(0).StartsWith("gm") AndAlso MinMax(1).StartsWith("gm") Then
gmMinMax = {MinMax(0).Remove(0, 2), MinMax(1).Remove(0, 2)}.ToArray
For number = CInt(gmMinMax(0)) To CInt(gmMinMax(1))
allowedItems.Add("gm" & number)
Next
Else
For number = CInt(MinMax(0)) To CInt(MinMax(1))
allowedItems.Add(number.ToString)
Next
End If
ElseIf itemData(i).Contains("-1") Then
allowedItems = {"-1"}.ToList
Exit For
Else
allowedItems.Add(itemData(i))
End If
Next
Else
allowedItems = {"-1"}.ToList
End If
Else
allowedItems = {"-1"}.ToList
End If
Inventory = New NewInventoryScreen(Core.CurrentScreen, allowedPages, Nothing, allowedItems, True)
Else
Inventory = New NewInventoryScreen(Core.CurrentScreen, allowedItems, True)
End If
If Inventory IsNot Nothing Then
Core.SetScreen(Inventory)
If CurrentScreen.Identification <> Screen.Identifications.InventoryScreen Then
IsReady = True
End If
End If
CanContinue = False
End Select
IsReady = True

2
P3D/World/ActionScript/V2/ScriptConstructs/DoInventory.vb
View File

@ -59,6 +59,8 @@
Return 0
Case "selected"
Return NewInventoryScreen.SelectedItem
End Select
Return DEFAULTNULL
End Function

5
P3D/World/ActionScript/V2/ScriptLibrary.vb
View File

@ -284,6 +284,9 @@ Namespace ScriptVersion2
r(New ScriptCommand("item", "messagegive", {New ScriptArgument("ItemID", ScriptArgument.ArgumentTypes.Int),
New ScriptArgument("Amount", ScriptArgument.ArgumentTypes.Int, True, "1")}.ToList(), "Displays a message for getting the specified amount of items."))
r(New ScriptCommand("item", "repel", {New ScriptArgument("RepelItemID", ScriptArgument.ArgumentTypes.Int, {"20", "42", "43"})}.ToList(), "Adds the steps of the Repel to the Repel steps of the player."))
r(New ScriptCommand("item", "select", {New ScriptArgument("AllowedPages", ScriptArgument.ArgumentTypes.Str, True, "-1"),
New ScriptArgument("AllowedItems", ScriptArgument.ArgumentTypes.Str, True, "-1")}.ToList(), "Opens an item select screen with only the specified item type pages (separated with "";"", e.g. ""0;1;2"" or ""standard;medicine;plants"") and possible item IDs (single items separated with "";"", or with a ""-"" if you want a range, e.g. ""2000-2066"")."))
End Sub
Private Shared Sub DoInventory()
@ -292,6 +295,7 @@ Namespace ScriptVersion2
r(New ScriptCommand("inventory", "countitems", "int", "Counts all items in the player's inventory.", ",", True))
r(New ScriptCommand("inventory", "name", "str", {New ScriptArgument("itemID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the name of an Item by its ItemID.", ",", True))
r(New ScriptCommand("inventory", "ID", "int", {New ScriptArgument("itemName", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Returns the ID of an Item by its Name.", ",", True))
r(New ScriptCommand("inventory", "selected", "str", "Returns the item ID of the item selected with @item.select.", ",", True))
End Sub
Private Shared Sub DoChat()
@ -340,6 +344,7 @@ Namespace ScriptVersion2
New ScriptArgument("BorderColor", ScriptArgument.ArgumentTypes.IntArr, {"0-255"}, True)}.ToList(), "Displays a dynamically sized customizable message box in the center of the screen."))
r(New ScriptCommand("screen", "secretbase", "Opens the Secret Base screen."))
r(New ScriptCommand("screen", "skinselection", "Opens the Player Skin selection screen."))
r(New ScriptCommand("screen", "voltorbflip", "Opens the Voltorb Flip minigame screen."))
End Sub
Private Shared Sub DoScript()