tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 08:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when giving items

Browse Source
This commit is contained in:
JappaWakka 2025-02-13 10:06:18 +01:00
parent 574a3eb8eb
commit e03827880e
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/HelperClasses/Localization.vb
View File

@ -117,6 +117,12 @@
If result.Contains("<name>") Then If result.Contains("<name>") Then
result = result.Replace("<name>", "//POKEMONNAME//") result = result.Replace("<name>", "//POKEMONNAME//")
End If End If
If result.Contains("<newitem>") Then
result = result.Replace("<newitem>", "//NEWITEM//")
End If
If result.Contains("<olditem>") Then
result = result.Replace("<olditem>", "//OLDITEM//")
End If
If result.Contains("<") Then If result.Contains("<") Then
result = CStr(ScriptVersion2.ScriptComparer.EvaluateConstruct(result)) result = CStr(ScriptVersion2.ScriptComparer.EvaluateConstruct(result))
End If End If

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

@ -1083,12 +1083,12 @@ Public Class NewInventoryScreen
If reItem Is Nothing Then If reItem Is Nothing Then
'JSON Stuff 'JSON Stuff
'ShowMessage(_translation.MESSAGE_GIVE_ITEM(Pokemon.GetDisplayName(), cItem.Name)) 'ShowMessage(_translation.MESSAGE_GIVE_ITEM(Pokemon.GetDisplayName(), cItem.Name))
Dim giveString As String = Localization.GetString("inventory_screen_GiveItem_Give", "Gave <name> the <newitem>.").Replace("<name>", Pokemon.GetDisplayName()).Replace("<newitem>", cItem.OneLineName()) Dim giveString As String = Localization.GetString("inventory_screen_GiveItem_Give", "Gave <name> the <newitem>.").Replace("//POKEMONNAME//", Pokemon.GetDisplayName()).Replace("//NEWITEM//", cItem.OneLineName())
ShowMessage(giveString) ShowMessage(giveString)
Else Else
'JSON Stuff 'JSON Stuff
'ShowMessage(_translation.MESSAGE_SWITCH_ITEM(Pokemon.GetDisplayName(), reItem.Name, cItem.Name)) 'ShowMessage(_translation.MESSAGE_SWITCH_ITEM(Pokemon.GetDisplayName(), reItem.Name, cItem.Name))
Dim switchString As String = Localization.GetString("inventory_screen_GiveItem_Switch", "Switched <name>'s <olditem> with the <newitem>.").Replace("<name>", Pokemon.GetDisplayName()).Replace("<olditem>", reItem.OneLineName()).Replace("<newitem>", cItem.OneLineName()) Dim switchString As String = Localization.GetString("inventory_screen_GiveItem_Switch", "Switched <name>'s <olditem> with the <newitem>.").Replace("//POKEMONNAME//", Pokemon.GetDisplayName()).Replace("//OLDITEM//", reItem.OneLineName()).Replace("//NEWITEM//", cItem.OneLineName())
ShowMessage(switchString) ShowMessage(switchString)
End If End If

8
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -850,7 +850,7 @@ Public Class PartyScreen
If reItem.IsMail And reItem.AdditionalData <> "" Then If reItem.IsMail And reItem.AdditionalData <> "" Then
Core.Player.Mails.Add(Items.MailItem.GetMailDataFromString(reItem.AdditionalData)) Core.Player.Mails.Add(Items.MailItem.GetMailDataFromString(reItem.AdditionalData))
message = Localization.GetString("inventory_screen_GiveItem_TakeMail", "Gave <newitem> to <name> and took the Mail to the PC.").Replace("<newitem>", i.OneLineName()).Replace("<name>", p.GetDisplayName()) message = Localization.GetString("inventory_screen_GiveItem_TakeMail", "Gave <newitem> to <name> and took the Mail to the PC.").Replace("//NEWITEM//", i.OneLineName()).Replace("//POKEMONNAME//", p.GetDisplayName())
Else Else
Dim ReItemID As String Dim ReItemID As String
If reItem.IsGameModeItem Then If reItem.IsGameModeItem Then
@ -860,17 +860,17 @@ Public Class PartyScreen
End If End If
Core.Player.Inventory.AddItem(ReItemID, 1) Core.Player.Inventory.AddItem(ReItemID, 1)
message = Localization.GetString("inventory_screen_GiveItem_Switch", "Switched <name>'s <olditem> with the <newitem>.").Replace("<newitem>", i.OneLineName()).Replace("<olditem>", reItem.OneLineName()).Replace("<name>", p.GetDisplayName()) message = Localization.GetString("inventory_screen_GiveItem_Switch", "Switched <name>'s <olditem> with the <newitem>.").Replace("//NEWITEM//", i.OneLineName()).Replace("//OLDITEM//", reItem.OneLineName()).Replace("//POKEMONNAME//", p.GetDisplayName())
End If End If
Else Else
message = Localization.GetString("inventory_screen_GiveItem_Give", "Gave <name> the <newitem>.").Replace("<name>", p.GetDisplayName()).Replace("<newitem>", i.OneLineName()) message = Localization.GetString("inventory_screen_GiveItem_Give", "Gave <name> the <newitem>.").Replace("//POKEMONNAME//", p.GetDisplayName()).Replace("//NEWITEM//", i.OneLineName())
End If End If
p.Item = i p.Item = i
ShowMessage(message) ShowMessage(message)
Else Else
ShowMessage(Localization.GetString("inventory_screen_CannotGiveToPokemon", "<newitem> cannot be given to a Pokémon.").Replace("<newitem>", i.OneLineName())) ShowMessage(Localization.GetString("inventory_screen_CannotGiveToPokemon", "<newitem> cannot be given to a Pokémon.").Replace("//NEWITEM//", i.OneLineName()))
End If End If
End Sub End Sub