From f655939510eeb2fda0775059d34d27dccf3c2644 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Thu, 21 Dec 2023 00:09:49 -0600 Subject: [PATCH] fix shops with registers --- P3D/Pokemon/Items/Machines/TM179.vb | 2 +- P3D/Screens/TradeScreen.vb | 2 ++ P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/P3D/Pokemon/Items/Machines/TM179.vb b/P3D/Pokemon/Items/Machines/TM179.vb index 138b16115..2626925c2 100644 --- a/P3D/Pokemon/Items/Machines/TM179.vb +++ b/P3D/Pokemon/Items/Machines/TM179.vb @@ -1,6 +1,6 @@ Namespace Items.Machines - + Public Class TM179 Inherits TechMachine diff --git a/P3D/Screens/TradeScreen.vb b/P3D/Screens/TradeScreen.vb index 232dbf6af..e57eb76ac 100644 --- a/P3D/Screens/TradeScreen.vb +++ b/P3D/Screens/TradeScreen.vb @@ -164,6 +164,8 @@ Public Class TradeScreen Me.TradeItems.Add(New TradeItem(itemData(0), ResultAmount, ScriptConversion.ToInteger(itemData(2)), Me.Currency)) End If End If + Else + Me.TradeItems.Add(New TradeItem(itemData(0), ScriptConversion.ToInteger(itemData(1)), ScriptConversion.ToInteger(itemData(2)), Me.Currency)) End If Else Me.TradeItems.Add(New TradeItem(itemData(0), ScriptConversion.ToInteger(itemData(1)), ScriptConversion.ToInteger(itemData(2)), Me.Currency)) diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb index c5bd3f1cc..547613f5a 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb @@ -53,7 +53,7 @@ End If Dim shopIdentifier As String = "" If argument.CountSplits() > 4 Then - shopIdentifier = argument.GetSplit(4) ' p for PokéDollars, bp for Battle Points, c for coins. + shopIdentifier = argument.GetSplit(4) End If Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New TradeScreen(Core.CurrentScreen, storeData, canBuy, canSell, currencyIndicator, shopIdentifier), Color.Black, False))