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

Name of Attack is shown after TM/HM item name... 

and when you @item.messagegive an HM, the Receive_HM jingle plays as well
This commit is contained in:
JappaWakka 2024-04-06 19:30:15 +02:00
parent 62f6605a0f
commit 86cdffdd76
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,19 @@
SoundManager.PlaySound("Receive_Item", True)
End If
Screen.TextBox.TextColor = TextBox.PlayerColor
Screen.TextBox.Show(Localization.GetString("item_found", "<player.name> found~").Replace("<player.name>", Core.Player.Name) & Me.Item.OneLineName() & "!*" & Core.Player.Inventory.GetMessageReceive(Item, 1), {Me})
Dim foundString As String = Localization.GetString("item_found", "<player.name> found~").Replace("<player.name>", Core.Player.Name) & Me.Item.OneLineName()
If Item.ItemType = Items.ItemTypes.Machines Then
If Item.IsGameModeItem = True Then
foundString &= " " & CType(Item, GameModeItem).gmTeachMove.Name & "!*"
Else
foundString &= " " & CType(Item, Items.TechMachine).Attack.Name & "!*"
End If
Else
foundString &= "!*"
End If
Screen.TextBox.Show(foundString & Core.Player.Inventory.GetMessageReceive(Item, 1), {Me})
Dim ItemID As String
If Me.Item.IsGameModeItem Then
ItemID = Me.Item.gmID

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

@ -98,12 +98,34 @@
Dim Amount As Integer = int(argument.GetSplit(1))
If Not item Is Nothing Then
Dim receiveString As String = Localization.GetString("item_received_single", "Received the~") & item.OneLineName() & ".*"
If Amount > 1 Then
receiveString = Localization.GetString("item_received_multiple", "Received") & " " & Amount & "~" & item.OneLinePluralName() & ".*"
Dim receiveString As String = Localization.GetString("item_received_single", "Received the~") & item.OneLineName()
If item.ItemType = Items.ItemTypes.Machines Then
If Amount > 1 Then
If item.IsGameModeItem = True Then
receiveString = Localization.GetString("item_received_multiple", "Received") & " " & Amount & "~" & item.OneLinePluralName() & " " & CType(item, GameModeItem).gmTeachMove.Name & ".*"
Else
receiveString = Localization.GetString("item_received_multiple", "Received") & " " & Amount & "~" & item.OneLinePluralName() & " " & CType(item, Items.TechMachine).Attack.Name & ".*"
End If
Else
If item.IsGameModeItem = True Then
receiveString &= " " & CType(item, GameModeItem).gmTeachMove.Name & ".*"
Else
receiveString &= " " & CType(item, Items.TechMachine).Attack.Name & ".*"
End If
End If
Else
If Amount > 1 Then
receiveString = Localization.GetString("item_received_multiple", "Received") & " " & Amount & "~" & item.OneLinePluralName() & ".*"
Else
receiveString &= ".*"
End If
End If
SoundManager.PlaySound("Receive_Item", True)
If item.OriginalName.Contains("HM") Then
SoundManager.PlaySound("Receive_HM", True)
Else
SoundManager.PlaySound("Receive_Item", True)
End If
Screen.TextBox.reDelay = 0.0F
Screen.TextBox.TextColor = TextBox.PlayerColor