mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Rewrote party screen, implemented redesign of it
This commit is contained in:
Maruno17
@@ -2,60 +2,17 @@ module UI
|
||||
#=============================================================================
|
||||
# The visuals class.
|
||||
#=============================================================================
|
||||
class BaseVisuals
|
||||
UI_FOLDER = "Graphics/UI/"
|
||||
GRAPHICS_FOLDER = "" # Subfolder in UI_FOLDER
|
||||
BACKGROUND_FILENAME = "bg"
|
||||
TEXT_COLOR_THEMES = { # These color themes are added to @sprites[:overlay]
|
||||
module SpriteContainerMixin
|
||||
UI_FOLDER = "Graphics/UI/"
|
||||
GRAPHICS_FOLDER = "" # Subfolder in UI_FOLDER
|
||||
TEXT_COLOR_THEMES = { # These color themes are added to @sprites[:overlay]
|
||||
:default => [Color.new(72, 72, 72), Color.new(160, 160, 160)] # Base and shadow colour
|
||||
}
|
||||
|
||||
def initialize
|
||||
@bitmaps = {}
|
||||
@sprites = {}
|
||||
initialize_viewport
|
||||
initialize_bitmaps
|
||||
initialize_background
|
||||
initialize_overlay
|
||||
initialize_message_box
|
||||
# TODO: Initialize dialogue box for messages to use.
|
||||
initialize_sprites
|
||||
refresh
|
||||
end
|
||||
|
||||
def initialize_viewport
|
||||
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
|
||||
@viewport.z = 99999
|
||||
end
|
||||
|
||||
def initialize_bitmaps
|
||||
end
|
||||
|
||||
def initialize_background
|
||||
addBackgroundPlane(@sprites, :background, self.class::GRAPHICS_FOLDER + background_filename, @viewport)
|
||||
@sprites[:background].z = -1000
|
||||
end
|
||||
|
||||
def initialize_overlay
|
||||
add_overlay(:overlay)
|
||||
end
|
||||
|
||||
def initialize_message_box
|
||||
@sprites[:message_box] = Window_AdvancedTextPokemon.new("")
|
||||
@sprites[:message_box].viewport = @viewport
|
||||
@sprites[:message_box].z = 2000
|
||||
@sprites[:message_box].visible = false
|
||||
@sprites[:message_box].letterbyletter = true
|
||||
pbBottomLeftLines(@sprites[:message_box], 2)
|
||||
end
|
||||
|
||||
def initialize_sprites
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def add_overlay(overlay)
|
||||
@sprites[overlay] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
|
||||
def add_overlay(overlay, overlay_width = -1, overlay_height = -1)
|
||||
overlay_width = Graphics.width if overlay_width < 0
|
||||
overlay_height = Graphics.height if overlay_height < 0
|
||||
@sprites[overlay] = BitmapSprite.new(overlay_width, overlay_height, @viewport)
|
||||
@sprites[overlay].z = 1000
|
||||
self.class::TEXT_COLOR_THEMES.each_pair { |key, values| @sprites[overlay].add_text_theme(key, *values) }
|
||||
pbSetSystemFont(@sprites[overlay].bitmap)
|
||||
@@ -85,20 +42,16 @@ module UI
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def fade_in
|
||||
pbFadeInAndShow(@sprites) { update_visuals }
|
||||
end
|
||||
|
||||
def fade_out
|
||||
pbFadeOutAndHide(@sprites) { update_visuals }
|
||||
end
|
||||
|
||||
def dispose
|
||||
@sprites.each_value { |s| s.dispose if s && !s.disposed? }
|
||||
@sprites.clear
|
||||
@bitmaps.each_value { |b| b.dispose if b && !b.disposed? }
|
||||
@bitmaps.clear
|
||||
@viewport.dispose
|
||||
@disposed = true
|
||||
end
|
||||
|
||||
def disposed?
|
||||
return !!@disposed
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
@@ -126,123 +79,6 @@ module UI
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def show_message(text)
|
||||
@sprites[:message_box].text = text
|
||||
@sprites[:message_box].visible = true
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
if @sprites[:message_box].busy?
|
||||
if Input.trigger?(Input::USE)
|
||||
pbPlayDecisionSE if @sprites[:message_box].pausing?
|
||||
@sprites[:message_box].resume
|
||||
end
|
||||
elsif Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
|
||||
break
|
||||
end
|
||||
end
|
||||
@sprites[:message_box].visible = false
|
||||
end
|
||||
|
||||
def show_confirm_message(text)
|
||||
ret = false
|
||||
@sprites[:message_box].text = text
|
||||
@sprites[:message_box].visible = true
|
||||
using(cmd_window = Window_CommandPokemon.new([_INTL("Yes"), _INTL("No")])) do
|
||||
cmd_window.z = @viewport.z + 1
|
||||
cmd_window.visible = false
|
||||
pbBottomRight(cmd_window)
|
||||
cmd_window.y -= @sprites[:message_box].height
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
cmd_window.visible = true if !@sprites[:message_box].busy?
|
||||
cmd_window.update
|
||||
if !@sprites[:message_box].busy?
|
||||
if Input.trigger?(Input::BACK)
|
||||
pbPlayCancelSE
|
||||
ret = false
|
||||
break
|
||||
elsif Input.trigger?(Input::USE) && @sprites[:message_box].resume
|
||||
pbPlayDecisionSE
|
||||
ret = (cmd_window.index == 0)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@sprites[:message_box].visible = false
|
||||
return ret
|
||||
end
|
||||
|
||||
def show_choice_message(text, options, index = 0)
|
||||
ret = -1
|
||||
commands = options
|
||||
commands = options.values if options.is_a?(Hash)
|
||||
@sprites[:message_box].text = text
|
||||
@sprites[:message_box].visible = true
|
||||
using(cmd_window = Window_CommandPokemon.new(commands)) do
|
||||
cmd_window.z = @viewport.z + 1
|
||||
cmd_window.visible = false
|
||||
cmd_window.index = index
|
||||
pbBottomRight(cmd_window)
|
||||
cmd_window.y -= @sprites[:message_box].height
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
cmd_window.visible = true if !@sprites[:message_box].busy?
|
||||
cmd_window.update
|
||||
if !@sprites[:message_box].busy?
|
||||
if Input.trigger?(Input::BACK)
|
||||
pbPlayCancelSE
|
||||
ret = -1
|
||||
break
|
||||
elsif Input.trigger?(Input::USE) && @sprites[:message_box].resume
|
||||
pbPlayDecisionSE
|
||||
ret = cmd_window.index
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@sprites[:message_box].visible = false
|
||||
ret = options.keys[ret] if options.is_a?(Hash)
|
||||
return ret
|
||||
end
|
||||
|
||||
def show_choice(options, index = 0)
|
||||
ret = -1
|
||||
commands = options
|
||||
commands = options.values if options.is_a?(Hash)
|
||||
using(cmd_window = Window_CommandPokemon.new(commands)) do
|
||||
cmd_window.z = @viewport.z + 1
|
||||
cmd_window.index = index
|
||||
pbBottomRight(cmd_window)
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
cmd_window.update
|
||||
if Input.trigger?(Input::BACK)
|
||||
pbPlayCancelSE
|
||||
ret = -1
|
||||
break
|
||||
elsif Input.trigger?(Input::USE)
|
||||
pbPlayDecisionSE
|
||||
ret = cmd_window.index
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
ret = options.keys[ret] if options.is_a?(Hash)
|
||||
return ret
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
# NOTE: max_width should include the width of the text shadow at the end of
|
||||
# the string (because characters in the font have a blank 2 pixels
|
||||
# after them for the shadow to occupy).
|
||||
@@ -267,7 +103,7 @@ module UI
|
||||
|
||||
def draw_paragraph_text(string, text_x, text_y, text_width, num_lines, theme: :default, overlay: :overlay)
|
||||
drawTextEx(@sprites[overlay].bitmap, text_x, text_y, text_width, num_lines,
|
||||
string, *self.class::TEXT_COLOR_THEMES[theme])
|
||||
string, *self.class::TEXT_COLOR_THEMES[theme])
|
||||
end
|
||||
|
||||
# NOTE: This also draws string in a paragraph, but with no limit on the
|
||||
@@ -295,7 +131,7 @@ module UI
|
||||
index = (char == "/") ? 10 : char.to_i
|
||||
char_x = (align == :right) ? text_x - ((i + 1) * char_width) : text_x + (i * char_width)
|
||||
draw_image(bitmap, char_x, text_y,
|
||||
index * char_width, 0, char_width, char_height, overlay: overlay)
|
||||
index * char_width, 0, char_width, char_height, overlay: overlay)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -316,6 +152,311 @@ module UI
|
||||
pbUpdateSpriteHash(@sprites)
|
||||
end
|
||||
|
||||
def update
|
||||
update_visuals
|
||||
end
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
# The visuals class.
|
||||
#=============================================================================
|
||||
class SpriteContainer
|
||||
attr_reader :x, :y, :z, :visible, :color
|
||||
|
||||
include SpriteContainerMixin
|
||||
|
||||
def initialize(viewport)
|
||||
@viewport = viewport
|
||||
@x ||= 0
|
||||
@y ||= 0
|
||||
@z ||= 0
|
||||
@visible = true
|
||||
@color = Color.new(0, 0, 0, 0)
|
||||
@bitmaps = {}
|
||||
@sprites = {}
|
||||
@sprites_values = {}
|
||||
initialize_bitmaps
|
||||
initialize_sprites
|
||||
refresh_sprites_values
|
||||
end
|
||||
|
||||
def initialize_bitmaps
|
||||
end
|
||||
|
||||
def initialize_sprites
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
# x, y, z, visible, opacity, color
|
||||
def x=(value)
|
||||
@x = value
|
||||
@sprites.each_pair do |key, sprite|
|
||||
sprite.x = @x + @sprites_values[key][:x]
|
||||
end
|
||||
end
|
||||
|
||||
def y=(value)
|
||||
@y = value
|
||||
@sprites.each_pair do |key, sprite|
|
||||
sprite.y = @y + @sprites_values[key][:y]
|
||||
end
|
||||
end
|
||||
|
||||
def z=(value)
|
||||
@z = value
|
||||
@sprites.each_pair do |key, sprite|
|
||||
sprite.z = @z + @sprites_values[key][:z]
|
||||
end
|
||||
end
|
||||
|
||||
def visible=(value)
|
||||
@visible = value
|
||||
@sprites.each_pair do |key, sprite|
|
||||
sprite.visible = @visible && @sprites_values[key][:visible]
|
||||
end
|
||||
end
|
||||
|
||||
def color=(value)
|
||||
@color = value
|
||||
@sprites.each_pair do |key, sprite|
|
||||
sprite.color = @color
|
||||
end
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def record_values(key)
|
||||
@sprites_values[key] ||= {}
|
||||
@sprites_values[key][:x] = @sprites[key].x
|
||||
@sprites_values[key][:y] = @sprites[key].y
|
||||
@sprites_values[key][:z] = @sprites[key].z
|
||||
@sprites_values[key][:visible] = @sprites[key].visible
|
||||
end
|
||||
|
||||
def refresh_sprites_values
|
||||
self.x = @x
|
||||
self.y = @y
|
||||
self.z = @z
|
||||
self.visible = @visible
|
||||
end
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
# The visuals class.
|
||||
#=============================================================================
|
||||
class BaseVisuals
|
||||
BACKGROUND_FILENAME = "bg"
|
||||
|
||||
include SpriteContainerMixin
|
||||
|
||||
def initialize
|
||||
@bitmaps = {}
|
||||
@sprites = {}
|
||||
initialize_viewport
|
||||
initialize_bitmaps
|
||||
initialize_background
|
||||
initialize_overlay
|
||||
initialize_message_box
|
||||
initialize_sprites
|
||||
refresh
|
||||
end
|
||||
|
||||
def initialize_viewport
|
||||
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
|
||||
@viewport.z = 99999
|
||||
end
|
||||
|
||||
def initialize_bitmaps
|
||||
end
|
||||
|
||||
def initialize_background
|
||||
addBackgroundPlane(@sprites, :background, self.class::GRAPHICS_FOLDER + background_filename, @viewport)
|
||||
@sprites[:background].z = -1000
|
||||
end
|
||||
|
||||
def initialize_overlay
|
||||
add_overlay(:overlay)
|
||||
end
|
||||
|
||||
def initialize_message_box
|
||||
@sprites[:message_box] = Window_AdvancedTextPokemon.new("")
|
||||
@sprites[:message_box].viewport = @viewport
|
||||
@sprites[:message_box].z = 2000
|
||||
@sprites[:message_box].visible = false
|
||||
@sprites[:message_box].letterbyletter = true
|
||||
pbBottomLeftLines(@sprites[:message_box], 2)
|
||||
@sprites[:speech_box] = Window_AdvancedTextPokemon.new("")
|
||||
@sprites[:speech_box].viewport = @viewport
|
||||
@sprites[:speech_box].z = 2001
|
||||
@sprites[:speech_box].visible = false
|
||||
@sprites[:speech_box].letterbyletter = true
|
||||
@sprites[:speech_box].setSkin(MessageConfig.pbGetSpeechFrame)
|
||||
pbBottomLeftLines(@sprites[:speech_box], 2)
|
||||
end
|
||||
|
||||
def initialize_sprites
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def fade_in
|
||||
pbFadeInAndShow(@sprites)# { update_visuals }
|
||||
end
|
||||
|
||||
def fade_out
|
||||
pbFadeOutAndHide(@sprites)# { update_visuals }
|
||||
end
|
||||
|
||||
def dispose
|
||||
super
|
||||
@viewport.dispose
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def show_message(text)
|
||||
@sprites[:speech_box].visible = true
|
||||
@sprites[:speech_box].text = text
|
||||
pbBottomLeftLines(@sprites[:speech_box], 2)
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
if @sprites[:speech_box].busy?
|
||||
if Input.trigger?(Input::USE)
|
||||
pbPlayDecisionSE if @sprites[:speech_box].pausing?
|
||||
@sprites[:speech_box].resume
|
||||
end
|
||||
elsif Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
|
||||
break
|
||||
end
|
||||
end
|
||||
@sprites[:speech_box].visible = false
|
||||
end
|
||||
|
||||
def show_confirm_message(text)
|
||||
ret = false
|
||||
@sprites[:speech_box].visible = true
|
||||
@sprites[:speech_box].text = text
|
||||
pbBottomLeftLines(@sprites[:speech_box], 2)
|
||||
using(cmd_window = Window_CommandPokemon.new([_INTL("Yes"), _INTL("No")])) do
|
||||
cmd_window.z = @viewport.z + 1
|
||||
cmd_window.visible = false
|
||||
pbBottomRight(cmd_window)
|
||||
cmd_window.y -= @sprites[:speech_box].height
|
||||
cmd_window.visible = true if !@sprites[:speech_box].busy?
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
cmd_window.visible = true if !@sprites[:speech_box].busy?
|
||||
cmd_window.update
|
||||
if !@sprites[:speech_box].busy?
|
||||
if Input.trigger?(Input::BACK)
|
||||
pbPlayCancelSE
|
||||
ret = false
|
||||
break
|
||||
elsif Input.trigger?(Input::USE) && @sprites[:speech_box].resume
|
||||
pbPlayDecisionSE
|
||||
ret = (cmd_window.index == 0)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@sprites[:speech_box].visible = false
|
||||
return ret
|
||||
end
|
||||
|
||||
# align: Where the command window is in relation to the message window.
|
||||
# :horizontal is side by side, :vertical is command window above.
|
||||
def show_choice_message(text, options, index = 0, align: :horizontal, cmd_side: :right)
|
||||
ret = -1
|
||||
commands = options
|
||||
commands = options.values if options.is_a?(Hash)
|
||||
@sprites[:speech_box].visible = true
|
||||
@sprites[:speech_box].text = text
|
||||
using(cmd_window = Window_AdvancedCommandPokemon.new(commands)) do
|
||||
if align == :vertical
|
||||
@sprites[:speech_box].resizeHeightToFit(text, Graphics.width)
|
||||
else
|
||||
@sprites[:speech_box].resizeHeightToFit(text, Graphics.width - cmd_window.width)
|
||||
end
|
||||
cmd_window.z = @viewport.z + 1
|
||||
cmd_window.visible = false
|
||||
cmd_window.index = index
|
||||
if cmd_side == :right
|
||||
pbBottomLeft(@sprites[:speech_box])
|
||||
pbBottomRight(cmd_window)
|
||||
else
|
||||
pbBottomRight(@sprites[:speech_box])
|
||||
pbBottomLeft(cmd_window)
|
||||
end
|
||||
if align == :vertical
|
||||
cmd_window.height = [cmd_window.height, Graphics.height - @sprites[:speech_box].height].min
|
||||
cmd_window.y = Graphics.height - @sprites[:speech_box].height - cmd_window.height
|
||||
end
|
||||
cmd_window.visible = true if !@sprites[:speech_box].busy?
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
cmd_window.visible = true if !@sprites[:speech_box].busy?
|
||||
cmd_window.update
|
||||
if !@sprites[:speech_box].busy?
|
||||
if Input.trigger?(Input::BACK)
|
||||
pbPlayCancelSE
|
||||
ret = -1
|
||||
break
|
||||
elsif Input.trigger?(Input::USE) && @sprites[:speech_box].resume
|
||||
pbPlayDecisionSE
|
||||
ret = cmd_window.index
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@sprites[:speech_box].visible = false
|
||||
ret = options.keys[ret] if options.is_a?(Hash)
|
||||
return ret
|
||||
end
|
||||
|
||||
def show_choice(options, index = 0)
|
||||
ret = -1
|
||||
commands = options
|
||||
commands = options.values if options.is_a?(Hash)
|
||||
using(cmd_window = Window_AdvancedCommandPokemon.new(commands)) do
|
||||
cmd_window.z = @viewport.z + 1
|
||||
cmd_window.index = index
|
||||
pbBottomRight(cmd_window)
|
||||
loop do
|
||||
Graphics.update
|
||||
Input.update
|
||||
update_visuals
|
||||
cmd_window.update
|
||||
if Input.trigger?(Input::BACK)
|
||||
pbPlayCancelSE
|
||||
ret = -1
|
||||
break
|
||||
elsif Input.trigger?(Input::USE)
|
||||
pbPlayDecisionSE
|
||||
ret = cmd_window.index
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
ret = options.keys[ret] if options.is_a?(Hash)
|
||||
return ret
|
||||
end
|
||||
|
||||
# TODO: Rewrite this.
|
||||
def choose_number(help_text, maximum, init_num = 1)
|
||||
return UIHelper.pbChooseNumber(@sprites[:speech_box], help_text, maximum, init_num) { update_visuals }
|
||||
end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def update_input
|
||||
if Input.trigger?(Input::BACK)
|
||||
return :quit
|
||||
@@ -323,11 +464,6 @@ module UI
|
||||
return nil
|
||||
end
|
||||
|
||||
# def update
|
||||
# update_visuals
|
||||
# return update_input
|
||||
# end
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def navigate
|
||||
@@ -395,46 +531,72 @@ module UI
|
||||
return @visuals.show_choice_message(text, options, initial_index)
|
||||
end
|
||||
|
||||
alias pbShowCommands show_choice_message
|
||||
|
||||
def show_choice(options, initial_index = 0)
|
||||
return @visuals.show_choice(options, initial_index)
|
||||
end
|
||||
|
||||
alias pbShowCommands show_choice
|
||||
|
||||
def show_choice_from_menu_handler(menu_handler_id)
|
||||
def show_choice_from_menu_handler(menu_handler_id, message = nil)
|
||||
commands = {}
|
||||
MenuHandlers.each_available(menu_handler_id, self) do |option, hash, name|
|
||||
MenuHandlers.each_available(menu_handler_id, self) do |option, _hash, name|
|
||||
commands[option] = name
|
||||
end
|
||||
return show_choice_message(message, commands) if message
|
||||
return show_choice(commands)
|
||||
end
|
||||
|
||||
def choose_number(help_text, maximum, init_num = 1)
|
||||
return @visuals.choose_number(help_text, maximum, init_num)
|
||||
end
|
||||
|
||||
alias pbChooseNumber choose_number
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def refresh
|
||||
@visuals.refresh
|
||||
end
|
||||
|
||||
alias pbRefresh refresh
|
||||
|
||||
def update
|
||||
@visuals.update
|
||||
end
|
||||
|
||||
alias pbUpdate update
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def show_and_hide
|
||||
start_screen
|
||||
yield if block_given?
|
||||
end_screen
|
||||
end
|
||||
|
||||
def main
|
||||
start_screen
|
||||
loop do
|
||||
on_start_main_loop
|
||||
command = @visuals.navigate
|
||||
break if command == :quit
|
||||
command = perform_action(command)
|
||||
break if command == :quit
|
||||
break if @disposed
|
||||
end
|
||||
end_screen
|
||||
end
|
||||
|
||||
def on_start_main_loop
|
||||
end
|
||||
|
||||
def perform_action(command)
|
||||
return nil if !self.class::SCREEN_ID
|
||||
action_hash = UIActionHandlers.get(self.class::SCREEN_ID, command)
|
||||
return nil if !action_hash
|
||||
return nil if action_hash[:condition] && !action_hash[:condition].call(self)
|
||||
if action_hash[:menu]
|
||||
choice = show_choice_from_menu_handler(action_hash[:menu])
|
||||
choice = show_choice_from_menu_handler(action_hash[:menu], action_hash[:menu_message]&.call(self))
|
||||
perform_action(choice) if choice
|
||||
elsif action_hash[:effect]
|
||||
return perform_action_effect(action_hash)
|
||||
|
||||
@@ -200,16 +200,15 @@ MenuHandlers.add(:pause_menu, :party, {
|
||||
"condition" => proc { next $player.party_count > 0 },
|
||||
"effect" => proc { |menu|
|
||||
pbPlayDecisionSE
|
||||
hidden_move = nil
|
||||
pbFadeOutIn do
|
||||
sscene = PokemonParty_Scene.new
|
||||
sscreen = PokemonPartyScreen.new(sscene, $player.party)
|
||||
hidden_move = sscreen.pbPokemonScreen
|
||||
(hidden_move) ? menu.silent_end_screen : menu.refresh
|
||||
UI::Party.new($player.party).main
|
||||
($game_temp.field_move_to_use) ? menu.silent_end_screen : menu.refresh
|
||||
end
|
||||
next false if !hidden_move
|
||||
next false if !$game_temp.field_move_to_use
|
||||
$game_temp.in_menu = false
|
||||
pbUseHiddenMove(hidden_move[0], hidden_move[1])
|
||||
pbUseHiddenMove($game_temp.field_move_user, $game_temp.field_move_to_use)
|
||||
$game_temp.field_move_user = nil
|
||||
$game_temp.field_move_to_use = nil
|
||||
next true
|
||||
}
|
||||
})
|
||||
|
||||
1532
Data/Scripts/016b_UI redesign/005_UI_Party.rb
Normal file
1532
Data/Scripts/016b_UI redesign/005_UI_Party.rb
Normal file
File diff suppressed because it is too large
Load Diff
@@ -218,6 +218,7 @@ class UI::PokemonSummaryVisuals < UI::BaseVisuals
|
||||
@page = (@mode == :choose_move) ? :moves : all_pages[0]
|
||||
@move_index = (@mode == :choose_move) ? 0 : nil
|
||||
super()
|
||||
refresh_move_cursor if @move_index
|
||||
end
|
||||
|
||||
def initialize_bitmaps
|
||||
@@ -974,9 +975,9 @@ class UI::PokemonSummaryVisuals < UI::BaseVisuals
|
||||
def refresh_move_cursor
|
||||
# Update cursor positions
|
||||
@sprites[:move_cursor].index = @move_index
|
||||
@sprites[:selected_move_cursor].index = @swap_move_index
|
||||
@sprites[:selected_move_cursor].index = @swap_move_index || -1
|
||||
# Update cursor z values
|
||||
if @swap_move_index >= 0
|
||||
if @swap_move_index && @swap_move_index >= 0
|
||||
@sprites[:selected_move_cursor].z = @sprites[:move_cursor].z + 1
|
||||
@sprites[:selected_move_cursor].z -= 2 if @move_index != @swap_move_index
|
||||
end
|
||||
@@ -1417,7 +1418,7 @@ end
|
||||
#===============================================================================
|
||||
# Actions that can be triggered in the Pokémon summary screen.
|
||||
#===============================================================================
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :go_to_previous_pokemon,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :go_to_previous_pokemon, {
|
||||
:effect => proc { |screen|
|
||||
if screen.party_index > 0
|
||||
new_index = screen.party_index
|
||||
@@ -1434,9 +1435,9 @@ UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :go_to_previous_pokemon,
|
||||
end
|
||||
end
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :go_to_next_pokemon,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :go_to_next_pokemon, {
|
||||
:effect => proc { |screen|
|
||||
if screen.party_index < screen.party.length - 1
|
||||
new_index = screen.party_index
|
||||
@@ -1453,9 +1454,9 @@ UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :go_to_next_pokemon,
|
||||
end
|
||||
end
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :navigate_moves,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :navigate_moves, {
|
||||
:returns_value => true,
|
||||
:effect => proc { |screen|
|
||||
move_index = screen.visuals.navigate_moves
|
||||
@@ -1463,29 +1464,29 @@ UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :navigate_moves,
|
||||
screen.refresh
|
||||
next nil
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :navigate_ribbons,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :navigate_ribbons, {
|
||||
:effect => proc { |screen|
|
||||
screen.visuals.navigate_ribbons
|
||||
screen.refresh
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :marking,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :marking, {
|
||||
:effect => proc { |screen|
|
||||
screen.visuals.navigate_markings
|
||||
screen.refresh
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
# Shows a choice menu using the MenuHandlers options below.
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :interact_menu,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :interact_menu, {
|
||||
:menu => :summary_screen_interact,
|
||||
:condition => proc { |screen| next screen.mode != :in_battle }
|
||||
)
|
||||
})
|
||||
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :give_item,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :give_item, {
|
||||
:effect => proc { |screen|
|
||||
item = nil
|
||||
pbFadeOutIn do
|
||||
@@ -1495,15 +1496,15 @@ UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :give_item,
|
||||
end
|
||||
screen.refresh if pbGiveItemToPokemon(item, screen.pokemon, screen, screen.party_index)
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :take_item,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :take_item, {
|
||||
:effect => proc { |screen|
|
||||
screen.refresh if pbTakeItemFromPokemon(screen.pokemon, screen)
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :pokedex,
|
||||
UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :pokedex, {
|
||||
:effect => proc { |screen|
|
||||
$player.pokedex.register_last_seen(screen.pokemon)
|
||||
pbFadeOutIn do
|
||||
@@ -1512,7 +1513,7 @@ UIActionHandlers.add(UI::PokemonSummary::SCREEN_ID, :pokedex,
|
||||
dex_screen.pbStartSceneSingle(screen.pokemon.species)
|
||||
end
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
#===============================================================================
|
||||
# Menu options for choice menus that exist in the Pokémon summary screen.
|
||||
|
||||
Reference in New Issue
Block a user