From f8c63948d45cb77d25e709ea8a4bedde4d604761 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Wed, 9 Aug 2023 14:26:26 +0200 Subject: [PATCH] Localizable receive items and berries messages --- P3D/Content/Localization/Tokens_en.dat | 14 ++++++++++++++ P3D/Entites/Enviroment/BerryPlant.vb | 4 ++-- P3D/Player/PlayerInventory.vb | 4 ++-- P3D/World/ActionScript/V2/ScriptCommands/DoItem.vb | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index 92da74c70..5e85236d7 100644 --- a/P3D/Content/Localization/Tokens_en.dat +++ b/P3D/Content/Localization/Tokens_en.dat @@ -411,6 +411,20 @@ pokedex_data_page_evolution,Evolution pokedex_habitat_area_unknown,Area Unknown. pokedex_evolution_no_evolutions,doesn't evolve. ---- +Receiving Items: +item_received_single,Received the~ +item_received_multiple,Received +item_stored_in_pocket_single_start, stored it in the~ +item_stored_in_pocket_single_end,pocket. +item_stored_in_pocket_multiple_start, stored them~in the +item_stored_in_pocket_multiple_end,pocket. + +Berries: +berry_picked_single_start, picked the~ +berry_picked_single_end,Berry. +berry_picked_multiple_start, picked the~ +berry_picked_multiple_end,Berries. +---- Battle: battle_trainer_about_to_send_out_1,is about to send out battle_trainer_about_to_send_out_2,! Do you want to switch your Pokémon? diff --git a/P3D/Entites/Enviroment/BerryPlant.vb b/P3D/Entites/Enviroment/BerryPlant.vb index c68a3b90b..595509e5e 100644 --- a/P3D/Entites/Enviroment/BerryPlant.vb +++ b/P3D/Entites/Enviroment/BerryPlant.vb @@ -183,9 +183,9 @@ Core.Player.Inventory.AddItem(Me.Berry.ID.ToString, Me.Berries) Dim Text As String = "" If Me.Berries = 1 Then - Text = Core.Player.Name & " picked the~" & Berry.Name & " Berry.*" & Core.Player.Inventory.GetMessageReceive(Berry, Me.Berries) + Text = Localization.GetString("berry_picked_single_start", " picked the~").Replace("", Core.Player.Name) & Berry.Name & " " & Localization.GetString("berry_picked_single_end", "Berry.") & "*" & Core.Player.Inventory.GetMessageReceive(Berry, Me.Berries) Else - Text = Core.Player.Name & " picked the " & Berries & "~" & Berry.Name & " Berries.*" & Core.Player.Inventory.GetMessageReceive(Berry, Me.Berries) + Text = Localization.GetString("berry_picked_multiple_start", " picked the~").Replace("", Core.Player.Name) & Berries & "~" & Berry.Name & " " & Localization.GetString("berry_picked_multiple_end", "Berries.") & "*" & Core.Player.Inventory.GetMessageReceive(Berry, Me.Berries) End If Core.Player.AddPoints(2, "Picked berries.") diff --git a/P3D/Player/PlayerInventory.vb b/P3D/Player/PlayerInventory.vb index baf9ede5c..117c4eed1 100644 --- a/P3D/Player/PlayerInventory.vb +++ b/P3D/Player/PlayerInventory.vb @@ -170,9 +170,9 @@ Public Class PlayerInventory Public Function GetMessageReceive(ByVal Item As Item, ByVal Amount As Integer) As String Dim Message As String If Amount = 1 Then - Message = Core.Player.Name & " stored it in the~" & Core.Player.Inventory.GetItemPocketChar(Item) & Item.ItemType.ToString() & " pocket." + Message = Localization.GetString("item_stored_in_pocket_single_start", " stored it in the~").Replace("", Core.Player.Name) & Core.Player.Inventory.GetItemPocketChar(Item) & Item.ItemType.ToString() & " " & Localization.GetString("item_stored_in_pocket_single_end", "pocket.").Replace("", Core.Player.Name) Else - Message = Core.Player.Name & " stored them~in the " & Core.Player.Inventory.GetItemPocketChar(Item) & Item.ItemType.ToString() & " pocket." + Message = Localization.GetString("item_stored_in_pocket_multiple_start", " stored them~in the").Replace("", Core.Player.Name) & " " & Core.Player.Inventory.GetItemPocketChar(Item) & Item.ItemType.ToString() & " " & Localization.GetString("item_stored_in_pocket_multiple_end", "pocket.").Replace("", Core.Player.Name) End If Return Message End Function diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoItem.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoItem.vb index 910166c17..6ce0107e3 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoItem.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoItem.vb @@ -110,9 +110,9 @@ Dim Amount As Integer = int(argument.GetSplit(1)) If Not item Is Nothing Then - Dim receiveString As String = "Received the~" & item.Name & ".*" + Dim receiveString As String = Localization.GetString("item_received_single", "Received the~" & item.Name & ".*") If Amount > 1 Then - receiveString = "Received " & Amount & "~" & item.PluralName & ".*" + receiveString = Localization.GetString("item_received_multiple", "Received") & " " & Amount & "~" & item.PluralName & ".*" End If SoundManager.PlaySound("Receive_Item", True)