From ca9df4177a8c6c6eab53f626934936ec0ae852d1 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Wed, 29 Dec 2021 18:53:39 +0000 Subject: [PATCH] Tidying up from previous commit --- Data/Scripts/002_BattleSettings.rb | 3 - Data/Scripts/016_UI/020_UI_PokeMart.rb | 112 +++++++++++-------------- 2 files changed, 49 insertions(+), 66 deletions(-) diff --git a/Data/Scripts/002_BattleSettings.rb b/Data/Scripts/002_BattleSettings.rb index f5e717cc2..6c8ff7240 100644 --- a/Data/Scripts/002_BattleSettings.rb +++ b/Data/Scripts/002_BattleSettings.rb @@ -65,9 +65,6 @@ module Settings #============================================================================= - # An array of items which act as Mega Rings for the player (NPCs don't need a - # Mega Ring item, just a Mega Stone held by their Pokémon). - MEGA_RINGS = [:MEGARING, :MEGABRACELET, :MEGACUFF, :MEGACHARM] # The Game Switch which, while ON, prevents all Pokémon in battle from Mega # Evolving even if they otherwise could. NO_MEGA_EVOLUTION = 34 diff --git a/Data/Scripts/016_UI/020_UI_PokeMart.rb b/Data/Scripts/016_UI/020_UI_PokeMart.rb index 3e3fd894b..24859a658 100644 --- a/Data/Scripts/016_UI/020_UI_PokeMart.rb +++ b/Data/Scripts/016_UI/020_UI_PokeMart.rb @@ -187,8 +187,8 @@ class PokemonMart_Scene @sprites["itemtextwindow"].text = (itemwindow.item) ? @adapter.getDescription(itemwindow.item) : _INTL("Quit shopping.") @sprites["qtywindow"].visible = !itemwindow.item.nil? - @sprites["qtywindow"].text = _INTL("In Bag:x{1}", @adapter.getQuantity(itemwindow.item)) - @sprites["qtywindow"].y = Graphics.height - 108 - @sprites["qtywindow"].height + @sprites["qtywindow"].text = _INTL("In Bag:{1}", @adapter.getQuantity(itemwindow.item)) + @sprites["qtywindow"].y = Graphics.height - 102 - @sprites["qtywindow"].height itemwindow.refresh end @sprites["moneywindow"].text = _INTL("Money:\r\n{1}", @adapter.getMoneyString) @@ -243,8 +243,8 @@ class PokemonMart_Scene @sprites["qtywindow"].height = 64 @sprites["qtywindow"].baseColor = Color.new(88, 88, 80) @sprites["qtywindow"].shadowColor = Color.new(168, 184, 184) - @sprites["qtywindow"].text = _INTL("In Bag:x{1}", @adapter.getQuantity(@sprites["itemwindow"].item)) - @sprites["qtywindow"].y = Graphics.height - 108 - @sprites["qtywindow"].height + @sprites["qtywindow"].text = _INTL("In Bag:{1}", @adapter.getQuantity(@sprites["itemwindow"].item)) + @sprites["qtywindow"].y = Graphics.height - 102 - @sprites["qtywindow"].height pbDeactivateWindows(@sprites) @buying = buying pbRefresh @@ -439,66 +439,52 @@ class PokemonMart_Scene itemprice = @adapter.getPrice(item, !@buying) itemprice /= 2 if !@buying pbDisplay(helptext, true) - using(numwindow = Window_AdvancedTextPokemon.new("")) { # Showing number of items - qty = @adapter.getQuantity(item) - using(inbagwindow = Window_AdvancedTextPokemon.new("")) { # Showing quantity in bag - pbPrepareWindow(numwindow) - pbPrepareWindow(inbagwindow) - numwindow.viewport = @viewport - numwindow.width = 224 - numwindow.height = 64 - numwindow.baseColor = Color.new(88, 88, 80) - numwindow.shadowColor = Color.new(168, 184, 184) - inbagwindow.visible = @buying - inbagwindow.viewport = @viewport - inbagwindow.width = 190 - inbagwindow.height = 64 - inbagwindow.baseColor = Color.new(88, 88, 80) - inbagwindow.shadowColor = Color.new(168, 184, 184) - inbagwindow.text = _INTL("In Bag:{1} ", qty) - numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) - pbBottomRight(numwindow) - numwindow.y -= helpwindow.height - pbBottomLeft(inbagwindow) - inbagwindow.y -= helpwindow.height - loop do - Graphics.update - Input.update - numwindow.update - inbagwindow.update - self.update - if Input.repeat?(Input::LEFT) - pbPlayCursorSE - curnumber -= 10 - curnumber = 1 if curnumber < 1 - numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) - elsif Input.repeat?(Input::RIGHT) - pbPlayCursorSE - curnumber += 10 - curnumber = maximum if curnumber > maximum - numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) - elsif Input.repeat?(Input::UP) - pbPlayCursorSE - curnumber += 1 - curnumber = 1 if curnumber > maximum - numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) - elsif Input.repeat?(Input::DOWN) - pbPlayCursorSE - curnumber -= 1 - curnumber = maximum if curnumber < 1 - numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) - elsif Input.trigger?(Input::USE) - pbPlayDecisionSE - ret = curnumber - break - elsif Input.trigger?(Input::BACK) - pbPlayCancelSE - ret = 0 - break - end + using(numwindow = Window_AdvancedTextPokemon.new("")) do # Showing number of items + pbPrepareWindow(numwindow) + numwindow.viewport = @viewport + numwindow.width = 224 + numwindow.height = 64 + numwindow.baseColor = Color.new(88, 88, 80) + numwindow.shadowColor = Color.new(168, 184, 184) + numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) + pbBottomRight(numwindow) + numwindow.y -= helpwindow.height + loop do + Graphics.update + Input.update + numwindow.update + update + if Input.repeat?(Input::LEFT) + pbPlayCursorSE + curnumber -= 10 + curnumber = 1 if curnumber < 1 + numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) + elsif Input.repeat?(Input::RIGHT) + pbPlayCursorSE + curnumber += 10 + curnumber = maximum if curnumber > maximum + numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) + elsif Input.repeat?(Input::UP) + pbPlayCursorSE + curnumber += 1 + curnumber = 1 if curnumber > maximum + numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) + elsif Input.repeat?(Input::DOWN) + pbPlayCursorSE + curnumber -= 1 + curnumber = maximum if curnumber < 1 + numwindow.text = _INTL("x{1}$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) + elsif Input.trigger?(Input::USE) + pbPlayDecisionSE + ret = curnumber + break + elsif Input.trigger?(Input::BACK) + pbPlayCancelSE + ret = 0 + break end - } - } + end + end helpwindow.visible = false return ret end