From 104188399267c1ec83c7aad7c1ffdbb089b3763c Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 28 Aug 2023 22:41:48 +0100 Subject: [PATCH 01/49] Initial proof of concept commit --- .../900_New utilities/001 utilities.rb | 8 + Data/Scripts/901_GameData/Animation.rb | 63 ++++ .../905_New controls/000 UIControls.rb | 2 + .../905_New controls/001 basic control.rb | 180 +++++++++++ Data/Scripts/905_New controls/002 label.rb | 24 ++ Data/Scripts/905_New controls/003 checkbox.rb | 68 +++++ Data/Scripts/905_New controls/004 text box.rb | 289 ++++++++++++++++++ .../905_New controls/005 number slider.rb | 128 ++++++++ .../Scripts/905_New controls/006 value box.rb | 139 +++++++++ Data/Scripts/905_New controls/007 button.rb | 50 +++ Data/Scripts/905_New controls/008_list.rb | 13 + .../905_New controls/009 dropdown list.rb | 9 + .../001 controls container.rb | 161 ++++++++++ .../910_New anim editor/001_anim selection.rb | 97 ++++++ .../910_New anim editor/010 editor scene.rb | 115 +++++++ .../910_New anim editor/020 button pane.rb | 12 + 16 files changed, 1358 insertions(+) create mode 100644 Data/Scripts/900_New utilities/001 utilities.rb create mode 100644 Data/Scripts/901_GameData/Animation.rb create mode 100644 Data/Scripts/905_New controls/000 UIControls.rb create mode 100644 Data/Scripts/905_New controls/001 basic control.rb create mode 100644 Data/Scripts/905_New controls/002 label.rb create mode 100644 Data/Scripts/905_New controls/003 checkbox.rb create mode 100644 Data/Scripts/905_New controls/004 text box.rb create mode 100644 Data/Scripts/905_New controls/005 number slider.rb create mode 100644 Data/Scripts/905_New controls/006 value box.rb create mode 100644 Data/Scripts/905_New controls/007 button.rb create mode 100644 Data/Scripts/905_New controls/008_list.rb create mode 100644 Data/Scripts/905_New controls/009 dropdown list.rb create mode 100644 Data/Scripts/906_New controls container/001 controls container.rb create mode 100644 Data/Scripts/910_New anim editor/001_anim selection.rb create mode 100644 Data/Scripts/910_New anim editor/010 editor scene.rb create mode 100644 Data/Scripts/910_New anim editor/020 button pane.rb diff --git a/Data/Scripts/900_New utilities/001 utilities.rb b/Data/Scripts/900_New utilities/001 utilities.rb new file mode 100644 index 000000000..38aa3c21f --- /dev/null +++ b/Data/Scripts/900_New utilities/001 utilities.rb @@ -0,0 +1,8 @@ +class Bitmap + def outline_rect(x, y, width, height, color, thickness = 1) + fill_rect(x, y, width, thickness, color) + fill_rect(x, y, thickness, height, color) + fill_rect(x, y + height - thickness, width, thickness, color) + fill_rect(x + width - thickness, y, thickness, height, color) + end +end diff --git a/Data/Scripts/901_GameData/Animation.rb b/Data/Scripts/901_GameData/Animation.rb new file mode 100644 index 000000000..4b26e2242 --- /dev/null +++ b/Data/Scripts/901_GameData/Animation.rb @@ -0,0 +1,63 @@ +module GameData + class Animation + attr_reader :name + attr_reader :move, :type # Type is move's type; useful for filtering; move==nil means common animation + attr_reader :version # Hit number + # TODO: Boolean for whether user is on player's side or foe's side. + # TODO: Boolean for not played if target is on user's side. + attr_reader :particles + attr_reader :flags + # TODO: PBS filename. +# attr_reader :pbs_filename + + DATA = {} + # TODO: Make sure the existence of animations.dat is optional. Currently + # it's required. +# DATA_FILENAME = "animations.dat" +# PBS_BASE_FILENAME = "animations" + + extend ClassMethodsIDNumbers + include InstanceMethods + + def register(hash) + DATA[DATA.keys.length] = self.new(hash) + end + + # TODO: Rewrite this to query animations from other criteria. Remember that + # multiple animations could have the same move/version. Odds are this + # method won't be used much at all. + # TODO: Separate exists? methods for move and common animations? +# def exists?(other) +# end + + # TODO: Rewrite this to get animations from other criteria. Remember that + # multiple animations could have the same move/version. Odds are this + # method won't be used much at all. + # TODO: Separate get methods for move and common animations? +# def get(other) +# end + + # TODO: Rewrite this to get animations from other criteria. Remember that + # multiple animations could have the same move/version. Odds are this + # method won't be used much at all. + # TODO: Separate try_get methods for move and common animations? +# def try_get(other) +# end + + def initialize(hash) + @name = hash[:name] + @move = hash[:move] + @type = hash[:type] + @version = hash[:version] || 0 + @particles = [] + # TODO: Copy particles info from hash somehow. + @flags = hash[:flags] || [] + # TODO: Come up with a decent default PBS filename; likely the move's name + # (for move anims) or @name (for common anims). + end + + def move_animation? + return !@move.nil? + end + end +end diff --git a/Data/Scripts/905_New controls/000 UIControls.rb b/Data/Scripts/905_New controls/000 UIControls.rb new file mode 100644 index 000000000..e3bed3025 --- /dev/null +++ b/Data/Scripts/905_New controls/000 UIControls.rb @@ -0,0 +1,2 @@ +# Container module for control classes. +module UIControls; end diff --git a/Data/Scripts/905_New controls/001 basic control.rb b/Data/Scripts/905_New controls/001 basic control.rb new file mode 100644 index 000000000..fea40b138 --- /dev/null +++ b/Data/Scripts/905_New controls/001 basic control.rb @@ -0,0 +1,180 @@ +# TODO: Add "disabled" greying out/non-editable. +# TODO: Add indicator of whether the control's value is "lerping" between frames +# (use yellow somehow?). + +#=============================================================================== +# +#=============================================================================== +class UIControls::BaseControl < BitmapSprite + attr_reader :value +# attr_accessor :disabled # TODO: Make use of this. + + TEXT_COLOR = Color.black + TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set + HOVER_COLOR = Color.cyan # For clickable area when hovering over it + CAPTURE_COLOR = Color.pink # For area you clicked in but aren't hovering over + + def initialize(width, height, viewport) + super(width, height, viewport) + self.bitmap.font.color = TEXT_COLOR + self.bitmap.font.size = TEXT_SIZE + +# @disabled = false # TODO: Make use of this. + @hover_area = nil # Is a symbol from the keys for @interactions if the mouse is hovering over that interaction + @captured_area = nil # Is a symbol from the keys for @interactions (or :none) if this control is clicked in + clear_changed + invalidate + end + + def width + return self.bitmap.width + end + + def height + return self.bitmap.height + end + + def mouse_pos + mouse_coords = Mouse.getMousePos + return nil, nil if !mouse_coords + ret_x = mouse_coords[0] - self.viewport.rect.x - self.x + ret_y = mouse_coords[1] - self.viewport.rect.y - self.y + return ret_x, ret_y + end + + def set_interactive_rects + @interactions = {} + end + + #----------------------------------------------------------------------------- + + def invalid? + return @invalid + end + + # Marks that the control must be redrawn to reflect current logic. + def invalidate + @invalid = true + end + + # Makes the control no longer invalid. + def validate + @invalid = false + end + + def busy? + return !@captured_area.nil? + end + + def changed? + return @changed + end + + def set_changed + @changed = true + end + + def clear_changed + @changed = false + end + + #----------------------------------------------------------------------------- + + def draw_text(this_bitmap, text_x, text_y, this_text) + text_size = this_bitmap.text_size(this_text) + this_bitmap.draw_text(text_x, text_y, text_size.width, text_size.height, this_text, 0) + end + + # Redraws the control only if it is invalid. + def repaint + return if !invalid? + refresh + validate + end + + def refresh + # Paint over control to erase contents (intentionally not using self.bitmap.clear) + self.bitmap.clear + draw_area_highlight + end + + def draw_area_highlight + return if !@interactions || @interactions.empty? + if !@captured_area || @hover_area == @captured_area + # Draw mouse hover over area highlight + rect = @interactions[@hover_area] + self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, HOVER_COLOR) if rect + elsif @captured_area + # Draw captured area highlight + rect = @interactions[@captured_area] + self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, CAPTURE_COLOR) if rect + end + end + + #----------------------------------------------------------------------------- + + # This method is only called if the mouse is in the game window and this + # control has interactive elements. + def on_mouse_press + return if !@interactions || @interactions.empty? + return if @captured_area + @captured_area = nil + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + @interactions.each_pair do |area, rect| + next if !rect.contains?(mouse_x, mouse_y) + @captured_area = area + invalidate + break + end + end + + # Returns whether this control has been properly decaptured. + def on_mouse_release + @captured_area = nil + invalidate + end + + def update_hover_highlight + # Remove the hover highlight if there are no interactions for this control + # or if the mouse is off-screen + mouse_x, mouse_y = mouse_pos + if !@interactions || @interactions.empty? || !mouse_x || !mouse_y + invalidate if @hover_area + @hover_area = nil + return + end + # Check each interactive area for whether the mouse is hovering over it, and + # set @hover_area accordingly + in_area = false + @interactions.each_pair do |area, rect| + next if !rect.contains?(mouse_x, mouse_y) + invalidate if @hover_area != area + @hover_area = area + in_area = true + break + end + if !in_area + invalidate if @hover_area + @hover_area = nil + end + end + + # Updates the logic on the control, invalidating it if necessary. + def update + # TODO: Disabled control stuff. +# return if self.disabled + + update_hover_highlight + + # Detect a mouse press/release + if @interactions && !@interactions.empty? + if Input.trigger?(Input::MOUSELEFT) + on_mouse_press + elsif busy? && Input.release?(Input::MOUSELEFT) + on_mouse_release + end + end + + end +end diff --git a/Data/Scripts/905_New controls/002 label.rb b/Data/Scripts/905_New controls/002 label.rb new file mode 100644 index 000000000..dac2d75bc --- /dev/null +++ b/Data/Scripts/905_New controls/002 label.rb @@ -0,0 +1,24 @@ +#=============================================================================== +# +#=============================================================================== +class UIControls::Label < UIControls::BaseControl + attr_reader :label + + LABEL_END_X = 80 + TEXT_OFFSET_Y = 7 + + def initialize(width, height, viewport, label) + super(width, height, viewport) + @label = label + end + + def label=(value) + @label = value + refresh + end + + def refresh + super + draw_text(self.bitmap, 4, TEXT_OFFSET_Y, @label) + end +end diff --git a/Data/Scripts/905_New controls/003 checkbox.rb b/Data/Scripts/905_New controls/003 checkbox.rb new file mode 100644 index 000000000..faa1d38fc --- /dev/null +++ b/Data/Scripts/905_New controls/003 checkbox.rb @@ -0,0 +1,68 @@ +#=============================================================================== +# NOTE: Strictly speaking, this is a toggle switch and not a checkbox. +#=============================================================================== +class UIControls::Checkbox < UIControls::BaseControl + CHECKBOX_X = 0 + CHECKBOX_WIDTH = 40 + CHECKBOX_HEIGHT = 24 + CHECKBOX_FILL_SIZE = CHECKBOX_HEIGHT - 8 + + UNCHECKED_COLOR = Color.gray + CHECKED_COLOR = Color.new(64, 255, 64) # Green + + def initialize(width, height, viewport, value = false) + super(width, height, viewport) + @value = value + end + + def value=(val) + return if @value == val + @value = val + invalidate + end + + def set_interactive_rects + @checkbox_rect = Rect.new(CHECKBOX_X, (height - CHECKBOX_HEIGHT) / 2, + CHECKBOX_WIDTH, CHECKBOX_HEIGHT) + @interactions = { + :checkbox => @checkbox_rect + } + end + + #----------------------------------------------------------------------------- + + def refresh + super + # Draw checkbox outline + self.bitmap.outline_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, + @checkbox_rect.width - 4, @checkbox_rect.height - 4, + self.bitmap.font.color) + # Draw checkbox fill + if @value # If checked + self.bitmap.fill_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 4, @checkbox_rect.y + 4, + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, CHECKED_COLOR) + self.bitmap.outline_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 4, @checkbox_rect.y + 4, + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) + else + self.bitmap.fill_rect(@checkbox_rect.x + 4, @checkbox_rect.y + 4, + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, UNCHECKED_COLOR) + self.bitmap.outline_rect(@checkbox_rect.x + 4, @checkbox_rect.y + 4, + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) + end + end + + #----------------------------------------------------------------------------- + + def on_mouse_release + return if !@captured_area # Wasn't captured to begin with + # Change this control's value + if @captured_area == :checkbox + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y && @interactions[@captured_area].contains?(mouse_x, mouse_y) + @value = !@value # The actual change of this control's value + set_changed + end + end + super # Make this control not busy again + end +end diff --git a/Data/Scripts/905_New controls/004 text box.rb b/Data/Scripts/905_New controls/004 text box.rb new file mode 100644 index 000000000..20fa86850 --- /dev/null +++ b/Data/Scripts/905_New controls/004 text box.rb @@ -0,0 +1,289 @@ +#=============================================================================== +# TODO: Support selecting part of the text by remembering the initial +# cursor position and using it and the current cursor position to +# decide which characters are selected. Maybe? Note that this method +# is only triggered upon the initial mouse press, and isn't repeated +# while it's still held down. +#=============================================================================== +class UIControls::TextBox < UIControls::BaseControl + TEXT_BOX_X = 2 + TEXT_BOX_WIDTH = 172 + TEXT_BOX_HEIGHT = 24 + TEXT_BOX_PADDING = 4 # Gap between sides of text box and text + TEXT_OFFSET_Y = 7 + + def initialize(width, height, viewport, value = "") + super(width, height, viewport) + @value = value + @cursor_pos = -1 + @display_pos = 0 + @cursor_timer = nil + @cursor_shown = false + end + + def value=(new_value) + return if @value == new_value + @value = new_value + invalidate + end + + def insert_char(ch) + @value.insert(@cursor_pos, ch) + @cursor_pos += 1 + @cursor_timer = System.uptime + @cursor_shown = true + invalidate + end + + def delete_at(index) + @value.slice!(index) + @cursor_pos -= 1 if @cursor_pos > index + @cursor_timer = System.uptime + @cursor_shown = true + invalidate + end + + def cursor_pos=(val) + @cursor_pos = val + reset_display_pos + @cursor_timer = System.uptime + @cursor_shown = true + invalidate + end + + def set_interactive_rects + @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, + [TEXT_BOX_WIDTH, width].min, TEXT_BOX_HEIGHT) + @interactions = { + :text_box => @text_box_rect + } + end + + #----------------------------------------------------------------------------- + + def busy? + return @cursor_pos >= 0 if @captured_area == :text_box + return super + end + + def reset_interaction + @cursor_pos = -1 + @display_pos = 0 + @cursor_timer = nil + @initial_value = nil + Input.text_input = false + invalidate + end + + #----------------------------------------------------------------------------- + + def get_cursor_index_from_mouse_position + char_widths = [] + @value.to_s.length.times { |i| char_widths[i] = self.bitmap.text_size(@value.to_s[i]).width } + mouse_x, mouse_y = mouse_pos + mouse_x -= @text_box_rect.x + TEXT_BOX_PADDING + return 0 if mouse_x < 0 + (@display_pos...char_widths.length).each do |i| + mouse_x -= char_widths[i] + if mouse_x <= 0 + return (mouse_x.abs >= char_widths[i] / 2) ? i : i + 1 + end + end + return @value.to_s.length + end + + def reset_display_pos + box_width = @text_box_rect.width - (TEXT_BOX_PADDING * 2) + char_widths = [] + @value.to_s.length.times { |i| char_widths[i] = self.bitmap.text_size(@value.to_s[i]).width } + # Text isn't wider than the box + if char_widths.sum <= box_width + return false if @display_pos == 0 + @display_pos = 0 + return true + end + display_pos_changed = false + # Ensure the cursor hasn't gone off the left side of the text box + if @cursor_pos < @display_pos + @display_pos = @cursor_pos + display_pos_changed = true + end + # Ensure the cursor hasn't gone off the right side of the text box + if @cursor_pos > @display_pos + loop do + cursor_x = 0 + (@display_pos...@cursor_pos).each do |i| + cursor_x += char_widths[i] if char_widths[i] + end + break if cursor_x < box_width + @display_pos += 1 + display_pos_changed = true + break if @display_pos == @cursor_pos + end + end + # Ensure there isn't empty space on the right if the text can be moved to + # the right to fill it + if @display_pos > 0 + cursor_x = 0 + (@display_pos...char_widths.length).each do |i| + cursor_x += char_widths[i] if char_widths[i] + end + loop do + cursor_x += char_widths[@display_pos - 1] + break if cursor_x >= box_width + @display_pos -= 1 + display_pos_changed = true + break if @display_pos == 0 + end + end + return display_pos_changed + end + + #----------------------------------------------------------------------------- + + def draw_area_highlight + return if @captured_area == :text_box && (@hover_area == @captured_area || !Input.press?(Input::MOUSELEFT)) + super + end + + def draw_cursor(cursor_x) + return if !@cursor_shown || @cursor_pos < 0 + cursor_y_offset = ((height - TEXT_BOX_HEIGHT) / 2) + 2 + cursor_height = height - (cursor_y_offset * 2) + bitmap.fill_rect(cursor_x, cursor_y_offset, 2, cursor_height, self.bitmap.font.color) + end + + def refresh + super + # Draw text box outline + self.bitmap.outline_rect(@text_box_rect.x, @text_box_rect.y, + @text_box_rect.width, @text_box_rect.height, + self.bitmap.font.color) + # Draw value + char_x = @text_box_rect.x + TEXT_BOX_PADDING + last_char_index = @display_pos + (@value.to_s.length - @display_pos).times do |i| + char = @value.to_s[@display_pos + i] + char_width = self.bitmap.text_size(char).width + cannot_display_next_char = char_x + char_width > @text_box_rect.x + @text_box_rect.width - TEXT_BOX_PADDING + draw_text(self.bitmap, char_x, TEXT_OFFSET_Y, char) if !cannot_display_next_char + # Draw cursor + draw_cursor(char_x - 1) if @display_pos + i == @cursor_pos + break if cannot_display_next_char + last_char_index = @display_pos + i + char_x += char_width + end + # Draw cursor at end + draw_cursor(char_x - 1) if @cursor_pos == @value.to_s.length + # Draw left/right arrows to indicate more text beyond the text box sides + if @display_pos > 0 + bitmap.fill_rect(@text_box_rect.x, (height / 2) - 4, 1, 8, Color.white) + 5.times do |i| + bitmap.fill_rect(@text_box_rect.x - 2 + i, (height / 2) - (i + 1), 1, 2 * (i + 1), self.bitmap.font.color) + end + end + if last_char_index < @value.to_s.length - 1 + bitmap.fill_rect(@text_box_rect.x + @text_box_rect.width - 1, (height / 2) - 4, 1, 8, Color.white) + 5.times do |i| + bitmap.fill_rect(@text_box_rect.x + @text_box_rect.width + 1 - i, (height / 2) - (i + 1), 1, 2 * (i + 1), self.bitmap.font.color) + end + end + end + + #----------------------------------------------------------------------------- + + def on_mouse_press + @captured_area = nil + super + if @captured_area == :text_box + # Clicked into the text box; put the text cursor in there + @cursor_pos = get_cursor_index_from_mouse_position + @cursor_timer = System.uptime + invalidate + else + set_changed if @initial_value && @value != @initial_value + reset_interaction + end + end + + def on_mouse_release + return if !@captured_area # Wasn't captured to begin with + # Start text entry if clicked and released mouse button in the text box + if @captured_area == :text_box + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y && @interactions[@captured_area].contains?(mouse_x, mouse_y) + @initial_value = @value.clone + Input.text_input = true + invalidate + return # This control is still captured + end + end + # Released mouse button outside of text box, or initially clicked outside of + # text box; end interaction with this control + set_changed if @initial_value && @value != @initial_value + reset_interaction + super # Make this control not busy again + end + + def update_special_inputs + # Left/right to move cursor + if Input.triggerex?(:LEFT) || Input.repeatex?(:LEFT) + self.cursor_pos = @cursor_pos - 1 if @cursor_pos > 0 + elsif Input.triggerex?(:RIGHT) || Input.repeatex?(:RIGHT) + self.cursor_pos = @cursor_pos + 1 if @cursor_pos < @value.to_s.length + end + # Home/End to jump to start/end of the text + if Input.triggerex?(:HOME) || Input.repeatex?(:HOME) + self.cursor_pos = 0 + elsif Input.triggerex?(:END) || Input.repeatex?(:END) + self.cursor_pos = @value.to_s.length + end + # Backspace/Delete to remove text + if Input.triggerex?(:BACKSPACE) || Input.repeatex?(:BACKSPACE) + delete_at(@cursor_pos - 1) if @cursor_pos > 0 + elsif Input.triggerex?(:DELETE) || Input.repeatex?(:DELETE) + delete_at(@cursor_pos) if @cursor_pos < @value.to_s.length + end + # Return/Escape to end text input (Escape undoes the change) + if Input.triggerex?(:RETURN) || Input.repeatex?(:RETURN) || + Input.triggerex?(:KP_ENTER) || Input.repeatex?(:KP_ENTER) + set_changed if @initial_value && @value != @initial_value + reset_interaction + @captured_area = nil + elsif Input.triggerex?(:ESCAPE) || Input.repeatex?(:ESCAPE) + @value = @initial_value if @initial_value + reset_interaction + @captured_area = nil + end + end + + def update_text_entry + ret = false + Input.gets.each_char do |ch| + insert_char(ch) + ret = true + end + return ret + end + + def update + super + # TODO: Disabled control stuff. +# return if self.disabled + # Make the cursor flash + if @captured_area == :text_box + cursor_to_show = ((System.uptime - @cursor_timer) / 0.35).to_i.even? + if cursor_to_show != @cursor_shown + @cursor_shown = cursor_to_show + invalidate + end + old_cursor_pos = @cursor_pos + # Update cursor movement, deletions and ending text input + update_special_inputs + return if @cursor_pos != old_cursor_pos || !busy? + # Detect character input and add them to @value + char_inserted = update_text_entry + invalidate if reset_display_pos || char_inserted + end + end +end diff --git a/Data/Scripts/905_New controls/005 number slider.rb b/Data/Scripts/905_New controls/005 number slider.rb new file mode 100644 index 000000000..e94b95b68 --- /dev/null +++ b/Data/Scripts/905_New controls/005 number slider.rb @@ -0,0 +1,128 @@ +#=============================================================================== +# +#=============================================================================== +class UIControls::Slider < UIControls::BaseControl + attr_reader :min_value + attr_reader :max_value + + PLUS_MINUS_SIZE = 16 + SLIDER_PADDING = 6 # Gap between sides of interactive area for slider and drawn slider bar + + MINUS_X = 0 + SLIDER_X = MINUS_X + PLUS_MINUS_SIZE + SLIDER_PADDING + SLIDER_LENGTH = 128 + PLUS_X = SLIDER_X + SLIDER_LENGTH + SLIDER_PADDING + VALUE_X = PLUS_X + PLUS_MINUS_SIZE + 5 + TEXT_OFFSET_Y = 7 + + SLIDER_KNOB_COLOR = Color.red + + def initialize(width, height, viewport, min_value, max_value, value) + super(width, height, viewport) + @min_value = min_value + @max_value = max_value + self.value = value + end + + def value=(new_value) + old_val = @value + @value = new_value.to_i.clamp(self.min_value, self.max_value) + self.invalidate if @value != old_val + end + + def min_value=(new_min) + return if new_min == @min_value + @min_value = new_min + @value = @value.clamp(self.min_value, self.max_value) + self.invalidate + end + + def max_value=(new_max) + return if new_max == @max_value + @max_value = new_max + @value = @value.clamp(self.min_value, self.max_value) + self.invalidate + end + + def set_interactive_rects + @slider_rect = Rect.new(SLIDER_X - SLIDER_PADDING, (self.height - PLUS_MINUS_SIZE) / 2, SLIDER_LENGTH + (SLIDER_PADDING * 2), PLUS_MINUS_SIZE) + @minus_rect = Rect.new(MINUS_X, (self.height - PLUS_MINUS_SIZE) / 2, PLUS_MINUS_SIZE, PLUS_MINUS_SIZE) + @plus_rect = Rect.new(PLUS_X, (self.height - PLUS_MINUS_SIZE) / 2, PLUS_MINUS_SIZE, PLUS_MINUS_SIZE) + @interactions = { + :slider => @slider_rect, + :minus => @minus_rect, + :plus => @plus_rect + } + end + + #----------------------------------------------------------------------------- + + def draw_area_highlight + # Don't want to ever highlight the slider with the capture color, because + # the mouse doesn't need to be on the slider to change this control's value + if @captured_area == :slider + rect = @interactions[@captured_area] + self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, HOVER_COLOR) if rect + else + super + end + end + + def refresh + super + # Draw minus button + self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, self.bitmap.font.color) + # Draw slider bar + self.bitmap.fill_rect(SLIDER_X, (self.height / 2) - 1, SLIDER_LENGTH, 2, self.bitmap.font.color) + # Draw notches on slider bar + 5.times do |i| + self.bitmap.fill_rect(SLIDER_X - 1 + (i * SLIDER_LENGTH / 4), (self.height / 2) - 2, 2, 4, self.bitmap.font.color) + end + # Draw slider knob + fraction = (self.value - self.min_value) / self.max_value.to_f + knob_x = (SLIDER_LENGTH * fraction).to_i + self.bitmap.fill_rect(SLIDER_X + knob_x - 4, (self.height / 2) - 6, 8, 12, SLIDER_KNOB_COLOR) + # Draw plus button + self.bitmap.fill_rect(@plus_rect.x + 2, @plus_rect.y + (@plus_rect.height / 2) - 2, @plus_rect.width - 4, 4, self.bitmap.font.color) + self.bitmap.fill_rect(@plus_rect.x + (@plus_rect.width / 2) - 2, @plus_rect.y + 2, 4, @plus_rect.height - 4, self.bitmap.font.color) + # Draw value text + draw_text(self.bitmap, VALUE_X, TEXT_OFFSET_Y, self.value.to_s) + end + + #----------------------------------------------------------------------------- + + def on_mouse_press + super + @initial_value = @value if @captured_area + end + + def on_mouse_release + return if !@captured_area # Wasn't captured to begin with + set_changed if @initial_value && @value != @initial_value + @initial_value = nil + super + end + + def update + super + # TODO: Disabled control stuff. +# return if self.disabled + case @captured_area + when :minus + # Constant decrement of value while pressing the minus button + if @hover_area == @captured_area && Input.repeat?(Input::MOUSELEFT) + self.value -= 1 + end + when :plus + # Constant incrementing of value while pressing the plus button + if @hover_area == @captured_area && Input.repeat?(Input::MOUSELEFT) + self.value += 1 + end + when :slider + # Constant updating of value depending on mouse's x position + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + self.value = lerp(self.min_value, self.max_value + (self.max_value & 1), SLIDER_LENGTH, mouse_x - SLIDER_X) + end + end +end diff --git a/Data/Scripts/905_New controls/006 value box.rb b/Data/Scripts/905_New controls/006 value box.rb new file mode 100644 index 000000000..14fd5e9a6 --- /dev/null +++ b/Data/Scripts/905_New controls/006 value box.rb @@ -0,0 +1,139 @@ +#=============================================================================== +# +#=============================================================================== +class UIControls::ValueBox < UIControls::TextBox + attr_reader :min_value + attr_reader :max_value + + PLUS_MINUS_SIZE = 16 + CONTROL_PADDING = 2 # Gap between buttons and text box + + MINUS_X = 0 + TEXT_BOX_X = MINUS_X + PLUS_MINUS_SIZE + CONTROL_PADDING + TEXT_BOX_WIDTH = 64 + TEXT_BOX_HEIGHT = 24 + PLUS_X = TEXT_BOX_X + TEXT_BOX_WIDTH + CONTROL_PADDING + + def initialize(width, height, viewport, min_value, max_value, value) + super(width, height, viewport, value) + @min_value = min_value + @max_value = max_value + self.value = value + end + + def value=(new_value) + old_val = @value + @value = new_value.to_i.clamp(self.min_value, self.max_value) + self.invalidate if @value != old_val + end + + def min_value=(new_min) + return if new_min == @min_value + @min_value = new_min + @value = @value.clamp(self.min_value, self.max_value) + self.invalidate + end + + def max_value=(new_max) + return if new_max == @max_value + @max_value = new_max + @value = @value.clamp(self.min_value, self.max_value) + self.invalidate + end + + # TODO: If current value is 0, replace it with ch instead of inserting ch? + def insert_char(ch) + self.value = @value.to_s.insert(@cursor_pos, ch).to_i + @cursor_pos += 1 + @cursor_pos = @cursor_pos.clamp(0, @value.to_s.length) + @cursor_timer = System.uptime + @cursor_shown = true + invalidate + end + + def delete_at(index) + new_val = @value.to_s + new_val.slice!(index) + self.value = new_val.to_i + @cursor_pos -= 1 if @cursor_pos > index + @cursor_pos = @cursor_pos.clamp(0, @value.to_s.length) + @cursor_timer = System.uptime + @cursor_shown = true + invalidate + end + + def set_interactive_rects + @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, + TEXT_BOX_WIDTH, TEXT_BOX_HEIGHT) + @minus_rect = Rect.new(MINUS_X, (self.height - PLUS_MINUS_SIZE) / 2, PLUS_MINUS_SIZE, PLUS_MINUS_SIZE) + @plus_rect = Rect.new(PLUS_X, (self.height - PLUS_MINUS_SIZE) / 2, PLUS_MINUS_SIZE, PLUS_MINUS_SIZE) + @interactions = { + :text_box => @text_box_rect, + :minus => @minus_rect, + :plus => @plus_rect + } + end + + #----------------------------------------------------------------------------- + + def refresh + super + # Draw minus button + self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, self.bitmap.font.color) + # Draw plus button + self.bitmap.fill_rect(@plus_rect.x + 2, @plus_rect.y + (@plus_rect.height / 2) - 2, @plus_rect.width - 4, 4, self.bitmap.font.color) + self.bitmap.fill_rect(@plus_rect.x + (@plus_rect.width / 2) - 2, @plus_rect.y + 2, 4, @plus_rect.height - 4, self.bitmap.font.color) + end + + #----------------------------------------------------------------------------- + + def on_mouse_press + @captured_area = nil + super + if @captured_area == :text_box + # Clicked into the text box; put the text cursor in there + @cursor_pos = get_cursor_index_from_mouse_position + @cursor_timer = System.uptime + invalidate + elsif @captured_area + @initial_value = @value + else + set_changed if @initial_value && @value != @initial_value + reset_interaction + end + end + + def update_text_entry + ret = false + Input.gets.each_char do |ch| + next if !["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "-"].include?(ch) + if ch == "-" + next if @min_value >= 0 || @cursor_pos > 1 || (@cursor_pos > 0 && @value >= 0) + if @value < 0 + delete_at(0) # Remove the negative sign + ret = true + next + end + end + insert_char(ch) + ret = true + end + return ret + end + + def update + super + case @captured_area + when :minus + # Constant decrement of value while pressing the minus button + if @hover_area == @captured_area && Input.repeat?(Input::MOUSELEFT) + self.value -= 1 + end + when :plus + # Constant incrementing of value while pressing the plus button + if @hover_area == @captured_area && Input.repeat?(Input::MOUSELEFT) + self.value += 1 + end + end + end +end diff --git a/Data/Scripts/905_New controls/007 button.rb b/Data/Scripts/905_New controls/007 button.rb new file mode 100644 index 000000000..058a47746 --- /dev/null +++ b/Data/Scripts/905_New controls/007 button.rb @@ -0,0 +1,50 @@ +#=============================================================================== +# +#=============================================================================== +class UIControls::Button < UIControls::BaseControl + BUTTON_X = 2 + BUTTON_PADDING = 10 + BUTTON_HEIGHT = 28 + TEXT_OFFSET_Y = 7 + + def initialize(width, height, viewport, text = "") + super(width, height, viewport) + @text = text + end + + def set_interactive_rects + text_width = self.bitmap.text_size(@text).width + @button_rect = Rect.new(BUTTON_X, (height - BUTTON_HEIGHT) / 2, + text_width + (BUTTON_PADDING * 2), BUTTON_HEIGHT) + @interactions = { + :button => @button_rect + } + end + + #----------------------------------------------------------------------------- + + # TODO: Make buttons look more different to text boxes? + def refresh + super + # Draw button outline + self.bitmap.outline_rect(@button_rect.x, @button_rect.y, + @button_rect.width, @button_rect.height, + self.bitmap.font.color) + # Draw button text + draw_text(self.bitmap, BUTTON_X + BUTTON_PADDING, TEXT_OFFSET_Y, @text) + end + + #----------------------------------------------------------------------------- + + def on_mouse_release + return if !@captured_area # Wasn't captured to begin with + # Change this control's value + if @captured_area == :button + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y && @interactions[@captured_area].contains?(mouse_x, mouse_y) + set_changed + end + end + super # Make this control not busy again + end +end diff --git a/Data/Scripts/905_New controls/008_list.rb b/Data/Scripts/905_New controls/008_list.rb new file mode 100644 index 000000000..60c7881e9 --- /dev/null +++ b/Data/Scripts/905_New controls/008_list.rb @@ -0,0 +1,13 @@ +#=============================================================================== +# TODO +# TODO: Click an option to select it. It remains selected indefinitely. Once an +# option is selected, there's probably no way to unselect everything; the +# selection can only be moved to a different option. +# TODO: Scrollable. +# TODO: Find some way to not redraw the entire thing if the hovered option +# changes. Maybe have another bitmap to write the text on (refreshed only +# when the list is scrolled), and self's bitmap draws the hover colour +# only. +#=============================================================================== +class UIControls::List < UIControls::BaseControl +end diff --git a/Data/Scripts/905_New controls/009 dropdown list.rb b/Data/Scripts/905_New controls/009 dropdown list.rb new file mode 100644 index 000000000..f3c12db67 --- /dev/null +++ b/Data/Scripts/905_New controls/009 dropdown list.rb @@ -0,0 +1,9 @@ +#=============================================================================== +# TODO +#=============================================================================== +class UIControls::DropdownList < UIControls::BaseControl + def initialize(width, height, viewport, options, value) + # NOTE: options is a hash: keys are symbols, values are display names. + super(width, height, viewport) + end +end diff --git a/Data/Scripts/906_New controls container/001 controls container.rb b/Data/Scripts/906_New controls container/001 controls container.rb new file mode 100644 index 000000000..fe558b466 --- /dev/null +++ b/Data/Scripts/906_New controls container/001 controls container.rb @@ -0,0 +1,161 @@ +#=============================================================================== +# Controls are arranged in a list in self's bitmap. Each control is given a +# "self's bitmap's width" x LINE_SPACING area of self's bitmap to draw itself +# in. +# TODO: The act of "capturing" a control makes other controls in this container +# not update themselves, i.e. they won't colour themselves with a hover +# highlight if the mouse happens to move over it while another control is +# captured. Is there a better way of dealing with this? I'm leaning +# towards the control itself deciding if it's captured, and it being +# treated as uncaptured once it says its value has changed, but I think +# this would require manually telling all other controls in this container +# that something else is captured and they shouldn't show a hover +# highlight when updated (perhaps as a parameter in def update), which I +# don't think is ideal. Mark self as "busy" while a control is captured. +#=============================================================================== +class UIControls::ControlsContainer + attr_reader :x, :y + attr_reader :controls + + LINE_SPACING = 32 + OFFSET_FROM_LABEL_X = 80 + OFFSET_FROM_LABEL_Y = 0 + + def initialize(x, y, width, height) + @viewport = Viewport.new(x, y, width, height) + @viewport.z = 99999 + @x = x + @y = y + @width = width + @height = height + @controls = [] + @control_rects = [] + @row_count = 0 + @captured = nil + end + + def dispose + @controls.each { |c| c[1]&.dispose } + @controls.clear + @viewport.dispose + end + + #----------------------------------------------------------------------------- + + def add_label(id, label, has_label = false) + id = (id.to_s + "_label").to_sym + add_control(id, UIControls::Label.new(*control_size(has_label), @viewport, label), has_label) + end + + def add_checkbox(id, value, has_label = false) + add_control(id, UIControls::Checkbox.new(*control_size(has_label), @viewport, value), has_label) + end + + def add_labelled_checkbox(id, label, value) + add_label(id, label) + add_checkbox(id, value, true) + end + + def add_text_box(id, value, has_label = false) + add_control(id, UIControls::TextBox.new(*control_size(has_label), @viewport, value), has_label) + end + + def add_labelled_text_box(id, label, value) + add_label(id, label) + add_text_box(id, value, true) + end + + def add_slider(id, min_value, max_value, value, has_label = false) + add_control(id, UIControls::Slider.new(*control_size(has_label), @viewport, min_value, max_value, value), has_label) + end + + def add_labelled_slider(id, label, min_value, max_value, value) + add_label(id, label) + add_slider(id, min_value, max_value, value, true) + end + + def add_value_box(id, min_value, max_value, value, has_label = false) + add_control(id, UIControls::ValueBox.new(*control_size(has_label), @viewport, min_value, max_value, value), has_label) + end + + def add_labelled_value_box(id, label, min_value, max_value, value) + add_label(id, label) + add_value_box(id, min_value, max_value, value, true) + end + + def add_button(id, button_text, has_label = false) + add_control(id, UIControls::Button.new(*control_size(has_label), @viewport, button_text), has_label) + end + + def add_labelled_button(id, label, button_text) + add_label(id, label) + add_button(id, button_text, true) + end + + def add_dropdown_list(id, options, value, has_label = false) + add_control(id, UIControls::DropdownList.new(*control_size(has_label), @viewport, options, value), has_label) + end + + def add_labelled_dropdown_list(id, label, options, value) + add_label(id, label) + add_dropdown_list(id, options, value, true) + end + + #----------------------------------------------------------------------------- + + def repaint + @controls.each { |ctrl| ctrl[1].repaint } + end + + #----------------------------------------------------------------------------- + + def update + # Update controls + if @captured + # TODO: Ideally all controls will be updated here, if only to redraw + # themselves if they happen to be invalidated somehow. But that + # involves telling each control whether any other control is busy, + # to ensure that they don't show their hover colours or anything, + # which is fiddly and I'm not sure if it's the best approach. + @captured.update + @captured = nil if !@captured.busy? + else + @controls.each do |ctrl| + ctrl[1].update + @captured = ctrl[1] if ctrl[1].busy? + end + end + # Check for updated controls + @controls.each do |ctrl| + next if !ctrl[1].changed? + # TODO: Get the new value from ctrl and put it in a hash for the main + # editor class to notice and use. + ctrl[1].clear_changed + end + # Redraw controls if needed + repaint + end + + #----------------------------------------------------------------------------- + + private + + def control_size(has_label = false) + if has_label + return @width - OFFSET_FROM_LABEL_X, LINE_SPACING - OFFSET_FROM_LABEL_Y + end + return @width, LINE_SPACING + end + + def add_control(id, control, add_offset = false) + i = @controls.length + control_y = (add_offset ? @row_count - 1 : @row_count) * LINE_SPACING + @control_rects[i] = Rect.new(0, control_y, control.width, control.height) + control.x = @control_rects[i].x + (add_offset ? OFFSET_FROM_LABEL_X : 0) + control.y = @control_rects[i].y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) + control.set_interactive_rects + @controls[i] = [id, control] + @row_count += 1 if !add_offset + repaint + end +end diff --git a/Data/Scripts/910_New anim editor/001_anim selection.rb b/Data/Scripts/910_New anim editor/001_anim selection.rb new file mode 100644 index 000000000..443235291 --- /dev/null +++ b/Data/Scripts/910_New anim editor/001_anim selection.rb @@ -0,0 +1,97 @@ +# TODO: Come up with a better name for this class. I'm not sure I want to merge +# this class with the editor class. +class AnimationEditorLoadScreen + WINDOW_WIDTH = Settings::SCREEN_WIDTH + (32 * 10) + WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + (32 * 10) + + ANIMATIONS_LIST_X = 4 + ANIMATIONS_LIST_Y = 4 + ANIMATIONS_LIST_WIDTH = 300 + ANIMATIONS_LIST_HEIGHT = WINDOW_HEIGHT - (ANIMATIONS_LIST_Y * 2) + + def initialize + @viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) + @viewport.z = 99999 + @screen_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @viewport) + draw_editor_background + end + + def dispose + @screen_bitmap.dispose + @viewport.dispose + end + + def draw_editor_background + # Fill the whole screen with black + @screen_bitmap.bitmap.fill_rect( + 0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.black + ) + # Outline around animations list + @screen_bitmap.bitmap.outline_rect( + ANIMATIONS_LIST_X - 3, ANIMATIONS_LIST_Y - 3, + ANIMATIONS_LIST_WIDTH + 6, ANIMATIONS_LIST_HEIGHT + 6, Color.white + ) + @screen_bitmap.bitmap.outline_rect( + ANIMATIONS_LIST_X - 2, ANIMATIONS_LIST_Y - 2, + ANIMATIONS_LIST_WIDTH + 4, ANIMATIONS_LIST_HEIGHT + 4, Color.black + ) + @screen_bitmap.bitmap.outline_rect( + ANIMATIONS_LIST_X - 1, ANIMATIONS_LIST_Y - 1, + ANIMATIONS_LIST_WIDTH + 2, ANIMATIONS_LIST_HEIGHT + 2, Color.white + ) + # Fill the animations list with white + @screen_bitmap.bitmap.fill_rect( + ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y, ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT, Color.white + ) + end + + def update + # TODO: Update the controls (animations list, Load button, etc.). + end + + def run + Input.text_input = false + loop do + inputting_text = Input.text_input + Graphics.update + Input.update + update + if !inputting_text + break if Input.trigger?(Input::BACK) + end + # Open editor with animation + # TODO: If the Load button is pressed while an animation is selected. + if Input.trigger?(Input::USE) + # TODO: Add animation to be edited as an argument. + screen = AnimationEditor.new + screen.run + end + end + dispose + end +end + +#=============================================================================== +# Start +#=============================================================================== +def test_anim_editor + Graphics.resize_screen(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) + pbSetResizeFactor(1) + screen = AnimationEditorLoadScreen.new + screen.run + Graphics.resize_screen(Settings::SCREEN_WIDTH, Settings::SCREEN_HEIGHT) + pbSetResizeFactor($PokemonSystem.screensize) + $game_map&.autoplay +end + +#=============================================================================== +# Add to Debug menu +#=============================================================================== +MenuHandlers.add(:debug_menu, :use_pc, { + "name" => "Test new animation editor", + "parent" => :main, + "description" => "Test new animation editor", + "effect" => proc { + test_anim_editor + } +}) diff --git a/Data/Scripts/910_New anim editor/010 editor scene.rb b/Data/Scripts/910_New anim editor/010 editor scene.rb new file mode 100644 index 000000000..df3ad2ee3 --- /dev/null +++ b/Data/Scripts/910_New anim editor/010 editor scene.rb @@ -0,0 +1,115 @@ +# TODO: Should I split this code into visual and mechanical classes, a la the +# other UI screens? +#=============================================================================== +# TODO: Need a way to recognise when text is being input into something +# (Input.text_input) and disable all keyboard shortcuts if so. If only +# this class has keyboard shortcuts in it, then it should be okay already. +#=============================================================================== +class AnimationEditor + WINDOW_WIDTH = AnimationEditorLoadScreen::WINDOW_WIDTH + WINDOW_HEIGHT = AnimationEditorLoadScreen::WINDOW_HEIGHT + + CANVAS_X = 4 + CANVAS_Y = 32 + 4 + CANVAS_WIDTH = Settings::SCREEN_WIDTH + CANVAS_HEIGHT = Settings::SCREEN_HEIGHT + SIDE_PANEL_X = CANVAS_X + CANVAS_WIDTH + 4 + 4 + SIDE_PANEL_Y = CANVAS_Y + SIDE_PANEL_WIDTH = WINDOW_WIDTH - SIDE_PANEL_X - 4 + SIDE_PANEL_HEIGHT = CANVAS_HEIGHT + (32 * 2) + + # TODO: Add a parameter which is the animation to be edited, and also a + # parameter for that animation's ID in GameData (just for the sake of + # saving changes over the same GameData slot). + def initialize + @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) + @viewport.z = 99999 + @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) + draw_editor_background + # Canvas + @canvas = Sprite.new(@viewport) + @canvas.x = CANVAS_X + @canvas.y = CANVAS_Y + @canvas.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", "field_bg") + # Side pane + @side_pane = ControlPane.new(SIDE_PANEL_X, SIDE_PANEL_Y, SIDE_PANEL_WIDTH, SIDE_PANEL_HEIGHT) + set_side_panel_contents + end + + def dispose + @screen_bitmap.dispose + @canvas.dispose + @side_pane.dispose + @viewport.dispose + end + + def draw_editor_background + # Fill the whole screen with black + @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.black) + # Outline around canvas + @screen_bitmap.bitmap.outline_rect(CANVAS_X - 3, CANVAS_Y - 3, CANVAS_WIDTH + 6, CANVAS_HEIGHT + 6, Color.white) + @screen_bitmap.bitmap.outline_rect(CANVAS_X - 2, CANVAS_Y - 2, CANVAS_WIDTH + 4, CANVAS_HEIGHT + 4, Color.black) + @screen_bitmap.bitmap.outline_rect(CANVAS_X - 1, CANVAS_Y - 1, CANVAS_WIDTH + 2, CANVAS_HEIGHT + 2, Color.white) + # Outline around side panel + @screen_bitmap.bitmap.outline_rect(SIDE_PANEL_X - 3, SIDE_PANEL_Y - 3, SIDE_PANEL_WIDTH + 6, SIDE_PANEL_HEIGHT + 6, Color.white) + @screen_bitmap.bitmap.outline_rect(SIDE_PANEL_X - 2, SIDE_PANEL_Y - 2, SIDE_PANEL_WIDTH + 4, SIDE_PANEL_HEIGHT + 4, Color.black) + @screen_bitmap.bitmap.outline_rect(SIDE_PANEL_X - 1, SIDE_PANEL_Y - 1, SIDE_PANEL_WIDTH + 2, SIDE_PANEL_HEIGHT + 2, Color.white) + # Fill the side panel with white + @screen_bitmap.bitmap.fill_rect(SIDE_PANEL_X, SIDE_PANEL_Y, SIDE_PANEL_WIDTH, SIDE_PANEL_HEIGHT, Color.white) + end + + def set_side_panel_contents + @side_pane.add_labelled_text_box(:name, "Name", "Untitled") + @side_pane.add_labelled_value_box(:x, "X", -128, CANVAS_WIDTH + 128, 64) + @side_pane.add_labelled_value_box(:y, "Y", -128, CANVAS_HEIGHT + 128, 96) + @side_pane.add_labelled_value_box(:zoom_x, "Zoom X", 0, 1000, 100) + @side_pane.add_labelled_value_box(:zoom_y, "Zoom Y", 0, 1000, 100) + @side_pane.add_labelled_value_box(:angle, "Angle", -1080, 1080, 0) + @side_pane.add_labelled_checkbox(:visible, "Visible", true) + @side_pane.add_labelled_slider(:opacity, "Opacity", 0, 255, 255) + @side_pane.add_labelled_checkbox(:flip, "Flip", false) + @side_pane.add_labelled_dropdown_list(:priority, "Priority", { # TODO: Include sub-priority. + :behind_all => "Behind all", + :behind_user => "Behind user", + :above_user => "In front of user", + :above_all => "In front of everything" + }, :above_user) +# @side_pane.add_labelled_dropdown_list(:focus, "Focus", { +# :user => "User", +# :target => "Target", +# :user_and_target => "User and target", +# :screen => "Screen" +# }, :user) + @side_pane.add_labelled_button(:color, "Color/tone", "Edit") + @side_pane.add_labelled_button(:graphic, "Graphic", "Change") + end + + def update + @canvas.update + @side_pane.update + # TODO: Check @side_pane for whether it's changed. Note that it includes + # buttons which won't themselves have a value but will flag themselves + # as changed when clicked; code here should determine what happens if + # a button is pressed (unless I put said code in a proc passed to the + # button control; said code will be lengthy). + end + + def run + Input.text_input = false + loop do + inputting_text = Input.text_input + Graphics.update + Input.update + update + if !inputting_text + if Input.trigger?(Input::BACK) + # TODO: Ask to save/discard changes. + # TODO: When saving, add animation to GameData and rewrite animation's + # parent PBS file (which could include multiple animations). + break + end + end + end + dispose + end +end diff --git a/Data/Scripts/910_New anim editor/020 button pane.rb b/Data/Scripts/910_New anim editor/020 button pane.rb new file mode 100644 index 000000000..e2bf531e1 --- /dev/null +++ b/Data/Scripts/910_New anim editor/020 button pane.rb @@ -0,0 +1,12 @@ +#=============================================================================== +# +#=============================================================================== +class AnimationEditor::ControlPane < UIControls::ControlsContainer + def on_control_release + # TODO: Update data for @captured control, because it may have changed. + # Gather data from all controls in this container and put them in a + # hash; it's up to the main editor screen to notice/read it, edit + # animation data accordingly, and then tell this container to nil that + # hash again. + end +end From d4077875a4d918d5d8c7aaf52a7ea69a266c243d Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 31 Aug 2023 23:03:47 +0100 Subject: [PATCH 02/49] Implemented list control and basic animation-choosing screen for editor --- Data/Scripts/901_GameData/Animation.rb | 8 +- .../905_New controls/001 basic control.rb | 5 + Data/Scripts/905_New controls/003 checkbox.rb | 16 +- .../905_New controls/005 number slider.rb | 4 +- Data/Scripts/905_New controls/007 button.rb | 33 ++- Data/Scripts/905_New controls/008_list.rb | 233 +++++++++++++++++- .../910_New anim editor/001_anim selection.rb | 127 +++++++--- 7 files changed, 367 insertions(+), 59 deletions(-) diff --git a/Data/Scripts/901_GameData/Animation.rb b/Data/Scripts/901_GameData/Animation.rb index 4b26e2242..7530922b3 100644 --- a/Data/Scripts/901_GameData/Animation.rb +++ b/Data/Scripts/901_GameData/Animation.rb @@ -19,8 +19,8 @@ module GameData extend ClassMethodsIDNumbers include InstanceMethods - def register(hash) - DATA[DATA.keys.length] = self.new(hash) + def register(hash, id = -1) + DATA[(id >= 0) ? id : DATA.keys.length] = self.new(hash) end # TODO: Rewrite this to query animations from other criteria. Remember that @@ -59,5 +59,9 @@ module GameData def move_animation? return !@move.nil? end + + # TODO: Create a def to_hash or something, which returns a hash copy version + # of this Animation object which can be edited. This hash should be + # able to be passed into def register (with an ID number). end end diff --git a/Data/Scripts/905_New controls/001 basic control.rb b/Data/Scripts/905_New controls/001 basic control.rb index fea40b138..4ef26e5dc 100644 --- a/Data/Scripts/905_New controls/001 basic control.rb +++ b/Data/Scripts/905_New controls/001 basic control.rb @@ -85,6 +85,11 @@ class UIControls::BaseControl < BitmapSprite this_bitmap.draw_text(text_x, text_y, text_size.width, text_size.height, this_text, 0) end + def draw_text_centered(this_bitmap, text_x, text_y, wid, this_text) + text_size = this_bitmap.text_size(this_text) + this_bitmap.draw_text(text_x, text_y, wid, text_size.height, this_text, 1) + end + # Redraws the control only if it is invalid. def repaint return if !invalid? diff --git a/Data/Scripts/905_New controls/003 checkbox.rb b/Data/Scripts/905_New controls/003 checkbox.rb index faa1d38fc..103f74b9e 100644 --- a/Data/Scripts/905_New controls/003 checkbox.rb +++ b/Data/Scripts/905_New controls/003 checkbox.rb @@ -2,10 +2,10 @@ # NOTE: Strictly speaking, this is a toggle switch and not a checkbox. #=============================================================================== class UIControls::Checkbox < UIControls::BaseControl - CHECKBOX_X = 0 + CHECKBOX_X = 2 CHECKBOX_WIDTH = 40 CHECKBOX_HEIGHT = 24 - CHECKBOX_FILL_SIZE = CHECKBOX_HEIGHT - 8 + CHECKBOX_FILL_SIZE = CHECKBOX_HEIGHT - 4 UNCHECKED_COLOR = Color.gray CHECKED_COLOR = Color.new(64, 255, 64) # Green @@ -34,19 +34,19 @@ class UIControls::Checkbox < UIControls::BaseControl def refresh super # Draw checkbox outline - self.bitmap.outline_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, - @checkbox_rect.width - 4, @checkbox_rect.height - 4, + self.bitmap.outline_rect(@checkbox_rect.x, @checkbox_rect.y, + @checkbox_rect.width, @checkbox_rect.height, self.bitmap.font.color) # Draw checkbox fill if @value # If checked - self.bitmap.fill_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 4, @checkbox_rect.y + 4, + self.bitmap.fill_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 2, @checkbox_rect.y + 2, CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, CHECKED_COLOR) - self.bitmap.outline_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 4, @checkbox_rect.y + 4, + self.bitmap.outline_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 2, @checkbox_rect.y + 2, CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) else - self.bitmap.fill_rect(@checkbox_rect.x + 4, @checkbox_rect.y + 4, + self.bitmap.fill_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, UNCHECKED_COLOR) - self.bitmap.outline_rect(@checkbox_rect.x + 4, @checkbox_rect.y + 4, + self.bitmap.outline_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) end end diff --git a/Data/Scripts/905_New controls/005 number slider.rb b/Data/Scripts/905_New controls/005 number slider.rb index e94b95b68..2e2d1e867 100644 --- a/Data/Scripts/905_New controls/005 number slider.rb +++ b/Data/Scripts/905_New controls/005 number slider.rb @@ -15,7 +15,9 @@ class UIControls::Slider < UIControls::BaseControl VALUE_X = PLUS_X + PLUS_MINUS_SIZE + 5 TEXT_OFFSET_Y = 7 - SLIDER_KNOB_COLOR = Color.red + # TODO: Is there a better knob design than a big black rectangle? I'd rather + # it not be a different colour. + SLIDER_KNOB_COLOR = Color.black def initialize(width, height, viewport, min_value, max_value, value) super(width, height, viewport) diff --git a/Data/Scripts/905_New controls/007 button.rb b/Data/Scripts/905_New controls/007 button.rb index 058a47746..e84d2acae 100644 --- a/Data/Scripts/905_New controls/007 button.rb +++ b/Data/Scripts/905_New controls/007 button.rb @@ -2,20 +2,28 @@ # #=============================================================================== class UIControls::Button < UIControls::BaseControl - BUTTON_X = 2 - BUTTON_PADDING = 10 - BUTTON_HEIGHT = 28 - TEXT_OFFSET_Y = 7 + BUTTON_X = 2 + BUTTON_Y = 2 + BUTTON_PADDING = 10 + BUTTON_HEIGHT = 28 + # TODO: This will also depend on the font size. + TEXT_BASE_OFFSET_Y = 18 # Text is centred vertically in the button def initialize(width, height, viewport, text = "") super(width, height, viewport) @text = text + @fixed_size = false + end + + def set_fixed_size + @fixed_size = true end def set_interactive_rects - text_width = self.bitmap.text_size(@text).width - @button_rect = Rect.new(BUTTON_X, (height - BUTTON_HEIGHT) / 2, - text_width + (BUTTON_PADDING * 2), BUTTON_HEIGHT) + button_width = (@fixed_size) ? width - (BUTTON_X * 2) : self.bitmap.text_size(@text).width + (BUTTON_PADDING * 2) + button_height = (@fixed_size) ? height - (2 * BUTTON_Y) : BUTTON_HEIGHT + button_height = [button_height, height - (2 * BUTTON_Y)].min + @button_rect = Rect.new(BUTTON_X, (height - button_height) / 2, button_width, button_height) @interactions = { :button => @button_rect } @@ -23,15 +31,22 @@ class UIControls::Button < UIControls::BaseControl #----------------------------------------------------------------------------- - # TODO: Make buttons look more different to text boxes? def refresh super # Draw button outline self.bitmap.outline_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, self.bitmap.font.color) + # TODO: Make buttons look more different to text boxes? + # shade = self.bitmap.font.color.clone + # shade.alpha = 96 + # self.bitmap.outline_rect(@button_rect.x + 1, @button_rect.y + 1, + # @button_rect.width - 2, @button_rect.height - 2, + # shade, 3) # Draw button text - draw_text(self.bitmap, BUTTON_X + BUTTON_PADDING, TEXT_OFFSET_Y, @text) + draw_text_centered(self.bitmap, @button_rect.x, + @button_rect.y + (@button_rect.height - TEXT_BASE_OFFSET_Y) / 2, + @button_rect.width, @text) end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/905_New controls/008_list.rb b/Data/Scripts/905_New controls/008_list.rb index 60c7881e9..5f68a98e6 100644 --- a/Data/Scripts/905_New controls/008_list.rb +++ b/Data/Scripts/905_New controls/008_list.rb @@ -1,13 +1,228 @@ #=============================================================================== -# TODO -# TODO: Click an option to select it. It remains selected indefinitely. Once an -# option is selected, there's probably no way to unselect everything; the -# selection can only be moved to a different option. -# TODO: Scrollable. -# TODO: Find some way to not redraw the entire thing if the hovered option -# changes. Maybe have another bitmap to write the text on (refreshed only -# when the list is scrolled), and self's bitmap draws the hover colour -# only. +# TODO: Do I need to split self's bitmap into two (one for highlights and one +# for text/slider)? This would be to reduce lag caused by redrawing text +# and the slider even if you're just waving the mouse over the control. +# There doesn't seem to be any lag at the moment with a tall list. #=============================================================================== class UIControls::List < UIControls::BaseControl + LIST_X = 0 + LIST_Y = 0 + ROW_HEIGHT = 24 + TEXT_PADDING_X = 4 + TEXT_OFFSET_Y = 3 + SLIDER_WIDTH = 16 + + SELECTED_ROW_COLOR = Color.green + + def initialize(width, height, viewport, values = []) + super(width, height, viewport) + @rows_count = (height / ROW_HEIGHT).floor # Number of rows visible at once + @top_row = 0 + @selected = -1 + @show_slider = false + self.values = values + end + + # Each value in @values is an array: [id, text]. + def values=(new_vals) + @values = new_vals + @show_slider = (@values.length > @rows_count) + set_interactive_rects + if @show_slider + self.top_row = @top_row + else + self.top_row = 0 + end + invalidate + end + + def top_row=(val) + old_val = @top_row + @top_row = val + if @show_slider + @top_row = @top_row.clamp(0, @values.length - @rows_count) + @slider.y = lerp(0, height - @slider.height, @values.length - @rows_count, 0, @top_row).round + else + @top_row = 0 + end + invalidate if @top_row != old_val + end + + def selected=(val) + return if @selected == val + @selected = val + invalidate + end + + # Returns the ID of the selected row. + def value + return nil if @selected < 0 + return @values[@selected][0] + end + + def set_interactive_rects + @interactions = {} + @slider = nil + if @show_slider + @slider = Rect.new(LIST_X + width - SLIDER_WIDTH, LIST_Y, + SLIDER_WIDTH, height * @rows_count / @values.length) + @interactions[:slider] = @slider + @slider_tray = Rect.new(LIST_X + width - SLIDER_WIDTH, LIST_Y, SLIDER_WIDTH, height) + @interactions[:slider_tray] = @slider_tray + end + @values.length.times do |i| + @interactions[i] = Rect.new(LIST_X, LIST_Y + (ROW_HEIGHT * i), width - LIST_X, ROW_HEIGHT) + end + end + + #----------------------------------------------------------------------------- + + def busy? + return !@captured_area.nil? + end + + #----------------------------------------------------------------------------- + + def draw_area_highlight + # If a row is captured, it will automatically be selected and the selection + # colour will be drawn over the highlight. The slider tray background + # (white) is drawn over the slider/slider tray's highlight. Either way, + # there's no point drawing a highlight at all if anything is captured. + return if @captured_area + # The slider tray background (white) is drawn over the slider/slider tray's + # highlight. There's no point drawing any highlight for the slider now; this + # is done in def refresh instead. + return if [:slider, :slider_tray].include?(@hover_area) + # Draw mouse hover over row highlight + rect = @interactions[@hover_area] + if rect + rect_y = rect.y + rect_y -= @top_row * ROW_HEIGHT if @hover_area.is_a?(Integer) + self.bitmap.fill_rect(rect.x, rect_y, rect.width, rect.height, HOVER_COLOR) + end + end + + def refresh + super + # Draw text options + @values.each_with_index do |val, i| + next if i < @top_row || i >= @top_row + @rows_count + if @selected == i + self.bitmap.fill_rect( + @interactions[i].x, + @interactions[i].y - (@top_row * ROW_HEIGHT), + @interactions[i].width, @interactions[i].height, + SELECTED_ROW_COLOR + ) + end + draw_text(self.bitmap, + @interactions[i].x + TEXT_PADDING_X, + @interactions[i].y + TEXT_OFFSET_Y - (@top_row * ROW_HEIGHT), + val[1]) + end + # Draw vertical slider + if @show_slider + self.bitmap.fill_rect(@slider_tray.x, @slider_tray.y, @slider_tray.width, @slider_tray.height, Color.white) + bar_color = self.bitmap.font.color + if @captured_area == :slider || (!@captured_area && @hover_area == :slider) + bar_color = HOVER_COLOR + end + self.bitmap.fill_rect(@slider.x + 1, @slider.y, @slider.width - 1, @slider.height, bar_color) + end + end + + #----------------------------------------------------------------------------- + + def on_mouse_press + @captured_area = nil + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + # Check for mouse presses on slider/slider tray + @interactions.each_pair do |area, rect| + next if area.is_a?(Integer) + next if !rect.contains?(mouse_x, mouse_y) + @captured_area = area + @slider_mouse_offset = mouse_y - rect.y if area == :slider + invalidate + break + end + return if @captured_area + # Check for mouse presses on rows + mouse_y += @top_row * ROW_HEIGHT + @interactions.each_pair do |area, rect| + next if !area.is_a?(Integer) || area < @top_row || area >= @top_row + @rows_count + next if !rect.contains?(mouse_x, mouse_y) + @captured_area = area + invalidate + break + end + end + + def on_mouse_release + return if !@captured_area # Wasn't captured to begin with + set_changed if @captured_area != :slider + super + end + + def update_hover_highlight + # Remove the hover highlight if there are no interactions for this control + # or if the mouse is off-screen + mouse_x, mouse_y = mouse_pos + if !@interactions || @interactions.empty? || !mouse_x || !mouse_y + invalidate if @hover_area + @hover_area = nil + return + end + # Check each interactive area for whether the mouse is hovering over it, and + # set @hover_area accordingly + in_area = false + @interactions.each_pair do |area, rect| + next if area.is_a?(Integer) + next if !rect.contains?(mouse_x, mouse_y) + invalidate if @hover_area != area + @hover_area = area + in_area = true + break + end + if !in_area + mouse_y += @top_row * ROW_HEIGHT + @interactions.each_pair do |area, rect| + next if !area.is_a?(Integer) || area < @top_row || area >= @top_row + @rows_count + next if !rect.contains?(mouse_x, mouse_y) + invalidate if @hover_area != area + @hover_area = area + in_area = true + break + end + end + if !in_area + invalidate if @hover_area + @hover_area = nil + end + end + + def update + super + # TODO: Disabled control stuff. +# return if self.disabled + if @captured_area == :slider + # TODO: Have a display y position for the slider bar which is in pixels, + # and round it to the nearest row when setting @top_row? This is + # just to make the slider bar movement smoother. + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + self.top_row = lerp(0, @values.length - @rows_count, height - @slider.height, 0, mouse_y - @slider_mouse_offset).round + elsif @captured_area == :slider_tray + if Input.repeat?(Input::MOUSELEFT) && @hover_area == :slider_tray + if mouse_y < @slider.y + self.top_row = @top_row - (@rows_count / 2) + else + self.top_row = @top_row + (@rows_count / 2) + end + end + elsif @captured_area + # Have clicked on a row; set the selected row to the row themouse is over + @selected = @hover_area if @hover_area.is_a?(Integer) + end + end end diff --git a/Data/Scripts/910_New anim editor/001_anim selection.rb b/Data/Scripts/910_New anim editor/001_anim selection.rb index 443235291..71691a440 100644 --- a/Data/Scripts/910_New anim editor/001_anim selection.rb +++ b/Data/Scripts/910_New anim editor/001_anim selection.rb @@ -9,11 +9,19 @@ class AnimationEditorLoadScreen ANIMATIONS_LIST_WIDTH = 300 ANIMATIONS_LIST_HEIGHT = WINDOW_HEIGHT - (ANIMATIONS_LIST_Y * 2) + LOAD_BUTTON_WIDTH = 200 + LOAD_BUTTON_HEIGHT = 48 + LOAD_BUTTON_X = ANIMATIONS_LIST_WIDTH + 100 + LOAD_BUTTON_Y = ANIMATIONS_LIST_Y + (ANIMATIONS_LIST_HEIGHT / 2) - (LOAD_BUTTON_HEIGHT / 2) + def initialize - @viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) + generate_list + @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @viewport.z = 99999 - @screen_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @viewport) + @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) draw_editor_background + @load_animation_id = nil + create_controls end def dispose @@ -21,32 +29,86 @@ class AnimationEditorLoadScreen @viewport.dispose end + def generate_list + @animations = [] + # TODO: Look through GameData to populate @animations; below is temporary. + # There will be separate arrays for move animations, common animations + # and overworld animations. The move animations one will primarily be + # a list of moves that have any animations, with the actual GameData + # animations being in a sub-array for each move. + 67.times { |i| @animations.push([i, "Animation #{i + 1}"]) } + end + def draw_editor_background - # Fill the whole screen with black - @screen_bitmap.bitmap.fill_rect( - 0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.black - ) + # Fill the whole screen with white + @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.black) # Outline around animations list - @screen_bitmap.bitmap.outline_rect( - ANIMATIONS_LIST_X - 3, ANIMATIONS_LIST_Y - 3, - ANIMATIONS_LIST_WIDTH + 6, ANIMATIONS_LIST_HEIGHT + 6, Color.white - ) - @screen_bitmap.bitmap.outline_rect( - ANIMATIONS_LIST_X - 2, ANIMATIONS_LIST_Y - 2, - ANIMATIONS_LIST_WIDTH + 4, ANIMATIONS_LIST_HEIGHT + 4, Color.black - ) - @screen_bitmap.bitmap.outline_rect( - ANIMATIONS_LIST_X - 1, ANIMATIONS_LIST_Y - 1, - ANIMATIONS_LIST_WIDTH + 2, ANIMATIONS_LIST_HEIGHT + 2, Color.white - ) - # Fill the animations list with white - @screen_bitmap.bitmap.fill_rect( - ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y, ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT, Color.white - ) + areas = [ + [ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y, ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT], + [LOAD_BUTTON_X, LOAD_BUTTON_Y, LOAD_BUTTON_WIDTH, LOAD_BUTTON_HEIGHT] + ] + areas.each do |area| + # Draw outlines around area + @screen_bitmap.bitmap.outline_rect(area[0] - 3, area[1] - 3, area[2] + 6, area[3] + 6, Color.white) + @screen_bitmap.bitmap.outline_rect(area[0] - 2, area[1] - 2, area[2] + 4, area[3] + 4, Color.black) + @screen_bitmap.bitmap.outline_rect(area[0] - 1, area[1] - 1, area[2] + 2, area[3] + 2, Color.white) + # Fill the area with white +# @screen_bitmap.bitmap.fill_rect(area[0], area[1], area[2], area[3], Color.white) + end + end + + def create_controls + @controls = {} + # TODO: Buttons to toggle between listing moves that have animations, and + # common animations (and overworld animations). + # Animations list + @list = UIControls::List.new(ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT, @viewport, @animations) + @list.x = ANIMATIONS_LIST_X + @list.y = ANIMATIONS_LIST_Y + @controls[:list] = @list + # TODO: A secondary list for displaying all the animations related to the + # selected move. For common anims/overworld anims, this will only ever + # list one animation. The first animation listed in here will be + # selected by default. + # TODO: Filter text box for @list's contents. Applies the filter upon every + # change to the text box's value. Perhaps it should only do so after + # 0.5 seconds of non-typing. What exactly should the filter be applied + # to? Animation's name, move's name (if there is one), what else? + # TODO: Filter dropdown list to pick a type? Other filter options? + # "Load animation" button + @load_button = UIControls::Button.new(LOAD_BUTTON_WIDTH, LOAD_BUTTON_HEIGHT, @viewport, "Load animation") + @load_button.x = LOAD_BUTTON_X + @load_button.y = LOAD_BUTTON_Y + @load_button.set_fixed_size + @load_button.set_interactive_rects + @controls[:load] = @load_button + # TODO: "New animation" button, "Delete animation" button. + repaint + end + + def repaint + @controls.each { |ctrl| ctrl[1].repaint } end def update - # TODO: Update the controls (animations list, Load button, etc.). + # Update all controls + if @captured + @captured.update + @captured = nil if !@captured.busy? + else + @controls.each do |ctrl| + ctrl[1].update + @captured = ctrl[1] if ctrl[1].busy? + end + end + # Check for changes in controls + @list.clear_changed if @list.changed? # We don't need @list's value now + if @load_button.changed? + # TODO: This will need to get the animation ID from the sublist instead. + @load_animation_id = @list.value + @load_button.clear_changed + end + repaint # Only repaints if needed end def run @@ -56,15 +118,20 @@ class AnimationEditorLoadScreen Graphics.update Input.update update - if !inputting_text - break if Input.trigger?(Input::BACK) - end - # Open editor with animation - # TODO: If the Load button is pressed while an animation is selected. - if Input.trigger?(Input::USE) - # TODO: Add animation to be edited as an argument. + if @load_animation_id + # Open editor with animation + # TODO: Add animation to be edited as an argument. This will be + # GameData::Animation.get(@load_animation_id).to_hash. + echoln "Anim number #{@load_animation_id}: #{@animations[@load_animation_id][1]}" screen = AnimationEditor.new screen.run + @load_animation_id = nil + # TODO: Regenerate @animations in case the edited animation changed its + # name/move/version. Reapply @animations to @list and the sublist + # (this should invalidate them). + repaint + elsif !inputting_text + break if Input.trigger?(Input::BACK) end end dispose From 2ff47cf40dfa9642b909b876345e7dc13e3be038 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 24 Sep 2023 18:20:32 +0100 Subject: [PATCH 03/49] Created animation PBS file compiler and writer --- .../900_New utilities/001 utilities.rb | 88 ++++++++ Data/Scripts/900_New utilities/anim debug.rb | 8 + Data/Scripts/901_GameData/Animation.rb | 208 +++++++++++++++--- .../902_Anim compiler/anim pbs compiler.rb | 182 +++++++++++++++ .../902_Anim compiler/anim pbs writer.rb | 122 ++++++++++ .../910_New anim editor/010 editor scene.rb | 5 + 6 files changed, 588 insertions(+), 25 deletions(-) create mode 100644 Data/Scripts/900_New utilities/anim debug.rb create mode 100644 Data/Scripts/902_Anim compiler/anim pbs compiler.rb create mode 100644 Data/Scripts/902_Anim compiler/anim pbs writer.rb diff --git a/Data/Scripts/900_New utilities/001 utilities.rb b/Data/Scripts/900_New utilities/001 utilities.rb index 38aa3c21f..d1f55e05e 100644 --- a/Data/Scripts/900_New utilities/001 utilities.rb +++ b/Data/Scripts/900_New utilities/001 utilities.rb @@ -6,3 +6,91 @@ class Bitmap fill_rect(x + width - thickness, y, thickness, height, color) end end + +#=============================================================================== +# Fixed Compiler.pbWriteCsvRecord to make it detect enums first, allowing enum +# values to be turned into symbols/booleans/whatever instead of just numbers. +#=============================================================================== +module Compiler + module_function + + def pbWriteCsvRecord(record, file, schema) + rec = (record.is_a?(Array)) ? record.flatten : [record] + start = (["*", "^"].include?(schema[1][0, 1])) ? 1 : 0 + index = -1 + loop do + (start...schema[1].length).each do |i| + index += 1 + value = rec[index] + if schema[1][i, 1][/[A-Z]/] # Optional + # Check the rest of the values for non-nil things + later_value_found = false + (index...rec.length).each do |j| + later_value_found = true if !rec[j].nil? + break if later_value_found + end + if !later_value_found + start = -1 + break + end + end + file.write(",") if index > 0 + next if value.nil? + case schema[1][i, 1] + when "e", "E" # Enumerable + enumer = schema[2 + i] + case enumer + when Array + file.write(enumer[value]) + when Symbol, String + mod = Object.const_get(enumer.to_sym) + file.write(getConstantName(mod, value)) + when Module + file.write(getConstantName(enumer, value)) + when Hash + enumer.each_key do |key| + next if enumer[key] != value + file.write(key) + break + end + end + when "y", "Y" # Enumerable or integer + enumer = schema[2 + i] + case enumer + when Array + file.write((enumer[value].nil?) ? value : enumer[value]) + when Symbol, String + mod = Object.const_get(enumer.to_sym) + file.write(getConstantNameOrValue(mod, value)) + when Module + file.write(getConstantNameOrValue(enumer, value)) + when Hash + hasenum = false + enumer.each_key do |key| + next if enumer[key] != value + file.write(key) + hasenum = true + break + end + file.write(value) unless hasenum + end + else + if value.is_a?(String) + file.write((schema[1][i, 1].downcase == "q") ? value : csvQuote(value)) + elsif value.is_a?(Symbol) + file.write(csvQuote(value.to_s)) + elsif value == true + file.write("true") + elsif value == false + file.write("false") + else + file.write(value.inspect) + end + end + end + break if start > 0 && index >= rec.length - 1 + break if start <= 0 + end + return record + end +end diff --git a/Data/Scripts/900_New utilities/anim debug.rb b/Data/Scripts/900_New utilities/anim debug.rb new file mode 100644 index 000000000..9d5f507fa --- /dev/null +++ b/Data/Scripts/900_New utilities/anim debug.rb @@ -0,0 +1,8 @@ +MenuHandlers.add(:debug_menu, :create_animation_pbs_files, { + "name" => _INTL("Write all animation PBS files"), + "parent" => :files_menu, + "description" => _INTL("Write all animation PBS files."), + "effect" => proc { + Compiler.write_all_battle_animations + } +}) diff --git a/Data/Scripts/901_GameData/Animation.rb b/Data/Scripts/901_GameData/Animation.rb index 7530922b3..67622c8d0 100644 --- a/Data/Scripts/901_GameData/Animation.rb +++ b/Data/Scripts/901_GameData/Animation.rb @@ -1,26 +1,91 @@ module GameData class Animation - attr_reader :name - attr_reader :move, :type # Type is move's type; useful for filtering; move==nil means common animation - attr_reader :version # Hit number - # TODO: Boolean for whether user is on player's side or foe's side. + attr_reader :type # :move, :opp_move, :common, :opp_common + attr_reader :move # Either the move's ID or the common animation's name + attr_reader :version # Hit number + attr_reader :name # Shown in the sublist; cosmetic only # TODO: Boolean for not played if target is on user's side. attr_reader :particles attr_reader :flags - # TODO: PBS filename. -# attr_reader :pbs_filename + attr_reader :pbs_path # Whole path minus "PBS/Animations/" at start and ".txt" at end DATA = {} - # TODO: Make sure the existence of animations.dat is optional. Currently - # it's required. -# DATA_FILENAME = "animations.dat" -# PBS_BASE_FILENAME = "animations" + DATA_FILENAME = "animations.dat" + OPTIONAL = true + + SCHEMA = { + # TODO: Add support for overworld animations. + "SectionName" => [:id, "esU", {"Move" => :move, "OppMove" => :opp_move, + "Common" => :common, "OppCommon" => :opp_common}], + "Name" => [:name, "s"], + # TODO: Target (Screen, User, UserAndTarget, etc. Determines which focuses + # a particle can be given). + # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage + # animations start playing). + "Flags" => [:flags, "*s"], + "Particle" => [:particles, "s"] + } + # For individual particles. All actions should have "^" in them. + # TODO: If more "SetXYZ"/"MoveXYZ" properties are added, ensure the "SetXYZ" + # ones are given a duration of 0 in def validate_compiled_animation. + SUB_SCHEMA = { + # These properties cannot be changed partway through the animation. + # TODO: "Name" isn't actually used; the name comes from the subsection + # written between and uses "Particle" above. +# "Name" => [:name, "s"], + "Focus" => [:focus, "e", {"User" => :user, "Target" => :target, + "UserAndTarget" => :user_and_target, "Screen" => :screen}], + # TODO FlipIfFoe, RotateIfFoe kinds of thing. + + # All properties below are "Set" or "Move". "Set" has the keyframe and the + # value, and "Move" has the keyframe, duration and the value. All are "^". + # "Set" is turned into "Move" with a duration (second value) of 0. + # TODO: The "MoveXYZ" commands will have optional easing (an enum). + "SetGraphic" => [:graphic, "^us"], + "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet + "MoveFrame" => [:frame, "^uuu"], + "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 + "SetFlip" => [:flip, "^ub"], + "SetX" => [:x, "^ui"], + "MoveX" => [:x, "^uui"], + "SetY" => [:y, "^ui"], + "MoveY" => [:y, "^uui"], + "SetZoomX" => [:zoom_x, "^uu"], + "MoveZoomX" => [:zoom_x, "^uuu"], + "SetZoomY" => [:zoom_y, "^uu"], + "MoveZoomY" => [:zoom_y, "^uuu"], + "SetAngle" => [:angle, "^ui"], + "MoveAngle" => [:angle, "^uui"], + "SetOpacity" => [:opacity, "^uu"], + "MoveOpacity" => [:opacity, "^uuu"] + # TODO: SetPriority should be an enum. There should also be a property + # (set and move) for the sub-priority within that priority bracket. +# "SetPriority" + # TODO: Color. + # TODO: Tone. + + # TODO: Play, PlayUserCry, PlayTargetCry. + # TODO: ScreenShake? Not sure how to work this yet. Edit def + # validate_compiled_animation like the "SE" particle does with the + # "Play"-type commands. + } + + @@cmd_to_pbs_name = nil # USed for writing animation PBS files extend ClassMethodsIDNumbers include InstanceMethods - def register(hash, id = -1) - DATA[(id >= 0) ? id : DATA.keys.length] = self.new(hash) + singleton_class.alias_method(:__new_anim__load, :load) unless singleton_class.method_defined?(:__new_anim__load) + def self.load + __new_anim__load if FileTest.exist?("Data/#{self::DATA_FILENAME}") + end + + def self.sub_schema + return SUB_SCHEMA + end + + def self.register(hash, id_num = -1) + DATA[(id_num >= 0) ? id_num : DATA.keys.length] = self.new(hash) end # TODO: Rewrite this to query animations from other criteria. Remember that @@ -45,23 +110,116 @@ module GameData # end def initialize(hash) - @name = hash[:name] - @move = hash[:move] - @type = hash[:type] - @version = hash[:version] || 0 - @particles = [] - # TODO: Copy particles info from hash somehow. - @flags = hash[:flags] || [] - # TODO: Come up with a decent default PBS filename; likely the move's name - # (for move anims) or @name (for common anims). + # NOTE: hash has an :id entry, but it's unused here. + @type = hash[:type] + @move = hash[:move] + @version = hash[:version] || 0 + @name = hash[:name] + @particles = hash[:particles] || [] + @flags = hash[:flags] || [] + @pbs_path = hash[:pbs_path] || "#{@type} - #{@move}" + end + + # Returns a clone of the animation in a hash format, the same as created by + # the Compiler. This hash can be passed into self.register. + def clone_as_hash + ret = {} + ret[:type] = @type + ret[:move] = @move + ret[:version] = @version + ret[:name] = @name + ret[:particles] = [] # Clone the @particles array, which is nested hashes and arrays + @particles.each do |particle| + new_p = {} + particle.each_pair do |key, val| + if val.is_a?(Array) + new_p[val] = [] + val.each { |cmd| new_p[val].push(cmd.clone) } + else + new_p[key] = val + end + end + end + ret[:flags] = @flags.clone + ret[:pbs_path] = @pbs_path end def move_animation? - return !@move.nil? + return [:move, :opp_move].include?(@type) end - # TODO: Create a def to_hash or something, which returns a hash copy version - # of this Animation object which can be edited. This hash should be - # able to be passed into def register (with an ID number). + def common_animation? + return [:common, :opp_common].include?(@type) + end + + alias __new_anim__get_property_for_PBS get_property_for_PBS unless method_defined?(:__new_anim__get_property_for_PBS) + def get_property_for_PBS(key) + ret = __new_anim__get_property_for_PBS(key) + case key + when "SectionName" + ret = [@type, @move] + ret.push(@version) if @version > 0 + end + return ret + end + + def get_particle_property_for_PBS(key, index = 0) + ret = nil + ret = @particles[index][SUB_SCHEMA[key][0]] if SUB_SCHEMA[key] + ret = nil if ret == false || (ret.is_a?(Array) && ret.length == 0) || ret == "" + case key + when "Focus" + # The User and Target particles are hardcoded to only have their + # corresponding foci, so they don't need writing to PBS + if ["User", "Target"].include?(@particles[index][:name]) + ret = nil + elsif ret + ret = SUB_SCHEMA[key][2].key(ret) + end + when "AllCommands" + # Get translations of all properties to their names as seen in PBS + # animation files + if !@@cmd_to_pbs_name + @@cmd_to_pbs_name = {} + SUB_SCHEMA.each_pair do |key, val| + @@cmd_to_pbs_name[val[0]] ||= [] + @@cmd_to_pbs_name[val[0]].push([key, val[1].length]) + end + # For each property translation, put "SetXYZ" before "MoveXYZ" + @@cmd_to_pbs_name.each_value do |val| + val.sort! { |a, b| a[1] <=> b[1] } + val.map! { |a| a[0] } + end + end + # Gather all commands into a single array + ret = [] + @particles[index].each_pair do |key, val| + next if !val.is_a?(Array) + val.each do |cmd| + new_cmd = cmd.clone + new_cmd.insert(1, 0) if @@cmd_to_pbs_name[key].length == 1 # "SetXYZ" only + if new_cmd[1] > 0 + ret.push([@@cmd_to_pbs_name[key][1]] + new_cmd) # ["MoveXYZ", keyframe, duration, value] + else + ret.push([@@cmd_to_pbs_name[key][0]] + new_cmd) # ["SetXYZ", keyframe, duration, value] + end + end + end + # Sort the array of commands by keyframe order, then by duration, then + # by the order they're defined in SUB_SCHEMA + ret.sort! do |a, b| + if a[1] == b[1] + if a[2] == b[2] + next SUB_SCHEMA.keys.index(a[0]) <=> SUB_SCHEMA.keys.index(b[0]) + else + next a[2] <=> b[2] # Sort by duration + end + else + next a[1] <=> b[1] # Sort by keyframe + end + end + end + return ret + end end end diff --git a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb new file mode 100644 index 000000000..0cca9c250 --- /dev/null +++ b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb @@ -0,0 +1,182 @@ +module Compiler + module_function + + def compile_battle_animations(*paths) + GameData::Animation::DATA.clear + schema = GameData::Animation.schema + sub_schema = GameData::Animation.sub_schema + idx = 0 + # Read from PBS file(s) + paths.each do |path| + compile_pbs_file_message_start(path) + file_name = path.gsub(/^PBS\/Animations\//, "").gsub(/.txt$/, "") + data_hash = nil + current_particle = nil + section_name = nil + section_line = nil + # Read each line of the animation PBS file at a time and compile it as an + # animation property + pbCompilerEachPreppedLine(path) do |line, line_no| + echo "." if idx % 100 == 0 + idx += 1 + Graphics.update if idx % 500 == 0 + FileLineData.setSection(section_name, nil, section_line) + if line[/^\s*\[\s*(.+)\s*\]\s*$/] + # New section [anim_type, name] + section_name = $~[1] + section_line = line + if data_hash + validate_compiled_animation(data_hash) + GameData::Animation.register(data_hash) + end + FileLineData.setSection(section_name, nil, section_line) + # Construct data hash + data_hash = { + :pbs_path => file_name + } + data_hash[schema["SectionName"][0]] = get_csv_record(section_name.clone, schema["SectionName"]) + data_hash[schema["Particle"][0]] = [] + current_particle = nil + elsif line[/^\s*<\s*(.+)\s*>\s*$/] + # New subsection [particle_name] + value = get_csv_record($~[1], schema["Particle"]) + current_particle = { + # TODO: If "Particle" is changed to be more than just a single + # string, add more properties accordingly. + :name => value + } + data_hash[schema["Particle"][0]].push(current_particle) + elsif line[/^\s*(\w+)\s*=\s*(.*)$/] + # XXX=YYY lines + if !data_hash + raise _INTL("Expected a section at the beginning of the file.\n{1}", FileLineData.linereport) + end + key = $~[1] + if schema[key] # Property of the animation + value = get_csv_record($~[2], schema[key]) + if schema[key][1][0] == "^" + value = nil if value.is_a?(Array) && value.empty? + data_hash[schema[key][0]] ||= [] + data_hash[schema[key][0]].push(value) if value + else + value = nil if value.is_a?(Array) && value.empty? + data_hash[schema[key][0]] = value + end + elsif sub_schema[key] # Property of a particle + if !current_particle + raise _INTL("Particle hasn't been defined yet!\n{1}", FileLineData.linereport) + end + value = get_csv_record($~[2], sub_schema[key]) + if sub_schema[key][1][0] == "^" + value = nil if value.is_a?(Array) && value.empty? + current_particle[sub_schema[key][0]] ||= [] + current_particle[sub_schema[key][0]].push(value) if value + else + value = nil if value.is_a?(Array) && value.empty? + current_particle[sub_schema[key][0]] = value + end + end + end + end + # Add last animation's data to records + if data_hash + FileLineData.setSection(section_name, nil, section_line) + validate_compiled_animation(data_hash) + GameData::Animation.register(data_hash) + end + process_pbs_file_message_end + end + validate_all_compiled_animations + # Save all data + GameData::Animation.save + end + + def validate_compiled_animation(hash) + # Split anim_type, move/common_name, version into their own values + hash[:type] = hash[:id][0] + hash[:move] = hash[:id][1] + hash[:version] = hash[:id][2] || 0 + # Go through each particle in turn + hash[:particles].each do |particle| + # Convert all "SetXYZ" particle commands to "MoveXYZ" by giving them a + # duration of 0 + [:frame, :x, :y, :zoom_x, :zoom_y, :angle, :opacity].each do |prop| + next if !particle[prop] + particle[prop].each do |cmd| + cmd.insert(1, 0) if cmd.length == 2 + end + end + # Sort each particle's commands by their keyframe and duration + particle.keys.each do |key| + next if !particle[key].is_a?(Array) + particle[key].sort! { |a, b| a[0] == b[0] ? a[1] == b[1] ? 0 : a[1] <=> b[1] : a[0] <=> b[0] } + # TODO: Find any overlapping particle commands and raise an error. + end + # Ensure valid values for "SetBlending" commands + if particle[:blending] + particle[:blending].each do |blend| + next if blend[1] <= 2 + raise _INTL("Invalid blend value: {1} (must be 0, 1 or 2).\n{2}", + blend[1], FileLineData.linereport) + end + end + # TODO: Ensure "Play", "PlayUserCry", "PlayTargetCry" are exclusively used + # by the particle "SE", and that the "SE" particle can only use + # those commands. Raise if problems found. + + # Ensure all particles have a default focus if not given + if !particle[:focus] + if particle[:name] == "User" + particle[:focus] = :user + elsif particle[:name] == "Target" + particle[:focus] = :target + elsif particle[:name] != "SE" + particle[:focus] = :screen + end + end + + # TODO: Depending on hash[:target], ensure all particles have an + # appropriate focus (i.e. can't be :user_and_target if hash[:target] + # doesn't include a target). Raise if problems found. + end + end + + def validate_all_compiled_animations; end +end + +#=============================================================================== +# Hook into the regular Compiler to also compile animation PBS files. +#=============================================================================== +module Compiler + module_function + + def get_animation_pbs_files_to_compile + ret = [] + if FileTest.directory?("PBS/Animations") + Dir.all("PBS/Animations", "**/**.txt").each { |file| ret.push(file) } + end + return ret + end + + class << self + if !method_defined?(:__new_anims__get_all_pbs_files_to_compile) + alias_method :__new_anims__get_all_pbs_files_to_compile, :get_all_pbs_files_to_compile + end + if !method_defined?(:__new_anims__compile_pbs_files) + alias_method :__new_anims__compile_pbs_files, :compile_pbs_files + end + end + + def get_all_pbs_files_to_compile + ret = __new_anims__get_all_pbs_files_to_compile + extra = get_animation_pbs_files_to_compile + ret[:Animation] = [nil, extra] + return ret + end + + def compile_pbs_files + __new_anims__compile_pbs_files + text_files = get_animation_pbs_files_to_compile + compile_battle_animations(*text_files) + end +end diff --git a/Data/Scripts/902_Anim compiler/anim pbs writer.rb b/Data/Scripts/902_Anim compiler/anim pbs writer.rb new file mode 100644 index 000000000..56d10521a --- /dev/null +++ b/Data/Scripts/902_Anim compiler/anim pbs writer.rb @@ -0,0 +1,122 @@ +module Compiler + module_function + + def write_all_battle_animations + # Delete all existing .txt files in the PBS/Animations/ folder + files_to_delete = get_animation_pbs_files_to_compile + files_to_delete.each { |path| File.delete(path) } + # Get all files that need writing + paths = [] + GameData::Animation.each { |anim| paths.push(anim.pbs_path) if !paths.include?(anim.pbs_path) } + idx = 0 + # Write each file in turn + paths.each do |path| + Graphics.update if idx % 500 == 0 + idx += 1 + write_battle_animation_file(path) + end + end + + def write_battle_animation_file(path) + schema = GameData::Animation.schema + sub_schema = GameData::Animation.sub_schema + write_pbs_file_message_start(path) + # Create all subfolders needed + dirs = ("PBS/Animations/" + path).split("/") + dirs.pop # Remove the filename + dirs.length.times do |i| + dir_string = dirs[0..i].join("/") + if !FileTest.directory?(dir_string) + Dir.mkdir(dir_string) rescue nil + end + end + # Write file + File.open("PBS/Animations/" + path + ".txt", "wb") do |f| + add_PBS_header_to_file(f) + # Write each element in turn + GameData::Animation.each do |element| + next if element.pbs_path != path + f.write("\#-------------------------------\r\n") + if schema["SectionName"] + f.write("[") + pbWriteCsvRecord(element.get_property_for_PBS("SectionName"), f, schema["SectionName"]) + f.write("]\r\n") + else + f.write("[#{element.id}]\r\n") + end + # Write each animation property + schema.each_key do |key| + next if ["SectionName", "Particle"].include?(key) + val = element.get_property_for_PBS(key) + next if val.nil? + f.write(sprintf("%s = ", key)) + pbWriteCsvRecord(val, f, schema[key]) + f.write("\r\n") + end + # Write each particle in turn + element.particles.sort! do |a, b| + a_val = 0 + a_val = -2 if a[:name] == "User" + a_val = -1 if a[:name] == "Target" + a_val = 1 if a[:name] == "SE" + b_val = 0 + b_val = -2 if b[:name] == "User" + b_val = -1 if b[:name] == "Target" + b_val = 1 if b[:name] == "SE" + next a_val <=> b_val + end + element.particles.each_with_index do |particle, i| + # Write header + f.write("<" + particle[:name] + ">") + f.write("\r\n") + # Write one-off particle properties + sub_schema.each_pair do |key, val| + next if val[1][0] == "^" + val = element.get_particle_property_for_PBS(key, i) + next if val.nil? + f.write(sprintf(" %s = ", key)) + pbWriteCsvRecord(val, f, sub_schema[key]) + f.write("\r\n") + end + # Write particle commands (in keyframe order) + cmds = element.get_particle_property_for_PBS("AllCommands", i) + cmds.each do |cmd| + if cmd[2] == 0 # Duration of 0 + f.write(sprintf(" %s = ", cmd[0])) + new_cmd = cmd[1..-1] + new_cmd.delete_at(1) + pbWriteCsvRecord(new_cmd, f, sub_schema[cmd[0]]) + f.write("\r\n") + else # Has a duration + f.write(sprintf(" %s = ", cmd[0])) + pbWriteCsvRecord(cmd[1..-1], f, sub_schema[cmd[0]]) + f.write("\r\n") + end + end + end + end + end + process_pbs_file_message_end + end +end + +#=============================================================================== +# Hook into the regular Compiler to also write all animation PBS files. +#=============================================================================== +module Compiler + module_function + + class << self + if !method_defined?(:__new_anims__write_all) + alias_method :__new_anims__write_all, :write_all + end + end + + def write_all + __new_anims__write_all + Console.echo_h1(_INTL("Writing all animation PBS files")) + write_all_battle_animations + echoln "" + Console.echo_h2(_INTL("Successfully rewrote all animation PBS files"), text: :green) + end +end diff --git a/Data/Scripts/910_New anim editor/010 editor scene.rb b/Data/Scripts/910_New anim editor/010 editor scene.rb index df3ad2ee3..ccc7b2fcf 100644 --- a/Data/Scripts/910_New anim editor/010 editor scene.rb +++ b/Data/Scripts/910_New anim editor/010 editor scene.rb @@ -4,6 +4,11 @@ # TODO: Need a way to recognise when text is being input into something # (Input.text_input) and disable all keyboard shortcuts if so. If only # this class has keyboard shortcuts in it, then it should be okay already. +# TODO: When creating a new particle, blacklist the names "User", "Target" and +# "SE". Make particles with those names undeletable. +# TODO: Remove the particle named "Target" if the animation's focus is changed +# to one that doesn't include a target, and vice versa. Do the same for +# "User". #=============================================================================== class AnimationEditor WINDOW_WIDTH = AnimationEditorLoadScreen::WINDOW_WIDTH From 79ffcd323014f8e8b74cfa0563316c89f44a42e1 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 1 Oct 2023 20:39:04 +0100 Subject: [PATCH 04/49] Animation editor now uses proper animation data, misc other code tweaks to animation editor --- Data/Scripts/901_GameData/Animation.rb | 33 ++- .../902_Anim compiler/anim pbs compiler.rb | 73 ++++-- .../905_New controls/001 basic control.rb | 2 +- Data/Scripts/905_New controls/003 checkbox.rb | 6 +- Data/Scripts/905_New controls/004 text box.rb | 1 + .../905_New controls/005 number slider.rb | 1 + .../Scripts/905_New controls/006 value box.rb | 1 + Data/Scripts/905_New controls/007 button.rb | 10 + Data/Scripts/905_New controls/008_list.rb | 2 + .../001 controls container.rb | 22 +- .../910_New anim editor/001_anim selection.rb | 46 ++-- .../910_New anim editor/010 editor scene.rb | 247 ++++++++++++++---- 12 files changed, 339 insertions(+), 105 deletions(-) diff --git a/Data/Scripts/901_GameData/Animation.rb b/Data/Scripts/901_GameData/Animation.rb index 67622c8d0..79b8ebf1e 100644 --- a/Data/Scripts/901_GameData/Animation.rb +++ b/Data/Scripts/901_GameData/Animation.rb @@ -19,7 +19,7 @@ module GameData "Common" => :common, "OppCommon" => :opp_common}], "Name" => [:name, "s"], # TODO: Target (Screen, User, UserAndTarget, etc. Determines which focuses - # a particle can be given). + # a particle can be given and whether "Target" particle exists). # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage # animations start playing). "Flags" => [:flags, "*s"], @@ -56,6 +56,13 @@ module GameData "MoveZoomY" => [:zoom_y, "^uuu"], "SetAngle" => [:angle, "^ui"], "MoveAngle" => [:angle, "^uui"], + # TODO: Remember that :visible defaults to false at the beginning for a + # particle, and becomes true automatically when the first command + # happens for that particle. For "User" and "Target", it defaults to + # true at the beginning instead. This affects the display of the + # particle's timeline and canvas sprite in the editor, as well as + # the animation player. + "SetVisible" => [:visible, "^ub"], "SetOpacity" => [:opacity, "^uu"], "MoveOpacity" => [:opacity, "^uuu"] # TODO: SetPriority should be an enum. There should also be a property @@ -69,6 +76,23 @@ module GameData # validate_compiled_animation like the "SE" particle does with the # "Play"-type commands. } + PARTICLE_DEFAULT_VALUES = { +# :name => "", + :focus => :screen + } + PARTICLE_KEYFRAME_DEFAULT_VALUES = { + :graphic => nil, + :frame => 0, + :blending => 0, + :flip => false, + :x => 0, + :y => 0, + :zoom_x => 100, + :zoom_y => 100, + :angle => 0, + :visible => false, + :opacity => 255 + } @@cmd_to_pbs_name = nil # USed for writing animation PBS files @@ -133,15 +157,17 @@ module GameData new_p = {} particle.each_pair do |key, val| if val.is_a?(Array) - new_p[val] = [] - val.each { |cmd| new_p[val].push(cmd.clone) } + new_p[key] = [] + val.each { |cmd| new_p[key].push(cmd.clone) } else new_p[key] = val end end + ret[:particles].push(new_p) end ret[:flags] = @flags.clone ret[:pbs_path] = @pbs_path + return ret end def move_animation? @@ -197,7 +223,6 @@ module GameData next if !val.is_a?(Array) val.each do |cmd| new_cmd = cmd.clone - new_cmd.insert(1, 0) if @@cmd_to_pbs_name[key].length == 1 # "SetXYZ" only if new_cmd[1] > 0 ret.push([@@cmd_to_pbs_name[key][1]] + new_cmd) # ["MoveXYZ", keyframe, duration, value] else diff --git a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb index 0cca9c250..c77aa3da6 100644 --- a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb +++ b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb @@ -96,34 +96,22 @@ module Compiler hash[:type] = hash[:id][0] hash[:move] = hash[:id][1] hash[:version] = hash[:id][2] || 0 + # TODO: raise if "Target" particle exists but animation's target doesn't + # involve a target battler. + # Create "User" and "SE" particles if they don't exist + if hash[:particles].none? { |particle| particle[:name] == "User" } + hash[:particles].push({:name => "User"}) + end + if hash[:particles].none? { |particle| particle[:name] == "SE" } + hash[:particles].push({:name => "SE"}) + end + # TODO: Create "Target" particle if it doesn't exist and animation's target + # involves a target battler. # Go through each particle in turn hash[:particles].each do |particle| - # Convert all "SetXYZ" particle commands to "MoveXYZ" by giving them a - # duration of 0 - [:frame, :x, :y, :zoom_x, :zoom_y, :angle, :opacity].each do |prop| - next if !particle[prop] - particle[prop].each do |cmd| - cmd.insert(1, 0) if cmd.length == 2 - end - end - # Sort each particle's commands by their keyframe and duration - particle.keys.each do |key| - next if !particle[key].is_a?(Array) - particle[key].sort! { |a, b| a[0] == b[0] ? a[1] == b[1] ? 0 : a[1] <=> b[1] : a[0] <=> b[0] } - # TODO: Find any overlapping particle commands and raise an error. - end - # Ensure valid values for "SetBlending" commands - if particle[:blending] - particle[:blending].each do |blend| - next if blend[1] <= 2 - raise _INTL("Invalid blend value: {1} (must be 0, 1 or 2).\n{2}", - blend[1], FileLineData.linereport) - end - end # TODO: Ensure "Play", "PlayUserCry", "PlayTargetCry" are exclusively used # by the particle "SE", and that the "SE" particle can only use # those commands. Raise if problems found. - # Ensure all particles have a default focus if not given if !particle[:focus] if particle[:name] == "User" @@ -134,10 +122,47 @@ module Compiler particle[:focus] = :screen end end - # TODO: Depending on hash[:target], ensure all particles have an # appropriate focus (i.e. can't be :user_and_target if hash[:target] # doesn't include a target). Raise if problems found. + + # Convert all "SetXYZ" particle commands to "MoveXYZ" by giving them a + # duration of 0 (even ones that can't have a "MoveXYZ" command) + GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.keys.each do |prop| + next if !particle[prop] + particle[prop].each do |cmd| + cmd.insert(1, 0) if cmd.length == 2 + end + end + # Sort each particle's commands by their keyframe and duration + particle.keys.each do |key| + next if !particle[key].is_a?(Array) + particle[key].sort! { |a, b| a[0] == b[0] ? a[1] == b[1] ? 0 : a[1] <=> b[1] : a[0] <=> b[0] } + # Check for any overlapping particle commands + last_frame = -1 + last_set_frame = -1 + particle[key].each do |cmd| + if last_frame > cmd[0] + raise _INTL("Animation has overlapping commands for the {1} property.\n{2}", + key.to_s.capitalize, FileLineData.linereport) + end + if particle[:name] != "SE" && cmd[1] == 0 && last_set_frame >= cmd[0] + raise _INTL("Animation has multiple \"Set\" commands in the same keyframe for the {1} property.\n{2}", + key.to_s.capitalize, FileLineData.linereport) + end + last_frame = cmd[0] + cmd[1] + last_set_frame = cmd[0] if cmd[1] == 0 + end + end + # Ensure valid values for "SetBlending" commands + if particle[:blending] + particle[:blending].each do |blend| + next if blend[2] <= 2 + raise _INTL("Invalid blend value: {1} (must be 0, 1 or 2).\n{2}", + blend[2], FileLineData.linereport) + end + end + end end diff --git a/Data/Scripts/905_New controls/001 basic control.rb b/Data/Scripts/905_New controls/001 basic control.rb index 4ef26e5dc..dd0e3ebc2 100644 --- a/Data/Scripts/905_New controls/001 basic control.rb +++ b/Data/Scripts/905_New controls/001 basic control.rb @@ -134,7 +134,6 @@ class UIControls::BaseControl < BitmapSprite end end - # Returns whether this control has been properly decaptured. def on_mouse_release @captured_area = nil invalidate @@ -167,6 +166,7 @@ class UIControls::BaseControl < BitmapSprite # Updates the logic on the control, invalidating it if necessary. def update + return if !self.visible # TODO: Disabled control stuff. # return if self.disabled diff --git a/Data/Scripts/905_New controls/003 checkbox.rb b/Data/Scripts/905_New controls/003 checkbox.rb index 103f74b9e..06bddaf97 100644 --- a/Data/Scripts/905_New controls/003 checkbox.rb +++ b/Data/Scripts/905_New controls/003 checkbox.rb @@ -15,9 +15,9 @@ class UIControls::Checkbox < UIControls::BaseControl @value = value end - def value=(val) - return if @value == val - @value = val + def value=(new_value) + return if @value == new_value + @value = new_value invalidate end diff --git a/Data/Scripts/905_New controls/004 text box.rb b/Data/Scripts/905_New controls/004 text box.rb index 20fa86850..8b615fb43 100644 --- a/Data/Scripts/905_New controls/004 text box.rb +++ b/Data/Scripts/905_New controls/004 text box.rb @@ -267,6 +267,7 @@ class UIControls::TextBox < UIControls::BaseControl end def update + return if !self.visible super # TODO: Disabled control stuff. # return if self.disabled diff --git a/Data/Scripts/905_New controls/005 number slider.rb b/Data/Scripts/905_New controls/005 number slider.rb index 2e2d1e867..1e8e7499d 100644 --- a/Data/Scripts/905_New controls/005 number slider.rb +++ b/Data/Scripts/905_New controls/005 number slider.rb @@ -106,6 +106,7 @@ class UIControls::Slider < UIControls::BaseControl end def update + return if !self.visible super # TODO: Disabled control stuff. # return if self.disabled diff --git a/Data/Scripts/905_New controls/006 value box.rb b/Data/Scripts/905_New controls/006 value box.rb index 14fd5e9a6..1742a7e32 100644 --- a/Data/Scripts/905_New controls/006 value box.rb +++ b/Data/Scripts/905_New controls/006 value box.rb @@ -122,6 +122,7 @@ class UIControls::ValueBox < UIControls::TextBox end def update + return if !self.visible super case @captured_area when :minus diff --git a/Data/Scripts/905_New controls/007 button.rb b/Data/Scripts/905_New controls/007 button.rb index e84d2acae..c6882ac0c 100644 --- a/Data/Scripts/905_New controls/007 button.rb +++ b/Data/Scripts/905_New controls/007 button.rb @@ -29,6 +29,16 @@ class UIControls::Button < UIControls::BaseControl } end + def set_changed + @value = true + super + end + + def clear_changed + @value = false + super + end + #----------------------------------------------------------------------------- def refresh diff --git a/Data/Scripts/905_New controls/008_list.rb b/Data/Scripts/905_New controls/008_list.rb index 5f68a98e6..020295306 100644 --- a/Data/Scripts/905_New controls/008_list.rb +++ b/Data/Scripts/905_New controls/008_list.rb @@ -33,6 +33,7 @@ class UIControls::List < UIControls::BaseControl else self.top_row = 0 end + self.selected = -1 if @selected >= @values.length invalidate end @@ -202,6 +203,7 @@ class UIControls::List < UIControls::BaseControl end def update + return if !self.visible super # TODO: Disabled control stuff. # return if self.disabled diff --git a/Data/Scripts/906_New controls container/001 controls container.rb b/Data/Scripts/906_New controls container/001 controls container.rb index fe558b466..00ecabd9c 100644 --- a/Data/Scripts/906_New controls container/001 controls container.rb +++ b/Data/Scripts/906_New controls container/001 controls container.rb @@ -16,6 +16,8 @@ class UIControls::ControlsContainer attr_reader :x, :y attr_reader :controls + attr_reader :values + attr_reader :visible LINE_SPACING = 32 OFFSET_FROM_LABEL_X = 80 @@ -32,6 +34,7 @@ class UIControls::ControlsContainer @control_rects = [] @row_count = 0 @captured = nil + @visible = true end def dispose @@ -40,6 +43,20 @@ class UIControls::ControlsContainer @viewport.dispose end + def changed? + return !@values.nil? + end + + def clear_changed + @values = nil + end + + def visible=(value) + @visible = value + @controls.each { |c| c[1].visible = value } + repaint if @visible + end + #----------------------------------------------------------------------------- def add_label(id, label, has_label = false) @@ -110,6 +127,7 @@ class UIControls::ControlsContainer #----------------------------------------------------------------------------- def update + return if !@visible # Update controls if @captured # TODO: Ideally all controls will be updated here, if only to redraw @@ -128,8 +146,8 @@ class UIControls::ControlsContainer # Check for updated controls @controls.each do |ctrl| next if !ctrl[1].changed? - # TODO: Get the new value from ctrl and put it in a hash for the main - # editor class to notice and use. + @values ||= {} + @values[ctrl[0]] = ctrl[1].value ctrl[1].clear_changed end # Redraw controls if needed diff --git a/Data/Scripts/910_New anim editor/001_anim selection.rb b/Data/Scripts/910_New anim editor/001_anim selection.rb index 71691a440..cd8c2d6e8 100644 --- a/Data/Scripts/910_New anim editor/001_anim selection.rb +++ b/Data/Scripts/910_New anim editor/001_anim selection.rb @@ -29,14 +29,22 @@ class AnimationEditorLoadScreen @viewport.dispose end + # TODO: Make separate arrays for move and common animations. Group animations + # for the same move/common animation together somehow to be listed in + # the main list - individual animations are shown in the secondary list. + # The display names will need improving accordingly. Usage of + # @animations in this class will need redoing. def generate_list @animations = [] - # TODO: Look through GameData to populate @animations; below is temporary. - # There will be separate arrays for move animations, common animations - # and overworld animations. The move animations one will primarily be - # a list of moves that have any animations, with the actual GameData - # animations being in a sub-array for each move. - 67.times { |i| @animations.push([i, "Animation #{i + 1}"]) } + GameData::Animation.keys.each do |id| + anim = GameData::Animation.get(id) + if anim.version > 0 + name = "#{anim.type}: #{anim.move} (#{anim.version}) - #{anim.name}" + else + name = "#{anim.type}: #{anim.move} - #{anim.name}" + end + @animations.push([id, name]) + end end def draw_editor_background @@ -53,7 +61,8 @@ class AnimationEditorLoadScreen @screen_bitmap.bitmap.outline_rect(area[0] - 2, area[1] - 2, area[2] + 4, area[3] + 4, Color.black) @screen_bitmap.bitmap.outline_rect(area[0] - 1, area[1] - 1, area[2] + 2, area[3] + 2, Color.white) # Fill the area with white -# @screen_bitmap.bitmap.fill_rect(area[0], area[1], area[2], area[3], Color.white) + # TODO: This line was quoted out previously, and I'm not sure why. + @screen_bitmap.bitmap.fill_rect(area[0], area[1], area[2], area[3], Color.white) end end @@ -74,7 +83,7 @@ class AnimationEditorLoadScreen # change to the text box's value. Perhaps it should only do so after # 0.5 seconds of non-typing. What exactly should the filter be applied # to? Animation's name, move's name (if there is one), what else? - # TODO: Filter dropdown list to pick a type? Other filter options? + # TODO: Filter dropdown list to pick a move type? Other filter options? # "Load animation" button @load_button = UIControls::Button.new(LOAD_BUTTON_WIDTH, LOAD_BUTTON_HEIGHT, @viewport, "Load animation") @load_button.x = LOAD_BUTTON_X @@ -118,21 +127,22 @@ class AnimationEditorLoadScreen Graphics.update Input.update update + # Open editor with animation if @load_animation_id - # Open editor with animation - # TODO: Add animation to be edited as an argument. This will be - # GameData::Animation.get(@load_animation_id).to_hash. - echoln "Anim number #{@load_animation_id}: #{@animations[@load_animation_id][1]}" - screen = AnimationEditor.new + screen = AnimationEditor.new(@load_animation_id, GameData::Animation.get(@load_animation_id).clone_as_hash) screen.run @load_animation_id = nil - # TODO: Regenerate @animations in case the edited animation changed its - # name/move/version. Reapply @animations to @list and the sublist - # (this should invalidate them). + # Refresh list of animations, in case the edited one changed its type, + # move, version or name + generate_list + @list.values = @animations repaint - elsif !inputting_text - break if Input.trigger?(Input::BACK) + next end + # Typing text into a text box; don't want key presses to trigger anything + next if inputting_text + # Inputs + break if Input.trigger?(Input::BACK) end dispose end diff --git a/Data/Scripts/910_New anim editor/010 editor scene.rb b/Data/Scripts/910_New anim editor/010 editor scene.rb index ccc7b2fcf..c02981fd0 100644 --- a/Data/Scripts/910_New anim editor/010 editor scene.rb +++ b/Data/Scripts/910_New anim editor/010 editor scene.rb @@ -9,24 +9,37 @@ # TODO: Remove the particle named "Target" if the animation's focus is changed # to one that doesn't include a target, and vice versa. Do the same for # "User". +# TODO: Things that need pop-up windows (draws a semi-transparent grey over the +# whole screen behind the window): +# - graphic picker +# - SE file picker +# - animation properties (Move/OppMove/Common/OppCommon, move, version, +# extra name, target, filepath, flags, etc.) +# - editor settings (theme, canvas BG graphics, user/target graphics, +# display of canvas particle boxes, etc.) +# TODO: While playing the animation, draw a semi-transparent grey over the +# screen except for the canvas and playback controls. Can't edit anything +# while it's playing. #=============================================================================== class AnimationEditor WINDOW_WIDTH = AnimationEditorLoadScreen::WINDOW_WIDTH WINDOW_HEIGHT = AnimationEditorLoadScreen::WINDOW_HEIGHT - CANVAS_X = 4 - CANVAS_Y = 32 + 4 - CANVAS_WIDTH = Settings::SCREEN_WIDTH - CANVAS_HEIGHT = Settings::SCREEN_HEIGHT - SIDE_PANEL_X = CANVAS_X + CANVAS_WIDTH + 4 + 4 - SIDE_PANEL_Y = CANVAS_Y - SIDE_PANEL_WIDTH = WINDOW_WIDTH - SIDE_PANEL_X - 4 - SIDE_PANEL_HEIGHT = CANVAS_HEIGHT + (32 * 2) + BORDER_THICKNESS = 4 + CANVAS_X = BORDER_THICKNESS + CANVAS_Y = 32 + BORDER_THICKNESS + CANVAS_WIDTH = Settings::SCREEN_WIDTH + CANVAS_HEIGHT = Settings::SCREEN_HEIGHT + SIDE_PANE_X = CANVAS_X + CANVAS_WIDTH + (BORDER_THICKNESS * 2) + SIDE_PANE_Y = CANVAS_Y + SIDE_PANE_WIDTH = WINDOW_WIDTH - SIDE_PANE_X - BORDER_THICKNESS + SIDE_PANE_HEIGHT = CANVAS_HEIGHT + (32 * 2) - # TODO: Add a parameter which is the animation to be edited, and also a - # parameter for that animation's ID in GameData (just for the sake of - # saving changes over the same GameData slot). - def initialize + def initialize(anim_id, anim) + @anim_id = anim_id + @anim = anim + @keyframe = 0 + @particle = -1 @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @viewport.z = 99999 @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) @@ -36,18 +49,75 @@ class AnimationEditor @canvas.x = CANVAS_X @canvas.y = CANVAS_Y @canvas.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", "field_bg") - # Side pane - @side_pane = ControlPane.new(SIDE_PANEL_X, SIDE_PANEL_Y, SIDE_PANEL_WIDTH, SIDE_PANEL_HEIGHT) - set_side_panel_contents + # Side panes + @keyframe_particle_pane = ControlPane.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + # TODO: Make more side panes for: + # - colour/tone editor (accessed from keyframe_particle_pane via a + # button; has Apply/Cancel buttons to only apply all its values at + # the end of editing them, although canvas will be updated in real + # time to show the changes) + # - particle properties (that don't change during the animation; name, + # focus...) + # - SE particle properties (depends on keyframe) + # - effects particle properties (depends on keyframe; for screen + # shake, etc.) + # - keyframe properties (shift all later particle commands forward/ + # backward). + set_side_panes_contents + refresh end def dispose @screen_bitmap.dispose @canvas.dispose - @side_pane.dispose + @keyframe_particle_pane.dispose @viewport.dispose end + #----------------------------------------------------------------------------- + + def set_keyframe_particle_pane_contents + # TODO: Move these properties to a new side pane for particle properties + # (ones that don't change during the animation). + @keyframe_particle_pane.add_labelled_text_box(:name, "Name", "Untitled") + # @keyframe_particle_pane.add_labelled_dropdown_list(:focus, "Focus", { + # :user => "User", + # :target => "Target", + # :user_and_target => "User and target", + # :screen => "Screen" + # }, :user) + + # TODO: Make sure the IDs for these controls all match up to particle + # properties that can change during the animation. + @keyframe_particle_pane.add_labelled_value_box(:x, "X", -128, CANVAS_WIDTH + 128, 64) + @keyframe_particle_pane.add_labelled_value_box(:y, "Y", -128, CANVAS_HEIGHT + 128, 96) + @keyframe_particle_pane.add_labelled_value_box(:zoom_x, "Zoom X", 0, 1000, 100) + @keyframe_particle_pane.add_labelled_value_box(:zoom_y, "Zoom Y", 0, 1000, 100) + @keyframe_particle_pane.add_labelled_checkbox(:visible, "Visible", true) + @keyframe_particle_pane.add_labelled_slider(:opacity, "Opacity", 0, 255, 255) + @keyframe_particle_pane.add_labelled_value_box(:angle, "Angle", -1080, 1080, 0) + @keyframe_particle_pane.add_labelled_checkbox(:flip, "Flip", false) + @keyframe_particle_pane.add_labelled_dropdown_list(:priority, "Priority", { # TODO: Include sub-priority. + :behind_all => "Behind all", + :behind_user => "Behind user", + :above_user => "In front of user", + :above_all => "In front of everything" + }, :above_user) + @keyframe_particle_pane.add_labelled_button(:color, "Color", "Edit") + @keyframe_particle_pane.add_labelled_button(:tone, "Tone", "Edit") + @keyframe_particle_pane.add_labelled_button(:graphic, "Graphic", "Change") + # :frame (related to graphic) + # :blending + # TODO: Add buttons that shift all commands from the current keyframe and + # later forwards/backwards in time? + end + + def set_side_panes_contents + set_keyframe_particle_pane_contents + end + + #----------------------------------------------------------------------------- + def draw_editor_background # Fill the whole screen with black @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.black) @@ -55,50 +125,121 @@ class AnimationEditor @screen_bitmap.bitmap.outline_rect(CANVAS_X - 3, CANVAS_Y - 3, CANVAS_WIDTH + 6, CANVAS_HEIGHT + 6, Color.white) @screen_bitmap.bitmap.outline_rect(CANVAS_X - 2, CANVAS_Y - 2, CANVAS_WIDTH + 4, CANVAS_HEIGHT + 4, Color.black) @screen_bitmap.bitmap.outline_rect(CANVAS_X - 1, CANVAS_Y - 1, CANVAS_WIDTH + 2, CANVAS_HEIGHT + 2, Color.white) - # Outline around side panel - @screen_bitmap.bitmap.outline_rect(SIDE_PANEL_X - 3, SIDE_PANEL_Y - 3, SIDE_PANEL_WIDTH + 6, SIDE_PANEL_HEIGHT + 6, Color.white) - @screen_bitmap.bitmap.outline_rect(SIDE_PANEL_X - 2, SIDE_PANEL_Y - 2, SIDE_PANEL_WIDTH + 4, SIDE_PANEL_HEIGHT + 4, Color.black) - @screen_bitmap.bitmap.outline_rect(SIDE_PANEL_X - 1, SIDE_PANEL_Y - 1, SIDE_PANEL_WIDTH + 2, SIDE_PANEL_HEIGHT + 2, Color.white) - # Fill the side panel with white - @screen_bitmap.bitmap.fill_rect(SIDE_PANEL_X, SIDE_PANEL_Y, SIDE_PANEL_WIDTH, SIDE_PANEL_HEIGHT, Color.white) + # Outline around side pane + @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 3, SIDE_PANE_Y - 3, SIDE_PANE_WIDTH + 6, SIDE_PANE_HEIGHT + 6, Color.white) + @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 2, SIDE_PANE_Y - 2, SIDE_PANE_WIDTH + 4, SIDE_PANE_HEIGHT + 4, Color.black) + @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 1, SIDE_PANE_Y - 1, SIDE_PANE_WIDTH + 2, SIDE_PANE_HEIGHT + 2, Color.white) + # Fill the side pane with white + @screen_bitmap.bitmap.fill_rect(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, Color.white) end - def set_side_panel_contents - @side_pane.add_labelled_text_box(:name, "Name", "Untitled") - @side_pane.add_labelled_value_box(:x, "X", -128, CANVAS_WIDTH + 128, 64) - @side_pane.add_labelled_value_box(:y, "Y", -128, CANVAS_HEIGHT + 128, 96) - @side_pane.add_labelled_value_box(:zoom_x, "Zoom X", 0, 1000, 100) - @side_pane.add_labelled_value_box(:zoom_y, "Zoom Y", 0, 1000, 100) - @side_pane.add_labelled_value_box(:angle, "Angle", -1080, 1080, 0) - @side_pane.add_labelled_checkbox(:visible, "Visible", true) - @side_pane.add_labelled_slider(:opacity, "Opacity", 0, 255, 255) - @side_pane.add_labelled_checkbox(:flip, "Flip", false) - @side_pane.add_labelled_dropdown_list(:priority, "Priority", { # TODO: Include sub-priority. - :behind_all => "Behind all", - :behind_user => "Behind user", - :above_user => "In front of user", - :above_all => "In front of everything" - }, :above_user) -# @side_pane.add_labelled_dropdown_list(:focus, "Focus", { -# :user => "User", -# :target => "Target", -# :user_and_target => "User and target", -# :screen => "Screen" -# }, :user) - @side_pane.add_labelled_button(:color, "Color/tone", "Edit") - @side_pane.add_labelled_button(:graphic, "Graphic", "Change") + def get_keyframe_particle_value(particle, frame, property) + if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) + raise _INTL("Couldn't get default value for property {1} for particle {2}.", + property, particle[:name]) + end + ret = [GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[property], false] + if particle[property] + # NOTE: The commands are already in keyframe order, so we can just run + # through them in order, applying their changes until we reach + # frame. + particle[property].each do |cmd| + break if cmd[0] > frame # Command is in the future; no more is needed + break if cmd[0] == frame && cmd[1] > 0 # Start of a "MoveXYZ" command; won't have changed yet + if cmd[0] + cmd[1] <= frame # Command has finished; use its end value + ret[0] = cmd[2] + next + end + # In a "MoveXYZ" command; need to interpolate + ret[0] = lerp(ret[0], cmd[2], cmd[1], cmd[0], frame).to_i + ret[1] = true # Interpolating + break + end + end + # NOTE: Particles are assumed to be not visible at the start of the + # animation, and automatically become visible when the particle has + # its first command. This does not apply to the "User" and "Target" + # particles, which start the animation visible. + if property == :visible + first_cmd = (["User", "Target"].include?(particle[:name])) ? 0 : -1 + first_visible_cmd = -1 + if first_cmd < 0 + particle.each_pair do |prop, value| + next if !value.is_a?(Array) || value.length == 0 + first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0] + first_visible_cmd = value[0][0] if prop == :visible && (first_visible_cmd < 0 || first_visible_cmd > value[0][0]) + end + end + ret[0] = true if first_cmd >= 0 && first_cmd <= frame && + (first_visible_cmd < 0 || frame < first_visible_cmd) + end + return ret + end + + def get_all_keyframe_particle_values(particle, frame) + ret = {} + GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.each_pair do |prop, default| + ret[prop] = get_keyframe_particle_value(particle, frame, prop) + end + return ret + end + + def refresh_keyframe_particle_pane + if @particle < 0 || !@anim[:particles][@particle] + @keyframe_particle_pane.visible = false + else + @keyframe_particle_pane.visible = true + new_vals = get_all_keyframe_particle_values(@anim[:particles][@particle], @keyframe) + # TODO: Need to do something special for :color, :tone and :graphic/:frame + # which all have button controls. + @keyframe_particle_pane.controls.each do |ctrl| + next if !new_vals.include?(ctrl[0]) + ctrl.value = new_vals[ctrl[0]][0] + # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, + # which should be indicated somehow in ctrl. + end + end + end + + def refresh + # Set all side pane controls to values from animation + refresh_keyframe_particle_pane + end + + #----------------------------------------------------------------------------- + + def update_canvas + @canvas.update + # TODO: Detect and apply changes made in canvas, e.g. moving particle, + # double-clicking to add particle, deleting particle. + end + + def update_keyframe_particle_pane + @keyframe_particle_pane.update + if @keyframe_particle_pane.changed? + # TODO: Make undo/redo snapshot. + values = @keyframe_particle_pane.values + # TODO: Apply vals to the animation data, unless the changed control is a + # button (its value will be true), in which case run some special + # code. Maybe this special code should be passed to/run in the + # control as a proc instead, and the button control can be given a + # value like any other control? Probably not. + echoln values + if values[:color] + elsif values[:tone] + elsif values[:graphic] + end + @keyframe_particle_pane.clear_changed + end end def update - @canvas.update - @side_pane.update - # TODO: Check @side_pane for whether it's changed. Note that it includes - # buttons which won't themselves have a value but will flag themselves - # as changed when clicked; code here should determine what happens if - # a button is pressed (unless I put said code in a proc passed to the - # button control; said code will be lengthy). + update_canvas + update_keyframe_particle_pane end + #----------------------------------------------------------------------------- + def run Input.text_input = false loop do From 193f01f70b16cd2030d0fd1d766c9526185d7318 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Fri, 6 Oct 2023 20:59:30 +0100 Subject: [PATCH 05/49] Refactored scrollbar into its own control --- Data/Scripts/905_New controls/008_list.rb | 125 +++++++-------- .../Scripts/905_New controls/101_scrollbar.rb | 143 ++++++++++++++++++ .../910_New anim editor/001_anim selection.rb | 4 + 3 files changed, 198 insertions(+), 74 deletions(-) create mode 100644 Data/Scripts/905_New controls/101_scrollbar.rb diff --git a/Data/Scripts/905_New controls/008_list.rb b/Data/Scripts/905_New controls/008_list.rb index 020295306..d04c51666 100644 --- a/Data/Scripts/905_New controls/008_list.rb +++ b/Data/Scripts/905_New controls/008_list.rb @@ -1,8 +1,10 @@ #=============================================================================== # TODO: Do I need to split self's bitmap into two (one for highlights and one -# for text/slider)? This would be to reduce lag caused by redrawing text -# and the slider even if you're just waving the mouse over the control. -# There doesn't seem to be any lag at the moment with a tall list. +# for text)? This would be to reduce lag caused by redrawing text even if +# you're just waving the mouse over the control. There doesn't seem to be +# any lag at the moment with a tall list. +# TODO: Make a viewport for the list, and allow scrolling positions halfway +# through a line? Nah. #=============================================================================== class UIControls::List < UIControls::BaseControl LIST_X = 0 @@ -10,26 +12,44 @@ class UIControls::List < UIControls::BaseControl ROW_HEIGHT = 24 TEXT_PADDING_X = 4 TEXT_OFFSET_Y = 3 - SLIDER_WIDTH = 16 SELECTED_ROW_COLOR = Color.green def initialize(width, height, viewport, values = []) super(width, height, viewport) + @slider = UIControls::Scrollbar.new(LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH, LIST_Y, height, viewport) + @slider.set_interactive_rects + @slider.range = ROW_HEIGHT + @slider.z = self.z + 1 @rows_count = (height / ROW_HEIGHT).floor # Number of rows visible at once @top_row = 0 @selected = -1 - @show_slider = false self.values = values end + def dispose + @slider.dispose + @slider = nil + super + end + + def x=(new_val) + super(new_val) + @slider.x = new_val + LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH + end + + def y=(new_val) + super(new_val) + @slider.y = new_val + LIST_Y + end + # Each value in @values is an array: [id, text]. def values=(new_vals) @values = new_vals - @show_slider = (@values.length > @rows_count) set_interactive_rects - if @show_slider - self.top_row = @top_row + @slider.range = @values.length * ROW_HEIGHT + if @slider.visible + self.top_row = (@slider.position.to_f / ROW_HEIGHT).round else self.top_row = 0 end @@ -40,9 +60,8 @@ class UIControls::List < UIControls::BaseControl def top_row=(val) old_val = @top_row @top_row = val - if @show_slider + if @slider.visible @top_row = @top_row.clamp(0, @values.length - @rows_count) - @slider.y = lerp(0, height - @slider.height, @values.length - @rows_count, 0, @top_row).round else @top_row = 0 end @@ -63,14 +82,6 @@ class UIControls::List < UIControls::BaseControl def set_interactive_rects @interactions = {} - @slider = nil - if @show_slider - @slider = Rect.new(LIST_X + width - SLIDER_WIDTH, LIST_Y, - SLIDER_WIDTH, height * @rows_count / @values.length) - @interactions[:slider] = @slider - @slider_tray = Rect.new(LIST_X + width - SLIDER_WIDTH, LIST_Y, SLIDER_WIDTH, height) - @interactions[:slider_tray] = @slider_tray - end @values.length.times do |i| @interactions[i] = Rect.new(LIST_X, LIST_Y + (ROW_HEIGHT * i), width - LIST_X, ROW_HEIGHT) end @@ -86,14 +97,9 @@ class UIControls::List < UIControls::BaseControl def draw_area_highlight # If a row is captured, it will automatically be selected and the selection - # colour will be drawn over the highlight. The slider tray background - # (white) is drawn over the slider/slider tray's highlight. Either way, - # there's no point drawing a highlight at all if anything is captured. + # colour will be drawn over the highlight. There's no point drawing a + # highlight at all if anything is captured. return if @captured_area - # The slider tray background (white) is drawn over the slider/slider tray's - # highlight. There's no point drawing any highlight for the slider now; this - # is done in def refresh instead. - return if [:slider, :slider_tray].include?(@hover_area) # Draw mouse hover over row highlight rect = @interactions[@hover_area] if rect @@ -103,6 +109,11 @@ class UIControls::List < UIControls::BaseControl end end + def repaint + @slider.repaint if @slider.invalid? + super if invalid? + end + def refresh super # Draw text options @@ -121,15 +132,6 @@ class UIControls::List < UIControls::BaseControl @interactions[i].y + TEXT_OFFSET_Y - (@top_row * ROW_HEIGHT), val[1]) end - # Draw vertical slider - if @show_slider - self.bitmap.fill_rect(@slider_tray.x, @slider_tray.y, @slider_tray.width, @slider_tray.height, Color.white) - bar_color = self.bitmap.font.color - if @captured_area == :slider || (!@captured_area && @hover_area == :slider) - bar_color = HOVER_COLOR - end - self.bitmap.fill_rect(@slider.x + 1, @slider.y, @slider.width - 1, @slider.height, bar_color) - end end #----------------------------------------------------------------------------- @@ -138,16 +140,7 @@ class UIControls::List < UIControls::BaseControl @captured_area = nil mouse_x, mouse_y = mouse_pos return if !mouse_x || !mouse_y - # Check for mouse presses on slider/slider tray - @interactions.each_pair do |area, rect| - next if area.is_a?(Integer) - next if !rect.contains?(mouse_x, mouse_y) - @captured_area = area - @slider_mouse_offset = mouse_y - rect.y if area == :slider - invalidate - break - end - return if @captured_area + return if @slider.visible && (@slider.busy? || mouse_x >= @slider.x - self.x) # Check for mouse presses on rows mouse_y += @top_row * ROW_HEIGHT @interactions.each_pair do |area, rect| @@ -161,7 +154,7 @@ class UIControls::List < UIControls::BaseControl def on_mouse_release return if !@captured_area # Wasn't captured to begin with - set_changed if @captured_area != :slider + set_changed super end @@ -174,28 +167,24 @@ class UIControls::List < UIControls::BaseControl @hover_area = nil return end + # Don't update the highlight if the mouse is using the scrollbar + if @slider.visible && (@slider.busy? || mouse_x >= @slider.x - self.x) + invalidate if @hover_area + @hover_area = nil + return + end # Check each interactive area for whether the mouse is hovering over it, and # set @hover_area accordingly in_area = false + mouse_y += @top_row * ROW_HEIGHT @interactions.each_pair do |area, rect| - next if area.is_a?(Integer) + next if !area.is_a?(Integer) || area < @top_row || area >= @top_row + @rows_count next if !rect.contains?(mouse_x, mouse_y) invalidate if @hover_area != area @hover_area = area in_area = true break end - if !in_area - mouse_y += @top_row * ROW_HEIGHT - @interactions.each_pair do |area, rect| - next if !area.is_a?(Integer) || area < @top_row || area >= @top_row + @rows_count - next if !rect.contains?(mouse_x, mouse_y) - invalidate if @hover_area != area - @hover_area = area - in_area = true - break - end - end if !in_area invalidate if @hover_area @hover_area = nil @@ -204,26 +193,14 @@ class UIControls::List < UIControls::BaseControl def update return if !self.visible + @slider.update super # TODO: Disabled control stuff. # return if self.disabled - if @captured_area == :slider - # TODO: Have a display y position for the slider bar which is in pixels, - # and round it to the nearest row when setting @top_row? This is - # just to make the slider bar movement smoother. - mouse_x, mouse_y = mouse_pos - return if !mouse_x || !mouse_y - self.top_row = lerp(0, @values.length - @rows_count, height - @slider.height, 0, mouse_y - @slider_mouse_offset).round - elsif @captured_area == :slider_tray - if Input.repeat?(Input::MOUSELEFT) && @hover_area == :slider_tray - if mouse_y < @slider.y - self.top_row = @top_row - (@rows_count / 2) - else - self.top_row = @top_row + (@rows_count / 2) - end - end - elsif @captured_area - # Have clicked on a row; set the selected row to the row themouse is over + # Refresh the list's position if changed by moving the slider + self.top_row = (@slider.position.to_f / ROW_HEIGHT).round + # Set the selected row to the row the mouse is over, if clicked on + if @captured_area @selected = @hover_area if @hover_area.is_a?(Integer) end end diff --git a/Data/Scripts/905_New controls/101_scrollbar.rb b/Data/Scripts/905_New controls/101_scrollbar.rb new file mode 100644 index 000000000..05dbb8523 --- /dev/null +++ b/Data/Scripts/905_New controls/101_scrollbar.rb @@ -0,0 +1,143 @@ +#=============================================================================== +# TODO: Make the slider a separate sprite that moves, instead of redrawing this +# sprite's bitmap whenever it moves? Intended to reduce lag. There doesn't +# seem to be any lag at the moment with a tall scrollbar. +#=============================================================================== +class UIControls::Scrollbar < UIControls::BaseControl + SLIDER_WIDTH = 16 + WIDTH_PADDING = 0 + TRAY_COLOR = Color.white + SLIDER_COLOR = Color.black + GRAB_COLOR = HOVER_COLOR # Cyan + + def initialize(x, y, size, viewport, horizontal = false, always_visible = false) + if horizontal + super(size, SLIDER_WIDTH, viewport) + else + super(SLIDER_WIDTH, size, viewport) + end + self.x = x + self.y = y + @horizontal = horizontal # Is vertical if not horizontal + @tray_size = size # Number of pixels the scrollbar can move around in + @slider_size = size + @range = size # Total distance of the area this scrollbar is for + @slider_top = 0 # Top pixel within @size of the scrollbar + @visible = @always_visible + @always_visible = always_visible + end + + def position + return 0 if @range <= @tray_size + return (@range - @tray_size) * @slider_top / (@tray_size - @slider_size) + end + + # Range is the total size of the large area that the scrollbar is able to + # show part of. + def range=(new_val) + raise "Can't set a scrollbar's range to 0!" if new_val == 0 + @range = new_val + @slider_size = (@tray_size * [@tray_size.to_f / @range, 1].min).round + if @horizontal + @slider.width = @slider_size + else # Vertical + @slider.height = @slider_size + end + self.slider_top = @slider_top + self.visible = (@always_visible || @range > @tray_size) + invalidate + end + + def slider_top=(new_val) + old_val = @slider_top + @slider_top = new_val.clamp(0, @tray_size - @slider_size) + if @horizontal + @slider.x = @slider_top + else # Vertical + @slider.y = @slider_top + end + invalidate if @slider_top != old_val + end + + def set_interactive_rects + @interactions = {} + if @horizontal + @slider = Rect.new(@slider_top, WIDTH_PADDING, @slider_size, height - (WIDTH_PADDING * 2)) + else # Vertical + @slider = Rect.new(WIDTH_PADDING, @slider_top, width - (WIDTH_PADDING * 2), @slider_size) + end + @interactions[:slider] = @slider + @slider_tray = Rect.new(0, 0, width, height) + @interactions[:slider_tray] = @slider_tray + end + + #----------------------------------------------------------------------------- + + def refresh + super + return if !self.visible + # Draw the tray + self.bitmap.fill_rect(@slider_tray.x, @slider_tray.y, @slider_tray.width, @slider_tray.height, TRAY_COLOR) + # Draw the slider + if @slider_size < @tray_size + bar_color = SLIDER_COLOR + if @captured_area == :slider || (!@captured_area && @hover_area == :slider) + bar_color = GRAB_COLOR + end + self.bitmap.fill_rect(@slider.x, @slider.y, @slider.width, @slider.height, bar_color) + end + end + + #----------------------------------------------------------------------------- + + def on_mouse_press + @captured_area = nil + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + # Check for mouse presses on slider/slider tray + @interactions.each_pair do |area, rect| + next if !rect.contains?(mouse_x, mouse_y) + @captured_area = area + if area == :slider + if @horizontal + @slider_mouse_offset = mouse_x - rect.x + else + @slider_mouse_offset = mouse_y - rect.y + end + end + invalidate + break + end + end + + def on_mouse_release + super if @captured_area + end + + def update + return if !self.visible + super + # TODO: Disabled control stuff. +# return if self.disabled + if @captured_area == :slider + # TODO: Have a display y position for the slider bar which is in pixels, + # and round it to the nearest row when setting @top_row? This is + # just to make the slider bar movement smoother. + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + long_coord = (@horizontal) ? mouse_x : mouse_y + self.slider_top = long_coord - @slider_mouse_offset + elsif @captured_area == :slider_tray + if Input.repeat?(Input::MOUSELEFT) && @hover_area == :slider_tray + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + long_coord = (@horizontal) ? mouse_x : mouse_y + if long_coord < @slider_top + self.slider_top = @slider_top - ((@tray_size - @slider_size) / 4.0).ceil + else + self.slider_top = @slider_top + ((@tray_size - @slider_size) / 4.0).ceil + end + end + end + end +end diff --git a/Data/Scripts/910_New anim editor/001_anim selection.rb b/Data/Scripts/910_New anim editor/001_anim selection.rb index cd8c2d6e8..944598c48 100644 --- a/Data/Scripts/910_New anim editor/001_anim selection.rb +++ b/Data/Scripts/910_New anim editor/001_anim selection.rb @@ -45,6 +45,10 @@ class AnimationEditorLoadScreen end @animations.push([id, name]) end + # TODO: For slider testing purposes. + rand(400).times do |i| + @animations.push([42 + i, "Extra animation #{i + 1}"]) + end end def draw_editor_background From 7031698d85d8a5e4a3a09de5b35098ac7ad5ab0b Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Wed, 18 Oct 2023 16:48:28 +0100 Subject: [PATCH 06/49] Added animation editor's particle list --- .../900_New utilities/001 utilities.rb | 39 ++ Data/Scripts/901_GameData/Animation.rb | 8 +- .../902_Anim compiler/anim pbs compiler.rb | 4 +- .../Scripts/905_New controls/101_scrollbar.rb | 2 +- .../001 controls container.rb | 6 +- .../910_New anim editor/001_anim selection.rb | 1 + .../910_New anim editor/010 editor scene.rb | 131 ++-- .../910_New anim editor/011_particle list.rb | 639 ++++++++++++++++++ .../910_New anim editor/020 button pane.rb | 12 - .../090 particle data helper.rb | 137 ++++ 10 files changed, 900 insertions(+), 79 deletions(-) create mode 100644 Data/Scripts/910_New anim editor/011_particle list.rb delete mode 100644 Data/Scripts/910_New anim editor/020 button pane.rb create mode 100644 Data/Scripts/910_New anim editor/090 particle data helper.rb diff --git a/Data/Scripts/900_New utilities/001 utilities.rb b/Data/Scripts/900_New utilities/001 utilities.rb index d1f55e05e..f35d84f7f 100644 --- a/Data/Scripts/900_New utilities/001 utilities.rb +++ b/Data/Scripts/900_New utilities/001 utilities.rb @@ -5,6 +5,45 @@ class Bitmap fill_rect(x, y + height - thickness, width, thickness, color) fill_rect(x + width - thickness, y, thickness, height, color) end + + def fill_diamond(x, y, radius, color) + ((radius * 2) + 1).times do |i| + height = (i <= radius) ? (i * 2) + 1 : (((radius * 2) - i) * 2) + 1 + fill_rect(x - radius + i, y - ((height - 1) / 2), 1, height, color) + end + end + + # TODO: Add more curve types once it's decided which ones they are. + def draw_interpolation_line(x, y, width, height, gradient, type, color) + case type + when :linear + # NOTE: https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm + start_x = x + end_x = x + width - 1 + start_y = (gradient) ? y + height - 1 : y + end_y = (gradient) ? y : y + height - 1 + dx = end_x - start_x + dy = -((end_y - start_y).abs) + error = dx + dy + draw_x = start_x + draw_y = start_y + loop do + fill_rect(draw_x, draw_y, 1, 1, color) + break if draw_x == end_x && draw_y == end_y + e2 = 2 * error + if e2 >= dy + break if draw_x == end_x + error += dy + draw_x += 1 + end + if e2 <= dx + break if draw_y == end_y + error += dx + draw_y += (gradient) ? -1 : 1 + end + end + end + end end #=============================================================================== diff --git a/Data/Scripts/901_GameData/Animation.rb b/Data/Scripts/901_GameData/Animation.rb index 79b8ebf1e..3fffe208f 100644 --- a/Data/Scripts/901_GameData/Animation.rb +++ b/Data/Scripts/901_GameData/Animation.rb @@ -19,7 +19,8 @@ module GameData "Common" => :common, "OppCommon" => :opp_common}], "Name" => [:name, "s"], # TODO: Target (Screen, User, UserAndTarget, etc. Determines which focuses - # a particle can be given and whether "Target" particle exists). + # a particle can be given and whether "Target" particle exists). Or + # InvolvesTarget boolean (user and screen will always exist). # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage # animations start playing). "Flags" => [:flags, "*s"], @@ -28,6 +29,7 @@ module GameData # For individual particles. All actions should have "^" in them. # TODO: If more "SetXYZ"/"MoveXYZ" properties are added, ensure the "SetXYZ" # ones are given a duration of 0 in def validate_compiled_animation. + # Also add display names to def property_display_name. SUB_SCHEMA = { # These properties cannot be changed partway through the animation. # TODO: "Name" isn't actually used; the name comes from the subsection @@ -59,9 +61,7 @@ module GameData # TODO: Remember that :visible defaults to false at the beginning for a # particle, and becomes true automatically when the first command # happens for that particle. For "User" and "Target", it defaults to - # true at the beginning instead. This affects the display of the - # particle's timeline and canvas sprite in the editor, as well as - # the animation player. + # true at the beginning instead. "SetVisible" => [:visible, "^ub"], "SetOpacity" => [:opacity, "^uu"], "MoveOpacity" => [:opacity, "^uuu"] diff --git a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb index c77aa3da6..7a225ddf1 100644 --- a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb +++ b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb @@ -7,8 +7,8 @@ module Compiler sub_schema = GameData::Animation.sub_schema idx = 0 # Read from PBS file(s) + Console.echo_li(_INTL("Compiling animation PBS files...")) paths.each do |path| - compile_pbs_file_message_start(path) file_name = path.gsub(/^PBS\/Animations\//, "").gsub(/.txt$/, "") data_hash = nil current_particle = nil @@ -84,9 +84,9 @@ module Compiler validate_compiled_animation(data_hash) GameData::Animation.register(data_hash) end - process_pbs_file_message_end end validate_all_compiled_animations + process_pbs_file_message_end # Save all data GameData::Animation.save end diff --git a/Data/Scripts/905_New controls/101_scrollbar.rb b/Data/Scripts/905_New controls/101_scrollbar.rb index 05dbb8523..b267a323f 100644 --- a/Data/Scripts/905_New controls/101_scrollbar.rb +++ b/Data/Scripts/905_New controls/101_scrollbar.rb @@ -23,8 +23,8 @@ class UIControls::Scrollbar < UIControls::BaseControl @slider_size = size @range = size # Total distance of the area this scrollbar is for @slider_top = 0 # Top pixel within @size of the scrollbar - @visible = @always_visible @always_visible = always_visible + self.visible = @always_visible end def position diff --git a/Data/Scripts/906_New controls container/001 controls container.rb b/Data/Scripts/906_New controls container/001 controls container.rb index 00ecabd9c..d731ed729 100644 --- a/Data/Scripts/906_New controls container/001 controls container.rb +++ b/Data/Scripts/906_New controls container/001 controls container.rb @@ -11,7 +11,7 @@ # this would require manually telling all other controls in this container # that something else is captured and they shouldn't show a hover # highlight when updated (perhaps as a parameter in def update), which I -# don't think is ideal. Mark self as "busy" while a control is captured. +# don't think is ideal. #=============================================================================== class UIControls::ControlsContainer attr_reader :x, :y @@ -43,6 +43,10 @@ class UIControls::ControlsContainer @viewport.dispose end + def busy? + return !@captured.nil? + end + def changed? return !@values.nil? end diff --git a/Data/Scripts/910_New anim editor/001_anim selection.rb b/Data/Scripts/910_New anim editor/001_anim selection.rb index 944598c48..3bfb860fc 100644 --- a/Data/Scripts/910_New anim editor/001_anim selection.rb +++ b/Data/Scripts/910_New anim editor/001_anim selection.rb @@ -132,6 +132,7 @@ class AnimationEditorLoadScreen Input.update update # Open editor with animation + @load_animation_id = 2 # TODO: For quickstart testing purposes. if @load_animation_id screen = AnimationEditor.new(@load_animation_id, GameData::Animation.get(@load_animation_id).clone_as_hash) screen.run diff --git a/Data/Scripts/910_New anim editor/010 editor scene.rb b/Data/Scripts/910_New anim editor/010 editor scene.rb index c02981fd0..217841a4c 100644 --- a/Data/Scripts/910_New anim editor/010 editor scene.rb +++ b/Data/Scripts/910_New anim editor/010 editor scene.rb @@ -34,11 +34,14 @@ class AnimationEditor SIDE_PANE_Y = CANVAS_Y SIDE_PANE_WIDTH = WINDOW_WIDTH - SIDE_PANE_X - BORDER_THICKNESS SIDE_PANE_HEIGHT = CANVAS_HEIGHT + (32 * 2) + PARTICLE_LIST_X = 0 + PARTICLE_LIST_Y = SIDE_PANE_Y + SIDE_PANE_HEIGHT + (BORDER_THICKNESS * 2) + PARTICLE_LIST_WIDTH = WINDOW_WIDTH + PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y def initialize(anim_id, anim) @anim_id = anim_id @anim = anim - @keyframe = 0 @particle = -1 @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @viewport.z = 99999 @@ -50,7 +53,7 @@ class AnimationEditor @canvas.y = CANVAS_Y @canvas.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", "field_bg") # Side panes - @keyframe_particle_pane = ControlPane.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + @keyframe_particle_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) # TODO: Make more side panes for: # - colour/tone editor (accessed from keyframe_particle_pane via a # button; has Apply/Cancel buttons to only apply all its values at @@ -63,7 +66,14 @@ class AnimationEditor # shake, etc.) # - keyframe properties (shift all later particle commands forward/ # backward). + # Timeline/particle list + @particle_list = UIControls::AnimationParticleList.new( + PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport + ) + @particle_list.set_interactive_rects + @captured = nil set_side_panes_contents + set_particle_list_contents refresh end @@ -71,9 +81,18 @@ class AnimationEditor @screen_bitmap.dispose @canvas.dispose @keyframe_particle_pane.dispose + @particle_list.dispose @viewport.dispose end + def keyframe + return @particle_list.keyframe + end + + def particle_index + return @particle_list.particle_index + end + #----------------------------------------------------------------------------- def set_keyframe_particle_pane_contents @@ -116,6 +135,10 @@ class AnimationEditor set_keyframe_particle_pane_contents end + def set_particle_list_contents + @particle_list.set_particles(@anim[:particles]) + end + #----------------------------------------------------------------------------- def draw_editor_background @@ -131,79 +154,39 @@ class AnimationEditor @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 1, SIDE_PANE_Y - 1, SIDE_PANE_WIDTH + 2, SIDE_PANE_HEIGHT + 2, Color.white) # Fill the side pane with white @screen_bitmap.bitmap.fill_rect(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, Color.white) - end - - def get_keyframe_particle_value(particle, frame, property) - if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) - raise _INTL("Couldn't get default value for property {1} for particle {2}.", - property, particle[:name]) - end - ret = [GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[property], false] - if particle[property] - # NOTE: The commands are already in keyframe order, so we can just run - # through them in order, applying their changes until we reach - # frame. - particle[property].each do |cmd| - break if cmd[0] > frame # Command is in the future; no more is needed - break if cmd[0] == frame && cmd[1] > 0 # Start of a "MoveXYZ" command; won't have changed yet - if cmd[0] + cmd[1] <= frame # Command has finished; use its end value - ret[0] = cmd[2] - next - end - # In a "MoveXYZ" command; need to interpolate - ret[0] = lerp(ret[0], cmd[2], cmd[1], cmd[0], frame).to_i - ret[1] = true # Interpolating - break - end - end - # NOTE: Particles are assumed to be not visible at the start of the - # animation, and automatically become visible when the particle has - # its first command. This does not apply to the "User" and "Target" - # particles, which start the animation visible. - if property == :visible - first_cmd = (["User", "Target"].include?(particle[:name])) ? 0 : -1 - first_visible_cmd = -1 - if first_cmd < 0 - particle.each_pair do |prop, value| - next if !value.is_a?(Array) || value.length == 0 - first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0] - first_visible_cmd = value[0][0] if prop == :visible && (first_visible_cmd < 0 || first_visible_cmd > value[0][0]) - end - end - ret[0] = true if first_cmd >= 0 && first_cmd <= frame && - (first_visible_cmd < 0 || frame < first_visible_cmd) - end - return ret - end - - def get_all_keyframe_particle_values(particle, frame) - ret = {} - GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.each_pair do |prop, default| - ret[prop] = get_keyframe_particle_value(particle, frame, prop) - end - return ret + # Outline around timeline/particle list + @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 3, PARTICLE_LIST_Y - 3, PARTICLE_LIST_WIDTH + 6, PARTICLE_LIST_HEIGHT + 6, Color.white) + @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 2, PARTICLE_LIST_Y - 2, PARTICLE_LIST_WIDTH + 4, PARTICLE_LIST_HEIGHT + 4, Color.black) + @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 1, PARTICLE_LIST_Y - 1, PARTICLE_LIST_WIDTH + 2, PARTICLE_LIST_HEIGHT + 2, Color.white) end def refresh_keyframe_particle_pane - if @particle < 0 || !@anim[:particles][@particle] + if !keyframe || keyframe < 0 || !particle_index || particle_index < 0 || + !@anim[:particles][particle_index] @keyframe_particle_pane.visible = false else @keyframe_particle_pane.visible = true - new_vals = get_all_keyframe_particle_values(@anim[:particles][@particle], @keyframe) + new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) # TODO: Need to do something special for :color, :tone and :graphic/:frame # which all have button controls. @keyframe_particle_pane.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) - ctrl.value = new_vals[ctrl[0]][0] + ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, - # which should be indicated somehow in ctrl. + # which should be indicated somehow in ctrl[1]. end end end + def refresh_particle_list + @particle_list.refresh + end + def refresh # Set all side pane controls to values from animation refresh_keyframe_particle_pane + # Set particle list's contents + refresh_particle_list end #----------------------------------------------------------------------------- @@ -216,6 +199,7 @@ class AnimationEditor def update_keyframe_particle_pane @keyframe_particle_pane.update + @captured = :keyframe_particle_pane if @keyframe_particle_pane.busy? if @keyframe_particle_pane.changed? # TODO: Make undo/redo snapshot. values = @keyframe_particle_pane.values @@ -233,9 +217,38 @@ class AnimationEditor end end + def update_particle_list + old_keyframe = keyframe + old_particle_index = particle_index + @particle_list.update + @captured = :particle_list if @particle_list.busy? + if @particle_list.changed? + refresh_keyframe_particle_pane if keyframe != old_keyframe || particle_index != old_particle_index + # TODO: Lots of stuff here. + @particle_list.clear_changed + end + @particle_list.repaint + end + def update - update_canvas - update_keyframe_particle_pane + if @captured + # TODO: There must be a better way to do this. + case @captured + when :canvas + update_canvas + @captured = nil if !@canvas.busy? + when :keyframe_particle_pane + update_keyframe_particle_pane + @captured = nil if !@keyframe_particle_pane.busy? + when :particle_list + update_particle_list + @captured = nil if !@particle_list.busy? + end + else + update_canvas + update_keyframe_particle_pane + update_particle_list + end end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/910_New anim editor/011_particle list.rb b/Data/Scripts/910_New anim editor/011_particle list.rb new file mode 100644 index 000000000..074cbbd04 --- /dev/null +++ b/Data/Scripts/910_New anim editor/011_particle list.rb @@ -0,0 +1,639 @@ +#=============================================================================== +# TODO: Would be nice to make command sprites wider than their viewport and +# change @commands_viewport's ox to @left_pos, similar to how the vertical +# scrollbar works, i.e. every visible @commands_sprites isn't redrawn each +# time the horizontal scrollbar changes. +#=============================================================================== +class UIControls::AnimationParticleList < UIControls::BaseControl + LIST_WIDTH = 150 + ROW_HEIGHT = 24 + TIMELINE_HEIGHT = 24 + DIAMOND_SIZE = 3 + TIMELINE_LEFT_BUFFER = DIAMOND_SIZE + 1 # Allows diamonds at keyframe 0 to be drawn fully + TIMELINE_TEXT_SIZE = 16 + KEYFRAME_SPACING = 20 + INTERP_LINE_HEIGHT = KEYFRAME_SPACING - ((DIAMOND_SIZE * 2) + 3) + INTERP_LINE_Y = (TIMELINE_HEIGHT / 2) - (INTERP_LINE_HEIGHT / 2) + DURATION_BUFFER = 20 # Extra keyframes shown after the animation's end + CONTROL_BG_COLORS = { + :user => Color.new(96, 248, 96), # Green + :target => Color.new(248, 96, 96), # Red + :user_and_target => Color.new(248, 248, 96), # Yellow + :screen => Color.new(128, 160, 248) # Blue + } + SE_CONTROL_BG = Color.gray + + attr_reader :keyframe # The selected keyframe + attr_reader :particle_index # Index in @particles + + def initialize(x, y, width, height, viewport) + super(width, height, viewport) + self.x = x + self.y = y + draw_control_background + # Create viewports + @list_viewport = Viewport.new( + x, y + TIMELINE_HEIGHT, LIST_WIDTH, height - TIMELINE_HEIGHT - UIControls::Scrollbar::SLIDER_WIDTH - 1 + ) + @list_viewport.z = self.viewport.z + 1 + @commands_bg_viewport = Viewport.new(@list_viewport.rect.x + LIST_WIDTH, @list_viewport.rect.y, + width - @list_viewport.rect.width - UIControls::Scrollbar::SLIDER_WIDTH, + @list_viewport.rect.height) + @commands_bg_viewport.z = self.viewport.z + 1 + @position_viewport = Viewport.new(@list_viewport.rect.x + LIST_WIDTH, y, @commands_bg_viewport.rect.width, height) + @position_viewport.z = self.viewport.z + 2 + @commands_viewport = Viewport.new(@list_viewport.rect.x + LIST_WIDTH, @list_viewport.rect.y, + width - @list_viewport.rect.width - UIControls::Scrollbar::SLIDER_WIDTH, + @list_viewport.rect.height) + @commands_viewport.z = self.viewport.z + 3 + # Create scrollbar + @list_scrollbar = UIControls::Scrollbar.new( + @commands_viewport.rect.x + @commands_viewport.rect.width, @commands_viewport.rect.y, + @commands_viewport.rect.height + 1, self.viewport, false, true + ) + @list_scrollbar.set_interactive_rects + @time_scrollbar = UIControls::Scrollbar.new( + @commands_viewport.rect.x, @commands_viewport.rect.y + @commands_viewport.rect.height + 1, + @commands_viewport.rect.width, self.viewport, true, true + ) + @time_scrollbar.set_interactive_rects + # Timeline bitmap sprite + @timeline_sprite = BitmapSprite.new(@commands_viewport.rect.width, TIMELINE_HEIGHT, self.viewport) + @timeline_sprite.x = @commands_viewport.rect.x + @timeline_sprite.y = self.y + @timeline_sprite.bitmap.font.color = TEXT_COLOR + @timeline_sprite.bitmap.font.size = TIMELINE_TEXT_SIZE + # Position line sprite + @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - 1, @position_viewport) + @position_sprite.ox = @position_sprite.width / 2 + @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, Color.red) + # List sprites and commands sprites + @list_sprites = [] + @commands_bg_sprites = [] + @commands_sprites = [] + # Scrollbar positions + @left_pos = 0 + @top_pos = 0 + @duration = 0 + # Selected things + @keyframe = 0 + @particle_index = 0 + # Particle information to display (one row each) + @particles = [] # Reference to particle data from the editor scene + @particle_list = [] # Each element is index in @particles or [index, property] + @visibilities = [] # Per particle + @commands = {} + end + + def draw_control_background + self.bitmap.clear + # Background + self.bitmap.fill_rect(0, 0, width, height, Color.white) + # Separator lines + self.bitmap.fill_rect(0, TIMELINE_HEIGHT - 1, width, 1, Color.black) + self.bitmap.fill_rect(LIST_WIDTH - 1, 0, 1, height, Color.black) + self.bitmap.fill_rect(0, height - UIControls::Scrollbar::SLIDER_WIDTH - 1, width, 1, Color.black) + self.bitmap.fill_rect(width - UIControls::Scrollbar::SLIDER_WIDTH - 1, 0, 1, height, Color.black) + end + + def dispose_listed_sprites + @list_sprites.each { |p| p&.dispose } + @list_sprites.clear + @commands_bg_sprites.each { |p| p&.dispose } + @commands_bg_sprites.clear + @commands_sprites.each { |p| p&.dispose } + @commands_sprites.clear + end + + def dispose + @list_scrollbar.dispose + @time_scrollbar.dispose + @timeline_sprite.dispose + @position_sprite.dispose + dispose_listed_sprites + @list_viewport.dispose + @commands_bg_viewport.dispose + @commands_viewport.dispose + end + + def left_pos=(val) + old_val = @left_pos + total_width = (@duration * KEYFRAME_SPACING) + TIMELINE_LEFT_BUFFER + 1 + if total_width <= @commands_viewport.rect.width + @left_pos = 0 + else + @left_pos = val + @left_pos = @left_pos.clamp(0, total_width - @commands_viewport.rect.width) + end + if @left_pos != old_val + refresh_position_line + invalidate_time + end + end + + def top_pos=(val) + old_val = @top_pos + total_height = @particle_list.length * ROW_HEIGHT + if total_height <= @list_viewport.rect.height + @top_pos = 0 + else + @top_pos = val + @top_pos = @top_pos.clamp(0, total_height - @list_viewport.rect.height) + end + @list_viewport.oy = @top_pos + @commands_viewport.oy = @top_pos + if @top_pos != old_val + invalidate_rows + @old_top_pos = old_val + end + end + + def set_particles(particles) + @particles = particles + @particle_list.clear + calculate_all_commands_and_durations + # Dispose of and clear all existing list/commands sprites + dispose_listed_sprites + # Fill in @particle_list with indices from @particles + @particles.length.times { |i| @particle_list.push(i) } + # Create new sprites for each particle (1x list and 2x commands) + @particle_list.length.times do + list_sprite = BitmapSprite.new(@list_viewport.rect.width, ROW_HEIGHT, @list_viewport) + list_sprite.y = @list_sprites.length * ROW_HEIGHT + list_sprite.bitmap.font.color = TEXT_COLOR + list_sprite.bitmap.font.size = TEXT_SIZE + @list_sprites.push(list_sprite) + commands_bg_sprite = BitmapSprite.new(@commands_viewport.rect.width, ROW_HEIGHT, @commands_bg_viewport) + commands_bg_sprite.y = @commands_bg_sprites.length * ROW_HEIGHT + commands_bg_sprite.bitmap.font.color = TEXT_COLOR + commands_bg_sprite.bitmap.font.size = TEXT_SIZE + @commands_bg_sprites.push(commands_bg_sprite) + commands_sprite = BitmapSprite.new(@commands_viewport.rect.width, ROW_HEIGHT, @commands_viewport) + commands_sprite.y = @commands_sprites.length * ROW_HEIGHT + commands_sprite.bitmap.font.color = TEXT_COLOR + commands_sprite.bitmap.font.size = TEXT_SIZE + @commands_sprites.push(commands_sprite) + end + @list_scrollbar.range = @particle_list.length * ROW_HEIGHT + @time_scrollbar.range = (@duration * KEYFRAME_SPACING) + TIMELINE_LEFT_BUFFER + 1 + self.left_pos = @left_pos + invalidate + end + + def set_interactive_rects + @list_rect = Rect.new(0, TIMELINE_HEIGHT, LIST_WIDTH - 1, @list_viewport.rect.height) + @timeline_rect = Rect.new(LIST_WIDTH, 0, width - LIST_WIDTH - UIControls::Scrollbar::SLIDER_WIDTH - 1, TIMELINE_HEIGHT - 1) + @commands_rect = Rect.new(LIST_WIDTH, TIMELINE_HEIGHT, @timeline_rect.width, @list_rect.height) + @interactions = { + :list => @list_rect, + :timeline => @timeline_rect, + :commands => @commands_rect + } + end + + #----------------------------------------------------------------------------- + + def invalid? + return @invalid || @invalid_time || @invalid_rows || @invalid_commands + end + + def invalidate_time + @invalid_time = true + end + + def invalidate_rows + @invalid_rows = true + end + + def invalidate_commands + @invalid_commands = true + end + + def validate + super + @invalid_time = false + @invalid_rows = false + @invalid_commands = false + end + + #----------------------------------------------------------------------------- + + def calculate_duration + @duration = AnimationEditor::ParticleDataHelper.get_duration(@particles) + @duration += DURATION_BUFFER + end + + # TODO: Call this only from set_particles and when changes are made to + # @particles by the main editor scene. If we can be specific about which + # particle was changed, recalculate only that particle's commands. + def calculate_all_commands_and_durations + calculate_duration + @commands = {} + @particles.each_with_index do |particle, i| + overall_commands = [] + particle.each_pair do |property, value| + next if !value.is_a?(Array) + cmds = AnimationEditor::ParticleDataHelper.get_particle_property_commands_timeline(value, property) + @commands[[i, property]] = cmds + cmds.each_with_index do |cmd, j| + next if !cmd + overall_commands[j] = (cmd.is_a?(Array)) ? cmd.clone : cmd + end + end + @commands[i] = overall_commands + end + # Calculate visibilities for every keyframe + @particles.each_with_index do |particle, i| + @visibilities[i] = AnimationEditor::ParticleDataHelper.get_timeline_particle_visibilities( + particle, @duration - DURATION_BUFFER + ) + end + end + + # TODO: Methods that will show/hide individual property rows for a given + # @particles index. + + def each_visible_keyframe(early_start = false) + full_width = @commands_viewport.rect.width + start_keyframe = ((@left_pos - TIMELINE_LEFT_BUFFER) / KEYFRAME_SPACING) + start_keyframe = 0 if start_keyframe < 0 + start_keyframe -= 1 if early_start && start_keyframe > 0 # For drawing long timestamps + end_keyframe = (@left_pos + full_width / KEYFRAME_SPACING) + (start_keyframe..end_keyframe).each { |i| yield i } + end + + def each_visible_particle + full_height = @list_viewport.rect.height + start_row = @top_pos / ROW_HEIGHT + end_row = (@top_pos + full_height) / ROW_HEIGHT + if @old_top_pos + old_start_row = @old_top_pos / ROW_HEIGHT + old_end_row = (@old_top_pos + full_height) / ROW_HEIGHT + (start_row..end_row).each { |i| yield i if !(old_start_row..old_end_row).include?(i) } + else + (start_row..end_row).each { |i| yield i } + end + end + + #----------------------------------------------------------------------------- + + def property_display_name(property) + return { + :graphic => "Graphic", + :frame => "Graphic frame", + :blending => "Blending", + :flip => "Flip", + :x => "X", + :y => "Y", + :zoom_x => "Zoom X", + :zoom_y => "Zoom Y", + :angle => "Angle", + :visible => "Visible", + :opacity => "Opacity" + }[property] || "Unnamed property" + end + + def repaint + @list_scrollbar.repaint if @list_scrollbar.invalid? + @time_scrollbar.repaint if @time_scrollbar.invalid? + super if invalid? + end + + def refresh_timeline + @timeline_sprite.bitmap.clear + # Draw hover highlight + hover_color = nil + if @captured_keyframe && !@captured_row + if @hover_keyframe && @hover_keyframe == @captured_keyframe && !@hover_row + hover_color = HOVER_COLOR + else + hover_color = CAPTURE_COLOR + end + draw_x = TIMELINE_LEFT_BUFFER + (@captured_keyframe * KEYFRAME_SPACING) - @left_pos + @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, + KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) + elsif !@captured_keyframe && !@captured_row && @hover_keyframe && !@hover_row + hover_color = HOVER_COLOR + draw_x = TIMELINE_LEFT_BUFFER + (@hover_keyframe * KEYFRAME_SPACING) - @left_pos + @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, + KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) + end + # Draw timeline markings + each_visible_keyframe(true) do |i| + draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos + line_height = 6 + if (i % 20) == 0 + line_height = TIMELINE_HEIGHT - 2 + elsif (i % 5) == 0 + line_height = TIMELINE_HEIGHT / 2 + end + @timeline_sprite.bitmap.fill_rect(draw_x, TIMELINE_HEIGHT - line_height, 1, line_height, TEXT_COLOR) + draw_text(@timeline_sprite.bitmap, draw_x + 1, 0, (i / 20.0).to_s) if (i % 5) == 0 + end + end + + def refresh_position_line + @position_sprite.visible = (@keyframe && @keyframe >= 0) + if @keyframe >= 0 + @position_sprite.x = TIMELINE_LEFT_BUFFER + (@keyframe * KEYFRAME_SPACING) - @left_pos + end + end + + # TODO: Add indicator that this is selected (if so). + def refresh_particle_list_sprite(index) + spr = @list_sprites[index] + return if !spr + spr.bitmap.clear + # Get the background color + p_index = (@particle_list[index].is_a?(Array)) ? @particle_list[index][0] : @particle_list[index] + particle_data = @particles[p_index] + if particle_data[:name] == "SE" + bg_color = SE_CONTROL_BG + else + bg_color = CONTROL_BG_COLORS[@particles[@particle_list[index][0]][:focus]] || Color.magenta + end + # Draw hover highlight + hover_color = nil + if @captured_row && !@captured_keyframe + if @captured_row == index + if @hover_row && @hover_row == index && !@hover_keyframe + hover_color = HOVER_COLOR + else + hover_color = CAPTURE_COLOR + end + end + elsif !@captured_row && !@captured_keyframe && @hover_row && @hover_row == index && !@hover_keyframe + hover_color = HOVER_COLOR + end + spr.bitmap.fill_rect(0, 1, spr.width - 1, spr.height - 1, hover_color) if hover_color + # Draw outline + spr.bitmap.outline_rect(0, 1, spr.width - 1, spr.height - 1, bg_color, 2) + # Draw text + if @particle_list[index].is_a?(Array) + draw_text(spr.bitmap, 3 + 40, 3, property_display_name(@particle_list[index][1])) + else + draw_text(spr.bitmap, 3, 3, @particles[p_index][:name] || "Unnamed") + end + end + + def refresh_particle_commands_bg_sprites(index) + bg_spr = @commands_bg_sprites[index] + return if !bg_spr + bg_spr.bitmap.clear + p_index = (@particle_list[index].is_a?(Array)) ? @particle_list[index][0] : @particle_list[index] + particle_data = @particles[p_index] + # Get the background color + if particle_data[:name] == "SE" + bg_color = SE_CONTROL_BG + else + bg_color = CONTROL_BG_COLORS[@particles[@particle_list[index][0]][:focus]] || Color.magenta + end + # Get visibilities of particle for each keyframe + visible_cmds = @visibilities[p_index] + # Draw background for visible parts of the particle + each_visible_keyframe do |i| + draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos + # Draw bg + if i < @duration - DURATION_BUFFER && (particle_data[:name] == "SE" || visible_cmds[i]) + bg_spr.bitmap.fill_rect(draw_x, 1, KEYFRAME_SPACING, ROW_HEIGHT - 2, bg_color) + end + # Draw hover highlight + hover_color = nil + if @captured_row && @captured_keyframe + if @captured_row == index && @captured_keyframe == i + if @hover_row && @hover_row == index && @hover_keyframe && @hover_keyframe == i + hover_color = HOVER_COLOR + else + hover_color = CAPTURE_COLOR + end + end + elsif !@captured_row && !@captured_keyframe && + @hover_row && @hover_row == index && @hover_keyframe && @hover_keyframe == i + hover_color = HOVER_COLOR + end + bg_spr.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, hover_color) if hover_color + next if i >= @duration - DURATION_BUFFER + next if particle_data[:name] != "SE" && !visible_cmds[i] + # Draw outline + bg_spr.bitmap.fill_rect(draw_x, 1, KEYFRAME_SPACING, 1, Color.black) # Top + bg_spr.bitmap.fill_rect(draw_x, ROW_HEIGHT - 1, KEYFRAME_SPACING, 1, Color.black) # Bottom + if i <= 0 || (particle_data[:name] != "SE" && !visible_cmds[i - 1]) + bg_spr.bitmap.fill_rect(draw_x, 1, 1, ROW_HEIGHT - 1, Color.black) # Left + end + if i == @duration - DURATION_BUFFER - 1 || (particle_data[:name] != "SE" && i < @duration - 1 && !visible_cmds[i + 1]) + bg_spr.bitmap.fill_rect(draw_x + KEYFRAME_SPACING, 1, 1, ROW_HEIGHT - 1, Color.black) # Right + end + end + end + + def refresh_particle_commands_sprite(index) + spr = @commands_sprites[index] + return if !spr + spr.bitmap.clear + cmds = @commands[@particle_list[index]] + return if !cmds + # Draw command diamonds + first_keyframe = -1 + each_visible_keyframe do |i| + first_keyframe = i if first_keyframe < 0 + next if !cmds[i] + draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos + # Draw command diamond + spr.bitmap.fill_diamond(draw_x, TIMELINE_HEIGHT / 2, DIAMOND_SIZE, TEXT_COLOR) + # Draw interpolation line + if cmds[i].is_a?(Array) + spr.bitmap.draw_interpolation_line( + draw_x + DIAMOND_SIZE + 2, + INTERP_LINE_Y, + cmds[i][0].abs * KEYFRAME_SPACING - ((DIAMOND_SIZE * 2) + 3), + INTERP_LINE_HEIGHT, + cmds[i][0] > 0, # Increases or decreases + cmds[i][1], # Interpolation type + TEXT_COLOR + ) + end + end + # Draw any interpolation lines that start before the first visible keyframe + if first_keyframe > 0 + (0...first_keyframe).each do |i| + next if !cmds[i] || !cmds[i].is_a?(Array) + next if i + cmds[i][0].abs < first_keyframe + draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos + spr.bitmap.draw_interpolation_line( + draw_x + DIAMOND_SIZE + 2, + INTERP_LINE_Y, + cmds[i][0].abs * KEYFRAME_SPACING - ((DIAMOND_SIZE * 2) + 3), + INTERP_LINE_HEIGHT, + cmds[i][0] > 0, # Increases or decreases + cmds[i][1], # Interpolation type + TEXT_COLOR + ) + end + end + end + + def refresh + draw_area_highlight + refresh_timeline if @invalid || @invalid_time + each_visible_particle do |i| + refresh_particle_list_sprite(i) if @invalid || @invalid_rows + refresh_particle_commands_bg_sprites(i) + refresh_particle_commands_sprite(i) + end + @old_top_pos = nil # For refreshing only rows that became visible via using vertical scrollbar + end + + # Does nothing, because area highlights are drawn in other sprites rather than + # this one. + def draw_area_highlight; end + + #----------------------------------------------------------------------------- + + def get_interactive_element_at_mouse + ret = nil + mouse_x, mouse_y = mouse_pos + return ret if !mouse_x || !mouse_y + @interactions.each_pair do |area, rect| + next if !rect.contains?(mouse_x, mouse_y) + ret = area + case area + when :list + new_hover_row = (mouse_y + @top_pos - rect.y) / ROW_HEIGHT + break if new_hover_row >= @particle_list.length + ret = [area, nil, new_hover_row] + when :timeline + new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2)) / KEYFRAME_SPACING + break if new_hover_keyframe < 0 || new_hover_keyframe >= @duration + ret = [area, new_hover_keyframe, nil] + when :commands + new_hover_row = (mouse_y + @top_pos - rect.y) / ROW_HEIGHT + new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2)) / KEYFRAME_SPACING + break if new_hover_row >= @particle_list.length + break if new_hover_keyframe < 0 || new_hover_keyframe >= @duration + ret = [area, new_hover_keyframe, new_hover_row] + end + break + end + return ret + end + + def on_mouse_press + return if @captured_area + hover_element = get_interactive_element_at_mouse + if hover_element.is_a?(Array) + @captured_area = hover_element[0] + @captured_keyframe = hover_element[1] + @captured_row = hover_element[2] + end + end + + def on_mouse_release + return if !@captured_area # Wasn't captured to begin with + # Change this control's value + hover_element = get_interactive_element_at_mouse + if hover_element.is_a?(Array) + if @captured_area == hover_element[0] && + @captured_keyframe == hover_element[1] && + @captured_row == hover_element[2] + set_changed if @keyframe != @captured_keyframe || @particle_index != @captured_row + @keyframe = @captured_keyframe || -1 + @particle_index = @captured_row || -1 + end + end + @captured_keyframe = nil + @captured_row = nil + super # Make this control not busy again + end + + def update_hover_highlight + # Remove the hover highlight if there are no interactions for this control + # or if the mouse is off-screen + mouse_x, mouse_y = mouse_pos + if !@interactions || @interactions.empty? || !mouse_x || !mouse_y + invalidate if @hover_area + @hover_area = nil + @hover_keyframe = nil + @hover_row = nil + return + end + # Check each interactive area for whether the mouse is hovering over it, and + # set @hover_area accordingly + hover_element = get_interactive_element_at_mouse + if hover_element.is_a?(Array) + invalidate if @hover_area != hover_element[0] # Moved to a different region + case hover_element[0] + when :list + invalidate_rows if @hover_row != hover_element[2] + when :timeline + invalidate_time if @hover_keyframe != hover_element[1] + when :commands + invalidate_commands if @hover_row != hover_element[2] || + @hover_keyframe != hover_element[1] + end + @hover_area = hover_element[0] + @hover_keyframe = hover_element[1] + @hover_row = hover_element[2] + elsif hover_element + if @hover_area == hover_element + case @hover_area + when :list + invalidate_rows if @hover_row + when :timeline + invalidate_time if @hover_keyframe + when :commands + invalidate_commands if @hover_keyframe || @hover_row + end + else # Moved to a different region + invalidate + end + @hover_area = hover_element + @hover_keyframe = nil + @hover_row = nil + else + invalidate if @hover_area + @hover_area = nil + @hover_keyframe = nil + @hover_row = nil + end + end + + def update + return if !self.visible + @list_scrollbar.update + @time_scrollbar.update + super + # Refresh sprites if a scrollbar has been moved + self.left_pos = @time_scrollbar.position + self.top_pos = @list_scrollbar.position + # Update the current keyframe line's position + refresh_position_line + + # TODO: This is testing code, and should be replaced by clicking on the + # timeline or a command sprite. Maybe keep it after all? + if Input.trigger?(Input::LEFT) + if @keyframe > 0 + @keyframe -= 1 + echoln "keyframe = #{@keyframe}" + set_changed + end + elsif Input.trigger?(Input::RIGHT) + if @keyframe < @duration - DURATION_BUFFER + @keyframe += 1 + echoln "keyframe = #{@keyframe}" + set_changed + end + elsif Input.trigger?(Input::UP) + if @particle_index > 0 + @particle_index -= 1 + echoln "particle_index = #{@particle_index}" + set_changed + end + elsif Input.trigger?(Input::DOWN) + if @particle_index < @particles.length - 1 + @particle_index += 1 + echoln "particle_index = #{@particle_index}" + set_changed + end + end + end +end diff --git a/Data/Scripts/910_New anim editor/020 button pane.rb b/Data/Scripts/910_New anim editor/020 button pane.rb deleted file mode 100644 index e2bf531e1..000000000 --- a/Data/Scripts/910_New anim editor/020 button pane.rb +++ /dev/null @@ -1,12 +0,0 @@ -#=============================================================================== -# -#=============================================================================== -class AnimationEditor::ControlPane < UIControls::ControlsContainer - def on_control_release - # TODO: Update data for @captured control, because it may have changed. - # Gather data from all controls in this container and put them in a - # hash; it's up to the main editor screen to notice/read it, edit - # animation data accordingly, and then tell this container to nil that - # hash again. - end -end diff --git a/Data/Scripts/910_New anim editor/090 particle data helper.rb b/Data/Scripts/910_New anim editor/090 particle data helper.rb new file mode 100644 index 000000000..f92e2fdb1 --- /dev/null +++ b/Data/Scripts/910_New anim editor/090 particle data helper.rb @@ -0,0 +1,137 @@ +module AnimationEditor::ParticleDataHelper + module_function + + def get_duration(particles) + ret = 0 + particles.each do |p| + p.each_pair do |cmd, val| + next if !val.is_a?(Array) || val.length == 0 + max = val.last[0] + val.last[1] + ret = max if ret < max + end + end + return ret + end + + def get_keyframe_particle_value(particle, frame, property) + if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) + raise _INTL("Couldn't get default value for property {1} for particle {2}.", + property, particle[:name]) + end + ret = [GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[property], false] + if particle[property] + # NOTE: The commands are already in keyframe order, so we can just run + # through them in order, applying their changes until we reach + # frame. + particle[property].each do |cmd| + break if cmd[0] > frame # Command is in the future; no more is needed + break if cmd[0] == frame && cmd[1] > 0 # Start of a "MoveXYZ" command; won't have changed yet + if cmd[0] + cmd[1] <= frame # Command has finished; use its end value + ret[0] = cmd[2] + next + end + # In a "MoveXYZ" command; need to interpolate + ret[0] = lerp(ret[0], cmd[2], cmd[1], cmd[0], frame).to_i + ret[1] = true # Interpolating + break + end + end + # NOTE: Particles are assumed to be not visible at the start of the + # animation, and automatically become visible when the particle has + # its first command. This does not apply to the "User" and "Target" + # particles, which start the animation visible. + if property == :visible + first_cmd = (["User", "Target"].include?(particle[:name])) ? 0 : -1 + first_visible_cmd = -1 + particle.each_pair do |prop, value| + next if !value.is_a?(Array) || value.length == 0 + first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0] + first_visible_cmd = value[0][0] if prop == :visible && (first_visible_cmd < 0 || first_visible_cmd > value[0][0]) + end + ret[0] = true if first_cmd >= 0 && first_cmd <= frame && + (first_visible_cmd < 0 || frame < first_visible_cmd) + end + echoln "here 2: #{ret}" + return ret + end + + def get_all_keyframe_particle_values(particle, frame) + ret = {} + GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.each_pair do |prop, default| + ret[prop] = get_keyframe_particle_value(particle, frame, prop) + end + return ret + end + + # TODO: Generalise this to any property? + # NOTE: Particles are assumed to be not visible at the start of the + # animation, and automatically become visible when the particle has + # its first command. This does not apply to the "User" and "Target" + # particles, which start the animation visible. They do NOT become + # invisible automatically after their last command. + def get_timeline_particle_visibilities(particle, duration) + if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(:visible) + raise _INTL("Couldn't get default value for property {1} for particle {2}.", + property, particle[:name]) + end + value = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[:visible] + value = true if ["User", "Target"].include?(particle[:name]) + ret = [] + if particle[:visible] + particle[:visible].each { |cmd| ret[cmd[0]] = cmd[2] } + end + duration.times do |i| + value = ret[i] if !ret[i].nil? + ret[i] = value + end + return ret + end + + #----------------------------------------------------------------------------- + + # Returns an array indicating where command diamonds and duration lines should + # be drawn in the AnimationParticleList. + def get_particle_commands_timeline(particle) + ret = [] + durations = [] + particle.each_pair do |prop, val| + next if !val.is_a?(Array) + val.each do |cmd| + ret[cmd[0]] = true + if cmd[1] > 0 + ret[cmd[0] + cmd[1]] = true + durations.push([cmd[0], cmd[1]]) + end + end + end + return ret, durations + end + + # Returns an array, whose indexes are keyframes, where the values in the array + # are commands. A keyframe's value can be one of these: + # 0 - SetXYZ + # [+/- duration, interpolation type] --- MoveXYZ (duration's sign is whether + # it makes the value higher or lower) + def get_particle_property_commands_timeline(commands, property) + return nil if !commands || commands.length == 0 + if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) + raise _INTL("No default value for property {1} in PARTICLE_KEYFRAME_DEFAULT_VALUES.", property) + end + ret = [] + val = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[property] + commands.each do |cmd| + if cmd[1] > 0 # MoveXYZ + dur = cmd[1] + dur *= -1 if cmd[2] < val + # TODO: Support multiple interpolation types here (will be cmd[3]). + ret[cmd[0]] = [dur, cmd[3] || :linear] + ret[cmd[0] + cmd[1]] = 0 + else # SetXYZ + ret[cmd[0]] = 0 + end + val = cmd[2] # New actual value + end + return ret + end + +end From 340983e76513a8435a31d99494346b3a07e44e7c Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 23 Oct 2023 22:36:43 +0100 Subject: [PATCH 07/49] Fleshing out animation editor's code --- Data/Scripts/901_GameData/Animation.rb | 188 +++++---- .../902_Anim compiler/anim pbs compiler.rb | 75 ++-- .../905_New controls/001 basic control.rb | 2 +- Data/Scripts/905_New controls/002 label.rb | 2 +- Data/Scripts/905_New controls/004 text box.rb | 5 +- .../905_New controls/005 number slider.rb | 2 +- Data/Scripts/905_New controls/008_list.rb | 6 +- .../Scripts/905_New controls/101_scrollbar.rb | 23 +- .../001 controls container.rb | 13 +- .../910_New anim editor/001_anim selection.rb | 3 +- .../910_New anim editor/010 editor scene.rb | 361 ++++++++++++++---- .../910_New anim editor/011_particle list.rb | 303 +++++++++++---- .../910_New anim editor/012_play controls.rb | 27 ++ .../090 particle data helper.rb | 82 +++- 14 files changed, 810 insertions(+), 282 deletions(-) create mode 100644 Data/Scripts/910_New anim editor/012_play controls.rb diff --git a/Data/Scripts/901_GameData/Animation.rb b/Data/Scripts/901_GameData/Animation.rb index 3fffe208f..52399a334 100644 --- a/Data/Scripts/901_GameData/Animation.rb +++ b/Data/Scripts/901_GameData/Animation.rb @@ -1,97 +1,141 @@ module GameData class Animation - attr_reader :type # :move, :opp_move, :common, :opp_common - attr_reader :move # Either the move's ID or the common animation's name - attr_reader :version # Hit number - attr_reader :name # Shown in the sublist; cosmetic only - # TODO: Boolean for not played if target is on user's side. - attr_reader :particles + attr_reader :type # :move, :opp_move, :common, :opp_common + attr_reader :move # Either the move's ID or the common animation's name (both are strings) + attr_reader :version # Hit number + attr_reader :name # Shown in the sublist; cosmetic only + attr_reader :no_target # Whether there is no "Target" particle (false by default) attr_reader :flags - attr_reader :pbs_path # Whole path minus "PBS/Animations/" at start and ".txt" at end + attr_reader :pbs_path # Whole path minus "PBS/Animations/" at start and ".txt" at end + attr_reader :particles DATA = {} DATA_FILENAME = "animations.dat" OPTIONAL = true + INTERPOLATION_TYPES = { + "None" => :none, + "Linear" => :linear, + "EaseIn" => :ease_in, + "EaseOut" => :ease_out, + "EaseBoth" => :ease_both + } + + # Properties that apply to the animation in general, not to individual + # particles. They don't change during the animation. SCHEMA = { # TODO: Add support for overworld animations. "SectionName" => [:id, "esU", {"Move" => :move, "OppMove" => :opp_move, "Common" => :common, "OppCommon" => :opp_common}], "Name" => [:name, "s"], - # TODO: Target (Screen, User, UserAndTarget, etc. Determines which focuses - # a particle can be given and whether "Target" particle exists). Or - # InvolvesTarget boolean (user and screen will always exist). + "NoTarget" => [:no_target, "b"], + # TODO: Boolean for whether the animation will be played if the target is + # on the same side as the user. # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage # animations start playing). "Flags" => [:flags, "*s"], - "Particle" => [:particles, "s"] + "Particle" => [:particles, "s"] # Is a subheader line like } - # For individual particles. All actions should have "^" in them. + # For individual particles. Any property whose schema begins with "^" can + # change during the animation. # TODO: If more "SetXYZ"/"MoveXYZ" properties are added, ensure the "SetXYZ" # ones are given a duration of 0 in def validate_compiled_animation. # Also add display names to def property_display_name. SUB_SCHEMA = { # These properties cannot be changed partway through the animation. - # TODO: "Name" isn't actually used; the name comes from the subsection - # written between and uses "Particle" above. -# "Name" => [:name, "s"], - "Focus" => [:focus, "e", {"User" => :user, "Target" => :target, - "UserAndTarget" => :user_and_target, "Screen" => :screen}], - # TODO FlipIfFoe, RotateIfFoe kinds of thing. + # NOTE: "Name" isn't a property here, because the particle's name comes + # from the "Particle" property above. + # TODO: If more focus types are added, add ones that involve a target to + # the Compiler's check relating to "NoTarget". + "Graphic" => [:graphic, "s"], + "Focus" => [:focus, "e", {"User" => :user, "Target" => :target, + "UserAndTarget" => :user_and_target, + "Screen" => :screen}], + # TODO: FlipIfFoe, RotateIfFoe kinds of thing. - # All properties below are "Set" or "Move". "Set" has the keyframe and the - # value, and "Move" has the keyframe, duration and the value. All are "^". - # "Set" is turned into "Move" with a duration (second value) of 0. - # TODO: The "MoveXYZ" commands will have optional easing (an enum). - "SetGraphic" => [:graphic, "^us"], - "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet - "MoveFrame" => [:frame, "^uuu"], - "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 - "SetFlip" => [:flip, "^ub"], - "SetX" => [:x, "^ui"], - "MoveX" => [:x, "^uui"], - "SetY" => [:y, "^ui"], - "MoveY" => [:y, "^uui"], - "SetZoomX" => [:zoom_x, "^uu"], - "MoveZoomX" => [:zoom_x, "^uuu"], - "SetZoomY" => [:zoom_y, "^uu"], - "MoveZoomY" => [:zoom_y, "^uuu"], - "SetAngle" => [:angle, "^ui"], - "MoveAngle" => [:angle, "^uui"], - # TODO: Remember that :visible defaults to false at the beginning for a - # particle, and becomes true automatically when the first command - # happens for that particle. For "User" and "Target", it defaults to - # true at the beginning instead. - "SetVisible" => [:visible, "^ub"], - "SetOpacity" => [:opacity, "^uu"], - "MoveOpacity" => [:opacity, "^uuu"] - # TODO: SetPriority should be an enum. There should also be a property - # (set and move) for the sub-priority within that priority bracket. -# "SetPriority" - # TODO: Color. - # TODO: Tone. + # All properties below are "SetXYZ" or "MoveXYZ". "SetXYZ" has the + # keyframe and the value, and "MoveXYZ" has the keyframe, duration and the + # value. All are "^". "SetXYZ" is turned into "MoveXYZ" when compiling by + # inserting a duration (second value) of 0. + "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet + "MoveFrame" => [:frame, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 + "SetFlip" => [:flip, "^ub"], + "SetX" => [:x, "^ui"], + "MoveX" => [:x, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetY" => [:y, "^ui"], + "MoveY" => [:y, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZoomX" => [:zoom_x, "^uu"], + "MoveZoomX" => [:zoom_x, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZoomY" => [:zoom_y, "^uu"], + "MoveZoomY" => [:zoom_y, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetAngle" => [:angle, "^ui"], + "MoveAngle" => [:angle, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetVisible" => [:visible, "^ub"], + "SetOpacity" => [:opacity, "^uu"], + "MoveOpacity" => [:opacity, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorRed" => [:color_red, "^ui"], + "MoveColorRed" => [:color_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorGreen" => [:color_green, "^ui"], + "MoveColorGreen" => [:color_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorBlue" => [:color_blue, "^ui"], + "MoveColorBlue" => [:color_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorAlpha" => [:color_alpha, "^ui"], + "MoveColorAlpha" => [:color_alpha, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneRed" => [:tone_red, "^ui"], + "MoveToneRed" => [:tone_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneGreen" => [:tone_green, "^ui"], + "MoveToneGreen" => [:tone_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneBlue" => [:tone_blue, "^ui"], + "MoveToneBlue" => [:tone_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneGray" => [:tone_gray, "^ui"], + "MoveToneGray" => [:tone_gray, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + # TODO: SetPriority should be an enum (above all, above user, etc.). There + # should also be a property (set and move) for the sub-priority + # within that priority bracket. + # TODO: Add "SetColor"/"SetTone" as shorthand for the above? They'd be + # converted in the Compiler. + # TODO: Bitmap masking. + + # These properties are specifically for the "SE" particle. + "Play" => [:se, "^usUU"], # Filename, volume, pitch + "PlayUserCry" => [:user_cry, "^uUU"], # Volume, pitch + "PlayTargetCry" => [:target_cry, "^uUU"] # Volume, pitch - # TODO: Play, PlayUserCry, PlayTargetCry. # TODO: ScreenShake? Not sure how to work this yet. Edit def # validate_compiled_animation like the "SE" particle does with the # "Play"-type commands. } PARTICLE_DEFAULT_VALUES = { -# :name => "", - :focus => :screen + :name => "", + :graphic => "", + :focus => :screen } + # NOTE: Particles are invisible until their first command, and automatically + # become visible then. "User" and "Target" are visible from the start, + # though. PARTICLE_KEYFRAME_DEFAULT_VALUES = { - :graphic => nil, - :frame => 0, - :blending => 0, - :flip => false, - :x => 0, - :y => 0, - :zoom_x => 100, - :zoom_y => 100, - :angle => 0, - :visible => false, - :opacity => 255 + :frame => 0, + :blending => 0, + :flip => false, + :x => 0, + :y => 0, + :zoom_x => 100, + :zoom_y => 100, + :angle => 0, + :visible => false, + :opacity => 255, + :color_red => 255, + :color_green => 255, + :color_blue => 255, + :color_alpha => 0, + :tone_red => 0, + :tone_green => 0, + :tone_blue => 0, + :tone_gray => 0, + :se => nil, + :user_cry => nil, + :target_cry => nil } @@cmd_to_pbs_name = nil # USed for writing animation PBS files @@ -135,13 +179,14 @@ module GameData def initialize(hash) # NOTE: hash has an :id entry, but it's unused here. - @type = hash[:type] - @move = hash[:move] - @version = hash[:version] || 0 - @name = hash[:name] - @particles = hash[:particles] || [] - @flags = hash[:flags] || [] - @pbs_path = hash[:pbs_path] || "#{@type} - #{@move}" + @type = hash[:type] + @move = hash[:move] + @version = hash[:version] || 0 + @name = hash[:name] + @no_target = hash[:no_target] || false + @particles = hash[:particles] || [] + @flags = hash[:flags] || [] + @pbs_path = hash[:pbs_path] || @move end # Returns a clone of the animation in a hash format, the same as created by @@ -223,7 +268,8 @@ module GameData next if !val.is_a?(Array) val.each do |cmd| new_cmd = cmd.clone - if new_cmd[1] > 0 + if @particles[index][:name] != "SE" && new_cmd[1] > 0 + new_cmd.pop if new_cmd.last == :linear # This is the default ret.push([@@cmd_to_pbs_name[key][1]] + new_cmd) # ["MoveXYZ", keyframe, duration, value] else ret.push([@@cmd_to_pbs_name[key][0]] + new_cmd) # ["SetXYZ", keyframe, duration, value] diff --git a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb index 7a225ddf1..e572de783 100644 --- a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb +++ b/Data/Scripts/902_Anim compiler/anim pbs compiler.rb @@ -96,59 +96,84 @@ module Compiler hash[:type] = hash[:id][0] hash[:move] = hash[:id][1] hash[:version] = hash[:id][2] || 0 - # TODO: raise if "Target" particle exists but animation's target doesn't - # involve a target battler. - # Create "User" and "SE" particles if they don't exist + # Ensure there is no "Target" particle if "NoTarget" is set + if hash[:particles].any? { |particle| particle[:name] == "Target" } && hash[:no_target] + raise _INTL("Can't define a \"Target\" particle and also set property \"NoTarget\" to true.") + "\n" + FileLineData.linereport + end + # Create "User", "SE" and "Target" particles if they don't exist but should if hash[:particles].none? { |particle| particle[:name] == "User" } hash[:particles].push({:name => "User"}) end + if hash[:particles].none? { |particle| particle[:name] == "Target" } && !hash[:no_target] + hash[:particles].push({:name => "Target"}) + end if hash[:particles].none? { |particle| particle[:name] == "SE" } hash[:particles].push({:name => "SE"}) end - # TODO: Create "Target" particle if it doesn't exist and animation's target - # involves a target battler. # Go through each particle in turn hash[:particles].each do |particle| - # TODO: Ensure "Play", "PlayUserCry", "PlayTargetCry" are exclusively used - # by the particle "SE", and that the "SE" particle can only use - # those commands. Raise if problems found. - # Ensure all particles have a default focus if not given - if !particle[:focus] - if particle[:name] == "User" - particle[:focus] = :user - elsif particle[:name] == "Target" - particle[:focus] = :target - elsif particle[:name] != "SE" - particle[:focus] = :screen + # Ensure the "Play"-type commands are exclusive to the "SE" particle, and + # that the "SE" particle has no other commands + if particle[:name] == "SE" + particle.keys.each do |property| + next if [:name, :se, :user_cry, :target_cry].include?(property) + raise _INTL("Particle \"{1}\" has a command that isn't a \"Play\"-type command.", + particle[:name]) + "\n" + FileLineData.linereport + end + else + if particle[:se] + raise _INTL("Particle \"{1}\" has a \"Play\" command but shouldn't.", + particle[:name]) + "\n" + FileLineData.linereport + elsif particle[:user_cry] + raise _INTL("Particle \"{1}\" has a \"PlayUserCry\" command but shouldn't.", + particle[:name]) + "\n" + FileLineData.linereport + elsif particle[:target_cry] + raise _INTL("Particle \"{1}\" has a \"PlayTargetCry\" command but shouldn't.", + particle[:name]) + "\n" + FileLineData.linereport end end - # TODO: Depending on hash[:target], ensure all particles have an - # appropriate focus (i.e. can't be :user_and_target if hash[:target] - # doesn't include a target). Raise if problems found. + # Ensure all particles have a default focus if not given + if !particle[:focus] && particle[:name] != "SE" + case particle[:name] + when "User" then particle[:focus] = :user + when "Target" then particle[:focus] = :target + else particle[:focus] = :screen + end + end + # Ensure that particles don't have a focus involving a target if the + # animation itself doesn't involve a target + if hash[:no_target] && [:target, :user_and_target].include?(particle[:focus]) + raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a target if property \"NoTarget\" is set to true.", + particle[:name]) + "\n" + FileLineData.linereport + end # Convert all "SetXYZ" particle commands to "MoveXYZ" by giving them a # duration of 0 (even ones that can't have a "MoveXYZ" command) GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.keys.each do |prop| next if !particle[prop] particle[prop].each do |cmd| - cmd.insert(1, 0) if cmd.length == 2 + cmd.insert(1, 0) if cmd.length == 2 || particle[:name] == "SE" + # Give default interpolation value of :linear to any "MoveXYZ" command + # that doesn't have one already + cmd.push(:linear) if cmd[1] > 0 && cmd.length < 4 end end # Sort each particle's commands by their keyframe and duration particle.keys.each do |key| next if !particle[key].is_a?(Array) particle[key].sort! { |a, b| a[0] == b[0] ? a[1] == b[1] ? 0 : a[1] <=> b[1] : a[0] <=> b[0] } + next if particle[:name] == "SE" # Check for any overlapping particle commands last_frame = -1 last_set_frame = -1 particle[key].each do |cmd| if last_frame > cmd[0] - raise _INTL("Animation has overlapping commands for the {1} property.\n{2}", - key.to_s.capitalize, FileLineData.linereport) + raise _INTL("Animation has overlapping commands for the {1} property.", + key.to_s.capitalize) + "\n" + FileLineData.linereport end - if particle[:name] != "SE" && cmd[1] == 0 && last_set_frame >= cmd[0] - raise _INTL("Animation has multiple \"Set\" commands in the same keyframe for the {1} property.\n{2}", - key.to_s.capitalize, FileLineData.linereport) + if cmd[1] == 0 && last_set_frame >= cmd[0] + raise _INTL("Animation has multiple \"Set\" commands in the same keyframe for the {1} property.", + key.to_s.capitalize) + "\n" + FileLineData.linereport end last_frame = cmd[0] + cmd[1] last_set_frame = cmd[0] if cmd[1] == 0 diff --git a/Data/Scripts/905_New controls/001 basic control.rb b/Data/Scripts/905_New controls/001 basic control.rb index dd0e3ebc2..9a4e49736 100644 --- a/Data/Scripts/905_New controls/001 basic control.rb +++ b/Data/Scripts/905_New controls/001 basic control.rb @@ -10,7 +10,7 @@ class UIControls::BaseControl < BitmapSprite # attr_accessor :disabled # TODO: Make use of this. TEXT_COLOR = Color.black - TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set + TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set HOVER_COLOR = Color.cyan # For clickable area when hovering over it CAPTURE_COLOR = Color.pink # For area you clicked in but aren't hovering over diff --git a/Data/Scripts/905_New controls/002 label.rb b/Data/Scripts/905_New controls/002 label.rb index dac2d75bc..d306ec532 100644 --- a/Data/Scripts/905_New controls/002 label.rb +++ b/Data/Scripts/905_New controls/002 label.rb @@ -5,7 +5,7 @@ class UIControls::Label < UIControls::BaseControl attr_reader :label LABEL_END_X = 80 - TEXT_OFFSET_Y = 7 + TEXT_OFFSET_Y = 5 def initialize(width, height, viewport, label) super(width, height, viewport) diff --git a/Data/Scripts/905_New controls/004 text box.rb b/Data/Scripts/905_New controls/004 text box.rb index 8b615fb43..da5dd9539 100644 --- a/Data/Scripts/905_New controls/004 text box.rb +++ b/Data/Scripts/905_New controls/004 text box.rb @@ -10,7 +10,7 @@ class UIControls::TextBox < UIControls::BaseControl TEXT_BOX_WIDTH = 172 TEXT_BOX_HEIGHT = 24 TEXT_BOX_PADDING = 4 # Gap between sides of text box and text - TEXT_OFFSET_Y = 7 + TEXT_OFFSET_Y = 5 def initialize(width, height, viewport, value = "") super(width, height, viewport) @@ -201,6 +201,7 @@ class UIControls::TextBox < UIControls::BaseControl @cursor_timer = System.uptime invalidate else + @value.strip! if @value.respond_to?("strip!") set_changed if @initial_value && @value != @initial_value reset_interaction end @@ -220,6 +221,7 @@ class UIControls::TextBox < UIControls::BaseControl end # Released mouse button outside of text box, or initially clicked outside of # text box; end interaction with this control + @value.strip! if @value.respond_to?("strip!") set_changed if @initial_value && @value != @initial_value reset_interaction super # Make this control not busy again @@ -247,6 +249,7 @@ class UIControls::TextBox < UIControls::BaseControl # Return/Escape to end text input (Escape undoes the change) if Input.triggerex?(:RETURN) || Input.repeatex?(:RETURN) || Input.triggerex?(:KP_ENTER) || Input.repeatex?(:KP_ENTER) + @value.strip! if @value.respond_to?("strip!") set_changed if @initial_value && @value != @initial_value reset_interaction @captured_area = nil diff --git a/Data/Scripts/905_New controls/005 number slider.rb b/Data/Scripts/905_New controls/005 number slider.rb index 1e8e7499d..35c8db6d8 100644 --- a/Data/Scripts/905_New controls/005 number slider.rb +++ b/Data/Scripts/905_New controls/005 number slider.rb @@ -13,7 +13,7 @@ class UIControls::Slider < UIControls::BaseControl SLIDER_LENGTH = 128 PLUS_X = SLIDER_X + SLIDER_LENGTH + SLIDER_PADDING VALUE_X = PLUS_X + PLUS_MINUS_SIZE + 5 - TEXT_OFFSET_Y = 7 + TEXT_OFFSET_Y = 5 # TODO: Is there a better knob design than a big black rectangle? I'd rather # it not be a different colour. diff --git a/Data/Scripts/905_New controls/008_list.rb b/Data/Scripts/905_New controls/008_list.rb index d04c51666..4500cbd69 100644 --- a/Data/Scripts/905_New controls/008_list.rb +++ b/Data/Scripts/905_New controls/008_list.rb @@ -7,9 +7,9 @@ # through a line? Nah. #=============================================================================== class UIControls::List < UIControls::BaseControl - LIST_X = 0 - LIST_Y = 0 - ROW_HEIGHT = 24 + LIST_X = 0 + LIST_Y = 0 + ROW_HEIGHT = 24 TEXT_PADDING_X = 4 TEXT_OFFSET_Y = 3 diff --git a/Data/Scripts/905_New controls/101_scrollbar.rb b/Data/Scripts/905_New controls/101_scrollbar.rb index b267a323f..516b4e267 100644 --- a/Data/Scripts/905_New controls/101_scrollbar.rb +++ b/Data/Scripts/905_New controls/101_scrollbar.rb @@ -4,11 +4,14 @@ # seem to be any lag at the moment with a tall scrollbar. #=============================================================================== class UIControls::Scrollbar < UIControls::BaseControl - SLIDER_WIDTH = 16 - WIDTH_PADDING = 0 - TRAY_COLOR = Color.white - SLIDER_COLOR = Color.black - GRAB_COLOR = HOVER_COLOR # Cyan + SLIDER_WIDTH = 16 + WIDTH_PADDING = 0 + SCROLL_DISTANCE = 16 + TRAY_COLOR = Color.white + SLIDER_COLOR = Color.black + GRAB_COLOR = HOVER_COLOR # Cyan + + attr_reader :slider_top def initialize(x, y, size, viewport, horizontal = false, always_visible = false) if horizontal @@ -138,6 +141,16 @@ class UIControls::Scrollbar < UIControls::BaseControl self.slider_top = @slider_top + ((@tray_size - @slider_size) / 4.0).ceil end end + else + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y && @interactions[:slider_tray].contains?(mouse_x, mouse_y) + wheel_v = Input.scroll_v + if wheel_v > 0 # Scroll up + self.slider_top -= SCROLL_DISTANCE + elsif wheel_v < 0 # Scroll down + self.slider_top += SCROLL_DISTANCE + end + end end end end diff --git a/Data/Scripts/906_New controls container/001 controls container.rb b/Data/Scripts/906_New controls container/001 controls container.rb index d731ed729..bd66060c4 100644 --- a/Data/Scripts/906_New controls container/001 controls container.rb +++ b/Data/Scripts/906_New controls container/001 controls container.rb @@ -19,8 +19,8 @@ class UIControls::ControlsContainer attr_reader :values attr_reader :visible - LINE_SPACING = 32 - OFFSET_FROM_LABEL_X = 80 + LINE_SPACING = 28 + OFFSET_FROM_LABEL_X = 90 OFFSET_FROM_LABEL_Y = 0 def initialize(x, y, width, height) @@ -61,6 +61,15 @@ class UIControls::ControlsContainer repaint if @visible end + def get_control(id) + ret = nil + @controls.each do |c| + ret = c[1] if c[0] == id + break if ret + end + return ret + end + #----------------------------------------------------------------------------- def add_label(id, label, has_label = false) diff --git a/Data/Scripts/910_New anim editor/001_anim selection.rb b/Data/Scripts/910_New anim editor/001_anim selection.rb index 3bfb860fc..789a19ffc 100644 --- a/Data/Scripts/910_New anim editor/001_anim selection.rb +++ b/Data/Scripts/910_New anim editor/001_anim selection.rb @@ -95,7 +95,8 @@ class AnimationEditorLoadScreen @load_button.set_fixed_size @load_button.set_interactive_rects @controls[:load] = @load_button - # TODO: "New animation" button, "Delete animation" button. + # TODO: "New animation" button, "Delete animation" button, "Duplicate + # animation" button. repaint end diff --git a/Data/Scripts/910_New anim editor/010 editor scene.rb b/Data/Scripts/910_New anim editor/010 editor scene.rb index 217841a4c..18cd396ae 100644 --- a/Data/Scripts/910_New anim editor/010 editor scene.rb +++ b/Data/Scripts/910_New anim editor/010 editor scene.rb @@ -25,24 +25,32 @@ class AnimationEditor WINDOW_WIDTH = AnimationEditorLoadScreen::WINDOW_WIDTH WINDOW_HEIGHT = AnimationEditorLoadScreen::WINDOW_HEIGHT + TOP_BAR_HEIGHT = 30 + BORDER_THICKNESS = 4 CANVAS_X = BORDER_THICKNESS - CANVAS_Y = 32 + BORDER_THICKNESS + CANVAS_Y = TOP_BAR_HEIGHT + BORDER_THICKNESS CANVAS_WIDTH = Settings::SCREEN_WIDTH CANVAS_HEIGHT = Settings::SCREEN_HEIGHT + + PLAY_CONTROLS_X = CANVAS_X + PLAY_CONTROLS_Y = CANVAS_Y + CANVAS_HEIGHT + (BORDER_THICKNESS * 2) + PLAY_CONTROLS_WIDTH = CANVAS_WIDTH + PLAY_CONTROLS_HEIGHT = 64 - (BORDER_THICKNESS * 2) + SIDE_PANE_X = CANVAS_X + CANVAS_WIDTH + (BORDER_THICKNESS * 2) SIDE_PANE_Y = CANVAS_Y SIDE_PANE_WIDTH = WINDOW_WIDTH - SIDE_PANE_X - BORDER_THICKNESS - SIDE_PANE_HEIGHT = CANVAS_HEIGHT + (32 * 2) - PARTICLE_LIST_X = 0 + SIDE_PANE_HEIGHT = CANVAS_HEIGHT + PLAY_CONTROLS_HEIGHT + (BORDER_THICKNESS * 2) + + PARTICLE_LIST_X = BORDER_THICKNESS PARTICLE_LIST_Y = SIDE_PANE_Y + SIDE_PANE_HEIGHT + (BORDER_THICKNESS * 2) - PARTICLE_LIST_WIDTH = WINDOW_WIDTH - PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y + PARTICLE_LIST_WIDTH = WINDOW_WIDTH - (BORDER_THICKNESS * 2) + PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y - BORDER_THICKNESS def initialize(anim_id, anim) @anim_id = anim_id @anim = anim - @particle = -1 @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @viewport.z = 99999 @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) @@ -53,9 +61,12 @@ class AnimationEditor @canvas.y = CANVAS_Y @canvas.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", "field_bg") # Side panes - @keyframe_particle_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + @commands_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + @se_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + @particle_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + @keyframe_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) # TODO: Make more side panes for: - # - colour/tone editor (accessed from keyframe_particle_pane via a + # - colour/tone editor (accessed from commands_pane via a # button; has Apply/Cancel buttons to only apply all its values at # the end of editing them, although canvas will be updated in real # time to show the changes) @@ -66,6 +77,10 @@ class AnimationEditor # shake, etc.) # - keyframe properties (shift all later particle commands forward/ # backward). + # Play controls + @play_controls = UIControls::AnimationPlayControls.new( + PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, @viewport + ) # Timeline/particle list @particle_list = UIControls::AnimationParticleList.new( PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport @@ -74,13 +89,18 @@ class AnimationEditor @captured = nil set_side_panes_contents set_particle_list_contents + set_play_controls_contents refresh end def dispose @screen_bitmap.dispose @canvas.dispose - @keyframe_particle_pane.dispose + @commands_pane.dispose + @se_pane.dispose + @particle_pane.dispose + @keyframe_pane.dispose + @play_controls.dispose @particle_list.dispose @viewport.dispose end @@ -95,55 +115,93 @@ class AnimationEditor #----------------------------------------------------------------------------- - def set_keyframe_particle_pane_contents - # TODO: Move these properties to a new side pane for particle properties - # (ones that don't change during the animation). - @keyframe_particle_pane.add_labelled_text_box(:name, "Name", "Untitled") - # @keyframe_particle_pane.add_labelled_dropdown_list(:focus, "Focus", { - # :user => "User", - # :target => "Target", - # :user_and_target => "User and target", - # :screen => "Screen" - # }, :user) - - # TODO: Make sure the IDs for these controls all match up to particle - # properties that can change during the animation. - @keyframe_particle_pane.add_labelled_value_box(:x, "X", -128, CANVAS_WIDTH + 128, 64) - @keyframe_particle_pane.add_labelled_value_box(:y, "Y", -128, CANVAS_HEIGHT + 128, 96) - @keyframe_particle_pane.add_labelled_value_box(:zoom_x, "Zoom X", 0, 1000, 100) - @keyframe_particle_pane.add_labelled_value_box(:zoom_y, "Zoom Y", 0, 1000, 100) - @keyframe_particle_pane.add_labelled_checkbox(:visible, "Visible", true) - @keyframe_particle_pane.add_labelled_slider(:opacity, "Opacity", 0, 255, 255) - @keyframe_particle_pane.add_labelled_value_box(:angle, "Angle", -1080, 1080, 0) - @keyframe_particle_pane.add_labelled_checkbox(:flip, "Flip", false) - @keyframe_particle_pane.add_labelled_dropdown_list(:priority, "Priority", { # TODO: Include sub-priority. - :behind_all => "Behind all", - :behind_user => "Behind user", - :above_user => "In front of user", - :above_all => "In front of everything" - }, :above_user) - @keyframe_particle_pane.add_labelled_button(:color, "Color", "Edit") - @keyframe_particle_pane.add_labelled_button(:tone, "Tone", "Edit") - @keyframe_particle_pane.add_labelled_button(:graphic, "Graphic", "Change") - # :frame (related to graphic) - # :blending + def set_commands_pane_contents + # :frame (related to graphic) - If the graphic is user's sprite/target's + # sprite, make this instead a choice of front/back/same as the main sprite/ + # opposite of the main sprite. Probably need two controls in the same space + # and refresh_commands_pane makes the appropriate one visible. + @commands_pane.add_labelled_value_box(:x, _INTL("X"), -128, CANVAS_WIDTH + 128, 64) + @commands_pane.add_labelled_value_box(:y, _INTL("Y"), -128, CANVAS_HEIGHT + 128, 96) + @commands_pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) + @commands_pane.add_labelled_slider(:opacity, _INTL("Opacity"), 0, 255, 255) + @commands_pane.add_labelled_value_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) + @commands_pane.add_labelled_value_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) + @commands_pane.add_labelled_value_box(:angle, _INTL("Angle"), -1080, 1080, 0) + @commands_pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) + @commands_pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { + 0 => _INTL("None"), + 1 => _INTL("Additive"), + 2 => _INTL("Subtractive") + }, 0) + @commands_pane.add_labelled_button(:color_tone, _INTL("Color/Tone"), _INTL("Edit")) + # @commands_pane.add_labelled_dropdown_list(:priority, _INTL("Priority"), { # TODO: Include sub-priority. + # :behind_all => _INTL("Behind all"), + # :behind_user => _INTL("Behind user"), + # :above_user => _INTL("In front of user"), + # :above_all => _INTL("In front of everything") + # }, :above_user) + # :sub_priority +# @commands_pane.add_labelled_button(:masking, _INTL("Masking"), _INTL("Edit")) # TODO: Add buttons that shift all commands from the current keyframe and # later forwards/backwards in time? end + def set_se_pane_contents + # TODO: A list containing all SE files that play this keyframe. Lists SE, + # user cry and target cry. + @se_pane.add_button(:add, _INTL("Add")) + @se_pane.add_button(:edit, _INTL("Edit")) + @se_pane.add_button(:delete, _INTL("Delete")) + end + + def set_particle_pane_contents + # TODO: Name should blacklist certain names ("User", "Target", "SE") and + # should be disabled if the value is one of those. + @particle_pane.add_labelled_text_box(:name, _INTL("Name"), _INTL("Untitled")) + # TODO: Graphic should show the graphic's name alongside a "Change" button. + # New kind of control that is a label plus a button? + @particle_pane.add_labelled_button(:graphic, _INTL("Graphic"), _INTL("Change")) + @particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), { + :user => _INTL("User"), + :target => _INTL("Target"), + :user_and_target => _INTL("User and target"), + :screen => _INTL("Screen") + }, :user) + # FlipIfFoe + # RotateIfFoe + # Delete button (if not "User"/"Target"/"SE") + # Duplicate button + # Shift all command timings by X keyframes (text box and button) + # Move particle up/down the list? + end + + def set_keyframe_pane_contents + @keyframe_pane.add_label(:temp, _INTL("Keyframe pane")) + # TODO: Various command-shifting options. + end + def set_side_panes_contents - set_keyframe_particle_pane_contents + set_commands_pane_contents + set_se_pane_contents + set_particle_pane_contents + set_keyframe_pane_contents end def set_particle_list_contents @particle_list.set_particles(@anim[:particles]) end + def set_play_controls_contents + @play_controls.duration = @particle_list.duration + end + #----------------------------------------------------------------------------- def draw_editor_background # Fill the whole screen with black @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.black) + # Fill the top bar with white + @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, TOP_BAR_HEIGHT, Color.white) # Outline around canvas @screen_bitmap.bitmap.outline_rect(CANVAS_X - 3, CANVAS_Y - 3, CANVAS_WIDTH + 6, CANVAS_HEIGHT + 6, Color.white) @screen_bitmap.bitmap.outline_rect(CANVAS_X - 2, CANVAS_Y - 2, CANVAS_WIDTH + 4, CANVAS_HEIGHT + 4, Color.black) @@ -154,22 +212,31 @@ class AnimationEditor @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 1, SIDE_PANE_Y - 1, SIDE_PANE_WIDTH + 2, SIDE_PANE_HEIGHT + 2, Color.white) # Fill the side pane with white @screen_bitmap.bitmap.fill_rect(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, Color.white) + # Outline around play controls + @screen_bitmap.bitmap.outline_rect(PLAY_CONTROLS_X - 3, PLAY_CONTROLS_Y - 3, PLAY_CONTROLS_WIDTH + 6, PLAY_CONTROLS_HEIGHT + 6, Color.white) + @screen_bitmap.bitmap.outline_rect(PLAY_CONTROLS_X - 2, PLAY_CONTROLS_Y - 2, PLAY_CONTROLS_WIDTH + 4, PLAY_CONTROLS_HEIGHT + 4, Color.black) + @screen_bitmap.bitmap.outline_rect(PLAY_CONTROLS_X - 1, PLAY_CONTROLS_Y - 1, PLAY_CONTROLS_WIDTH + 2, PLAY_CONTROLS_HEIGHT + 2, Color.white) + # Fill the play controls with white + @screen_bitmap.bitmap.fill_rect(PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, Color.white) # Outline around timeline/particle list @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 3, PARTICLE_LIST_Y - 3, PARTICLE_LIST_WIDTH + 6, PARTICLE_LIST_HEIGHT + 6, Color.white) @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 2, PARTICLE_LIST_Y - 2, PARTICLE_LIST_WIDTH + 4, PARTICLE_LIST_HEIGHT + 4, Color.black) @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 1, PARTICLE_LIST_Y - 1, PARTICLE_LIST_WIDTH + 2, PARTICLE_LIST_HEIGHT + 2, Color.white) end - def refresh_keyframe_particle_pane - if !keyframe || keyframe < 0 || !particle_index || particle_index < 0 || - !@anim[:particles][particle_index] - @keyframe_particle_pane.visible = false + def refresh_canvas + end + + def refresh_commands_pane + if keyframe < 0 || particle_index < 0 || !@anim[:particles][particle_index] || + @anim[:particles][particle_index][:name] == "SE" + @commands_pane.visible = false else - @keyframe_particle_pane.visible = true + @commands_pane.visible = true new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) - # TODO: Need to do something special for :color, :tone and :graphic/:frame - # which all have button controls. - @keyframe_particle_pane.controls.each do |ctrl| + # TODO: Need to do something special for :color, :tone and :frame which + # all have button controls. + @commands_pane.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, @@ -178,15 +245,58 @@ class AnimationEditor end end + def refresh_se_pane + if keyframe < 0 || particle_index < 0 || !@anim[:particles][particle_index] || + @anim[:particles][particle_index][:name] != "SE" + @se_pane.visible = false + else + @se_pane.visible = true + # TODO: Set list of SEs, activate/deactivate buttons accordingly. + end + end + + def refresh_particle_pane + if keyframe >= 0 || particle_index < 0 + @particle_pane.visible = false + else + @particle_pane.visible = true + new_vals = AnimationEditor::ParticleDataHelper.get_all_particle_values(@anim[:particles][particle_index]) + @particle_pane.controls.each do |ctrl| + next if !new_vals.include?(ctrl[0]) + ctrl[1].value = new_vals[ctrl[0]] if ctrl[1].respond_to?("value=") + end + # TODO: Disable the name and graphic controls for "User"/"Target". + end + end + + def refresh_keyframe_pane + if keyframe < 0 || particle_index >= 0 + @keyframe_pane.visible = false + else + @keyframe_pane.visible = true + end + end + def refresh_particle_list @particle_list.refresh end + def refresh_play_controls + @play_controls.refresh + end + def refresh + # Set canvas display + refresh_canvas # Set all side pane controls to values from animation - refresh_keyframe_particle_pane + refresh_commands_pane + refresh_se_pane + refresh_particle_pane + refresh_keyframe_pane # Set particle list's contents refresh_particle_list + # Set play controls' information + refresh_play_controls end #----------------------------------------------------------------------------- @@ -197,23 +307,96 @@ class AnimationEditor # double-clicking to add particle, deleting particle. end - def update_keyframe_particle_pane - @keyframe_particle_pane.update - @captured = :keyframe_particle_pane if @keyframe_particle_pane.busy? - if @keyframe_particle_pane.changed? + def update_commands_pane + return if !@commands_pane.visible + @commands_pane.update + if @commands_pane.busy? + @captured = [@commands_pane, :update_commands_pane] + end + if @commands_pane.changed? # TODO: Make undo/redo snapshot. - values = @keyframe_particle_pane.values - # TODO: Apply vals to the animation data, unless the changed control is a - # button (its value will be true), in which case run some special - # code. Maybe this special code should be passed to/run in the - # control as a proc instead, and the button control can be given a - # value like any other control? Probably not. - echoln values - if values[:color] - elsif values[:tone] - elsif values[:graphic] + values = @commands_pane.values + values.each_pair do |property, value| + case property + when :color_tone # Button + # TODO: Open the colour/tone side pane. + else + particle = @anim[:particles][particle_index] + new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) + if new_cmds + particle[property] = new_cmds + else + particle.delete(property) + end + @particle_list.change_particle_commands(particle_index) + @play_controls.duration = @particle_list.duration + refresh_commands_pane + end end - @keyframe_particle_pane.clear_changed + @commands_pane.clear_changed + end + end + + def update_se_pane + return if !@se_pane.visible + @se_pane.update + if @se_pane.busy? + @captured = [@se_pane, :update_se_pane] + end + # TODO: Enable the "Edit" and "Delete" controls only if an SE is selected. + if @se_pane.changed? + # TODO: Make undo/redo snapshot. + values = @se_pane.values + values.each_pair do |property, value| + case property + when :add # Button + when :edit # Button + when :delete # Button + else + particle = @anim[:particles][particle_index] + end + end + @se_pane.clear_changed + end + end + + def update_particle_pane + return if !@particle_pane.visible + @particle_pane.update + if @particle_pane.busy? + @captured = [@particle_pane, :update_particle_pane] + end + if @particle_pane.changed? + # TODO: Make undo/redo snapshot. + values = @particle_pane.values + values.each_pair do |property, value| + case property + when :graphic # Button + # TODO: Open the graphic chooser pop-up window. + else + particle = @anim[:particles][particle_index] + new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) + @particle_list.change_particle(particle_index) + refresh_particle_pane + end + end + @particle_pane.clear_changed + end + end + + def update_keyframe_pane + return if !@keyframe_pane.visible + @keyframe_pane.update + if @keyframe_pane.busy? + @captured = [@keyframe_pane, :update_keyframe_pane] + end + if @keyframe_pane.changed? + # TODO: Make undo/redo snapshot. + values = @keyframe_pane.values + values.each_pair do |property, value| + # TODO: Stuff here once I decide what controls to add. + end + @keyframe_pane.clear_changed end end @@ -221,34 +404,44 @@ class AnimationEditor old_keyframe = keyframe old_particle_index = particle_index @particle_list.update - @captured = :particle_list if @particle_list.busy? + if @particle_list.busy? + @captured = [@particle_list, :update_particle_list] + end if @particle_list.changed? - refresh_keyframe_particle_pane if keyframe != old_keyframe || particle_index != old_particle_index + refresh if keyframe != old_keyframe || particle_index != old_particle_index # TODO: Lots of stuff here. @particle_list.clear_changed end @particle_list.repaint end + def update_play_controls + @play_controls.update + @play_controls.repaint + if @play_controls.busy? + @captured = [@play_controls, :update_play_controls] + end + # TODO: Will the play controls ever signal themselves as changed? I don't + # think so. + if @play_controls.changed? + @play_controls.clear_changed + end + @play_controls.repaint + end + def update if @captured - # TODO: There must be a better way to do this. - case @captured - when :canvas - update_canvas - @captured = nil if !@canvas.busy? - when :keyframe_particle_pane - update_keyframe_particle_pane - @captured = nil if !@keyframe_particle_pane.busy? - when :particle_list - update_particle_list - @captured = nil if !@particle_list.busy? - end - else - update_canvas - update_keyframe_particle_pane - update_particle_list + self.send(@captured[1]) + @captured = nil if !@captured[0].busy? + return end + update_canvas + update_commands_pane + update_se_pane + update_particle_pane + update_keyframe_pane + update_particle_list + update_play_controls end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/910_New anim editor/011_particle list.rb b/Data/Scripts/910_New anim editor/011_particle list.rb index 074cbbd04..d5ad0a69e 100644 --- a/Data/Scripts/910_New anim editor/011_particle list.rb +++ b/Data/Scripts/910_New anim editor/011_particle list.rb @@ -5,15 +5,21 @@ # time the horizontal scrollbar changes. #=============================================================================== class UIControls::AnimationParticleList < UIControls::BaseControl - LIST_WIDTH = 150 + VIEWPORT_SPACING = 1 + TIMELINE_HEIGHT = 24 - VIEWPORT_SPACING + LIST_X = 0 + LIST_Y = TIMELINE_HEIGHT + VIEWPORT_SPACING + LIST_WIDTH = 150 - VIEWPORT_SPACING + COMMANDS_X = LIST_WIDTH + VIEWPORT_SPACING + COMMANDS_Y = LIST_Y + ROW_HEIGHT = 24 - TIMELINE_HEIGHT = 24 DIAMOND_SIZE = 3 TIMELINE_LEFT_BUFFER = DIAMOND_SIZE + 1 # Allows diamonds at keyframe 0 to be drawn fully TIMELINE_TEXT_SIZE = 16 KEYFRAME_SPACING = 20 INTERP_LINE_HEIGHT = KEYFRAME_SPACING - ((DIAMOND_SIZE * 2) + 3) - INTERP_LINE_Y = (TIMELINE_HEIGHT / 2) - (INTERP_LINE_HEIGHT / 2) + INTERP_LINE_Y = (ROW_HEIGHT / 2) - (INTERP_LINE_HEIGHT / 2) DURATION_BUFFER = 20 # Extra keyframes shown after the animation's end CONTROL_BG_COLORS = { :user => Color.new(96, 248, 96), # Green @@ -24,7 +30,6 @@ class UIControls::AnimationParticleList < UIControls::BaseControl SE_CONTROL_BG = Color.gray attr_reader :keyframe # The selected keyframe - attr_reader :particle_index # Index in @particles def initialize(x, y, width, height, viewport) super(width, height, viewport) @@ -33,28 +38,28 @@ class UIControls::AnimationParticleList < UIControls::BaseControl draw_control_background # Create viewports @list_viewport = Viewport.new( - x, y + TIMELINE_HEIGHT, LIST_WIDTH, height - TIMELINE_HEIGHT - UIControls::Scrollbar::SLIDER_WIDTH - 1 + x + LIST_X, y + LIST_Y, LIST_WIDTH, height - LIST_Y - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING ) @list_viewport.z = self.viewport.z + 1 - @commands_bg_viewport = Viewport.new(@list_viewport.rect.x + LIST_WIDTH, @list_viewport.rect.y, - width - @list_viewport.rect.width - UIControls::Scrollbar::SLIDER_WIDTH, - @list_viewport.rect.height) + @commands_bg_viewport = Viewport.new( + x + COMMANDS_X, y + COMMANDS_Y, + width - COMMANDS_X - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @list_viewport.rect.height + ) @commands_bg_viewport.z = self.viewport.z + 1 - @position_viewport = Viewport.new(@list_viewport.rect.x + LIST_WIDTH, y, @commands_bg_viewport.rect.width, height) + @position_viewport = Viewport.new(@commands_bg_viewport.rect.x, y, @commands_bg_viewport.rect.width, height) @position_viewport.z = self.viewport.z + 2 - @commands_viewport = Viewport.new(@list_viewport.rect.x + LIST_WIDTH, @list_viewport.rect.y, - width - @list_viewport.rect.width - UIControls::Scrollbar::SLIDER_WIDTH, - @list_viewport.rect.height) + @commands_viewport = Viewport.new(@commands_bg_viewport.rect.x, @commands_bg_viewport.rect.y, + @commands_bg_viewport.rect.width, @commands_bg_viewport.rect.height) @commands_viewport.z = self.viewport.z + 3 # Create scrollbar @list_scrollbar = UIControls::Scrollbar.new( - @commands_viewport.rect.x + @commands_viewport.rect.width, @commands_viewport.rect.y, - @commands_viewport.rect.height + 1, self.viewport, false, true + x + width - UIControls::Scrollbar::SLIDER_WIDTH, @commands_bg_viewport.rect.y, + @commands_bg_viewport.rect.height, self.viewport, false, true ) @list_scrollbar.set_interactive_rects @time_scrollbar = UIControls::Scrollbar.new( - @commands_viewport.rect.x, @commands_viewport.rect.y + @commands_viewport.rect.height + 1, - @commands_viewport.rect.width, self.viewport, true, true + @commands_bg_viewport.rect.x, y + height - UIControls::Scrollbar::SLIDER_WIDTH, + @commands_bg_viewport.rect.width, self.viewport, true, true ) @time_scrollbar.set_interactive_rects # Timeline bitmap sprite @@ -64,7 +69,7 @@ class UIControls::AnimationParticleList < UIControls::BaseControl @timeline_sprite.bitmap.font.color = TEXT_COLOR @timeline_sprite.bitmap.font.size = TIMELINE_TEXT_SIZE # Position line sprite - @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - 1, @position_viewport) + @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @position_viewport) @position_sprite.ox = @position_sprite.width / 2 @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, Color.red) # List sprites and commands sprites @@ -77,9 +82,10 @@ class UIControls::AnimationParticleList < UIControls::BaseControl @duration = 0 # Selected things @keyframe = 0 - @particle_index = 0 + @row_index = 0 # Particle information to display (one row each) @particles = [] # Reference to particle data from the editor scene + @expanded_particles = [0] # Each element is index in @particles @particle_list = [] # Each element is index in @particles or [index, property] @visibilities = [] # Per particle @commands = {} @@ -90,10 +96,10 @@ class UIControls::AnimationParticleList < UIControls::BaseControl # Background self.bitmap.fill_rect(0, 0, width, height, Color.white) # Separator lines - self.bitmap.fill_rect(0, TIMELINE_HEIGHT - 1, width, 1, Color.black) - self.bitmap.fill_rect(LIST_WIDTH - 1, 0, 1, height, Color.black) - self.bitmap.fill_rect(0, height - UIControls::Scrollbar::SLIDER_WIDTH - 1, width, 1, Color.black) - self.bitmap.fill_rect(width - UIControls::Scrollbar::SLIDER_WIDTH - 1, 0, 1, height, Color.black) + self.bitmap.fill_rect(0, TIMELINE_HEIGHT, width, VIEWPORT_SPACING, Color.black) + self.bitmap.fill_rect(LIST_WIDTH, 0, VIEWPORT_SPACING, height, Color.black) + self.bitmap.fill_rect(0, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, width, VIEWPORT_SPACING, Color.black) + self.bitmap.fill_rect(width - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, 0, VIEWPORT_SPACING, height, Color.black) end def dispose_listed_sprites @@ -116,6 +122,15 @@ class UIControls::AnimationParticleList < UIControls::BaseControl @commands_viewport.dispose end + def duration + return [@duration - DURATION_BUFFER, 0].max + end + + def particle_index + ret = @particle_list[@row_index] + return (ret.is_a?(Array)) ? ret[0] : ret + end + def left_pos=(val) old_val = @left_pos total_width = (@duration * KEYFRAME_SPACING) + TIMELINE_LEFT_BUFFER + 1 @@ -133,7 +148,7 @@ class UIControls::AnimationParticleList < UIControls::BaseControl def top_pos=(val) old_val = @top_pos - total_height = @particle_list.length * ROW_HEIGHT + total_height = (@particle_list.length * ROW_HEIGHT) + 1 if total_height <= @list_viewport.rect.height @top_pos = 0 else @@ -141,6 +156,7 @@ class UIControls::AnimationParticleList < UIControls::BaseControl @top_pos = @top_pos.clamp(0, total_height - @list_viewport.rect.height) end @list_viewport.oy = @top_pos + @commands_bg_viewport.oy = @top_pos @commands_viewport.oy = @top_pos if @top_pos != old_val invalidate_rows @@ -150,12 +166,22 @@ class UIControls::AnimationParticleList < UIControls::BaseControl def set_particles(particles) @particles = particles - @particle_list.clear calculate_all_commands_and_durations + create_sprites + end + + def create_sprites + # Fill in @particle_list with indices from @particles + @particle_list.clear + @particles.length.times do |i| + @particle_list.push(i) + next if !@expanded_particles.include?(i) + @particles[i].each_pair do |property, value| + @particle_list.push([i, property]) if value.is_a?(Array) + end + end # Dispose of and clear all existing list/commands sprites dispose_listed_sprites - # Fill in @particle_list with indices from @particles - @particles.length.times { |i| @particle_list.push(i) } # Create new sprites for each particle (1x list and 2x commands) @particle_list.length.times do list_sprite = BitmapSprite.new(@list_viewport.rect.width, ROW_HEIGHT, @list_viewport) @@ -174,9 +200,12 @@ class UIControls::AnimationParticleList < UIControls::BaseControl commands_sprite.bitmap.font.size = TEXT_SIZE @commands_sprites.push(commands_sprite) end - @list_scrollbar.range = @particle_list.length * ROW_HEIGHT + # Set scrollbars to the correct lengths + @list_scrollbar.range = (@particle_list.length * ROW_HEIGHT) + 1 @time_scrollbar.range = (@duration * KEYFRAME_SPACING) + TIMELINE_LEFT_BUFFER + 1 self.left_pos = @left_pos + self.top_pos = @top_pos + # Redraw all sprites invalidate end @@ -219,6 +248,8 @@ class UIControls::AnimationParticleList < UIControls::BaseControl #----------------------------------------------------------------------------- def calculate_duration + # TODO: Refresh lots of things if the duration changed (e.g. SE command + # line). @duration = AnimationEditor::ParticleDataHelper.get_duration(@particles) @duration += DURATION_BUFFER end @@ -228,31 +259,101 @@ class UIControls::AnimationParticleList < UIControls::BaseControl # particle was changed, recalculate only that particle's commands. def calculate_all_commands_and_durations calculate_duration + calculate_all_commands + end + + def calculate_all_commands @commands = {} - @particles.each_with_index do |particle, i| - overall_commands = [] + @particles.each_with_index do |particle, index| + calculate_commands_for_particle(index) + end + end + + def calculate_commands_for_particle(index) + # TODO: Delete everything from @commands that includes index. + overall_commands = [] + @particles[index].each_pair do |property, value| + next if !value.is_a?(Array) + cmds = AnimationEditor::ParticleDataHelper.get_particle_property_commands_timeline(@particles[index], value, property) + @commands[[index, property]] = cmds + cmds.each_with_index do |cmd, i| + next if !cmd + overall_commands[i] = (cmd.is_a?(Array)) ? cmd.clone : cmd + end + end + @commands[index] = overall_commands + # Calculate visibilities for every keyframe + @visibilities[index] = AnimationEditor::ParticleDataHelper.get_timeline_particle_visibilities( + @particles[index], @duration - DURATION_BUFFER + ) + end + + # Returns whether the sprites need replacing due to the addition or + # subtraction of one. + def ensure_sprites + # TODO: Check through @particle_list to ensure only ones are shown which + # correspond to something in @particles. + # Go through all @particles to ensure there are sprites for each of them + missing = false + @particles.each_with_index do |particle, index| + if @particle_list.none? { |value| next !value.is_a?(Array) && value == index } + missing = true + break + end + next if !@expanded_particles.include?(index) particle.each_pair do |property, value| next if !value.is_a?(Array) - cmds = AnimationEditor::ParticleDataHelper.get_particle_property_commands_timeline(value, property) - @commands[[i, property]] = cmds - cmds.each_with_index do |cmd, j| - next if !cmd - overall_commands[j] = (cmd.is_a?(Array)) ? cmd.clone : cmd + if @particle_list.none? { |value| next value.is_a?(Array) && value[0] == index && value[1] == property } + missing = true + break end end - @commands[i] = overall_commands + break if missing end - # Calculate visibilities for every keyframe - @particles.each_with_index do |particle, i| - @visibilities[i] = AnimationEditor::ParticleDataHelper.get_timeline_particle_visibilities( - particle, @duration - DURATION_BUFFER - ) + return true if missing + # Go through all sprites to ensure there are none for a particle or + # particle/property that don't exist + excess = false + @particle_list.each do |value| + if value.is_a?(Array) + excess = true if !@particles[value[0]] || !@particles[value[0]][value[1]] || + @particles[value[0]][value[1]].empty? + else + excess = true if !@particles[value] + end + break if excess end + return excess + end + + # Called when a change is made to a particle's commands. + def change_particle_commands(index) + old_duration = @duration + calculate_duration + if @duration != old_duration + calculate_all_commands + else + calculate_commands_for_particle(index) + end + sprites_need_changing = ensure_sprites + if @duration != old_duration || sprites_need_changing + @keyframe = @keyframe.clamp(0, @duration - 1) + @row_index = @row_index.clamp(0, @particle_list.length - 1) + create_sprites + end + invalidate + end + + # Called when a change is made to a particle's general properties. + def change_particle(index) + invalidate_rows end # TODO: Methods that will show/hide individual property rows for a given # @particles index. + #----------------------------------------------------------------------------- + def each_visible_keyframe(early_start = false) full_width = @commands_viewport.rect.width start_keyframe = ((@left_pos - TIMELINE_LEFT_BUFFER) / KEYFRAME_SPACING) @@ -279,18 +380,17 @@ class UIControls::AnimationParticleList < UIControls::BaseControl def property_display_name(property) return { - :graphic => "Graphic", - :frame => "Graphic frame", - :blending => "Blending", - :flip => "Flip", - :x => "X", - :y => "Y", - :zoom_x => "Zoom X", - :zoom_y => "Zoom Y", - :angle => "Angle", - :visible => "Visible", - :opacity => "Opacity" - }[property] || "Unnamed property" + :frame => _INTL("Graphic frame"), + :blending => _INTL("Blending"), + :flip => _INTL("Flip"), + :x => _INTL("X"), + :y => _INTL("Y"), + :zoom_x => _INTL("Zoom X"), + :zoom_y => _INTL("Zoom Y"), + :angle => _INTL("Angle"), + :visible => _INTL("Visible"), + :opacity => _INTL("Opacity") + }[property] || property.capitalize end def repaint @@ -333,7 +433,7 @@ class UIControls::AnimationParticleList < UIControls::BaseControl end def refresh_position_line - @position_sprite.visible = (@keyframe && @keyframe >= 0) + @position_sprite.visible = (@keyframe >= 0) if @keyframe >= 0 @position_sprite.x = TIMELINE_LEFT_BUFFER + (@keyframe * KEYFRAME_SPACING) - @left_pos end @@ -344,6 +444,7 @@ class UIControls::AnimationParticleList < UIControls::BaseControl spr = @list_sprites[index] return if !spr spr.bitmap.clear + box_x = (@particle_list[index].is_a?(Array)) ? 16 : 0 # Get the background color p_index = (@particle_list[index].is_a?(Array)) ? @particle_list[index][0] : @particle_list[index] particle_data = @particles[p_index] @@ -365,14 +466,15 @@ class UIControls::AnimationParticleList < UIControls::BaseControl elsif !@captured_row && !@captured_keyframe && @hover_row && @hover_row == index && !@hover_keyframe hover_color = HOVER_COLOR end - spr.bitmap.fill_rect(0, 1, spr.width - 1, spr.height - 1, hover_color) if hover_color + spr.bitmap.fill_rect(box_x, 1, spr.width - box_x, spr.height - 1, hover_color) if hover_color # Draw outline - spr.bitmap.outline_rect(0, 1, spr.width - 1, spr.height - 1, bg_color, 2) + spr.bitmap.outline_rect(box_x, 1, spr.width - box_x, spr.height - 1, bg_color, 2) # Draw text if @particle_list[index].is_a?(Array) - draw_text(spr.bitmap, 3 + 40, 3, property_display_name(@particle_list[index][1])) + draw_text(spr.bitmap, box_x + 4, 0, "→") # ► + draw_text(spr.bitmap, box_x + 4 + 17, 3, property_display_name(@particle_list[index][1])) else - draw_text(spr.bitmap, 3, 3, @particles[p_index][:name] || "Unnamed") + draw_text(spr.bitmap, 4, 3, @particles[p_index][:name] || "Unnamed") end end @@ -394,7 +496,7 @@ class UIControls::AnimationParticleList < UIControls::BaseControl each_visible_keyframe do |i| draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos # Draw bg - if i < @duration - DURATION_BUFFER && (particle_data[:name] == "SE" || visible_cmds[i]) + if i < @duration - DURATION_BUFFER && visible_cmds[i] bg_spr.bitmap.fill_rect(draw_x, 1, KEYFRAME_SPACING, ROW_HEIGHT - 2, bg_color) end # Draw hover highlight @@ -413,14 +515,14 @@ class UIControls::AnimationParticleList < UIControls::BaseControl end bg_spr.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, hover_color) if hover_color next if i >= @duration - DURATION_BUFFER - next if particle_data[:name] != "SE" && !visible_cmds[i] + next if !visible_cmds[i] # Draw outline bg_spr.bitmap.fill_rect(draw_x, 1, KEYFRAME_SPACING, 1, Color.black) # Top bg_spr.bitmap.fill_rect(draw_x, ROW_HEIGHT - 1, KEYFRAME_SPACING, 1, Color.black) # Bottom - if i <= 0 || (particle_data[:name] != "SE" && !visible_cmds[i - 1]) + if i <= 0 || !visible_cmds[i - 1] bg_spr.bitmap.fill_rect(draw_x, 1, 1, ROW_HEIGHT - 1, Color.black) # Left end - if i == @duration - DURATION_BUFFER - 1 || (particle_data[:name] != "SE" && i < @duration - 1 && !visible_cmds[i + 1]) + if i == @duration - DURATION_BUFFER - 1 || (i < @duration - 1 && !visible_cmds[i + 1]) bg_spr.bitmap.fill_rect(draw_x + KEYFRAME_SPACING, 1, 1, ROW_HEIGHT - 1, Color.black) # Right end end @@ -439,7 +541,7 @@ class UIControls::AnimationParticleList < UIControls::BaseControl next if !cmds[i] draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos # Draw command diamond - spr.bitmap.fill_diamond(draw_x, TIMELINE_HEIGHT / 2, DIAMOND_SIZE, TEXT_COLOR) + spr.bitmap.fill_diamond(draw_x, ROW_HEIGHT / 2, DIAMOND_SIZE, TEXT_COLOR) # Draw interpolation line if cmds[i].is_a?(Array) spr.bitmap.draw_interpolation_line( @@ -500,14 +602,17 @@ class UIControls::AnimationParticleList < UIControls::BaseControl when :list new_hover_row = (mouse_y + @top_pos - rect.y) / ROW_HEIGHT break if new_hover_row >= @particle_list.length + listed_element = @particle_list[new_hover_row] + p_index = listed_element.is_a?(Array) ? listed_element[0] : listed_element + break if @particles[p_index][:name] == "SE" ret = [area, nil, new_hover_row] when :timeline - new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2)) / KEYFRAME_SPACING + new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2) - 1) / KEYFRAME_SPACING break if new_hover_keyframe < 0 || new_hover_keyframe >= @duration ret = [area, new_hover_keyframe, nil] when :commands new_hover_row = (mouse_y + @top_pos - rect.y) / ROW_HEIGHT - new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2)) / KEYFRAME_SPACING + new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2) - 1) / KEYFRAME_SPACING break if new_hover_row >= @particle_list.length break if new_hover_keyframe < 0 || new_hover_keyframe >= @duration ret = [area, new_hover_keyframe, new_hover_row] @@ -535,9 +640,14 @@ class UIControls::AnimationParticleList < UIControls::BaseControl if @captured_area == hover_element[0] && @captured_keyframe == hover_element[1] && @captured_row == hover_element[2] - set_changed if @keyframe != @captured_keyframe || @particle_index != @captured_row + if @captured_row && @particle_list[@captured_row].is_a?(Array) + # TODO: If I want to be able to select individual property rows and/or + # diamonds, I shouldn't have this line. + @captured_row = @particle_list.index(@particle_list[@captured_row][0]) + end + set_changed if @keyframe != @captured_keyframe || @row_index != @captured_row @keyframe = @captured_keyframe || -1 - @particle_index = @captured_row || -1 + @row_index = @captured_row || -1 end end @captured_keyframe = nil @@ -545,6 +655,11 @@ class UIControls::AnimationParticleList < UIControls::BaseControl super # Make this control not busy again end + def on_right_mouse_release + # TODO: Toggle interpolation line at mouse's position. Should this also have + # a def on_right_mouse_press and @right_captured_whatever? + end + def update_hover_highlight # Remove the hover highlight if there are no interactions for this control # or if the mouse is off-screen @@ -608,32 +723,54 @@ class UIControls::AnimationParticleList < UIControls::BaseControl # Update the current keyframe line's position refresh_position_line + if Input.release?(Input::MOUSERIGHT) + on_right_mouse_release + end + # TODO: This is testing code, and should be replaced by clicking on the - # timeline or a command sprite. Maybe keep it after all? - if Input.trigger?(Input::LEFT) + # timeline or a command sprite. Maybe keep it after all? If so, + # probably change left/right to <>, and also move the scrollbar(s) to + # keep the "cursor" on-screen. + if Input.repeat?(Input::LEFT) if @keyframe > 0 @keyframe -= 1 - echoln "keyframe = #{@keyframe}" set_changed end - elsif Input.trigger?(Input::RIGHT) - if @keyframe < @duration - DURATION_BUFFER + elsif Input.repeat?(Input::RIGHT) + if @keyframe < @duration - 1 @keyframe += 1 - echoln "keyframe = #{@keyframe}" set_changed end - elsif Input.trigger?(Input::UP) - if @particle_index > 0 - @particle_index -= 1 - echoln "particle_index = #{@particle_index}" - set_changed - end - elsif Input.trigger?(Input::DOWN) - if @particle_index < @particles.length - 1 - @particle_index += 1 - echoln "particle_index = #{@particle_index}" - set_changed + # TODO: If this is to be kept, @row_index should be changed by potentially + # more than 1, so that @particle_list[@row_index] is an integer and + # not an array. + # elsif Input.repeat?(Input::UP) + # if @row_index > 0 + # @row_index -= 1 + # set_changed + # end + # elsif Input.repeat?(Input::DOWN) + # if @row_index < @particles.length - 1 + # @row_index += 1 + # set_changed + # end + end + + # Mouse scroll wheel + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y + if @interactions[:list].contains?(mouse_x, mouse_y) || + @interactions[:commands].contains?(mouse_x, mouse_y) + wheel_v = Input.scroll_v + if wheel_v > 0 # Scroll up + @list_scrollbar.slider_top -= UIControls::Scrollbar::SCROLL_DISTANCE + self.top_pos = @list_scrollbar.position + elsif wheel_v < 0 # Scroll down + @list_scrollbar.slider_top += UIControls::Scrollbar::SCROLL_DISTANCE + self.top_pos = @list_scrollbar.position + end end end + end end diff --git a/Data/Scripts/910_New anim editor/012_play controls.rb b/Data/Scripts/910_New anim editor/012_play controls.rb new file mode 100644 index 000000000..14a73d602 --- /dev/null +++ b/Data/Scripts/910_New anim editor/012_play controls.rb @@ -0,0 +1,27 @@ +#=============================================================================== +# TODO +#=============================================================================== +class UIControls::AnimationPlayControls < UIControls::BaseControl + TEXT_OFFSET_Y = 5 + + def initialize(x, y, width, height, viewport) + super(width, height, viewport) + self.x = x + self.y = y + @duration = 0 + end + + def duration=(new_val) + return if @duration == new_val + @duration = new_val + refresh + end + + #----------------------------------------------------------------------------- + + def refresh + super + draw_text(self.bitmap, 12, TEXT_OFFSET_Y + 14, _INTL("Play controls not added yet!")) + draw_text(self.bitmap, width - 134, TEXT_OFFSET_Y, _INTL("Total length: {1}s", @duration / 20.0)) + end +end diff --git a/Data/Scripts/910_New anim editor/090 particle data helper.rb b/Data/Scripts/910_New anim editor/090 particle data helper.rb index f92e2fdb1..05e5a3e5d 100644 --- a/Data/Scripts/910_New anim editor/090 particle data helper.rb +++ b/Data/Scripts/910_New anim editor/090 particle data helper.rb @@ -6,7 +6,7 @@ module AnimationEditor::ParticleDataHelper particles.each do |p| p.each_pair do |cmd, val| next if !val.is_a?(Array) || val.length == 0 - max = val.last[0] + val.last[1] + max = val.last[0] + val.last[1] # Keyframe + duration ret = max if ret < max end end @@ -51,7 +51,6 @@ module AnimationEditor::ParticleDataHelper ret[0] = true if first_cmd >= 0 && first_cmd <= frame && (first_visible_cmd < 0 || frame < first_visible_cmd) end - echoln "here 2: #{ret}" return ret end @@ -63,6 +62,14 @@ module AnimationEditor::ParticleDataHelper return ret end + def get_all_particle_values(particle) + ret = {} + GameData::Animation::PARTICLE_DEFAULT_VALUES.each_pair do |prop, default| + ret[prop] = particle[prop] || default + end + return ret + end + # TODO: Generalise this to any property? # NOTE: Particles are assumed to be not visible at the start of the # animation, and automatically become visible when the particle has @@ -75,7 +82,7 @@ module AnimationEditor::ParticleDataHelper property, particle[:name]) end value = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[:visible] - value = true if ["User", "Target"].include?(particle[:name]) + value = true if ["User", "Target", "SE"].include?(particle[:name]) ret = [] if particle[:visible] particle[:visible].each { |cmd| ret[cmd[0]] = cmd[2] } @@ -112,8 +119,13 @@ module AnimationEditor::ParticleDataHelper # 0 - SetXYZ # [+/- duration, interpolation type] --- MoveXYZ (duration's sign is whether # it makes the value higher or lower) - def get_particle_property_commands_timeline(commands, property) + def get_particle_property_commands_timeline(particle, commands, property) return nil if !commands || commands.length == 0 + if particle[:name] == "SE" + ret = [] + commands.each { |cmd| ret[cmd[0]] = 0 } + return ret + end if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) raise _INTL("No default value for property {1} in PARTICLE_KEYFRAME_DEFAULT_VALUES.", property) end @@ -134,4 +146,66 @@ module AnimationEditor::ParticleDataHelper return ret end + #----------------------------------------------------------------------------- + + def set_property(particle, property, value) + particle[property] = value + end + + def add_command(particle, property, frame, value) + # Split particle[property] into values and interpolation arrays + set_points = [] # All SetXYZ commands (the values thereof) + end_points = [] # End points of MoveXYZ commands (the values thereof) + interps = [] # Interpolation type from a keyframe to the next point + if particle && particle[property] + particle[property].each do |cmd| + if cmd[1] == 0 # SetXYZ + set_points[cmd[0]] = cmd[2] + else + interps[cmd[0]] = cmd[3] || :linear + end_points[cmd[0] + cmd[1]] = cmd[2] + end + end + end + # Add new command to points (may replace an existing command) + interp = :none + (frame + 1).times do |i| + interp = :none if set_points[i] || end_points[i] + interp = interps[i] if interps[i] + end + interps[frame] = interp if interp != :none + set_points[frame] = value + # Convert points and interps back into particle[property] + ret = [] + if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) + raise _INTL("Couldn't get default value for property {1}.", property) + end + val = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[property] + val = true if property == :visible && ["User", "Target", "SE"].include?(particle[:name]) + length = [set_points.length, end_points.length].max + length.times do |i| + if !set_points[i].nil? && set_points[i] != val + ret.push([i, 0, set_points[i]]) + val = set_points[i] + end + if interps[i] && interps[i] != :none + ((i + 1)..length).each do |j| + next if set_points[j].nil? && end_points[j].nil? + if set_points[j].nil? + break if end_points[j] == val + ret.push([i, j - i, end_points[j], interps[i]]) + val = end_points[j] + end_points[j] = nil + else + break if set_points[j] == val + ret.push([i, j - i, set_points[j], interps[i]]) + val = set_points[j] + set_points[j] = nil + end + break + end + end + end + return (ret.empty?) ? nil : ret + end end From 64890f3c9ecf775d9213f0b5ee5676ee6e4536db Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 23 Oct 2023 23:44:34 +0100 Subject: [PATCH 08/49] Rearranged and renamed Animation Editor-related script files --- .../001_UIControls.rb} | 0 .../002_ControlsContainer.rb} | 16 +++--- .../Control elements/001_BaseControl.rb} | 0 .../Control elements/002_Label.rb} | 0 .../Control elements/003_Checkbox.rb} | 0 .../Control elements/004_TextBox.rb} | 0 .../Control elements/005_NumberSlider.rb} | 2 +- .../Control elements/006_NumberTextBox.rb} | 2 +- .../Control elements/007_Button.rb} | 0 .../Control elements/008_List.rb} | 36 ++++++------- .../Control elements/009_DropdownList.rb} | 0 .../Control elements/101_Scrollbar.rb} | 0 Data/Scripts/900_New utilities/anim debug.rb | 8 --- .../001_Anim utilities.rb} | 0 .../001_Animation.rb} | 0 .../001_Anim compiler.rb} | 0 .../002_Anim writer.rb} | 13 +++++ .../001_AnimationEditor.rb} | 50 ++++++++++--------- .../010_AnimationSelector.rb} | 48 ++++++++---------- .../901_ParticleDataHelper.rb} | 5 +- .../Anim Editor elements/001_Canvas.rb | 43 ++++++++++++++++ .../Anim Editor elements/002_PlayControls.rb} | 2 +- .../Anim Editor elements/003_ParticleList.rb} | 2 +- 23 files changed, 136 insertions(+), 91 deletions(-) rename Data/Scripts/{905_New controls/000 UIControls.rb => 801_UI controls/001_UIControls.rb} (100%) rename Data/Scripts/{906_New controls container/001 controls container.rb => 801_UI controls/002_ControlsContainer.rb} (88%) rename Data/Scripts/{905_New controls/001 basic control.rb => 801_UI controls/Control elements/001_BaseControl.rb} (100%) rename Data/Scripts/{905_New controls/002 label.rb => 801_UI controls/Control elements/002_Label.rb} (100%) rename Data/Scripts/{905_New controls/003 checkbox.rb => 801_UI controls/Control elements/003_Checkbox.rb} (100%) rename Data/Scripts/{905_New controls/004 text box.rb => 801_UI controls/Control elements/004_TextBox.rb} (100%) rename Data/Scripts/{905_New controls/005 number slider.rb => 801_UI controls/Control elements/005_NumberSlider.rb} (98%) rename Data/Scripts/{905_New controls/006 value box.rb => 801_UI controls/Control elements/006_NumberTextBox.rb} (98%) rename Data/Scripts/{905_New controls/007 button.rb => 801_UI controls/Control elements/007_Button.rb} (100%) rename Data/Scripts/{905_New controls/008_list.rb => 801_UI controls/Control elements/008_List.rb} (85%) rename Data/Scripts/{905_New controls/009 dropdown list.rb => 801_UI controls/Control elements/009_DropdownList.rb} (100%) rename Data/Scripts/{905_New controls/101_scrollbar.rb => 801_UI controls/Control elements/101_Scrollbar.rb} (100%) delete mode 100644 Data/Scripts/900_New utilities/anim debug.rb rename Data/Scripts/{900_New utilities/001 utilities.rb => 901_Anim utilities/001_Anim utilities.rb} (100%) rename Data/Scripts/{901_GameData/Animation.rb => 902_Anim GameData/001_Animation.rb} (100%) rename Data/Scripts/{902_Anim compiler/anim pbs compiler.rb => 903_Anim Compiler/001_Anim compiler.rb} (100%) rename Data/Scripts/{902_Anim compiler/anim pbs writer.rb => 903_Anim Compiler/002_Anim writer.rb} (88%) rename Data/Scripts/{910_New anim editor/010 editor scene.rb => 904_Anim Editor/001_AnimationEditor.rb} (92%) rename Data/Scripts/{910_New anim editor/001_anim selection.rb => 904_Anim Editor/010_AnimationSelector.rb} (83%) rename Data/Scripts/{910_New anim editor/090 particle data helper.rb => 904_Anim Editor/901_ParticleDataHelper.rb} (97%) create mode 100644 Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb rename Data/Scripts/{910_New anim editor/012_play controls.rb => 904_Anim Editor/Anim Editor elements/002_PlayControls.rb} (91%) rename Data/Scripts/{910_New anim editor/011_particle list.rb => 904_Anim Editor/Anim Editor elements/003_ParticleList.rb} (99%) diff --git a/Data/Scripts/905_New controls/000 UIControls.rb b/Data/Scripts/801_UI controls/001_UIControls.rb similarity index 100% rename from Data/Scripts/905_New controls/000 UIControls.rb rename to Data/Scripts/801_UI controls/001_UIControls.rb diff --git a/Data/Scripts/906_New controls container/001 controls container.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb similarity index 88% rename from Data/Scripts/906_New controls container/001 controls container.rb rename to Data/Scripts/801_UI controls/002_ControlsContainer.rb index bd66060c4..734b2d136 100644 --- a/Data/Scripts/906_New controls container/001 controls container.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -95,22 +95,22 @@ class UIControls::ControlsContainer add_text_box(id, value, true) end - def add_slider(id, min_value, max_value, value, has_label = false) - add_control(id, UIControls::Slider.new(*control_size(has_label), @viewport, min_value, max_value, value), has_label) + def add_number_slider(id, min_value, max_value, value, has_label = false) + add_control(id, UIControls::NumberSlider.new(*control_size(has_label), @viewport, min_value, max_value, value), has_label) end - def add_labelled_slider(id, label, min_value, max_value, value) + def add_labelled_number_slider(id, label, min_value, max_value, value) add_label(id, label) - add_slider(id, min_value, max_value, value, true) + add_number_slider(id, min_value, max_value, value, true) end - def add_value_box(id, min_value, max_value, value, has_label = false) - add_control(id, UIControls::ValueBox.new(*control_size(has_label), @viewport, min_value, max_value, value), has_label) + def add_number_text_box(id, min_value, max_value, value, has_label = false) + add_control(id, UIControls::NumberTextBox.new(*control_size(has_label), @viewport, min_value, max_value, value), has_label) end - def add_labelled_value_box(id, label, min_value, max_value, value) + def add_labelled_number_text_box(id, label, min_value, max_value, value) add_label(id, label) - add_value_box(id, min_value, max_value, value, true) + add_number_text_box(id, min_value, max_value, value, true) end def add_button(id, button_text, has_label = false) diff --git a/Data/Scripts/905_New controls/001 basic control.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb similarity index 100% rename from Data/Scripts/905_New controls/001 basic control.rb rename to Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb diff --git a/Data/Scripts/905_New controls/002 label.rb b/Data/Scripts/801_UI controls/Control elements/002_Label.rb similarity index 100% rename from Data/Scripts/905_New controls/002 label.rb rename to Data/Scripts/801_UI controls/Control elements/002_Label.rb diff --git a/Data/Scripts/905_New controls/003 checkbox.rb b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb similarity index 100% rename from Data/Scripts/905_New controls/003 checkbox.rb rename to Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb diff --git a/Data/Scripts/905_New controls/004 text box.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb similarity index 100% rename from Data/Scripts/905_New controls/004 text box.rb rename to Data/Scripts/801_UI controls/Control elements/004_TextBox.rb diff --git a/Data/Scripts/905_New controls/005 number slider.rb b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb similarity index 98% rename from Data/Scripts/905_New controls/005 number slider.rb rename to Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb index 35c8db6d8..69899d87f 100644 --- a/Data/Scripts/905_New controls/005 number slider.rb +++ b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb @@ -1,7 +1,7 @@ #=============================================================================== # #=============================================================================== -class UIControls::Slider < UIControls::BaseControl +class UIControls::NumberSlider < UIControls::BaseControl attr_reader :min_value attr_reader :max_value diff --git a/Data/Scripts/905_New controls/006 value box.rb b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb similarity index 98% rename from Data/Scripts/905_New controls/006 value box.rb rename to Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb index 1742a7e32..54a0895c2 100644 --- a/Data/Scripts/905_New controls/006 value box.rb +++ b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb @@ -1,7 +1,7 @@ #=============================================================================== # #=============================================================================== -class UIControls::ValueBox < UIControls::TextBox +class UIControls::NumberTextBox < UIControls::TextBox attr_reader :min_value attr_reader :max_value diff --git a/Data/Scripts/905_New controls/007 button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb similarity index 100% rename from Data/Scripts/905_New controls/007 button.rb rename to Data/Scripts/801_UI controls/Control elements/007_Button.rb diff --git a/Data/Scripts/905_New controls/008_list.rb b/Data/Scripts/801_UI controls/Control elements/008_List.rb similarity index 85% rename from Data/Scripts/905_New controls/008_list.rb rename to Data/Scripts/801_UI controls/Control elements/008_List.rb index 4500cbd69..fd2529cbe 100644 --- a/Data/Scripts/905_New controls/008_list.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_List.rb @@ -17,10 +17,10 @@ class UIControls::List < UIControls::BaseControl def initialize(width, height, viewport, values = []) super(width, height, viewport) - @slider = UIControls::Scrollbar.new(LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH, LIST_Y, height, viewport) - @slider.set_interactive_rects - @slider.range = ROW_HEIGHT - @slider.z = self.z + 1 + @scrollbar = UIControls::Scrollbar.new(LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH, LIST_Y, height, viewport) + @scrollbar.set_interactive_rects + @scrollbar.range = ROW_HEIGHT + @scrollbar.z = self.z + 1 @rows_count = (height / ROW_HEIGHT).floor # Number of rows visible at once @top_row = 0 @selected = -1 @@ -28,28 +28,28 @@ class UIControls::List < UIControls::BaseControl end def dispose - @slider.dispose - @slider = nil + @scrollbar.dispose + @scrollbar = nil super end def x=(new_val) super(new_val) - @slider.x = new_val + LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH + @scrollbar.x = new_val + LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH end def y=(new_val) super(new_val) - @slider.y = new_val + LIST_Y + @scrollbar.y = new_val + LIST_Y end # Each value in @values is an array: [id, text]. def values=(new_vals) @values = new_vals set_interactive_rects - @slider.range = @values.length * ROW_HEIGHT - if @slider.visible - self.top_row = (@slider.position.to_f / ROW_HEIGHT).round + @scrollbar.range = @values.length * ROW_HEIGHT + if @scrollbar.visible + self.top_row = (@scrollbar.position.to_f / ROW_HEIGHT).round else self.top_row = 0 end @@ -60,7 +60,7 @@ class UIControls::List < UIControls::BaseControl def top_row=(val) old_val = @top_row @top_row = val - if @slider.visible + if @scrollbar.visible @top_row = @top_row.clamp(0, @values.length - @rows_count) else @top_row = 0 @@ -110,7 +110,7 @@ class UIControls::List < UIControls::BaseControl end def repaint - @slider.repaint if @slider.invalid? + @scrollbar.repaint if @scrollbar.invalid? super if invalid? end @@ -140,7 +140,7 @@ class UIControls::List < UIControls::BaseControl @captured_area = nil mouse_x, mouse_y = mouse_pos return if !mouse_x || !mouse_y - return if @slider.visible && (@slider.busy? || mouse_x >= @slider.x - self.x) + return if @scrollbar.visible && (@scrollbar.busy? || mouse_x >= @scrollbar.x - self.x) # Check for mouse presses on rows mouse_y += @top_row * ROW_HEIGHT @interactions.each_pair do |area, rect| @@ -168,7 +168,7 @@ class UIControls::List < UIControls::BaseControl return end # Don't update the highlight if the mouse is using the scrollbar - if @slider.visible && (@slider.busy? || mouse_x >= @slider.x - self.x) + if @scrollbar.visible && (@scrollbar.busy? || mouse_x >= @scrollbar.x - self.x) invalidate if @hover_area @hover_area = nil return @@ -193,12 +193,12 @@ class UIControls::List < UIControls::BaseControl def update return if !self.visible - @slider.update + @scrollbar.update super # TODO: Disabled control stuff. # return if self.disabled - # Refresh the list's position if changed by moving the slider - self.top_row = (@slider.position.to_f / ROW_HEIGHT).round + # Refresh the list's position if changed by moving the scrollbar + self.top_row = (@scrollbar.position.to_f / ROW_HEIGHT).round # Set the selected row to the row the mouse is over, if clicked on if @captured_area @selected = @hover_area if @hover_area.is_a?(Integer) diff --git a/Data/Scripts/905_New controls/009 dropdown list.rb b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb similarity index 100% rename from Data/Scripts/905_New controls/009 dropdown list.rb rename to Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb diff --git a/Data/Scripts/905_New controls/101_scrollbar.rb b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb similarity index 100% rename from Data/Scripts/905_New controls/101_scrollbar.rb rename to Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb diff --git a/Data/Scripts/900_New utilities/anim debug.rb b/Data/Scripts/900_New utilities/anim debug.rb deleted file mode 100644 index 9d5f507fa..000000000 --- a/Data/Scripts/900_New utilities/anim debug.rb +++ /dev/null @@ -1,8 +0,0 @@ -MenuHandlers.add(:debug_menu, :create_animation_pbs_files, { - "name" => _INTL("Write all animation PBS files"), - "parent" => :files_menu, - "description" => _INTL("Write all animation PBS files."), - "effect" => proc { - Compiler.write_all_battle_animations - } -}) diff --git a/Data/Scripts/900_New utilities/001 utilities.rb b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb similarity index 100% rename from Data/Scripts/900_New utilities/001 utilities.rb rename to Data/Scripts/901_Anim utilities/001_Anim utilities.rb diff --git a/Data/Scripts/901_GameData/Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb similarity index 100% rename from Data/Scripts/901_GameData/Animation.rb rename to Data/Scripts/902_Anim GameData/001_Animation.rb diff --git a/Data/Scripts/902_Anim compiler/anim pbs compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb similarity index 100% rename from Data/Scripts/902_Anim compiler/anim pbs compiler.rb rename to Data/Scripts/903_Anim Compiler/001_Anim compiler.rb diff --git a/Data/Scripts/902_Anim compiler/anim pbs writer.rb b/Data/Scripts/903_Anim Compiler/002_Anim writer.rb similarity index 88% rename from Data/Scripts/902_Anim compiler/anim pbs writer.rb rename to Data/Scripts/903_Anim Compiler/002_Anim writer.rb index 56d10521a..263c616ac 100644 --- a/Data/Scripts/902_Anim compiler/anim pbs writer.rb +++ b/Data/Scripts/903_Anim Compiler/002_Anim writer.rb @@ -120,3 +120,16 @@ module Compiler Console.echo_h2(_INTL("Successfully rewrote all animation PBS files"), text: :green) end end + +#=============================================================================== +# Debug menu function for writing all animation PBS files. Shouldn't need to be +# used, but it's here if you want it. +#=============================================================================== +MenuHandlers.add(:debug_menu, :create_animation_pbs_files, { + "name" => _INTL("Write all animation PBS files"), + "parent" => :files_menu, + "description" => _INTL("Write all animation PBS files."), + "effect" => proc { + Compiler.write_all_battle_animations + } +}) diff --git a/Data/Scripts/910_New anim editor/010 editor scene.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb similarity index 92% rename from Data/Scripts/910_New anim editor/010 editor scene.rb rename to Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 18cd396ae..505f8dff3 100644 --- a/Data/Scripts/910_New anim editor/010 editor scene.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -22,8 +22,8 @@ # while it's playing. #=============================================================================== class AnimationEditor - WINDOW_WIDTH = AnimationEditorLoadScreen::WINDOW_WIDTH - WINDOW_HEIGHT = AnimationEditorLoadScreen::WINDOW_HEIGHT + WINDOW_WIDTH = Settings::SCREEN_WIDTH + (32 * 10) + WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + (32 * 10) TOP_BAR_HEIGHT = 30 @@ -51,42 +51,39 @@ class AnimationEditor def initialize(anim_id, anim) @anim_id = anim_id @anim = anim + # Viewports @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @viewport.z = 99999 + @canvas_viewport = Viewport.new(CANVAS_X, CANVAS_Y, CANVAS_WIDTH, CANVAS_HEIGHT) + @canvas_viewport.z = @viewport.z + # Background sprite @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) draw_editor_background # Canvas - @canvas = Sprite.new(@viewport) - @canvas.x = CANVAS_X - @canvas.y = CANVAS_Y - @canvas.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", "field_bg") + @canvas = AnimationEditor::Canvas.new(@canvas_viewport) + # Play controls + @play_controls = AnimationEditor::PlayControls.new( + PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, @viewport + ) # Side panes @commands_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) - @se_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + @se_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) @particle_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) @keyframe_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) # TODO: Make more side panes for: - # - colour/tone editor (accessed from commands_pane via a + # - colour/tone editor (accessed from @commands_pane via a # button; has Apply/Cancel buttons to only apply all its values at # the end of editing them, although canvas will be updated in real # time to show the changes) - # - particle properties (that don't change during the animation; name, - # focus...) - # - SE particle properties (depends on keyframe) # - effects particle properties (depends on keyframe; for screen # shake, etc.) - # - keyframe properties (shift all later particle commands forward/ - # backward). - # Play controls - @play_controls = UIControls::AnimationPlayControls.new( - PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, @viewport - ) # Timeline/particle list - @particle_list = UIControls::AnimationParticleList.new( + @particle_list = AnimationEditor::ParticleList.new( PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport ) @particle_list.set_interactive_rects @captured = nil + set_canvas_contents set_side_panes_contents set_particle_list_contents set_play_controls_contents @@ -103,6 +100,7 @@ class AnimationEditor @play_controls.dispose @particle_list.dispose @viewport.dispose + @canvas_viewport.dispose end def keyframe @@ -115,18 +113,22 @@ class AnimationEditor #----------------------------------------------------------------------------- + def set_canvas_contents + @canvas.bg_name = "indoor1" + end + def set_commands_pane_contents # :frame (related to graphic) - If the graphic is user's sprite/target's # sprite, make this instead a choice of front/back/same as the main sprite/ # opposite of the main sprite. Probably need two controls in the same space # and refresh_commands_pane makes the appropriate one visible. - @commands_pane.add_labelled_value_box(:x, _INTL("X"), -128, CANVAS_WIDTH + 128, 64) - @commands_pane.add_labelled_value_box(:y, _INTL("Y"), -128, CANVAS_HEIGHT + 128, 96) + @commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -128, CANVAS_WIDTH + 128, 64) + @commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -128, CANVAS_HEIGHT + 128, 96) @commands_pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) - @commands_pane.add_labelled_slider(:opacity, _INTL("Opacity"), 0, 255, 255) - @commands_pane.add_labelled_value_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) - @commands_pane.add_labelled_value_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) - @commands_pane.add_labelled_value_box(:angle, _INTL("Angle"), -1080, 1080, 0) + @commands_pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) + @commands_pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) + @commands_pane.add_labelled_number_text_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) + @commands_pane.add_labelled_number_text_box(:angle, _INTL("Angle"), -1080, 1080, 0) @commands_pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) @commands_pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { 0 => _INTL("None"), diff --git a/Data/Scripts/910_New anim editor/001_anim selection.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb similarity index 83% rename from Data/Scripts/910_New anim editor/001_anim selection.rb rename to Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 789a19ffc..f4c0e86b3 100644 --- a/Data/Scripts/910_New anim editor/001_anim selection.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -1,13 +1,11 @@ -# TODO: Come up with a better name for this class. I'm not sure I want to merge -# this class with the editor class. -class AnimationEditorLoadScreen - WINDOW_WIDTH = Settings::SCREEN_WIDTH + (32 * 10) - WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + (32 * 10) - +#=============================================================================== +# +#=============================================================================== +class AnimationEditor::AnimationSelector ANIMATIONS_LIST_X = 4 ANIMATIONS_LIST_Y = 4 ANIMATIONS_LIST_WIDTH = 300 - ANIMATIONS_LIST_HEIGHT = WINDOW_HEIGHT - (ANIMATIONS_LIST_Y * 2) + ANIMATIONS_LIST_HEIGHT = AnimationEditor::WINDOW_HEIGHT - (ANIMATIONS_LIST_Y * 2) LOAD_BUTTON_WIDTH = 200 LOAD_BUTTON_HEIGHT = 48 @@ -16,9 +14,9 @@ class AnimationEditorLoadScreen def initialize generate_list - @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) + @viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) @viewport.z = 99999 - @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) + @screen_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @viewport) draw_editor_background @load_animation_id = nil create_controls @@ -45,7 +43,7 @@ class AnimationEditorLoadScreen end @animations.push([id, name]) end - # TODO: For slider testing purposes. + # TODO: For scrollbar testing purposes. rand(400).times do |i| @animations.push([42 + i, "Extra animation #{i + 1}"]) end @@ -53,7 +51,7 @@ class AnimationEditorLoadScreen def draw_editor_background # Fill the whole screen with white - @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.black) + @screen_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.black) # Outline around animations list areas = [ [ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y, ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT], @@ -138,6 +136,7 @@ class AnimationEditorLoadScreen screen = AnimationEditor.new(@load_animation_id, GameData::Animation.get(@load_animation_id).clone_as_hash) screen.run @load_animation_id = nil + break # TODO: For quickstart testing purposes. # Refresh list of animations, in case the edited one changed its type, # move, version or name generate_list @@ -155,26 +154,19 @@ class AnimationEditorLoadScreen end #=============================================================================== -# Start -#=============================================================================== -def test_anim_editor - Graphics.resize_screen(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) - pbSetResizeFactor(1) - screen = AnimationEditorLoadScreen.new - screen.run - Graphics.resize_screen(Settings::SCREEN_WIDTH, Settings::SCREEN_HEIGHT) - pbSetResizeFactor($PokemonSystem.screensize) - $game_map&.autoplay -end - -#=============================================================================== -# Add to Debug menu +# Add to Debug menu. #=============================================================================== MenuHandlers.add(:debug_menu, :use_pc, { - "name" => "Test new animation editor", + "name" => _INTL("New Animation Editor"), "parent" => :main, - "description" => "Test new animation editor", + "description" => _INTL("Open the new animation editor."), "effect" => proc { - test_anim_editor + Graphics.resize_screen(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) + pbSetResizeFactor(1) + screen = AnimationEditor::AnimationSelector.new + screen.run + Graphics.resize_screen(Settings::SCREEN_WIDTH, Settings::SCREEN_HEIGHT) + pbSetResizeFactor($PokemonSystem.screensize) + $game_map&.autoplay } }) diff --git a/Data/Scripts/910_New anim editor/090 particle data helper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb similarity index 97% rename from Data/Scripts/910_New anim editor/090 particle data helper.rb rename to Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 05e5a3e5d..4dfbccc69 100644 --- a/Data/Scripts/910_New anim editor/090 particle data helper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -1,3 +1,6 @@ +#=============================================================================== +# +#=============================================================================== module AnimationEditor::ParticleDataHelper module_function @@ -97,7 +100,7 @@ module AnimationEditor::ParticleDataHelper #----------------------------------------------------------------------------- # Returns an array indicating where command diamonds and duration lines should - # be drawn in the AnimationParticleList. + # be drawn in the AnimationEditor::ParticleList. def get_particle_commands_timeline(particle) ret = [] durations = [] diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb new file mode 100644 index 000000000..53a36d523 --- /dev/null +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -0,0 +1,43 @@ +#=============================================================================== +# TODO +#=============================================================================== +class AnimationEditor::Canvas < Sprite + attr_reader :bg_name + + def initialize(viewport) + super + @bg_val = "" + # TODO: Add a second bg sprite for screen shake purposes. + player_base_pos = Battle::Scene.pbBattlerPosition(0) + @player_base = IconSprite.new(*player_base_pos, viewport) + @player_base.z = 1 + foe_base_pos = Battle::Scene.pbBattlerPosition(1) + @foe_base = IconSprite.new(*foe_base_pos, viewport) + @foe_base.z = 1 + @message_bar_sprite = Sprite.new(viewport) + @message_bar_sprite.z = 999 + end + + def dispose + @message_bar_sprite.dispose + @player_base.dispose + @foe_base.dispose + super + end + + def bg_name=(val) + return if @bg_name == val + @bg_name = val + # TODO: Come up with a better way to define the base filenames, based on + # which files actually exist. + self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_bg") + @player_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") + @player_base.ox = @player_base.bitmap.width / 2 + @player_base.oy = @player_base.bitmap.height + @foe_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base1") + @foe_base.ox = @foe_base.bitmap.width / 2 + @foe_base.oy = @foe_base.bitmap.height / 2 + @message_bar_sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_message") + @message_bar_sprite.y = Settings::SCREEN_HEIGHT - @message_bar_sprite.height + end +end diff --git a/Data/Scripts/910_New anim editor/012_play controls.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb similarity index 91% rename from Data/Scripts/910_New anim editor/012_play controls.rb rename to Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb index 14a73d602..b308aeac8 100644 --- a/Data/Scripts/910_New anim editor/012_play controls.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb @@ -1,7 +1,7 @@ #=============================================================================== # TODO #=============================================================================== -class UIControls::AnimationPlayControls < UIControls::BaseControl +class AnimationEditor::PlayControls < UIControls::BaseControl TEXT_OFFSET_Y = 5 def initialize(x, y, width, height, viewport) diff --git a/Data/Scripts/910_New anim editor/011_particle list.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb similarity index 99% rename from Data/Scripts/910_New anim editor/011_particle list.rb rename to Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index d5ad0a69e..c33b1baf8 100644 --- a/Data/Scripts/910_New anim editor/011_particle list.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -4,7 +4,7 @@ # scrollbar works, i.e. every visible @commands_sprites isn't redrawn each # time the horizontal scrollbar changes. #=============================================================================== -class UIControls::AnimationParticleList < UIControls::BaseControl +class AnimationEditor::ParticleList < UIControls::BaseControl VIEWPORT_SPACING = 1 TIMELINE_HEIGHT = 24 - VIEWPORT_SPACING LIST_X = 0 From ab2d2c135664072de96dd6cd1fa2b3a69dd578c6 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 4 Nov 2023 23:12:25 +0000 Subject: [PATCH 09/49] Added header variant of Label control, makde DropdownList control --- .../801_UI controls/002_ControlsContainer.rb | 6 + .../Control elements/001_BaseControl.rb | 10 ++ .../Control elements/002_Label.rb | 14 +- .../Control elements/004_TextBox.rb | 2 + .../Control elements/007_Button.rb | 2 +- .../Control elements/008_List.rb | 29 +++- .../Control elements/009_DropdownList.rb | 140 +++++++++++++++++- .../902_Anim GameData/001_Animation.rb | 2 + .../903_Anim Compiler/001_Anim compiler.rb | 2 - .../904_Anim Editor/001_AnimationEditor.rb | 7 +- .../904_Anim Editor/010_AnimationSelector.rb | 4 +- .../Anim Editor elements/003_ParticleList.rb | 1 + 12 files changed, 209 insertions(+), 10 deletions(-) diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index 734b2d136..ea730223d 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -77,6 +77,12 @@ class UIControls::ControlsContainer add_control(id, UIControls::Label.new(*control_size(has_label), @viewport, label), has_label) end + def add_header_label(id, label) + ctrl = UIControls::Label.new(*control_size, @viewport, label) + ctrl.header = true + add_control(id, ctrl) + end + def add_checkbox(id, value, has_label = false) add_control(id, UIControls::Checkbox.new(*control_size(has_label), @viewport, value), has_label) end diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index 9a4e49736..e70b0f747 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -46,6 +46,16 @@ class UIControls::BaseControl < BitmapSprite @interactions = {} end + def mouse_in_control? + return false if !@interactions || @interactions.empty? + mouse_x, mouse_y = mouse_pos + return false if !mouse_x || !mouse_y + @interactions.each_pair do |area, rect| + return true if rect.contains?(mouse_x, mouse_y) + end + return false + end + #----------------------------------------------------------------------------- def invalid? diff --git a/Data/Scripts/801_UI controls/Control elements/002_Label.rb b/Data/Scripts/801_UI controls/Control elements/002_Label.rb index d306ec532..2dd898ab9 100644 --- a/Data/Scripts/801_UI controls/Control elements/002_Label.rb +++ b/Data/Scripts/801_UI controls/Control elements/002_Label.rb @@ -10,6 +10,7 @@ class UIControls::Label < UIControls::BaseControl def initialize(width, height, viewport, label) super(width, height, viewport) @label = label + @header = false end def label=(value) @@ -17,8 +18,19 @@ class UIControls::Label < UIControls::BaseControl refresh end + def header=(val) + @header = val + refresh + end + def refresh super - draw_text(self.bitmap, 4, TEXT_OFFSET_Y, @label) + if @header + draw_text_centered(self.bitmap, 0, TEXT_OFFSET_Y, width, @label) + text_size = self.bitmap.text_size(@label) + self.bitmap.fill_rect((width - text_size.width) / 2, TEXT_OFFSET_Y + text_size.height, text_size.width, 1, TEXT_COLOR) + else + draw_text(self.bitmap, 4, TEXT_OFFSET_Y, @label) + end end end diff --git a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb index da5dd9539..72cb56e51 100644 --- a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb @@ -4,6 +4,8 @@ # decide which characters are selected. Maybe? Note that this method # is only triggered upon the initial mouse press, and isn't repeated # while it's still held down. +# TODO: Add a blacklist array. Can't type in any values in this array. Disable +# this control if @value is in this array. #=============================================================================== class UIControls::TextBox < UIControls::BaseControl TEXT_BOX_X = 2 diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index c6882ac0c..19bfa66de 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -66,7 +66,7 @@ class UIControls::Button < UIControls::BaseControl # Change this control's value if @captured_area == :button mouse_x, mouse_y = mouse_pos - if mouse_x && mouse_y && @interactions[@captured_area].contains?(mouse_x, mouse_y) + if mouse_x && mouse_y && @interactions[@captured_area].contains?(mouse_x, mouse_y) set_changed end end diff --git a/Data/Scripts/801_UI controls/Control elements/008_List.rb b/Data/Scripts/801_UI controls/Control elements/008_List.rb index fd2529cbe..beca0fa3d 100644 --- a/Data/Scripts/801_UI controls/Control elements/008_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_List.rb @@ -43,6 +43,11 @@ class UIControls::List < UIControls::BaseControl @scrollbar.y = new_val + LIST_Y end + def z=(new_val) + super(new_val) + @scrollbar.z = new_val + 1 + end + # Each value in @values is an array: [id, text]. def values=(new_vals) @values = new_vals @@ -77,7 +82,18 @@ class UIControls::List < UIControls::BaseControl # Returns the ID of the selected row. def value return nil if @selected < 0 - return @values[@selected][0] + if @values.is_a?(Array) + return (@values[@selected].is_a?(Array)) ? @values[@selected][0] : @selected + elsif @values.is_a?(Hash) + return @values.keys[@selected] + end + return nil + end + + def mouse_in_control? + return true if super + return true if @scrollbar.mouse_in_control? + return false end def set_interactive_rects @@ -202,6 +218,17 @@ class UIControls::List < UIControls::BaseControl # Set the selected row to the row the mouse is over, if clicked on if @captured_area @selected = @hover_area if @hover_area.is_a?(Integer) + elsif @hover_area + wheel_v = Input.scroll_v + if wheel_v > 0 # Scroll up + @scrollbar.slider_top -= UIControls::Scrollbar::SCROLL_DISTANCE + elsif wheel_v < 0 # Scroll down + @scrollbar.slider_top += UIControls::Scrollbar::SCROLL_DISTANCE + end + if wheel_v != 0 + self.top_row = (@scrollbar.position.to_f / ROW_HEIGHT).round + update_hover_highlight + end end end end diff --git a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb index f3c12db67..a1f2331a4 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb @@ -1,9 +1,147 @@ #=============================================================================== -# TODO +# #=============================================================================== class UIControls::DropdownList < UIControls::BaseControl + TEXT_BOX_X = 2 + TEXT_BOX_WIDTH = 172 + TEXT_BOX_HEIGHT = 24 + TEXT_BOX_PADDING = 4 # Gap between sides of text box and text + TEXT_OFFSET_Y = 5 + MAX_LIST_ROWS = 8 + def initialize(width, height, viewport, options, value) # NOTE: options is a hash: keys are symbols, values are display names. super(width, height, viewport) + @options = options + @value = value + @toggling_dropdown_list = false + end + + def dispose + remove_dropdown_menu + super + end + + def value=(new_value) + return if @value == new_value + @value = new_value + invalidate + end + + def set_interactive_rects + @button_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, + [TEXT_BOX_WIDTH, width].min, TEXT_BOX_HEIGHT) + @interactions = { + :button => @button_rect + } + end + + #----------------------------------------------------------------------------- + + def busy? + return true if @dropdown_menu || @toggling_dropdown_list + return super + end + + #----------------------------------------------------------------------------- + + def make_dropdown_menu + menu_height = UIControls::List::ROW_HEIGHT * [@options.length, MAX_LIST_ROWS].min + # Draw menu's background + @dropdown_menu_bg = BitmapSprite.new(@button_rect.width, menu_height + 4, self.viewport) + @dropdown_menu_bg.x = self.x + @button_rect.x + @dropdown_menu_bg.y = self.y + @button_rect.y + @button_rect.height + @dropdown_menu_bg.z = self.z + 1 + @dropdown_menu_bg.bitmap.outline_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.black) + @dropdown_menu_bg.bitmap.fill_rect(1, 1, @dropdown_menu_bg.width - 2, @dropdown_menu_bg.height - 2, Color.white) + # Create menu + @dropdown_menu = UIControls::List.new(@button_rect.width - 4, menu_height, self.viewport, @options) + @dropdown_menu.x = @dropdown_menu_bg.x + 2 + @dropdown_menu.y = @dropdown_menu_bg.y + 2 + @dropdown_menu.z = self.z + 2 + @dropdown_menu.set_interactive_rects + @dropdown_menu.repaint + end + + def remove_dropdown_menu + @dropdown_menu_bg&.dispose + @dropdown_menu_bg = nil + @dropdown_menu&.dispose + @dropdown_menu = nil + @captured_area = nil + end + + #----------------------------------------------------------------------------- + + def draw_area_highlight + return if @captured_area == :button + super + end + + def refresh + @dropdown_menu&.refresh + super + # Draw button outline + self.bitmap.outline_rect(@button_rect.x, @button_rect.y, + @button_rect.width, @button_rect.height, + Color.black) + # Draw value + draw_text(self.bitmap, @button_rect.x + TEXT_BOX_PADDING, TEXT_OFFSET_Y, @options[@value] || "???") + # Draw down arrow + arrow_area_x = @button_rect.x + @button_rect.width - @button_rect.height + 1 + arrow_area_width = @button_rect.height - 2 + self.bitmap.fill_rect(arrow_area_x, @button_rect.y + 1, arrow_area_width, arrow_area_width, + (@hover_area && @captured_area != :button) ? HOVER_COLOR : Color.white) + 6.times do |i| + self.bitmap.fill_rect(arrow_area_x + (arrow_area_width / 2) - 5 + i, + @button_rect.y + (arrow_area_width / 2) - 1 + i, + 11 - (2 * i), 1, Color.black) + end + end + + #----------------------------------------------------------------------------- + + def on_mouse_press + if @dropdown_menu + if !@dropdown_menu.mouse_in_control? + remove_dropdown_menu + @toggling_dropdown_list = true + end + else + @captured_area = nil + super + if @captured_area == :button + make_dropdown_menu + @toggling_dropdown_list = true + end + end + end + + def on_mouse_release + return if !@captured_area && !@dropdown_menu && !@toggling_dropdown_list + if @toggling_dropdown_list + @toggling_dropdown_list = false + return + end + if @dropdown_menu + if @dropdown_menu.changed? + new_val = @dropdown_menu.value + if new_val && new_val != @value + @value = new_val + set_changed + end + remove_dropdown_menu + super # Make this control not busy again + elsif !@dropdown_menu.mouse_in_control? + remove_dropdown_menu + super # Make this control not busy again + end + end + end + + def update + @dropdown_menu&.update + @dropdown_menu&.repaint + super end end diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 52399a334..51c7ee917 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -34,6 +34,8 @@ module GameData # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage # animations start playing). "Flags" => [:flags, "*s"], + # TODO: If this is changed to be more than just a string, edit the + # compiler's current_particle definition accordingly. "Particle" => [:particles, "s"] # Is a subheader line like } # For individual particles. Any property whose schema begins with "^" can diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index e572de783..7f3e8ea8e 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -41,8 +41,6 @@ module Compiler # New subsection [particle_name] value = get_csv_record($~[1], schema["Particle"]) current_particle = { - # TODO: If "Particle" is changed to be more than just a single - # string, add more properties accordingly. :name => value } data_hash[schema["Particle"][0]].push(current_particle) diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 505f8dff3..84d6eb717 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -118,6 +118,7 @@ class AnimationEditor end def set_commands_pane_contents + @commands_pane.add_header_label(:header, _INTL("Edit particle at keyframe")) # :frame (related to graphic) - If the graphic is user's sprite/target's # sprite, make this instead a choice of front/back/same as the main sprite/ # opposite of the main sprite. Probably need two controls in the same space @@ -149,6 +150,7 @@ class AnimationEditor end def set_se_pane_contents + @se_pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) # TODO: A list containing all SE files that play this keyframe. Lists SE, # user cry and target cry. @se_pane.add_button(:add, _INTL("Add")) @@ -157,6 +159,7 @@ class AnimationEditor end def set_particle_pane_contents + @particle_pane.add_header_label(:header, _INTL("Edit particle properties")) # TODO: Name should blacklist certain names ("User", "Target", "SE") and # should be disabled if the value is one of those. @particle_pane.add_labelled_text_box(:name, _INTL("Name"), _INTL("Untitled")) @@ -178,7 +181,7 @@ class AnimationEditor end def set_keyframe_pane_contents - @keyframe_pane.add_label(:temp, _INTL("Keyframe pane")) + @keyframe_pane.add_header_label(:header, _INTL("Edit keyframe")) # TODO: Various command-shifting options. end @@ -267,7 +270,7 @@ class AnimationEditor next if !new_vals.include?(ctrl[0]) ctrl[1].value = new_vals[ctrl[0]] if ctrl[1].respond_to?("value=") end - # TODO: Disable the name and graphic controls for "User"/"Target". + # TODO: Disable the name, graphic and focus controls for "User"/"Target". end end diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index f4c0e86b3..7857dcfa4 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -131,12 +131,12 @@ class AnimationEditor::AnimationSelector Input.update update # Open editor with animation - @load_animation_id = 2 # TODO: For quickstart testing purposes. +# @load_animation_id = 2 # TODO: For quickstart testing purposes. if @load_animation_id screen = AnimationEditor.new(@load_animation_id, GameData::Animation.get(@load_animation_id).clone_as_hash) screen.run @load_animation_id = nil - break # TODO: For quickstart testing purposes. +# break # TODO: For quickstart testing purposes. # Refresh list of animations, in case the edited one changed its type, # move, version or name generate_list diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index c33b1baf8..e52791323 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -127,6 +127,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end def particle_index + return -1 if @row_index < 0 ret = @particle_list[@row_index] return (ret.is_a?(Array)) ? ret[0] : ret end From b54a96f23f6d3e30869a50cba0d4db03bb6ad0be Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 19 Nov 2023 22:13:47 +0000 Subject: [PATCH 10/49] Add menu bar to Animation Editor, some refactoring --- .../801_UI controls/002_ControlsContainer.rb | 8 +- .../Control elements/007_Button.rb | 7 + .../901_Anim utilities/001_Anim utilities.rb | 3 +- .../904_Anim Editor/001_AnimationEditor.rb | 581 ++++++++++-------- .../904_Anim Editor/010_AnimationSelector.rb | 4 +- .../Anim Editor elements/001_Canvas.rb | 18 + .../Anim Editor elements/003_ParticleList.rb | 41 +- .../Anim Editor elements/004_Menu bar.rb | 52 ++ 8 files changed, 421 insertions(+), 293 deletions(-) create mode 100644 Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index ea730223d..3a0e23b6b 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -1,7 +1,6 @@ #=============================================================================== -# Controls are arranged in a list in self's bitmap. Each control is given a -# "self's bitmap's width" x LINE_SPACING area of self's bitmap to draw itself -# in. +# Controls are arranged in a list in self's bitmap. Each control is given an +# area of size "self's bitmap's width" x LINE_SPACING to draw itself in. # TODO: The act of "capturing" a control makes other controls in this container # not update themselves, i.e. they won't colour themselves with a hover # highlight if the mouse happens to move over it while another control is @@ -143,6 +142,8 @@ class UIControls::ControlsContainer @controls.each { |ctrl| ctrl[1].repaint } end + def refresh; end + #----------------------------------------------------------------------------- def update @@ -187,6 +188,7 @@ class UIControls::ControlsContainer def add_control(id, control, add_offset = false) i = @controls.length control_y = (add_offset ? @row_count - 1 : @row_count) * LINE_SPACING + # TODO: I don't think I need @control_rects. @control_rects[i] = Rect.new(0, control_y, control.width, control.height) control.x = @control_rects[i].x + (add_offset ? OFFSET_FROM_LABEL_X : 0) control.y = @control_rects[i].y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index 19bfa66de..d25c13f7f 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -29,6 +29,13 @@ class UIControls::Button < UIControls::BaseControl } end + # TODO: This won't change the button's size. This is probably okay. + def set_text(val) + return if @text == val + @text = val + invalidate + end + def set_changed @value = true super diff --git a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb index f35d84f7f..86db9c772 100644 --- a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb +++ b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb @@ -13,7 +13,8 @@ class Bitmap end end - # TODO: Add more curve types once it's decided which ones they are. + # TODO: Add more curve types once it's decided which ones they are. See + # INTERPOLATION_TYPES. def draw_interpolation_line(x, y, width, height, gradient, type, color) case type when :linear diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 84d6eb717..cce53ec3d 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -1,14 +1,11 @@ # TODO: Should I split this code into visual and mechanical classes, a la the # other UI screens? #=============================================================================== -# TODO: Need a way to recognise when text is being input into something -# (Input.text_input) and disable all keyboard shortcuts if so. If only -# this class has keyboard shortcuts in it, then it should be okay already. # TODO: When creating a new particle, blacklist the names "User", "Target" and # "SE". Make particles with those names undeletable. # TODO: Remove the particle named "Target" if the animation's focus is changed # to one that doesn't include a target, and vice versa. Do the same for -# "User". +# "User"(?). # TODO: Things that need pop-up windows (draws a semi-transparent grey over the # whole screen behind the window): # - graphic picker @@ -25,13 +22,15 @@ class AnimationEditor WINDOW_WIDTH = Settings::SCREEN_WIDTH + (32 * 10) WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + (32 * 10) - TOP_BAR_HEIGHT = 30 - BORDER_THICKNESS = 4 - CANVAS_X = BORDER_THICKNESS - CANVAS_Y = TOP_BAR_HEIGHT + BORDER_THICKNESS - CANVAS_WIDTH = Settings::SCREEN_WIDTH - CANVAS_HEIGHT = Settings::SCREEN_HEIGHT + + MENU_BAR_WIDTH = WINDOW_WIDTH + MENU_BAR_HEIGHT = 30 + + CANVAS_X = BORDER_THICKNESS + CANVAS_Y = MENU_BAR_HEIGHT + BORDER_THICKNESS + CANVAS_WIDTH = Settings::SCREEN_WIDTH + CANVAS_HEIGHT = Settings::SCREEN_HEIGHT PLAY_CONTROLS_X = CANVAS_X PLAY_CONTROLS_Y = CANVAS_Y + CANVAS_HEIGHT + (BORDER_THICKNESS * 2) @@ -48,9 +47,19 @@ class AnimationEditor PARTICLE_LIST_WIDTH = WINDOW_WIDTH - (BORDER_THICKNESS * 2) PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y - BORDER_THICKNESS + MESSAGE_BOX_WIDTH = WINDOW_WIDTH * 3 / 4 + MESSAGE_BOX_HEIGHT = 160 + MESSAGE_BOX_X = (WINDOW_WIDTH - MESSAGE_BOX_WIDTH) / 2 + MESSAGE_BOX_Y = (WINDOW_HEIGHT - MESSAGE_BOX_HEIGHT) / 2 + MESSAGE_BOX_BUTTON_WIDTH = 150 + MESSAGE_BOX_BUTTON_HEIGHT = 32 + MESSAGE_BOX_SPACING = 16 + def initialize(anim_id, anim) @anim_id = anim_id @anim = anim + @pbs_path = anim[:pbs_path] + @quit = false # Viewports @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @viewport.z = 99999 @@ -58,31 +67,35 @@ class AnimationEditor @canvas_viewport.z = @viewport.z # Background sprite @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) + @screen_bitmap.z = -1 draw_editor_background + @components = {} + # Menu bar + @components[:menu_bar] = AnimationEditor::MenuBar.new(0, 0, MENU_BAR_WIDTH, MENU_BAR_HEIGHT, @viewport) # Canvas - @canvas = AnimationEditor::Canvas.new(@canvas_viewport) + @components[:canvas] = AnimationEditor::Canvas.new(@canvas_viewport) # Play controls - @play_controls = AnimationEditor::PlayControls.new( + @components[:play_controls] = AnimationEditor::PlayControls.new( PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, @viewport ) # Side panes - @commands_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) - @se_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) - @particle_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) - @keyframe_pane = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + [:commands_pane, :se_pane, :particle_pane, :keyframe_pane].each do |pane| + @components[pane] = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + end # TODO: Make more side panes for: - # - colour/tone editor (accessed from @commands_pane via a - # button; has Apply/Cancel buttons to only apply all its values at + # - colour/tone editor (accessed from @components[:commands_pane] via + # a button; has Apply/Cancel buttons to only apply all its values at # the end of editing them, although canvas will be updated in real # time to show the changes) # - effects particle properties (depends on keyframe; for screen # shake, etc.) # Timeline/particle list - @particle_list = AnimationEditor::ParticleList.new( + @components[:particle_list] = AnimationEditor::ParticleList.new( PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport ) - @particle_list.set_interactive_rects + @components[:particle_list].set_interactive_rects @captured = nil + set_menu_bar_contents set_canvas_contents set_side_panes_contents set_particle_list_contents @@ -92,81 +105,109 @@ class AnimationEditor def dispose @screen_bitmap.dispose - @canvas.dispose - @commands_pane.dispose - @se_pane.dispose - @particle_pane.dispose - @keyframe_pane.dispose - @play_controls.dispose - @particle_list.dispose + @components.each_value { |c| c.dispose } + @components.clear @viewport.dispose @canvas_viewport.dispose end def keyframe - return @particle_list.keyframe + return @components[:particle_list].keyframe end def particle_index - return @particle_list.particle_index + return @components[:particle_list].particle_index end #----------------------------------------------------------------------------- + # Returns the animation's name for display in the menu bar and elsewhere. + def get_animation_display_name + ret = "" + case @anim[:type] + when :move then ret += _INTL("[Move]") + when :opp_move then ret += _INTL("[Foe Move]") + when :common then ret += _INTL("[Common]") + when :opp_common then ret += _INTL("[Foe Common]") + else + raise _INTL("Unknown animation type.") + end + case @anim[:type] + when :move, :opp_move + move_data = GameData::Move.try_get(@anim[:move]) + move_name = (move_data) ? move_data.name : @anim[:move] + ret += " " + move_name + when :common, :opp_common + ret += " " + @anim[:move] + end + ret += " (" + @anim[:version].to_s + ")" if @anim[:version] > 0 + ret += " - " + @anim[:name] if @anim[:name] + return ret + end + + def set_menu_bar_contents + @components[:menu_bar].add_button(:quit, _INTL("Quit")) + @components[:menu_bar].add_button(:save, _INTL("Save")) + @components[:menu_bar].add_name_button(:name, get_animation_display_name) + end + def set_canvas_contents - @canvas.bg_name = "indoor1" + @components[:canvas].bg_name = "indoor1" end def set_commands_pane_contents - @commands_pane.add_header_label(:header, _INTL("Edit particle at keyframe")) + commands_pane = @components[:commands_pane] + commands_pane.add_header_label(:header, _INTL("Edit particle at keyframe")) # :frame (related to graphic) - If the graphic is user's sprite/target's # sprite, make this instead a choice of front/back/same as the main sprite/ # opposite of the main sprite. Probably need two controls in the same space - # and refresh_commands_pane makes the appropriate one visible. - @commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -128, CANVAS_WIDTH + 128, 64) - @commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -128, CANVAS_HEIGHT + 128, 96) - @commands_pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) - @commands_pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) - @commands_pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) - @commands_pane.add_labelled_number_text_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) - @commands_pane.add_labelled_number_text_box(:angle, _INTL("Angle"), -1080, 1080, 0) - @commands_pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) - @commands_pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { + # and refresh_component(:commands_pane) makes the appropriate one visible. + commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -128, CANVAS_WIDTH + 128, 64) + commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -128, CANVAS_HEIGHT + 128, 96) + commands_pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) + commands_pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) + commands_pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) + commands_pane.add_labelled_number_text_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) + commands_pane.add_labelled_number_text_box(:angle, _INTL("Angle"), -1080, 1080, 0) + commands_pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) + commands_pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { 0 => _INTL("None"), 1 => _INTL("Additive"), 2 => _INTL("Subtractive") }, 0) - @commands_pane.add_labelled_button(:color_tone, _INTL("Color/Tone"), _INTL("Edit")) - # @commands_pane.add_labelled_dropdown_list(:priority, _INTL("Priority"), { # TODO: Include sub-priority. + commands_pane.add_labelled_button(:color_tone, _INTL("Color/Tone"), _INTL("Edit")) + # commands_pane.add_labelled_dropdown_list(:priority, _INTL("Priority"), { # TODO: Include sub-priority. # :behind_all => _INTL("Behind all"), # :behind_user => _INTL("Behind user"), # :above_user => _INTL("In front of user"), # :above_all => _INTL("In front of everything") # }, :above_user) # :sub_priority -# @commands_pane.add_labelled_button(:masking, _INTL("Masking"), _INTL("Edit")) +# commands_pane.add_labelled_button(:masking, _INTL("Masking"), _INTL("Edit")) # TODO: Add buttons that shift all commands from the current keyframe and # later forwards/backwards in time? end def set_se_pane_contents - @se_pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) + se_pane = @components[:se_pane] + se_pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) # TODO: A list containing all SE files that play this keyframe. Lists SE, # user cry and target cry. - @se_pane.add_button(:add, _INTL("Add")) - @se_pane.add_button(:edit, _INTL("Edit")) - @se_pane.add_button(:delete, _INTL("Delete")) + se_pane.add_button(:add, _INTL("Add")) + se_pane.add_button(:edit, _INTL("Edit")) + se_pane.add_button(:delete, _INTL("Delete")) end def set_particle_pane_contents - @particle_pane.add_header_label(:header, _INTL("Edit particle properties")) + particle_pane = @components[:particle_pane] + particle_pane.add_header_label(:header, _INTL("Edit particle properties")) # TODO: Name should blacklist certain names ("User", "Target", "SE") and # should be disabled if the value is one of those. - @particle_pane.add_labelled_text_box(:name, _INTL("Name"), _INTL("Untitled")) + particle_pane.add_labelled_text_box(:name, _INTL("Name"), _INTL("Untitled")) # TODO: Graphic should show the graphic's name alongside a "Change" button. # New kind of control that is a label plus a button? - @particle_pane.add_labelled_button(:graphic, _INTL("Graphic"), _INTL("Change")) - @particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), { + particle_pane.add_labelled_button(:graphic, _INTL("Graphic"), _INTL("Change")) + particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), { :user => _INTL("User"), :target => _INTL("Target"), :user_and_target => _INTL("User and target"), @@ -181,7 +222,8 @@ class AnimationEditor end def set_keyframe_pane_contents - @keyframe_pane.add_header_label(:header, _INTL("Edit keyframe")) + keyframe_pane = @components[:keyframe_pane] + keyframe_pane.add_header_label(:header, _INTL("Edit keyframe")) # TODO: Various command-shifting options. end @@ -193,80 +235,151 @@ class AnimationEditor end def set_particle_list_contents - @particle_list.set_particles(@anim[:particles]) + @components[:particle_list].set_particles(@anim[:particles]) end def set_play_controls_contents - @play_controls.duration = @particle_list.duration + @components[:play_controls].duration = @components[:particle_list].duration + end + + #----------------------------------------------------------------------------- + + def message(text, *options) + msg_viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) + msg_viewport.z = @viewport.z + 50 + msg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, msg_viewport) + msg_bitmap.bitmap.font.color = Color.black + msg_bitmap.bitmap.font.size = 18 + # Draw gray background + msg_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) + # Draw message box border + BORDER_THICKNESS.times do |i| + col = (i.even?) ? Color.white : Color.black + msg_bitmap.bitmap.outline_rect(MESSAGE_BOX_X - i - 1, MESSAGE_BOX_Y - i - 1, + MESSAGE_BOX_WIDTH + (i * 2) + 2, MESSAGE_BOX_HEIGHT + (i * 2) + 2, col) + end + # Fill message box with white + msg_bitmap.bitmap.fill_rect(MESSAGE_BOX_X, MESSAGE_BOX_Y, MESSAGE_BOX_WIDTH, MESSAGE_BOX_HEIGHT, Color.white) + # Draw text + text_size = msg_bitmap.bitmap.text_size(text) + msg_bitmap.bitmap.draw_text(MESSAGE_BOX_X, (WINDOW_HEIGHT / 2) - MESSAGE_BOX_BUTTON_HEIGHT, + MESSAGE_BOX_WIDTH, text_size.height, text, 1) + # Create buttons + buttons = [] + options.each_with_index do |option, i| + btn = UIControls::Button.new(MESSAGE_BOX_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, msg_viewport, option[1]) + btn.x = (WINDOW_WIDTH - (options.length * MESSAGE_BOX_BUTTON_WIDTH)) / 2 + (i * MESSAGE_BOX_BUTTON_WIDTH) + btn.y = MESSAGE_BOX_Y + MESSAGE_BOX_HEIGHT - MESSAGE_BOX_BUTTON_HEIGHT - MESSAGE_BOX_SPACING + btn.set_fixed_size + btn.set_interactive_rects + buttons.push([option[0], btn]) + end + # Interaction loop + ret = nil + captured = nil + loop do + Graphics.update + Input.update + if captured + captured.update + captured = nil if !captured.busy? + else + buttons.each do |btn| + btn[1].update + captured = btn[1] if btn[1].busy? + end + end + buttons.each do |btn| + next if !btn[1].changed? + ret = btn[0] + break + end + ret = :cancel if Input.trigger?(Input::BACK) + break if ret + buttons.each { |btn| btn[1].repaint } + end + # Dispose and return + buttons.each { |btn| btn[1].dispose } + buttons.clear + msg_bitmap.dispose + msg_viewport.dispose + return ret + end + + def confirm_message(text) + return message(text, [:yes, _INTL("Yes")], [:no, _INTL("No")]) == :yes + end + + #----------------------------------------------------------------------------- + + def save + GameData::Animation.register(@anim, @anim_id) + Compiler.write_battle_animation_file(@anim[:pbs_path]) + if @anim[:pbs_path] != @pbs_path + if GameData::Animation::DATA.any? { |_key, anim| anim.pbs_path == @pbs_path } + Compiler.write_battle_animation_file(@pbs_path) + elsif FileTest.exist?("PBS/Animations/" + @pbs_path + ".txt") + File.delete("PBS/Animations/" + @pbs_path + ".txt") + end + @pbs_path = @anim[:pbs_path] + end end #----------------------------------------------------------------------------- def draw_editor_background - # Fill the whole screen with black - @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.black) - # Fill the top bar with white - @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, TOP_BAR_HEIGHT, Color.white) - # Outline around canvas - @screen_bitmap.bitmap.outline_rect(CANVAS_X - 3, CANVAS_Y - 3, CANVAS_WIDTH + 6, CANVAS_HEIGHT + 6, Color.white) - @screen_bitmap.bitmap.outline_rect(CANVAS_X - 2, CANVAS_Y - 2, CANVAS_WIDTH + 4, CANVAS_HEIGHT + 4, Color.black) - @screen_bitmap.bitmap.outline_rect(CANVAS_X - 1, CANVAS_Y - 1, CANVAS_WIDTH + 2, CANVAS_HEIGHT + 2, Color.white) - # Outline around side pane - @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 3, SIDE_PANE_Y - 3, SIDE_PANE_WIDTH + 6, SIDE_PANE_HEIGHT + 6, Color.white) - @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 2, SIDE_PANE_Y - 2, SIDE_PANE_WIDTH + 4, SIDE_PANE_HEIGHT + 4, Color.black) - @screen_bitmap.bitmap.outline_rect(SIDE_PANE_X - 1, SIDE_PANE_Y - 1, SIDE_PANE_WIDTH + 2, SIDE_PANE_HEIGHT + 2, Color.white) - # Fill the side pane with white - @screen_bitmap.bitmap.fill_rect(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, Color.white) - # Outline around play controls - @screen_bitmap.bitmap.outline_rect(PLAY_CONTROLS_X - 3, PLAY_CONTROLS_Y - 3, PLAY_CONTROLS_WIDTH + 6, PLAY_CONTROLS_HEIGHT + 6, Color.white) - @screen_bitmap.bitmap.outline_rect(PLAY_CONTROLS_X - 2, PLAY_CONTROLS_Y - 2, PLAY_CONTROLS_WIDTH + 4, PLAY_CONTROLS_HEIGHT + 4, Color.black) - @screen_bitmap.bitmap.outline_rect(PLAY_CONTROLS_X - 1, PLAY_CONTROLS_Y - 1, PLAY_CONTROLS_WIDTH + 2, PLAY_CONTROLS_HEIGHT + 2, Color.white) - # Fill the play controls with white - @screen_bitmap.bitmap.fill_rect(PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, Color.white) - # Outline around timeline/particle list - @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 3, PARTICLE_LIST_Y - 3, PARTICLE_LIST_WIDTH + 6, PARTICLE_LIST_HEIGHT + 6, Color.white) - @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 2, PARTICLE_LIST_Y - 2, PARTICLE_LIST_WIDTH + 4, PARTICLE_LIST_HEIGHT + 4, Color.black) - @screen_bitmap.bitmap.outline_rect(PARTICLE_LIST_X - 1, PARTICLE_LIST_Y - 1, PARTICLE_LIST_WIDTH + 2, PARTICLE_LIST_HEIGHT + 2, Color.white) + draw_big_outline = lambda do |bitmap, x, y, width, height| + BORDER_THICKNESS.times do |i| + col = (i.even?) ? Color.white : Color.black + bitmap.outline_rect(x - i - 1, y - i - 1, width + (i * 2) + 2, height + (i * 2) + 2, col) + end + end + # Fill the whole screen with white + @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.white) + # Outline around elements + draw_big_outline.call(@screen_bitmap.bitmap, CANVAS_X, CANVAS_Y, CANVAS_WIDTH, CANVAS_HEIGHT) + draw_big_outline.call(@screen_bitmap.bitmap, PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT) + draw_big_outline.call(@screen_bitmap.bitmap, SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + draw_big_outline.call(@screen_bitmap.bitmap, PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT) end - def refresh_canvas + def refresh_component_visibility(component_sym) + component = @components[component_sym] + # Panes are all mutually exclusive + case component_sym + when :commands_pane + component.visible = (keyframe >= 0 && particle_index >= 0 && + @anim[:particles][particle_index] && + @anim[:particles][particle_index][:name] != "SE") + when :se_pane + component.visible = (keyframe >= 0 && particle_index >= 0 && + @anim[:particles][particle_index] && + @anim[:particles][particle_index][:name] == "SE") + when :particle_pane + component.visible = (keyframe < 0 && particle_index >= 0) + when :keyframe_pane + component.visible = (keyframe >= 0 && particle_index < 0) + end end - def refresh_commands_pane - if keyframe < 0 || particle_index < 0 || !@anim[:particles][particle_index] || - @anim[:particles][particle_index][:name] == "SE" - @commands_pane.visible = false - else - @commands_pane.visible = true + def refresh_component_values(component_sym) + component = @components[component_sym] + case component_sym + when :commands_pane new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) # TODO: Need to do something special for :color, :tone and :frame which # all have button controls. - @commands_pane.controls.each do |ctrl| + component.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, # which should be indicated somehow in ctrl[1]. end - end - end - - def refresh_se_pane - if keyframe < 0 || particle_index < 0 || !@anim[:particles][particle_index] || - @anim[:particles][particle_index][:name] != "SE" - @se_pane.visible = false - else - @se_pane.visible = true + when :se_pane # TODO: Set list of SEs, activate/deactivate buttons accordingly. - end - end - - def refresh_particle_pane - if keyframe >= 0 || particle_index < 0 - @particle_pane.visible = false - else - @particle_pane.visible = true + when :particle_pane new_vals = AnimationEditor::ParticleDataHelper.get_all_particle_values(@anim[:particles][particle_index]) - @particle_pane.controls.each do |ctrl| + component.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) ctrl[1].value = new_vals[ctrl[0]] if ctrl[1].respond_to?("value=") end @@ -274,179 +387,109 @@ class AnimationEditor end end - def refresh_keyframe_pane - if keyframe < 0 || particle_index >= 0 - @keyframe_pane.visible = false - else - @keyframe_pane.visible = true - end - end - - def refresh_particle_list - @particle_list.refresh - end - - def refresh_play_controls - @play_controls.refresh + def refresh_component(component_sym) + refresh_component_visibility(component_sym) + return if !@components[component_sym].visible + refresh_component_values(component_sym) + @components[component_sym].refresh end def refresh - # Set canvas display - refresh_canvas - # Set all side pane controls to values from animation - refresh_commands_pane - refresh_se_pane - refresh_particle_pane - refresh_keyframe_pane - # Set particle list's contents - refresh_particle_list - # Set play controls' information - refresh_play_controls + @components.each_key { |sym| refresh_component(sym) } end #----------------------------------------------------------------------------- - def update_canvas - @canvas.update - # TODO: Detect and apply changes made in canvas, e.g. moving particle, - # double-clicking to add particle, deleting particle. - end - - def update_commands_pane - return if !@commands_pane.visible - @commands_pane.update - if @commands_pane.busy? - @captured = [@commands_pane, :update_commands_pane] - end - if @commands_pane.changed? - # TODO: Make undo/redo snapshot. - values = @commands_pane.values - values.each_pair do |property, value| - case property - when :color_tone # Button - # TODO: Open the colour/tone side pane. + # TODO: Every component that contains a button, etc. should respond to + # "values", which returns the changed elements. + def apply_changed_value(component_sym, property, value) + case component_sym + when :menu_bar + case property + when :quit + @quit = true + when :save + save + when :name + # TODO: Open the animation properties pop-up window. + echoln "animation name clicked" + end + when :canvas + # TODO: Detect and apply changes made in canvas, e.g. moving particle, + # double-clicking to add particle, deleting particle. + when :commands_pane + case property + when :color_tone # Button + # TODO: Open the colour/tone side pane. + else + particle = @anim[:particles][particle_index] + new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) + if new_cmds + particle[property] = new_cmds else - particle = @anim[:particles][particle_index] - new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) - if new_cmds - particle[property] = new_cmds - else - particle.delete(property) - end - @particle_list.change_particle_commands(particle_index) - @play_controls.duration = @particle_list.duration - refresh_commands_pane + particle.delete(property) end + @components[:particle_list].change_particle_commands(particle_index) + @components[:play_controls].duration = @components[:particle_list].duration + refresh_component(:commands_pane) end - @commands_pane.clear_changed - end - end - - def update_se_pane - return if !@se_pane.visible - @se_pane.update - if @se_pane.busy? - @captured = [@se_pane, :update_se_pane] - end - # TODO: Enable the "Edit" and "Delete" controls only if an SE is selected. - if @se_pane.changed? - # TODO: Make undo/redo snapshot. - values = @se_pane.values - values.each_pair do |property, value| - case property - when :add # Button - when :edit # Button - when :delete # Button - else - particle = @anim[:particles][particle_index] - end + when :se_pane + # TODO: Enable the "Edit" and "Delete" controls only if an SE is selected. + case property + when :add # Button + when :edit # Button + when :delete # Button + else +# particle = @anim[:particles][particle_index] end - @se_pane.clear_changed - end - end - - def update_particle_pane - return if !@particle_pane.visible - @particle_pane.update - if @particle_pane.busy? - @captured = [@particle_pane, :update_particle_pane] - end - if @particle_pane.changed? - # TODO: Make undo/redo snapshot. - values = @particle_pane.values - values.each_pair do |property, value| - case property - when :graphic # Button - # TODO: Open the graphic chooser pop-up window. - else - particle = @anim[:particles][particle_index] - new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) - @particle_list.change_particle(particle_index) - refresh_particle_pane - end + when :particle_pane + case property + when :graphic # Button + # TODO: Open the graphic chooser pop-up window. + else + particle = @anim[:particles][particle_index] + new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) + @components[:particle_list].change_particle(particle_index) + refresh_component(:particle_pane) end - @particle_pane.clear_changed - end - end - - def update_keyframe_pane - return if !@keyframe_pane.visible - @keyframe_pane.update - if @keyframe_pane.busy? - @captured = [@keyframe_pane, :update_keyframe_pane] - end - if @keyframe_pane.changed? - # TODO: Make undo/redo snapshot. - values = @keyframe_pane.values - values.each_pair do |property, value| - # TODO: Stuff here once I decide what controls to add. - end - @keyframe_pane.clear_changed - end - end - - def update_particle_list - old_keyframe = keyframe - old_particle_index = particle_index - @particle_list.update - if @particle_list.busy? - @captured = [@particle_list, :update_particle_list] - end - if @particle_list.changed? - refresh if keyframe != old_keyframe || particle_index != old_particle_index + when :keyframe_pane + # TODO: Stuff here once I decide what controls to add. + when :particle_list +# refresh if keyframe != old_keyframe || particle_index != old_particle_index # TODO: Lots of stuff here. - @particle_list.clear_changed + when :play_controls + # TODO: Will the play controls ever signal themselves as changed? I don't + # think so. end - @particle_list.repaint - end - - def update_play_controls - @play_controls.update - @play_controls.repaint - if @play_controls.busy? - @captured = [@play_controls, :update_play_controls] - end - # TODO: Will the play controls ever signal themselves as changed? I don't - # think so. - if @play_controls.changed? - @play_controls.clear_changed - end - @play_controls.repaint end def update - if @captured - self.send(@captured[1]) - @captured = nil if !@captured[0].busy? - return + old_keyframe = keyframe + old_particle_index = particle_index + @components.each_pair do |sym, component| + next if @captured && @captured != sym + next if !component.visible + component.update + @captured = sym if component.busy? + if component.changed? + if sym == :particle_list + refresh if keyframe != old_keyframe || particle_index != old_particle_index + end + if component.respond_to?("values") + # TODO: Make undo/redo snapshot. + values = component.values + values.each_pair do |property, value| + apply_changed_value(sym, property, value) + end + end + component.clear_changed + end + component.repaint if sym == :particle_list || sym == :menu_bar + if @captured + @captured = nil if !component.busy? + break + end end - update_canvas - update_commands_pane - update_se_pane - update_particle_pane - update_keyframe_pane - update_particle_list - update_play_controls end #----------------------------------------------------------------------------- @@ -454,16 +497,22 @@ class AnimationEditor def run Input.text_input = false loop do + # TODO: Do we need to check for Input.text_input? I think just checking + # @captured != nil will suffice. inputting_text = Input.text_input Graphics.update Input.update update - if !inputting_text - if Input.trigger?(Input::BACK) - # TODO: Ask to save/discard changes. - # TODO: When saving, add animation to GameData and rewrite animation's - # parent PBS file (which could include multiple animations). - break + if !inputting_text && @captured.nil? + if @quit || Input.trigger?(Input::BACK) + case message(_INTL("Do you want to save changes to the animation?"), + [:yes, _INTL("Yes")], [:no, _INTL("No")], [:cancel, _INTL("Cancel")]) + when :yes + save + when :cancel + @quit = false + end + break if @quit end end end diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 7857dcfa4..9d079f8f8 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -87,14 +87,14 @@ class AnimationEditor::AnimationSelector # to? Animation's name, move's name (if there is one), what else? # TODO: Filter dropdown list to pick a move type? Other filter options? # "Load animation" button - @load_button = UIControls::Button.new(LOAD_BUTTON_WIDTH, LOAD_BUTTON_HEIGHT, @viewport, "Load animation") + @load_button = UIControls::Button.new(LOAD_BUTTON_WIDTH, LOAD_BUTTON_HEIGHT, @viewport, _INTL("Load animation")) @load_button.x = LOAD_BUTTON_X @load_button.y = LOAD_BUTTON_Y @load_button.set_fixed_size @load_button.set_interactive_rects @controls[:load] = @load_button # TODO: "New animation" button, "Delete animation" button, "Duplicate - # animation" button. + # animation" button, "Quit" button. repaint end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 53a36d523..ad22723b7 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -40,4 +40,22 @@ class AnimationEditor::Canvas < Sprite @message_bar_sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_message") @message_bar_sprite.y = Settings::SCREEN_HEIGHT - @message_bar_sprite.height end + + #----------------------------------------------------------------------------- + + def busy? + return false + end + + def changed? + return false + end + + #----------------------------------------------------------------------------- + + def repaint + end + + def refresh + end end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index e52791323..bbce614a3 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -77,8 +77,8 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands_bg_sprites = [] @commands_sprites = [] # Scrollbar positions - @left_pos = 0 @top_pos = 0 + @left_pos = 0 @duration = 0 # Selected things @keyframe = 0 @@ -93,8 +93,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def draw_control_background self.bitmap.clear - # Background - self.bitmap.fill_rect(0, 0, width, height, Color.white) # Separator lines self.bitmap.fill_rect(0, TIMELINE_HEIGHT, width, VIEWPORT_SPACING, Color.black) self.bitmap.fill_rect(LIST_WIDTH, 0, VIEWPORT_SPACING, height, Color.black) @@ -132,21 +130,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl return (ret.is_a?(Array)) ? ret[0] : ret end - def left_pos=(val) - old_val = @left_pos - total_width = (@duration * KEYFRAME_SPACING) + TIMELINE_LEFT_BUFFER + 1 - if total_width <= @commands_viewport.rect.width - @left_pos = 0 - else - @left_pos = val - @left_pos = @left_pos.clamp(0, total_width - @commands_viewport.rect.width) - end - if @left_pos != old_val - refresh_position_line - invalidate_time - end - end - def top_pos=(val) old_val = @top_pos total_height = (@particle_list.length * ROW_HEIGHT) + 1 @@ -165,6 +148,21 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end + def left_pos=(val) + old_val = @left_pos + total_width = (@duration * KEYFRAME_SPACING) + TIMELINE_LEFT_BUFFER + 1 + if total_width <= @commands_viewport.rect.width + @left_pos = 0 + else + @left_pos = val + @left_pos = @left_pos.clamp(0, total_width - @commands_viewport.rect.width) + end + if @left_pos != old_val + refresh_position_line + invalidate_time + end + end + def set_particles(particles) @particles = particles calculate_all_commands_and_durations @@ -204,8 +202,8 @@ class AnimationEditor::ParticleList < UIControls::BaseControl # Set scrollbars to the correct lengths @list_scrollbar.range = (@particle_list.length * ROW_HEIGHT) + 1 @time_scrollbar.range = (@duration * KEYFRAME_SPACING) + TIMELINE_LEFT_BUFFER + 1 - self.left_pos = @left_pos - self.top_pos = @top_pos + self.top_pos = @list_scrollbar.position + self.left_pos = @time_scrollbar.position # Redraw all sprites invalidate end @@ -576,6 +574,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end def refresh + @old_top_pos = nil if @invalid draw_area_highlight refresh_timeline if @invalid || @invalid_time each_visible_particle do |i| @@ -719,8 +718,8 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @time_scrollbar.update super # Refresh sprites if a scrollbar has been moved - self.left_pos = @time_scrollbar.position self.top_pos = @list_scrollbar.position + self.left_pos = @time_scrollbar.position # Update the current keyframe line's position refresh_position_line diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb new file mode 100644 index 000000000..6140e5575 --- /dev/null +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb @@ -0,0 +1,52 @@ +#=============================================================================== +# TODO: Ideally the menu buttons (add_button) will be replaced by a proper +# menu control (basically multiple DropdownList controls where the headers +# have fixed names and, while captured, hovering over a header changes +# which list is displayed). The menu control should go under UI controls +# rather than be unique to the Animation Editor. +#=============================================================================== +class AnimationEditor::MenuBar < UIControls::ControlsContainer + MENU_BUTTON_WIDTH = 80 + NAME_BUTTON_WIDTH = 400 # The animation's name + + def initialize(x, y, width, height, viewport) + super(x, y, width, height) + @viewport.z = viewport.z + 10 # So that it appears over the canvas + end + + #----------------------------------------------------------------------------- + + def add_button(id, button_text) + ctrl = UIControls::Button.new(MENU_BUTTON_WIDTH, @height, @viewport, button_text) + ctrl.set_fixed_size + add_control(id, ctrl) + end + + def add_name_button(id, button_text) + ctrl = UIControls::Button.new(NAME_BUTTON_WIDTH, @height, @viewport, button_text) + ctrl.set_fixed_size + add_control(id, ctrl) + end + + def anim_name=(val) + ctrl = get_control(:name) + ctrl.set_text(val) if ctrl + end + + #----------------------------------------------------------------------------- + + private + + def add_control(id, control, add_offset = false) + i = @controls.length + control_x = (add_offset ? @row_count - 1 : @row_count) * MENU_BUTTON_WIDTH + control_x = @width - control.width if control.width == NAME_BUTTON_WIDTH + @control_rects[i] = Rect.new(control_x, 0, control.width, control.height) + control.x = @control_rects[i].x + (add_offset ? OFFSET_FROM_LABEL_X : 0) + control.y = @control_rects[i].y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) + control.set_interactive_rects + @controls[i] = [id, control] + @row_count += 1 if !add_offset + repaint + end +end From 973b93a524a997f3fe8c346b6aa0fbb676626249 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 28 Nov 2023 22:28:08 +0000 Subject: [PATCH 11/49] Added gra;hic/SE chooser pop-up windows to Animation Editor --- .../801_UI controls/002_ControlsContainer.rb | 49 ++- .../Control elements/005_NumberSlider.rb | 2 +- .../Control elements/008_List.rb | 10 +- .../902_Anim GameData/001_Animation.rb | 9 + .../903_Anim Compiler/001_Anim compiler.rb | 10 +- .../904_Anim Editor/001_AnimationEditor.rb | 208 ++++++----- .../002_AnimationEditor_popups.rb | 347 ++++++++++++++++++ .../904_Anim Editor/901_ParticleDataHelper.rb | 73 ++++ 8 files changed, 595 insertions(+), 113 deletions(-) create mode 100644 Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index 3a0e23b6b..237922040 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -17,6 +17,7 @@ class UIControls::ControlsContainer attr_reader :controls attr_reader :values attr_reader :visible + attr_reader :viewport LINE_SPACING = 28 OFFSET_FROM_LABEL_X = 90 @@ -30,8 +31,8 @@ class UIControls::ControlsContainer @width = width @height = height @controls = [] - @control_rects = [] @row_count = 0 + @pixel_offset = 0 @captured = nil @visible = true end @@ -72,10 +73,15 @@ class UIControls::ControlsContainer #----------------------------------------------------------------------------- def add_label(id, label, has_label = false) - id = (id.to_s + "_label").to_sym + id = (id.to_s + "_label").to_sym if !has_label add_control(id, UIControls::Label.new(*control_size(has_label), @viewport, label), has_label) end + def add_labelled_label(id, label, text) + add_label(id, label) + add_label(id, text, true) + end + def add_header_label(id, label) ctrl = UIControls::Label.new(*control_size, @viewport, label) ctrl.header = true @@ -127,6 +133,18 @@ class UIControls::ControlsContainer add_button(id, button_text, true) end + def add_list(id, rows, options, has_label = false) + size = control_size(has_label) + size[0] -= 8 + size[1] = rows * UIControls::List::ROW_HEIGHT + add_control(id, UIControls::List.new(*size, @viewport, options), has_label, rows) + end + + def add_labelled_list(id, label, rows, options) + add_label(id, label) + add_list(id, rows, options, true) + end + def add_dropdown_list(id, options, value, has_label = false) add_control(id, UIControls::DropdownList.new(*control_size(has_label), @viewport, options, value), has_label) end @@ -176,8 +194,6 @@ class UIControls::ControlsContainer #----------------------------------------------------------------------------- - private - def control_size(has_label = false) if has_label return @width - OFFSET_FROM_LABEL_X, LINE_SPACING - OFFSET_FROM_LABEL_Y @@ -185,16 +201,23 @@ class UIControls::ControlsContainer return @width, LINE_SPACING end - def add_control(id, control, add_offset = false) - i = @controls.length - control_y = (add_offset ? @row_count - 1 : @row_count) * LINE_SPACING - # TODO: I don't think I need @control_rects. - @control_rects[i] = Rect.new(0, control_y, control.width, control.height) - control.x = @control_rects[i].x + (add_offset ? OFFSET_FROM_LABEL_X : 0) - control.y = @control_rects[i].y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) + def add_control_at(id, control, x, y) + control.x = x + control.y = y control.set_interactive_rects - @controls[i] = [id, control] - @row_count += 1 if !add_offset + @controls.push([id, control]) repaint end + + def add_control(id, control, add_offset = false, rows = 1) + i = @controls.length + row_x = 0 + row_y = (add_offset ? @row_count - 1 : @row_count) * LINE_SPACING + ctrl_x = row_x + (add_offset ? OFFSET_FROM_LABEL_X : 0) + ctrl_x += 4 if control.is_a?(UIControls::List) + ctrl_y = row_y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) + @pixel_offset + add_control_at(id, control, ctrl_x, ctrl_y) + @row_count += rows if !add_offset + @pixel_offset -= (LINE_SPACING - UIControls::List::ROW_HEIGHT) * (rows - 1) if control.is_a?(UIControls::List) + end end diff --git a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb index 69899d87f..edaf9c524 100644 --- a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb +++ b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb @@ -81,7 +81,7 @@ class UIControls::NumberSlider < UIControls::BaseControl self.bitmap.fill_rect(SLIDER_X - 1 + (i * SLIDER_LENGTH / 4), (self.height / 2) - 2, 2, 4, self.bitmap.font.color) end # Draw slider knob - fraction = (self.value - self.min_value) / self.max_value.to_f + fraction = (self.value - self.min_value) / (self.max_value.to_f - self.min_value) knob_x = (SLIDER_LENGTH * fraction).to_i self.bitmap.fill_rect(SLIDER_X + knob_x - 4, (self.height / 2) - 6, 8, 12, SLIDER_KNOB_COLOR) # Draw plus button diff --git a/Data/Scripts/801_UI controls/Control elements/008_List.rb b/Data/Scripts/801_UI controls/Control elements/008_List.rb index beca0fa3d..f6ffd521c 100644 --- a/Data/Scripts/801_UI controls/Control elements/008_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_List.rb @@ -48,11 +48,16 @@ class UIControls::List < UIControls::BaseControl @scrollbar.z = new_val + 1 end + def visible=(new_val) + super + @scrollbar.visible = new_val + end + # Each value in @values is an array: [id, text]. def values=(new_vals) @values = new_vals set_interactive_rects - @scrollbar.range = @values.length * ROW_HEIGHT + @scrollbar.range = [@values.length, 1].max * ROW_HEIGHT if @scrollbar.visible self.top_row = (@scrollbar.position.to_f / ROW_HEIGHT).round else @@ -143,10 +148,11 @@ class UIControls::List < UIControls::BaseControl SELECTED_ROW_COLOR ) end + txt = (val.is_a?(Array)) ? val[1] : val draw_text(self.bitmap, @interactions[i].x + TEXT_PADDING_X, @interactions[i].y + TEXT_OFFSET_Y - (@top_row * ROW_HEIGHT), - val[1]) + txt) end end diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 51c7ee917..8c8c49700 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -98,6 +98,7 @@ module GameData # TODO: Add "SetColor"/"SetTone" as shorthand for the above? They'd be # converted in the Compiler. # TODO: Bitmap masking. + # TODO: Hue? I don't think so; color/tone do the same job. # These properties are specifically for the "SE" particle. "Play" => [:se, "^usUU"], # Filename, volume, pitch @@ -249,6 +250,14 @@ module GameData elsif ret ret = SUB_SCHEMA[key][2].key(ret) end + when "graphic" + # The User and Target particles have hardcoded graphics, so they don't + # need writing to PBS + ret = nil if ["User", "Target"].include?(@particles[index][:name]) + when "Play" + # TODO: Turn volume/pitch of 100 into nil. + when "PlayUserCry", "PlayTargetCry" + # TODO: Turn volume/pitch of 100 into nil. when "AllCommands" # Get translations of all properties to their names as seen in PBS # animation files diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index 7f3e8ea8e..a80afbc7c 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -138,13 +138,21 @@ module Compiler else particle[:focus] = :screen end end + # Ensure user/target particles have a default graphic if not given + if !particle[:graphic] && particle[:name] != "SE" + case particle[:name] + when "User" then particle[:graphic] = "USER" + when "Target" then particle[:graphic] = "TARGET" + end + end # Ensure that particles don't have a focus involving a target if the # animation itself doesn't involve a target if hash[:no_target] && [:target, :user_and_target].include?(particle[:focus]) raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a target if property \"NoTarget\" is set to true.", particle[:name]) + "\n" + FileLineData.linereport end - + # TODO: For SE particle, ensure that it doesn't play two instances of the + # same file in the same frame. # Convert all "SetXYZ" particle commands to "MoveXYZ" by giving them a # duration of 0 (even ones that can't have a "MoveXYZ" command) GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.keys.each do |prop| diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index cce53ec3d..9b15e9130 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -47,14 +47,6 @@ class AnimationEditor PARTICLE_LIST_WIDTH = WINDOW_WIDTH - (BORDER_THICKNESS * 2) PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y - BORDER_THICKNESS - MESSAGE_BOX_WIDTH = WINDOW_WIDTH * 3 / 4 - MESSAGE_BOX_HEIGHT = 160 - MESSAGE_BOX_X = (WINDOW_WIDTH - MESSAGE_BOX_WIDTH) / 2 - MESSAGE_BOX_Y = (WINDOW_HEIGHT - MESSAGE_BOX_HEIGHT) / 2 - MESSAGE_BOX_BUTTON_WIDTH = 150 - MESSAGE_BOX_BUTTON_HEIGHT = 32 - MESSAGE_BOX_SPACING = 16 - def initialize(anim_id, anim) @anim_id = anim_id @anim = anim @@ -65,9 +57,17 @@ class AnimationEditor @viewport.z = 99999 @canvas_viewport = Viewport.new(CANVAS_X, CANVAS_Y, CANVAS_WIDTH, CANVAS_HEIGHT) @canvas_viewport.z = @viewport.z + @pop_up_viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) + @pop_up_viewport.z = @viewport.z + 50 # Background sprite @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) - @screen_bitmap.z = -1 + @screen_bitmap.z = -100 + @se_list_box_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) + @se_list_box_bitmap.z = -90 + @se_list_box_bitmap.visible = false + @pop_up_bg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @pop_up_viewport) + @pop_up_bg_bitmap.z = -100 + @pop_up_bg_bitmap.visible = false draw_editor_background @components = {} # Menu bar @@ -105,6 +105,8 @@ class AnimationEditor def dispose @screen_bitmap.dispose + @se_list_box_bitmap.dispose + @pop_up_bg_bitmap.dispose @components.each_value { |c| c.dispose } @components.clear @viewport.dispose @@ -191,11 +193,21 @@ class AnimationEditor def set_se_pane_contents se_pane = @components[:se_pane] se_pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) - # TODO: A list containing all SE files that play this keyframe. Lists SE, - # user cry and target cry. - se_pane.add_button(:add, _INTL("Add")) - se_pane.add_button(:edit, _INTL("Edit")) - se_pane.add_button(:delete, _INTL("Delete")) + size = se_pane.control_size + size[0] -= 10 + size[1] = UIControls::List::ROW_HEIGHT * 5 # 5 rows + list = UIControls::List.new(*size, se_pane.viewport, []) + se_pane.add_control_at(:list, list, 5, 30) + button_height = UIControls::ControlsContainer::LINE_SPACING + add = UIControls::Button.new(101, button_height, se_pane.viewport, _INTL("Add")) + add.set_fixed_size + se_pane.add_control_at(:add, add, 1, 154) + edit = UIControls::Button.new(100, button_height, se_pane.viewport, _INTL("Edit")) + edit.set_fixed_size + se_pane.add_control_at(:edit, edit, 102, 154) + delete = UIControls::Button.new(101, button_height, se_pane.viewport, _INTL("Delete")) + delete.set_fixed_size + se_pane.add_control_at(:delete, delete, 202, 154) end def set_particle_pane_contents @@ -206,7 +218,8 @@ class AnimationEditor particle_pane.add_labelled_text_box(:name, _INTL("Name"), _INTL("Untitled")) # TODO: Graphic should show the graphic's name alongside a "Change" button. # New kind of control that is a label plus a button? - particle_pane.add_labelled_button(:graphic, _INTL("Graphic"), _INTL("Change")) + particle_pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") + particle_pane.add_labelled_button(:graphic, "", _INTL("Change")) particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), { :user => _INTL("User"), :target => _INTL("Target"), @@ -244,74 +257,6 @@ class AnimationEditor #----------------------------------------------------------------------------- - def message(text, *options) - msg_viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) - msg_viewport.z = @viewport.z + 50 - msg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, msg_viewport) - msg_bitmap.bitmap.font.color = Color.black - msg_bitmap.bitmap.font.size = 18 - # Draw gray background - msg_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) - # Draw message box border - BORDER_THICKNESS.times do |i| - col = (i.even?) ? Color.white : Color.black - msg_bitmap.bitmap.outline_rect(MESSAGE_BOX_X - i - 1, MESSAGE_BOX_Y - i - 1, - MESSAGE_BOX_WIDTH + (i * 2) + 2, MESSAGE_BOX_HEIGHT + (i * 2) + 2, col) - end - # Fill message box with white - msg_bitmap.bitmap.fill_rect(MESSAGE_BOX_X, MESSAGE_BOX_Y, MESSAGE_BOX_WIDTH, MESSAGE_BOX_HEIGHT, Color.white) - # Draw text - text_size = msg_bitmap.bitmap.text_size(text) - msg_bitmap.bitmap.draw_text(MESSAGE_BOX_X, (WINDOW_HEIGHT / 2) - MESSAGE_BOX_BUTTON_HEIGHT, - MESSAGE_BOX_WIDTH, text_size.height, text, 1) - # Create buttons - buttons = [] - options.each_with_index do |option, i| - btn = UIControls::Button.new(MESSAGE_BOX_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, msg_viewport, option[1]) - btn.x = (WINDOW_WIDTH - (options.length * MESSAGE_BOX_BUTTON_WIDTH)) / 2 + (i * MESSAGE_BOX_BUTTON_WIDTH) - btn.y = MESSAGE_BOX_Y + MESSAGE_BOX_HEIGHT - MESSAGE_BOX_BUTTON_HEIGHT - MESSAGE_BOX_SPACING - btn.set_fixed_size - btn.set_interactive_rects - buttons.push([option[0], btn]) - end - # Interaction loop - ret = nil - captured = nil - loop do - Graphics.update - Input.update - if captured - captured.update - captured = nil if !captured.busy? - else - buttons.each do |btn| - btn[1].update - captured = btn[1] if btn[1].busy? - end - end - buttons.each do |btn| - next if !btn[1].changed? - ret = btn[0] - break - end - ret = :cancel if Input.trigger?(Input::BACK) - break if ret - buttons.each { |btn| btn[1].repaint } - end - # Dispose and return - buttons.each { |btn| btn[1].dispose } - buttons.clear - msg_bitmap.dispose - msg_viewport.dispose - return ret - end - - def confirm_message(text) - return message(text, [:yes, _INTL("Yes")], [:no, _INTL("No")]) == :yes - end - - #----------------------------------------------------------------------------- - def save GameData::Animation.register(@anim, @anim_id) Compiler.write_battle_animation_file(@anim[:pbs_path]) @@ -341,6 +286,11 @@ class AnimationEditor draw_big_outline.call(@screen_bitmap.bitmap, PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT) draw_big_outline.call(@screen_bitmap.bitmap, SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) draw_big_outline.call(@screen_bitmap.bitmap, PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT) + # Draw box around SE list box in side pane + @se_list_box_bitmap.bitmap.outline_rect(SIDE_PANE_X + 3, SIDE_PANE_Y + 24 + 4, + SIDE_PANE_WIDTH - 6, (5 * UIControls::List::ROW_HEIGHT) + 4, Color.black) + # Make the pop-up background semi-transparent + @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) end def refresh_component_visibility(component_sym) @@ -355,6 +305,7 @@ class AnimationEditor component.visible = (keyframe >= 0 && particle_index >= 0 && @anim[:particles][particle_index] && @anim[:particles][particle_index][:name] == "SE") + @se_list_box_bitmap.visible = component.visible when :particle_pane component.visible = (keyframe < 0 && particle_index >= 0) when :keyframe_pane @@ -376,13 +327,44 @@ class AnimationEditor # which should be indicated somehow in ctrl[1]. end when :se_pane - # TODO: Set list of SEs, activate/deactivate buttons accordingly. + # TODO: Activate/deactivate Edit/Delete buttons accordingly. + se_particle = @anim[:particles].select { |p| p[:name] == "SE" }[0] + kyfrm = keyframe + # Populate list of files + list = [] + se_particle.each_pair do |property, values| + next if !values.is_a?(Array) + values.each do |val| + next if val[0] != kyfrm + text = AnimationEditor::ParticleDataHelper.get_se_display_text(property, val) + case property + when :user_cry then list.push(["USER", text]) + when :target_cry then list.push(["TARGET", text]) + when :se then list.push([val[2], text]) + end + end + end + list.sort! { |a, b| a[1].downcase <=> b[1].downcase } + component.get_control(:list).values = list when :particle_pane new_vals = AnimationEditor::ParticleDataHelper.get_all_particle_values(@anim[:particles][particle_index]) component.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) ctrl[1].value = new_vals[ctrl[0]] if ctrl[1].respond_to?("value=") end + graphic_name = @anim[:particles][particle_index][:graphic] + graphic_override_names = { + "USER" => _INTL("[[User's sprite]]"), + "USER_OPP" => _INTL("[[User's other side sprite]]"), + "USER_FRONT" => _INTL("[[User's front sprite]]"), + "USER_BACK" => _INTL("[[User's back sprite]]"), + "TARGET" => _INTL("[[Target's sprite]]"), + "TARGET_OPP" => _INTL("[[Target's other side sprite]]"), + "TARGET_FRONT" => _INTL("[[Target's front sprite]]"), + "TARGET_BACK" => _INTL("[[Target's back sprite]]"), + } + graphic_name = graphic_override_names[graphic_name] if graphic_override_names[graphic_name] + component.get_control(:graphic_name).label = graphic_name # TODO: Disable the name, graphic and focus controls for "User"/"Target". end end @@ -434,18 +416,54 @@ class AnimationEditor refresh_component(:commands_pane) end when :se_pane - # TODO: Enable the "Edit" and "Delete" controls only if an SE is selected. case property when :add # Button + new_file, new_volume, new_pitch = choose_audio_file("", 100, 100) + if new_file != "" + particle = @anim[:particles][particle_index] + AnimationEditor::ParticleDataHelper.add_se_command(particle, keyframe, new_file, new_volume, new_pitch) + @components[:particle_list].change_particle_commands(particle_index) + @components[:play_controls].duration = @components[:particle_list].duration + refresh_component(:se_pane) + end when :edit # Button + particle = @anim[:particles][particle_index] + list = @components[:se_pane].get_control(:list) + old_file = list.value + old_volume, old_pitch = AnimationEditor::ParticleDataHelper.get_se_values_from_filename_and_frame(particle, keyframe, old_file) + if old_file + new_file, new_volume, new_pitch = choose_audio_file(old_file, old_volume, old_pitch) + if new_file != old_file || new_volume != old_volume || new_pitch != old_pitch + AnimationEditor::ParticleDataHelper.delete_se_command(particle, keyframe, old_file) + AnimationEditor::ParticleDataHelper.add_se_command(particle, keyframe, new_file, new_volume, new_pitch) + @components[:particle_list].change_particle_commands(particle_index) + @components[:play_controls].duration = @components[:particle_list].duration + refresh_component(:se_pane) + end + end when :delete # Button + particle = @anim[:particles][particle_index] + list = @components[:se_pane].get_control(:list) + old_file = list.value + if old_file + AnimationEditor::ParticleDataHelper.delete_se_command(particle, keyframe, old_file) + @components[:particle_list].change_particle_commands(particle_index) + @components[:play_controls].duration = @components[:particle_list].duration + refresh_component(:se_pane) + end else # particle = @anim[:particles][particle_index] end when :particle_pane case property when :graphic # Button - # TODO: Open the graphic chooser pop-up window. + p_index = particle_index + new_file = choose_graphic_file(@anim[:particles][p_index][:graphic]) + if @anim[:particles][p_index][:graphic] != new_file + @anim[:particles][p_index][:graphic] = new_file + refresh_component(:particle_pane) + # TODO: refresh_component(:canvas) + end else particle = @anim[:particles][particle_index] new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) @@ -503,17 +521,15 @@ class AnimationEditor Graphics.update Input.update update - if !inputting_text && @captured.nil? - if @quit || Input.trigger?(Input::BACK) - case message(_INTL("Do you want to save changes to the animation?"), - [:yes, _INTL("Yes")], [:no, _INTL("No")], [:cancel, _INTL("Cancel")]) - when :yes - save - when :cancel - @quit = false - end - break if @quit + if !inputting_text && @captured.nil? && @quit + case message(_INTL("Do you want to save changes to the animation?"), + [:yes, _INTL("Yes")], [:no, _INTL("No")], [:cancel, _INTL("Cancel")]) + when :yes + save + when :cancel + @quit = false end + break if @quit end end dispose diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb new file mode 100644 index 000000000..b26795569 --- /dev/null +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -0,0 +1,347 @@ +#=============================================================================== +# +#=============================================================================== +class AnimationEditor + MESSAGE_BOX_WIDTH = WINDOW_WIDTH * 3 / 4 + MESSAGE_BOX_HEIGHT = 160 + MESSAGE_BOX_BUTTON_WIDTH = 150 + MESSAGE_BOX_BUTTON_HEIGHT = 32 + MESSAGE_BOX_SPACING = 16 + + GRAPHIC_CHOOSER_BUTTON_WIDTH = 150 + GRAPHIC_CHOOSER_BUTTON_HEIGHT = MESSAGE_BOX_BUTTON_HEIGHT + GRAPHIC_CHOOSER_FILE_LIST_WIDTH = GRAPHIC_CHOOSER_BUTTON_WIDTH * 2 + GRAPHIC_CHOOSER_FILE_LIST_HEIGHT = 15 * UIControls::List::ROW_HEIGHT + GRAPHIC_CHOOSER_PREVIEW_SIZE = 320 + GRAPHIC_CHOOSER_WINDOW_WIDTH = GRAPHIC_CHOOSER_FILE_LIST_WIDTH + GRAPHIC_CHOOSER_PREVIEW_SIZE + (MESSAGE_BOX_SPACING * 2) + 8 + GRAPHIC_CHOOSER_WINDOW_HEIGHT = GRAPHIC_CHOOSER_FILE_LIST_HEIGHT + GRAPHIC_CHOOSER_BUTTON_HEIGHT + 24 + (MESSAGE_BOX_SPACING * 2) + 2 + + def create_pop_up_window(width, height) + ret = BitmapSprite.new(width, height, @pop_up_viewport) + ret.x = (WINDOW_WIDTH - width) / 2 + ret.y = (WINDOW_HEIGHT - height) / 2 + ret.z = -1 + ret.bitmap.font.color = Color.black + ret.bitmap.font.size = 18 + # Draw message box border + BORDER_THICKNESS.times do |i| + col = (i.even?) ? Color.black : Color.white + ret.bitmap.outline_rect(i, i, ret.width - (i * 2), ret.height - (i * 2), col) + end + # Fill message box with white + ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, + ret.width - (BORDER_THICKNESS * 2), + ret.height - (BORDER_THICKNESS * 2), + Color.white) + return ret + end + + #----------------------------------------------------------------------------- + + def message(text, *options) + @pop_up_bg_bitmap.visible = true + msg_bitmap = create_pop_up_window(MESSAGE_BOX_WIDTH, MESSAGE_BOX_HEIGHT) + # Draw text + text_size = msg_bitmap.bitmap.text_size(text) + msg_bitmap.bitmap.draw_text(0, (msg_bitmap.height / 2) - MESSAGE_BOX_BUTTON_HEIGHT, + msg_bitmap.width, text_size.height, text, 1) + # Create buttons + buttons = [] + options.each_with_index do |option, i| + btn = UIControls::Button.new(MESSAGE_BOX_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) + btn.x = msg_bitmap.x + (msg_bitmap.width - (MESSAGE_BOX_BUTTON_WIDTH * options.length)) / 2 + btn.x += MESSAGE_BOX_BUTTON_WIDTH * i + btn.y = msg_bitmap.y + msg_bitmap.height - MESSAGE_BOX_BUTTON_HEIGHT - MESSAGE_BOX_SPACING + btn.set_fixed_size + btn.set_interactive_rects + buttons.push([option[0], btn]) + end + # Interaction loop + ret = nil + captured = nil + loop do + Graphics.update + Input.update + if captured + captured.update + captured = nil if !captured.busy? + else + buttons.each do |btn| + btn[1].update + captured = btn[1] if btn[1].busy? + end + end + buttons.each do |btn| + next if !btn[1].changed? + ret = btn[0] + break + end + ret = :cancel if Input.trigger?(Input::BACK) + break if ret + buttons.each { |btn| btn[1].repaint } + end + # Dispose and return + buttons.each { |btn| btn[1].dispose } + buttons.clear + msg_bitmap.dispose + @pop_up_bg_bitmap.visible = false + return ret + end + + def confirm_message(text) + return message(text, [:yes, _INTL("Yes")], [:no, _INTL("No")]) == :yes + end + + #----------------------------------------------------------------------------- + + def choose_graphic_file(selected) + selected ||= "" + sprite_folder = "Graphics/Battle animations/" + # Get a list of files + files = [] + Dir.chdir(sprite_folder) do + Dir.glob("*.png") { |f| files.push([File.basename(f, ".*"), f]) } + Dir.glob("*.jpg") { |f| files.push([File.basename(f, ".*"), f]) } + Dir.glob("*.jpeg") { |f| files.push([File.basename(f, ".*"), f]) } + end + files.delete_if { |f| ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", + "TARGET_BACK"].include?(f[0].upcase) } + files.sort! { |a, b| a[0].downcase <=> b[0].downcase } + files.prepend(["USER", _INTL("[[User's sprite]]")], + ["USER_OPP", _INTL("[[User's other side sprite]]")], + ["USER_FRONT", _INTL("[[User's front sprite]]")], + ["USER_BACK", _INTL("[[User's back sprite]]")], + ["TARGET", _INTL("[[Target's sprite]]")], + ["TARGET_OPP", _INTL("[[Target's other side sprite]]")], + ["TARGET_FRONT", _INTL("[[Target's front sprite]]")], + ["TARGET_BACK", _INTL("[[Target's back sprite]]")]) + idx = 0 + files.each_with_index do |f, i| + next if f[0] != selected + idx = i + break + end + # Show pop-up window + @pop_up_bg_bitmap.visible = true + bg_bitmap = create_pop_up_window(GRAPHIC_CHOOSER_WINDOW_WIDTH, GRAPHIC_CHOOSER_WINDOW_HEIGHT) + text = _INTL("Choose a file...") + text_size = bg_bitmap.bitmap.text_size(text) + bg_bitmap.bitmap.draw_text(MESSAGE_BOX_SPACING, 11, bg_bitmap.width, text_size.height, text, 0) + # Create list of files + list = UIControls::List.new(GRAPHIC_CHOOSER_FILE_LIST_WIDTH, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT, @pop_up_viewport, files) + list.x = bg_bitmap.x + MESSAGE_BOX_SPACING + list.y = bg_bitmap.y + MESSAGE_BOX_SPACING + 24 + list.selected = idx + list.set_interactive_rects + list.repaint + bg_bitmap.bitmap.outline_rect(MESSAGE_BOX_SPACING - 2, MESSAGE_BOX_SPACING + 24 - 2, + GRAPHIC_CHOOSER_FILE_LIST_WIDTH + 4, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT + 4, Color.black) + # Create buttons + buttons = [] + [[:ok, _INTL("OK")], [:cancel, _INTL("Cancel")]].each_with_index do |option, i| + btn = UIControls::Button.new(GRAPHIC_CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) + btn.x = list.x + (GRAPHIC_CHOOSER_BUTTON_WIDTH * i) + btn.y = list.y + list.height + 2 + btn.set_fixed_size + btn.set_interactive_rects + buttons.push([option[0], btn]) + end + # Create sprite preview + bg_bitmap.bitmap.outline_rect(MESSAGE_BOX_SPACING + list.width + 6, MESSAGE_BOX_SPACING + 24 - 2, + GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, + Color.black) + preview_sprite = Sprite.new(@pop_up_viewport) + preview_sprite.x = list.x + list.width + 8 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) + preview_sprite.y = list.y + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) + preview_bitmap = nil + set_preview_graphic = lambda do |sprite, filename| + preview_bitmap&.dispose + # TODO: When the canvas works, use the proper user's/target's sprite here. + case filename + when "USER", "USER_BACK", "TARGET_BACK", "TARGET_OPP" + preview_bitmap = AnimatedBitmap.new("Graphics/Pokemon/Back/" + "000") + when "TARGET", "TARGET_FRONT", "USER_FRONT", "USER_OPP" + preview_bitmap = AnimatedBitmap.new("Graphics/Pokemon/Front/" + "000") + else + preview_bitmap = AnimatedBitmap.new(sprite_folder + filename) + end + bg_bitmap.bitmap.fill_rect(MESSAGE_BOX_SPACING + list.width + 8, MESSAGE_BOX_SPACING + 24, + GRAPHIC_CHOOSER_PREVIEW_SIZE, GRAPHIC_CHOOSER_PREVIEW_SIZE, + Color.white) + next if !preview_bitmap + sprite.bitmap = preview_bitmap.bitmap + zoom = [[GRAPHIC_CHOOSER_PREVIEW_SIZE.to_f / preview_bitmap.width, + GRAPHIC_CHOOSER_PREVIEW_SIZE.to_f / preview_bitmap.height].min, 1.0].min + sprite.zoom_x = sprite.zoom_y = zoom + sprite.ox = sprite.width / 2 + sprite.oy = sprite.height / 2 + bg_bitmap.bitmap.fill_rect(MESSAGE_BOX_SPACING + list.width + 8 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) - (sprite.width * sprite.zoom_x / 2), + MESSAGE_BOX_SPACING + 24 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) - (sprite.height * sprite.zoom_y / 2), + sprite.width * sprite.zoom_x, sprite.height * sprite.zoom_y, + Color.magenta) + end + set_preview_graphic.call(preview_sprite, list.value) + # Interaction loop + ret = nil + captured = nil + loop do + Graphics.update + Input.update + if captured + captured.update + captured = nil if !captured.busy? + else + list.update + captured = list if list.busy? + buttons.each do |btn| + btn[1].update + captured = btn[1] if btn[1].busy? + end + end + if list.changed? + set_preview_graphic.call(preview_sprite, list.value) + list.clear_changed + end + buttons.each do |btn| + next if !btn[1].changed? + ret = list.value if btn[0] == :ok + ret = selected if btn[0] == :cancel + break + end + ret = selected if Input.trigger?(Input::BACK) + break if ret + list.repaint + buttons.each { |btn| btn[1].repaint } + end + # Dispose and return + list.dispose + buttons.each { |btn| btn[1].dispose } + buttons.clear + bg_bitmap.dispose + preview_sprite.dispose + preview_bitmap&.dispose + @pop_up_bg_bitmap.visible = false + return ret + end + + #----------------------------------------------------------------------------- + + def choose_audio_file(selected, volume = 100, pitch = 100) + selected ||= "" + sprite_folder = "Audio/SE/Anim/" + # Get a list of files + files = [] + Dir.chdir(sprite_folder) do + Dir.glob("*.wav") { |f| files.push([File.basename(f, ".*"), f]) } + Dir.glob("*.ogg") { |f| files.push([File.basename(f, ".*"), f]) } + Dir.glob("*.mp3") { |f| files.push([File.basename(f, ".*"), f]) } + Dir.glob("*.wma") { |f| files.push([File.basename(f, ".*"), f]) } + end + files.delete_if { |f| ["USER", "TARGET"].include?(f[0].upcase) } + files.sort! { |a, b| a[0].downcase <=> b[0].downcase } + files.prepend(["USER", _INTL("[[User's cry]]")], + ["TARGET", _INTL("[[Target's cry]]")]) + idx = 0 + files.each_with_index do |f, i| + next if f[0] != selected + idx = i + break + end + # Show pop-up window + @pop_up_bg_bitmap.visible = true + bg_bitmap = create_pop_up_window(GRAPHIC_CHOOSER_WINDOW_WIDTH - 24, GRAPHIC_CHOOSER_WINDOW_HEIGHT) + text = _INTL("Choose a file...") + text_size = bg_bitmap.bitmap.text_size(text) + bg_bitmap.bitmap.draw_text(MESSAGE_BOX_SPACING, 11, bg_bitmap.width, text_size.height, text, 0) + # Create list of files + list = UIControls::List.new(GRAPHIC_CHOOSER_FILE_LIST_WIDTH, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT, @pop_up_viewport, files) + list.x = bg_bitmap.x + MESSAGE_BOX_SPACING + list.y = bg_bitmap.y + MESSAGE_BOX_SPACING + 24 + list.selected = idx + list.set_interactive_rects + list.repaint + bg_bitmap.bitmap.outline_rect(MESSAGE_BOX_SPACING - 2, MESSAGE_BOX_SPACING + 24 - 2, + GRAPHIC_CHOOSER_FILE_LIST_WIDTH + 4, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT + 4, Color.black) + # Create buttons + buttons = [] + [[:ok, _INTL("OK")], [:cancel, _INTL("Cancel")]].each_with_index do |option, i| + btn = UIControls::Button.new(GRAPHIC_CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) + btn.x = list.x + (GRAPHIC_CHOOSER_BUTTON_WIDTH * i) + btn.y = list.y + list.height + 2 + btn.set_fixed_size + btn.set_interactive_rects + buttons.push([option[0], btn]) + end + # Create audio player controls + [[:volume, _INTL("Volume"), 0, 100], [:pitch, _INTL("Pitch"), 0, 200]].each_with_index do |option, i| + label = UIControls::Label.new(90, 28, @pop_up_viewport, option[1]) + label.x = list.x + list.width + 8 + label.y = list.y + (28 * i) + label.set_interactive_rects + buttons.push([(option[0].to_s + "_label").to_sym, label]) + slider = UIControls::NumberSlider.new(250, 28, @pop_up_viewport, option[2], option[3], (i == 0 ? volume : pitch)) + slider.x = list.x + list.width + 8 + label.width + slider.y = list.y + (28 * i) + slider.set_interactive_rects + buttons.push([option[0], slider]) + end + [[:play, _INTL("Play")], [:stop, _INTL("Stop")]].each_with_index do |option, i| + btn = UIControls::Button.new(GRAPHIC_CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) + btn.x = list.x + list.width + 8 + (GRAPHIC_CHOOSER_BUTTON_WIDTH * i) + btn.y = list.y + (28 * 2) + btn.set_fixed_size + btn.set_interactive_rects + buttons.push([option[0], btn]) + end + # Interaction loop + ret = nil + captured = nil + loop do + Graphics.update + Input.update + if captured + captured.update + captured = nil if !captured.busy? + else + list.update + captured = list if list.busy? + buttons.each do |btn| + btn[1].update + captured = btn[1] if btn[1].busy? + end + end + buttons.each do |btn| + next if !btn[1].changed? + case btn[0] + when :ok + ret = list.value + when :cancel + ret = selected + when :play + vol = buttons.select { |b| b[0] == :volume }[0][1].value + ptch = buttons.select { |b| b[0] == :pitch }[0][1].value + # TODO: Play appropriate things if a cry is selected. + pbSEPlay(RPG::AudioFile.new("Anim/" + list.value, vol, ptch)) + when :stop + pbSEStop + end + btn[1].clear_changed + break + end + ret = selected if Input.trigger?(Input::BACK) + break if ret + list.repaint + buttons.each { |btn| btn[1].repaint } + end + vol = buttons.select { |b| b[0] == :volume }[0][1].value + ptch = buttons.select { |b| b[0] == :pitch }[0][1].value + # Dispose and return + list.dispose + buttons.each { |btn| btn[1].dispose } + buttons.clear + bg_bitmap.dispose + @pop_up_bg_bitmap.visible = false + return [ret, vol, ptch] + end +end diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 4dfbccc69..3d9393d38 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -211,4 +211,77 @@ module AnimationEditor::ParticleDataHelper end return (ret.empty?) ? nil : ret end + + #----------------------------------------------------------------------------- + + def get_se_display_text(property, value) + ret = "" + case property + when :user_cry + ret += _INTL("[[User's cry]]") + when :target_cry + ret += _INTL("[[Target's cry]]") + when :se + ret += value[2] + else + raise _INTL("Unhandled property {1} for SE particle found.", property) + end + volume = (property == :se) ? value[3] : value[2] + ret += " " + _INTL("(volume: {1})", volume) if volume && volume != 100 + pitch = (property == :se) ? value[4] : value[3] + ret += " " + _INTL("(pitch: {1})", pitch) if pitch && pitch != 100 + return ret + end + + # Returns the volume and pitch of the SE to be played at the given frame + # of the given filename. + def get_se_values_from_filename_and_frame(particle, frame, filename) + return nil if !filename + case filename + when "USER", "TARGET" + property = (filename == "USER") ? :user_cry : :target_cry + slot = particle[property].select { |s| s[0] == frame }[0] + return nil if !slot + return slot[2] || 100, slot[3] || 100 + else + slot = particle[:se].select { |s| s[0] == frame && s[2] == filename }[0] + return nil if !slot + return slot[3] || 100, slot[4] || 100 + end + return nil + end + + # Deletes an existing command that plays the same filename at the same frame, + # and adds the new one. + def add_se_command(particle, frame, filename, volume, pitch) + delete_se_command(particle, frame, filename) + case filename + when "USER", "TARGET" + property = (filename == "USER") ? :user_cry : :target_cry + particle[property] ||= [] + particle[property].push([frame, 0, (volume == 100) ? nil : volume, (pitch == 100) ? nil : pitch]) + particle[property].sort! { |a, b| a[0] <=> b[0] } + else + particle[:se] ||= [] + particle[:se].push([frame, 0, filename, (volume == 100) ? nil : volume, (pitch == 100) ? nil : pitch]) + particle[:se].sort! { |a, b| a[0] <=> b[0] } + particle[:se].sort! { |a, b| (a[0] == b[0]) ? a[2].downcase <=> b[2].downcase : a[0] <=> b[0] } + end + end + + # Deletes an existing SE-playing command at the given frame of the given + # filename. + def delete_se_command(particle, frame, filename) + case filename + when "USER", "TARGET" + property = (filename == "USER") ? :user_cry : :target_cry + return if !particle[property] || particle[property].empty? + particle[property].delete_if { |s| s[0] == frame } + particle.delete(property) if particle[property].empty? + else + return if !particle[:se] || particle[:se].empty? + particle[:se].delete_if { |s| s[0] == frame && s[2] == filename } + particle.delete(:se) if particle[:se].empty? + end + end end From 5553218507f2e9e934404772335b592c11a6e90f Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Wed, 29 Nov 2023 23:39:10 +0000 Subject: [PATCH 12/49] UIControls can be disabled, added blacklist to TextBox control --- .../Control elements/001_BaseControl.rb | 35 ++++++++++++---- .../Control elements/003_Checkbox.rb | 10 ++++- .../Control elements/004_TextBox.rb | 25 +++++++++-- .../Control elements/005_NumberSlider.rb | 18 ++++---- .../Control elements/006_NumberTextBox.rb | 7 ++-- .../Control elements/007_Button.rb | 6 +++ .../Control elements/008_List.rb | 3 +- .../Control elements/009_DropdownList.rb | 10 ++++- .../Control elements/101_Scrollbar.rb | 5 +-- .../902_Anim GameData/001_Animation.rb | 14 ++----- .../904_Anim Editor/001_AnimationEditor.rb | 42 +++++++++++-------- .../Anim Editor elements/003_ParticleList.rb | 4 +- .../Anim Editor elements/004_Menu bar.rb | 6 +-- 13 files changed, 116 insertions(+), 69 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index e70b0f747..6ac78b8f6 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -6,20 +6,22 @@ # #=============================================================================== class UIControls::BaseControl < BitmapSprite - attr_reader :value -# attr_accessor :disabled # TODO: Make use of this. + attr_reader :value + attr_accessor :disabled - TEXT_COLOR = Color.black - TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set - HOVER_COLOR = Color.cyan # For clickable area when hovering over it - CAPTURE_COLOR = Color.pink # For area you clicked in but aren't hovering over + TEXT_COLOR = Color.black + TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set + HOVER_COLOR = Color.cyan # For clickable area when hovering over it + CAPTURE_COLOR = Color.pink # For area you clicked in but aren't hovering over + DISABLED_COLOR = Color.gray + DISABLED_COLOR_DARK = Color.new(128, 128, 128) def initialize(width, height, viewport) super(width, height, viewport) self.bitmap.font.color = TEXT_COLOR self.bitmap.font.size = TEXT_SIZE -# @disabled = false # TODO: Make use of this. + @disabled = false @hover_area = nil # Is a symbol from the keys for @interactions if the mouse is hovering over that interaction @captured_area = nil # Is a symbol from the keys for @interactions (or :none) if this control is clicked in clear_changed @@ -58,6 +60,22 @@ class UIControls::BaseControl < BitmapSprite #----------------------------------------------------------------------------- + def disabled? + return @disabled + end + + def disable + return if disabled? + @disabled = true + invalidate + end + + def enable + return if !disabled? + @disabled = false + invalidate + end + def invalid? return @invalid end @@ -177,8 +195,7 @@ class UIControls::BaseControl < BitmapSprite # Updates the logic on the control, invalidating it if necessary. def update return if !self.visible - # TODO: Disabled control stuff. -# return if self.disabled + return if disabled? && !busy? update_hover_highlight diff --git a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb index 06bddaf97..449d49148 100644 --- a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb +++ b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb @@ -33,6 +33,12 @@ class UIControls::Checkbox < UIControls::BaseControl def refresh super + # Draw disabled colour + if disabled? + self.bitmap.fill_rect(@checkbox_rect.x, @checkbox_rect.y, + @checkbox_rect.width, @checkbox_rect.height, + DISABLED_COLOR) + end # Draw checkbox outline self.bitmap.outline_rect(@checkbox_rect.x, @checkbox_rect.y, @checkbox_rect.width, @checkbox_rect.height, @@ -40,12 +46,12 @@ class UIControls::Checkbox < UIControls::BaseControl # Draw checkbox fill if @value # If checked self.bitmap.fill_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 2, @checkbox_rect.y + 2, - CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, CHECKED_COLOR) + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, (disabled?) ? DISABLED_COLOR_DARK : CHECKED_COLOR) self.bitmap.outline_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 2, @checkbox_rect.y + 2, CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) else self.bitmap.fill_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, - CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, UNCHECKED_COLOR) + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, (disabled?) ? DISABLED_COLOR_DARK : UNCHECKED_COLOR) self.bitmap.outline_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) end diff --git a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb index 72cb56e51..032d77552 100644 --- a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb @@ -4,8 +4,6 @@ # decide which characters are selected. Maybe? Note that this method # is only triggered upon the initial mouse press, and isn't repeated # while it's still held down. -# TODO: Add a blacklist array. Can't type in any values in this array. Disable -# this control if @value is in this array. #=============================================================================== class UIControls::TextBox < UIControls::BaseControl TEXT_BOX_X = 2 @@ -21,6 +19,7 @@ class UIControls::TextBox < UIControls::BaseControl @display_pos = 0 @cursor_timer = nil @cursor_shown = false + @blacklist = [] end def value=(new_value) @@ -53,6 +52,11 @@ class UIControls::TextBox < UIControls::BaseControl invalidate end + def set_blacklist(*list) + @blacklist = list + invalidate + end + def set_interactive_rects @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, [TEXT_BOX_WIDTH, width].min, TEXT_BOX_HEIGHT) @@ -63,6 +67,12 @@ class UIControls::TextBox < UIControls::BaseControl #----------------------------------------------------------------------------- + def disabled? + val = (@value.respond_to?("strip!")) ? @value.strip : @value + return true if @blacklist.include?(val) + return super + end + def busy? return @cursor_pos >= 0 if @captured_area == :text_box return super @@ -157,6 +167,12 @@ class UIControls::TextBox < UIControls::BaseControl def refresh super + # Draw disabled colour + if disabled? + self.bitmap.fill_rect(@text_box_rect.x, @text_box_rect.y, + @text_box_rect.width, @text_box_rect.height, + DISABLED_COLOR) + end # Draw text box outline self.bitmap.outline_rect(@text_box_rect.x, @text_box_rect.y, @text_box_rect.width, @text_box_rect.height, @@ -204,6 +220,7 @@ class UIControls::TextBox < UIControls::BaseControl invalidate else @value.strip! if @value.respond_to?("strip!") + @value = @initial_value if disabled? set_changed if @initial_value && @value != @initial_value reset_interaction end @@ -224,6 +241,7 @@ class UIControls::TextBox < UIControls::BaseControl # Released mouse button outside of text box, or initially clicked outside of # text box; end interaction with this control @value.strip! if @value.respond_to?("strip!") + @value = @initial_value if disabled? set_changed if @initial_value && @value != @initial_value reset_interaction super # Make this control not busy again @@ -252,6 +270,7 @@ class UIControls::TextBox < UIControls::BaseControl if Input.triggerex?(:RETURN) || Input.repeatex?(:RETURN) || Input.triggerex?(:KP_ENTER) || Input.repeatex?(:KP_ENTER) @value.strip! if @value.respond_to?("strip!") + @value = @initial_value if disabled? set_changed if @initial_value && @value != @initial_value reset_interaction @captured_area = nil @@ -274,8 +293,6 @@ class UIControls::TextBox < UIControls::BaseControl def update return if !self.visible super - # TODO: Disabled control stuff. -# return if self.disabled # Make the cursor flash if @captured_area == :text_box cursor_to_show = ((System.uptime - @cursor_timer) / 0.35).to_i.even? diff --git a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb index edaf9c524..97e0df00d 100644 --- a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb +++ b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb @@ -1,5 +1,6 @@ #=============================================================================== -# +# TODO: Is there a better knob design than a big black rectangle? I'd rather +# it not be a different colour. #=============================================================================== class UIControls::NumberSlider < UIControls::BaseControl attr_reader :min_value @@ -15,10 +16,6 @@ class UIControls::NumberSlider < UIControls::BaseControl VALUE_X = PLUS_X + PLUS_MINUS_SIZE + 5 TEXT_OFFSET_Y = 5 - # TODO: Is there a better knob design than a big black rectangle? I'd rather - # it not be a different colour. - SLIDER_KNOB_COLOR = Color.black - def initialize(width, height, viewport, min_value, max_value, value) super(width, height, viewport) @min_value = min_value @@ -72,8 +69,9 @@ class UIControls::NumberSlider < UIControls::BaseControl def refresh super + button_color = (disabled?) ? DISABLED_COLOR : self.bitmap.font.color # Draw minus button - self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, self.bitmap.font.color) + self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, button_color) # Draw slider bar self.bitmap.fill_rect(SLIDER_X, (self.height / 2) - 1, SLIDER_LENGTH, 2, self.bitmap.font.color) # Draw notches on slider bar @@ -83,10 +81,10 @@ class UIControls::NumberSlider < UIControls::BaseControl # Draw slider knob fraction = (self.value - self.min_value) / (self.max_value.to_f - self.min_value) knob_x = (SLIDER_LENGTH * fraction).to_i - self.bitmap.fill_rect(SLIDER_X + knob_x - 4, (self.height / 2) - 6, 8, 12, SLIDER_KNOB_COLOR) + self.bitmap.fill_rect(SLIDER_X + knob_x - 4, (self.height / 2) - 6, 8, 12, button_color) # Draw plus button - self.bitmap.fill_rect(@plus_rect.x + 2, @plus_rect.y + (@plus_rect.height / 2) - 2, @plus_rect.width - 4, 4, self.bitmap.font.color) - self.bitmap.fill_rect(@plus_rect.x + (@plus_rect.width / 2) - 2, @plus_rect.y + 2, 4, @plus_rect.height - 4, self.bitmap.font.color) + self.bitmap.fill_rect(@plus_rect.x + 2, @plus_rect.y + (@plus_rect.height / 2) - 2, @plus_rect.width - 4, 4, button_color) + self.bitmap.fill_rect(@plus_rect.x + (@plus_rect.width / 2) - 2, @plus_rect.y + 2, 4, @plus_rect.height - 4, button_color) # Draw value text draw_text(self.bitmap, VALUE_X, TEXT_OFFSET_Y, self.value.to_s) end @@ -108,8 +106,6 @@ class UIControls::NumberSlider < UIControls::BaseControl def update return if !self.visible super - # TODO: Disabled control stuff. -# return if self.disabled case @captured_area when :minus # Constant decrement of value while pressing the minus button diff --git a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb index 54a0895c2..6316a1c27 100644 --- a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb @@ -78,11 +78,12 @@ class UIControls::NumberTextBox < UIControls::TextBox def refresh super + button_color = (disabled?) ? DISABLED_COLOR : self.bitmap.font.color # Draw minus button - self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, self.bitmap.font.color) + self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, button_color) # Draw plus button - self.bitmap.fill_rect(@plus_rect.x + 2, @plus_rect.y + (@plus_rect.height / 2) - 2, @plus_rect.width - 4, 4, self.bitmap.font.color) - self.bitmap.fill_rect(@plus_rect.x + (@plus_rect.width / 2) - 2, @plus_rect.y + 2, 4, @plus_rect.height - 4, self.bitmap.font.color) + self.bitmap.fill_rect(@plus_rect.x + 2, @plus_rect.y + (@plus_rect.height / 2) - 2, @plus_rect.width - 4, 4, button_color) + self.bitmap.fill_rect(@plus_rect.x + (@plus_rect.width / 2) - 2, @plus_rect.y + 2, 4, @plus_rect.height - 4, button_color) end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index d25c13f7f..403419004 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -50,6 +50,12 @@ class UIControls::Button < UIControls::BaseControl def refresh super + # Draw disabled colour + if disabled? + self.bitmap.fill_rect(@button_rect.x, @button_rect.y, + @button_rect.width, @button_rect.height, + DISABLED_COLOR) + end # Draw button outline self.bitmap.outline_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, diff --git a/Data/Scripts/801_UI controls/Control elements/008_List.rb b/Data/Scripts/801_UI controls/Control elements/008_List.rb index f6ffd521c..fbd4cc35a 100644 --- a/Data/Scripts/801_UI controls/Control elements/008_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_List.rb @@ -5,6 +5,7 @@ # any lag at the moment with a tall list. # TODO: Make a viewport for the list, and allow scrolling positions halfway # through a line? Nah. +# TODO: This control cannot be disabled. #=============================================================================== class UIControls::List < UIControls::BaseControl LIST_X = 0 @@ -217,8 +218,6 @@ class UIControls::List < UIControls::BaseControl return if !self.visible @scrollbar.update super - # TODO: Disabled control stuff. -# return if self.disabled # Refresh the list's position if changed by moving the scrollbar self.top_row = (@scrollbar.position.to_f / ROW_HEIGHT).round # Set the selected row to the row the mouse is over, if clicked on diff --git a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb index a1f2331a4..c374d4bf1 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb @@ -81,10 +81,16 @@ class UIControls::DropdownList < UIControls::BaseControl def refresh @dropdown_menu&.refresh super + # Draw disabled colour + if disabled? + self.bitmap.fill_rect(@button_rect.x, @button_rect.y, + @button_rect.width, @button_rect.height, + DISABLED_COLOR) + end # Draw button outline self.bitmap.outline_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - Color.black) + self.bitmap.font.color) # Draw value draw_text(self.bitmap, @button_rect.x + TEXT_BOX_PADDING, TEXT_OFFSET_Y, @options[@value] || "???") # Draw down arrow @@ -95,7 +101,7 @@ class UIControls::DropdownList < UIControls::BaseControl 6.times do |i| self.bitmap.fill_rect(arrow_area_x + (arrow_area_width / 2) - 5 + i, @button_rect.y + (arrow_area_width / 2) - 1 + i, - 11 - (2 * i), 1, Color.black) + 11 - (2 * i), 1, (disabled?) ? DISABLED_COLOR_DARK : self.bitmap.font.color) end end diff --git a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb index 516b4e267..7a1b28323 100644 --- a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb +++ b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb @@ -87,6 +87,7 @@ class UIControls::Scrollbar < UIControls::BaseControl if @captured_area == :slider || (!@captured_area && @hover_area == :slider) bar_color = GRAB_COLOR end + bar_color = DISABLED_COLOR if disabled? self.bitmap.fill_rect(@slider.x, @slider.y, @slider.width, @slider.height, bar_color) end end @@ -120,8 +121,6 @@ class UIControls::Scrollbar < UIControls::BaseControl def update return if !self.visible super - # TODO: Disabled control stuff. -# return if self.disabled if @captured_area == :slider # TODO: Have a display y position for the slider bar which is in pixels, # and round it to the nearest row when setting @top_row? This is @@ -141,7 +140,7 @@ class UIControls::Scrollbar < UIControls::BaseControl self.slider_top = @slider_top + ((@tray_size - @slider_size) / 4.0).ceil end end - else + elsif !disabled? mouse_x, mouse_y = mouse_pos if mouse_x && mouse_y && @interactions[:slider_tray].contains?(mouse_x, mouse_y) wheel_v = Input.scroll_v diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 8c8c49700..548213417 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -242,17 +242,9 @@ module GameData ret = @particles[index][SUB_SCHEMA[key][0]] if SUB_SCHEMA[key] ret = nil if ret == false || (ret.is_a?(Array) && ret.length == 0) || ret == "" case key - when "Focus" - # The User and Target particles are hardcoded to only have their - # corresponding foci, so they don't need writing to PBS - if ["User", "Target"].include?(@particles[index][:name]) - ret = nil - elsif ret - ret = SUB_SCHEMA[key][2].key(ret) - end - when "graphic" - # The User and Target particles have hardcoded graphics, so they don't - # need writing to PBS + when "Graphic", "Focus" + # The User and Target particles have hardcoded graphics/foci, so they + # don't need writing to PBS ret = nil if ["User", "Target"].include?(@particles[index][:name]) when "Play" # TODO: Turn volume/pitch of 100 into nil. diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 9b15e9130..b1a8e5064 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -8,8 +8,6 @@ # "User"(?). # TODO: Things that need pop-up windows (draws a semi-transparent grey over the # whole screen behind the window): -# - graphic picker -# - SE file picker # - animation properties (Move/OppMove/Common/OppCommon, move, version, # extra name, target, filepath, flags, etc.) # - editor settings (theme, canvas BG graphics, user/target graphics, @@ -213,11 +211,8 @@ class AnimationEditor def set_particle_pane_contents particle_pane = @components[:particle_pane] particle_pane.add_header_label(:header, _INTL("Edit particle properties")) - # TODO: Name should blacklist certain names ("User", "Target", "SE") and - # should be disabled if the value is one of those. - particle_pane.add_labelled_text_box(:name, _INTL("Name"), _INTL("Untitled")) - # TODO: Graphic should show the graphic's name alongside a "Change" button. - # New kind of control that is a label plus a button? + particle_pane.add_labelled_text_box(:name, _INTL("Name"), "") + particle_pane.get_control(:name).set_blacklist("User", "Target", "SE") particle_pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") particle_pane.add_labelled_button(:graphic, "", _INTL("Change")) particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), { @@ -327,7 +322,6 @@ class AnimationEditor # which should be indicated somehow in ctrl[1]. end when :se_pane - # TODO: Activate/deactivate Edit/Delete buttons accordingly. se_particle = @anim[:particles].select { |p| p[:name] == "SE" }[0] kyfrm = keyframe # Populate list of files @@ -346,7 +340,16 @@ class AnimationEditor end list.sort! { |a, b| a[1].downcase <=> b[1].downcase } component.get_control(:list).values = list + # Enable/disable the "Edit" and "Delete" buttons + if list.length > 0 && component.get_control(:list).value + component.get_control(:edit).enable + component.get_control(:delete).enable + else + component.get_control(:edit).disable + component.get_control(:delete).disable + end when :particle_pane + # Display particle's graphic's name new_vals = AnimationEditor::ParticleDataHelper.get_all_particle_values(@anim[:particles][particle_index]) component.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) @@ -365,7 +368,14 @@ class AnimationEditor } graphic_name = graphic_override_names[graphic_name] if graphic_override_names[graphic_name] component.get_control(:graphic_name).label = graphic_name - # TODO: Disable the name, graphic and focus controls for "User"/"Target". + # Enable/disable the Graphic and Focus controls for "User"/"Target" + if ["User", "Target"].include?(@anim[:particles][particle_index][:name]) + component.get_control(:graphic).disable + component.get_control(:focus).disable + else + component.get_control(:graphic).enable + component.get_control(:focus).enable + end end end @@ -394,7 +404,7 @@ class AnimationEditor save when :name # TODO: Open the animation properties pop-up window. - echoln "animation name clicked" + echoln "Animation's name button clicked" end when :canvas # TODO: Detect and apply changes made in canvas, e.g. moving particle, @@ -403,6 +413,7 @@ class AnimationEditor case property when :color_tone # Button # TODO: Open the colour/tone side pane. + echoln "Color/Tone button clicked" else particle = @anim[:particles][particle_index] new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) @@ -417,6 +428,8 @@ class AnimationEditor end when :se_pane case property + when :list # List + refresh_component(:se_pane) when :add # Button new_file, new_volume, new_pitch = choose_audio_file("", 100, 100) if new_file != "" @@ -451,8 +464,6 @@ class AnimationEditor @components[:play_controls].duration = @components[:particle_list].duration refresh_component(:se_pane) end - else -# particle = @anim[:particles][particle_index] end when :particle_pane case property @@ -474,7 +485,7 @@ class AnimationEditor # TODO: Stuff here once I decide what controls to add. when :particle_list # refresh if keyframe != old_keyframe || particle_index != old_particle_index - # TODO: Lots of stuff here. + # TODO: Lots of stuff here when buttons are added to it. when :play_controls # TODO: Will the play controls ever signal themselves as changed? I don't # think so. @@ -515,13 +526,10 @@ class AnimationEditor def run Input.text_input = false loop do - # TODO: Do we need to check for Input.text_input? I think just checking - # @captured != nil will suffice. - inputting_text = Input.text_input Graphics.update Input.update update - if !inputting_text && @captured.nil? && @quit + if @captured.nil? && @quit case message(_INTL("Do you want to save changes to the animation?"), [:yes, _INTL("Yes")], [:no, _INTL("No")], [:cancel, _INTL("Cancel")]) when :yes diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index bbce614a3..a35dca01c 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -450,7 +450,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl if particle_data[:name] == "SE" bg_color = SE_CONTROL_BG else - bg_color = CONTROL_BG_COLORS[@particles[@particle_list[index][0]][:focus]] || Color.magenta + bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta end # Draw hover highlight hover_color = nil @@ -487,7 +487,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl if particle_data[:name] == "SE" bg_color = SE_CONTROL_BG else - bg_color = CONTROL_BG_COLORS[@particles[@particle_list[index][0]][:focus]] || Color.magenta + bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta end # Get visibilities of particle for each keyframe visible_cmds = @visibilities[p_index] diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb index 6140e5575..b8e589bea 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb @@ -41,9 +41,9 @@ class AnimationEditor::MenuBar < UIControls::ControlsContainer i = @controls.length control_x = (add_offset ? @row_count - 1 : @row_count) * MENU_BUTTON_WIDTH control_x = @width - control.width if control.width == NAME_BUTTON_WIDTH - @control_rects[i] = Rect.new(control_x, 0, control.width, control.height) - control.x = @control_rects[i].x + (add_offset ? OFFSET_FROM_LABEL_X : 0) - control.y = @control_rects[i].y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) + control_y = 0 + control.x = control_x + (add_offset ? OFFSET_FROM_LABEL_X : 0) + control.y = control_y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) control.set_interactive_rects @controls[i] = [id, control] @row_count += 1 if !add_offset From b69f1fc5a647dd51a1574cd9cd97c1764c8c1a59 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 30 Nov 2023 22:16:42 +0000 Subject: [PATCH 13/49] Fleshed out Animation Editor's chooser screen, added lots of example animation PBS files --- .../902_Anim GameData/001_Animation.rb | 4 + .../100_convert old anims to new.rb | 175 ++++ .../904_Anim Editor/010_AnimationSelector.rb | 297 +++--- .../Anim Editor elements/003_ParticleList.rb | 2 +- PBS/Animations/Converted/Common/Attract.txt | 116 +++ PBS/Animations/Converted/Common/Bind.txt | 47 + PBS/Animations/Converted/Common/Burn.txt | 20 + PBS/Animations/Converted/Common/Confusion.txt | 49 + PBS/Animations/Converted/Common/FireSpin.txt | 132 +++ PBS/Animations/Converted/Common/Frozen.txt | 64 ++ PBS/Animations/Converted/Common/Hail.txt | 168 ++++ .../Converted/Common/HealthDown.txt | 170 ++++ PBS/Animations/Converted/Common/HealthUp.txt | 38 + PBS/Animations/Converted/Common/LeechSeed.txt | 111 +++ PBS/Animations/Converted/Common/Paralysis.txt | 55 ++ .../Converted/Common/ParentalBond.txt | 22 + PBS/Animations/Converted/Common/Poison.txt | 18 + PBS/Animations/Converted/Common/Rain.txt | 251 +++++ PBS/Animations/Converted/Common/Sandstorm.txt | 288 ++++++ PBS/Animations/Converted/Common/Shadow.txt | 70 ++ PBS/Animations/Converted/Common/ShadowSky.txt | 23 + PBS/Animations/Converted/Common/Shiny.txt | 70 ++ PBS/Animations/Converted/Common/Sleep.txt | 70 ++ PBS/Animations/Converted/Common/StatDown.txt | 143 +++ PBS/Animations/Converted/Common/StatUp.txt | 111 +++ PBS/Animations/Converted/Common/Sun.txt | 41 + .../Converted/Common/SuperShiny.txt | 70 ++ PBS/Animations/Converted/Common/Toxic.txt | 18 + PBS/Animations/Converted/Common/Wrap.txt | 47 + PBS/Animations/Converted/Move/ABSORB.txt | 188 ++++ PBS/Animations/Converted/Move/ACID.txt | 53 ++ PBS/Animations/Converted/Move/ACIDARMOR.txt | 24 + PBS/Animations/Converted/Move/ACIDSPRAY.txt | 133 +++ PBS/Animations/Converted/Move/ACROBATICS.txt | 44 + PBS/Animations/Converted/Move/ACUPRESSURE.txt | 97 ++ PBS/Animations/Converted/Move/AERIALACE.txt | 372 ++++++++ PBS/Animations/Converted/Move/AGILITY.txt | 87 ++ PBS/Animations/Converted/Move/ALLYSWITCH.txt | 52 ++ PBS/Animations/Converted/Move/AMNESIA.txt | 22 + .../Converted/Move/ANCIENTPOWER.txt | 312 +++++++ PBS/Animations/Converted/Move/AQUARING.txt | 66 ++ .../Converted/Move/AROMATHERAPY.txt | 156 ++++ PBS/Animations/Converted/Move/AURORABEAM.txt | 229 +++++ PBS/Animations/Converted/Move/BARRIER.txt | 56 ++ PBS/Animations/Converted/Move/BEATUP.txt | 229 +++++ PBS/Animations/Converted/Move/BIND.txt | 47 + PBS/Animations/Converted/Move/BITE.txt | 24 + PBS/Animations/Converted/Move/BLASTBURN.txt | 207 +++++ PBS/Animations/Converted/Move/BLOCK.txt | 18 + PBS/Animations/Converted/Move/BLUEFLARE.txt | 34 + PBS/Animations/Converted/Move/BODYSLAM.txt | 18 + PBS/Animations/Converted/Move/BRICKBREAK.txt | 36 + PBS/Animations/Converted/Move/BUBBLE.txt | 221 +++++ PBS/Animations/Converted/Move/BUBBLEBEAM.txt | 393 ++++++++ PBS/Animations/Converted/Move/BULKUP.txt | 72 ++ PBS/Animations/Converted/Move/BULLETPUNCH.txt | 104 +++ PBS/Animations/Converted/Move/BULLETSEED.txt | 526 +++++++++++ PBS/Animations/Converted/Move/CHARGE.txt | 105 +++ PBS/Animations/Converted/Move/CHARM.txt | 59 ++ PBS/Animations/Converted/Move/CLEARSMOG.txt | 26 + PBS/Animations/Converted/Move/CLOSECOMBAT.txt | 229 +++++ PBS/Animations/Converted/Move/COMETPUNCH.txt | 176 ++++ PBS/Animations/Converted/Move/CONFUSERAY.txt | 52 ++ PBS/Animations/Converted/Move/COTTONGUARD.txt | 87 ++ PBS/Animations/Converted/Move/COTTONSPORE.txt | 18 + PBS/Animations/Converted/Move/COUNTER.txt | 134 +++ PBS/Animations/Converted/Move/CRUNCH.txt | 90 ++ PBS/Animations/Converted/Move/CRUSHCLAW.txt | 30 + PBS/Animations/Converted/Move/CURSE.txt | 23 + PBS/Animations/Converted/Move/CUT.txt | 20 + PBS/Animations/Converted/Move/DEFENSECURL.txt | 34 + PBS/Animations/Converted/Move/DETECT.txt | 28 + PBS/Animations/Converted/Move/DISABLE.txt | 38 + PBS/Animations/Converted/Move/DIZZYPUNCH.txt | 193 ++++ PBS/Animations/Converted/Move/DOUBLEEDGE.txt | 48 + PBS/Animations/Converted/Move/DOUBLEKICK.txt | 73 ++ PBS/Animations/Converted/Move/DOUBLESLAP.txt | 176 ++++ .../Converted/Move/DRAGONBREATH.txt | 112 +++ PBS/Animations/Converted/Move/DRAGONCLAW.txt | 23 + PBS/Animations/Converted/Move/DRAGONDANCE.txt | 28 + PBS/Animations/Converted/Move/DRAGONRAGE.txt | 64 ++ .../Converted/Move/DYNAMICPUNCH.txt | 55 ++ PBS/Animations/Converted/Move/EMBER.txt | 48 + PBS/Animations/Converted/Move/ENCORE.txt | 60 ++ PBS/Animations/Converted/Move/ENERGYBALL.txt | 38 + PBS/Animations/Converted/Move/ERUPTION.txt | 75 ++ PBS/Animations/Converted/Move/EXPLOSION.txt | 66 ++ PBS/Animations/Converted/Move/FAKEOUT.txt | 41 + PBS/Animations/Converted/Move/FAKETEARS.txt | 84 ++ PBS/Animations/Converted/Move/FIERYDANCE.txt | 118 +++ PBS/Animations/Converted/Move/FINALGAMBIT.txt | 57 ++ PBS/Animations/Converted/Move/FIREBLAST.txt | 30 + PBS/Animations/Converted/Move/FIREFANG.txt | 101 ++ PBS/Animations/Converted/Move/FIREPLEDGE.txt | 36 + PBS/Animations/Converted/Move/FIREPUNCH.txt | 113 +++ PBS/Animations/Converted/Move/FIRESPIN.txt | 38 + PBS/Animations/Converted/Move/FLAIL.txt | 63 ++ PBS/Animations/Converted/Move/FLAMEBURST.txt | 249 +++++ PBS/Animations/Converted/Move/FLAMECHARGE.txt | 74 ++ .../Converted/Move/FLAMETHROWER.txt | 305 ++++++ PBS/Animations/Converted/Move/FLAMEWHEEL.txt | 252 +++++ PBS/Animations/Converted/Move/FLASH.txt | 18 + PBS/Animations/Converted/Move/FLY.txt | 62 ++ PBS/Animations/Converted/Move/FOCUSENERGY.txt | 26 + PBS/Animations/Converted/Move/FOLLOWME.txt | 90 ++ PBS/Animations/Converted/Move/FORESIGHT.txt | 41 + PBS/Animations/Converted/Move/FRENZYPLANT.txt | 36 + PBS/Animations/Converted/Move/FURYATTACK.txt | 356 +++++++ PBS/Animations/Converted/Move/FURYCUTTER.txt | 18 + PBS/Animations/Converted/Move/FURYSWIPES.txt | 716 +++++++++++++++ PBS/Animations/Converted/Move/FUTURESIGHT.txt | 55 ++ PBS/Animations/Converted/Move/GASTROACID.txt | 104 +++ PBS/Animations/Converted/Move/GIGADRAIN.txt | 166 ++++ PBS/Animations/Converted/Move/GLARE.txt | 39 + .../Converted/Move/GRASSWHISTLE.txt | 160 ++++ PBS/Animations/Converted/Move/GROWL.txt | 132 +++ PBS/Animations/Converted/Move/GRUDGE.txt | 171 ++++ PBS/Animations/Converted/Move/GUST.txt | 129 +++ PBS/Animations/Converted/Move/HAIL.txt | 170 ++++ PBS/Animations/Converted/Move/HARDEN.txt | 23 + PBS/Animations/Converted/Move/HEADBUTT.txt | 23 + PBS/Animations/Converted/Move/HEATWAVE.txt | 87 ++ .../Converted/Move/HIGHJUMPKICK.txt | 36 + PBS/Animations/Converted/Move/HORNATTACK.txt | 36 + PBS/Animations/Converted/Move/HYDROPUMP.txt | 43 + PBS/Animations/Converted/Move/HYPERFANG.txt | 24 + PBS/Animations/Converted/Move/ICEBALL.txt | 31 + PBS/Animations/Converted/Move/ICEFANG.txt | 106 +++ PBS/Animations/Converted/Move/ICEPUNCH.txt | 172 ++++ PBS/Animations/Converted/Move/ICICLESPEAR.txt | 156 ++++ PBS/Animations/Converted/Move/ICYWIND.txt | 58 ++ PBS/Animations/Converted/Move/INFERNO.txt | 298 ++++++ PBS/Animations/Converted/Move/IRONHEAD.txt | 63 ++ PBS/Animations/Converted/Move/JUMPKICK.txt | 35 + PBS/Animations/Converted/Move/KARATECHOP.txt | 35 + PBS/Animations/Converted/Move/KINESIS.txt | 30 + PBS/Animations/Converted/Move/LEAFBLADE.txt | 22 + PBS/Animations/Converted/Move/LEECHLIFE.txt | 123 +++ PBS/Animations/Converted/Move/LEECHSEED.txt | 134 +++ PBS/Animations/Converted/Move/LEER.txt | 49 + PBS/Animations/Converted/Move/LICK.txt | 22 + PBS/Animations/Converted/Move/LIGHTSCREEN.txt | 84 ++ PBS/Animations/Converted/Move/LOCKON.txt | 81 ++ PBS/Animations/Converted/Move/LOVELYKISS.txt | 105 +++ PBS/Animations/Converted/Move/LOWKICK.txt | 31 + PBS/Animations/Converted/Move/LUCKYCHANT.txt | 296 ++++++ PBS/Animations/Converted/Move/MACHPUNCH.txt | 74 ++ PBS/Animations/Converted/Move/MAGICCOAT.txt | 127 +++ PBS/Animations/Converted/Move/MEANLOOK.txt | 23 + PBS/Animations/Converted/Move/MEGADRAIN.txt | 268 ++++++ PBS/Animations/Converted/Move/MEGAHORN.txt | 104 +++ PBS/Animations/Converted/Move/MEGAKICK.txt | 36 + PBS/Animations/Converted/Move/MEGAPUNCH.txt | 64 ++ PBS/Animations/Converted/Move/METALCLAW.txt | 30 + PBS/Animations/Converted/Move/METEORMASH.txt | 124 +++ PBS/Animations/Converted/Move/METRONOME.txt | 93 ++ PBS/Animations/Converted/Move/MIST.txt | 57 ++ PBS/Animations/Converted/Move/MISTBALL.txt | 59 ++ PBS/Animations/Converted/Move/MOONLIGHT.txt | 35 + PBS/Animations/Converted/Move/MORNINGSUN.txt | 27 + PBS/Animations/Converted/Move/NIGHTMARE.txt | 123 +++ PBS/Animations/Converted/Move/OUTRAGE.txt | 174 ++++ PBS/Animations/Converted/Move/OVERHEAT.txt | 113 +++ PBS/Animations/Converted/Move/PAYDAY.txt | 67 ++ PBS/Animations/Converted/Move/PETALDANCE.txt | 105 +++ PBS/Animations/Converted/Move/PINMISSILE.txt | 491 ++++++++++ PBS/Animations/Converted/Move/POISONFANG.txt | 55 ++ PBS/Animations/Converted/Move/POISONGAS.txt | 142 +++ .../Converted/Move/POISONPOWDER.txt | 18 + PBS/Animations/Converted/Move/POISONSTING.txt | 68 ++ PBS/Animations/Converted/Move/POISONTAIL.txt | 25 + PBS/Animations/Converted/Move/POUND.txt | 36 + PBS/Animations/Converted/Move/PSYCHIC.txt | 74 ++ PBS/Animations/Converted/Move/PSYCHOCUT.txt | 184 ++++ PBS/Animations/Converted/Move/QUICKATTACK.txt | 60 ++ PBS/Animations/Converted/Move/RAINDANCE.txt | 251 +++++ PBS/Animations/Converted/Move/RAZORLEAF.txt | 128 +++ PBS/Animations/Converted/Move/REFLECT.txt | 93 ++ PBS/Animations/Converted/Move/REST.txt | 34 + PBS/Animations/Converted/Move/ROAR.txt | 104 +++ PBS/Animations/Converted/Move/ROCKSMASH.txt | 19 + PBS/Animations/Converted/Move/ROCKTHROW.txt | 31 + PBS/Animations/Converted/Move/ROLLINGKICK.txt | 46 + PBS/Animations/Converted/Move/SANDATTACK.txt | 564 ++++++++++++ PBS/Animations/Converted/Move/SANDSTORM.txt | 288 ++++++ PBS/Animations/Converted/Move/SCARYFACE.txt | 35 + PBS/Animations/Converted/Move/SCRATCH.txt | 25 + PBS/Animations/Converted/Move/SCREECH.txt | 53 ++ .../Converted/Move/SELFDESTRUCT.txt | 74 ++ PBS/Animations/Converted/Move/SHADOWBALL.txt | 52 ++ PBS/Animations/Converted/Move/SIGNALBEAM.txt | 390 ++++++++ PBS/Animations/Converted/Move/SILVERWIND.txt | 278 ++++++ PBS/Animations/Converted/Move/SING.txt | 868 ++++++++++++++++++ PBS/Animations/Converted/Move/SKETCH.txt | 57 ++ PBS/Animations/Converted/Move/SLAM.txt | 18 + PBS/Animations/Converted/Move/SLASH.txt | 47 + PBS/Animations/Converted/Move/SLEEPPOWDER.txt | 18 + PBS/Animations/Converted/Move/SLUDGE.txt | 30 + PBS/Animations/Converted/Move/SLUDGEBOMB.txt | 79 ++ PBS/Animations/Converted/Move/SMOG.txt | 18 + PBS/Animations/Converted/Move/SMOKESCREEN.txt | 102 ++ PBS/Animations/Converted/Move/SPIDERWEB.txt | 69 ++ PBS/Animations/Converted/Move/SPIKECANNON.txt | 376 ++++++++ PBS/Animations/Converted/Move/SPIKES.txt | 84 ++ PBS/Animations/Converted/Move/SPLASH.txt | 69 ++ PBS/Animations/Converted/Move/SPORE.txt | 18 + PBS/Animations/Converted/Move/STEALTHROCK.txt | 479 ++++++++++ PBS/Animations/Converted/Move/STOMP.txt | 22 + PBS/Animations/Converted/Move/STRINGSHOT.txt | 121 +++ PBS/Animations/Converted/Move/STRUGGLE.txt | 55 ++ PBS/Animations/Converted/Move/STUNSPORE.txt | 18 + PBS/Animations/Converted/Move/SUNNYDAY.txt | 41 + PBS/Animations/Converted/Move/SUPERSONIC.txt | 103 +++ PBS/Animations/Converted/Move/SWAGGER.txt | 43 + PBS/Animations/Converted/Move/SWEETKISS.txt | 75 ++ PBS/Animations/Converted/Move/SWIFT.txt | 117 +++ PBS/Animations/Converted/Move/SWORDSDANCE.txt | 102 ++ PBS/Animations/Converted/Move/TACKLE.txt | 22 + PBS/Animations/Converted/Move/TAILGLOW.txt | 39 + PBS/Animations/Converted/Move/TAILWHIP.txt | 36 + PBS/Animations/Converted/Move/TELEPORT.txt | 63 ++ PBS/Animations/Converted/Move/THUNDER.txt | 66 ++ PBS/Animations/Converted/Move/THUNDERBOLT.txt | 40 + PBS/Animations/Converted/Move/THUNDERFANG.txt | 71 ++ .../Converted/Move/THUNDERPUNCH.txt | 111 +++ .../Converted/Move/THUNDERSHOCK.txt | 20 + PBS/Animations/Converted/Move/THUNDERWAVE.txt | 47 + PBS/Animations/Converted/Move/TOXIC.txt | 62 ++ PBS/Animations/Converted/Move/TRICKROOM.txt | 33 + PBS/Animations/Converted/Move/TWINEEDLE.txt | 123 +++ PBS/Animations/Converted/Move/TWISTER.txt | 23 + PBS/Animations/Converted/Move/VINEWHIP.txt | 34 + PBS/Animations/Converted/Move/WATERGUN.txt | 209 +++++ PBS/Animations/Converted/Move/WATERPULSE.txt | 45 + PBS/Animations/Converted/Move/WHIRLWIND.txt | 18 + PBS/Animations/Converted/Move/WILLOWISP.txt | 70 ++ PBS/Animations/Converted/Move/WINGATTACK.txt | 19 + PBS/Animations/Converted/Move/WRAP.txt | 47 + PBS/Animations/Converted/Move/WRINGOUT.txt | 56 ++ PBS/Animations/Converted/Move/XSCISSOR.txt | 40 + PBS/Animations/Converted/Move/ZAPCANNON.txt | 22 + 241 files changed, 24533 insertions(+), 104 deletions(-) create mode 100644 Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb create mode 100644 PBS/Animations/Converted/Common/Attract.txt create mode 100644 PBS/Animations/Converted/Common/Bind.txt create mode 100644 PBS/Animations/Converted/Common/Burn.txt create mode 100644 PBS/Animations/Converted/Common/Confusion.txt create mode 100644 PBS/Animations/Converted/Common/FireSpin.txt create mode 100644 PBS/Animations/Converted/Common/Frozen.txt create mode 100644 PBS/Animations/Converted/Common/Hail.txt create mode 100644 PBS/Animations/Converted/Common/HealthDown.txt create mode 100644 PBS/Animations/Converted/Common/HealthUp.txt create mode 100644 PBS/Animations/Converted/Common/LeechSeed.txt create mode 100644 PBS/Animations/Converted/Common/Paralysis.txt create mode 100644 PBS/Animations/Converted/Common/ParentalBond.txt create mode 100644 PBS/Animations/Converted/Common/Poison.txt create mode 100644 PBS/Animations/Converted/Common/Rain.txt create mode 100644 PBS/Animations/Converted/Common/Sandstorm.txt create mode 100644 PBS/Animations/Converted/Common/Shadow.txt create mode 100644 PBS/Animations/Converted/Common/ShadowSky.txt create mode 100644 PBS/Animations/Converted/Common/Shiny.txt create mode 100644 PBS/Animations/Converted/Common/Sleep.txt create mode 100644 PBS/Animations/Converted/Common/StatDown.txt create mode 100644 PBS/Animations/Converted/Common/StatUp.txt create mode 100644 PBS/Animations/Converted/Common/Sun.txt create mode 100644 PBS/Animations/Converted/Common/SuperShiny.txt create mode 100644 PBS/Animations/Converted/Common/Toxic.txt create mode 100644 PBS/Animations/Converted/Common/Wrap.txt create mode 100644 PBS/Animations/Converted/Move/ABSORB.txt create mode 100644 PBS/Animations/Converted/Move/ACID.txt create mode 100644 PBS/Animations/Converted/Move/ACIDARMOR.txt create mode 100644 PBS/Animations/Converted/Move/ACIDSPRAY.txt create mode 100644 PBS/Animations/Converted/Move/ACROBATICS.txt create mode 100644 PBS/Animations/Converted/Move/ACUPRESSURE.txt create mode 100644 PBS/Animations/Converted/Move/AERIALACE.txt create mode 100644 PBS/Animations/Converted/Move/AGILITY.txt create mode 100644 PBS/Animations/Converted/Move/ALLYSWITCH.txt create mode 100644 PBS/Animations/Converted/Move/AMNESIA.txt create mode 100644 PBS/Animations/Converted/Move/ANCIENTPOWER.txt create mode 100644 PBS/Animations/Converted/Move/AQUARING.txt create mode 100644 PBS/Animations/Converted/Move/AROMATHERAPY.txt create mode 100644 PBS/Animations/Converted/Move/AURORABEAM.txt create mode 100644 PBS/Animations/Converted/Move/BARRIER.txt create mode 100644 PBS/Animations/Converted/Move/BEATUP.txt create mode 100644 PBS/Animations/Converted/Move/BIND.txt create mode 100644 PBS/Animations/Converted/Move/BITE.txt create mode 100644 PBS/Animations/Converted/Move/BLASTBURN.txt create mode 100644 PBS/Animations/Converted/Move/BLOCK.txt create mode 100644 PBS/Animations/Converted/Move/BLUEFLARE.txt create mode 100644 PBS/Animations/Converted/Move/BODYSLAM.txt create mode 100644 PBS/Animations/Converted/Move/BRICKBREAK.txt create mode 100644 PBS/Animations/Converted/Move/BUBBLE.txt create mode 100644 PBS/Animations/Converted/Move/BUBBLEBEAM.txt create mode 100644 PBS/Animations/Converted/Move/BULKUP.txt create mode 100644 PBS/Animations/Converted/Move/BULLETPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/BULLETSEED.txt create mode 100644 PBS/Animations/Converted/Move/CHARGE.txt create mode 100644 PBS/Animations/Converted/Move/CHARM.txt create mode 100644 PBS/Animations/Converted/Move/CLEARSMOG.txt create mode 100644 PBS/Animations/Converted/Move/CLOSECOMBAT.txt create mode 100644 PBS/Animations/Converted/Move/COMETPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/CONFUSERAY.txt create mode 100644 PBS/Animations/Converted/Move/COTTONGUARD.txt create mode 100644 PBS/Animations/Converted/Move/COTTONSPORE.txt create mode 100644 PBS/Animations/Converted/Move/COUNTER.txt create mode 100644 PBS/Animations/Converted/Move/CRUNCH.txt create mode 100644 PBS/Animations/Converted/Move/CRUSHCLAW.txt create mode 100644 PBS/Animations/Converted/Move/CURSE.txt create mode 100644 PBS/Animations/Converted/Move/CUT.txt create mode 100644 PBS/Animations/Converted/Move/DEFENSECURL.txt create mode 100644 PBS/Animations/Converted/Move/DETECT.txt create mode 100644 PBS/Animations/Converted/Move/DISABLE.txt create mode 100644 PBS/Animations/Converted/Move/DIZZYPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/DOUBLEEDGE.txt create mode 100644 PBS/Animations/Converted/Move/DOUBLEKICK.txt create mode 100644 PBS/Animations/Converted/Move/DOUBLESLAP.txt create mode 100644 PBS/Animations/Converted/Move/DRAGONBREATH.txt create mode 100644 PBS/Animations/Converted/Move/DRAGONCLAW.txt create mode 100644 PBS/Animations/Converted/Move/DRAGONDANCE.txt create mode 100644 PBS/Animations/Converted/Move/DRAGONRAGE.txt create mode 100644 PBS/Animations/Converted/Move/DYNAMICPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/EMBER.txt create mode 100644 PBS/Animations/Converted/Move/ENCORE.txt create mode 100644 PBS/Animations/Converted/Move/ENERGYBALL.txt create mode 100644 PBS/Animations/Converted/Move/ERUPTION.txt create mode 100644 PBS/Animations/Converted/Move/EXPLOSION.txt create mode 100644 PBS/Animations/Converted/Move/FAKEOUT.txt create mode 100644 PBS/Animations/Converted/Move/FAKETEARS.txt create mode 100644 PBS/Animations/Converted/Move/FIERYDANCE.txt create mode 100644 PBS/Animations/Converted/Move/FINALGAMBIT.txt create mode 100644 PBS/Animations/Converted/Move/FIREBLAST.txt create mode 100644 PBS/Animations/Converted/Move/FIREFANG.txt create mode 100644 PBS/Animations/Converted/Move/FIREPLEDGE.txt create mode 100644 PBS/Animations/Converted/Move/FIREPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/FIRESPIN.txt create mode 100644 PBS/Animations/Converted/Move/FLAIL.txt create mode 100644 PBS/Animations/Converted/Move/FLAMEBURST.txt create mode 100644 PBS/Animations/Converted/Move/FLAMECHARGE.txt create mode 100644 PBS/Animations/Converted/Move/FLAMETHROWER.txt create mode 100644 PBS/Animations/Converted/Move/FLAMEWHEEL.txt create mode 100644 PBS/Animations/Converted/Move/FLASH.txt create mode 100644 PBS/Animations/Converted/Move/FLY.txt create mode 100644 PBS/Animations/Converted/Move/FOCUSENERGY.txt create mode 100644 PBS/Animations/Converted/Move/FOLLOWME.txt create mode 100644 PBS/Animations/Converted/Move/FORESIGHT.txt create mode 100644 PBS/Animations/Converted/Move/FRENZYPLANT.txt create mode 100644 PBS/Animations/Converted/Move/FURYATTACK.txt create mode 100644 PBS/Animations/Converted/Move/FURYCUTTER.txt create mode 100644 PBS/Animations/Converted/Move/FURYSWIPES.txt create mode 100644 PBS/Animations/Converted/Move/FUTURESIGHT.txt create mode 100644 PBS/Animations/Converted/Move/GASTROACID.txt create mode 100644 PBS/Animations/Converted/Move/GIGADRAIN.txt create mode 100644 PBS/Animations/Converted/Move/GLARE.txt create mode 100644 PBS/Animations/Converted/Move/GRASSWHISTLE.txt create mode 100644 PBS/Animations/Converted/Move/GROWL.txt create mode 100644 PBS/Animations/Converted/Move/GRUDGE.txt create mode 100644 PBS/Animations/Converted/Move/GUST.txt create mode 100644 PBS/Animations/Converted/Move/HAIL.txt create mode 100644 PBS/Animations/Converted/Move/HARDEN.txt create mode 100644 PBS/Animations/Converted/Move/HEADBUTT.txt create mode 100644 PBS/Animations/Converted/Move/HEATWAVE.txt create mode 100644 PBS/Animations/Converted/Move/HIGHJUMPKICK.txt create mode 100644 PBS/Animations/Converted/Move/HORNATTACK.txt create mode 100644 PBS/Animations/Converted/Move/HYDROPUMP.txt create mode 100644 PBS/Animations/Converted/Move/HYPERFANG.txt create mode 100644 PBS/Animations/Converted/Move/ICEBALL.txt create mode 100644 PBS/Animations/Converted/Move/ICEFANG.txt create mode 100644 PBS/Animations/Converted/Move/ICEPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/ICICLESPEAR.txt create mode 100644 PBS/Animations/Converted/Move/ICYWIND.txt create mode 100644 PBS/Animations/Converted/Move/INFERNO.txt create mode 100644 PBS/Animations/Converted/Move/IRONHEAD.txt create mode 100644 PBS/Animations/Converted/Move/JUMPKICK.txt create mode 100644 PBS/Animations/Converted/Move/KARATECHOP.txt create mode 100644 PBS/Animations/Converted/Move/KINESIS.txt create mode 100644 PBS/Animations/Converted/Move/LEAFBLADE.txt create mode 100644 PBS/Animations/Converted/Move/LEECHLIFE.txt create mode 100644 PBS/Animations/Converted/Move/LEECHSEED.txt create mode 100644 PBS/Animations/Converted/Move/LEER.txt create mode 100644 PBS/Animations/Converted/Move/LICK.txt create mode 100644 PBS/Animations/Converted/Move/LIGHTSCREEN.txt create mode 100644 PBS/Animations/Converted/Move/LOCKON.txt create mode 100644 PBS/Animations/Converted/Move/LOVELYKISS.txt create mode 100644 PBS/Animations/Converted/Move/LOWKICK.txt create mode 100644 PBS/Animations/Converted/Move/LUCKYCHANT.txt create mode 100644 PBS/Animations/Converted/Move/MACHPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/MAGICCOAT.txt create mode 100644 PBS/Animations/Converted/Move/MEANLOOK.txt create mode 100644 PBS/Animations/Converted/Move/MEGADRAIN.txt create mode 100644 PBS/Animations/Converted/Move/MEGAHORN.txt create mode 100644 PBS/Animations/Converted/Move/MEGAKICK.txt create mode 100644 PBS/Animations/Converted/Move/MEGAPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/METALCLAW.txt create mode 100644 PBS/Animations/Converted/Move/METEORMASH.txt create mode 100644 PBS/Animations/Converted/Move/METRONOME.txt create mode 100644 PBS/Animations/Converted/Move/MIST.txt create mode 100644 PBS/Animations/Converted/Move/MISTBALL.txt create mode 100644 PBS/Animations/Converted/Move/MOONLIGHT.txt create mode 100644 PBS/Animations/Converted/Move/MORNINGSUN.txt create mode 100644 PBS/Animations/Converted/Move/NIGHTMARE.txt create mode 100644 PBS/Animations/Converted/Move/OUTRAGE.txt create mode 100644 PBS/Animations/Converted/Move/OVERHEAT.txt create mode 100644 PBS/Animations/Converted/Move/PAYDAY.txt create mode 100644 PBS/Animations/Converted/Move/PETALDANCE.txt create mode 100644 PBS/Animations/Converted/Move/PINMISSILE.txt create mode 100644 PBS/Animations/Converted/Move/POISONFANG.txt create mode 100644 PBS/Animations/Converted/Move/POISONGAS.txt create mode 100644 PBS/Animations/Converted/Move/POISONPOWDER.txt create mode 100644 PBS/Animations/Converted/Move/POISONSTING.txt create mode 100644 PBS/Animations/Converted/Move/POISONTAIL.txt create mode 100644 PBS/Animations/Converted/Move/POUND.txt create mode 100644 PBS/Animations/Converted/Move/PSYCHIC.txt create mode 100644 PBS/Animations/Converted/Move/PSYCHOCUT.txt create mode 100644 PBS/Animations/Converted/Move/QUICKATTACK.txt create mode 100644 PBS/Animations/Converted/Move/RAINDANCE.txt create mode 100644 PBS/Animations/Converted/Move/RAZORLEAF.txt create mode 100644 PBS/Animations/Converted/Move/REFLECT.txt create mode 100644 PBS/Animations/Converted/Move/REST.txt create mode 100644 PBS/Animations/Converted/Move/ROAR.txt create mode 100644 PBS/Animations/Converted/Move/ROCKSMASH.txt create mode 100644 PBS/Animations/Converted/Move/ROCKTHROW.txt create mode 100644 PBS/Animations/Converted/Move/ROLLINGKICK.txt create mode 100644 PBS/Animations/Converted/Move/SANDATTACK.txt create mode 100644 PBS/Animations/Converted/Move/SANDSTORM.txt create mode 100644 PBS/Animations/Converted/Move/SCARYFACE.txt create mode 100644 PBS/Animations/Converted/Move/SCRATCH.txt create mode 100644 PBS/Animations/Converted/Move/SCREECH.txt create mode 100644 PBS/Animations/Converted/Move/SELFDESTRUCT.txt create mode 100644 PBS/Animations/Converted/Move/SHADOWBALL.txt create mode 100644 PBS/Animations/Converted/Move/SIGNALBEAM.txt create mode 100644 PBS/Animations/Converted/Move/SILVERWIND.txt create mode 100644 PBS/Animations/Converted/Move/SING.txt create mode 100644 PBS/Animations/Converted/Move/SKETCH.txt create mode 100644 PBS/Animations/Converted/Move/SLAM.txt create mode 100644 PBS/Animations/Converted/Move/SLASH.txt create mode 100644 PBS/Animations/Converted/Move/SLEEPPOWDER.txt create mode 100644 PBS/Animations/Converted/Move/SLUDGE.txt create mode 100644 PBS/Animations/Converted/Move/SLUDGEBOMB.txt create mode 100644 PBS/Animations/Converted/Move/SMOG.txt create mode 100644 PBS/Animations/Converted/Move/SMOKESCREEN.txt create mode 100644 PBS/Animations/Converted/Move/SPIDERWEB.txt create mode 100644 PBS/Animations/Converted/Move/SPIKECANNON.txt create mode 100644 PBS/Animations/Converted/Move/SPIKES.txt create mode 100644 PBS/Animations/Converted/Move/SPLASH.txt create mode 100644 PBS/Animations/Converted/Move/SPORE.txt create mode 100644 PBS/Animations/Converted/Move/STEALTHROCK.txt create mode 100644 PBS/Animations/Converted/Move/STOMP.txt create mode 100644 PBS/Animations/Converted/Move/STRINGSHOT.txt create mode 100644 PBS/Animations/Converted/Move/STRUGGLE.txt create mode 100644 PBS/Animations/Converted/Move/STUNSPORE.txt create mode 100644 PBS/Animations/Converted/Move/SUNNYDAY.txt create mode 100644 PBS/Animations/Converted/Move/SUPERSONIC.txt create mode 100644 PBS/Animations/Converted/Move/SWAGGER.txt create mode 100644 PBS/Animations/Converted/Move/SWEETKISS.txt create mode 100644 PBS/Animations/Converted/Move/SWIFT.txt create mode 100644 PBS/Animations/Converted/Move/SWORDSDANCE.txt create mode 100644 PBS/Animations/Converted/Move/TACKLE.txt create mode 100644 PBS/Animations/Converted/Move/TAILGLOW.txt create mode 100644 PBS/Animations/Converted/Move/TAILWHIP.txt create mode 100644 PBS/Animations/Converted/Move/TELEPORT.txt create mode 100644 PBS/Animations/Converted/Move/THUNDER.txt create mode 100644 PBS/Animations/Converted/Move/THUNDERBOLT.txt create mode 100644 PBS/Animations/Converted/Move/THUNDERFANG.txt create mode 100644 PBS/Animations/Converted/Move/THUNDERPUNCH.txt create mode 100644 PBS/Animations/Converted/Move/THUNDERSHOCK.txt create mode 100644 PBS/Animations/Converted/Move/THUNDERWAVE.txt create mode 100644 PBS/Animations/Converted/Move/TOXIC.txt create mode 100644 PBS/Animations/Converted/Move/TRICKROOM.txt create mode 100644 PBS/Animations/Converted/Move/TWINEEDLE.txt create mode 100644 PBS/Animations/Converted/Move/TWISTER.txt create mode 100644 PBS/Animations/Converted/Move/VINEWHIP.txt create mode 100644 PBS/Animations/Converted/Move/WATERGUN.txt create mode 100644 PBS/Animations/Converted/Move/WATERPULSE.txt create mode 100644 PBS/Animations/Converted/Move/WHIRLWIND.txt create mode 100644 PBS/Animations/Converted/Move/WILLOWISP.txt create mode 100644 PBS/Animations/Converted/Move/WINGATTACK.txt create mode 100644 PBS/Animations/Converted/Move/WRAP.txt create mode 100644 PBS/Animations/Converted/Move/WRINGOUT.txt create mode 100644 PBS/Animations/Converted/Move/XSCISSOR.txt create mode 100644 PBS/Animations/Converted/Move/ZAPCANNON.txt diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 548213417..8d05f83e3 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -226,6 +226,10 @@ module GameData return [:common, :opp_common].include?(@type) end + def opposing_animation? + return [:opp_move, :opp_common].include?(@type) + end + alias __new_anim__get_property_for_PBS get_property_for_PBS unless method_defined?(:__new_anim__get_property_for_PBS) def get_property_for_PBS(key) ret = __new_anim__get_property_for_PBS(key) diff --git a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb new file mode 100644 index 000000000..e1e8bfb70 --- /dev/null +++ b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb @@ -0,0 +1,175 @@ +module AnimationConverter + module_function + + def convert_old_animations_to_new + list = pbLoadBattleAnimations + raise "No animations found." if !list || list.length == 0 + + last_move = nil # For filename purposes + last_version = 0 + last_type = :move + + list.each do |anim| + next if !anim.name || anim.name == "" || anim.length <= 1 + + # Get folder and filename for new PBS file + folder = "Converted/" + folder += (anim.name[/^Common:/]) ? "Common/" : "Move/" + filename = anim.name.gsub(/^Common:/, "") + filename.gsub!(/^Move:/, "") + filename.gsub!(/^OppMove:/, "") + # Update record of move and version + type = :move + if anim.name[/^Common:/] + type = :common + elsif anim.name[/^OppMove:/] + type = :opp_move + elsif anim.name[/^Move:/] + type = :move + end + if filename == anim.name + last_version += 1 + type = last_type + pbs_path = folder + last_move + else + last_move = filename + last_version = 0 + last_type = type + pbs_path = folder + filename + end + last_move = filename if !last_move + # Generate basic animaiton properties + + new_anim = { + :type => type, + :move => last_move, + :version => last_version, + :name => filename, + :particles => [], + :pbs_path => pbs_path + } + + add_frames_to_new_anim_hash(anim, new_anim) + add_se_commands_to_new_anim_hash(anim, new_anim) + + new_anim[:particles].compact! + GameData::Animation.register(new_anim) + Compiler.write_battle_animation_file(new_anim[:pbs_path]) + end + + end + + def add_frames_to_new_anim_hash(anim, hash) + # Set up previous frame's values + default_frame = [] + default_frame[AnimFrame::X] = -999 + default_frame[AnimFrame::Y] = -999 + default_frame[AnimFrame::ZOOMX] = 100 + default_frame[AnimFrame::ZOOMY] = 100 + default_frame[AnimFrame::BLENDTYPE] = 0 + default_frame[AnimFrame::ANGLE] = 0 + default_frame[AnimFrame::OPACITY] = 255 + default_frame[AnimFrame::COLORRED] = 0 + default_frame[AnimFrame::COLORGREEN] = 0 + default_frame[AnimFrame::COLORBLUE] = 0 + default_frame[AnimFrame::COLORALPHA] = 0 + default_frame[AnimFrame::TONERED] = 0 + default_frame[AnimFrame::TONEGREEN] = 0 + default_frame[AnimFrame::TONEBLUE] = 0 + default_frame[AnimFrame::TONEGRAY] = 0 + + default_frame[AnimFrame::VISIBLE] = 1 # Boolean + default_frame[AnimFrame::MIRROR] = 0 # Boolean + + default_frame[AnimFrame::FOCUS] = 4 # 1=target, 2=user, 3=user and target, 4=screen + + last_frame_values = [] + # Go through each frame + anim.length.times do |frame_num| + frame = anim[frame_num] + frame.each_with_index do |cel, i| + next if !cel + # i=0 for "User", i=1 for "Target" + hash[:particles][i] ||= { + :name => "Particle #{i}" + } + particle = hash[:particles][i] + if i == 0 + particle[:name] = "User" + elsif i == 1 + particle[:name] = "Target" + else + particle[:visible] = [[0, 0, true]] + end + + last_frame = last_frame_values[i] || default_frame.clone + # Copy commands across + [ + [AnimFrame::X, :x], + [AnimFrame::Y, :y], + [AnimFrame::ZOOMX, :zoom_x], + [AnimFrame::ZOOMY, :zoom_y], + [AnimFrame::BLENDTYPE, :blending], + [AnimFrame::ANGLE, :angle], + [AnimFrame::OPACITY, :opacity], + [AnimFrame::COLORRED, :color_red], + [AnimFrame::COLORGREEN, :color_green], + [AnimFrame::COLORBLUE, :color_blue], + [AnimFrame::COLORALPHA, :color_alpha], + [AnimFrame::TONERED, :tone_red], + [AnimFrame::TONEGREEN, :tone_green], + [AnimFrame::TONEBLUE, :tone_blue], + [AnimFrame::TONEGRAY, :tone_gray], + [AnimFrame::VISIBLE, :visible], # Boolean + [AnimFrame::MIRROR, :flip], # Boolean + ].each do |property| + next if cel[property[0]] == last_frame[property[0]] + particle[property[1]] ||= [] + val = cel[property[0]].to_i + val = (val == 1) if [:visible, :flip].include?(property[1]) + particle[property[1]].push([frame_num, 0, val]) + last_frame[property[0]] = cel[property[0]] + end + # Set graphic + particle[:graphic] = anim.graphic + # Set focus for non-User/non-Target + if i > 1 + particle[:focus] = [:screen, :target, :user, :user_and_target, :screen][cel[AnimFrame::FOCUS]] + end + # Remember this cel's values at this frame + last_frame_values[i] = last_frame + end + end + end + + def add_se_commands_to_new_anim_hash(anim, new_anim) + anim.timing.each do |cmd| + next if cmd.timingType != 0 # Play SE + particle = new_anim[:particles].last + if particle[:name] != "SE" + particle = { :name => "SE" } + new_anim[:particles].push(particle) + end + # Add command + if cmd.name && cmd.name != "" + particle[:se] ||= [] + particle[:se].push([cmd.frame, 0, cmd.name, cmd.volume, cmd.pitch]) + else # Play user's cry + particle[:user_cry] ||= [] + particle[:user_cry].push([cmd.frame, 0, cmd.volume, cmd.pitch]) + end + end + end +end + +#=============================================================================== +# Add to Debug menu. +#=============================================================================== +MenuHandlers.add(:debug_menu, :convert_anims, { + "name" => "Convert old animation to PBS files", + "parent" => :main, + "description" => "This is just for the sake of having lots of example animation PBS files.", + "effect" => proc { + AnimationConverter.convert_old_animations_to_new + } +}) diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 9d079f8f8..901d15b8d 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -2,152 +2,243 @@ # #=============================================================================== class AnimationEditor::AnimationSelector - ANIMATIONS_LIST_X = 4 - ANIMATIONS_LIST_Y = 4 - ANIMATIONS_LIST_WIDTH = 300 - ANIMATIONS_LIST_HEIGHT = AnimationEditor::WINDOW_HEIGHT - (ANIMATIONS_LIST_Y * 2) + QUIT_BUTTON_WIDTH = 80 + QUIT_BUTTON_HEIGHT = 30 - LOAD_BUTTON_WIDTH = 200 - LOAD_BUTTON_HEIGHT = 48 - LOAD_BUTTON_X = ANIMATIONS_LIST_WIDTH + 100 - LOAD_BUTTON_Y = ANIMATIONS_LIST_Y + (ANIMATIONS_LIST_HEIGHT / 2) - (LOAD_BUTTON_HEIGHT / 2) + TYPE_BUTTONS_X = 2 + TYPE_BUTTONS_Y = 62 + TYPE_BUTTON_WIDTH = 100 + TYPE_BUTTON_HEIGHT = 48 + + MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 4 + MOVES_LIST_Y = TYPE_BUTTONS_Y + 4 + MOVES_LIST_WIDTH = 200 + MOVES_LIST_HEIGHT = 26 * UIControls::List::ROW_HEIGHT + + ANIMATIONS_LIST_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 8 + ANIMATIONS_LIST_Y = MOVES_LIST_Y + ANIMATIONS_LIST_WIDTH = 300 + ANIMATIONS_LIST_HEIGHT = MOVES_LIST_HEIGHT + + ACTION_BUTTON_WIDTH = 200 + ACTION_BUTTON_HEIGHT = 48 + ACTION_BUTTON_X = ANIMATIONS_LIST_X + ANIMATIONS_LIST_WIDTH + 4 + ACTION_BUTTON_Y = TYPE_BUTTONS_Y + ((ANIMATIONS_LIST_HEIGHT - (ACTION_BUTTON_HEIGHT * 3)) / 2) + 4 def initialize - generate_list + generate_lists @viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) @viewport.z = 99999 @screen_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @viewport) draw_editor_background - @load_animation_id = nil + @animation_type = 0 # 0=move, 1=common + @quit = false create_controls + refresh end def dispose @screen_bitmap.dispose + @components.dispose @viewport.dispose end - # TODO: Make separate arrays for move and common animations. Group animations - # for the same move/common animation together somehow to be listed in - # the main list - individual animations are shown in the secondary list. - # The display names will need improving accordingly. Usage of - # @animations in this class will need redoing. - def generate_list - @animations = [] - GameData::Animation.keys.each do |id| - anim = GameData::Animation.get(id) - if anim.version > 0 - name = "#{anim.type}: #{anim.move} (#{anim.version}) - #{anim.name}" - else - name = "#{anim.type}: #{anim.move} - #{anim.name}" - end - @animations.push([id, name]) + LABEL_OFFSET_X = -4 + LABEL_OFFSET_Y = -32 + + def create_controls + @components = UIControls::ControlsContainer.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) + # Quit button + btn = UIControls::Button.new(QUIT_BUTTON_WIDTH, QUIT_BUTTON_HEIGHT, @viewport, _INTL("Quit")) + btn.set_fixed_size + @components.add_control_at(:quit, btn, 0, 0) + # New button + btn = UIControls::Button.new(QUIT_BUTTON_WIDTH, QUIT_BUTTON_HEIGHT, @viewport, _INTL("New")) + btn.set_fixed_size + @components.add_control_at(:new, btn, QUIT_BUTTON_WIDTH, 0) + # Type label + label = UIControls::Label.new(TYPE_BUTTON_WIDTH, TYPE_BUTTON_HEIGHT, @viewport, _INTL("Anim types")) + label.header = true + @components.add_control_at(:type_label, label, TYPE_BUTTONS_X + LABEL_OFFSET_X + 4, TYPE_BUTTONS_Y + LABEL_OFFSET_Y + 4) + # Animation type toggle buttons + [[:moves, _INTL("Moves")], [:commons, _INTL("Common")]].each_with_index do |val, i| + btn = UIControls::Button.new(TYPE_BUTTON_WIDTH, TYPE_BUTTON_HEIGHT, @viewport, val[1]) + btn.set_fixed_size + @components.add_control_at(val[0], btn, TYPE_BUTTONS_X, TYPE_BUTTONS_Y + (i * TYPE_BUTTON_HEIGHT)) end - # TODO: For scrollbar testing purposes. - rand(400).times do |i| - @animations.push([42 + i, "Extra animation #{i + 1}"]) + # TODO: Filter text box for :moves_list's contents. Applies the filter upon + # every change to the text box's value. Perhaps it should only do so + # after 0.5 seconds of non-typing. What exactly should the filter be + # applied to? Animation's name, move's name (if there is one), what + # else? + # Moves list label + label = UIControls::Label.new(MOVES_LIST_WIDTH, TYPE_BUTTON_HEIGHT, @viewport, _INTL("Moves")) + label.header = true + @components.add_control_at(:moves_label, label, MOVES_LIST_X + LABEL_OFFSET_X, MOVES_LIST_Y + LABEL_OFFSET_Y) + # Moves list + list = UIControls::List.new(MOVES_LIST_WIDTH, MOVES_LIST_HEIGHT, @viewport, []) + @components.add_control_at(:moves_list, list, MOVES_LIST_X, MOVES_LIST_Y) + # Animations list label + label = UIControls::Label.new(ANIMATIONS_LIST_WIDTH, TYPE_BUTTON_HEIGHT, @viewport, _INTL("Animations")) + label.header = true + @components.add_control_at(:animations_label, label, ANIMATIONS_LIST_X + LABEL_OFFSET_X, ANIMATIONS_LIST_Y + LABEL_OFFSET_Y) + # Animations list + list = UIControls::List.new(ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT, @viewport, []) + @components.add_control_at(:animations_list, list, ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y) + # Edit, Copy and Delete buttons + [[:edit, _INTL("Edit animation")], [:copy, _INTL("Copy animation")], [:delete, _INTL("Delete animation")]].each_with_index do |val, i| + btn = UIControls::Button.new(ACTION_BUTTON_WIDTH, ACTION_BUTTON_HEIGHT, @viewport, val[1]) + btn.set_fixed_size + @components.add_control_at(val[0], btn, ACTION_BUTTON_X, ACTION_BUTTON_Y + (i * ACTION_BUTTON_HEIGHT)) end end def draw_editor_background # Fill the whole screen with white - @screen_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.black) - # Outline around animations list + @screen_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.white) + # Outlines around lists areas = [ - [ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y, ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT], - [LOAD_BUTTON_X, LOAD_BUTTON_Y, LOAD_BUTTON_WIDTH, LOAD_BUTTON_HEIGHT] + [MOVES_LIST_X, MOVES_LIST_Y, MOVES_LIST_WIDTH, MOVES_LIST_HEIGHT], + [ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y, ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT] ] areas.each do |area| - # Draw outlines around area - @screen_bitmap.bitmap.outline_rect(area[0] - 3, area[1] - 3, area[2] + 6, area[3] + 6, Color.white) @screen_bitmap.bitmap.outline_rect(area[0] - 2, area[1] - 2, area[2] + 4, area[3] + 4, Color.black) - @screen_bitmap.bitmap.outline_rect(area[0] - 1, area[1] - 1, area[2] + 2, area[3] + 2, Color.white) - # Fill the area with white - # TODO: This line was quoted out previously, and I'm not sure why. - @screen_bitmap.bitmap.fill_rect(area[0], area[1], area[2], area[3], Color.white) end end - def create_controls - @controls = {} - # TODO: Buttons to toggle between listing moves that have animations, and - # common animations (and overworld animations). - # Animations list - @list = UIControls::List.new(ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT, @viewport, @animations) - @list.x = ANIMATIONS_LIST_X - @list.y = ANIMATIONS_LIST_Y - @controls[:list] = @list - # TODO: A secondary list for displaying all the animations related to the - # selected move. For common anims/overworld anims, this will only ever - # list one animation. The first animation listed in here will be - # selected by default. - # TODO: Filter text box for @list's contents. Applies the filter upon every - # change to the text box's value. Perhaps it should only do so after - # 0.5 seconds of non-typing. What exactly should the filter be applied - # to? Animation's name, move's name (if there is one), what else? - # TODO: Filter dropdown list to pick a move type? Other filter options? - # "Load animation" button - @load_button = UIControls::Button.new(LOAD_BUTTON_WIDTH, LOAD_BUTTON_HEIGHT, @viewport, _INTL("Load animation")) - @load_button.x = LOAD_BUTTON_X - @load_button.y = LOAD_BUTTON_Y - @load_button.set_fixed_size - @load_button.set_interactive_rects - @controls[:load] = @load_button - # TODO: "New animation" button, "Delete animation" button, "Duplicate - # animation" button, "Quit" button. - repaint + #----------------------------------------------------------------------------- + + def generate_lists + @move_list = [] + @common_list = [] + @move_animations = {} + @common_animations = {} + GameData::Animation.keys.each do |id| + anim = GameData::Animation.get(id) + name = "" + name += _INTL("[Foe]") + " " if anim.opposing_animation? + name += "[#{anim.version}]" + " " if anim.version > 0 + name += anim.name + if anim.move_animation? + move_name = GameData::Move.try_get(anim.move)&.name || anim.move + @move_list.push([anim.move, move_name]) if !@move_animations[anim.move] + @move_animations[anim.move] ||= [] + @move_animations[anim.move].push([id, name]) + elsif anim.common_animation? + @common_list.push([anim.move, anim.move]) if !@common_animations[anim.move] + @common_animations[anim.move] ||= [] + @common_animations[anim.move].push([id, name]) + end + end + @move_list.sort! + @common_list.sort! + @move_animations.values.each do |val| + val.sort! { |a, b| a[1] <=> b[1] } + end + @common_animations.values.each do |val| + val.sort! { |a, b| a[1] <=> b[1] } + end end - def repaint - @controls.each { |ctrl| ctrl[1].repaint } + def selected_move_animations + val = @components.get_control(:moves_list).value + return [] if !val + return @move_animations[val] if @animation_type == 0 + return @common_animations[val] if @animation_type == 1 + return [] + end + + def selected_animation_id + return @components.get_control(:animations_list).value + end + + #----------------------------------------------------------------------------- + + def refresh + # Put the correct list into the moves list + case @animation_type + when 0 + @components.get_control(:moves).disable + @components.get_control(:commons).enable + @components.get_control(:moves_list).values = @move_list + @components.get_control(:moves_label).label = _INTL("Moves") + when 1 + @components.get_control(:moves).enable + @components.get_control(:commons).disable + @components.get_control(:moves_list).values = @common_list + @components.get_control(:moves_label).label = _INTL("Common animations") + end + # Put the correct list into the animations list + @components.get_control(:animations_list).values = selected_move_animations + # Enable/disable buttons depending on what is selected + if @components.get_control(:animations_list).value + @components.get_control(:edit).enable + @components.get_control(:copy).enable + @components.get_control(:delete).enable + else + @components.get_control(:edit).disable + @components.get_control(:copy).disable + @components.get_control(:delete).disable + end + end + + #----------------------------------------------------------------------------- + + def apply_button_press(button) + case button + when :quit + @quit = true + return # Don't need to refresh the screen + when :new + # TODO: New animation. + when :moves + @animation_type = 0 + @components.get_control(:moves_list).selected = -1 + @components.get_control(:animations_list).selected = -1 + when :commons + @animation_type = 1 + @components.get_control(:moves_list).selected = -1 + @components.get_control(:animations_list).selected = -1 + when :edit + anim_id = selected_animation_id + if anim_id + screen = AnimationEditor.new(anim_id, GameData::Animation.get(anim_id).clone_as_hash) + screen.run + # TODO: Might want to select whichever options in each list get to + # the animation with ID anim_id. + generate_lists + end + when :copy + anim_id = selected_animation_id + if anim_id + # TODO: Copy animation. + end + when :delete + anim_id = selected_animation_id + if anim_id + # TODO: Delete animation. + end + end + refresh end def update - # Update all controls - if @captured - @captured.update - @captured = nil if !@captured.busy? - else - @controls.each do |ctrl| - ctrl[1].update - @captured = ctrl[1] if ctrl[1].busy? + @components.update + if @components.changed? + @components.values.each_pair do |property, value| + apply_button_press(property) end + @components.clear_changed end - # Check for changes in controls - @list.clear_changed if @list.changed? # We don't need @list's value now - if @load_button.changed? - # TODO: This will need to get the animation ID from the sublist instead. - @load_animation_id = @list.value - @load_button.clear_changed - end - repaint # Only repaints if needed end def run Input.text_input = false loop do - inputting_text = Input.text_input Graphics.update Input.update update - # Open editor with animation -# @load_animation_id = 2 # TODO: For quickstart testing purposes. - if @load_animation_id - screen = AnimationEditor.new(@load_animation_id, GameData::Animation.get(@load_animation_id).clone_as_hash) - screen.run - @load_animation_id = nil -# break # TODO: For quickstart testing purposes. - # Refresh list of animations, in case the edited one changed its type, - # move, version or name - generate_list - @list.values = @animations - repaint - next - end - # Typing text into a text box; don't want key presses to trigger anything - next if inputting_text - # Inputs - break if Input.trigger?(Input::BACK) + break if !@components.busy? && @quit end dispose end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index a35dca01c..4a48387ed 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -85,7 +85,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @row_index = 0 # Particle information to display (one row each) @particles = [] # Reference to particle data from the editor scene - @expanded_particles = [0] # Each element is index in @particles + @expanded_particles = [] # Each element is index in @particles @particle_list = [] # Each element is index in @particles or [index, property] @visibilities = [] # Per particle @commands = {} diff --git a/PBS/Animations/Converted/Common/Attract.txt b/PBS/Animations/Converted/Common/Attract.txt new file mode 100644 index 000000000..f5869b092 --- /dev/null +++ b/PBS/Animations/Converted/Common/Attract.txt @@ -0,0 +1,116 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Attract] +Name = Attract + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 7,355 + SetY = 7,50 + SetX = 8,341 + SetY = 8,65 + SetX = 9,350 + SetY = 9,67 + SetX = 10,376 + SetY = 10,85 + SetX = 11,361 + SetY = 11,90 + SetX = 12,377 + SetY = 12,74 + SetX = 13,390 + SetY = 13,54 + SetX = 14,404 + SetY = 14,27 + SetY = 15,19 + SetOpacity = 15,192 + SetY = 16,11 + SetOpacity = 16,128 + SetY = 17,3 + SetOpacity = 17,64 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 8,349 + SetY = 8,50 + SetX = 9,333 + SetY = 9,61 + SetX = 10,350 + SetY = 10,86 + SetX = 11,361 + SetY = 11,88 + SetX = 12,348 + SetY = 12,90 + SetX = 13,353 + SetY = 13,71 + SetX = 14,336 + SetY = 14,50 + SetY = 15,42 + SetOpacity = 15,192 + SetY = 16,34 + SetOpacity = 16,128 + SetY = 17,26 + SetOpacity = 17,64 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 12,397 + SetY = 12,93 + SetX = 13,411 + SetY = 13,72 + SetX = 14,412 + SetY = 14,44 + SetX = 15,414 + SetY = 15,40 + SetOpacity = 15,192 + SetY = 16,32 + SetOpacity = 16,128 + SetY = 17,24 + SetOpacity = 17,64 + + Graphic = poi.hear.mus + Focus = Target + SetX = 0,374 + SetY = 0,67 + SetVisible = 0,true + SetX = 1,407 + SetY = 1,65 + SetX = 2,432 + SetY = 2,60 + SetX = 3,436 + SetY = 3,49 + SetX = 4,415 + SetY = 4,32 + SetX = 5,348 + SetY = 5,36 + SetX = 6,325 + SetY = 6,42 + SetX = 7,308 + SetY = 7,68 + SetX = 8,343 + SetY = 8,79 + SetX = 9,369 + SetY = 9,85 + SetX = 10,376 + SetY = 10,73 + SetX = 11,375 + SetY = 11,64 + SetY = 12,47 + SetY = 13,31 + SetY = 14,7 + SetY = 15,-1 + SetOpacity = 15,192 + SetY = 16,-9 + SetOpacity = 16,128 + SetY = 17,-17 + SetOpacity = 17,64 + + Play = 0,infatuated,100,100 diff --git a/PBS/Animations/Converted/Common/Bind.txt b/PBS/Animations/Converted/Common/Bind.txt new file mode 100644 index 000000000..8d8ba9ca8 --- /dev/null +++ b/PBS/Animations/Converted/Common/Bind.txt @@ -0,0 +1,47 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Bind] +Name = Bind + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Struggle + Focus = Target + SetX = 0,440 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,480 + SetY = 1,94 + SetX = 2,488 + SetY = 2,102 + SetX = 3,464 + SetY = 3,94 + SetX = 4,432 + SetX = 5,464 + SetX = 6,496 + SetY = 6,102 + SetX = 7,480 + + Graphic = Struggle + Focus = Target + SetX = 0,320 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,94 + SetX = 2,240 + SetY = 2,102 + SetX = 3,264 + SetY = 3,94 + SetX = 4,296 + SetX = 5,256 + SetX = 6,216 + SetX = 7,264 + + Play = 0,Slash10,80,100 + Play = 3,Slash10,80,100 + Play = 6,Slash10,80,100 diff --git a/PBS/Animations/Converted/Common/Burn.txt b/PBS/Animations/Converted/Common/Burn.txt new file mode 100644 index 000000000..00cd7ee39 --- /dev/null +++ b/PBS/Animations/Converted/Common/Burn.txt @@ -0,0 +1,20 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Burn] +Name = Burn + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Flames + Focus = Target + SetX = 0,384 + SetY = 0,96 + SetZoomX = 0,200 + SetZoomY = 0,200 + SetVisible = 0,true + + Play = 0,Fire2,80,100 diff --git a/PBS/Animations/Converted/Common/Confusion.txt b/PBS/Animations/Converted/Common/Confusion.txt new file mode 100644 index 000000000..c41559284 --- /dev/null +++ b/PBS/Animations/Converted/Common/Confusion.txt @@ -0,0 +1,49 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Confusion] +Name = Confusion + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = confused + Focus = Target + SetX = 0,384 + SetY = 0,63 + SetVisible = 0,true + SetY = 1,64 + SetY = 2,57 + SetX = 3,385 + SetY = 3,63 + SetX = 4,384 + SetY = 4,64 + SetX = 5,388 + SetY = 5,59 + SetX = 6,389 + SetY = 6,57 + SetX = 7,391 + SetX = 8,384 + SetY = 8,55 + SetX = 9,382 + SetY = 9,59 + SetX = 10,396 + SetY = 10,56 + SetX = 11,386 + SetY = 11,53 + SetX = 12,383 + SetX = 13,386 + SetY = 13,52 + SetY = 14,45 + SetX = 15,391 + SetY = 15,42 + SetX = 16,392 + SetY = 16,41 + SetOpacity = 16,233 + SetX = 17,394 + SetY = 17,39 + SetOpacity = 17,154 + + Play = 0,throw,80,100 diff --git a/PBS/Animations/Converted/Common/FireSpin.txt b/PBS/Animations/Converted/Common/FireSpin.txt new file mode 100644 index 000000000..17597c6cd --- /dev/null +++ b/PBS/Animations/Converted/Common/FireSpin.txt @@ -0,0 +1,132 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,FireSpin] +Name = FireSpin + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetX = 0,355 + SetY = 0,136 + SetVisible = 0,true + + Graphic = fly copy + Focus = Target + SetX = 0,393 + SetY = 0,138 + SetVisible = 0,true + + Graphic = fly copy + Focus = Target + SetX = 0,428 + SetY = 0,137 + SetVisible = 0,true + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,355 + SetY = 1,121 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,394 + SetY = 1,123 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,431 + SetY = 1,122 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 2,359 + SetY = 2,108 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 2,395 + SetY = 2,107 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 2,433 + SetY = 2,105 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 3,357 + SetY = 3,92 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 3,396 + SetY = 3,91 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 3,431 + SetY = 3,89 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,356 + SetY = 4,77 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,397 + SetY = 4,78 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,435 + SetY = 4,76 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 5,355 + SetY = 5,62 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 5,397 + SetY = 5,63 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 5,434 + SetY = 5,61 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 5,374 + SetY = 5,137 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 5,415 + SetY = 5,138 + + Play = 0,throw,80,100 diff --git a/PBS/Animations/Converted/Common/Frozen.txt b/PBS/Animations/Converted/Common/Frozen.txt new file mode 100644 index 000000000..157f962e6 --- /dev/null +++ b/PBS/Animations/Converted/Common/Frozen.txt @@ -0,0 +1,64 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Frozen] +Name = Frozen + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 016-Ice01 + Focus = Target + SetX = 0,328 + SetY = 0,14 + SetVisible = 0,true + SetX = 1,360 + SetY = 1,30 + SetX = 8,384 + SetY = 8,38 + SetX = 9,440 + SetY = 9,102 + SetX = 10,456 + SetY = 10,134 + SetX = 11,432 + SetY = 11,14 + SetX = 12,456 + SetY = 12,46 + SetX = 13,464 + SetY = 13,94 + + Graphic = 016-Ice01 + Focus = Target + SetVisible = 0,true + SetX = 1,384 + SetY = 1,94 + SetOpacity = 6,192 + SetOpacity = 7,255 + SetX = 9,432 + SetY = 9,14 + SetX = 10,408 + SetY = 10,54 + SetX = 11,344 + SetY = 11,78 + SetX = 12,328 + SetY = 12,110 + SetX = 13,352 + SetY = 13,142 + + Graphic = 016-Ice01 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + SetOpacity = 1,128 + SetOpacity = 2,255 + SetOpacity = 7,192 + SetOpacity = 8,255 + SetOpacity = 10,100 + SetX = 14,408 + SetY = 14,134 + SetOpacity = 14,255 + + Play = 0,Ice5,80,100 diff --git a/PBS/Animations/Converted/Common/Hail.txt b/PBS/Animations/Converted/Common/Hail.txt new file mode 100644 index 000000000..aa5c04c19 --- /dev/null +++ b/PBS/Animations/Converted/Common/Hail.txt @@ -0,0 +1,168 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Hail] +Name = Hail + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,37 + SetY = 0,26 + SetVisible = 0,true + SetX = 1,207 + SetY = 1,56 + SetX = 2,84 + SetY = 2,43 + SetX = 3,171 + SetY = 3,56 + SetX = 4,118 + SetY = 4,97 + SetX = 5,357 + SetY = 5,200 + SetX = 6,10 + SetY = 6,9 + SetX = 7,109 + SetY = 7,105 + SetX = 8,136 + SetY = 8,77 + SetX = 9,69 + SetY = 9,208 + SetX = 10,136 + SetY = 10,107 + + Graphic = weather + Focus = Screen + SetX = 0,164 + SetY = 0,136 + SetVisible = 0,true + SetX = 1,464 + SetY = 1,117 + SetX = 3,441 + SetY = 3,241 + SetX = 5,225 + SetY = 5,69 + SetX = 8,180 + SetY = 8,199 + SetX = 9,163 + SetY = 9,99 + SetX = 11,176 + SetY = 11,119 + + Graphic = weather + Focus = Screen + SetX = 0,302 + SetY = 0,79 + SetVisible = 0,true + SetX = 1,201 + SetY = 1,204 + SetX = 2,228 + SetY = 2,98 + SetX = 3,278 + SetY = 3,164 + SetX = 6,334 + SetY = 6,226 + SetX = 8,444 + SetY = 8,137 + SetX = 9,303 + SetY = 9,240 + SetX = 10,444 + SetY = 10,89 + SetX = 12,474 + SetY = 12,59 + + Graphic = weather + Focus = Screen + SetX = 0,440 + SetY = 0,194 + SetVisible = 0,true + SetX = 1,51 + SetY = 1,161 + SetX = 2,263 + SetY = 2,253 + SetX = 3,436 + SetY = 3,52 + SetX = 4,390 + SetY = 4,210 + SetX = 6,465 + SetY = 6,116 + SetX = 7,454 + SetY = 7,82 + SetX = 8,276 + SetY = 8,136 + SetX = 9,465 + SetY = 9,160 + SetX = 10,285 + SetY = 10,105 + SetX = 11,419 + SetY = 11,272 + SetX = 12,230 + SetY = 12,142 + + Graphic = weather + Focus = Screen + SetX = 0,362 + SetY = 0,252 + SetVisible = 0,true + SetX = 2,78 + SetY = 2,206 + SetX = 4,259 + SetY = 4,87 + SetX = 5,181 + SetY = 5,217 + SetX = 6,298 + SetY = 6,96 + SetX = 7,191 + SetY = 7,222 + SetX = 8,365 + SetY = 8,231 + SetX = 9,337 + SetY = 9,93 + SetX = 10,82 + SetY = 10,240 + SetX = 11,489 + SetY = 11,96 + SetX = 12,198 + SetY = 12,28 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 4,72 + SetY = 4,220 + SetX = 6,161 + SetY = 6,265 + SetX = 7,296 + SetY = 7,172 + SetX = 11,281 + SetY = 11,268 + SetX = 12,41 + SetY = 12,229 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 9,28 + SetY = 9,57 + SetX = 10,294 + SetY = 10,234 + SetX = 11,111 + SetY = 11,246 + SetX = 12,167 + SetY = 12,237 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 11,299 + SetY = 11,47 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 12,449 + SetY = 12,237 diff --git a/PBS/Animations/Converted/Common/HealthDown.txt b/PBS/Animations/Converted/Common/HealthDown.txt new file mode 100644 index 000000000..b88442155 --- /dev/null +++ b/PBS/Animations/Converted/Common/HealthDown.txt @@ -0,0 +1,170 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,HealthDown] +Name = HealthDown + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ! + Focus = Target + SetX = 0,334 + SetY = 0,43 + SetVisible = 0,true + SetOpacity = 0,126 + SetToneRed = 0,255 + SetToneGreen = 0,64 + SetToneBlue = 0,-128 + SetY = 1,63 + SetY = 2,83 + SetY = 3,103 + SetY = 4,123 + SetY = 5,143 + SetOpacity = 5,79 + SetY = 6,163 + SetOpacity = 6,32 + SetX = 7,398 + SetY = 7,169 + SetX = 8,383 + SetY = 8,159 + SetX = 9,409 + SetY = 9,188 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 1,419 + SetY = 1,64 + SetOpacity = 1,126 + SetToneRed = 1,255 + SetToneGreen = 1,64 + SetToneBlue = 1,-128 + SetY = 2,84 + SetY = 3,104 + SetY = 4,124 + SetY = 5,144 + SetOpacity = 5,79 + SetY = 6,164 + SetOpacity = 6,32 + SetX = 7,368 + SetY = 7,187 + SetX = 8,343 + SetY = 8,178 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 1,406 + SetY = 1,87 + SetOpacity = 1,126 + SetToneRed = 1,255 + SetToneGreen = 1,64 + SetToneBlue = 1,-128 + SetY = 2,107 + SetY = 3,127 + SetY = 4,147 + SetY = 5,167 + SetOpacity = 5,79 + SetY = 6,187 + SetOpacity = 6,32 + SetX = 7,383 + SetY = 7,139 + SetOpacity = 7,79 + SetX = 8,409 + SetY = 8,168 + + Graphic = ! + Focus = Target + SetX = 0,419 + SetY = 0,44 + SetVisible = 0,true + SetOpacity = 0,126 + SetToneRed = 0,255 + SetToneGreen = 0,64 + SetToneBlue = 0,-128 + SetX = 1,398 + SetY = 1,49 + SetY = 2,69 + SetY = 3,89 + SetY = 4,109 + SetY = 5,129 + SetY = 6,149 + SetOpacity = 6,79 + SetX = 7,343 + SetY = 7,158 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 2,368 + SetY = 2,87 + SetOpacity = 2,126 + SetToneRed = 2,255 + SetToneGreen = 2,64 + SetToneBlue = 2,-128 + SetY = 3,107 + SetY = 4,127 + SetY = 5,147 + SetY = 6,167 + SetOpacity = 6,79 + SetX = 7,409 + SetY = 7,148 + SetOpacity = 7,126 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 2,383 + SetY = 2,39 + SetOpacity = 2,126 + SetToneRed = 2,255 + SetToneGreen = 2,64 + SetToneBlue = 2,-128 + SetY = 3,59 + SetY = 4,79 + SetY = 5,99 + SetY = 6,119 + + Graphic = ! + Focus = Target + SetX = 0,406 + SetY = 0,67 + SetVisible = 0,true + SetOpacity = 0,126 + SetToneRed = 0,255 + SetToneGreen = 0,64 + SetToneBlue = 0,-128 + SetX = 1,368 + SetX = 3,343 + SetY = 3,78 + SetY = 4,98 + SetY = 5,118 + SetY = 6,138 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 3,409 + SetY = 3,68 + SetOpacity = 3,126 + SetToneRed = 3,255 + SetToneGreen = 3,64 + SetToneBlue = 3,-128 + SetY = 4,88 + SetY = 5,108 + SetY = 6,128 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 2,343 + SetY = 2,58 + SetOpacity = 2,126 + SetToneRed = 2,255 + SetToneGreen = 2,64 + SetToneBlue = 2,-128 + + Play = 0,decrease,100,140 diff --git a/PBS/Animations/Converted/Common/HealthUp.txt b/PBS/Animations/Converted/Common/HealthUp.txt new file mode 100644 index 000000000..05fde7f52 --- /dev/null +++ b/PBS/Animations/Converted/Common/HealthUp.txt @@ -0,0 +1,38 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,HealthUp] +Name = HealthUp + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 1,432 + SetY = 1,54 + SetX = 10,344 + SetY = 10,70 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 4,344 + SetY = 4,70 + + Graphic = leech-seed + Focus = Target + SetX = 0,392 + SetY = 0,94 + SetVisible = 0,true + SetX = 10,432 + SetY = 10,54 + SetX = 11,344 + SetY = 11,70 + + Play = 0,Recovery,75,100 + Play = 2,Recovery,80,100 + Play = 5,Recovery,80,100 diff --git a/PBS/Animations/Converted/Common/LeechSeed.txt b/PBS/Animations/Converted/Common/LeechSeed.txt new file mode 100644 index 000000000..b01686e44 --- /dev/null +++ b/PBS/Animations/Converted/Common/LeechSeed.txt @@ -0,0 +1,111 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,LeechSeed] +Name = LeechSeed + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,339 + SetY = 1,98 + SetX = 2,345 + SetY = 2,154 + SetX = 3,294 + SetY = 3,192 + SetX = 4,236 + SetY = 4,217 + SetX = 5,179 + SetY = 5,230 + SetX = 10,108 + SetY = 10,192 + SetX = 16,147 + SetY = 16,173 + SetX = 17,96 + SetY = 17,230 + SetX = 18,160 + SetY = 18,211 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,384 + SetY = 2,98 + SetX = 3,313 + SetY = 3,123 + SetX = 4,256 + SetY = 4,148 + SetX = 5,192 + SetY = 5,179 + SetX = 6,121 + SetY = 6,224 + SetX = 7,134 + SetX = 11,147 + SetY = 11,173 + SetX = 16,96 + SetY = 16,230 + SetX = 17,160 + SetY = 17,211 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,371 + SetY = 3,98 + SetX = 4,345 + SetY = 4,148 + SetX = 5,294 + SetY = 5,192 + SetX = 6,243 + SetY = 6,211 + SetX = 7,185 + SetY = 7,224 + SetX = 8,134 + SetX = 12,96 + SetY = 12,230 + SetX = 16,160 + SetY = 16,211 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,313 + SetY = 4,104 + SetX = 5,249 + SetY = 5,116 + SetX = 6,179 + SetY = 6,148 + SetX = 13,160 + SetY = 13,211 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,384 + SetY = 0,98 + SetVisible = 0,true + SetY = 1,110 + SetX = 2,275 + SetY = 2,98 + SetX = 3,204 + SetY = 3,123 + SetX = 4,147 + SetY = 4,167 + SetX = 5,134 + SetY = 5,224 + SetX = 7,128 + SetY = 7,186 + SetX = 9,134 + SetY = 9,224 + SetX = 16,108 + SetY = 16,192 + SetX = 17,147 + SetY = 17,173 + SetX = 18,96 + SetY = 18,230 + SetX = 19,160 + SetY = 19,211 diff --git a/PBS/Animations/Converted/Common/Paralysis.txt b/PBS/Animations/Converted/Common/Paralysis.txt new file mode 100644 index 000000000..b5ac92c97 --- /dev/null +++ b/PBS/Animations/Converted/Common/Paralysis.txt @@ -0,0 +1,55 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Paralysis] +Name = Paralysis + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Struggle + Focus = Target + SetVisible = 0,true + SetX = 1,424 + SetY = 1,102 + SetX = 2,456 + SetY = 2,86 + SetX = 3,440 + SetX = 4,336 + SetX = 5,408 + SetY = 5,110 + SetX = 6,280 + SetY = 6,102 + SetX = 7,424 + SetX = 8,456 + SetY = 8,86 + SetX = 9,440 + SetX = 10,336 + SetX = 11,408 + SetY = 11,110 + + Graphic = Struggle + Focus = Target + SetVisible = 0,true + SetX = 1,336 + SetY = 1,94 + SetX = 2,304 + SetY = 2,78 + SetX = 3,328 + SetY = 3,94 + SetX = 4,448 + SetX = 5,312 + SetX = 6,456 + SetY = 6,86 + SetX = 7,336 + SetY = 7,94 + SetX = 8,304 + SetY = 8,78 + SetX = 9,328 + SetY = 9,94 + SetX = 10,448 + SetX = 11,312 + + Play = 0,Paralyze3,80,100 diff --git a/PBS/Animations/Converted/Common/ParentalBond.txt b/PBS/Animations/Converted/Common/ParentalBond.txt new file mode 100644 index 000000000..a15dcdda1 --- /dev/null +++ b/PBS/Animations/Converted/Common/ParentalBond.txt @@ -0,0 +1,22 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,ParentalBond] +Name = ParentalBond + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Tackle_B + Focus = Target + SetVisible = 0,true + SetX = 2,384 + SetY = 2,99 + SetOpacity = 2,150 + SetOpacity = 3,255 + SetOpacity = 8,150 + SetOpacity = 9,100 + + Play = 0,Blow1,80,100 diff --git a/PBS/Animations/Converted/Common/Poison.txt b/PBS/Animations/Converted/Common/Poison.txt new file mode 100644 index 000000000..c2117053b --- /dev/null +++ b/PBS/Animations/Converted/Common/Poison.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Poison] +Name = Poison + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = State1 + Focus = Target + SetVisible = 0,true + SetX = 1,384 + SetY = 1,86 + + Play = 0,Poison,80,100 diff --git a/PBS/Animations/Converted/Common/Rain.txt b/PBS/Animations/Converted/Common/Rain.txt new file mode 100644 index 000000000..8a3955508 --- /dev/null +++ b/PBS/Animations/Converted/Common/Rain.txt @@ -0,0 +1,251 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Rain] +Name = Rain + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,197 + SetY = 0,25 + SetVisible = 0,true + SetX = 1,72 + SetY = 1,49 + SetX = 2,60 + SetY = 2,42 + SetX = 3,43 + SetY = 3,62 + SetY = 4,66 + SetX = 5,480 + SetY = 5,78 + SetX = 6,201 + SetY = 6,65 + SetX = 7,80 + SetY = 7,62 + SetX = 8,265 + SetY = 8,218 + SetX = 9,99 + SetY = 9,55 + + Graphic = weather + Focus = Screen + SetX = 0,275 + SetY = 0,47 + SetVisible = 0,true + SetX = 1,229 + SetY = 1,216 + SetX = 2,193 + SetY = 2,131 + SetX = 3,205 + SetY = 3,111 + SetX = 4,122 + SetY = 4,73 + SetX = 5,361 + SetY = 5,34 + SetX = 6,278 + SetY = 6,211 + SetX = 7,239 + SetY = 7,122 + SetX = 8,398 + SetY = 8,251 + SetX = 9,253 + SetY = 9,148 + + Graphic = weather + Focus = Screen + SetX = 0,355 + SetY = 0,51 + SetVisible = 0,true + SetX = 1,109 + SetY = 1,217 + SetX = 2,265 + SetY = 2,233 + SetX = 3,289 + SetY = 3,227 + SetX = 4,148 + SetY = 4,143 + SetX = 5,404 + SetY = 5,152 + SetX = 6,397 + SetY = 6,257 + SetX = 7,172 + SetY = 7,23 + SetX = 8,270 + SetY = 8,110 + SetX = 9,254 + SetY = 9,274 + + Graphic = weather + Focus = Screen + SetX = 0,450 + SetY = 0,50 + SetVisible = 0,true + SetX = 1,223 + SetY = 1,110 + SetX = 2,228 + SetY = 2,82 + SetX = 3,279 + SetY = 3,63 + SetX = 4,203 + SetY = 4,141 + SetX = 5,274 + SetY = 5,69 + SetX = 6,478 + SetY = 6,170 + SetX = 7,25 + SetY = 7,169 + SetX = 8,491 + SetY = 8,59 + SetX = 9,418 + SetY = 9,243 + + Graphic = weather + Focus = Screen + SetX = 0,83 + SetY = 0,81 + SetVisible = 0,true + SetX = 1,399 + SetY = 1,120 + SetX = 2,350 + SetY = 2,43 + SetX = 3,31 + SetY = 3,176 + SetX = 4,101 + SetY = 4,242 + SetX = 5,54 + SetY = 5,71 + SetX = 6,480 + SetY = 6,53 + SetX = 7,263 + SetY = 7,251 + SetX = 8,492 + SetY = 8,204 + SetX = 9,181 + SetY = 9,238 + + Graphic = weather + Focus = Screen + SetX = 0,231 + SetY = 0,170 + SetVisible = 0,true + SetX = 1,480 + SetY = 1,83 + SetX = 2,399 + SetY = 2,154 + SetX = 3,475 + SetY = 3,231 + SetX = 4,185 + SetY = 4,249 + SetX = 5,155 + SetY = 5,126 + SetX = 6,28 + SetY = 6,111 + SetX = 7,146 + SetY = 7,249 + SetX = 8,91 + SetY = 8,63 + SetX = 9,108 + SetY = 9,245 + + Graphic = weather + Focus = Screen + SetX = 0,352 + SetY = 0,212 + SetVisible = 0,true + SetX = 1,362 + SetY = 1,63 + SetX = 2,488 + SetY = 2,60 + SetX = 3,482 + SetY = 3,85 + SetX = 4,290 + SetY = 4,114 + SetX = 5,210 + SetY = 5,242 + SetX = 6,119 + SetY = 6,59 + SetX = 7,29 + SetY = 7,266 + SetX = 8,35 + SetY = 8,173 + SetX = 9,25 + SetY = 9,205 + + Graphic = weather + Focus = Screen + SetX = 0,467 + SetY = 0,254 + SetVisible = 0,true + SetX = 1,376 + SetY = 1,192 + SetX = 2,434 + SetY = 2,253 + SetX = 3,381 + SetY = 3,12 + SetX = 4,440 + SetY = 4,119 + SetX = 5,55 + SetY = 5,232 + SetX = 6,77 + SetY = 6,215 + SetX = 7,367 + SetY = 7,134 + SetX = 8,187 + SetY = 8,144 + SetX = 9,148 + SetY = 9,25 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 1,482 + SetY = 1,244 + SetX = 2,121 + SetY = 2,249 + SetX = 3,382 + SetY = 3,209 + SetX = 4,378 + SetY = 4,150 + SetX = 5,422 + SetY = 5,252 + SetX = 7,471 + SetY = 7,126 + SetX = 9,247 + SetY = 9,72 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 2,27 + SetY = 2,241 + SetX = 3,88 + SetY = 3,177 + SetX = 4,337 + SetY = 4,243 + SetX = 5,319 + SetY = 5,241 + SetX = 7,363 + SetY = 7,237 + SetX = 9,365 + SetY = 9,42 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 4,409 + SetY = 4,203 + SetX = 7,443 + SetY = 7,194 + SetX = 9,479 + SetY = 9,180 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 9,474 + SetY = 9,41 diff --git a/PBS/Animations/Converted/Common/Sandstorm.txt b/PBS/Animations/Converted/Common/Sandstorm.txt new file mode 100644 index 000000000..b2716c99a --- /dev/null +++ b/PBS/Animations/Converted/Common/Sandstorm.txt @@ -0,0 +1,288 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Sandstorm] +Name = Sandstorm + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,-350 + SetY = 0,-30 + SetVisible = 0,true + SetX = 1,153 + SetY = 1,62 + SetX = 2,-350 + SetY = 2,-30 + SetX = 3,153 + SetY = 3,62 + SetX = 4,139 + SetY = 4,48 + SetX = 5,-350 + SetY = 5,-30 + SetX = 6,153 + SetY = 6,62 + SetX = 7,-350 + SetY = 7,-30 + SetX = 8,153 + SetY = 8,62 + SetX = 9,32 + SetY = 9,252 + + Graphic = weather + Focus = Screen + SetX = 0,31 + SetY = 0,69 + SetVisible = 0,true + SetX = 1,56 + SetY = 1,85 + SetX = 2,31 + SetY = 2,69 + SetX = 3,56 + SetY = 3,85 + SetX = 4,42 + SetY = 4,82 + SetX = 5,31 + SetY = 5,69 + SetX = 6,56 + SetY = 6,85 + SetX = 7,31 + SetY = 7,69 + SetX = 8,56 + SetY = 8,85 + SetX = 9,119 + SetY = 9,175 + + Graphic = weather + Focus = Screen + SetX = 0,156 + SetY = 0,106 + SetVisible = 0,true + SetX = 1,74 + SetY = 1,223 + SetX = 2,156 + SetY = 2,106 + SetX = 3,74 + SetY = 3,223 + SetX = 4,157 + SetY = 4,167 + SetX = 5,156 + SetY = 5,106 + SetX = 6,74 + SetY = 6,223 + SetX = 7,156 + SetY = 7,106 + SetX = 8,74 + SetY = 8,223 + SetX = 9,143 + SetY = 9,267 + + Graphic = weather + Focus = Screen + SetX = 0,165 + SetY = 0,220 + SetVisible = 0,true + SetX = 1,220 + SetY = 1,207 + SetX = 2,165 + SetY = 2,220 + SetX = 3,220 + SetY = 3,207 + SetX = 4,58 + SetY = 4,225 + SetX = 5,165 + SetY = 5,220 + SetX = 6,220 + SetY = 6,207 + SetX = 7,165 + SetY = 7,220 + SetX = 8,220 + SetY = 8,207 + SetX = 9,222 + SetY = 9,197 + + Graphic = weather + Focus = Screen + SetX = 0,267 + SetY = 0,178 + SetVisible = 0,true + SetX = 1,352 + SetY = 1,253 + SetX = 2,267 + SetY = 2,178 + SetX = 3,352 + SetY = 3,253 + SetX = 4,178 + SetY = 4,273 + SetX = 5,267 + SetY = 5,178 + SetX = 6,352 + SetY = 6,253 + SetX = 7,267 + SetY = 7,178 + SetX = 8,352 + SetY = 8,253 + SetX = 9,162 + SetY = 9,82 + + Graphic = weather + Focus = Screen + SetX = 0,309 + SetY = 0,248 + SetVisible = 0,true + SetX = 1,464 + SetY = 1,227 + SetX = 2,309 + SetY = 2,248 + SetX = 3,464 + SetY = 3,227 + SetX = 4,284 + SetY = 4,217 + SetX = 5,309 + SetY = 5,248 + SetX = 6,464 + SetY = 6,227 + SetX = 7,309 + SetY = 7,248 + SetX = 8,464 + SetY = 8,227 + SetX = 9,49 + SetY = 9,61 + + Graphic = weather + Focus = Screen + SetX = 0,388 + SetY = 0,142 + SetVisible = 0,true + SetX = 1,484 + SetY = 1,76 + SetX = 2,388 + SetY = 2,142 + SetX = 3,484 + SetY = 3,76 + SetX = 4,377 + SetY = 4,143 + SetX = 5,388 + SetY = 5,142 + SetX = 6,484 + SetY = 6,76 + SetX = 7,388 + SetY = 7,142 + SetX = 8,484 + SetY = 8,76 + SetX = 9,21 + SetY = 9,158 + + Graphic = weather + Focus = Screen + SetX = 0,448 + SetY = 0,243 + SetVisible = 0,true + SetX = 1,378 + SetY = 1,130 + SetX = 2,448 + SetY = 2,243 + SetX = 3,378 + SetY = 3,130 + SetX = 4,403 + SetY = 4,259 + SetX = 5,448 + SetY = 5,243 + SetX = 6,378 + SetY = 6,130 + SetX = 7,448 + SetY = 7,243 + SetX = 8,378 + SetY = 8,130 + SetX = 9,350 + SetY = 9,240 + + Graphic = weather + Focus = Screen + SetX = 0,35 + SetY = 0,216 + SetVisible = 0,true + SetX = 1,285 + SetY = 1,142 + SetX = 2,35 + SetY = 2,216 + SetX = 3,285 + SetY = 3,142 + SetX = 4,500 + SetY = 4,230 + SetX = 5,35 + SetY = 5,216 + SetX = 6,285 + SetY = 6,142 + SetX = 7,35 + SetY = 7,216 + SetX = 8,285 + SetY = 8,142 + SetX = 9,481 + SetY = 9,206 + + Graphic = weather + Focus = Screen + SetX = 0,276 + SetY = 0,34 + SetVisible = 0,true + SetX = 1,316 + SetY = 1,22 + SetX = 2,276 + SetY = 2,34 + SetX = 3,316 + SetY = 3,22 + SetX = 4,481 + SetY = 4,77 + SetX = 5,276 + SetY = 5,34 + SetX = 6,316 + SetY = 6,22 + SetX = 7,276 + SetY = 7,34 + SetX = 8,316 + SetY = 8,22 + SetX = 9,456 + SetY = 9,64 + + Graphic = weather + Focus = Screen + SetX = 0,487 + SetY = 0,32 + SetVisible = 0,true + SetX = 4,358 + SetY = 4,16 + SetX = 5,487 + SetY = 5,32 + SetX = 9,311 + SetY = 9,55 + + Graphic = weather + Focus = Screen + SetX = 0,492 + SetY = 0,135 + SetVisible = 0,true + SetX = 4,267 + SetY = 4,63 + SetX = 5,492 + SetY = 5,135 + SetX = 9,328 + SetY = 9,146 + + Graphic = weather + Focus = Screen + SetX = 0,387 + SetY = 0,18 + SetVisible = 0,true + SetX = 9,251 + SetY = 9,305 + + Graphic = weather + Focus = Screen + SetX = 0,148 + SetY = 0,9 + SetVisible = 0,true diff --git a/PBS/Animations/Converted/Common/Shadow.txt b/PBS/Animations/Converted/Common/Shadow.txt new file mode 100644 index 000000000..69e8f6a00 --- /dev/null +++ b/PBS/Animations/Converted/Common/Shadow.txt @@ -0,0 +1,70 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Shadow] +Name = Shadow + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 2,440 + SetY = 2,126 + SetX = 4,296 + SetY = 4,86 + SetX = 6,360 + SetY = 6,110 + SetX = 7,416 + SetY = 7,54 + SetX = 8,368 + SetY = 8,22 + SetX = 9,416 + SetY = 9,118 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 3,296 + SetY = 3,86 + SetX = 4,360 + SetY = 4,110 + SetX = 6,416 + SetY = 6,54 + SetX = 7,368 + SetY = 7,22 + SetX = 8,416 + SetY = 8,118 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 5,416 + SetY = 5,54 + SetX = 6,368 + SetY = 6,22 + SetX = 7,416 + SetY = 7,118 + + Graphic = leech-seed + Focus = Target + SetX = 0,360 + SetY = 0,110 + SetVisible = 0,true + SetX = 4,440 + SetY = 4,126 + SetX = 6,296 + SetY = 6,86 + SetX = 7,344 + SetY = 7,142 + SetX = 8,416 + SetY = 8,54 + SetX = 9,368 + SetY = 9,22 + SetX = 10,416 + SetY = 10,118 + + Play = 0,Saint6,75,100 diff --git a/PBS/Animations/Converted/Common/ShadowSky.txt b/PBS/Animations/Converted/Common/ShadowSky.txt new file mode 100644 index 000000000..268835620 --- /dev/null +++ b/PBS/Animations/Converted/Common/ShadowSky.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,ShadowSky] +Name = ShadowSky + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,258 + SetY = 0,132 + SetZoomX = 0,327 + SetZoomY = 0,242 + SetVisible = 0,true + SetOpacity = 0,128 + SetOpacity = 1,192 + SetOpacity = 2,249 + SetOpacity = 8,192 + SetOpacity = 9,128 diff --git a/PBS/Animations/Converted/Common/Shiny.txt b/PBS/Animations/Converted/Common/Shiny.txt new file mode 100644 index 000000000..67a6dcded --- /dev/null +++ b/PBS/Animations/Converted/Common/Shiny.txt @@ -0,0 +1,70 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Shiny] +Name = Shiny + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 2,440 + SetY = 2,126 + SetX = 4,327 + SetY = 4,78 + SetX = 6,366 + SetY = 6,129 + SetX = 7,416 + SetY = 7,54 + SetX = 8,368 + SetY = 8,67 + SetX = 9,416 + SetY = 9,118 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 3,327 + SetY = 3,78 + SetX = 4,366 + SetY = 4,129 + SetX = 6,416 + SetY = 6,54 + SetX = 7,368 + SetY = 7,67 + SetX = 8,416 + SetY = 8,118 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 5,416 + SetY = 5,54 + SetX = 6,368 + SetY = 6,67 + SetX = 7,416 + SetY = 7,118 + + Graphic = leech-seed + Focus = Target + SetX = 0,360 + SetY = 0,110 + SetVisible = 0,true + SetX = 4,440 + SetY = 4,126 + SetX = 6,327 + SetY = 6,78 + SetX = 7,366 + SetY = 7,129 + SetX = 8,416 + SetY = 8,54 + SetX = 9,368 + SetY = 9,67 + SetX = 10,416 + SetY = 10,118 + + Play = 0,Shiny sparkle,100,100 diff --git a/PBS/Animations/Converted/Common/Sleep.txt b/PBS/Animations/Converted/Common/Sleep.txt new file mode 100644 index 000000000..6366e3274 --- /dev/null +++ b/PBS/Animations/Converted/Common/Sleep.txt @@ -0,0 +1,70 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Sleep] +Name = Sleep + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 028-State01 + Focus = Target + SetVisible = 0,true + SetX = 3,424 + SetY = 3,54 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,376 + SetY = 4,78 + SetX = 5,352 + SetY = 5,94 + SetX = 6,366 + SetY = 6,48 + SetX = 7,361 + SetY = 7,34 + SetX = 8,432 + SetY = 8,70 + SetX = 9,441 + SetY = 9,54 + SetX = 10,452 + SetY = 10,38 + SetX = 11,463 + SetY = 11,20 + + Graphic = 028-State01 + Focus = Target + SetVisible = 0,true + SetX = 5,370 + SetY = 5,64 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetX = 7,424 + SetY = 7,86 + + Graphic = 028-State01 + Focus = Target + SetVisible = 0,true + SetX = 1,408 + SetY = 1,78 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetX = 2,416 + SetY = 2,67 + SetX = 4,431 + SetY = 4,41 + SetX = 5,436 + SetY = 5,29 + SetX = 6,343 + SetY = 6,79 + SetX = 7,334 + SetY = 7,66 + SetX = 8,325 + SetY = 8,53 + SetX = 9,317 + SetY = 9,39 + SetX = 10,309 + SetY = 10,25 + + Play = 0,Sleep,80,100 diff --git a/PBS/Animations/Converted/Common/StatDown.txt b/PBS/Animations/Converted/Common/StatDown.txt new file mode 100644 index 000000000..74666f4d1 --- /dev/null +++ b/PBS/Animations/Converted/Common/StatDown.txt @@ -0,0 +1,143 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,StatDown] +Name = StatDown + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ! + Focus = Target + SetX = 0,334 + SetY = 0,43 + SetVisible = 0,true + SetOpacity = 0,126 + SetY = 1,63 + SetY = 2,83 + SetY = 3,103 + SetY = 4,123 + SetY = 5,143 + SetOpacity = 5,79 + SetY = 6,163 + SetOpacity = 6,32 + SetX = 7,398 + SetY = 7,169 + SetX = 8,383 + SetY = 8,159 + SetX = 9,409 + SetY = 9,188 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 1,419 + SetY = 1,64 + SetOpacity = 1,126 + SetY = 2,84 + SetY = 3,104 + SetY = 4,124 + SetY = 5,144 + SetOpacity = 5,79 + SetY = 6,164 + SetOpacity = 6,32 + SetX = 7,368 + SetY = 7,187 + SetX = 8,343 + SetY = 8,178 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 1,406 + SetY = 1,87 + SetOpacity = 1,126 + SetY = 2,107 + SetY = 3,127 + SetY = 4,147 + SetY = 5,167 + SetOpacity = 5,79 + SetY = 6,187 + SetOpacity = 6,32 + SetX = 7,383 + SetY = 7,139 + SetOpacity = 7,79 + SetX = 8,409 + SetY = 8,168 + + Graphic = ! + Focus = Target + SetX = 0,419 + SetY = 0,44 + SetVisible = 0,true + SetOpacity = 0,126 + SetX = 1,398 + SetY = 1,49 + SetY = 2,69 + SetY = 3,89 + SetY = 4,109 + SetY = 5,129 + SetY = 6,149 + SetOpacity = 6,79 + SetX = 7,343 + SetY = 7,158 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 2,368 + SetY = 2,87 + SetOpacity = 2,126 + SetY = 3,107 + SetY = 4,127 + SetY = 5,147 + SetY = 6,167 + SetOpacity = 6,79 + SetX = 7,409 + SetY = 7,148 + SetOpacity = 7,126 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 2,383 + SetY = 2,39 + SetOpacity = 2,126 + SetY = 3,59 + SetY = 4,79 + SetY = 5,99 + SetY = 6,119 + + Graphic = ! + Focus = Target + SetX = 0,406 + SetY = 0,67 + SetVisible = 0,true + SetOpacity = 0,126 + SetX = 1,368 + SetX = 3,343 + SetY = 3,78 + SetY = 4,98 + SetY = 5,118 + SetY = 6,138 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 3,409 + SetY = 3,68 + SetOpacity = 3,126 + SetY = 4,88 + SetY = 5,108 + SetY = 6,128 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 2,343 + SetY = 2,58 + SetOpacity = 2,126 + + Play = 0,decrease,100,100 diff --git a/PBS/Animations/Converted/Common/StatUp.txt b/PBS/Animations/Converted/Common/StatUp.txt new file mode 100644 index 000000000..dbbb93721 --- /dev/null +++ b/PBS/Animations/Converted/Common/StatUp.txt @@ -0,0 +1,111 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,StatUp] +Name = StatUp + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ! + Focus = Target + SetX = 0,343 + SetY = 0,234 + SetVisible = 0,true + SetOpacity = 0,126 + SetY = 1,210 + SetY = 2,178 + SetY = 3,146 + SetY = 4,114 + SetY = 5,82 + SetY = 6,62 + SetY = 7,42 + SetY = 8,22 + SetOpacity = 8,63 + SetY = 9,2 + SetOpacity = 9,0 + + Graphic = ! + Focus = Target + SetX = 0,391 + SetY = 0,202 + SetVisible = 0,true + SetOpacity = 0,126 + SetY = 1,170 + SetY = 2,138 + SetY = 3,98 + SetY = 4,66 + SetY = 5,34 + SetY = 6,14 + SetY = 7,-6 + SetY = 8,-26 + SetOpacity = 8,63 + SetY = 9,-46 + SetOpacity = 9,0 + + Graphic = ! + Focus = Target + SetX = 0,439 + SetY = 0,234 + SetVisible = 0,true + SetOpacity = 0,126 + SetY = 1,210 + SetX = 2,447 + SetY = 2,178 + SetX = 3,439 + SetY = 3,146 + SetY = 4,114 + SetY = 5,82 + SetY = 6,62 + SetY = 7,42 + SetY = 8,22 + SetOpacity = 8,63 + SetY = 9,2 + SetOpacity = 9,0 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 2,375 + SetY = 2,234 + SetOpacity = 2,126 + SetY = 3,202 + SetY = 4,170 + SetY = 5,138 + SetY = 6,118 + SetY = 7,98 + SetY = 8,78 + SetOpacity = 8,63 + SetY = 9,58 + SetOpacity = 9,0 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 3,423 + SetY = 3,234 + SetOpacity = 3,126 + SetY = 4,202 + SetY = 5,170 + SetY = 6,150 + SetY = 7,130 + SetY = 8,110 + SetOpacity = 8,63 + SetY = 9,90 + SetOpacity = 9,0 + + Graphic = ! + Focus = Target + SetVisible = 0,true + SetX = 5,359 + SetY = 5,234 + SetOpacity = 5,126 + SetY = 6,194 + SetY = 8,174 + SetOpacity = 8,63 + SetY = 9,154 + SetOpacity = 9,0 + + Play = 0,increase,100,100 diff --git a/PBS/Animations/Converted/Common/Sun.txt b/PBS/Animations/Converted/Common/Sun.txt new file mode 100644 index 000000000..826992724 --- /dev/null +++ b/PBS/Animations/Converted/Common/Sun.txt @@ -0,0 +1,41 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Sun] +Name = Sun + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,64 + SetY = 0,64 + SetVisible = 0,true + SetOpacity = 0,64 + SetX = 1,72 + SetY = 1,72 + SetOpacity = 1,128 + SetX = 2,80 + SetY = 2,80 + SetOpacity = 2,192 + SetX = 3,88 + SetY = 3,88 + SetOpacity = 3,224 + SetX = 4,94 + SetY = 4,94 + SetOpacity = 4,255 + SetX = 12,88 + SetY = 12,88 + SetOpacity = 12,224 + SetX = 13,80 + SetY = 13,80 + SetOpacity = 13,192 + SetX = 14,72 + SetY = 14,72 + SetOpacity = 14,128 + SetX = 15,64 + SetY = 15,64 + SetOpacity = 15,64 diff --git a/PBS/Animations/Converted/Common/SuperShiny.txt b/PBS/Animations/Converted/Common/SuperShiny.txt new file mode 100644 index 000000000..a1d1e3820 --- /dev/null +++ b/PBS/Animations/Converted/Common/SuperShiny.txt @@ -0,0 +1,70 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,SuperShiny] +Name = SuperShiny + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 2,440 + SetY = 2,126 + SetX = 4,327 + SetY = 4,78 + SetX = 6,366 + SetY = 6,129 + SetX = 7,416 + SetY = 7,54 + SetX = 8,368 + SetY = 8,67 + SetX = 9,416 + SetY = 9,118 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 3,327 + SetY = 3,78 + SetX = 4,366 + SetY = 4,129 + SetX = 6,416 + SetY = 6,54 + SetX = 7,368 + SetY = 7,67 + SetX = 8,416 + SetY = 8,118 + + Graphic = leech-seed + Focus = Target + SetVisible = 0,true + SetX = 5,416 + SetY = 5,54 + SetX = 6,368 + SetY = 6,67 + SetX = 7,416 + SetY = 7,118 + + Graphic = leech-seed + Focus = Target + SetX = 0,360 + SetY = 0,110 + SetVisible = 0,true + SetX = 4,440 + SetY = 4,126 + SetX = 6,327 + SetY = 6,78 + SetX = 7,366 + SetY = 7,129 + SetX = 8,416 + SetY = 8,54 + SetX = 9,368 + SetY = 9,67 + SetX = 10,416 + SetY = 10,118 + + Play = 0,Shiny sparkle,100,100 diff --git a/PBS/Animations/Converted/Common/Toxic.txt b/PBS/Animations/Converted/Common/Toxic.txt new file mode 100644 index 000000000..2118dde8e --- /dev/null +++ b/PBS/Animations/Converted/Common/Toxic.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Toxic] +Name = Toxic + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = State1 + Focus = Target + SetVisible = 0,true + SetX = 1,384 + SetY = 1,86 + + Play = 0,Poison,80,80 diff --git a/PBS/Animations/Converted/Common/Wrap.txt b/PBS/Animations/Converted/Common/Wrap.txt new file mode 100644 index 000000000..3859df54b --- /dev/null +++ b/PBS/Animations/Converted/Common/Wrap.txt @@ -0,0 +1,47 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Common,Wrap] +Name = Wrap + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Struggle + Focus = Target + SetX = 0,440 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,480 + SetY = 1,94 + SetX = 2,488 + SetY = 2,102 + SetX = 3,464 + SetY = 3,94 + SetX = 4,432 + SetX = 5,464 + SetX = 6,496 + SetY = 6,102 + SetX = 7,480 + + Graphic = Struggle + Focus = Target + SetX = 0,320 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,94 + SetX = 2,240 + SetY = 2,102 + SetX = 3,264 + SetY = 3,94 + SetX = 4,296 + SetX = 5,256 + SetX = 6,216 + SetX = 7,264 + + Play = 0,Slash10,80,100 + Play = 3,Slash10,80,100 + Play = 6,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/ABSORB.txt b/PBS/Animations/Converted/Move/ABSORB.txt new file mode 100644 index 000000000..a043a9215 --- /dev/null +++ b/PBS/Animations/Converted/Move/ABSORB.txt @@ -0,0 +1,188 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ABSORB] +Name = ABSORB + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,358 + SetY = 0,91 + SetVisible = 0,true + SetX = 1,300 + SetY = 1,98 + SetX = 2,198 + SetY = 2,129 + SetX = 3,134 + SetY = 3,179 + SetX = 4,108 + SetY = 4,192 + SetX = 5,166 + SetY = 5,224 + SetX = 6,179 + SetY = 6,198 + SetX = 7,128 + SetY = 7,211 + SetX = 8,153 + SetY = 8,192 + SetX = 9,89 + SetY = 9,186 + SetX = 12,147 + SetY = 12,148 + SetFlip = 13,true + SetX = 13,115 + SetY = 13,230 + SetFlip = 14,false + SetX = 14,102 + SetY = 14,142 + SetFlip = 15,true + SetX = 15,96 + SetY = 15,192 + SetFlip = 16,false + SetX = 16,160 + SetY = 16,173 + SetX = 17,128 + SetY = 17,217 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,396 + SetY = 1,104 + SetX = 2,364 + SetY = 2,148 + SetX = 3,281 + SetY = 3,192 + SetX = 4,217 + SetY = 4,211 + SetX = 5,140 + SetY = 5,198 + SetX = 6,108 + SetY = 6,186 + SetX = 7,172 + SetY = 7,224 + SetX = 8,89 + SetY = 8,186 + SetX = 9,160 + SetY = 9,211 + SetX = 11,147 + SetY = 11,148 + SetX = 12,160 + SetY = 12,211 + SetX = 13,102 + SetY = 13,142 + SetFlip = 14,true + SetX = 14,96 + SetY = 14,192 + SetFlip = 15,false + SetX = 15,160 + SetY = 15,173 + SetX = 16,128 + SetY = 16,217 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,364 + SetY = 1,85 + SetX = 2,300 + SetY = 2,116 + SetX = 3,243 + SetY = 3,148 + SetX = 4,172 + SetY = 4,179 + SetX = 5,256 + SetY = 5,186 + SetX = 6,236 + SetY = 6,198 + SetX = 7,134 + SetY = 7,173 + SetX = 9,147 + SetY = 9,148 + SetX = 11,160 + SetY = 11,211 + SetFlip = 12,true + SetX = 12,121 + SetY = 12,230 + SetX = 13,96 + SetY = 13,192 + SetFlip = 14,false + SetX = 14,160 + SetY = 14,173 + SetX = 15,128 + SetY = 15,217 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,384 + SetY = 2,91 + SetX = 3,345 + SetY = 3,129 + SetX = 4,313 + SetY = 4,154 + SetX = 5,153 + SetY = 5,167 + SetX = 6,192 + SetY = 6,142 + SetX = 7,230 + SetY = 7,154 + SetFlip = 10,true + SetX = 10,121 + SetY = 10,230 + SetFlip = 12,false + SetX = 12,102 + SetY = 12,142 + SetX = 13,160 + SetY = 13,173 + SetX = 14,128 + SetY = 14,217 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,345 + SetY = 2,85 + SetX = 3,307 + SetY = 3,98 + SetX = 4,230 + SetY = 4,116 + SetX = 5,332 + SetY = 5,161 + SetX = 6,307 + SetY = 6,129 + SetX = 11,102 + SetY = 11,142 + SetFlip = 12,true + SetX = 12,96 + SetY = 12,192 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,390 + SetY = 3,110 + SetX = 4,371 + SetY = 4,135 + SetX = 5,275 + SetY = 5,110 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,345 + SetY = 4,91 + SetX = 5,364 + SetY = 5,98 + + Play = 0,Absorb2,80,100 + Play = 0,Absorb2,80,100 + Play = 2,Absorb2,80,100 + Play = 5,Absorb2,80,100 + Play = 7,Absorb2,80,100 + Play = 8,Saint7,80,100 diff --git a/PBS/Animations/Converted/Move/ACID.txt b/PBS/Animations/Converted/Move/ACID.txt new file mode 100644 index 000000000..eb44a3ac3 --- /dev/null +++ b/PBS/Animations/Converted/Move/ACID.txt @@ -0,0 +1,53 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ACID] +Name = ACID + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison2 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,147 + SetY = 1,211 + SetX = 2,172 + SetY = 2,179 + SetX = 3,217 + SetY = 3,142 + SetX = 4,275 + SetY = 4,104 + SetX = 5,326 + SetY = 5,91 + SetY = 6,85 + + Graphic = poison2 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,153 + SetY = 3,211 + SetX = 4,204 + SetY = 4,148 + SetX = 5,268 + SetY = 5,91 + + Graphic = poison2 + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,161 + SetX = 2,217 + SetY = 2,129 + SetX = 3,300 + SetY = 3,104 + SetX = 4,358 + SetY = 4,110 + SetOpacity = 12,100 + + Play = 0,throw,80,100 + Play = 3,Poison,80,100 diff --git a/PBS/Animations/Converted/Move/ACIDARMOR.txt b/PBS/Animations/Converted/Move/ACIDARMOR.txt new file mode 100644 index 000000000..b2cb5a71d --- /dev/null +++ b/PBS/Animations/Converted/Move/ACIDARMOR.txt @@ -0,0 +1,24 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ACIDARMOR] +Name = ACIDARMOR + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = Target + SetX = 0,392 + SetY = 0,94 + SetVisible = 0,true + SetX = 4,400 + SetY = 4,86 + SetX = 5,392 + SetY = 6,78 + + Play = 0,throw,80,100 + Play = 0,Sound2,80,100 + Play = 0,Pollen,80,100 diff --git a/PBS/Animations/Converted/Move/ACIDSPRAY.txt b/PBS/Animations/Converted/Move/ACIDSPRAY.txt new file mode 100644 index 000000000..fa4fb5cab --- /dev/null +++ b/PBS/Animations/Converted/Move/ACIDSPRAY.txt @@ -0,0 +1,133 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ACIDSPRAY] +Name = ACIDSPRAY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetX = 0,341 + SetY = 0,8 + SetZoomX = 0,85 + SetZoomY = 0,85 + SetVisible = 0,true + SetY = 1,17 + SetX = 3,335 + SetY = 3,48 + SetX = 4,340 + SetY = 4,76 + SetX = 5,339 + SetY = 5,93 + SetX = 6,365 + SetY = 6,104 + SetAngle = 6,180 + SetX = 7,330 + SetY = 7,116 + SetX = 8,413 + SetY = 8,151 + SetZoomX = 8,79 + SetZoomY = 8,79 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,366 + SetY = 1,8 + SetZoomX = 1,85 + SetZoomY = 1,85 + SetX = 3,354 + SetY = 3,30 + SetX = 4,355 + SetY = 4,55 + SetY = 5,81 + SetX = 6,338 + SetY = 6,92 + SetAngle = 6,180 + SetX = 7,357 + SetY = 7,125 + SetX = 8,390 + SetY = 8,128 + SetZoomX = 8,79 + SetZoomY = 8,79 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,394 + SetY = 1,17 + SetZoomX = 1,85 + SetZoomY = 1,85 + SetX = 3,384 + SetY = 3,40 + SetX = 4,376 + SetY = 4,63 + SetX = 6,382 + SetY = 6,91 + SetAngle = 6,180 + SetX = 7,420 + SetY = 7,129 + SetX = 8,364 + SetY = 8,134 + SetZoomX = 8,79 + SetZoomY = 8,79 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 2,418 + SetY = 2,9 + SetZoomX = 2,85 + SetZoomY = 2,85 + SetX = 3,408 + SetY = 3,23 + SetX = 4,402 + SetY = 4,71 + SetX = 5,401 + SetY = 5,89 + SetX = 6,407 + SetY = 6,102 + SetAngle = 6,180 + SetX = 7,380 + SetY = 7,127 + SetX = 8,341 + SetY = 8,129 + SetZoomX = 8,79 + SetZoomY = 8,79 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 2,441 + SetY = 2,12 + SetZoomX = 2,85 + SetZoomY = 2,85 + SetX = 3,438 + SetY = 3,37 + SetX = 4,431 + SetY = 4,65 + SetX = 5,430 + SetY = 5,83 + SetY = 6,101 + SetAngle = 6,180 + SetX = 7,399 + SetY = 7,116 + SetX = 8,306 + SetY = 8,125 + SetZoomX = 8,79 + SetZoomY = 8,79 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 5,361 + SetY = 5,86 + SetZoomX = 5,85 + SetZoomY = 5,85 + SetAngle = 5,180 + + Play = 0,Substitute,80,100 diff --git a/PBS/Animations/Converted/Move/ACROBATICS.txt b/PBS/Animations/Converted/Move/ACROBATICS.txt new file mode 100644 index 000000000..9edff535c --- /dev/null +++ b/PBS/Animations/Converted/Move/ACROBATICS.txt @@ -0,0 +1,44 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ACROBATICS] +Name = ACROBATICS + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 2,376 + SetY = 2,133 + SetZoomX = 2,41 + SetZoomY = 2,41 + SetZoomX = 3,39 + SetZoomY = 3,39 + SetZoomX = 5,62 + SetZoomY = 5,62 + SetX = 6,360 + SetY = 6,131 + SetZoomX = 6,84 + SetZoomY = 6,84 + + Graphic = finger.spoon + Focus = Target + SetX = 0,392 + SetY = 0,86 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetVisible = 0,true + SetZoomX = 1,47 + SetZoomY = 1,47 + SetZoomX = 3,70 + SetZoomY = 3,70 + SetZoomX = 4,81 + SetZoomY = 4,81 + SetZoomX = 5,86 + SetZoomY = 5,86 + + Play = 0,Take Down,100,112 diff --git a/PBS/Animations/Converted/Move/ACUPRESSURE.txt b/PBS/Animations/Converted/Move/ACUPRESSURE.txt new file mode 100644 index 000000000..7fe639f06 --- /dev/null +++ b/PBS/Animations/Converted/Move/ACUPRESSURE.txt @@ -0,0 +1,97 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ACUPRESSURE] +Name = ACUPRESSURE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = mixed status + Focus = Target + SetX = 0,399 + SetY = 0,93 + SetVisible = 0,true + SetX = 1,397 + SetY = 1,94 + SetX = 2,395 + SetX = 3,394 + SetY = 3,96 + SetY = 4,93 + SetX = 5,397 + SetY = 5,94 + SetX = 6,393 + SetY = 6,92 + SetX = 7,395 + SetY = 7,95 + SetX = 8,393 + SetY = 8,92 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 4,385 + SetY = 4,84 + SetX = 5,389 + SetY = 5,88 + SetX = 6,397 + SetY = 7,90 + SetX = 8,395 + SetY = 8,80 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 5,367 + SetY = 5,127 + SetX = 6,369 + SetY = 6,124 + SetX = 7,367 + SetY = 7,125 + SetX = 8,446 + SetY = 8,116 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 6,427 + SetY = 6,92 + SetX = 7,449 + SetY = 7,119 + SetX = 8,366 + SetY = 8,121 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 7,428 + SetY = 7,91 + SetY = 8,90 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 8,430 + SetY = 8,92 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 8,445 + SetY = 8,115 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 8,368 + SetY = 8,121 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 8,395 + SetY = 8,80 + + Play = 0,Acupressure,100,100 diff --git a/PBS/Animations/Converted/Move/AERIALACE.txt b/PBS/Animations/Converted/Move/AERIALACE.txt new file mode 100644 index 000000000..17cb1aa7b --- /dev/null +++ b/PBS/Animations/Converted/Move/AERIALACE.txt @@ -0,0 +1,372 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,AERIALACE] +Name = AERIALACE + + SetX = 0,128 + SetY = 0,224 + SetOpacity = 1,170 + SetOpacity = 2,85 + SetOpacity = 3,0 + SetOpacity = 6,255 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Aerial Ace + Focus = Target + SetX = 0,468 + SetY = 0,46 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,76 + SetY = 1,230 + SetOpacity = 1,255 + SetOpacity = 2,170 + SetOpacity = 3,85 + SetX = 4,331 + SetY = 4,173 + SetOpacity = 4,255 + SetToneRed = 4,214 + SetToneGreen = 4,100 + SetToneBlue = 4,100 + SetX = 5,351 + SetY = 5,151 + SetToneRed = 5,0 + SetToneGreen = 5,0 + SetToneBlue = 5,0 + SetX = 6,390 + SetY = 6,118 + SetX = 7,415 + SetY = 7,95 + SetX = 8,452 + SetY = 8,62 + SetX = 9,476 + SetY = 9,36 + SetOpacity = 9,128 + SetX = 10,287 + SetY = 10,32 + SetOpacity = 10,255 + SetX = 11,268 + SetY = 11,6 + SetOpacity = 11,128 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 1,442 + SetY = 1,71 + SetToneRed = 1,-37 + SetToneGreen = 1,-37 + SetToneBlue = 1,-37 + SetX = 2,59 + SetY = 2,258 + SetToneRed = 2,0 + SetToneGreen = 2,0 + SetToneBlue = 2,0 + SetOpacity = 3,170 + SetOpacity = 4,85 + SetX = 6,381 + SetY = 6,118 + SetOpacity = 6,128 + SetX = 7,391 + SetY = 7,82 + SetOpacity = 7,255 + SetX = 8,327 + SetY = 8,92 + SetX = 9,292 + SetY = 9,66 + SetX = 10,309 + SetY = 10,3 + SetOpacity = 10,128 + SetX = 11,490 + SetY = 11,6 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 2,411 + SetY = 2,98 + SetToneRed = 2,-74 + SetToneGreen = 2,-74 + SetToneBlue = 2,-74 + SetX = 3,100 + SetY = 3,272 + SetToneRed = 3,0 + SetToneGreen = 3,0 + SetToneBlue = 3,0 + SetX = 4,163 + SetY = 4,259 + SetX = 5,140 + SetY = 5,230 + SetX = 6,393 + SetY = 6,110 + SetOpacity = 6,128 + SetX = 7,368 + SetY = 7,98 + SetOpacity = 7,255 + SetX = 8,350 + SetY = 8,57 + SetX = 9,307 + SetY = 9,23 + SetX = 10,353 + SetY = 10,21 + SetX = 11,345 + SetY = 11,-3 + SetOpacity = 11,128 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 3,371 + SetY = 3,137 + SetX = 4,100 + SetY = 4,272 + SetOpacity = 4,170 + SetX = 5,163 + SetY = 5,259 + SetX = 6,140 + SetY = 6,230 + SetX = 7,419 + SetY = 7,74 + SetOpacity = 7,255 + SetX = 8,392 + SetY = 8,57 + SetX = 9,356 + SetY = 9,38 + SetX = 10,477 + SetY = 10,24 + SetX = 11,411 + SetY = 11,7 + SetOpacity = 11,128 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 5,100 + SetY = 5,272 + SetOpacity = 5,85 + SetX = 6,163 + SetY = 6,259 + SetX = 7,139 + SetY = 7,230 + SetX = 8,479 + SetY = 8,89 + SetOpacity = 8,255 + SetX = 9,507 + SetY = 9,97 + SetOpacity = 9,128 + SetX = 10,410 + SetY = 10,37 + SetOpacity = 10,255 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 6,410 + SetY = 6,109 + SetOpacity = 6,128 + SetX = 7,440 + SetY = 7,98 + SetOpacity = 7,255 + SetX = 8,479 + SetY = 8,145 + SetX = 9,502 + SetY = 9,158 + SetOpacity = 9,128 + SetX = 10,510 + SetY = 10,59 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 6,408 + SetY = 6,125 + SetOpacity = 6,128 + SetX = 7,439 + SetY = 7,127 + SetOpacity = 7,255 + SetX = 8,443 + SetY = 8,57 + SetX = 9,453 + SetY = 9,38 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 6,363 + SetY = 6,112 + SetOpacity = 6,128 + SetX = 7,405 + SetY = 7,77 + SetOpacity = 7,255 + SetX = 8,420 + SetY = 8,66 + SetX = 9,411 + SetY = 9,32 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 7,432 + SetY = 7,86 + SetX = 8,455 + SetY = 8,78 + SetX = 9,487 + SetY = 9,62 + + Play = 0,Ace,80,100 +#------------------------------- +[OppMove,AERIALACE] +Name = AERIALACE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + SetOpacity = 1,170 + SetOpacity = 2,85 + SetOpacity = 3,0 + SetOpacity = 5,255 + + Graphic = Aerial Ace + Focus = User + SetX = 0,229 + SetY = 0,168 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,209 + SetY = 1,185 + SetOpacity = 1,255 + SetX = 2,176 + SetY = 2,216 + SetX = 3,144 + SetY = 3,248 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 1,333 + SetY = 1,114 + SetOpacity = 2,170 + SetOpacity = 3,85 + SetX = 4,433 + SetY = 4,108 + SetOpacity = 4,255 + SetOpacity = 5,170 + SetOpacity = 6,85 + + Graphic = Aerial Ace + Focus = User + SetVisible = 0,true + SetX = 2,368 + SetY = 2,140 + SetX = 3,418 + SetY = 3,134 + SetOpacity = 4,170 + SetX = 5,182 + SetY = 5,251 + SetOpacity = 5,128 + SetX = 6,129 + SetY = 6,192 + SetOpacity = 6,255 + SetX = 7,112 + SetY = 7,172 + SetX = 8,87 + SetY = 8,169 + SetX = 9,68 + SetY = 9,160 + SetX = 10,53 + SetY = 10,151 + SetOpacity = 10,170 + SetX = 11,31 + SetY = 11,139 + SetOpacity = 11,85 + + Graphic = Aerial Ace + Focus = Target + SetVisible = 0,true + SetX = 3,368 + SetY = 3,140 + SetOpacity = 3,170 + SetOpacity = 4,85 + SetX = 5,418 + SetY = 5,134 + + Graphic = Aerial Ace + Focus = User + SetVisible = 0,true + SetX = 5,158 + SetY = 5,237 + SetOpacity = 5,128 + SetX = 6,92 + SetY = 6,243 + SetOpacity = 6,255 + SetX = 7,79 + SetY = 7,240 + SetX = 8,64 + SetY = 8,252 + SetX = 9,35 + SetY = 9,256 + SetX = 10,17 + SetY = 10,260 + SetOpacity = 10,170 + + Graphic = Aerial Ace + Focus = User + SetVisible = 0,true + SetX = 5,125 + SetY = 5,227 + SetOpacity = 5,128 + SetX = 6,171 + SetY = 6,189 + SetOpacity = 6,255 + SetX = 7,195 + SetY = 7,167 + SetX = 8,204 + SetY = 8,153 + SetX = 9,228 + SetY = 9,129 + SetOpacity = 9,170 + SetX = 10,239 + SetY = 10,122 + SetOpacity = 10,85 + + Graphic = Aerial Ace + Focus = User + SetVisible = 0,true + SetX = 5,101 + SetY = 5,250 + SetOpacity = 5,128 + SetX = 6,197 + SetY = 6,244 + SetOpacity = 6,255 + SetX = 7,196 + SetY = 7,239 + SetX = 8,228 + SetY = 8,232 + SetX = 9,264 + SetY = 9,242 + SetX = 10,283 + SetY = 10,244 + SetOpacity = 10,170 + SetX = 11,298 + SetY = 11,246 + SetOpacity = 11,85 + + Graphic = Aerial Ace + Focus = User + SetVisible = 0,true + SetX = 5,147 + SetY = 5,274 + SetOpacity = 5,128 + SetX = 6,173 + SetY = 6,277 + SetOpacity = 6,255 + SetX = 7,189 + SetY = 7,274 + SetX = 8,211 + SetY = 8,284 + + Play = 0,Ace,80,100 diff --git a/PBS/Animations/Converted/Move/AGILITY.txt b/PBS/Animations/Converted/Move/AGILITY.txt new file mode 100644 index 000000000..bae4af56a --- /dev/null +++ b/PBS/Animations/Converted/Move/AGILITY.txt @@ -0,0 +1,87 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,AGILITY] +Name = AGILITY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ! + Focus = User + SetX = 0,30 + SetY = 0,188 + SetAngle = 0,90 + SetVisible = 0,true + SetX = 1,55 + SetX = 2,80 + SetX = 3,110 + SetX = 4,135 + SetX = 5,160 + SetX = 6,185 + SetX = 7,210 + SetX = 8,235 + SetX = 9,260 + + Graphic = ! + Focus = User + SetX = 0,75 + SetY = 0,131 + SetAngle = 0,90 + SetVisible = 0,true + SetX = 1,105 + SetX = 2,140 + SetX = 3,175 + SetX = 4,210 + SetX = 5,245 + SetX = 6,280 + SetX = 7,315 + + Graphic = ! + Focus = User + SetVisible = 0,true + SetX = 1,40 + SetY = 1,273 + SetAngle = 1,90 + SetX = 2,65 + SetX = 3,90 + SetX = 4,115 + SetX = 5,140 + SetX = 6,165 + SetX = 7,190 + SetX = 8,215 + SetX = 9,240 + + Graphic = ! + Focus = User + SetVisible = 0,true + SetX = 2,30 + SetY = 2,144 + SetAngle = 2,90 + SetX = 3,65 + SetX = 4,100 + SetX = 5,135 + SetX = 6,170 + SetX = 7,205 + SetX = 8,240 + SetX = 9,275 + + Graphic = ! + Focus = User + SetX = 0,52 + SetY = 0,237 + SetAngle = 0,90 + SetVisible = 0,true + SetX = 1,82 + SetX = 2,112 + SetX = 3,142 + SetX = 4,172 + SetX = 5,202 + SetX = 6,232 + SetX = 7,262 + SetX = 8,292 + SetX = 9,322 + + Play = 0,Psych Up,100,82 diff --git a/PBS/Animations/Converted/Move/ALLYSWITCH.txt b/PBS/Animations/Converted/Move/ALLYSWITCH.txt new file mode 100644 index 000000000..032ca80f7 --- /dev/null +++ b/PBS/Animations/Converted/Move/ALLYSWITCH.txt @@ -0,0 +1,52 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ALLYSWITCH] +Name = ALLYSWITCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet + Focus = User + SetX = 0,137 + SetY = 0,222 + SetVisible = 0,true + SetX = 1,139 + SetY = 1,224 + SetX = 2,137 + SetY = 2,222 + SetZoomX = 3,110 + SetZoomY = 3,110 + SetY = 4,220 + SetZoomX = 4,125 + SetZoomY = 4,125 + SetX = 5,141 + SetY = 5,217 + SetZoomX = 5,165 + SetZoomY = 5,165 + SetX = 6,142 + SetY = 6,216 + SetZoomX = 6,186 + SetZoomY = 6,186 + SetX = 7,143 + SetY = 7,215 + SetZoomX = 7,202 + SetZoomY = 7,202 + SetY = 8,213 + SetZoomX = 8,230 + SetZoomY = 8,230 + SetX = 9,148 + SetY = 9,207 + SetZoomX = 9,300 + SetZoomY = 9,300 + SetOpacity = 14,212 + SetOpacity = 15,170 + SetOpacity = 16,127 + SetOpacity = 17,85 + SetOpacity = 18,42 + SetOpacity = 19,0 + + Play = 0,Uproar,100,100 diff --git a/PBS/Animations/Converted/Move/AMNESIA.txt b/PBS/Animations/Converted/Move/AMNESIA.txt new file mode 100644 index 000000000..950913c9a --- /dev/null +++ b/PBS/Animations/Converted/Move/AMNESIA.txt @@ -0,0 +1,22 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,AMNESIA] +Name = AMNESIA + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = mixed + Focus = Target + SetX = 0,428 + SetY = 0,80 + SetVisible = 0,true + SetOpacity = 0,200 + SetOpacity = 1,220 + SetOpacity = 2,250 + SetOpacity = 3,255 + + Play = 0,Yawn,100,100 diff --git a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt new file mode 100644 index 000000000..6d3e30c2e --- /dev/null +++ b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt @@ -0,0 +1,312 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ANCIENTPOWER] +Name = ANCIENTPOWER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetX = 0,39 + SetY = 0,228 + SetVisible = 0,true + SetX = 1,43 + SetY = 1,205 + SetX = 2,53 + SetY = 2,190 + SetX = 3,55 + SetY = 3,172 + SetX = 4,64 + SetY = 4,145 + SetX = 5,96 + SetY = 5,124 + SetY = 6,132 + SetY = 7,124 + SetY = 8,132 + SetX = 9,80 + SetY = 9,140 + SetX = 10,64 + SetY = 12,164 + SetY = 13,156 + SetY = 14,164 + SetY = 15,172 + SetY = 16,180 + SetY = 17,188 + SetX = 20,80 + SetY = 20,180 + SetX = 21,96 + SetY = 21,164 + SetX = 22,128 + SetY = 22,148 + SetX = 23,144 + SetY = 23,140 + SetY = 24,148 + SetX = 25,168 + SetY = 25,140 + SetX = 26,200 + SetY = 26,116 + SetX = 27,256 + SetY = 27,108 + SetX = 28,320 + SetY = 28,84 + SetX = 29,360 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetX = 0,305 + SetY = 0,244 + SetVisible = 0,true + SetX = 1,304 + SetY = 1,212 + SetX = 2,300 + SetY = 2,193 + SetX = 3,291 + SetY = 3,173 + SetX = 4,272 + SetY = 4,157 + SetX = 5,253 + SetY = 5,128 + SetY = 6,136 + SetY = 7,128 + SetY = 8,136 + SetX = 9,256 + SetY = 9,144 + SetX = 10,272 + SetY = 10,136 + SetX = 12,288 + SetY = 12,152 + SetX = 13,296 + SetY = 13,144 + SetY = 14,152 + SetY = 15,160 + SetY = 16,168 + SetY = 17,176 + SetX = 20,312 + SetY = 20,160 + SetX = 21,336 + SetY = 21,144 + SetX = 22,360 + SetY = 22,128 + SetX = 23,392 + SetY = 23,104 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetX = 0,140 + SetY = 0,275 + SetVisible = 0,true + SetY = 1,251 + SetX = 2,139 + SetY = 2,236 + SetX = 3,140 + SetY = 3,207 + SetX = 4,139 + SetY = 4,180 + SetX = 5,140 + SetY = 5,152 + SetY = 6,160 + SetY = 7,152 + SetY = 8,160 + SetY = 9,176 + SetY = 10,200 + SetX = 11,168 + SetY = 11,216 + SetY = 12,224 + SetX = 13,176 + SetY = 13,232 + SetY = 14,240 + SetY = 15,248 + SetY = 16,256 + SetY = 17,264 + SetX = 20,192 + SetY = 20,240 + SetX = 21,208 + SetY = 21,224 + SetX = 22,232 + SetY = 22,200 + SetX = 23,240 + SetY = 23,192 + SetX = 24,272 + SetY = 24,176 + SetX = 25,296 + SetY = 25,160 + SetX = 26,328 + SetY = 26,136 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,72 + SetY = 6,235 + SetY = 7,211 + SetX = 8,80 + SetY = 8,195 + SetX = 9,112 + SetY = 9,163 + SetX = 10,96 + SetY = 10,171 + SetX = 11,112 + SetY = 11,147 + SetX = 12,120 + SetY = 12,123 + SetY = 13,107 + SetY = 14,115 + SetY = 15,123 + SetY = 16,131 + SetY = 17,139 + SetX = 20,152 + SetY = 20,131 + SetX = 21,176 + SetY = 21,123 + SetX = 22,200 + SetY = 22,107 + SetX = 23,208 + SetY = 23,99 + SetX = 24,232 + SetY = 24,91 + SetX = 25,264 + SetY = 25,107 + SetX = 26,304 + SetY = 26,99 + SetX = 27,360 + SetY = 27,91 + SetX = 28,400 + SetY = 28,107 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,240 + SetY = 6,241 + SetY = 7,217 + SetY = 8,193 + SetX = 9,216 + SetY = 9,161 + SetX = 10,232 + SetY = 10,185 + SetY = 11,217 + SetX = 12,256 + SetY = 12,225 + SetX = 13,272 + SetY = 13,217 + SetY = 14,225 + SetY = 15,233 + SetY = 16,241 + SetY = 17,249 + SetX = 20,288 + SetY = 20,233 + SetX = 21,312 + SetY = 21,217 + SetX = 22,336 + SetY = 22,193 + SetX = 23,360 + SetY = 23,161 + SetX = 24,384 + SetY = 24,137 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,160 + SetY = 6,265 + SetY = 7,241 + SetX = 10,112 + SetY = 10,245 + SetX = 11,104 + SetY = 11,221 + SetX = 12,96 + SetY = 12,213 + SetX = 13,88 + SetY = 14,221 + SetY = 15,229 + SetY = 16,237 + SetY = 17,245 + SetX = 20,112 + SetY = 20,237 + SetX = 21,136 + SetY = 21,229 + SetX = 22,160 + SetY = 22,213 + SetX = 23,168 + SetY = 24,221 + SetX = 25,192 + SetY = 25,197 + SetX = 26,240 + SetY = 26,173 + SetX = 27,288 + SetY = 27,165 + SetX = 28,328 + SetY = 28,141 + SetX = 29,368 + SetY = 29,133 + SetX = 30,409 + SetY = 30,112 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 8,184 + SetY = 8,221 + SetY = 9,197 + SetY = 10,141 + SetX = 11,216 + SetY = 11,133 + SetX = 12,232 + SetY = 12,125 + SetX = 13,240 + SetY = 13,109 + SetY = 14,117 + SetY = 15,125 + SetY = 16,133 + SetY = 17,141 + SetX = 20,256 + SetY = 20,133 + SetX = 21,280 + SetY = 21,125 + SetX = 22,304 + SetY = 22,109 + SetX = 23,312 + SetY = 23,100 + SetX = 24,344 + SetY = 24,92 + SetX = 25,392 + SetY = 25,84 + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 10,184 + SetY = 10,280 + SetY = 11,248 + SetX = 12,152 + SetY = 12,240 + SetX = 13,160 + SetY = 13,232 + SetY = 14,240 + SetY = 15,248 + SetY = 16,256 + SetY = 17,264 + SetX = 20,176 + SetY = 20,240 + SetX = 21,200 + SetY = 21,224 + SetX = 22,224 + SetY = 22,208 + SetX = 23,240 + SetY = 23,216 + SetY = 24,224 + SetX = 25,304 + SetY = 25,200 + SetX = 26,328 + SetY = 26,176 + SetX = 27,368 + SetY = 27,160 + SetX = 28,432 + SetY = 28,136 + + Play = 0,Earth4,100,100 + Play = 24,Earth5,100,100 diff --git a/PBS/Animations/Converted/Move/AQUARING.txt b/PBS/Animations/Converted/Move/AQUARING.txt new file mode 100644 index 000000000..535c45261 --- /dev/null +++ b/PBS/Animations/Converted/Move/AQUARING.txt @@ -0,0 +1,66 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,AQUARING] +Name = AQUARING + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,389 + SetY = 2,108 + SetX = 3,387 + SetY = 3,100 + SetX = 4,368 + SetY = 4,96 + SetX = 5,381 + SetY = 5,93 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,396 + SetY = 3,111 + SetX = 4,374 + SetY = 4,97 + SetX = 5,386 + SetY = 5,92 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,380 + SetY = 4,94 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,386 + SetY = 4,104 + + Graphic = fly copy + Focus = UserAndTarget + SetX = 0,394 + SetY = 0,105 + SetVisible = 0,true + SetX = 1,395 + SetY = 1,107 + SetX = 2,388 + SetY = 2,94 + SetZoomX = 2,110 + SetZoomY = 2,110 + SetX = 3,379 + SetY = 3,98 + SetZoomX = 3,100 + SetZoomY = 3,100 + SetX = 4,382 + SetY = 4,100 + SetX = 5,394 + SetY = 5,104 + + Play = 0,Weatherball,80,100 diff --git a/PBS/Animations/Converted/Move/AROMATHERAPY.txt b/PBS/Animations/Converted/Move/AROMATHERAPY.txt new file mode 100644 index 000000000..7e25e5d70 --- /dev/null +++ b/PBS/Animations/Converted/Move/AROMATHERAPY.txt @@ -0,0 +1,156 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,AROMATHERAPY] +Name = AROMATHERAPY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Anima (1) + Focus = Screen + SetX = 0,608 + SetY = 0,-50 + SetVisible = 0,true + SetX = 1,560 + SetY = 1,-2 + SetX = 2,496 + SetY = 2,30 + SetX = 3,416 + SetY = 3,70 + SetX = 4,296 + SetY = 4,134 + SetX = 5,176 + SetY = 5,190 + SetX = 6,120 + SetY = 6,222 + SetX = 7,104 + SetY = 7,118 + SetX = 8,224 + SetY = 8,190 + SetX = 9,248 + SetY = 9,174 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 1,664 + SetY = 1,22 + SetX = 2,608 + SetY = 2,94 + SetX = 3,520 + SetY = 3,182 + SetX = 4,480 + SetY = 4,230 + SetX = 5,304 + SetY = 5,62 + SetX = 6,200 + SetY = 6,94 + SetX = 7,296 + SetY = 7,150 + SetX = 8,336 + SetY = 8,118 + SetX = 9,112 + SetY = 9,142 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 2,584 + SetY = 2,-34 + SetX = 3,528 + SetY = 3,-2 + SetX = 4,424 + SetY = 4,38 + SetX = 5,312 + SetY = 5,134 + SetX = 6,256 + SetY = 6,214 + SetX = 7,88 + SetY = 7,126 + SetX = 8,184 + SetY = 8,86 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 2,464 + SetY = 2,-42 + SetX = 3,408 + SetY = 3,6 + SetX = 4,376 + SetY = 4,70 + SetX = 5,448 + SetY = 5,166 + SetX = 6,376 + SetY = 6,222 + SetX = 7,512 + SetY = 7,198 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 3,672 + SetY = 3,46 + SetX = 4,544 + SetY = 4,102 + SetX = 5,560 + SetY = 5,222 + SetX = 6,392 + SetY = 6,94 + SetX = 7,416 + SetY = 7,62 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 3,664 + SetY = 3,118 + SetX = 4,616 + SetY = 4,166 + SetX = 5,480 + SetY = 5,54 + SetX = 6,160 + SetY = 6,70 + SetX = 7,280 + SetY = 7,30 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 3,640 + SetY = 3,-26 + SetX = 4,576 + SetY = 4,14 + SetX = 5,224 + SetY = 5,22 + SetX = 6,128 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 4,336 + SetY = 4,-26 + SetX = 5,184 + SetY = 5,-34 + SetX = 6,600 + SetY = 6,118 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 5,680 + SetY = 5,30 + SetX = 6,504 + SetY = 6,6 + + Graphic = Anima (1) + Focus = Screen + SetVisible = 0,true + SetX = 5,552 + SetY = 5,-26 + SetX = 6,368 + + Play = 0,Saint8,80,100 diff --git a/PBS/Animations/Converted/Move/AURORABEAM.txt b/PBS/Animations/Converted/Move/AURORABEAM.txt new file mode 100644 index 000000000..635dbd6df --- /dev/null +++ b/PBS/Animations/Converted/Move/AURORABEAM.txt @@ -0,0 +1,229 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,AURORABEAM] +Name = AURORABEAM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,313 + SetY = 1,186 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetX = 2,108 + SetY = 2,148 + SetX = 3,185 + SetY = 3,179 + SetX = 4,128 + SetY = 4,236 + SetZoomX = 4,100 + SetZoomY = 4,100 + SetY = 6,230 + SetZoomX = 6,200 + SetZoomY = 6,200 + SetX = 7,166 + SetY = 7,205 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetX = 8,243 + SetY = 8,154 + SetX = 9,326 + SetY = 9,129 + SetX = 10,358 + SetY = 10,110 + SetZoomX = 13,150 + SetZoomY = 13,150 + SetOpacity = 13,100 + SetY = 14,98 + SetZoomX = 14,200 + SetZoomY = 14,200 + SetY = 15,110 + SetZoomX = 15,100 + SetZoomY = 15,100 + SetOpacity = 15,50 + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,102 + SetY = 1,72 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetX = 2,230 + SetY = 2,205 + SetX = 3,128 + SetY = 3,236 + SetZoomX = 3,100 + SetZoomY = 3,100 + SetX = 4,121 + SetY = 4,230 + SetZoomX = 4,150 + SetZoomY = 4,150 + SetX = 5,128 + SetY = 5,224 + SetZoomX = 5,200 + SetZoomY = 5,200 + SetY = 6,236 + SetZoomX = 6,100 + SetZoomY = 6,100 + SetX = 7,192 + SetY = 7,186 + SetX = 8,288 + SetY = 8,123 + SetX = 9,358 + SetY = 9,110 + SetX = 10,320 + SetY = 10,135 + SetX = 11,326 + SetY = 11,129 + SetX = 12,358 + SetY = 12,110 + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,128 + SetY = 1,236 + SetX = 2,192 + SetY = 2,66 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,108 + SetY = 3,192 + SetX = 4,83 + SetY = 4,167 + SetX = 5,70 + SetY = 5,110 + SetX = 7,192 + SetY = 7,179 + SetZoomX = 7,150 + SetZoomY = 7,150 + SetX = 8,166 + SetY = 8,205 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetX = 9,275 + SetY = 9,154 + SetY = 10,167 + SetX = 11,358 + SetY = 11,110 + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,128 + SetY = 2,236 + SetX = 3,179 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,192 + SetY = 4,192 + SetX = 5,172 + SetY = 5,104 + SetX = 8,198 + SetY = 8,186 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetX = 9,236 + SetY = 9,173 + SetX = 10,358 + SetY = 10,110 + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,64 + SetY = 2,66 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,83 + SetY = 3,91 + SetX = 4,160 + SetY = 4,186 + SetX = 5,236 + SetY = 5,173 + SetX = 8,288 + SetY = 8,110 + SetZoomX = 8,120 + SetZoomY = 8,120 + SetX = 9,198 + SetY = 9,198 + SetZoomX = 9,100 + SetZoomY = 9,100 + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,345 + SetY = 2,236 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,236 + SetY = 3,242 + SetX = 4,204 + SetY = 4,249 + SetX = 5,256 + SetX = 9,364 + SetY = 9,104 + SetZoomX = 9,120 + SetZoomY = 9,120 + + Graphic = 023-Burst01 + Focus = User + SetVisible = 0,true + SetX = 2,313 + SetY = 2,110 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,179 + SetY = 3,104 + SetX = 4,128 + SetY = 4,173 + + Graphic = 023-Burst01 + Focus = User + SetVisible = 0,true + SetX = 3,115 + SetY = 3,148 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,64 + SetY = 4,53 + + Graphic = 023-Burst01 + Focus = User + SetVisible = 0,true + SetX = 3,326 + SetY = 3,224 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,198 + SetY = 4,53 + + Graphic = 023-Burst01 + Focus = User + SetVisible = 0,true + SetX = 3,262 + SetY = 3,148 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,300 + + Graphic = 023-Burst01 + Focus = User + SetVisible = 0,true + SetX = 4,339 + SetY = 4,236 + SetZoomX = 4,50 + SetZoomY = 4,50 + + Play = 1,Twine,80,100 + Play = 10,Fire3,80,100 diff --git a/PBS/Animations/Converted/Move/BARRIER.txt b/PBS/Animations/Converted/Move/BARRIER.txt new file mode 100644 index 000000000..d2c036b2d --- /dev/null +++ b/PBS/Animations/Converted/Move/BARRIER.txt @@ -0,0 +1,56 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BARRIER] +Name = BARRIER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 1,356 + SetY = 1,65 + SetX = 2,437 + SetX = 3,440 + SetY = 3,63 + SetX = 4,369 + SetY = 4,126 + SetX = 5,374 + SetY = 5,130 + SetX = 6,448 + SetY = 6,74 + SetX = 7,453 + SetY = 7,66 + SetX = 8,364 + SetY = 8,89 + SetX = 9,367 + + Graphic = anim sheet + Focus = Target + SetX = 0,392 + SetY = 0,95 + SetVisible = 0,true + SetOpacity = 0,154 + SetX = 1,393 + SetY = 1,90 + SetX = 2,392 + SetY = 2,95 + SetY = 3,91 + SetX = 4,395 + SetY = 4,92 + SetX = 5,397 + SetY = 5,88 + SetX = 6,398 + SetY = 6,92 + SetX = 7,394 + SetY = 7,90 + SetX = 8,395 + SetY = 8,97 + SetX = 9,379 + SetY = 9,85 + + Play = 0,Flash2,80,100 diff --git a/PBS/Animations/Converted/Move/BEATUP.txt b/PBS/Animations/Converted/Move/BEATUP.txt new file mode 100644 index 000000000..ef260272a --- /dev/null +++ b/PBS/Animations/Converted/Move/BEATUP.txt @@ -0,0 +1,229 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BEATUP] +Name = BEATUP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetOpacity = 0,150 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,100 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,86 + SetOpacity = 1,100 + SetX = 2,384 + SetY = 2,94 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,50 + + Play = 0,Blow4,80,100 +#------------------------------- +[Move,BEATUP,1] +Name = Beat Up hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,86 + SetOpacity = 1,100 + SetX = 2,384 + SetY = 2,94 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,50 + + Graphic = many + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetOpacity = 0,150 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,100 + + Play = 0,Blow4,80,100 +#------------------------------- +[Move,BEATUP,2] +Name = Beat Up hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetOpacity = 0,150 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,100 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,86 + SetOpacity = 1,100 + SetX = 2,384 + SetY = 2,94 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,50 + + Play = 0,Blow4,80,100 +#------------------------------- +[Move,BEATUP,3] +Name = Beat Up hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,86 + SetOpacity = 1,100 + SetX = 2,384 + SetY = 2,94 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,50 + + Graphic = many + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetOpacity = 0,150 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,100 + + Play = 0,Blow4,80,100 +#------------------------------- +[Move,BEATUP,4] +Name = Beat Up hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetOpacity = 0,150 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,100 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,86 + SetOpacity = 1,100 + SetX = 2,384 + SetY = 2,94 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,50 + + Play = 0,Blow4,80,100 +#------------------------------- +[Move,BEATUP,5] +Name = Beat Up hit 6 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,86 + SetOpacity = 1,100 + SetX = 2,384 + SetY = 2,94 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,50 + + Graphic = many + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetOpacity = 0,150 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetZoomX = 3,125 + SetZoomY = 3,125 + SetOpacity = 3,100 + + Play = 0,Blow4,80,100 diff --git a/PBS/Animations/Converted/Move/BIND.txt b/PBS/Animations/Converted/Move/BIND.txt new file mode 100644 index 000000000..6b773d2c4 --- /dev/null +++ b/PBS/Animations/Converted/Move/BIND.txt @@ -0,0 +1,47 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BIND] +Name = BIND + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Struggle + Focus = Target + SetX = 0,440 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,480 + SetY = 1,94 + SetX = 2,488 + SetY = 2,102 + SetX = 3,464 + SetY = 3,94 + SetX = 4,432 + SetX = 5,464 + SetX = 6,496 + SetY = 6,102 + SetX = 7,480 + + Graphic = Struggle + Focus = Target + SetX = 0,320 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,94 + SetX = 2,240 + SetY = 2,102 + SetX = 3,264 + SetY = 3,94 + SetX = 4,296 + SetX = 5,256 + SetX = 6,216 + SetX = 7,264 + + Play = 0,Slash10,80,100 + Play = 3,Slash10,80,100 + Play = 6,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/BITE.txt b/PBS/Animations/Converted/Move/BITE.txt new file mode 100644 index 000000000..70f19d810 --- /dev/null +++ b/PBS/Animations/Converted/Move/BITE.txt @@ -0,0 +1,24 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BITE] +Name = BITE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Crunch + Focus = Target + SetX = 0,386 + SetY = 0,96 + SetVisible = 0,true + SetOpacity = 0,128 + SetOpacity = 2,192 + SetX = 3,385 + SetY = 3,97 + SetOpacity = 3,255 + SetOpacity = 13,128 + + Play = 9,Sword2,80,100 diff --git a/PBS/Animations/Converted/Move/BLASTBURN.txt b/PBS/Animations/Converted/Move/BLASTBURN.txt new file mode 100644 index 000000000..53f0b8c02 --- /dev/null +++ b/PBS/Animations/Converted/Move/BLASTBURN.txt @@ -0,0 +1,207 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BLASTBURN] +Name = BLASTBURN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Firebird + Focus = Target + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetFlip = 1,true + SetAngle = 1,20 + SetX = 2,160 + SetY = 2,161 + SetAngle = 2,0 + SetX = 3,217 + SetY = 3,129 + SetAngle = 3,20 + SetX = 4,256 + SetY = 4,110 + SetAngle = 4,0 + SetFlip = 5,false + SetX = 5,377 + SetY = 5,123 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetX = 6,358 + SetY = 6,110 + SetZoomX = 6,100 + SetZoomY = 6,100 + SetX = 7,352 + SetY = 7,116 + SetX = 8,441 + SetY = 8,154 + SetX = 9,345 + SetY = 9,110 + SetX = 10,358 + SetY = 10,91 + SetAngle = 10,180 + SetX = 11,448 + SetY = 11,110 + SetAngle = 11,90 + SetX = 12,294 + SetY = 12,98 + SetAngle = 12,45 + SetX = 13,300 + SetY = 13,161 + SetAngle = 13,270 + SetX = 14,364 + SetY = 14,123 + SetAngle = 14,0 + SetX = 15,332 + SetY = 15,104 + SetX = 16,358 + SetOpacity = 16,100 + + Graphic = Firebird + Focus = Target + SetVisible = 0,true + SetFlip = 5,true + SetX = 5,358 + SetY = 5,110 + SetFlip = 6,false + SetX = 6,345 + SetY = 6,123 + SetZoomX = 6,90 + SetZoomY = 6,90 + SetX = 7,371 + SetY = 7,154 + SetZoomX = 7,50 + SetZoomY = 7,50 + SetX = 8,345 + SetY = 8,161 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetX = 9,435 + SetY = 9,154 + SetX = 10,396 + SetY = 10,186 + SetX = 11,294 + SetY = 11,98 + SetAngle = 11,270 + SetX = 12,339 + SetY = 12,85 + SetX = 13,352 + SetY = 13,167 + SetAngle = 13,0 + SetX = 14,422 + SetY = 14,161 + SetOpacity = 14,100 + SetX = 15,390 + SetY = 15,110 + SetOpacity = 15,255 + SetX = 16,332 + SetOpacity = 16,100 + + Graphic = Firebird + Focus = Target + SetVisible = 0,true + SetX = 6,358 + SetY = 6,123 + SetX = 7,390 + SetY = 7,104 + SetX = 8,377 + SetY = 8,98 + SetY = 9,198 + SetX = 10,409 + SetY = 10,154 + SetAngle = 10,45 + SetX = 11,320 + SetY = 11,116 + SetAngle = 11,0 + SetX = 12,435 + SetY = 12,161 + SetX = 13,332 + SetY = 13,91 + SetX = 14,307 + SetY = 14,98 + SetOpacity = 14,100 + SetX = 15,358 + SetY = 15,104 + SetOpacity = 15,255 + SetX = 16,396 + SetY = 16,110 + SetOpacity = 16,100 + + Graphic = Firebird + Focus = Target + SetVisible = 0,true + SetX = 7,364 + SetY = 7,154 + SetX = 9,326 + SetY = 9,142 + SetX = 10,454 + SetY = 10,79 + SetAngle = 10,45 + SetX = 11,332 + SetY = 11,161 + SetAngle = 11,0 + SetX = 12,435 + SetY = 12,85 + SetX = 13,403 + SetY = 13,167 + SetX = 14,358 + SetY = 14,72 + SetOpacity = 14,100 + + Graphic = Firebird + Focus = Target + SetVisible = 0,true + SetX = 9,384 + SetY = 9,91 + SetX = 10,345 + SetY = 10,98 + SetAngle = 10,135 + SetX = 11,422 + SetY = 11,161 + SetAngle = 11,0 + SetX = 12,377 + SetY = 12,173 + SetX = 13,422 + SetY = 13,110 + SetX = 14,326 + SetY = 14,167 + SetOpacity = 14,100 + + Graphic = Firebird + Focus = Target + SetVisible = 0,true + SetX = 9,441 + SetY = 9,167 + SetX = 10,339 + SetY = 10,123 + SetX = 11,377 + SetY = 11,85 + SetX = 13,396 + SetY = 13,123 + SetX = 14,441 + SetY = 14,79 + SetOpacity = 14,100 + + Graphic = Firebird + Focus = Target + SetVisible = 0,true + SetX = 10,371 + SetY = 10,66 + SetX = 11,320 + SetX = 13,441 + SetY = 13,79 + SetOpacity = 13,100 + SetX = 14,396 + SetY = 14,104 + SetOpacity = 14,250 + + Graphic = Firebird + Focus = Target + SetVisible = 0,true + SetX = 10,339 + SetY = 10,179 + + Play = 3,Fire2,80,100 diff --git a/PBS/Animations/Converted/Move/BLOCK.txt b/PBS/Animations/Converted/Move/BLOCK.txt new file mode 100644 index 000000000..29e8b9088 --- /dev/null +++ b/PBS/Animations/Converted/Move/BLOCK.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BLOCK] +Name = BLOCK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = block + Focus = Target + SetX = 0,385 + SetY = 0,96 + SetVisible = 0,true + + Play = 0,buzzer,80,100 diff --git a/PBS/Animations/Converted/Move/BLUEFLARE.txt b/PBS/Animations/Converted/Move/BLUEFLARE.txt new file mode 100644 index 000000000..b06b53173 --- /dev/null +++ b/PBS/Animations/Converted/Move/BLUEFLARE.txt @@ -0,0 +1,34 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BLUEFLARE] +Name = BLUEFLARE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet.2 + Focus = Target + SetX = 0,382 + SetY = 0,103 + SetVisible = 0,true + SetX = 1,379 + SetY = 1,93 + SetX = 2,384 + SetY = 2,94 + SetX = 4,390 + SetY = 4,96 + SetX = 5,385 + SetY = 5,94 + SetX = 6,392 + SetX = 8,384 + SetY = 8,95 + SetX = 9,383 + SetX = 10,384 + SetY = 10,96 + SetX = 11,385 + SetY = 11,92 + + Play = 0,Slam,100,110 diff --git a/PBS/Animations/Converted/Move/BODYSLAM.txt b/PBS/Animations/Converted/Move/BODYSLAM.txt new file mode 100644 index 000000000..4b8192cef --- /dev/null +++ b/PBS/Animations/Converted/Move/BODYSLAM.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BODYSLAM] +Name = BODYSLAM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Damage1,80,100 diff --git a/PBS/Animations/Converted/Move/BRICKBREAK.txt b/PBS/Animations/Converted/Move/BRICKBREAK.txt new file mode 100644 index 000000000..f0f1063e6 --- /dev/null +++ b/PBS/Animations/Converted/Move/BRICKBREAK.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BRICKBREAK] +Name = BRICKBREAK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetX = 0,296 + SetY = 0,38 + SetVisible = 0,true + SetX = 1,320 + SetAngle = 1,345 + SetX = 2,352 + SetY = 2,62 + SetAngle = 2,330 + SetX = 3,384 + SetY = 3,86 + SetAngle = 3,315 + SetX = 4,400 + SetY = 4,118 + SetAngle = 4,300 + SetX = 5,416 + SetY = 5,142 + SetAngle = 5,285 + SetX = 6,432 + SetY = 6,158 + SetX = 7,440 + SetY = 7,166 + + Play = 4,Blow7,80,100 diff --git a/PBS/Animations/Converted/Move/BUBBLE.txt b/PBS/Animations/Converted/Move/BUBBLE.txt new file mode 100644 index 000000000..da11ec2ca --- /dev/null +++ b/PBS/Animations/Converted/Move/BUBBLE.txt @@ -0,0 +1,221 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BUBBLE] +Name = BUBBLE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,153 + SetY = 1,224 + SetX = 2,198 + SetY = 2,198 + SetX = 3,230 + SetY = 3,173 + SetX = 4,275 + SetY = 4,154 + SetX = 5,332 + SetY = 5,116 + SetX = 6,358 + SetY = 6,110 + SetX = 7,371 + SetX = 8,211 + SetY = 8,186 + SetX = 9,377 + SetY = 9,104 + SetX = 10,384 + SetY = 10,66 + SetY = 11,53 + SetX = 12,358 + SetY = 12,110 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,134 + SetY = 1,217 + SetX = 2,153 + SetY = 2,205 + SetX = 3,179 + SetY = 3,186 + SetX = 4,211 + SetY = 4,154 + SetX = 5,256 + SetY = 5,142 + SetX = 6,294 + SetY = 6,123 + SetX = 7,128 + SetY = 7,236 + SetX = 8,339 + SetY = 8,85 + SetX = 9,345 + SetY = 9,66 + SetX = 10,422 + SetY = 10,72 + SetX = 11,416 + SetY = 11,91 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,128 + SetY = 1,236 + SetX = 2,179 + SetY = 2,198 + SetX = 3,198 + SetY = 3,167 + SetX = 4,243 + SetY = 4,161 + SetX = 5,236 + SetY = 5,123 + SetX = 6,281 + SetY = 6,104 + SetX = 7,320 + SetY = 7,72 + SetX = 8,371 + SetY = 8,98 + SetX = 9,345 + SetX = 10,358 + SetY = 10,91 + SetX = 11,352 + SetY = 11,98 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,128 + SetY = 2,236 + SetX = 3,166 + SetY = 3,205 + SetX = 4,128 + SetY = 4,236 + SetX = 5,160 + SetY = 5,205 + SetX = 6,211 + SetY = 6,173 + SetX = 7,352 + SetY = 7,79 + SetX = 8,403 + SetY = 8,104 + SetX = 9,390 + SetY = 9,72 + SetX = 10,384 + SetY = 10,98 + SetX = 11,396 + SetY = 11,79 + SetOpacity = 11,100 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,140 + SetY = 3,211 + SetX = 4,211 + SetY = 4,186 + SetX = 5,300 + SetY = 5,148 + SetX = 6,275 + SetY = 6,129 + SetX = 7,281 + SetY = 7,123 + SetX = 8,358 + SetY = 8,60 + SetX = 9,377 + SetY = 9,47 + SetX = 10,339 + SetY = 10,60 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetX = 4,179 + SetY = 4,224 + SetX = 5,236 + SetY = 5,186 + SetX = 6,332 + SetY = 6,110 + SetY = 7,104 + SetX = 8,390 + SetY = 8,47 + SetX = 9,416 + SetY = 9,110 + SetX = 10,358 + SetY = 10,85 + SetOpacity = 10,100 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,166 + SetY = 4,186 + SetX = 5,192 + SetY = 5,154 + SetX = 6,256 + SetY = 6,173 + SetX = 7,230 + SetY = 7,135 + SetX = 8,281 + SetY = 8,104 + SetX = 9,313 + SetY = 9,98 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,128 + SetY = 5,236 + SetX = 6,230 + SetY = 6,142 + SetX = 7,313 + SetX = 8,326 + SetY = 8,116 + SetY = 9,129 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,160 + SetY = 6,236 + SetX = 7,217 + SetY = 7,179 + SetX = 8,275 + SetY = 8,148 + SetX = 9,288 + SetY = 9,129 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,352 + SetY = 6,85 + SetOpacity = 6,100 + SetFlip = 7,true + SetX = 7,377 + SetY = 7,104 + SetFlip = 8,false + SetX = 8,224 + SetY = 8,161 + SetOpacity = 8,255 + SetFlip = 9,true + SetX = 9,384 + SetY = 9,98 + SetOpacity = 9,100 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 8,358 + SetY = 8,91 + SetOpacity = 8,100 + + Play = 0,Water5,80,100 diff --git a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt new file mode 100644 index 000000000..e143f6567 --- /dev/null +++ b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt @@ -0,0 +1,393 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BUBBLEBEAM] +Name = BUBBLEBEAM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,205 + SetX = 2,243 + SetY = 2,179 + SetX = 3,160 + SetY = 3,192 + SetX = 4,326 + SetY = 4,123 + SetX = 5,275 + SetY = 5,129 + SetX = 6,166 + SetY = 6,211 + SetX = 7,224 + SetY = 7,192 + SetX = 8,236 + SetY = 8,135 + SetX = 9,249 + SetY = 9,179 + SetX = 10,384 + SetY = 10,66 + SetX = 11,185 + SetY = 11,205 + SetX = 12,281 + SetY = 12,154 + SetX = 13,358 + SetY = 13,91 + SetX = 14,390 + SetX = 15,358 + SetY = 15,110 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,140 + SetY = 1,186 + SetX = 2,192 + SetY = 2,173 + SetX = 3,224 + SetY = 3,167 + SetX = 4,300 + SetY = 4,85 + SetX = 5,358 + SetY = 5,110 + SetX = 6,371 + SetY = 6,79 + SetX = 7,384 + SetY = 7,110 + SetX = 8,339 + SetY = 8,85 + SetX = 9,364 + SetY = 9,53 + SetX = 10,217 + SetY = 10,154 + SetX = 11,416 + SetY = 11,91 + SetX = 12,390 + SetX = 13,371 + SetY = 13,72 + SetX = 14,358 + SetY = 14,98 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,192 + SetY = 1,179 + SetX = 2,204 + SetY = 2,148 + SetX = 3,217 + SetY = 3,129 + SetX = 4,134 + SetY = 4,230 + SetX = 5,307 + SetY = 5,98 + SetX = 6,281 + SetY = 6,104 + SetX = 7,332 + SetY = 7,72 + SetX = 8,339 + SetY = 8,116 + SetX = 9,345 + SetY = 9,98 + SetX = 10,358 + SetY = 10,91 + SetX = 11,352 + SetY = 11,98 + SetX = 12,339 + SetAngle = 12,90 + SetX = 13,377 + SetY = 13,85 + SetAngle = 13,0 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,128 + SetY = 2,236 + SetX = 3,262 + SetY = 3,116 + SetY = 4,161 + SetX = 5,313 + SetY = 5,154 + SetX = 6,211 + SetY = 6,173 + SetX = 7,281 + SetY = 7,79 + SetX = 8,332 + SetY = 8,53 + SetX = 9,364 + SetY = 9,85 + SetX = 10,384 + SetY = 10,98 + SetX = 11,396 + SetY = 11,79 + SetOpacity = 11,100 + SetX = 12,371 + SetY = 12,135 + SetOpacity = 12,255 + SetX = 13,326 + SetY = 13,98 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,211 + SetX = 3,198 + SetY = 3,179 + SetX = 4,275 + SetY = 4,123 + SetX = 5,371 + SetY = 5,91 + SetX = 6,326 + SetX = 7,281 + SetY = 7,123 + SetX = 8,217 + SetY = 8,161 + SetX = 9,224 + SetY = 9,167 + SetX = 10,256 + SetY = 10,186 + SetX = 11,377 + SetY = 11,72 + SetX = 12,307 + SetY = 12,161 + SetX = 13,364 + SetY = 13,98 + SetOpacity = 13,50 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,275 + SetY = 3,154 + SetX = 4,313 + SetY = 4,148 + SetX = 5,256 + SetY = 5,104 + SetX = 6,204 + SetY = 6,148 + SetX = 7,339 + SetY = 7,110 + SetX = 8,211 + SetY = 8,142 + SetX = 9,140 + SetY = 9,211 + SetX = 10,294 + SetY = 10,85 + SetX = 11,192 + SetY = 11,173 + SetAngle = 11,135 + SetX = 12,428 + SetY = 12,142 + SetAngle = 12,0 + SetX = 13,320 + SetY = 13,148 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,211 + SetY = 3,161 + SetX = 4,198 + SetX = 5,307 + SetY = 5,60 + SetX = 6,371 + SetY = 6,129 + SetX = 7,147 + SetY = 7,211 + SetX = 8,281 + SetY = 8,104 + SetX = 9,339 + SetY = 9,53 + SetX = 10,275 + SetY = 10,116 + SetX = 11,224 + SetX = 12,371 + SetY = 12,41 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,160 + SetY = 3,217 + SetX = 4,275 + SetY = 4,116 + SetX = 5,179 + SetY = 5,148 + SetX = 6,390 + SetY = 6,98 + SetOpacity = 6,100 + SetX = 7,307 + SetY = 7,173 + SetOpacity = 7,255 + SetX = 8,294 + SetY = 8,135 + SetX = 9,339 + SetY = 9,129 + SetX = 10,300 + SetY = 10,72 + SetX = 11,288 + SetY = 11,91 + SetX = 12,211 + SetY = 12,173 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,185 + SetY = 4,186 + SetX = 5,230 + SetY = 5,167 + SetX = 6,313 + SetY = 6,135 + SetX = 7,262 + SetY = 7,129 + SetX = 8,396 + SetY = 8,135 + SetX = 9,288 + SetY = 9,129 + SetX = 10,371 + SetY = 10,104 + SetX = 11,294 + SetY = 11,47 + SetX = 12,403 + SetY = 12,85 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,172 + SetY = 4,224 + SetX = 5,313 + SetY = 5,79 + SetX = 6,249 + SetY = 6,167 + SetX = 7,198 + SetY = 7,135 + SetY = 8,110 + SetX = 9,249 + SetY = 9,142 + SetX = 10,230 + SetY = 10,186 + SetX = 11,416 + SetY = 11,154 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,288 + SetY = 4,211 + SetX = 5,281 + SetY = 5,135 + SetX = 6,377 + SetY = 6,91 + SetX = 7,384 + SetOpacity = 7,100 + SetX = 9,192 + SetY = 9,148 + SetOpacity = 9,255 + SetX = 10,294 + SetY = 10,154 + SetX = 11,256 + SetY = 11,186 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,243 + SetY = 4,211 + SetX = 5,134 + SetY = 5,217 + SetX = 6,313 + SetY = 6,85 + SetY = 7,104 + SetX = 8,396 + SetY = 8,98 + SetOpacity = 8,100 + SetY = 9,123 + SetOpacity = 9,255 + SetX = 10,377 + SetY = 10,154 + SetX = 11,345 + SetY = 11,135 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,217 + SetY = 4,129 + SetY = 5,211 + SetX = 6,396 + SetY = 6,135 + SetX = 7,147 + SetY = 7,217 + SetX = 8,377 + SetY = 8,79 + SetX = 9,320 + SetY = 9,161 + SetX = 10,243 + SetY = 10,135 + SetX = 11,147 + SetY = 11,224 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,288 + SetY = 4,179 + SetX = 5,371 + SetY = 5,135 + SetX = 6,185 + SetY = 6,179 + SetX = 7,236 + SetX = 8,166 + SetY = 8,186 + SetX = 9,198 + SetY = 9,179 + SetX = 10,275 + SetY = 10,198 + SetX = 11,409 + SetY = 11,79 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,185 + SetY = 6,236 + SetX = 7,249 + SetY = 7,123 + SetX = 8,300 + SetY = 8,161 + SetX = 9,249 + SetY = 9,116 + SetX = 10,160 + SetY = 10,186 + + Graphic = 018-Water01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,307 + SetY = 6,186 + SetX = 7,326 + SetY = 7,41 + SetX = 8,243 + SetY = 8,104 + SetX = 9,326 + SetY = 9,116 + SetX = 10,153 + SetY = 10,217 + + Play = 0,Water5,80,100 + Play = 3,Blow1,80,100 + Play = 7,Blow1,80,100 + Play = 9,Blow1,80,100 + Play = 11,Blow1,80,100 + Play = 13,Blow1,80,100 diff --git a/PBS/Animations/Converted/Move/BULKUP.txt b/PBS/Animations/Converted/Move/BULKUP.txt new file mode 100644 index 000000000..92604056c --- /dev/null +++ b/PBS/Animations/Converted/Move/BULKUP.txt @@ -0,0 +1,72 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BULKUP] +Name = BULKUP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = animsheet + Focus = Target + SetX = 0,344 + SetY = 0,102 + SetVisible = 0,true + SetOpacity = 0,200 + SetY = 1,94 + SetOpacity = 1,150 + SetY = 2,86 + SetOpacity = 2,100 + SetY = 3,78 + SetOpacity = 3,50 + SetY = 6,102 + SetOpacity = 6,200 + SetY = 7,94 + SetOpacity = 7,150 + SetY = 8,86 + SetOpacity = 8,100 + SetY = 9,78 + SetOpacity = 9,50 + SetY = 12,102 + SetOpacity = 12,200 + SetY = 13,94 + SetOpacity = 13,150 + SetY = 14,86 + SetOpacity = 14,100 + SetY = 15,78 + SetOpacity = 15,50 + + Graphic = animsheet + Focus = Target + SetX = 0,464 + SetY = 0,102 + SetVisible = 0,true + SetOpacity = 0,200 + SetY = 1,94 + SetOpacity = 1,150 + SetY = 2,86 + SetOpacity = 2,100 + SetY = 3,78 + SetOpacity = 3,50 + SetY = 6,102 + SetOpacity = 6,200 + SetY = 7,94 + SetOpacity = 7,150 + SetY = 8,86 + SetOpacity = 8,100 + SetY = 9,78 + SetOpacity = 9,50 + SetY = 12,102 + SetOpacity = 12,200 + SetY = 13,94 + SetOpacity = 13,150 + SetY = 14,86 + SetOpacity = 14,100 + SetY = 15,78 + SetOpacity = 15,50 + + Play = 0,fog2,80,150 + Play = 6,fog2,80,150 + Play = 12,fog2,80,150 diff --git a/PBS/Animations/Converted/Move/BULLETPUNCH.txt b/PBS/Animations/Converted/Move/BULLETPUNCH.txt new file mode 100644 index 000000000..0d964e561 --- /dev/null +++ b/PBS/Animations/Converted/Move/BULLETPUNCH.txt @@ -0,0 +1,104 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BULLETPUNCH] +Name = BULLETPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetX = 0,386 + SetY = 0,99 + SetVisible = 0,true + SetX = 1,391 + SetY = 1,95 + SetX = 2,403 + SetY = 2,98 + SetOpacity = 2,64 + SetX = 3,405 + SetY = 3,72 + SetOpacity = 3,255 + SetX = 4,423 + SetY = 4,73 + SetOpacity = 4,64 + SetX = 5,355 + SetY = 5,131 + SetOpacity = 5,255 + SetX = 6,364 + SetY = 6,128 + SetOpacity = 6,107 + SetX = 7,418 + SetY = 7,135 + SetOpacity = 7,255 + SetX = 8,425 + SetY = 8,131 + SetOpacity = 8,108 + SetX = 9,370 + SetY = 9,107 + SetOpacity = 9,255 + SetX = 10,415 + SetY = 10,88 + SetOpacity = 10,84 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,426 + SetY = 2,69 + SetX = 4,372 + SetY = 4,142 + SetX = 6,446 + SetY = 6,141 + SetX = 8,395 + SetY = 8,115 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,405 + SetY = 2,67 + SetX = 4,352 + SetY = 4,133 + SetX = 6,427 + SetY = 6,135 + SetX = 8,379 + SetY = 8,109 + + Graphic = punches + Focus = Target + SetX = 0,398 + SetY = 0,100 + SetVisible = 0,true + SetX = 1,406 + SetY = 1,95 + SetX = 2,384 + SetY = 2,94 + SetOpacity = 2,84 + SetX = 3,420 + SetY = 3,67 + SetOpacity = 3,255 + SetX = 4,406 + SetY = 4,78 + SetOpacity = 4,44 + SetX = 5,368 + SetY = 5,135 + SetOpacity = 5,255 + SetX = 6,351 + SetY = 6,133 + SetOpacity = 6,64 + SetX = 7,432 + SetOpacity = 7,255 + SetX = 8,435 + SetOpacity = 8,36 + SetX = 9,387 + SetY = 9,103 + SetOpacity = 9,255 + SetX = 10,396 + SetY = 10,88 + SetOpacity = 10,44 + + Play = 0,Comet Punch,100,59 diff --git a/PBS/Animations/Converted/Move/BULLETSEED.txt b/PBS/Animations/Converted/Move/BULLETSEED.txt new file mode 100644 index 000000000..ed67310f3 --- /dev/null +++ b/PBS/Animations/Converted/Move/BULLETSEED.txt @@ -0,0 +1,526 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BULLETSEED] +Name = BULLETSEED + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,198 + SetVisible = 0,true + SetX = 1,211 + SetY = 1,173 + SetX = 2,249 + SetY = 2,148 + SetX = 3,300 + SetY = 3,129 + SetX = 4,358 + SetY = 4,104 + SetX = 5,352 + SetY = 5,85 + SetX = 6,332 + SetY = 6,66 + SetOpacity = 6,100 + SetX = 7,422 + SetY = 7,60 + SetX = 8,326 + SetY = 8,47 + SetX = 9,428 + SetY = 9,98 + SetX = 10,352 + SetY = 10,47 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,256 + SetY = 3,154 + SetX = 4,307 + SetY = 4,135 + SetX = 5,358 + SetY = 5,104 + SetX = 6,403 + SetY = 6,72 + SetX = 7,345 + SetY = 7,66 + SetX = 8,416 + SetY = 8,85 + SetX = 9,364 + SetY = 9,79 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,172 + SetY = 2,198 + SetX = 3,211 + SetY = 3,179 + SetX = 4,262 + SetY = 4,167 + SetX = 5,307 + SetY = 5,135 + SetX = 6,358 + SetY = 6,98 + SetX = 7,364 + SetY = 8,110 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,172 + SetY = 3,205 + SetX = 4,217 + SetY = 4,192 + SetX = 5,262 + SetY = 5,167 + SetX = 6,307 + SetY = 6,129 + SetX = 7,313 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,179 + SetY = 4,217 + SetX = 5,217 + SetY = 5,192 + SetX = 6,256 + SetY = 6,161 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 5,throw,80,100 + Play = 5,Knock,80,100 + Play = 7,Knock,80,100 + Play = 8,throw,80,100 + Play = 9,Knock,80,100 +#------------------------------- +[Move,BULLETSEED,1] +Name = Bullet Seed hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,179 + SetY = 4,217 + SetX = 5,217 + SetY = 5,192 + SetX = 6,256 + SetY = 6,161 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,198 + SetVisible = 0,true + SetX = 1,211 + SetY = 1,173 + SetX = 2,249 + SetY = 2,148 + SetX = 3,300 + SetY = 3,129 + SetX = 4,358 + SetY = 4,104 + SetX = 5,352 + SetY = 5,85 + SetX = 6,332 + SetY = 6,66 + SetOpacity = 6,100 + SetX = 7,422 + SetY = 7,60 + SetX = 8,326 + SetY = 8,47 + SetX = 9,428 + SetY = 9,98 + SetX = 10,352 + SetY = 10,47 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,256 + SetY = 3,154 + SetX = 4,307 + SetY = 4,135 + SetX = 5,358 + SetY = 5,104 + SetX = 6,403 + SetY = 6,72 + SetX = 7,345 + SetY = 7,66 + SetX = 8,416 + SetY = 8,85 + SetX = 9,364 + SetY = 9,79 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,172 + SetY = 2,198 + SetX = 3,211 + SetY = 3,179 + SetX = 4,262 + SetY = 4,167 + SetX = 5,307 + SetY = 5,135 + SetX = 6,358 + SetY = 6,98 + SetX = 7,364 + SetY = 8,110 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,172 + SetY = 3,205 + SetX = 4,217 + SetY = 4,192 + SetX = 5,262 + SetY = 5,167 + SetX = 6,307 + SetY = 6,129 + SetX = 7,313 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 5,throw,80,100 + Play = 5,Knock,80,100 + Play = 7,Knock,80,100 + Play = 8,throw,80,100 + Play = 9,Knock,80,100 +#------------------------------- +[Move,BULLETSEED,2] +Name = Bullet Seed hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,172 + SetY = 3,205 + SetX = 4,217 + SetY = 4,192 + SetX = 5,262 + SetY = 5,167 + SetX = 6,307 + SetY = 6,129 + SetX = 7,313 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,179 + SetY = 4,217 + SetX = 5,217 + SetY = 5,192 + SetX = 6,256 + SetY = 6,161 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,198 + SetVisible = 0,true + SetX = 1,211 + SetY = 1,173 + SetX = 2,249 + SetY = 2,148 + SetX = 3,300 + SetY = 3,129 + SetX = 4,358 + SetY = 4,104 + SetX = 5,352 + SetY = 5,85 + SetX = 6,332 + SetY = 6,66 + SetOpacity = 6,100 + SetX = 7,422 + SetY = 7,60 + SetX = 8,326 + SetY = 8,47 + SetX = 9,428 + SetY = 9,98 + SetX = 10,352 + SetY = 10,47 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,256 + SetY = 3,154 + SetX = 4,307 + SetY = 4,135 + SetX = 5,358 + SetY = 5,104 + SetX = 6,403 + SetY = 6,72 + SetX = 7,345 + SetY = 7,66 + SetX = 8,416 + SetY = 8,85 + SetX = 9,364 + SetY = 9,79 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,172 + SetY = 2,198 + SetX = 3,211 + SetY = 3,179 + SetX = 4,262 + SetY = 4,167 + SetX = 5,307 + SetY = 5,135 + SetX = 6,358 + SetY = 6,98 + SetX = 7,364 + SetY = 8,110 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 5,throw,80,100 + Play = 5,Knock,80,100 + Play = 7,Knock,80,100 + Play = 8,throw,80,100 + Play = 9,Knock,80,100 +#------------------------------- +[Move,BULLETSEED,3] +Name = Bullet Seed hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,172 + SetY = 2,198 + SetX = 3,211 + SetY = 3,179 + SetX = 4,262 + SetY = 4,167 + SetX = 5,307 + SetY = 5,135 + SetX = 6,358 + SetY = 6,98 + SetX = 7,364 + SetY = 8,110 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,172 + SetY = 3,205 + SetX = 4,217 + SetY = 4,192 + SetX = 5,262 + SetY = 5,167 + SetX = 6,307 + SetY = 6,129 + SetX = 7,313 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,179 + SetY = 4,217 + SetX = 5,217 + SetY = 5,192 + SetX = 6,256 + SetY = 6,161 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,198 + SetVisible = 0,true + SetX = 1,211 + SetY = 1,173 + SetX = 2,249 + SetY = 2,148 + SetX = 3,300 + SetY = 3,129 + SetX = 4,358 + SetY = 4,104 + SetX = 5,352 + SetY = 5,85 + SetX = 6,332 + SetY = 6,66 + SetOpacity = 6,100 + SetX = 7,422 + SetY = 7,60 + SetX = 8,326 + SetY = 8,47 + SetX = 9,428 + SetY = 9,98 + SetX = 10,352 + SetY = 10,47 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,256 + SetY = 3,154 + SetX = 4,307 + SetY = 4,135 + SetX = 5,358 + SetY = 5,104 + SetX = 6,403 + SetY = 6,72 + SetX = 7,345 + SetY = 7,66 + SetX = 8,416 + SetY = 8,85 + SetX = 9,364 + SetY = 9,79 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 5,throw,80,100 + Play = 5,Knock,80,100 + Play = 7,Knock,80,100 + Play = 8,throw,80,100 + Play = 9,Knock,80,100 +#------------------------------- +[Move,BULLETSEED,4] +Name = Bullet Seed hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,256 + SetY = 3,154 + SetX = 4,307 + SetY = 4,135 + SetX = 5,358 + SetY = 5,104 + SetX = 6,403 + SetY = 6,72 + SetX = 7,345 + SetY = 7,66 + SetX = 8,416 + SetY = 8,85 + SetX = 9,364 + SetY = 9,79 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,172 + SetY = 2,198 + SetX = 3,211 + SetY = 3,179 + SetX = 4,262 + SetY = 4,167 + SetX = 5,307 + SetY = 5,135 + SetX = 6,358 + SetY = 6,98 + SetX = 7,364 + SetY = 8,110 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,172 + SetY = 3,205 + SetX = 4,217 + SetY = 4,192 + SetX = 5,262 + SetY = 5,167 + SetX = 6,307 + SetY = 6,129 + SetX = 7,313 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,179 + SetY = 4,217 + SetX = 5,217 + SetY = 5,192 + SetX = 6,256 + SetY = 6,161 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,198 + SetVisible = 0,true + SetX = 1,211 + SetY = 1,173 + SetX = 2,249 + SetY = 2,148 + SetX = 3,300 + SetY = 3,129 + SetX = 4,358 + SetY = 4,104 + SetX = 5,352 + SetY = 5,85 + SetX = 6,332 + SetY = 6,66 + SetOpacity = 6,100 + SetX = 7,422 + SetY = 7,60 + SetX = 8,326 + SetY = 8,47 + SetX = 9,428 + SetY = 9,98 + SetX = 10,352 + SetY = 10,47 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 5,throw,80,100 + Play = 5,Knock,80,100 + Play = 7,Knock,80,100 + Play = 8,throw,80,100 + Play = 9,Knock,80,100 diff --git a/PBS/Animations/Converted/Move/CHARGE.txt b/PBS/Animations/Converted/Move/CHARGE.txt new file mode 100644 index 000000000..d593e3dcc --- /dev/null +++ b/PBS/Animations/Converted/Move/CHARGE.txt @@ -0,0 +1,105 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CHARGE] +Name = CHARGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = electric2 + Focus = User + SetX = 0,328 + SetY = 0,238 + SetVisible = 0,true + SetX = 1,296 + SetX = 2,216 + SetY = 2,230 + SetX = 3,184 + SetX = 4,176 + SetX = 6,72 + SetY = 6,262 + SetX = 7,168 + SetY = 7,190 + SetX = 8,24 + SetX = 9,192 + SetY = 9,174 + SetX = 10,64 + SetY = 10,294 + SetOpacity = 11,100 + + Graphic = electric2 + Focus = User + SetVisible = 0,true + SetX = 1,-32 + SetY = 1,230 + SetX = 2,0 + SetX = 3,40 + SetX = 4,64 + SetX = 5,72 + SetY = 5,254 + SetX = 6,168 + SetY = 6,190 + SetX = 7,24 + SetX = 8,48 + SetY = 8,302 + SetX = 9,16 + SetY = 9,198 + SetOpacity = 10,100 + SetX = 11,232 + SetY = 11,222 + + Graphic = electric2 + Focus = User + SetVisible = 0,true + SetX = 3,328 + SetY = 3,238 + SetX = 4,280 + SetX = 5,216 + SetY = 5,230 + SetX = 6,72 + SetY = 6,238 + SetX = 7,48 + SetY = 7,302 + SetX = 8,176 + SetY = 8,222 + SetX = 10,208 + SetX = 11,200 + SetY = 11,310 + + Graphic = electric2 + Focus = User + SetVisible = 0,true + SetX = 4,-72 + SetY = 4,238 + SetX = 5,-24 + SetX = 6,56 + SetY = 6,190 + SetY = 7,238 + SetX = 8,192 + SetY = 8,174 + + Graphic = electric2 + Focus = User + SetVisible = 0,true + SetX = 5,344 + SetY = 5,246 + SetX = 6,304 + SetX = 7,216 + SetY = 7,238 + SetX = 8,176 + SetY = 8,278 + + Graphic = electric2 + Focus = User + SetVisible = 0,true + SetX = 7,176 + SetY = 7,286 + + Play = 0,Thunder3,80,100 + Play = 2,Thunder3,80,100 + Play = 4,Thunder3,80,100 + Play = 5,Thunder3,80,100 + Play = 7,Thunder3,80,100 diff --git a/PBS/Animations/Converted/Move/CHARM.txt b/PBS/Animations/Converted/Move/CHARM.txt new file mode 100644 index 000000000..517d67946 --- /dev/null +++ b/PBS/Animations/Converted/Move/CHARM.txt @@ -0,0 +1,59 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CHARM] +Name = CHARM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = electric2 + Focus = Target + SetVisible = 0,true + SetX = 2,440 + SetY = 2,142 + SetX = 3,432 + SetY = 3,134 + SetX = 4,424 + SetY = 4,126 + SetY = 5,118 + SetX = 6,352 + SetY = 6,78 + SetY = 7,70 + + Graphic = electric2 + Focus = Target + SetVisible = 0,true + SetX = 5,376 + SetY = 5,102 + + Graphic = electric2 + Focus = Target + SetX = 0,336 + SetY = 0,126 + SetVisible = 0,true + SetX = 1,344 + SetY = 1,118 + SetX = 2,352 + SetY = 2,110 + SetY = 3,102 + SetY = 4,94 + SetX = 5,344 + SetY = 5,86 + SetOpacity = 5,100 + SetX = 6,424 + SetY = 6,110 + SetOpacity = 6,255 + SetX = 7,432 + SetY = 7,102 + SetOpacity = 7,100 + SetX = 8,352 + SetY = 8,62 + SetOpacity = 8,255 + SetX = 9,344 + SetY = 9,54 + SetX = 10,336 + SetY = 10,46 + SetOpacity = 10,100 diff --git a/PBS/Animations/Converted/Move/CLEARSMOG.txt b/PBS/Animations/Converted/Move/CLEARSMOG.txt new file mode 100644 index 000000000..535bebd48 --- /dev/null +++ b/PBS/Animations/Converted/Move/CLEARSMOG.txt @@ -0,0 +1,26 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CLEARSMOG] +Name = CLEARSMOG + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = UserAndTarget + SetX = 0,384 + SetY = 0,98 + SetVisible = 0,true + SetX = 2,385 + SetY = 2,95 + SetY = 3,98 + SetX = 4,382 + SetY = 4,97 + SetX = 5,383 + SetY = 5,101 + SetX = 6,382 + + Play = 0,Snore,86,100 diff --git a/PBS/Animations/Converted/Move/CLOSECOMBAT.txt b/PBS/Animations/Converted/Move/CLOSECOMBAT.txt new file mode 100644 index 000000000..e705bc9a1 --- /dev/null +++ b/PBS/Animations/Converted/Move/CLOSECOMBAT.txt @@ -0,0 +1,229 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CLOSECOMBAT] +Name = CLOSECOMBAT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 4,383 + SetY = 4,57 + SetOpacity = 4,47 + SetX = 5,401 + SetY = 5,118 + SetOpacity = 5,20 + SetX = 6,339 + SetY = 6,91 + SetOpacity = 6,72 + SetX = 8,385 + SetY = 8,99 + SetOpacity = 8,154 + SetX = 9,428 + SetY = 9,121 + SetOpacity = 9,255 + SetX = 10,396 + SetY = 10,138 + SetX = 11,389 + SetY = 11,139 + SetOpacity = 11,154 + SetX = 12,378 + SetY = 12,100 + SetOpacity = 12,255 + SetX = 13,372 + SetY = 13,116 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 1,361 + SetY = 1,125 + SetX = 2,344 + SetY = 2,154 + SetOpacity = 2,144 + SetX = 3,341 + SetY = 3,148 + SetOpacity = 3,43 + SetX = 4,422 + SetY = 4,75 + SetOpacity = 4,55 + SetX = 5,431 + SetY = 5,142 + SetOpacity = 5,54 + SetX = 6,372 + SetY = 6,78 + SetOpacity = 6,44 + SetX = 8,422 + SetY = 8,86 + SetOpacity = 8,170 + SetX = 9,395 + SetY = 9,142 + SetOpacity = 9,255 + SetX = 10,434 + SetY = 10,119 + SetX = 11,425 + SetY = 11,123 + SetOpacity = 11,114 + SetX = 12,410 + SetY = 12,91 + SetOpacity = 12,255 + SetX = 13,402 + SetY = 13,97 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 1,332 + SetY = 1,147 + SetX = 2,370 + SetY = 2,133 + SetOpacity = 2,172 + SetX = 3,361 + SetY = 3,136 + SetOpacity = 3,81 + SetX = 4,404 + SetY = 4,67 + SetOpacity = 4,63 + SetX = 5,417 + SetY = 5,124 + SetOpacity = 5,89 + SetX = 6,365 + SetY = 6,77 + SetOpacity = 6,74 + SetX = 8,407 + SetY = 8,85 + SetOpacity = 8,178 + SetX = 9,417 + SetY = 9,131 + SetOpacity = 9,255 + SetY = 10,125 + SetX = 11,411 + SetOpacity = 11,164 + SetX = 12,393 + SetY = 12,91 + SetOpacity = 12,255 + SetX = 13,388 + SetY = 13,103 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 1,353 + SetY = 1,137 + SetX = 2,361 + SetY = 2,134 + SetOpacity = 2,144 + SetY = 3,131 + SetOpacity = 3,36 + SetX = 4,395 + SetY = 4,109 + SetOpacity = 4,115 + SetX = 5,340 + SetY = 5,93 + SetOpacity = 5,154 + SetX = 6,378 + SetY = 6,99 + SetOpacity = 6,255 + SetX = 7,383 + SetY = 7,107 + SetX = 8,424 + SetY = 8,123 + SetX = 11,373 + SetY = 11,108 + SetX = 13,354 + SetY = 13,69 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 2,417 + SetY = 2,104 + SetX = 3,374 + SetY = 3,85 + SetOpacity = 3,164 + SetX = 4,431 + SetY = 4,133 + SetOpacity = 4,154 + SetX = 5,369 + SetY = 5,82 + SetOpacity = 5,143 + SetX = 6,408 + SetY = 6,86 + SetOpacity = 6,255 + SetX = 7,418 + SetY = 7,87 + SetX = 11,402 + SetY = 11,103 + SetX = 13,384 + SetY = 13,63 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 2,379 + SetY = 2,83 + SetX = 3,421 + SetY = 3,107 + SetOpacity = 3,144 + SetX = 4,414 + SetY = 4,119 + SetOpacity = 4,174 + SetX = 5,357 + SetY = 5,89 + SetOpacity = 5,144 + SetX = 6,401 + SetY = 6,96 + SetOpacity = 6,255 + SetX = 7,400 + SetY = 7,94 + SetX = 11,393 + SetY = 11,104 + SetX = 13,374 + SetY = 13,71 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 2,400 + SetY = 2,94 + SetX = 3,397 + SetY = 3,90 + SetOpacity = 3,154 + SetX = 4,338 + SetY = 4,89 + SetOpacity = 4,255 + SetX = 5,375 + SetY = 5,110 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 3,413 + SetY = 3,138 + SetX = 4,369 + SetY = 4,72 + SetX = 5,406 + SetY = 5,95 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 3,377 + SetY = 3,126 + SetX = 4,359 + SetY = 4,82 + SetX = 5,398 + SetY = 5,103 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 3,399 + SetY = 3,127 + + Play = 0,Comet Punch,100,105 diff --git a/PBS/Animations/Converted/Move/COMETPUNCH.txt b/PBS/Animations/Converted/Move/COMETPUNCH.txt new file mode 100644 index 000000000..46bbfe90f --- /dev/null +++ b/PBS/Animations/Converted/Move/COMETPUNCH.txt @@ -0,0 +1,176 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,COMETPUNCH] +Name = COMETPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetVisible = 0,true + SetX = 2,432 + SetY = 2,78 + SetX = 3,368 + SetY = 3,30 + SetX = 5,432 + SetY = 5,110 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,352 + SetY = 0,102 + SetVisible = 0,true + SetX = 3,432 + SetY = 3,78 + SetX = 5,368 + SetY = 5,30 + SetX = 6,432 + SetY = 6,110 + + Play = 0,Blow1,80,100 + Play = 2,Blow1,80,100 + Play = 5,Blow1,80,100 +#------------------------------- +[Move,COMETPUNCH,1] +Name = Comet Punch hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,352 + SetY = 0,102 + SetVisible = 0,true + SetX = 3,432 + SetY = 3,78 + SetX = 5,368 + SetY = 5,30 + SetX = 6,432 + SetY = 6,110 + + Graphic = 003-Attack01 + Focus = Target + SetVisible = 0,true + SetX = 2,432 + SetY = 2,78 + SetX = 3,368 + SetY = 3,30 + SetX = 5,432 + SetY = 5,110 + + Play = 0,Blow1,80,100 + Play = 2,Blow1,80,100 + Play = 5,Blow1,80,100 +#------------------------------- +[Move,COMETPUNCH,2] +Name = Comet Punch hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetVisible = 0,true + SetX = 2,432 + SetY = 2,78 + SetX = 3,368 + SetY = 3,30 + SetX = 5,432 + SetY = 5,110 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,352 + SetY = 0,102 + SetVisible = 0,true + SetX = 3,432 + SetY = 3,78 + SetX = 5,368 + SetY = 5,30 + SetX = 6,432 + SetY = 6,110 + + Play = 0,Blow1,80,100 + Play = 2,Blow1,80,100 + Play = 5,Blow1,80,100 +#------------------------------- +[Move,COMETPUNCH,3] +Name = Comet Punch hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,352 + SetY = 0,102 + SetVisible = 0,true + SetX = 3,432 + SetY = 3,78 + SetX = 5,368 + SetY = 5,30 + SetX = 6,432 + SetY = 6,110 + + Graphic = 003-Attack01 + Focus = Target + SetVisible = 0,true + SetX = 2,432 + SetY = 2,78 + SetX = 3,368 + SetY = 3,30 + SetX = 5,432 + SetY = 5,110 + + Play = 0,Blow1,80,100 + Play = 2,Blow1,80,100 + Play = 5,Blow1,80,100 +#------------------------------- +[Move,COMETPUNCH,4] +Name = Comet Punch hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetVisible = 0,true + SetX = 2,432 + SetY = 2,78 + SetX = 3,368 + SetY = 3,30 + SetX = 5,432 + SetY = 5,110 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,352 + SetY = 0,102 + SetVisible = 0,true + SetX = 3,432 + SetY = 3,78 + SetX = 5,368 + SetY = 5,30 + SetX = 6,432 + SetY = 6,110 + + Play = 0,Blow1,80,100 + Play = 2,Blow1,80,100 + Play = 5,Blow1,80,100 diff --git a/PBS/Animations/Converted/Move/CONFUSERAY.txt b/PBS/Animations/Converted/Move/CONFUSERAY.txt new file mode 100644 index 000000000..984f810b0 --- /dev/null +++ b/PBS/Animations/Converted/Move/CONFUSERAY.txt @@ -0,0 +1,52 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CONFUSERAY] +Name = CONFUSERAY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = estranho + Focus = UserAndTarget + SetX = 0,153 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,166 + SetY = 1,205 + SetX = 2,172 + SetY = 2,198 + SetX = 3,185 + SetY = 3,192 + SetX = 4,198 + SetY = 4,186 + SetX = 5,211 + SetY = 5,179 + SetX = 6,224 + SetY = 6,173 + SetX = 7,236 + SetY = 7,167 + SetX = 8,249 + SetY = 8,161 + SetX = 9,262 + SetY = 9,154 + SetX = 10,275 + SetY = 10,148 + SetX = 11,288 + SetY = 11,142 + SetX = 12,300 + SetY = 12,135 + SetX = 13,313 + SetY = 13,129 + SetX = 14,326 + SetY = 14,123 + SetX = 15,339 + SetY = 15,116 + SetX = 16,358 + SetY = 16,110 + SetOpacity = 17,100 + + Play = 1,Twine,80,100 + Play = 12,Confuse,80,100 diff --git a/PBS/Animations/Converted/Move/COTTONGUARD.txt b/PBS/Animations/Converted/Move/COTTONGUARD.txt new file mode 100644 index 000000000..421b13336 --- /dev/null +++ b/PBS/Animations/Converted/Move/COTTONGUARD.txt @@ -0,0 +1,87 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,COTTONGUARD] +Name = COTTONGUARD + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = animsheet + Focus = User + SetX = 0,113 + SetY = 0,263 + SetVisible = 0,true + SetX = 1,123 + SetY = 1,272 + SetX = 2,135 + SetY = 2,268 + SetY = 3,223 + SetX = 4,149 + SetY = 4,210 + SetX = 5,135 + SetY = 5,267 + SetX = 6,184 + SetY = 6,233 + + Graphic = animsheet + Focus = User + SetVisible = 0,true + SetX = 1,156 + SetY = 1,258 + SetX = 2,166 + SetY = 2,247 + SetX = 3,167 + SetY = 3,243 + SetX = 4,154 + SetY = 4,234 + SetX = 5,165 + SetY = 5,256 + SetX = 6,154 + SetY = 6,217 + + Graphic = animsheet + Focus = User + SetVisible = 0,true + SetX = 3,133 + SetY = 3,263 + SetX = 4,170 + SetY = 4,259 + SetX = 5,146 + SetY = 5,237 + SetX = 6,141 + SetY = 6,252 + + Graphic = animsheet + Focus = User + SetVisible = 0,true + SetX = 3,167 + SetY = 3,266 + SetX = 4,138 + SetY = 4,269 + SetX = 5,163 + SetY = 5,214 + SetX = 6,178 + SetY = 6,265 + + Graphic = animsheet + Focus = User + SetVisible = 0,true + SetX = 3,176 + SetY = 3,220 + SetX = 4,190 + SetY = 4,236 + SetX = 5,180 + SetY = 5,232 + SetX = 6,138 + SetY = 6,269 + + Graphic = animsheet + Focus = User + SetVisible = 0,true + SetX = 4,129 + SetY = 4,237 + + Play = 0,Substitute,80,100 diff --git a/PBS/Animations/Converted/Move/COTTONSPORE.txt b/PBS/Animations/Converted/Move/COTTONSPORE.txt new file mode 100644 index 000000000..46a500475 --- /dev/null +++ b/PBS/Animations/Converted/Move/COTTONSPORE.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,COTTONSPORE] +Name = COTTONSPORE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Special5 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/COUNTER.txt b/PBS/Animations/Converted/Move/COUNTER.txt new file mode 100644 index 000000000..e0167d6d8 --- /dev/null +++ b/PBS/Animations/Converted/Move/COUNTER.txt @@ -0,0 +1,134 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,COUNTER] +Name = COUNTER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = UserAndTarget + SetX = 0,384 + SetY = 0,98 + SetVisible = 0,true + SetX = 1,408 + SetY = 1,80 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetX = 2,384 + SetY = 2,99 + SetZoomX = 2,100 + SetZoomY = 2,100 + SetX = 3,392 + SetY = 3,111 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,352 + SetY = 4,24 + SetX = 5,416 + SetY = 5,104 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,387 + SetY = 1,99 + SetX = 2,408 + SetY = 2,70 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,360 + SetY = 3,115 + SetX = 4,339 + SetY = 4,22 + SetX = 5,400 + SetY = 5,92 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,352 + SetY = 1,99 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetX = 2,360 + SetY = 2,78 + SetX = 3,368 + SetY = 3,97 + SetX = 4,376 + SetY = 4,8 + SetX = 5,416 + SetY = 5,53 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,400 + SetY = 2,101 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,352 + SetY = 3,63 + SetY = 4,121 + SetX = 5,377 + SetY = 5,112 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,408 + SetY = 3,85 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,392 + SetY = 4,61 + SetX = 5,368 + SetY = 5,54 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,386 + SetY = 3,98 + SetX = 4,384 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetX = 5,336 + SetY = 5,10 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,384 + SetY = 4,96 + SetX = 5,400 + SetY = 5,39 + SetZoomX = 5,50 + SetZoomY = 5,50 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,352 + SetY = 5,131 + SetZoomX = 5,50 + SetZoomY = 5,50 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,376 + SetY = 5,26 + SetZoomX = 5,50 + SetZoomY = 5,50 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,399 + SetY = 5,92 + + Play = 0,MiningCollapse,80,100 diff --git a/PBS/Animations/Converted/Move/CRUNCH.txt b/PBS/Animations/Converted/Move/CRUNCH.txt new file mode 100644 index 000000000..a8a99eb00 --- /dev/null +++ b/PBS/Animations/Converted/Move/CRUNCH.txt @@ -0,0 +1,90 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CRUNCH] +Name = CRUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = teeth + Focus = Target + SetX = 0,396 + SetY = 0,97 + SetVisible = 0,true + SetX = 1,391 + SetY = 1,98 + SetX = 2,387 + SetY = 2,99 + SetY = 3,97 + SetX = 4,381 + SetY = 4,92 + SetX = 5,389 + SetX = 6,388 + SetY = 6,96 + SetX = 7,389 + SetY = 7,99 + SetX = 8,388 + SetY = 8,93 + SetX = 9,384 + SetY = 9,94 + SetX = 10,395 + SetY = 10,98 + SetX = 11,391 + SetY = 11,93 + SetX = 12,384 + SetY = 12,97 + + Graphic = teeth + Focus = Target + SetVisible = 0,true + SetX = 7,444 + SetY = 7,115 + SetX = 8,418 + SetY = 8,95 + SetX = 9,379 + SetY = 9,112 + SetX = 10,331 + SetY = 10,128 + + Graphic = teeth + Focus = Target + SetVisible = 0,true + SetX = 7,343 + SetY = 7,94 + SetX = 8,329 + SetY = 8,104 + SetX = 9,425 + SetY = 9,119 + SetX = 10,437 + SetY = 10,116 + + Graphic = teeth + Focus = Target + SetVisible = 0,true + SetX = 8,343 + SetY = 8,95 + SetX = 9,327 + SetY = 9,115 + SetX = 10,387 + SetY = 10,141 + + Graphic = teeth + Focus = Target + SetVisible = 0,true + SetX = 8,442 + SetY = 8,99 + SetX = 9,391 + SetY = 9,152 + SetX = 10,404 + SetY = 10,114 + + Graphic = teeth + Focus = Target + SetVisible = 0,true + SetX = 10,325 + SetY = 10,96 + + Play = 7,Super Fang,100,111 diff --git a/PBS/Animations/Converted/Move/CRUSHCLAW.txt b/PBS/Animations/Converted/Move/CRUSHCLAW.txt new file mode 100644 index 000000000..8d14eb5a0 --- /dev/null +++ b/PBS/Animations/Converted/Move/CRUSHCLAW.txt @@ -0,0 +1,30 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CRUSHCLAW] +Name = CRUSHCLAW + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = dragon claw + Focus = Target + SetX = 0,387 + SetY = 0,84 + SetVisible = 0,true + SetX = 1,392 + SetY = 1,87 + SetX = 2,402 + SetY = 2,93 + SetX = 3,400 + SetY = 3,112 + SetX = 4,397 + SetY = 4,105 + SetY = 5,110 + SetX = 6,392 + SetX = 7,384 + + Play = 0,Slash,100,135 + Play = 4,Slash,100,135 diff --git a/PBS/Animations/Converted/Move/CURSE.txt b/PBS/Animations/Converted/Move/CURSE.txt new file mode 100644 index 000000000..96df1b0bd --- /dev/null +++ b/PBS/Animations/Converted/Move/CURSE.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CURSE] +Name = CURSE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ghost1 + Focus = Target + SetX = 0,392 + SetY = 0,14 + SetAngle = 0,90 + SetVisible = 0,true + SetY = 1,54 + SetY = 2,70 + SetY = 3,78 + SetX = 4,384 + + Play = 2,Darkness6,80,100 diff --git a/PBS/Animations/Converted/Move/CUT.txt b/PBS/Animations/Converted/Move/CUT.txt new file mode 100644 index 000000000..b886d071d --- /dev/null +++ b/PBS/Animations/Converted/Move/CUT.txt @@ -0,0 +1,20 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,CUT] +Name = CUT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 004-Attack02 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Slash10,80,100 + Play = 3,Slash2,80,100 + Play = 6,Slash11,80,100 diff --git a/PBS/Animations/Converted/Move/DEFENSECURL.txt b/PBS/Animations/Converted/Move/DEFENSECURL.txt new file mode 100644 index 000000000..1fa57c611 --- /dev/null +++ b/PBS/Animations/Converted/Move/DEFENSECURL.txt @@ -0,0 +1,34 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DEFENSECURL] +Name = DEFENSECURL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = User + SetX = 0,133 + SetY = 0,224 + SetVisible = 0,true + SetOpacity = 0,100 + SetX = 1,131 + SetY = 1,223 + SetOpacity = 1,110 + SetX = 2,134 + SetY = 2,221 + SetOpacity = 2,140 + SetX = 3,131 + SetOpacity = 3,170 + SetY = 4,222 + SetOpacity = 4,230 + SetX = 5,127 + SetY = 5,219 + SetOpacity = 5,255 + SetX = 6,132 + SetOpacity = 6,233 + + Play = 0,Defense Curl,100,100 diff --git a/PBS/Animations/Converted/Move/DETECT.txt b/PBS/Animations/Converted/Move/DETECT.txt new file mode 100644 index 000000000..c315e2446 --- /dev/null +++ b/PBS/Animations/Converted/Move/DETECT.txt @@ -0,0 +1,28 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DETECT] +Name = DETECT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet + Focus = UserAndTarget + SetX = 0,422 + SetY = 0,66 + SetVisible = 0,true + SetX = 1,423 + SetY = 1,68 + SetX = 2,416 + SetY = 2,73 + SetX = 3,420 + SetY = 3,72 + SetX = 4,408 + SetY = 4,74 + SetX = 5,409 + SetY = 5,78 + + Play = 0,Flash2,80,85 diff --git a/PBS/Animations/Converted/Move/DISABLE.txt b/PBS/Animations/Converted/Move/DISABLE.txt new file mode 100644 index 000000000..5d42c0824 --- /dev/null +++ b/PBS/Animations/Converted/Move/DISABLE.txt @@ -0,0 +1,38 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DISABLE] +Name = DISABLE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,385 + SetY = 4,96 + SetAngle = 4,45 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,388 + SetY = 6,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,385 + SetY = 0,101 + SetVisible = 0,true + SetX = 1,384 + SetY = 1,98 + SetY = 2,99 + SetX = 3,385 + SetY = 3,96 + SetX = 4,387 + SetY = 4,98 + + Play = 0,Sword2,80,121 diff --git a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt new file mode 100644 index 000000000..87e0160e3 --- /dev/null +++ b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt @@ -0,0 +1,193 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DIZZYPUNCH] +Name = DIZZYPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetX = 0,384 + SetY = 0,97 + SetVisible = 0,true + SetY = 1,96 + SetY = 2,91 + SetX = 4,387 + SetY = 4,96 + SetX = 6,383 + SetY = 6,97 + SetX = 7,388 + SetY = 7,91 + SetX = 8,384 + SetY = 8,96 + SetY = 9,97 + SetY = 10,96 + SetY = 11,91 + SetX = 13,387 + SetY = 13,96 + SetX = 15,383 + SetY = 15,97 + SetX = 16,388 + SetY = 16,91 + SetX = 17,384 + SetY = 17,96 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 1,388 + SetY = 1,102 + SetX = 2,390 + SetY = 2,98 + SetX = 4,445 + SetY = 4,88 + SetX = 5,415 + SetY = 5,124 + SetX = 6,378 + SetY = 6,128 + SetY = 7,118 + SetX = 8,407 + SetY = 8,111 + SetX = 10,388 + SetY = 10,102 + SetX = 11,390 + SetY = 11,98 + SetX = 13,445 + SetY = 13,88 + SetX = 14,415 + SetY = 14,124 + SetX = 15,378 + SetY = 15,128 + SetY = 16,118 + SetX = 17,407 + SetY = 17,111 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,447 + SetY = 2,80 + SetX = 4,469 + SetY = 4,105 + SetX = 5,428 + SetY = 5,142 + SetX = 6,356 + SetY = 6,156 + SetX = 7,364 + SetY = 7,146 + SetX = 8,422 + SetY = 8,139 + SetX = 11,447 + SetY = 11,80 + SetX = 13,469 + SetY = 13,105 + SetX = 14,428 + SetY = 14,142 + SetX = 15,356 + SetY = 15,156 + SetX = 16,364 + SetY = 16,146 + SetX = 17,422 + SetY = 17,139 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,471 + SetY = 2,88 + SetX = 4,356 + SetY = 4,68 + SetX = 5,351 + SetY = 5,38 + SetX = 6,411 + SetY = 6,54 + SetX = 7,422 + SetY = 7,50 + SetX = 8,357 + SetY = 8,112 + SetX = 11,471 + SetY = 11,88 + SetX = 13,356 + SetY = 13,68 + SetX = 14,351 + SetY = 14,38 + SetX = 15,411 + SetY = 15,54 + SetX = 16,422 + SetY = 16,50 + SetX = 17,357 + SetY = 17,112 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 3,346 + SetY = 3,82 + SetX = 4,329 + SetY = 4,60 + SetX = 6,432 + SetY = 6,30 + SetX = 7,442 + SetY = 7,28 + SetX = 8,336 + SetY = 8,129 + SetX = 12,346 + SetY = 12,82 + SetX = 13,329 + SetY = 13,60 + SetX = 15,432 + SetY = 15,30 + SetX = 16,442 + SetY = 16,28 + SetX = 17,336 + SetY = 17,129 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 3,316 + SetY = 3,91 + SetX = 5,377 + SetY = 5,58 + SetX = 7,356 + SetY = 7,67 + SetX = 8,377 + SetY = 8,58 + SetX = 12,316 + SetY = 12,91 + SetX = 14,377 + SetY = 14,58 + SetX = 16,356 + SetY = 16,67 + SetX = 17,377 + SetY = 17,58 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 7,426 + SetY = 7,103 + SetX = 8,361 + SetY = 8,36 + SetX = 16,426 + SetY = 16,103 + SetX = 17,361 + SetY = 17,36 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 8,427 + SetY = 8,74 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 8,447 + SetY = 8,64 + + Play = 0,Dizzy Punch,100,100 diff --git a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt new file mode 100644 index 000000000..55e09ccfc --- /dev/null +++ b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt @@ -0,0 +1,48 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DOUBLEEDGE] +Name = DOUBLEEDGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Divine_Smash + Focus = Target + SetVisible = 0,true + SetX = 1,198 + SetY = 1,236 + SetY = 2,179 + SetX = 3,96 + SetY = 3,167 + SetX = 8,358 + SetY = 8,110 + + Graphic = Divine_Smash + Focus = User + SetVisible = 0,true + SetX = 2,96 + SetY = 2,230 + + Graphic = Divine_Smash + Focus = Target + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetY = 1,192 + SetY = 2,129 + SetX = 3,198 + SetY = 3,116 + SetX = 4,96 + SetY = 4,129 + SetX = 5,358 + SetY = 5,110 + SetOpacity = 5,50 + SetOpacity = 7,255 + SetX = 10,352 + SetAngle = 10,90 + + Play = 0,throw,80,100 + Play = 6,Damage1,80,100 diff --git a/PBS/Animations/Converted/Move/DOUBLEKICK.txt b/PBS/Animations/Converted/Move/DOUBLEKICK.txt new file mode 100644 index 000000000..184a1d627 --- /dev/null +++ b/PBS/Animations/Converted/Move/DOUBLEKICK.txt @@ -0,0 +1,73 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DOUBLEKICK] +Name = DOUBLEKICK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetX = 0,336 + SetY = 0,94 + SetZoomX = 0,110 + SetZoomY = 0,110 + SetVisible = 0,true + SetOpacity = 0,100 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetX = 3,440 + SetY = 3,78 + SetOpacity = 5,100 + + Graphic = normal1 + Focus = Target + SetVisible = 0,true + SetX = 2,440 + SetY = 2,78 + SetZoomX = 2,110 + SetZoomY = 2,110 + SetOpacity = 2,100 + + Play = 1,Blow3,80,100 + Play = 3,Blow3,80,100 +#------------------------------- +[Move,DOUBLEKICK,1] +Name = Double Kick hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetVisible = 0,true + SetX = 2,440 + SetY = 2,78 + SetZoomX = 2,110 + SetZoomY = 2,110 + SetOpacity = 2,100 + + Graphic = normal1 + Focus = Target + SetX = 0,336 + SetY = 0,94 + SetZoomX = 0,110 + SetZoomY = 0,110 + SetVisible = 0,true + SetOpacity = 0,100 + SetZoomX = 1,100 + SetZoomY = 1,100 + SetOpacity = 1,255 + SetX = 3,440 + SetY = 3,78 + SetOpacity = 5,100 + + Play = 1,Blow3,80,100 + Play = 3,Blow3,80,100 diff --git a/PBS/Animations/Converted/Move/DOUBLESLAP.txt b/PBS/Animations/Converted/Move/DOUBLESLAP.txt new file mode 100644 index 000000000..714c55ca7 --- /dev/null +++ b/PBS/Animations/Converted/Move/DOUBLESLAP.txt @@ -0,0 +1,176 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DOUBLESLAP] +Name = DOUBLESLAP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,94 + SetOpacity = 3,100 + SetX = 7,384 + SetOpacity = 7,255 + + Graphic = many + Focus = Target + SetX = 0,520 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,480 + SetX = 2,424 + SetX = 3,392 + SetX = 4,224 + SetX = 5,296 + SetX = 6,344 + SetX = 7,384 + SetOpacity = 8,100 + + Play = 3,Blow5,80,100 + Play = 7,Blow5,80,100 +#------------------------------- +[Move,DOUBLESLAP,1] +Name = DoubleSlap hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetX = 0,520 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,480 + SetX = 2,424 + SetX = 3,392 + SetX = 4,224 + SetX = 5,296 + SetX = 6,344 + SetX = 7,384 + SetOpacity = 8,100 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,94 + SetOpacity = 3,100 + SetX = 7,384 + SetOpacity = 7,255 + + Play = 3,Blow5,80,100 + Play = 7,Blow5,80,100 +#------------------------------- +[Move,DOUBLESLAP,2] +Name = DoubleSlap hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,94 + SetOpacity = 3,100 + SetX = 7,384 + SetOpacity = 7,255 + + Graphic = many + Focus = Target + SetX = 0,520 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,480 + SetX = 2,424 + SetX = 3,392 + SetX = 4,224 + SetX = 5,296 + SetX = 6,344 + SetX = 7,384 + SetOpacity = 8,100 + + Play = 3,Blow5,80,100 + Play = 7,Blow5,80,100 +#------------------------------- +[Move,DOUBLESLAP,3] +Name = DoubleSlap hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetX = 0,520 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,480 + SetX = 2,424 + SetX = 3,392 + SetX = 4,224 + SetX = 5,296 + SetX = 6,344 + SetX = 7,384 + SetOpacity = 8,100 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,94 + SetOpacity = 3,100 + SetX = 7,384 + SetOpacity = 7,255 + + Play = 3,Blow5,80,100 + Play = 7,Blow5,80,100 +#------------------------------- +[Move,DOUBLESLAP,4] +Name = DoubleSlap hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,94 + SetOpacity = 3,100 + SetX = 7,384 + SetOpacity = 7,255 + + Graphic = many + Focus = Target + SetX = 0,520 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,480 + SetX = 2,424 + SetX = 3,392 + SetX = 4,224 + SetX = 5,296 + SetX = 6,344 + SetX = 7,384 + SetOpacity = 8,100 + + Play = 3,Blow5,80,100 + Play = 7,Blow5,80,100 diff --git a/PBS/Animations/Converted/Move/DRAGONBREATH.txt b/PBS/Animations/Converted/Move/DRAGONBREATH.txt new file mode 100644 index 000000000..d81ff174f --- /dev/null +++ b/PBS/Animations/Converted/Move/DRAGONBREATH.txt @@ -0,0 +1,112 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DRAGONBREATH] +Name = DRAGONBREATH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fire5 + Focus = UserAndTarget + SetX = 0,153 + SetY = 0,205 + SetVisible = 0,true + SetX = 1,204 + SetY = 1,186 + SetX = 2,256 + SetY = 2,167 + SetX = 3,307 + SetY = 3,142 + SetX = 4,339 + SetY = 4,123 + SetX = 5,358 + SetY = 5,110 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,179 + SetY = 1,198 + SetX = 2,217 + SetX = 3,288 + SetY = 3,179 + SetX = 4,300 + SetY = 4,173 + SetZoomX = 4,75 + SetZoomY = 4,75 + SetX = 5,326 + SetY = 5,167 + SetZoomX = 5,100 + SetZoomY = 5,100 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 2,true + SetX = 2,217 + SetY = 2,186 + SetFlip = 3,false + SetX = 3,268 + SetY = 3,192 + SetX = 4,281 + SetY = 4,186 + SetX = 5,307 + SetY = 5,179 + SetZoomX = 5,75 + SetZoomY = 5,75 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 2,true + SetX = 2,179 + SetY = 2,205 + SetX = 3,230 + SetY = 3,198 + SetX = 4,249 + SetY = 4,192 + SetZoomX = 4,75 + SetZoomY = 4,75 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,236 + SetY = 2,154 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,230 + SetY = 3,205 + SetZoomX = 3,100 + SetZoomY = 3,100 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 3,true + SetX = 3,345 + SetY = 3,154 + SetZoomX = 3,50 + SetZoomY = 3,50 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 3,true + SetX = 3,294 + SetY = 3,142 + SetZoomX = 3,40 + SetZoomY = 3,40 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,211 + SetY = 3,211 + SetZoomX = 3,75 + SetZoomY = 3,75 + + Play = 0,Fire4,80,100 diff --git a/PBS/Animations/Converted/Move/DRAGONCLAW.txt b/PBS/Animations/Converted/Move/DRAGONCLAW.txt new file mode 100644 index 000000000..7d2ff7bf7 --- /dev/null +++ b/PBS/Animations/Converted/Move/DRAGONCLAW.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DRAGONCLAW] +Name = DRAGONCLAW + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,360 + SetAngle = 1,25 + SetY = 2,102 + SetAngle = 2,0 + + Play = 0,Slash9,80,100 + Play = 0,Thunder4,80,100 diff --git a/PBS/Animations/Converted/Move/DRAGONDANCE.txt b/PBS/Animations/Converted/Move/DRAGONDANCE.txt new file mode 100644 index 000000000..7b153acd7 --- /dev/null +++ b/PBS/Animations/Converted/Move/DRAGONDANCE.txt @@ -0,0 +1,28 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DRAGONDANCE] +Name = DRAGONDANCE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = electric1 + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,46 + SetY = 7,94 + + Graphic = electric1 + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,94 + SetY = 7,46 + SetY = 9,94 + SetOpacity = 12,100 + + Play = 0,Twine,80,100 diff --git a/PBS/Animations/Converted/Move/DRAGONRAGE.txt b/PBS/Animations/Converted/Move/DRAGONRAGE.txt new file mode 100644 index 000000000..4dedd0b8b --- /dev/null +++ b/PBS/Animations/Converted/Move/DRAGONRAGE.txt @@ -0,0 +1,64 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DRAGONRAGE] +Name = DRAGONRAGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,179 + SetY = 1,198 + SetX = 2,217 + SetX = 3,288 + SetY = 3,179 + SetX = 4,300 + SetY = 4,173 + SetZoomX = 4,75 + SetZoomY = 4,75 + SetX = 5,326 + SetY = 5,167 + SetZoomX = 5,100 + SetZoomY = 5,100 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 2,true + SetX = 2,217 + SetY = 2,186 + SetFlip = 3,false + SetX = 3,268 + SetY = 3,192 + SetX = 4,281 + SetY = 4,186 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 3,true + SetX = 3,230 + SetY = 3,198 + + Graphic = fire5 + Focus = UserAndTarget + SetX = 0,153 + SetY = 0,205 + SetVisible = 0,true + SetX = 1,204 + SetY = 1,186 + SetX = 2,256 + SetY = 2,167 + SetX = 3,307 + SetY = 3,142 + SetX = 4,339 + SetY = 4,123 + SetX = 5,358 + SetY = 5,110 + + Play = 0,Fire6,80,100 diff --git a/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt b/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt new file mode 100644 index 000000000..49411b87e --- /dev/null +++ b/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt @@ -0,0 +1,55 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DYNAMICPUNCH] +Name = DYNAMICPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 1,389 + SetY = 1,99 + SetX = 2,386 + SetX = 3,383 + SetY = 3,107 + SetX = 4,386 + SetY = 4,99 + SetX = 5,384 + SetY = 5,108 + + Graphic = punches + Focus = Target + SetX = 0,389 + SetY = 0,98 + SetVisible = 0,true + SetX = 1,386 + SetY = 1,96 + SetX = 2,389 + SetY = 2,94 + SetX = 3,384 + SetY = 3,99 + SetZoomX = 3,150 + SetZoomY = 3,150 + SetOpacity = 3,250 + SetX = 4,386 + SetY = 4,90 + SetZoomX = 4,180 + SetZoomY = 4,180 + SetOpacity = 4,194 + SetX = 5,388 + SetY = 5,96 + SetZoomX = 5,250 + SetZoomY = 5,250 + SetOpacity = 5,120 + SetX = 7,390 + SetY = 7,99 + SetZoomX = 7,150 + SetZoomY = 7,150 + SetOpacity = 7,255 + + Play = 0,Take Down,100,104 diff --git a/PBS/Animations/Converted/Move/EMBER.txt b/PBS/Animations/Converted/Move/EMBER.txt new file mode 100644 index 000000000..00eedaf36 --- /dev/null +++ b/PBS/Animations/Converted/Move/EMBER.txt @@ -0,0 +1,48 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,EMBER] +Name = EMBER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Flames + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,144 + SetY = 1,204 + SetFlip = 2,true + SetX = 2,164 + SetY = 2,196 + SetFlip = 3,false + SetX = 3,185 + SetY = 3,180 + SetFlip = 4,true + SetX = 4,206 + SetY = 4,172 + SetFlip = 5,false + SetX = 5,227 + SetY = 5,164 + SetFlip = 6,true + SetX = 6,248 + SetY = 6,156 + SetFlip = 7,false + SetX = 7,268 + SetY = 7,148 + SetX = 8,289 + SetY = 8,132 + + Graphic = Flames + Focus = UserAndTarget + SetVisible = 0,true + SetX = 9,310 + SetY = 9,126 + SetFlip = 10,true + SetX = 10,331 + SetY = 10,116 + SetFlip = 11,false + + Play = 1,Fire2,80,100 diff --git a/PBS/Animations/Converted/Move/ENCORE.txt b/PBS/Animations/Converted/Move/ENCORE.txt new file mode 100644 index 000000000..10fd4af71 --- /dev/null +++ b/PBS/Animations/Converted/Move/ENCORE.txt @@ -0,0 +1,60 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ENCORE] +Name = ENCORE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = BABACOMETRO + Focus = UserAndTarget + SetX = 0,96 + SetY = 0,186 + SetVisible = 0,true + SetX = 1,108 + SetX = 2,121 + SetX = 3,160 + SetX = 4,96 + SetX = 5,108 + SetX = 6,140 + SetX = 7,108 + SetX = 8,166 + SetX = 9,108 + SetX = 10,121 + SetX = 11,160 + SetX = 12,96 + SetX = 13,108 + SetX = 14,140 + SetX = 15,108 + SetX = 16,89 + SetX = 17,115 + SetX = 18,147 + + Graphic = BABACOMETRO + Focus = UserAndTarget + SetX = 0,172 + SetY = 0,186 + SetVisible = 0,true + SetX = 1,160 + SetX = 2,140 + SetX = 3,108 + SetX = 4,172 + SetX = 5,160 + SetX = 6,121 + SetX = 7,160 + SetX = 8,96 + SetX = 9,153 + SetX = 10,140 + SetX = 11,108 + SetX = 12,172 + SetX = 13,160 + SetX = 14,121 + SetX = 15,160 + SetX = 16,179 + SetX = 17,160 + SetX = 18,128 + + Play = 0,Applause,80,100 diff --git a/PBS/Animations/Converted/Move/ENERGYBALL.txt b/PBS/Animations/Converted/Move/ENERGYBALL.txt new file mode 100644 index 000000000..16c08fc5c --- /dev/null +++ b/PBS/Animations/Converted/Move/ENERGYBALL.txt @@ -0,0 +1,38 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ENERGYBALL] +Name = ENERGYBALL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetX = 0,393 + SetY = 0,117 + SetZoomX = 0,80 + SetZoomY = 0,80 + SetVisible = 0,true + SetZoomX = 1,90 + SetZoomY = 1,90 + SetZoomX = 2,100 + SetZoomY = 2,100 + SetZoomX = 3,110 + SetZoomY = 3,110 + SetZoomX = 4,120 + SetZoomY = 4,120 + SetZoomX = 5,130 + SetZoomY = 5,130 + SetZoomX = 6,140 + SetZoomY = 6,140 + SetZoomX = 7,150 + SetZoomY = 7,150 + SetZoomX = 8,160 + SetZoomY = 8,160 + SetZoomX = 9,170 + SetZoomY = 9,170 + + Play = 0,Uproar,100,85 diff --git a/PBS/Animations/Converted/Move/ERUPTION.txt b/PBS/Animations/Converted/Move/ERUPTION.txt new file mode 100644 index 000000000..d9d9fbab1 --- /dev/null +++ b/PBS/Animations/Converted/Move/ERUPTION.txt @@ -0,0 +1,75 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ERUPTION] +Name = ERUPTION + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,211 + SetY = 2,167 + SetAngle = 2,30 + SetX = 3,268 + SetY = 3,142 + SetAngle = 3,15 + SetX = 4,294 + SetY = 4,123 + SetX = 5,332 + SetY = 5,110 + SetAngle = 5,10 + SetX = 6,364 + SetAngle = 6,0 + SetX = 7,262 + SetY = 7,91 + SetAngle = 7,10 + + Graphic = fire5 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,147 + SetY = 4,161 + SetAngle = 4,30 + SetX = 5,179 + SetY = 5,142 + SetAngle = 5,15 + SetX = 6,204 + SetY = 6,110 + + Graphic = fire5 + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,167 + SetAngle = 0,30 + SetVisible = 0,true + SetX = 1,198 + SetY = 1,148 + SetAngle = 1,15 + SetX = 2,236 + SetY = 2,116 + SetX = 3,268 + SetY = 3,98 + SetAngle = 3,10 + SetX = 4,313 + SetAngle = 4,0 + SetX = 5,358 + SetY = 5,110 + SetX = 6,364 + SetX = 7,377 + SetY = 7,116 + SetX = 8,326 + SetY = 8,91 + SetX = 9,358 + SetY = 9,104 + SetX = 10,371 + SetY = 10,123 + + Play = 0,Fire5,80,100 + Play = 0,Fire2,80,100 + Play = 3,Fire2,80,100 + Play = 6,Fire2,80,100 diff --git a/PBS/Animations/Converted/Move/EXPLOSION.txt b/PBS/Animations/Converted/Move/EXPLOSION.txt new file mode 100644 index 000000000..db7ed24e0 --- /dev/null +++ b/PBS/Animations/Converted/Move/EXPLOSION.txt @@ -0,0 +1,66 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,EXPLOSION] +Name = EXPLOSION + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Fire3 + Focus = Target + SetX = 0,424 + SetY = 0,46 + SetVisible = 0,true + SetOpacity = 0,50 + SetX = 2,400 + SetY = 2,142 + SetOpacity = 2,255 + SetX = 13,392 + SetY = 13,78 + SetX = 15,424 + SetY = 15,46 + SetOpacity = 15,150 + + Graphic = Fire3 + Focus = Target + SetVisible = 0,true + SetX = 2,424 + SetY = 2,46 + SetOpacity = 2,100 + SetOpacity = 3,255 + SetX = 6,392 + SetY = 6,78 + SetOpacity = 6,100 + SetOpacity = 7,255 + SetX = 13,424 + SetY = 13,46 + + Graphic = Fire3 + Focus = Target + SetVisible = 0,true + SetX = 6,424 + SetY = 6,46 + + Graphic = Fire3 + Focus = Target + SetX = 0,296 + SetY = 0,94 + SetVisible = 0,true + SetOpacity = 12,150 + SetX = 13,400 + SetY = 13,142 + SetOpacity = 13,255 + SetOpacity = 14,150 + SetX = 15,392 + SetY = 15,78 + SetOpacity = 15,255 + SetOpacity = 16,200 + SetOpacity = 17,150 + + Play = 0,Explosion3,80,100 + Play = 2,Explosion7,80,100 + Play = 5,Explosion3,80,100 + Play = 8,Explosion2,80,100 diff --git a/PBS/Animations/Converted/Move/FAKEOUT.txt b/PBS/Animations/Converted/Move/FAKEOUT.txt new file mode 100644 index 000000000..d66b1e19b --- /dev/null +++ b/PBS/Animations/Converted/Move/FAKEOUT.txt @@ -0,0 +1,41 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FAKEOUT] +Name = FAKEOUT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Fakeout + Focus = Target + SetFlip = 0,true + SetX = 0,480 + SetY = 0,102 + SetVisible = 0,true + SetX = 6,464 + SetX = 7,448 + SetX = 8,400 + SetX = 9,384 + SetX = 12,400 + SetX = 13,448 + SetX = 14,464 + SetX = 15,480 + + Graphic = Fakeout + Focus = Target + SetX = 0,288 + SetY = 0,102 + SetVisible = 0,true + SetX = 6,304 + SetX = 7,320 + SetX = 8,368 + SetX = 9,384 + SetX = 12,368 + SetX = 13,320 + SetX = 14,304 + SetX = 15,288 + + Play = 9,punch5,80,150 diff --git a/PBS/Animations/Converted/Move/FAKETEARS.txt b/PBS/Animations/Converted/Move/FAKETEARS.txt new file mode 100644 index 000000000..19aa120a0 --- /dev/null +++ b/PBS/Animations/Converted/Move/FAKETEARS.txt @@ -0,0 +1,84 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FAKETEARS] +Name = FAKETEARS + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison2 + Focus = User + SetVisible = 0,true + SetFlip = 1,true + SetX = 1,56 + SetY = 1,230 + SetX = 3,40 + SetY = 3,214 + SetX = 4,29 + SetY = 4,209 + SetX = 5,15 + SetY = 5,225 + SetFlip = 6,false + SetX = 6,240 + SetY = 6,222 + SetX = 7,7 + SetY = 7,208 + SetX = 8,-7 + SetY = 8,214 + SetX = 9,-16 + SetY = 9,227 + + Graphic = poison2 + Focus = User + SetVisible = 0,true + SetX = 2,200 + SetY = 2,222 + SetX = 4,221 + SetY = 4,217 + SetX = 5,234 + SetY = 5,216 + SetFlip = 6,true + SetX = 6,-3 + SetY = 6,203 + + Graphic = poison2 + Focus = User + SetVisible = 0,true + SetFlip = 5,true + SetX = 5,10 + SetY = 5,204 + + Graphic = poison2 + Focus = User + SetX = 0,184 + SetY = 0,238 + SetVisible = 0,true + SetX = 1,192 + SetY = 1,230 + SetFlip = 2,true + SetX = 2,48 + SetY = 2,222 + SetFlip = 3,false + SetX = 3,211 + SetY = 3,218 + SetX = 4,224 + SetY = 4,230 + SetX = 5,232 + SetY = 5,238 + SetFlip = 6,true + SetX = 6,4 + SetY = 6,233 + SetFlip = 7,false + SetX = 7,248 + SetY = 7,226 + SetX = 8,258 + SetY = 8,234 + SetX = 9,270 + SetY = 9,248 + + Play = 0,Water1,40,70 + Play = 2,Water1,40,70 + Play = 4,Water1,40,70 diff --git a/PBS/Animations/Converted/Move/FIERYDANCE.txt b/PBS/Animations/Converted/Move/FIERYDANCE.txt new file mode 100644 index 000000000..5314da5b6 --- /dev/null +++ b/PBS/Animations/Converted/Move/FIERYDANCE.txt @@ -0,0 +1,118 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FIERYDANCE] +Name = FIERYDANCE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetX = 0,419 + SetY = 0,80 + SetVisible = 0,true + SetX = 1,424 + SetY = 1,86 + SetX = 2,425 + SetY = 2,92 + SetX = 3,416 + SetY = 3,84 + SetX = 4,358 + SetY = 4,102 + SetX = 5,354 + SetY = 5,108 + SetX = 6,339 + SetY = 6,79 + SetX = 7,386 + SetY = 7,100 + SetX = 8,367 + SetY = 8,127 + SetX = 9,374 + SetY = 9,108 + SetX = 10,373 + SetY = 10,101 + SetX = 11,388 + SetY = 11,97 + SetX = 12,385 + SetY = 12,92 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,364 + SetY = 1,85 + SetX = 2,359 + SetY = 2,82 + SetX = 3,356 + SetY = 3,84 + SetX = 4,413 + SetY = 4,104 + SetX = 5,398 + SetY = 5,90 + SetX = 6,382 + SetY = 6,39 + SetX = 7,421 + SetY = 7,82 + SetX = 8,418 + SetY = 8,110 + SetX = 9,422 + SetY = 9,100 + SetX = 10,407 + SetY = 10,57 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,411 + SetY = 1,49 + SetX = 2,407 + SetY = 2,50 + SetX = 3,403 + SetY = 3,40 + SetX = 4,404 + SetY = 4,50 + SetX = 5,438 + SetY = 5,41 + SetX = 6,419 + SetY = 6,84 + SetX = 7,399 + SetY = 7,54 + SetX = 8,388 + SetY = 8,75 + SetX = 9,399 + SetY = 9,50 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 3,338 + SetY = 3,51 + SetX = 4,321 + SetY = 4,48 + SetX = 5,435 + SetY = 5,118 + SetX = 7,410 + SetY = 7,115 + SetX = 8,424 + SetY = 8,52 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,373 + SetY = 4,55 + SetX = 7,359 + SetY = 7,63 + SetX = 8,342 + SetY = 8,49 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 7,351 + SetY = 7,107 + + Play = 0,Wring Out,80,100 diff --git a/PBS/Animations/Converted/Move/FINALGAMBIT.txt b/PBS/Animations/Converted/Move/FINALGAMBIT.txt new file mode 100644 index 000000000..97898ffb8 --- /dev/null +++ b/PBS/Animations/Converted/Move/FINALGAMBIT.txt @@ -0,0 +1,57 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FINALGAMBIT] +Name = FINALGAMBIT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetX = 0,364 + SetY = 0,126 + SetVisible = 0,true + SetX = 1,362 + SetY = 1,122 + SetX = 2,391 + SetY = 2,127 + SetX = 3,396 + SetY = 3,122 + SetX = 4,367 + SetY = 4,100 + SetX = 5,388 + SetY = 5,97 + SetX = 6,387 + SetY = 6,108 + SetX = 7,356 + SetY = 7,76 + SetX = 8,405 + SetY = 8,107 + SetX = 9,404 + SetY = 9,108 + SetX = 10,377 + SetY = 10,84 + SetX = 11,386 + SetY = 11,107 + SetX = 12,411 + SetY = 12,67 + SetX = 13,414 + SetY = 13,74 + SetX = 14,400 + SetY = 14,113 + SetX = 15,387 + SetY = 15,114 + SetY = 16,137 + SetX = 17,384 + SetY = 17,136 + SetX = 18,375 + SetY = 18,76 + SetX = 19,416 + SetY = 19,89 + SetX = 20,407 + SetY = 20,108 + + Play = 0,MiningCollapse,100,100 diff --git a/PBS/Animations/Converted/Move/FIREBLAST.txt b/PBS/Animations/Converted/Move/FIREBLAST.txt new file mode 100644 index 000000000..a5dc2f575 --- /dev/null +++ b/PBS/Animations/Converted/Move/FIREBLAST.txt @@ -0,0 +1,30 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FIREBLAST] +Name = FIREBLAST + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fire blast + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + SetY = 2,95 + SetY = 3,92 + SetX = 4,383 + SetY = 4,91 + SetX = 5,384 + SetY = 5,98 + SetY = 6,94 + SetY = 7,96 + SetX = 8,382 + SetY = 8,92 + SetX = 9,385 + SetY = 9,89 + + Play = 0,Voltorb Flip Explosion,95,101 diff --git a/PBS/Animations/Converted/Move/FIREFANG.txt b/PBS/Animations/Converted/Move/FIREFANG.txt new file mode 100644 index 000000000..f2c66f643 --- /dev/null +++ b/PBS/Animations/Converted/Move/FIREFANG.txt @@ -0,0 +1,101 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FIREFANG] +Name = FIREFANG + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = element fangs + Focus = Target + SetX = 0,391 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,394 + SetY = 1,96 + SetX = 2,386 + SetY = 2,93 + SetX = 3,392 + SetY = 3,99 + SetX = 4,381 + SetY = 4,98 + SetX = 5,384 + SetY = 5,94 + SetX = 6,386 + SetY = 6,96 + SetX = 8,391 + SetY = 8,95 + SetX = 9,382 + SetY = 9,87 + SetX = 10,395 + SetY = 10,96 + SetX = 11,393 + SetY = 11,98 + SetY = 12,93 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 7,411 + SetY = 7,88 + SetY = 8,89 + SetY = 9,82 + SetX = 10,415 + SetY = 10,89 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 8,418 + SetY = 8,70 + SetX = 9,414 + SetY = 9,61 + SetX = 10,420 + SetY = 10,69 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 8,353 + SetY = 8,73 + SetX = 9,349 + SetY = 9,40 + SetX = 10,405 + SetY = 10,53 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 9,359 + SetY = 9,33 + SetX = 10,348 + SetY = 10,48 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 10,358 + SetY = 10,44 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 10,375 + SetY = 10,40 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 10,356 + SetY = 10,104 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 10,365 + SetY = 10,32 + + Play = 6,Vice Grip,100,114 diff --git a/PBS/Animations/Converted/Move/FIREPLEDGE.txt b/PBS/Animations/Converted/Move/FIREPLEDGE.txt new file mode 100644 index 000000000..c8f63d4dd --- /dev/null +++ b/PBS/Animations/Converted/Move/FIREPLEDGE.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FIREPLEDGE] +Name = FIREPLEDGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet.2 + Focus = Target + SetX = 0,388 + SetY = 0,135 + SetZoomY = 0,30 + SetVisible = 0,true + SetX = 1,387 + SetY = 1,123 + SetZoomY = 1,50 + SetY = 2,111 + SetZoomY = 2,75 + SetX = 3,386 + SetY = 3,100 + SetZoomY = 3,100 + SetX = 4,387 + SetY = 4,111 + SetZoomY = 4,75 + SetX = 5,386 + SetY = 5,100 + SetZoomY = 5,100 + SetX = 6,384 + SetY = 6,98 + SetY = 7,95 + + Play = 0,Mega Punch,100,100 diff --git a/PBS/Animations/Converted/Move/FIREPUNCH.txt b/PBS/Animations/Converted/Move/FIREPUNCH.txt new file mode 100644 index 000000000..3badeb032 --- /dev/null +++ b/PBS/Animations/Converted/Move/FIREPUNCH.txt @@ -0,0 +1,113 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FIREPUNCH] +Name = FIREPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetX = 0,387 + SetY = 0,97 + SetVisible = 0,true + SetX = 1,402 + SetY = 1,88 + SetX = 2,403 + SetY = 2,96 + SetX = 3,404 + SetY = 3,104 + SetX = 4,406 + SetY = 4,107 + SetX = 5,410 + SetY = 5,101 + SetX = 6,395 + SetY = 6,74 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 1,390 + SetY = 1,95 + SetX = 2,384 + SetY = 2,98 + SetX = 3,366 + SetY = 3,72 + SetX = 4,363 + SetY = 4,90 + SetX = 5,395 + SetY = 5,76 + SetX = 6,413 + SetY = 6,96 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 3,385 + SetY = 3,101 + SetX = 4,395 + SetY = 4,69 + SetX = 5,364 + SetY = 5,91 + SetX = 6,393 + SetY = 6,113 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 4,384 + SetY = 4,103 + SetX = 5,381 + SetY = 5,109 + SetX = 6,370 + SetY = 6,98 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 5,387 + SetY = 5,104 + SetX = 6,392 + SetY = 6,106 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 7,403 + SetY = 7,82 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 8,374 + SetY = 8,81 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 9,398 + SetY = 9,64 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 10,388 + SetY = 10,102 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 11,403 + SetY = 11,110 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 11,377 + SetY = 11,115 + + Play = 0,Slam,100,115 + Play = 1,Explosion,100,100 diff --git a/PBS/Animations/Converted/Move/FIRESPIN.txt b/PBS/Animations/Converted/Move/FIRESPIN.txt new file mode 100644 index 000000000..0170aedc9 --- /dev/null +++ b/PBS/Animations/Converted/Move/FIRESPIN.txt @@ -0,0 +1,38 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FIRESPIN] +Name = FIRESPIN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = grass2 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetVisible = 0,true + SetOpacity = 0,100 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetOpacity = 1,150 + SetY = 2,86 + SetZoomX = 2,75 + SetZoomY = 2,75 + SetOpacity = 2,200 + SetY = 3,78 + SetZoomX = 3,100 + SetZoomY = 3,100 + SetOpacity = 3,255 + SetZoomX = 10,75 + SetZoomY = 10,75 + SetOpacity = 10,150 + SetZoomX = 11,50 + SetZoomY = 11,50 + SetOpacity = 11,100 + + Play = 0,Fire5,80,100 diff --git a/PBS/Animations/Converted/Move/FLAIL.txt b/PBS/Animations/Converted/Move/FLAIL.txt new file mode 100644 index 000000000..10ff3fe80 --- /dev/null +++ b/PBS/Animations/Converted/Move/FLAIL.txt @@ -0,0 +1,63 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FLAIL] +Name = FLAIL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = UserAndTarget + SetX = 0,354 + SetY = 0,117 + SetVisible = 0,true + SetX = 1,374 + SetY = 1,111 + SetX = 2,415 + SetY = 2,116 + SetX = 3,396 + SetY = 3,106 + SetX = 4,398 + SetY = 4,104 + SetX = 5,417 + SetY = 5,123 + SetX = 6,355 + SetY = 6,127 + SetX = 7,377 + SetY = 7,105 + SetX = 8,381 + SetY = 8,119 + SetX = 9,354 + SetY = 9,138 + SetX = 10,410 + SetY = 10,124 + SetX = 11,387 + SetY = 11,108 + SetX = 12,409 + SetY = 12,121 + SetX = 13,374 + SetY = 13,122 + SetX = 14,421 + SetY = 14,113 + SetX = 15,388 + SetY = 15,91 + SetX = 16,414 + SetY = 16,133 + SetX = 17,412 + SetY = 17,122 + SetX = 18,413 + SetX = 19,371 + SetY = 19,119 + SetX = 20,379 + SetY = 20,117 + SetX = 21,406 + SetY = 21,104 + SetX = 22,403 + SetY = 22,96 + SetX = 23,405 + SetY = 23,95 + + Play = 0,Flail,100,100 diff --git a/PBS/Animations/Converted/Move/FLAMEBURST.txt b/PBS/Animations/Converted/Move/FLAMEBURST.txt new file mode 100644 index 000000000..07c1373c7 --- /dev/null +++ b/PBS/Animations/Converted/Move/FLAMEBURST.txt @@ -0,0 +1,249 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FLAMEBURST] +Name = FLAMEBURST + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Flames + Focus = Target + SetX = 0,385 + SetY = 0,101 + SetVisible = 0,true + SetY = 1,98 + SetX = 2,375 + SetY = 2,109 + SetX = 3,374 + SetY = 3,116 + SetX = 4,377 + SetY = 4,126 + SetX = 5,357 + SetY = 5,121 + SetX = 6,346 + SetY = 6,132 + SetX = 7,354 + SetY = 7,131 + SetX = 8,359 + SetY = 8,124 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,400 + SetY = 1,114 + SetX = 2,365 + SetY = 2,90 + SetX = 3,396 + SetY = 3,122 + SetX = 4,368 + SetY = 4,104 + SetX = 5,356 + SetX = 6,347 + SetY = 6,115 + SetX = 7,344 + SetY = 7,111 + SetX = 8,354 + SetY = 8,106 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,371 + SetY = 1,110 + SetX = 2,397 + SetY = 2,111 + SetX = 3,391 + SetY = 3,104 + SetX = 4,384 + SetY = 4,108 + SetX = 5,377 + SetY = 5,130 + SetX = 6,343 + SetY = 6,95 + SetX = 7,356 + SetY = 7,93 + SetX = 8,380 + SetY = 8,130 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 2,389 + SetY = 2,94 + SetX = 3,367 + SetX = 4,399 + SetY = 4,119 + SetX = 5,379 + SetY = 5,114 + SetX = 6,352 + SetY = 6,76 + SetX = 7,372 + SetY = 7,111 + SetX = 8,383 + SetY = 8,108 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,399 + SetY = 3,83 + SetX = 4,382 + SetY = 4,89 + SetX = 5,375 + SetY = 5,95 + SetX = 6,367 + SetY = 6,91 + SetX = 7,377 + SetY = 7,95 + SetX = 8,373 + SetY = 8,99 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,410 + SetY = 3,111 + SetX = 4,400 + SetY = 4,92 + SetX = 5,356 + SetY = 5,84 + SetX = 6,367 + SetY = 6,114 + SetX = 7,382 + SetY = 7,130 + SetX = 8,353 + SetY = 8,87 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,380 + SetY = 3,78 + SetX = 4,358 + SetY = 4,90 + SetX = 5,386 + SetY = 5,81 + SetX = 6,371 + SetY = 6,136 + SetX = 7,396 + SetY = 7,109 + SetX = 8,369 + SetY = 8,82 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,369 + SetY = 4,77 + SetX = 5,372 + SetY = 5,73 + SetX = 6,392 + SetY = 6,137 + SetX = 7,399 + SetY = 7,84 + SetX = 8,388 + SetY = 8,87 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,394 + SetY = 4,77 + SetX = 5,400 + SetY = 5,99 + SetX = 6,397 + SetY = 6,123 + SetX = 7,384 + SetY = 7,74 + SetX = 8,402 + SetY = 8,107 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,413 + SetY = 4,107 + SetX = 5,400 + SetY = 5,125 + SetX = 6,394 + SetY = 6,100 + SetX = 7,363 + SetY = 7,73 + SetX = 8,412 + SetY = 8,133 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 5,414 + SetY = 5,114 + SetX = 6,413 + SetY = 6,108 + SetX = 7,406 + SetY = 7,136 + SetX = 8,420 + SetY = 8,93 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 5,420 + SetY = 5,92 + SetX = 6,388 + SetY = 6,77 + SetX = 7,382 + SetY = 7,146 + SetX = 8,409 + SetY = 8,87 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 5,405 + SetY = 5,82 + SetX = 6,367 + SetY = 6,76 + SetX = 7,343 + SetY = 7,79 + SetX = 8,396 + SetY = 8,66 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 6,422 + SetY = 6,130 + SetX = 7,377 + SetY = 7,60 + SetX = 8,373 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 6,344 + SetY = 6,76 + SetX = 7,354 + SetY = 7,66 + SetX = 8,352 + SetY = 8,74 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 7,405 + SetY = 7,61 + SetX = 8,431 + SetY = 8,116 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 7,391 + SetY = 7,49 + + Play = 0,Voltorb Flip Explosion,100,110 + Play = 4,Voltorb Flip Explosion,100,110 diff --git a/PBS/Animations/Converted/Move/FLAMECHARGE.txt b/PBS/Animations/Converted/Move/FLAMECHARGE.txt new file mode 100644 index 000000000..a200b1edb --- /dev/null +++ b/PBS/Animations/Converted/Move/FLAMECHARGE.txt @@ -0,0 +1,74 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FLAMECHARGE] +Name = FLAMECHARGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Flames + Focus = Target + SetX = 0,356 + SetY = 0,113 + SetVisible = 0,true + + Graphic = Flames + Focus = Target + SetX = 0,371 + SetY = 0,121 + SetVisible = 0,true + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,390 + SetY = 1,124 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 2,408 + SetY = 2,112 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,405 + SetY = 3,90 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,393 + SetY = 4,76 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 5,378 + SetY = 5,73 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 6,360 + SetY = 6,76 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 7,357 + SetY = 7,95 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 8,382 + SetY = 8,104 + SetX = 9,381 + SetY = 9,99 + + Play = 0,Work Up,100,116 diff --git a/PBS/Animations/Converted/Move/FLAMETHROWER.txt b/PBS/Animations/Converted/Move/FLAMETHROWER.txt new file mode 100644 index 000000000..4910a4465 --- /dev/null +++ b/PBS/Animations/Converted/Move/FLAMETHROWER.txt @@ -0,0 +1,305 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FLAMETHROWER] +Name = FLAMETHROWER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Flames + Focus = Target + SetX = 0,165 + SetY = 0,215 + SetVisible = 0,true + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,183 + SetY = 1,207 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 2,197 + SetY = 2,193 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,223 + SetY = 3,175 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,255 + SetY = 4,153 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 5,285 + SetY = 5,126 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 6,315 + SetY = 6,104 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 7,352 + SetY = 7,84 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 8,379 + SetY = 8,72 + + Play = 0,Whirlwind,100,121 +#------------------------------- +[OppMove,FLAMETHROWER] +Name = FLAMETHROWER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Flames + Focus = Target + SetX = 0,381 + SetY = 0,98 + SetVisible = 0,true + SetX = 1,384 + SetX = 2,383 + SetY = 2,95 + SetX = 3,386 + SetY = 3,94 + SetX = 4,385 + SetY = 4,99 + SetX = 5,387 + SetY = 5,101 + SetX = 6,385 + SetY = 6,99 + SetX = 7,386 + SetY = 7,103 + SetX = 8,388 + SetY = 8,100 + SetX = 9,386 + SetY = 9,94 + SetX = 10,384 + SetY = 10,87 + SetX = 11,148 + SetY = 11,218 + SetX = 12,135 + SetY = 12,214 + SetX = 13,139 + SetY = 13,216 + SetX = 14,134 + SetY = 14,220 + SetX = 15,131 + SetY = 15,215 + SetX = 16,138 + SetY = 16,216 + SetX = 17,129 + SetY = 17,215 + SetX = 18,131 + SetY = 18,218 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,361 + SetY = 1,105 + SetX = 2,362 + SetY = 2,103 + SetY = 3,102 + SetX = 4,367 + SetY = 4,107 + SetY = 5,110 + SetX = 6,366 + SetY = 6,106 + SetX = 7,363 + SetX = 8,368 + SetY = 8,108 + SetX = 9,362 + SetY = 9,109 + SetX = 10,358 + SetY = 10,98 + SetX = 11,176 + SetY = 11,190 + SetX = 12,162 + SetY = 12,192 + SetX = 13,173 + SetX = 14,167 + SetY = 14,193 + SetX = 15,158 + SetY = 15,195 + SetX = 16,193 + SetY = 16,188 + SetX = 17,174 + SetY = 17,183 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 2,342 + SetY = 2,112 + SetX = 3,339 + SetX = 4,347 + SetY = 4,111 + SetX = 5,348 + SetY = 5,114 + SetX = 6,343 + SetY = 6,109 + SetX = 7,337 + SetY = 7,114 + SetX = 8,350 + SetY = 8,108 + SetX = 9,335 + SetY = 9,111 + SetX = 10,331 + SetY = 10,108 + SetX = 11,205 + SetY = 11,170 + SetX = 12,196 + SetY = 12,169 + SetX = 13,207 + SetY = 13,160 + SetX = 14,199 + SetY = 14,166 + SetX = 15,189 + SetY = 15,178 + SetX = 16,234 + SetY = 16,158 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,313 + SetY = 3,120 + SetX = 4,323 + SetY = 4,128 + SetX = 5,325 + SetY = 5,119 + SetX = 6,320 + SetY = 6,123 + SetX = 7,311 + SetY = 7,122 + SetX = 8,324 + SetX = 9,299 + SetY = 9,118 + SetX = 10,306 + SetY = 10,116 + SetX = 11,237 + SetY = 11,143 + SetX = 12,238 + SetY = 12,147 + SetX = 13,242 + SetY = 13,143 + SetX = 14,238 + SetY = 14,141 + SetX = 15,229 + SetY = 15,155 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,299 + SetY = 4,137 + SetX = 5,296 + SetY = 5,127 + SetY = 6,133 + SetX = 7,278 + SetY = 7,132 + SetX = 8,289 + SetY = 8,128 + SetX = 9,266 + SetY = 9,125 + SetX = 10,272 + SetY = 10,130 + SetX = 11,269 + SetY = 11,122 + SetX = 12,275 + SetY = 12,128 + SetX = 13,274 + SetY = 13,127 + SetX = 14,278 + SetY = 14,124 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 5,267 + SetY = 5,134 + SetY = 6,143 + SetX = 7,247 + SetY = 7,139 + SetX = 8,255 + SetY = 8,137 + SetX = 9,230 + SetY = 9,134 + SetX = 10,237 + SetY = 10,149 + SetX = 11,304 + SetY = 11,110 + SetX = 12,311 + SetX = 13,310 + SetY = 13,115 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 6,238 + SetY = 6,152 + SetX = 7,215 + SetY = 7,147 + SetX = 8,220 + SetY = 8,146 + SetX = 9,196 + SetY = 9,150 + SetX = 10,209 + SetY = 10,174 + SetX = 11,332 + SetY = 11,94 + SetX = 12,349 + SetY = 12,92 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 8,189 + SetY = 8,164 + SetX = 9,165 + SetY = 9,163 + SetX = 10,173 + SetY = 10,190 + SetX = 11,360 + SetY = 11,87 + SetX = 12,381 + SetY = 12,81 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 9,136 + SetY = 9,194 + SetX = 10,143 + SetY = 10,205 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 10,122 + SetY = 10,227 + + Play = 0,Whirlwind,100,121 diff --git a/PBS/Animations/Converted/Move/FLAMEWHEEL.txt b/PBS/Animations/Converted/Move/FLAMEWHEEL.txt new file mode 100644 index 000000000..646bd7a5f --- /dev/null +++ b/PBS/Animations/Converted/Move/FLAMEWHEEL.txt @@ -0,0 +1,252 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FLAMEWHEEL] +Name = FLAMEWHEEL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = UserAndTarget + SetX = 0,156 + SetY = 0,171 + SetVisible = 0,true + SetX = 8,398 + SetY = 8,100 + SetX = 9,396 + SetY = 9,91 + SetX = 10,397 + SetY = 10,99 + + Graphic = punches + Focus = UserAndTarget + SetX = 0,186 + SetY = 0,191 + SetVisible = 0,true + SetX = 10,423 + SetY = 10,124 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,193 + SetY = 1,230 + SetX = 7,191 + SetY = 7,222 + SetX = 10,364 + SetY = 10,76 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,162 + SetY = 2,256 + SetX = 11,378 + SetY = 11,128 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,254 + SetX = 11,423 + SetY = 11,51 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,113 + SetY = 4,228 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,116 + SetY = 5,191 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,130 + SetY = 6,172 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,159 + SetY = 7,165 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,187 + SetY = 7,185 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,188 + SetY = 7,222 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,168 + SetY = 7,246 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,143 + SetY = 7,250 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,121 + SetY = 7,241 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,109 + SetY = 7,217 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,112 + SetY = 7,192 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,125 + SetY = 7,172 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,174 + SetY = 7,172 + + Play = 0,Trump Card,100,110 +#------------------------------- +[OppMove,FLAMEWHEEL] +Name = FLAMEWHEEL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = UserAndTarget + SetX = 0,397 + SetY = 0,63 + SetVisible = 0,true + SetX = 8,139 + SetY = 8,227 + SetX = 9,133 + SetY = 9,216 + SetX = 10,141 + SetY = 10,217 + SetX = 11,138 + SetY = 11,223 + + Graphic = punches + Focus = UserAndTarget + SetX = 0,417 + SetY = 0,75 + SetVisible = 0,true + SetX = 10,176 + SetY = 10,187 + SetX = 11,163 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,422 + SetY = 1,102 + SetX = 10,119 + SetY = 10,234 + SetX = 11,117 + SetY = 11,244 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,407 + SetY = 2,120 + SetX = 11,110 + SetY = 11,200 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,380 + SetY = 3,110 + SetX = 4,377 + SetY = 4,112 + SetX = 11,172 + SetY = 11,239 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,366 + SetY = 4,92 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,376 + SetY = 5,71 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,388 + SetY = 6,62 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,408 + SetY = 6,71 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,422 + SetY = 6,95 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,406 + SetY = 6,113 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,384 + SetY = 7,108 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,374 + SetY = 7,86 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,379 + SetY = 7,70 + + Play = 0,Trump Card,100,110 diff --git a/PBS/Animations/Converted/Move/FLASH.txt b/PBS/Animations/Converted/Move/FLASH.txt new file mode 100644 index 000000000..3ab0a9ecd --- /dev/null +++ b/PBS/Animations/Converted/Move/FLASH.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FLASH] +Name = FLASH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Light1 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Saint7,80,100 diff --git a/PBS/Animations/Converted/Move/FLY.txt b/PBS/Animations/Converted/Move/FLY.txt new file mode 100644 index 000000000..dd7d49560 --- /dev/null +++ b/PBS/Animations/Converted/Move/FLY.txt @@ -0,0 +1,62 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FLY] +Name = FLY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetX = 0,281 + SetY = 0,-22 + SetAngle = 0,207 + SetVisible = 0,true + SetX = 1,312 + SetY = 1,26 + SetX = 2,335 + SetY = 2,61 + SetX = 3,356 + SetY = 3,87 + SetX = 4,379 + SetY = 4,118 + SetX = 5,424 + SetY = 5,184 + SetX = 6,401 + SetY = 6,154 + + Play = 0,Take Down,80,110 +#------------------------------- +[Move,FLY,1] +Name = Fly charging + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = User + SetX = 0,134 + SetY = 0,260 + SetVisible = 0,true + SetX = 1,138 + SetY = 1,247 + SetX = 2,136 + SetY = 2,258 + SetX = 3,132 + SetY = 3,238 + SetX = 4,131 + SetY = 4,233 + SetX = 5,142 + SetY = 5,225 + SetX = 6,136 + SetY = 6,194 + SetX = 7,134 + SetY = 7,166 + + Play = 0,Trump Card,100,100 diff --git a/PBS/Animations/Converted/Move/FOCUSENERGY.txt b/PBS/Animations/Converted/Move/FOCUSENERGY.txt new file mode 100644 index 000000000..97b830814 --- /dev/null +++ b/PBS/Animations/Converted/Move/FOCUSENERGY.txt @@ -0,0 +1,26 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FOCUSENERGY] +Name = FOCUSENERGY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Fire3 + Focus = User + SetVisible = 0,true + SetX = 4,144 + SetY = 4,222 + + Graphic = Fire3 + Focus = User + SetX = 0,144 + SetY = 0,222 + SetVisible = 0,true + + Play = 0,Up,80,100 + Play = 3,Up,80,100 + Play = 6,Up,80,100 diff --git a/PBS/Animations/Converted/Move/FOLLOWME.txt b/PBS/Animations/Converted/Move/FOLLOWME.txt new file mode 100644 index 000000000..0d6cf5391 --- /dev/null +++ b/PBS/Animations/Converted/Move/FOLLOWME.txt @@ -0,0 +1,90 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FOLLOWME] +Name = FOLLOWME + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetX = 0,386 + SetY = 0,97 + SetVisible = 0,true + SetX = 1,377 + SetY = 1,112 + SetX = 2,359 + SetY = 2,137 + SetX = 3,336 + SetY = 3,169 + SetX = 4,299 + SetY = 4,190 + SetX = 5,274 + SetY = 5,218 + SetX = 6,279 + SetY = 6,214 + SetOpacity = 6,53 + SetX = 7,244 + SetY = 7,238 + SetOpacity = 7,255 + SetX = 8,219 + SetX = 9,179 + SetY = 9,235 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 6,267 + SetY = 6,216 + + Play = 0,Follow Me,85,102 +#------------------------------- +[OppMove,FOLLOWME] +Name = FOLLOWME + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetVisible = 0,true + SetX = 5,282 + SetY = 5,206 + + Graphic = finger.spoon + Focus = Target + SetX = 0,191 + SetY = 0,221 + SetVisible = 0,true + SetX = 1,212 + SetY = 1,218 + SetX = 2,230 + SetY = 2,212 + SetX = 3,249 + SetY = 3,214 + SetX = 4,261 + SetY = 4,213 + SetX = 5,270 + SetY = 5,204 + SetOpacity = 5,78 + SetX = 6,301 + SetY = 6,196 + SetOpacity = 6,255 + SetX = 7,311 + SetY = 7,181 + SetX = 8,331 + SetY = 8,154 + SetX = 9,349 + SetY = 9,142 + SetX = 10,372 + SetY = 10,125 + SetX = 11,388 + SetY = 11,111 + + Play = 0,Follow Me,80,100 diff --git a/PBS/Animations/Converted/Move/FORESIGHT.txt b/PBS/Animations/Converted/Move/FORESIGHT.txt new file mode 100644 index 000000000..81d8a9353 --- /dev/null +++ b/PBS/Animations/Converted/Move/FORESIGHT.txt @@ -0,0 +1,41 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FORESIGHT] +Name = FORESIGHT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetX = 0,272 + SetY = 0,22 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetVisible = 0,true + SetOpacity = 0,150 + SetX = 1,304 + SetY = 1,54 + SetOpacity = 1,255 + SetX = 2,344 + SetY = 2,94 + SetX = 3,384 + SetY = 3,134 + SetX = 4,424 + SetY = 4,118 + SetX = 5,456 + SetY = 5,86 + SetX = 6,464 + SetY = 6,46 + SetX = 7,440 + SetY = 7,30 + SetX = 8,392 + SetY = 8,14 + SetX = 9,336 + SetY = 9,6 + SetX = 10,320 + SetY = 10,46 + SetY = 11,86 diff --git a/PBS/Animations/Converted/Move/FRENZYPLANT.txt b/PBS/Animations/Converted/Move/FRENZYPLANT.txt new file mode 100644 index 000000000..002ace82e --- /dev/null +++ b/PBS/Animations/Converted/Move/FRENZYPLANT.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FRENZYPLANT] +Name = FRENZYPLANT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = grass2 + Focus = UserAndTarget + SetX = 0,172 + SetY = 0,192 + SetVisible = 0,true + SetX = 1,192 + SetY = 1,186 + SetX = 2,217 + SetY = 2,173 + SetX = 3,256 + SetY = 3,161 + SetX = 4,281 + SetY = 4,142 + SetX = 5,313 + SetY = 5,123 + SetX = 6,332 + SetY = 6,116 + SetX = 7,384 + SetY = 11,110 + SetY = 12,104 + SetY = 13,98 + SetOpacity = 16,100 + + Play = 0,Earth4,80,100 + Play = 8,Earth5,80,100 diff --git a/PBS/Animations/Converted/Move/FURYATTACK.txt b/PBS/Animations/Converted/Move/FURYATTACK.txt new file mode 100644 index 000000000..62ef374fc --- /dev/null +++ b/PBS/Animations/Converted/Move/FURYATTACK.txt @@ -0,0 +1,356 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FURYATTACK] +Name = FURYATTACK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,129 + SetX = 3,358 + SetY = 3,110 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetX = 4,199 + SetY = 4,200 + SetX = 5,264 + SetY = 5,146 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[Move,FURYATTACK,1] +Name = Fury Attack hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetX = 4,199 + SetY = 4,200 + SetX = 5,264 + SetY = 5,146 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,129 + SetX = 3,358 + SetY = 3,110 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[Move,FURYATTACK,2] +Name = Fury Attack hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,129 + SetX = 3,358 + SetY = 3,110 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetX = 4,199 + SetY = 4,200 + SetX = 5,264 + SetY = 5,146 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[Move,FURYATTACK,3] +Name = Fury Attack hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetX = 4,199 + SetY = 4,200 + SetX = 5,264 + SetY = 5,146 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,129 + SetX = 3,358 + SetY = 3,110 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[Move,FURYATTACK,4] +Name = Fury Attack hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,129 + SetX = 3,358 + SetY = 3,110 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetX = 4,199 + SetY = 4,200 + SetX = 5,264 + SetY = 5,146 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[OppMove,FURYATTACK] +Name = FURYATTACK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,332 + SetY = 3,127 + SetAngle = 3,180 + SetX = 4,283 + SetY = 4,158 + SetX = 5,220 + SetY = 5,197 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,338 + SetY = 0,128 + SetAngle = 0,180 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,155 + SetX = 2,213 + SetY = 2,203 + SetX = 3,129 + SetY = 3,242 + SetAngle = 3,0 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[OppMove,FURYATTACK,1] +Name = Fury Attack hit 2 opp + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,338 + SetY = 0,128 + SetAngle = 0,180 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,155 + SetX = 2,213 + SetY = 2,203 + SetX = 3,129 + SetY = 3,242 + SetAngle = 3,0 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,332 + SetY = 3,127 + SetAngle = 3,180 + SetX = 4,283 + SetY = 4,158 + SetX = 5,220 + SetY = 5,197 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[OppMove,FURYATTACK,2] +Name = Fury Attack hit 3 opp + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,332 + SetY = 3,127 + SetAngle = 3,180 + SetX = 4,283 + SetY = 4,158 + SetX = 5,220 + SetY = 5,197 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,338 + SetY = 0,128 + SetAngle = 0,180 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,155 + SetX = 2,213 + SetY = 2,203 + SetX = 3,129 + SetY = 3,242 + SetAngle = 3,0 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[OppMove,FURYATTACK,3] +Name = Fury Attack hit 4 opp + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,338 + SetY = 0,128 + SetAngle = 0,180 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,155 + SetX = 2,213 + SetY = 2,203 + SetX = 3,129 + SetY = 3,242 + SetAngle = 3,0 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,332 + SetY = 3,127 + SetAngle = 3,180 + SetX = 4,283 + SetY = 4,158 + SetX = 5,220 + SetY = 5,197 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 +#------------------------------- +[OppMove,FURYATTACK,4] +Name = Fury Attack hit 5 opp + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,332 + SetY = 3,127 + SetAngle = 3,180 + SetX = 4,283 + SetY = 4,158 + SetX = 5,220 + SetY = 5,197 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,338 + SetY = 0,128 + SetAngle = 0,180 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,155 + SetX = 2,213 + SetY = 2,203 + SetX = 3,129 + SetY = 3,242 + SetAngle = 3,0 + + Play = 3,normaldamage,80,100 + Play = 5,normaldamage,80,100 diff --git a/PBS/Animations/Converted/Move/FURYCUTTER.txt b/PBS/Animations/Converted/Move/FURYCUTTER.txt new file mode 100644 index 000000000..a297b365d --- /dev/null +++ b/PBS/Animations/Converted/Move/FURYCUTTER.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FURYCUTTER] +Name = FURYCUTTER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Sword6 + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetVisible = 0,true + + Play = 0,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/FURYSWIPES.txt b/PBS/Animations/Converted/Move/FURYSWIPES.txt new file mode 100644 index 000000000..cdaa5b755 --- /dev/null +++ b/PBS/Animations/Converted/Move/FURYSWIPES.txt @@ -0,0 +1,716 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FURYSWIPES] +Name = FURYSWIPES + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetX = 0,437 + SetY = 0,65 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,424 + SetY = 1,81 + SetOpacity = 1,255 + SetX = 2,416 + SetY = 2,97 + SetX = 3,408 + SetY = 3,113 + SetToneRed = 4,-128 + SetToneGreen = 4,-128 + SetToneBlue = 4,-128 + SetX = 5,409 + SetOpacity = 5,128 + SetX = 8,362 + SetY = 8,138 + SetOpacity = 8,255 + SetToneRed = 8,0 + SetToneGreen = 8,0 + SetToneBlue = 8,0 + SetX = 9,308 + SetY = 9,144 + SetX = 10,275 + SetY = 10,178 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 2,397 + SetY = 2,125 + SetX = 3,371 + SetY = 3,137 + SetX = 4,432 + SetY = 4,158 + SetFlip = 5,true + SetX = 5,320 + SetY = 5,72 + SetOpacity = 5,128 + SetX = 6,336 + SetY = 6,88 + SetOpacity = 6,255 + SetX = 7,352 + SetY = 7,104 + SetX = 8,360 + SetY = 8,112 + SetToneRed = 9,-128 + SetToneGreen = 9,-128 + SetToneBlue = 9,-128 + SetOpacity = 10,128 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 3,403 + SetY = 3,138 + SetX = 4,366 + SetY = 4,157 + SetX = 5,362 + SetY = 5,227 + SetX = 7,370 + SetY = 7,128 + SetX = 8,393 + SetY = 8,133 + SetX = 9,367 + SetY = 9,184 + SetX = 10,374 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,332 + SetY = 4,127 + SetX = 5,474 + SetY = 5,228 + SetX = 9,421 + SetY = 9,184 + SetX = 10,292 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,439 + SetY = 4,134 + SetX = 5,507 + SetY = 5,96 + SetX = 9,445 + SetY = 9,109 + SetX = 10,430 + SetY = 10,206 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,267 + SetY = 5,180 + SetX = 10,459 + SetY = 10,164 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,337 + SetY = 5,191 + SetX = 10,480 + SetY = 10,89 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,399 + SetY = 5,177 + SetX = 10,331 + SetY = 10,188 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,457 + SetY = 5,180 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,483 + SetY = 5,143 + + Play = 0,Fury Swipes,100,100 +#------------------------------- +[Move,FURYSWIPES,1] +Name = Fury Swipes hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetX = 0,437 + SetY = 0,65 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,424 + SetY = 1,81 + SetOpacity = 1,255 + SetX = 2,416 + SetY = 2,97 + SetX = 3,408 + SetY = 3,113 + SetToneRed = 4,-128 + SetToneGreen = 4,-128 + SetToneBlue = 4,-128 + SetX = 5,409 + SetOpacity = 5,128 + SetX = 8,362 + SetY = 8,138 + SetOpacity = 8,255 + SetToneRed = 8,0 + SetToneGreen = 8,0 + SetToneBlue = 8,0 + SetX = 9,308 + SetY = 9,144 + SetX = 10,275 + SetY = 10,178 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 2,397 + SetY = 2,125 + SetX = 3,371 + SetY = 3,137 + SetX = 4,432 + SetY = 4,158 + SetFlip = 5,true + SetX = 5,320 + SetY = 5,72 + SetOpacity = 5,128 + SetX = 6,336 + SetY = 6,88 + SetOpacity = 6,255 + SetX = 7,352 + SetY = 7,104 + SetX = 8,360 + SetY = 8,112 + SetToneRed = 9,-128 + SetToneGreen = 9,-128 + SetToneBlue = 9,-128 + SetOpacity = 10,128 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 3,403 + SetY = 3,138 + SetX = 4,366 + SetY = 4,157 + SetX = 5,362 + SetY = 5,227 + SetX = 7,370 + SetY = 7,128 + SetX = 8,393 + SetY = 8,133 + SetX = 9,367 + SetY = 9,184 + SetX = 10,374 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,332 + SetY = 4,127 + SetX = 5,474 + SetY = 5,228 + SetX = 9,421 + SetY = 9,184 + SetX = 10,292 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,439 + SetY = 4,134 + SetX = 5,507 + SetY = 5,96 + SetX = 9,445 + SetY = 9,109 + SetX = 10,430 + SetY = 10,206 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,267 + SetY = 5,180 + SetX = 10,459 + SetY = 10,164 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,337 + SetY = 5,191 + SetX = 10,480 + SetY = 10,89 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,399 + SetY = 5,177 + SetX = 10,331 + SetY = 10,188 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,457 + SetY = 5,180 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,483 + SetY = 5,143 + + Play = 0,Fury Swipes,100,100 +#------------------------------- +[Move,FURYSWIPES,2] +Name = Fury Swipes hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetX = 0,437 + SetY = 0,65 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,424 + SetY = 1,81 + SetOpacity = 1,255 + SetX = 2,416 + SetY = 2,97 + SetX = 3,408 + SetY = 3,113 + SetToneRed = 4,-128 + SetToneGreen = 4,-128 + SetToneBlue = 4,-128 + SetX = 5,409 + SetOpacity = 5,128 + SetX = 8,362 + SetY = 8,138 + SetOpacity = 8,255 + SetToneRed = 8,0 + SetToneGreen = 8,0 + SetToneBlue = 8,0 + SetX = 9,308 + SetY = 9,144 + SetX = 10,275 + SetY = 10,178 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 2,397 + SetY = 2,125 + SetX = 3,371 + SetY = 3,137 + SetX = 4,432 + SetY = 4,158 + SetFlip = 5,true + SetX = 5,320 + SetY = 5,72 + SetOpacity = 5,128 + SetX = 6,336 + SetY = 6,88 + SetOpacity = 6,255 + SetX = 7,352 + SetY = 7,104 + SetX = 8,360 + SetY = 8,112 + SetToneRed = 9,-128 + SetToneGreen = 9,-128 + SetToneBlue = 9,-128 + SetOpacity = 10,128 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 3,403 + SetY = 3,138 + SetX = 4,366 + SetY = 4,157 + SetX = 5,362 + SetY = 5,227 + SetX = 7,370 + SetY = 7,128 + SetX = 8,393 + SetY = 8,133 + SetX = 9,367 + SetY = 9,184 + SetX = 10,374 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,332 + SetY = 4,127 + SetX = 5,474 + SetY = 5,228 + SetX = 9,421 + SetY = 9,184 + SetX = 10,292 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,439 + SetY = 4,134 + SetX = 5,507 + SetY = 5,96 + SetX = 9,445 + SetY = 9,109 + SetX = 10,430 + SetY = 10,206 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,267 + SetY = 5,180 + SetX = 10,459 + SetY = 10,164 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,337 + SetY = 5,191 + SetX = 10,480 + SetY = 10,89 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,399 + SetY = 5,177 + SetX = 10,331 + SetY = 10,188 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,457 + SetY = 5,180 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,483 + SetY = 5,143 + + Play = 0,Fury Swipes,100,100 +#------------------------------- +[Move,FURYSWIPES,3] +Name = Fury Swipes hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetX = 0,437 + SetY = 0,65 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,424 + SetY = 1,81 + SetOpacity = 1,255 + SetX = 2,416 + SetY = 2,97 + SetX = 3,408 + SetY = 3,113 + SetToneRed = 4,-128 + SetToneGreen = 4,-128 + SetToneBlue = 4,-128 + SetX = 5,409 + SetOpacity = 5,128 + SetX = 8,362 + SetY = 8,138 + SetOpacity = 8,255 + SetToneRed = 8,0 + SetToneGreen = 8,0 + SetToneBlue = 8,0 + SetX = 9,308 + SetY = 9,144 + SetX = 10,275 + SetY = 10,178 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 2,397 + SetY = 2,125 + SetX = 3,371 + SetY = 3,137 + SetX = 4,432 + SetY = 4,158 + SetFlip = 5,true + SetX = 5,320 + SetY = 5,72 + SetOpacity = 5,128 + SetX = 6,336 + SetY = 6,88 + SetOpacity = 6,255 + SetX = 7,352 + SetY = 7,104 + SetX = 8,360 + SetY = 8,112 + SetToneRed = 9,-128 + SetToneGreen = 9,-128 + SetToneBlue = 9,-128 + SetOpacity = 10,128 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 3,403 + SetY = 3,138 + SetX = 4,366 + SetY = 4,157 + SetX = 5,362 + SetY = 5,227 + SetX = 7,370 + SetY = 7,128 + SetX = 8,393 + SetY = 8,133 + SetX = 9,367 + SetY = 9,184 + SetX = 10,374 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,332 + SetY = 4,127 + SetX = 5,474 + SetY = 5,228 + SetX = 9,421 + SetY = 9,184 + SetX = 10,292 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,439 + SetY = 4,134 + SetX = 5,507 + SetY = 5,96 + SetX = 9,445 + SetY = 9,109 + SetX = 10,430 + SetY = 10,206 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,267 + SetY = 5,180 + SetX = 10,459 + SetY = 10,164 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,337 + SetY = 5,191 + SetX = 10,480 + SetY = 10,89 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,399 + SetY = 5,177 + SetX = 10,331 + SetY = 10,188 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,457 + SetY = 5,180 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,483 + SetY = 5,143 + + Play = 0,Fury Swipes,100,100 +#------------------------------- +[Move,FURYSWIPES,4] +Name = Fury Swipes hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetX = 0,437 + SetY = 0,65 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,424 + SetY = 1,81 + SetOpacity = 1,255 + SetX = 2,416 + SetY = 2,97 + SetX = 3,408 + SetY = 3,113 + SetToneRed = 4,-128 + SetToneGreen = 4,-128 + SetToneBlue = 4,-128 + SetX = 5,409 + SetOpacity = 5,128 + SetX = 8,362 + SetY = 8,138 + SetOpacity = 8,255 + SetToneRed = 8,0 + SetToneGreen = 8,0 + SetToneBlue = 8,0 + SetX = 9,308 + SetY = 9,144 + SetX = 10,275 + SetY = 10,178 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 2,397 + SetY = 2,125 + SetX = 3,371 + SetY = 3,137 + SetX = 4,432 + SetY = 4,158 + SetFlip = 5,true + SetX = 5,320 + SetY = 5,72 + SetOpacity = 5,128 + SetX = 6,336 + SetY = 6,88 + SetOpacity = 6,255 + SetX = 7,352 + SetY = 7,104 + SetX = 8,360 + SetY = 8,112 + SetToneRed = 9,-128 + SetToneGreen = 9,-128 + SetToneBlue = 9,-128 + SetOpacity = 10,128 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 3,403 + SetY = 3,138 + SetX = 4,366 + SetY = 4,157 + SetX = 5,362 + SetY = 5,227 + SetX = 7,370 + SetY = 7,128 + SetX = 8,393 + SetY = 8,133 + SetX = 9,367 + SetY = 9,184 + SetX = 10,374 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,332 + SetY = 4,127 + SetX = 5,474 + SetY = 5,228 + SetX = 9,421 + SetY = 9,184 + SetX = 10,292 + SetY = 10,215 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 4,439 + SetY = 4,134 + SetX = 5,507 + SetY = 5,96 + SetX = 9,445 + SetY = 9,109 + SetX = 10,430 + SetY = 10,206 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,267 + SetY = 5,180 + SetX = 10,459 + SetY = 10,164 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,337 + SetY = 5,191 + SetX = 10,480 + SetY = 10,89 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,399 + SetY = 5,177 + SetX = 10,331 + SetY = 10,188 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,457 + SetY = 5,180 + + Graphic = Scratch + Shadow Claw + Focus = Target + SetVisible = 0,true + SetX = 5,483 + SetY = 5,143 + + Play = 0,Fury Swipes,100,100 diff --git a/PBS/Animations/Converted/Move/FUTURESIGHT.txt b/PBS/Animations/Converted/Move/FUTURESIGHT.txt new file mode 100644 index 000000000..000ce25bf --- /dev/null +++ b/PBS/Animations/Converted/Move/FUTURESIGHT.txt @@ -0,0 +1,55 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,FUTURESIGHT] +Name = FUTURESIGHT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = face and eye + Focus = User + SetX = 0,145 + SetY = 0,224 + SetVisible = 0,true + SetX = 2,141 + SetY = 2,222 + SetX = 3,131 + SetY = 3,221 + SetX = 4,143 + SetY = 4,219 + SetX = 5,131 + SetY = 5,220 + SetOpacity = 8,192 + SetOpacity = 9,96 + + Play = 0,Flash2,80,78 +#------------------------------- +[Move,FUTURESIGHT,1] +Name = Future Sight hit + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = face and eye + Focus = Target + SetX = 0,401 + SetY = 0,96 + SetVisible = 0,true + SetX = 2,397 + SetY = 2,94 + SetX = 3,387 + SetY = 3,93 + SetX = 4,399 + SetY = 4,91 + SetX = 5,387 + SetY = 5,92 + SetOpacity = 8,192 + SetOpacity = 9,96 + + Play = 0,Flash2,80,78 diff --git a/PBS/Animations/Converted/Move/GASTROACID.txt b/PBS/Animations/Converted/Move/GASTROACID.txt new file mode 100644 index 000000000..66e9533b5 --- /dev/null +++ b/PBS/Animations/Converted/Move/GASTROACID.txt @@ -0,0 +1,104 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GASTROACID] +Name = GASTROACID + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,393 + SetY = 1,120 + SetZoomX = 1,85 + SetZoomY = 1,85 + SetOpacity = 1,200 + SetX = 2,369 + SetY = 2,60 + SetX = 3,359 + SetY = 3,108 + SetX = 4,394 + SetY = 4,93 + SetX = 5,316 + SetY = 5,72 + SetX = 6,336 + SetY = 6,80 + SetX = 7,375 + SetY = 7,96 + SetX = 8,330 + SetY = 8,64 + SetX = 9,376 + SetY = 9,91 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 2,363 + SetY = 2,114 + SetZoomX = 2,85 + SetZoomY = 2,85 + SetOpacity = 2,200 + SetX = 3,315 + SetY = 3,86 + SetX = 4,337 + SetY = 4,123 + SetX = 6,343 + SetY = 6,27 + SetX = 7,301 + SetY = 7,36 + SetX = 9,348 + SetY = 9,24 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 3,402 + SetY = 3,119 + SetZoomX = 3,85 + SetZoomY = 3,85 + SetOpacity = 3,200 + SetX = 4,302 + SetY = 4,69 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,344 + SetY = 4,23 + SetZoomX = 4,85 + SetZoomY = 4,85 + SetOpacity = 4,200 + + Graphic = fly copy + Focus = Target + SetX = 0,353 + SetY = 0,110 + SetZoomX = 0,85 + SetZoomY = 0,85 + SetVisible = 0,true + SetOpacity = 0,200 + SetX = 1,352 + SetY = 1,85 + SetX = 2,315 + SetY = 2,58 + SetX = 3,342 + SetY = 3,38 + SetX = 4,358 + SetY = 4,77 + SetX = 5,364 + SetY = 5,72 + SetX = 6,380 + SetY = 6,75 + SetX = 7,381 + SetY = 7,45 + SetX = 8,390 + SetY = 8,79 + SetX = 9,310 + SetY = 9,83 + SetX = 10,365 + + Play = 0,Sweet Scent,100,100 diff --git a/PBS/Animations/Converted/Move/GIGADRAIN.txt b/PBS/Animations/Converted/Move/GIGADRAIN.txt new file mode 100644 index 000000000..8d6bba803 --- /dev/null +++ b/PBS/Animations/Converted/Move/GIGADRAIN.txt @@ -0,0 +1,166 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GIGADRAIN] +Name = GIGADRAIN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetX = 0,345 + SetY = 0,91 + SetVisible = 0,true + SetX = 1,294 + SetY = 1,98 + SetX = 2,211 + SetY = 2,123 + SetX = 3,160 + SetY = 3,161 + SetX = 4,128 + SetY = 4,205 + SetX = 5,134 + + Graphic = rockice + Focus = UserAndTarget + SetX = 0,371 + SetY = 0,110 + SetVisible = 0,true + SetX = 1,396 + SetY = 1,116 + SetX = 2,358 + SetY = 2,148 + SetX = 3,307 + SetY = 3,186 + SetX = 4,217 + SetY = 4,217 + SetX = 5,147 + SetY = 5,186 + SetX = 6,172 + SetY = 6,173 + SetX = 7,160 + SetY = 7,198 + SetX = 9,166 + SetY = 9,211 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,345 + SetY = 1,142 + SetX = 2,339 + SetY = 2,104 + SetX = 3,262 + SetY = 3,135 + SetX = 4,185 + SetY = 4,167 + SetX = 5,204 + SetY = 5,192 + SetX = 6,275 + SetY = 6,173 + SetX = 7,198 + SetY = 7,192 + SetX = 8,128 + SetY = 8,173 + SetX = 9,153 + SetY = 9,198 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,339 + SetY = 1,85 + SetX = 2,268 + SetY = 2,192 + SetX = 3,371 + SetY = 3,123 + SetX = 4,320 + SetY = 4,154 + SetX = 5,256 + SetY = 5,135 + SetY = 6,98 + SetX = 7,172 + SetY = 7,135 + SetX = 8,230 + SetY = 8,192 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,288 + SetY = 2,91 + SetX = 3,371 + SetX = 4,307 + SetY = 4,110 + SetX = 5,339 + SetY = 5,135 + SetX = 6,371 + SetY = 6,91 + SetX = 7,326 + SetY = 7,135 + SetX = 8,185 + SetY = 8,198 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,377 + SetY = 2,104 + SetX = 3,166 + SetY = 3,230 + SetX = 4,377 + SetY = 4,104 + SetX = 5,352 + SetY = 5,85 + SetX = 6,256 + SetY = 6,154 + SetX = 7,185 + SetY = 7,173 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,236 + SetY = 3,116 + SetX = 4,371 + SetY = 4,85 + SetX = 5,313 + SetY = 5,116 + SetX = 6,320 + SetY = 6,167 + SetX = 7,249 + SetY = 7,186 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,326 + SetY = 3,142 + SetX = 4,166 + SetY = 4,161 + SetX = 5,140 + SetY = 5,173 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,275 + SetY = 4,167 + SetX = 5,179 + SetY = 5,192 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,396 + SetY = 4,104 + SetX = 5,371 + SetY = 5,135 + + Play = 0,Absorb2,80,100 + Play = 2,Absorb2,80,100 + Play = 5,Absorb2,80,100 + Play = 7,Absorb2,80,100 diff --git a/PBS/Animations/Converted/Move/GLARE.txt b/PBS/Animations/Converted/Move/GLARE.txt new file mode 100644 index 000000000..491ead574 --- /dev/null +++ b/PBS/Animations/Converted/Move/GLARE.txt @@ -0,0 +1,39 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GLARE] +Name = GLARE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = face and eye + Focus = UserAndTarget + SetX = 0,437 + SetY = 0,88 + SetVisible = 0,true + SetX = 1,421 + SetY = 1,86 + SetX = 2,415 + SetY = 2,81 + SetX = 3,429 + SetY = 3,90 + SetX = 4,345 + SetY = 4,89 + + Graphic = face and eye + Focus = UserAndTarget + SetX = 0,355 + SetY = 0,85 + SetVisible = 0,true + SetX = 1,346 + SetY = 1,84 + SetX = 2,333 + SetY = 2,83 + SetX = 3,355 + SetY = 3,90 + SetX = 4,420 + + Play = 0,Scary Face,80,100 diff --git a/PBS/Animations/Converted/Move/GRASSWHISTLE.txt b/PBS/Animations/Converted/Move/GRASSWHISTLE.txt new file mode 100644 index 000000000..eddf3a25e --- /dev/null +++ b/PBS/Animations/Converted/Move/GRASSWHISTLE.txt @@ -0,0 +1,160 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GRASSWHISTLE] +Name = GRASSWHISTLE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,205 + SetVisible = 0,true + SetX = 1,172 + SetY = 1,179 + SetX = 2,204 + SetY = 2,161 + SetX = 3,249 + SetY = 3,154 + SetX = 4,288 + SetY = 4,161 + SetX = 5,352 + SetY = 5,148 + SetX = 6,396 + SetY = 6,129 + SetX = 7,371 + SetY = 7,135 + SetX = 8,384 + SetY = 8,110 + SetY = 9,116 + SetX = 10,358 + SetY = 10,142 + SetX = 11,403 + SetY = 11,110 + SetX = 12,384 + SetY = 12,123 + SetX = 13,364 + SetY = 13,148 + SetX = 14,403 + SetY = 14,110 + SetY = 15,123 + + Graphic = normal1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,140 + SetY = 2,192 + SetX = 3,179 + SetY = 3,167 + SetX = 4,217 + SetY = 4,142 + SetX = 5,262 + SetY = 5,161 + SetX = 6,313 + SetY = 6,167 + SetX = 7,281 + SetY = 7,173 + SetX = 8,332 + SetY = 8,167 + SetX = 9,307 + SetY = 9,179 + SetX = 10,281 + SetY = 10,167 + SetX = 11,345 + SetY = 11,142 + SetX = 12,320 + SetY = 12,186 + SetX = 13,300 + SetY = 13,192 + SetX = 14,352 + SetY = 14,186 + + Graphic = normal1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,142 + SetX = 3,192 + SetY = 3,123 + SetX = 4,153 + SetY = 4,179 + SetX = 5,185 + SetY = 5,161 + SetX = 6,230 + SetY = 6,154 + SetX = 7,204 + SetX = 8,256 + SetY = 8,173 + SetX = 9,224 + SetY = 9,154 + SetX = 10,217 + SetY = 10,167 + SetX = 11,256 + SetY = 11,179 + SetX = 12,243 + SetY = 12,167 + SetX = 13,320 + SetY = 13,135 + SetX = 14,371 + SetY = 14,91 + + Graphic = normal1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,236 + SetY = 4,110 + SetX = 5,307 + SetY = 5,98 + SetX = 6,160 + SetY = 6,167 + SetX = 7,358 + SetY = 7,135 + SetX = 8,172 + SetY = 8,167 + SetX = 9,390 + SetY = 9,79 + SetX = 10,339 + SetY = 10,123 + SetX = 11,198 + SetY = 11,173 + SetX = 12,236 + SetY = 12,135 + + Graphic = normal1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,185 + SetY = 4,179 + SetX = 5,249 + SetY = 5,167 + SetX = 6,358 + SetY = 6,104 + SetX = 7,262 + SetY = 7,129 + SetX = 8,403 + SetY = 8,110 + SetX = 9,275 + SetY = 9,161 + SetX = 11,416 + SetY = 11,79 + + Graphic = normal1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,300 + SetY = 6,167 + SetX = 8,320 + SetY = 8,116 + SetX = 11,172 + SetY = 11,154 + + Graphic = normal1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,172 + SetY = 6,135 + SetY = 8,186 diff --git a/PBS/Animations/Converted/Move/GROWL.txt b/PBS/Animations/Converted/Move/GROWL.txt new file mode 100644 index 000000000..2cb9a947b --- /dev/null +++ b/PBS/Animations/Converted/Move/GROWL.txt @@ -0,0 +1,132 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GROWL] +Name = GROWL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Growl + Focus = User + SetFlip = 0,true + SetX = 0,185 + SetY = 0,230 + SetVisible = 0,true + SetX = 1,200 + SetY = 1,240 + SetX = 2,216 + SetY = 2,250 + SetX = 3,230 + SetY = 3,261 + SetX = 4,185 + SetY = 4,230 + SetX = 5,200 + SetY = 5,240 + SetX = 6,216 + SetY = 6,250 + SetX = 7,230 + SetY = 7,261 + + Graphic = Growl + Focus = User + SetX = 0,192 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,209 + SetX = 2,226 + SetX = 3,243 + SetX = 4,192 + SetX = 5,209 + SetX = 6,226 + SetX = 7,243 + + Graphic = Growl + Focus = User + SetX = 0,185 + SetY = 0,205 + SetVisible = 0,true + SetX = 1,200 + SetY = 1,192 + SetX = 2,216 + SetY = 2,179 + SetX = 3,230 + SetY = 3,167 + SetX = 4,185 + SetY = 4,205 + SetX = 5,200 + SetY = 5,192 + SetX = 6,216 + SetY = 6,179 + SetX = 7,230 + SetY = 7,167 + + PlayUserCry = 0,100,100 +#------------------------------- +[OppMove,GROWL] +Name = GROWL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Growl + Focus = Target + SetFlip = 0,true + SetX = 0,326 + SetY = 0,98 + SetVisible = 0,true + SetX = 1,313 + SetY = 1,85 + SetX = 2,300 + SetY = 2,72 + SetX = 3,288 + SetY = 3,60 + SetX = 4,326 + SetY = 4,98 + SetX = 5,313 + SetY = 5,85 + SetX = 6,300 + SetY = 6,72 + SetX = 7,288 + SetY = 7,60 + + Graphic = Growl + Focus = Target + SetX = 0,326 + SetY = 0,135 + SetVisible = 0,true + SetX = 1,313 + SetY = 1,148 + SetX = 2,300 + SetY = 2,161 + SetX = 3,288 + SetY = 3,173 + SetX = 4,326 + SetY = 4,135 + SetX = 5,313 + SetY = 5,148 + SetX = 6,300 + SetY = 6,161 + SetX = 7,288 + SetY = 7,173 + + Graphic = Growl + Focus = Target + SetFlip = 0,true + SetX = 0,326 + SetY = 0,110 + SetVisible = 0,true + SetX = 1,311 + SetX = 2,296 + SetX = 3,281 + SetX = 4,326 + SetX = 5,311 + SetX = 6,296 + SetX = 7,281 + + PlayUserCry = 0,100,100 diff --git a/PBS/Animations/Converted/Move/GRUDGE.txt b/PBS/Animations/Converted/Move/GRUDGE.txt new file mode 100644 index 000000000..8a3ebd876 --- /dev/null +++ b/PBS/Animations/Converted/Move/GRUDGE.txt @@ -0,0 +1,171 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GRUDGE] +Name = GRUDGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ghost1 + Focus = Target + SetX = 0,512 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,456 + SetY = 1,118 + SetX = 2,416 + SetX = 3,344 + SetY = 3,102 + SetX = 4,296 + SetX = 5,272 + SetY = 5,86 + SetX = 6,320 + SetY = 6,62 + SetX = 7,368 + SetY = 7,54 + SetX = 8,424 + SetY = 8,70 + SetX = 9,496 + SetY = 9,86 + SetX = 10,480 + SetY = 10,102 + SetX = 11,464 + SetY = 11,118 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 1,512 + SetY = 1,102 + SetX = 2,456 + SetY = 2,118 + SetX = 3,416 + SetX = 4,344 + SetY = 4,102 + SetX = 5,312 + SetX = 6,288 + SetX = 7,312 + SetY = 7,70 + SetX = 8,368 + SetY = 8,62 + SetX = 9,424 + SetY = 9,70 + SetX = 10,488 + SetX = 11,496 + SetY = 11,110 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 2,512 + SetY = 2,102 + SetX = 3,456 + SetY = 3,118 + SetX = 4,416 + SetX = 5,344 + SetY = 5,102 + SetX = 6,328 + SetY = 6,118 + SetX = 7,272 + SetY = 7,94 + SetX = 8,312 + SetX = 9,368 + SetY = 9,78 + SetX = 10,432 + SetY = 10,62 + SetX = 11,464 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 3,512 + SetY = 3,102 + SetX = 4,472 + SetY = 4,110 + SetX = 5,392 + SetY = 5,118 + SetX = 6,376 + SetY = 6,142 + SetX = 7,320 + SetY = 7,134 + SetX = 8,272 + SetY = 8,110 + SetX = 9,304 + SetY = 9,78 + SetX = 10,376 + SetY = 10,54 + SetX = 11,424 + SetY = 11,46 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 4,512 + SetY = 4,78 + SetX = 5,448 + SetY = 5,102 + SetY = 6,118 + SetX = 7,400 + SetY = 7,126 + SetX = 8,312 + SetY = 8,134 + SetX = 9,272 + SetY = 9,110 + SetX = 10,312 + SetY = 10,62 + SetX = 11,360 + SetY = 11,46 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 6,504 + SetY = 6,102 + SetX = 7,464 + SetY = 7,126 + SetX = 8,376 + SetY = 8,166 + SetX = 9,312 + SetY = 9,134 + SetX = 10,264 + SetY = 10,94 + SetX = 11,312 + SetY = 11,54 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 7,504 + SetY = 7,86 + SetX = 8,456 + SetY = 8,126 + SetX = 9,376 + SetY = 9,142 + SetX = 10,320 + SetY = 10,134 + SetX = 11,272 + SetY = 11,94 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 8,496 + SetY = 8,102 + SetX = 9,448 + SetY = 9,142 + SetX = 10,376 + SetX = 11,328 + SetY = 11,118 + + Graphic = ghost1 + Focus = Target + SetVisible = 0,true + SetX = 10,432 + SetY = 10,126 + SetX = 11,392 + SetY = 11,134 + + Play = 0,Fire1,80,100 diff --git a/PBS/Animations/Converted/Move/GUST.txt b/PBS/Animations/Converted/Move/GUST.txt new file mode 100644 index 000000000..5cee17c4b --- /dev/null +++ b/PBS/Animations/Converted/Move/GUST.txt @@ -0,0 +1,129 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GUST] +Name = GUST + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Gust + Focus = Target + SetX = 0,384 + SetY = 0,101 + SetVisible = 0,true + SetX = 1,400 + SetX = 2,416 + SetY = 2,99 + SetX = 3,432 + SetX = 4,440 + SetY = 4,91 + SetFlip = 5,true + SetX = 5,445 + SetY = 5,87 + SetX = 6,440 + SetY = 6,79 + SetX = 7,428 + SetY = 7,71 + SetX = 8,420 + SetY = 8,67 + SetX = 9,400 + SetY = 9,65 + SetFlip = 10,false + SetX = 10,385 + SetX = 11,374 + SetY = 11,67 + SetX = 12,360 + SetY = 12,69 + SetX = 13,352 + SetY = 13,71 + SetX = 14,332 + SetY = 14,75 + SetFlip = 15,true + SetX = 15,320 + SetY = 15,83 + SetX = 16,328 + SetY = 16,91 + SetX = 17,334 + SetY = 17,95 + SetX = 18,344 + SetY = 18,99 + SetX = 19,358 + SetFlip = 20,false + SetX = 20,385 + SetY = 20,98 + SetX = 21,384 + SetY = 21,94 + SetOpacity = 21,150 + SetOpacity = 22,255 + SetOpacity = 25,150 + + Play = 0,gust,80,82 + Play = 21,hit,80,100 +#------------------------------- +[OppMove,GUST] +Name = GUST + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Gust + Focus = Target + SetX = 0,128 + SetY = 0,229 + SetZoomX = 0,200 + SetZoomY = 0,200 + SetVisible = 0,true + SetX = 1,144 + SetX = 2,160 + SetY = 2,227 + SetX = 3,176 + SetX = 4,184 + SetY = 4,219 + SetFlip = 5,true + SetX = 5,189 + SetY = 5,215 + SetX = 6,184 + SetY = 6,207 + SetX = 7,172 + SetY = 7,199 + SetX = 8,164 + SetY = 8,195 + SetX = 9,144 + SetY = 9,193 + SetFlip = 10,false + SetX = 10,129 + SetX = 11,118 + SetY = 11,195 + SetX = 12,104 + SetY = 12,197 + SetX = 13,96 + SetY = 13,199 + SetX = 14,76 + SetY = 14,203 + SetFlip = 15,true + SetX = 15,64 + SetY = 15,211 + SetX = 16,72 + SetY = 16,219 + SetX = 17,78 + SetY = 17,223 + SetX = 18,88 + SetY = 18,227 + SetX = 19,102 + SetFlip = 20,false + SetX = 20,129 + SetY = 20,226 + SetX = 21,128 + SetY = 21,222 + SetOpacity = 21,150 + SetOpacity = 22,255 + SetOpacity = 25,150 + + Play = 0,gust,80,82 + Play = 21,hit,80,100 diff --git a/PBS/Animations/Converted/Move/HAIL.txt b/PBS/Animations/Converted/Move/HAIL.txt new file mode 100644 index 000000000..edfea81ee --- /dev/null +++ b/PBS/Animations/Converted/Move/HAIL.txt @@ -0,0 +1,170 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HAIL] +Name = HAIL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,37 + SetY = 0,26 + SetVisible = 0,true + SetX = 1,207 + SetY = 1,56 + SetX = 2,84 + SetY = 2,43 + SetX = 3,171 + SetY = 3,56 + SetX = 4,118 + SetY = 4,97 + SetX = 5,357 + SetY = 5,200 + SetX = 6,10 + SetY = 6,9 + SetX = 7,109 + SetY = 7,105 + SetX = 8,136 + SetY = 8,77 + SetX = 9,69 + SetY = 9,208 + SetX = 10,136 + SetY = 10,107 + + Graphic = weather + Focus = Screen + SetX = 0,164 + SetY = 0,136 + SetVisible = 0,true + SetX = 1,464 + SetY = 1,117 + SetX = 3,441 + SetY = 3,241 + SetX = 5,225 + SetY = 5,69 + SetX = 8,180 + SetY = 8,199 + SetX = 9,163 + SetY = 9,99 + SetX = 11,176 + SetY = 11,119 + + Graphic = weather + Focus = Screen + SetX = 0,302 + SetY = 0,79 + SetVisible = 0,true + SetX = 1,201 + SetY = 1,204 + SetX = 2,228 + SetY = 2,98 + SetX = 3,278 + SetY = 3,164 + SetX = 6,334 + SetY = 6,226 + SetX = 8,444 + SetY = 8,137 + SetX = 9,303 + SetY = 9,240 + SetX = 10,444 + SetY = 10,89 + SetX = 12,474 + SetY = 12,59 + + Graphic = weather + Focus = Screen + SetX = 0,440 + SetY = 0,194 + SetVisible = 0,true + SetX = 1,51 + SetY = 1,161 + SetX = 2,263 + SetY = 2,253 + SetX = 3,436 + SetY = 3,52 + SetX = 4,390 + SetY = 4,210 + SetX = 6,465 + SetY = 6,116 + SetX = 7,454 + SetY = 7,82 + SetX = 8,276 + SetY = 8,136 + SetX = 9,465 + SetY = 9,160 + SetX = 10,285 + SetY = 10,105 + SetX = 11,419 + SetY = 11,272 + SetX = 12,230 + SetY = 12,142 + + Graphic = weather + Focus = Screen + SetX = 0,362 + SetY = 0,252 + SetVisible = 0,true + SetX = 2,78 + SetY = 2,206 + SetX = 4,259 + SetY = 4,87 + SetX = 5,181 + SetY = 5,217 + SetX = 6,298 + SetY = 6,96 + SetX = 7,191 + SetY = 7,222 + SetX = 8,365 + SetY = 8,231 + SetX = 9,337 + SetY = 9,93 + SetX = 10,82 + SetY = 10,240 + SetX = 11,489 + SetY = 11,96 + SetX = 12,198 + SetY = 12,28 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 4,72 + SetY = 4,220 + SetX = 6,161 + SetY = 6,265 + SetX = 7,296 + SetY = 7,172 + SetX = 11,281 + SetY = 11,268 + SetX = 12,41 + SetY = 12,229 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 9,28 + SetY = 9,57 + SetX = 10,294 + SetY = 10,234 + SetX = 11,111 + SetY = 11,246 + SetX = 12,167 + SetY = 12,237 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 11,299 + SetY = 11,47 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 12,449 + SetY = 12,237 + + Play = 0,Natural Gift,100,147 diff --git a/PBS/Animations/Converted/Move/HARDEN.txt b/PBS/Animations/Converted/Move/HARDEN.txt new file mode 100644 index 000000000..c32165dd6 --- /dev/null +++ b/PBS/Animations/Converted/Move/HARDEN.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HARDEN] +Name = HARDEN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet + Focus = User + SetX = 0,133 + SetY = 0,221 + SetVisible = 0,true + SetOpacity = 0,70 + SetOpacity = 1,105 + SetOpacity = 2,140 + SetOpacity = 6,105 + SetOpacity = 7,70 + + Play = 0,Harden,100,100 diff --git a/PBS/Animations/Converted/Move/HEADBUTT.txt b/PBS/Animations/Converted/Move/HEADBUTT.txt new file mode 100644 index 000000000..4fabdc679 --- /dev/null +++ b/PBS/Animations/Converted/Move/HEADBUTT.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HEADBUTT] +Name = HEADBUTT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + SetAngle = 2,90 + SetAngle = 3,0 + SetZoomX = 4,120 + SetZoomY = 4,120 + SetOpacity = 5,100 + + Play = 0,Blow3,80,100 diff --git a/PBS/Animations/Converted/Move/HEATWAVE.txt b/PBS/Animations/Converted/Move/HEATWAVE.txt new file mode 100644 index 000000000..69e04be3d --- /dev/null +++ b/PBS/Animations/Converted/Move/HEATWAVE.txt @@ -0,0 +1,87 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HEATWAVE] +Name = HEATWAVE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 011-Weapon06 + Focus = UserAndTarget + SetX = 0,256 + SetY = 0,167 + SetVisible = 0,true + SetZoomX = 1,110 + SetZoomY = 1,110 + SetOpacity = 1,240 + SetZoomX = 2,120 + SetZoomY = 2,120 + SetOpacity = 2,220 + SetFlip = 3,true + SetZoomX = 3,130 + SetZoomY = 3,130 + SetOpacity = 3,200 + SetZoomX = 4,140 + SetZoomY = 4,140 + SetOpacity = 4,190 + SetFlip = 5,false + SetZoomX = 5,150 + SetZoomY = 5,150 + SetOpacity = 5,175 + SetZoomX = 6,160 + SetZoomY = 6,160 + SetOpacity = 6,155 + SetZoomX = 7,170 + SetZoomY = 7,170 + SetOpacity = 7,130 + SetZoomX = 8,180 + SetZoomY = 8,180 + SetOpacity = 8,110 + SetZoomX = 9,190 + SetZoomY = 9,190 + SetOpacity = 9,95 + SetFlip = 10,true + SetZoomX = 10,200 + SetZoomY = 10,200 + SetOpacity = 10,80 + SetFlip = 11,false + SetZoomX = 11,220 + SetZoomY = 11,220 + SetOpacity = 11,75 + SetZoomX = 12,250 + SetZoomY = 12,250 + SetOpacity = 12,70 + SetZoomX = 13,300 + SetZoomY = 13,300 + SetOpacity = 13,65 + SetZoomX = 14,350 + SetZoomY = 14,350 + SetOpacity = 14,60 + SetZoomX = 15,400 + SetZoomY = 15,400 + SetOpacity = 15,55 + SetZoomX = 16,450 + SetZoomY = 16,450 + SetOpacity = 16,50 + SetZoomX = 17,500 + SetZoomY = 17,500 + SetOpacity = 17,45 + SetZoomX = 18,550 + SetZoomY = 18,550 + SetOpacity = 18,40 + SetZoomX = 19,600 + SetZoomY = 19,600 + SetZoomX = 20,500 + SetZoomY = 20,500 + SetOpacity = 20,35 + SetZoomX = 21,400 + SetZoomY = 21,400 + SetOpacity = 21,30 + + Play = 0,Fire1,80,100 + Play = 2,Fire2,80,100 + Play = 6,Fire2,80,100 + Play = 8,Fire2,80,100 diff --git a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt new file mode 100644 index 000000000..4df3731c5 --- /dev/null +++ b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HIGHJUMPKICK] +Name = HIGHJUMPKICK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetX = 0,504 + SetY = 0,142 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetX = 1,488 + SetY = 1,110 + SetX = 2,456 + SetY = 2,78 + SetX = 3,392 + SetY = 3,54 + SetX = 4,328 + SetY = 4,62 + SetX = 5,288 + SetY = 5,86 + SetX = 6,248 + SetY = 6,118 + SetX = 7,240 + SetY = 7,134 + SetOpacity = 7,100 + + Play = 0,throw,80,100 + Play = 3,Blow4,80,100 diff --git a/PBS/Animations/Converted/Move/HORNATTACK.txt b/PBS/Animations/Converted/Move/HORNATTACK.txt new file mode 100644 index 000000000..66c8f2a43 --- /dev/null +++ b/PBS/Animations/Converted/Move/HORNATTACK.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HORNATTACK] +Name = HORNATTACK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Cosmo-01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,390 + SetY = 4,85 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetOpacity = 4,100 + + Graphic = Cosmo-01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,192 + SetX = 2,236 + SetY = 2,154 + SetX = 3,294 + SetY = 3,135 + SetX = 4,358 + SetY = 4,110 + SetOpacity = 5,25 + + Play = 3,normaldamage,80,100 diff --git a/PBS/Animations/Converted/Move/HYDROPUMP.txt b/PBS/Animations/Converted/Move/HYDROPUMP.txt new file mode 100644 index 000000000..cf4852a92 --- /dev/null +++ b/PBS/Animations/Converted/Move/HYDROPUMP.txt @@ -0,0 +1,43 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HYDROPUMP] +Name = HYDROPUMP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = icewater + Focus = Target + SetVisible = 0,true + SetX = 2,480 + SetY = 2,94 + + Graphic = icewater + Focus = Target + SetVisible = 0,true + SetX = 5,296 + SetY = 5,94 + + Graphic = icewater + Focus = Target + SetX = 0,384 + SetY = 0,118 + SetVisible = 0,true + SetX = 3,392 + SetX = 4,400 + SetX = 5,376 + SetX = 6,384 + SetFlip = 9,true + SetX = 9,376 + SetFlip = 10,false + SetX = 11,368 + SetX = 12,376 + SetX = 14,296 + SetY = 14,94 + + Play = 1,Water1,80,100 + Play = 5,Water1,80,100 + Play = 9,Water1,80,100 diff --git a/PBS/Animations/Converted/Move/HYPERFANG.txt b/PBS/Animations/Converted/Move/HYPERFANG.txt new file mode 100644 index 000000000..d6b8645d9 --- /dev/null +++ b/PBS/Animations/Converted/Move/HYPERFANG.txt @@ -0,0 +1,24 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,HYPERFANG] +Name = HYPERFANG + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal2 + Focus = Target + SetX = 0,376 + SetY = 0,94 + SetVisible = 0,true + SetX = 2,384 + SetY = 2,102 + SetX = 4,376 + SetY = 4,110 + SetOpacity = 6,150 + SetOpacity = 7,100 + + Play = 0,Slash9,80,100 diff --git a/PBS/Animations/Converted/Move/ICEBALL.txt b/PBS/Animations/Converted/Move/ICEBALL.txt new file mode 100644 index 000000000..d7600d61e --- /dev/null +++ b/PBS/Animations/Converted/Move/ICEBALL.txt @@ -0,0 +1,31 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ICEBALL] +Name = ICEBALL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = icewater + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,140 + SetY = 1,198 + SetX = 2,172 + SetY = 2,173 + SetX = 3,204 + SetY = 3,154 + SetX = 4,262 + SetY = 4,129 + SetX = 5,307 + SetY = 5,116 + SetX = 6,358 + SetY = 6,110 + + Play = 0,throw,80,100 + Play = 7,Earth3,80,100 diff --git a/PBS/Animations/Converted/Move/ICEFANG.txt b/PBS/Animations/Converted/Move/ICEFANG.txt new file mode 100644 index 000000000..5b67cde7e --- /dev/null +++ b/PBS/Animations/Converted/Move/ICEFANG.txt @@ -0,0 +1,106 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ICEFANG] +Name = ICEFANG + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = element fangs + Focus = Target + SetX = 0,395 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,390 + SetY = 1,92 + SetX = 2,389 + SetY = 2,97 + SetX = 3,388 + SetY = 3,94 + SetX = 4,389 + SetY = 4,88 + SetX = 5,392 + SetY = 5,101 + SetX = 6,386 + SetY = 6,94 + SetX = 7,390 + SetY = 7,95 + SetX = 8,389 + SetY = 8,90 + SetX = 9,382 + SetY = 9,92 + SetX = 10,397 + SetY = 10,99 + SetX = 11,388 + SetY = 11,94 + SetX = 12,391 + SetY = 12,95 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 7,330 + SetY = 7,111 + SetOpacity = 7,208 + SetX = 8,328 + SetY = 8,47 + SetOpacity = 8,164 + SetX = 9,353 + SetY = 9,43 + SetOpacity = 9,154 + SetX = 10,354 + SetY = 10,146 + SetOpacity = 10,255 + SetX = 11,443 + SetY = 11,167 + SetOpacity = 11,204 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 8,332 + SetY = 8,111 + SetOpacity = 8,133 + SetX = 9,342 + SetY = 9,137 + SetOpacity = 9,159 + SetX = 10,462 + SetY = 10,48 + SetOpacity = 10,234 + SetX = 11,478 + SetY = 11,106 + SetOpacity = 11,224 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 8,473 + SetY = 8,65 + SetOpacity = 8,213 + SetX = 9,410 + SetY = 9,166 + SetOpacity = 9,212 + SetX = 10,402 + SetY = 10,174 + SetOpacity = 10,174 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 9,399 + SetY = 9,30 + SetOpacity = 9,144 + SetX = 10,320 + SetOpacity = 10,224 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 10,450 + SetY = 10,90 + SetOpacity = 10,154 + + Play = 6,Super Fang,80,100 diff --git a/PBS/Animations/Converted/Move/ICEPUNCH.txt b/PBS/Animations/Converted/Move/ICEPUNCH.txt new file mode 100644 index 000000000..a8205d262 --- /dev/null +++ b/PBS/Animations/Converted/Move/ICEPUNCH.txt @@ -0,0 +1,172 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ICEPUNCH] +Name = ICEPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetX = 0,384 + SetY = 0,93 + SetVisible = 0,true + SetY = 1,91 + SetX = 2,409 + SetY = 2,116 + SetX = 3,385 + SetY = 3,93 + SetX = 4,392 + SetY = 4,74 + SetX = 5,373 + SetY = 5,79 + SetX = 6,412 + SetY = 6,145 + SetX = 8,349 + SetY = 8,135 + SetX = 9,387 + SetY = 9,136 + SetX = 10,361 + SetY = 10,9 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 1,387 + SetY = 1,96 + SetX = 2,385 + SetX = 3,431 + SetY = 3,135 + SetX = 4,327 + SetY = 4,154 + SetX = 5,420 + SetY = 5,54 + SetX = 6,325 + SetY = 6,81 + SetX = 8,409 + SetY = 8,148 + SetX = 9,313 + SetY = 9,175 + SetX = 10,400 + SetY = 10,42 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,348 + SetY = 2,107 + SetX = 3,334 + SetY = 3,124 + SetX = 4,449 + SetY = 4,159 + SetX = 5,438 + SetY = 5,120 + SetX = 6,382 + SetY = 6,5 + SetX = 8,380 + SetY = 8,77 + SetX = 9,330 + SetY = 9,54 + SetX = 10,468 + SetY = 10,177 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 3,383 + SetY = 3,63 + SetX = 4,393 + SetY = 4,164 + SetX = 5,347 + SetY = 5,135 + SetX = 6,317 + SetY = 6,48 + SetX = 8,338 + SetY = 8,90 + SetX = 9,435 + SetY = 9,47 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,118 + SetX = 4,375 + SetY = 4,103 + SetX = 5,341 + SetY = 5,88 + SetX = 6,298 + SetY = 6,131 + SetX = 8,414 + SetY = 8,111 + SetX = 9,445 + SetY = 9,117 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 4,408 + SetY = 4,127 + SetX = 5,391 + SetY = 5,140 + SetX = 6,432 + SetY = 6,110 + SetX = 8,393 + SetY = 8,28 + SetX = 9,384 + SetY = 9,95 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 4,378 + SetY = 4,99 + SetX = 5,399 + SetY = 5,103 + SetX = 6,427 + SetY = 6,77 + SetX = 8,387 + SetY = 8,117 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 5,332 + SetY = 5,33 + SetX = 6,380 + SetY = 6,109 + SetX = 8,459 + SetY = 8,80 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 5,381 + SetY = 5,93 + SetX = 6,383 + SetY = 6,101 + SetX = 8,382 + SetY = 8,92 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 7,392 + SetY = 7,104 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 7,363 + SetY = 7,85 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 7,393 + SetY = 7,83 + + Play = 0,Shell Smash,100,131 diff --git a/PBS/Animations/Converted/Move/ICICLESPEAR.txt b/PBS/Animations/Converted/Move/ICICLESPEAR.txt new file mode 100644 index 000000000..d6023337c --- /dev/null +++ b/PBS/Animations/Converted/Move/ICICLESPEAR.txt @@ -0,0 +1,156 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ICICLESPEAR] +Name = ICICLESPEAR + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetFlip = 0,true + SetX = 0,192 + SetY = 0,192 + SetAngle = 0,135 + SetVisible = 0,true + SetX = 1,256 + SetY = 1,173 + SetX = 2,294 + SetY = 2,142 + SetX = 3,332 + SetY = 3,135 + SetX = 4,345 + SetY = 4,129 + SetX = 5,352 + SetY = 5,123 + + Play = 0,throw,80,100 + Play = 2,Crash,50,115 + Play = 2,Ice2,80,100 +#------------------------------- +[Move,ICICLESPEAR,1] +Name = Icicle Spear hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetFlip = 0,true + SetX = 0,192 + SetY = 0,192 + SetAngle = 0,135 + SetVisible = 0,true + SetX = 1,256 + SetY = 1,173 + SetX = 2,294 + SetY = 2,142 + SetX = 3,332 + SetY = 3,135 + SetX = 4,345 + SetY = 4,129 + SetX = 5,352 + SetY = 5,123 + + Play = 0,throw,80,100 + Play = 2,Crash,50,115 + Play = 2,Ice2,80,100 +#------------------------------- +[Move,ICICLESPEAR,2] +Name = Icicle Spear hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetFlip = 0,true + SetX = 0,192 + SetY = 0,192 + SetAngle = 0,135 + SetVisible = 0,true + SetX = 1,256 + SetY = 1,173 + SetX = 2,294 + SetY = 2,142 + SetX = 3,332 + SetY = 3,135 + SetX = 4,345 + SetY = 4,129 + SetX = 5,352 + SetY = 5,123 + + Play = 0,throw,80,100 + Play = 2,Crash,50,115 + Play = 2,Ice2,80,100 +#------------------------------- +[Move,ICICLESPEAR,3] +Name = Icicle Spear hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetFlip = 0,true + SetX = 0,192 + SetY = 0,192 + SetAngle = 0,135 + SetVisible = 0,true + SetX = 1,256 + SetY = 1,173 + SetX = 2,294 + SetY = 2,142 + SetX = 3,332 + SetY = 3,135 + SetX = 4,345 + SetY = 4,129 + SetX = 5,352 + SetY = 5,123 + + Play = 0,throw,80,100 + Play = 2,Crash,50,115 + Play = 2,Ice2,80,100 +#------------------------------- +[Move,ICICLESPEAR,4] +Name = Icicle Spear hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetFlip = 0,true + SetX = 0,192 + SetY = 0,192 + SetAngle = 0,135 + SetVisible = 0,true + SetX = 1,256 + SetY = 1,173 + SetX = 2,294 + SetY = 2,142 + SetX = 3,332 + SetY = 3,135 + SetX = 4,345 + SetY = 4,129 + SetX = 5,352 + SetY = 5,123 + + Play = 0,throw,80,100 + Play = 2,Crash,50,115 + Play = 2,Ice2,80,100 diff --git a/PBS/Animations/Converted/Move/ICYWIND.txt b/PBS/Animations/Converted/Move/ICYWIND.txt new file mode 100644 index 000000000..07942e8df --- /dev/null +++ b/PBS/Animations/Converted/Move/ICYWIND.txt @@ -0,0 +1,58 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ICYWIND] +Name = ICYWIND + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Ice1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,134 + SetY = 1,192 + SetX = 2,179 + SetY = 2,179 + SetX = 3,217 + SetY = 3,167 + SetX = 4,249 + SetY = 4,148 + SetFlip = 5,true + SetX = 5,300 + SetY = 5,135 + + Graphic = Ice1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,172 + SetY = 3,179 + SetX = 4,204 + SetY = 4,167 + SetZoomX = 4,75 + SetZoomY = 4,75 + + Graphic = Ice1 + Focus = UserAndTarget + SetX = 0,140 + SetY = 0,192 + SetVisible = 0,true + SetX = 1,166 + SetY = 1,186 + SetX = 2,236 + SetY = 2,154 + SetX = 3,275 + SetY = 3,135 + SetX = 4,313 + SetY = 4,123 + SetFlip = 5,true + SetX = 5,358 + SetY = 5,116 + SetFlip = 6,false + SetY = 6,110 + SetOpacity = 10,100 + + Play = 0,throw,80,100 + Play = 1,Ice8,80,100 diff --git a/PBS/Animations/Converted/Move/INFERNO.txt b/PBS/Animations/Converted/Move/INFERNO.txt new file mode 100644 index 000000000..53d44698f --- /dev/null +++ b/PBS/Animations/Converted/Move/INFERNO.txt @@ -0,0 +1,298 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,INFERNO] +Name = INFERNO + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Flames + Focus = Target + SetX = 0,368 + SetY = 0,128 + SetVisible = 0,true + SetX = 1,361 + SetY = 1,122 + SetX = 2,360 + SetY = 2,121 + SetX = 3,353 + SetY = 3,129 + SetX = 4,347 + SetY = 4,134 + SetX = 5,359 + SetY = 5,129 + SetX = 6,364 + SetY = 6,128 + SetX = 7,354 + SetX = 8,360 + SetY = 8,130 + SetX = 9,376 + SetY = 9,129 + + Graphic = Flames + Focus = Target + SetX = 0,405 + SetY = 0,123 + SetVisible = 0,true + SetX = 1,410 + SetY = 1,121 + SetX = 2,383 + SetY = 2,130 + SetX = 3,376 + SetY = 3,132 + SetX = 4,372 + SetY = 4,136 + SetX = 5,383 + SetY = 5,133 + SetY = 6,126 + SetX = 7,379 + SetY = 7,127 + SetX = 8,386 + SetY = 8,134 + SetX = 9,351 + SetY = 9,129 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,387 + SetY = 1,119 + SetX = 2,407 + SetY = 2,123 + SetX = 3,369 + SetY = 3,114 + SetX = 4,393 + SetY = 4,135 + SetX = 5,378 + SetY = 5,115 + SetX = 6,381 + SetY = 6,110 + SetX = 7,368 + SetY = 7,107 + SetX = 8,377 + SetY = 8,117 + SetX = 9,371 + SetY = 9,108 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,377 + SetY = 1,105 + SetX = 2,380 + SetY = 2,109 + SetX = 3,400 + SetY = 3,134 + SetX = 4,362 + SetY = 4,118 + SetX = 5,383 + SetY = 5,95 + SetX = 6,356 + SetY = 6,102 + SetX = 7,344 + SetY = 7,108 + SetX = 8,403 + SetY = 8,123 + SetX = 9,352 + SetY = 9,100 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 1,402 + SetY = 1,107 + SetX = 2,397 + SetY = 2,110 + SetX = 3,389 + SetY = 3,117 + SetX = 4,387 + SetY = 4,121 + SetX = 5,402 + SetY = 5,107 + SetX = 6,408 + SetY = 6,118 + SetX = 7,355 + SetY = 7,92 + SetX = 8,406 + SetY = 8,101 + SetX = 9,349 + SetY = 9,78 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 2,364 + SetY = 2,103 + SetX = 3,409 + SetY = 3,115 + SetX = 4,346 + SetY = 4,109 + SetX = 5,404 + SetY = 5,131 + SetX = 6,386 + SetY = 6,95 + SetX = 7,383 + SetY = 7,90 + SetX = 8,382 + SetY = 8,93 + SetX = 9,370 + SetY = 9,88 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 2,386 + SetY = 2,95 + SetX = 3,349 + SetY = 3,105 + SetX = 4,378 + SetY = 4,104 + SetX = 5,400 + SetY = 5,83 + SetX = 6,402 + SetY = 6,100 + SetX = 7,368 + SetY = 7,76 + SetX = 8,359 + SetY = 8,106 + SetX = 9,391 + SetY = 9,105 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 2,349 + SetY = 2,92 + SetX = 3,373 + SetY = 3,98 + SetX = 4,404 + SetY = 4,132 + SetX = 5,357 + SetY = 5,101 + SetX = 6,368 + SetY = 6,76 + SetX = 7,404 + SetY = 7,125 + SetX = 8,351 + SetY = 8,87 + SetX = 9,406 + SetY = 9,128 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,393 + SetY = 3,99 + SetX = 4,402 + SetY = 4,113 + SetX = 5,343 + SetY = 5,117 + SetX = 7,395 + SetY = 7,108 + SetX = 8,373 + SetY = 8,75 + SetX = 9,417 + SetY = 9,107 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,357 + SetY = 3,89 + SetX = 4,395 + SetY = 4,94 + SetX = 5,363 + SetY = 5,79 + SetX = 7,400 + SetY = 7,81 + SetX = 8,384 + SetY = 8,78 + SetX = 9,397 + SetY = 9,88 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,412 + SetY = 3,95 + SetX = 4,357 + SetY = 4,93 + SetX = 7,387 + SetY = 7,71 + SetX = 8,414 + SetY = 8,83 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 3,380 + SetY = 3,81 + SetX = 4,385 + SetY = 4,84 + SetX = 7,341 + SetY = 7,79 + SetX = 8,347 + SetY = 8,70 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,367 + SetY = 4,74 + SetX = 7,355 + SetY = 7,61 + SetX = 8,368 + SetY = 8,59 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,343 + SetY = 4,79 + SetX = 7,383 + SetY = 7,52 + SetX = 8,392 + SetY = 8,57 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,402 + SetY = 4,76 + SetX = 7,419 + SetY = 7,77 + SetX = 8,416 + SetY = 8,62 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 4,382 + SetY = 4,58 + SetX = 7,422 + SetY = 7,103 + SetX = 8,342 + SetY = 8,48 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 8,423 + SetY = 8,116 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 8,414 + SetY = 8,138 + + Graphic = Flames + Focus = Target + SetVisible = 0,true + SetX = 8,396 + SetY = 8,33 + + Play = 0,Wring Out,100,150 diff --git a/PBS/Animations/Converted/Move/IRONHEAD.txt b/PBS/Animations/Converted/Move/IRONHEAD.txt new file mode 100644 index 000000000..0367927d5 --- /dev/null +++ b/PBS/Animations/Converted/Move/IRONHEAD.txt @@ -0,0 +1,63 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,IRONHEAD] +Name = IRONHEAD + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Iron Head + Focus = Target + SetVisible = 0,true + SetX = 1,384 + SetY = 1,97 + SetOpacity = 7,128 + + Graphic = Iron Head + Focus = Target + SetVisible = 0,true + SetX = 2,331 + SetY = 2,114 + SetX = 3,278 + SetY = 3,128 + SetX = 4,284 + SetY = 4,178 + SetOpacity = 4,128 + + Graphic = Iron Head + Focus = Target + SetVisible = 0,true + SetX = 2,437 + SetY = 2,118 + SetX = 3,485 + SetY = 3,132 + SetX = 4,507 + SetY = 4,182 + SetOpacity = 4,128 + + Graphic = Iron Head + Focus = Target + SetVisible = 0,true + SetX = 3,279 + SetY = 3,82 + SetX = 4,266 + SetY = 4,27 + + Graphic = Iron Head + Focus = Target + SetVisible = 0,true + SetX = 3,461 + SetY = 3,69 + SetX = 4,513 + SetY = 4,54 + + Graphic = Iron Head + Focus = Target + SetVisible = 0,true + SetX = 3,275 + SetY = 3,33 + + Play = 0,Damage1,100,100 diff --git a/PBS/Animations/Converted/Move/JUMPKICK.txt b/PBS/Animations/Converted/Move/JUMPKICK.txt new file mode 100644 index 000000000..7bba3a7d1 --- /dev/null +++ b/PBS/Animations/Converted/Move/JUMPKICK.txt @@ -0,0 +1,35 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,JUMPKICK] +Name = JUMPKICK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetX = 0,504 + SetY = 0,142 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetX = 1,488 + SetY = 1,110 + SetX = 2,456 + SetY = 2,78 + SetX = 3,392 + SetY = 3,54 + SetX = 4,328 + SetY = 4,62 + SetX = 5,288 + SetY = 5,86 + SetX = 6,248 + SetY = 6,118 + SetX = 7,240 + SetY = 7,134 + SetOpacity = 7,100 + + Play = 3,Blow3,80,100 diff --git a/PBS/Animations/Converted/Move/KARATECHOP.txt b/PBS/Animations/Converted/Move/KARATECHOP.txt new file mode 100644 index 000000000..d06410fb5 --- /dev/null +++ b/PBS/Animations/Converted/Move/KARATECHOP.txt @@ -0,0 +1,35 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,KARATECHOP] +Name = KARATECHOP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetX = 0,232 + SetY = 0,30 + SetVisible = 0,true + SetX = 1,272 + SetY = 1,38 + SetAngle = 1,350 + SetX = 2,312 + SetAngle = 2,340 + SetX = 3,336 + SetY = 3,54 + SetAngle = 3,330 + SetX = 4,360 + SetY = 4,70 + SetAngle = 4,320 + SetX = 5,376 + SetY = 5,86 + SetX = 6,384 + SetY = 6,94 + SetAngle = 6,0 + + Play = 0,Wind1,80,100 + Play = 7,Blow3,80,100 diff --git a/PBS/Animations/Converted/Move/KINESIS.txt b/PBS/Animations/Converted/Move/KINESIS.txt new file mode 100644 index 000000000..bfba0b1c8 --- /dev/null +++ b/PBS/Animations/Converted/Move/KINESIS.txt @@ -0,0 +1,30 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,KINESIS] +Name = KINESIS + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetX = 0,383 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,385 + SetX = 2,384 + SetY = 2,95 + SetY = 3,90 + SetX = 4,386 + SetY = 4,93 + SetY = 5,94 + SetY = 6,93 + SetX = 7,384 + SetY = 7,94 + SetX = 8,385 + SetY = 8,93 + + Play = 0,Trump Card,86,100 diff --git a/PBS/Animations/Converted/Move/LEAFBLADE.txt b/PBS/Animations/Converted/Move/LEAFBLADE.txt new file mode 100644 index 000000000..1ae4b8b6b --- /dev/null +++ b/PBS/Animations/Converted/Move/LEAFBLADE.txt @@ -0,0 +1,22 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LEAFBLADE] +Name = LEAFBLADE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Sword5 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Sword1,80,100 + Play = 3,Slash3,80,100 + Play = 7,Slash3,80,100 + Play = 11,Slash3,80,100 + Play = 15,Slash3,80,100 diff --git a/PBS/Animations/Converted/Move/LEECHLIFE.txt b/PBS/Animations/Converted/Move/LEECHLIFE.txt new file mode 100644 index 000000000..0f70cd82e --- /dev/null +++ b/PBS/Animations/Converted/Move/LEECHLIFE.txt @@ -0,0 +1,123 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LEECHLIFE] +Name = LEECHLIFE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetX = 0,166 + SetY = 0,224 + SetVisible = 0,true + SetX = 1,224 + SetY = 1,179 + SetX = 2,294 + SetY = 2,142 + SetX = 3,358 + SetY = 3,110 + SetZoomX = 4,110 + SetZoomY = 4,110 + SetOpacity = 4,100 + SetX = 5,281 + SetY = 5,104 + SetZoomX = 5,100 + SetZoomY = 5,100 + SetOpacity = 5,255 + SetX = 6,211 + SetY = 6,123 + SetX = 7,140 + SetY = 7,161 + SetX = 8,121 + SetY = 8,192 + SetX = 9,179 + SetY = 9,224 + SetX = 10,102 + SetY = 10,217 + SetX = 11,147 + SetY = 11,230 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,339 + SetY = 4,98 + SetX = 5,332 + SetY = 5,192 + SetX = 6,281 + SetY = 6,230 + SetX = 7,179 + SetX = 8,153 + SetY = 8,198 + SetX = 9,108 + SetY = 9,154 + SetX = 10,243 + SetY = 10,230 + SetX = 11,96 + SetY = 11,211 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,384 + SetY = 4,154 + SetX = 5,345 + SetY = 5,91 + SetX = 6,281 + SetY = 6,123 + SetX = 7,230 + SetY = 7,154 + SetX = 8,268 + SetY = 8,192 + SetX = 9,320 + SetY = 9,205 + SetX = 10,134 + SetY = 10,167 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,384 + SetY = 6,116 + SetX = 7,326 + SetY = 7,154 + SetX = 8,166 + SetY = 8,98 + SetX = 9,217 + SetY = 9,129 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,339 + SetY = 6,79 + SetX = 7,256 + SetX = 8,384 + SetY = 8,148 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,377 + SetY = 7,85 + SetX = 8,268 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,320 + SetY = 7,79 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,396 + SetY = 7,129 + + Play = 0,throw,80,100 + Play = 2,Twine,80,100 + Play = 3,Bow1,80,100 diff --git a/PBS/Animations/Converted/Move/LEECHSEED.txt b/PBS/Animations/Converted/Move/LEECHSEED.txt new file mode 100644 index 000000000..179abdccc --- /dev/null +++ b/PBS/Animations/Converted/Move/LEECHSEED.txt @@ -0,0 +1,134 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LEECHSEED] +Name = LEECHSEED + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,147 + SetY = 4,205 + SetX = 5,179 + SetY = 5,148 + SetX = 6,217 + SetY = 6,116 + SetX = 8,352 + SetY = 8,91 + SetX = 10,422 + SetY = 10,129 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,205 + SetVisible = 0,true + SetX = 1,198 + SetY = 1,142 + SetX = 2,249 + SetY = 2,104 + SetX = 3,300 + SetY = 3,85 + SetX = 4,339 + SetX = 5,371 + SetY = 5,104 + SetX = 6,384 + SetY = 6,129 + SetX = 7,281 + SetY = 7,91 + SetX = 8,384 + SetY = 8,129 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,147 + SetY = 2,205 + SetX = 3,185 + SetY = 3,135 + SetX = 4,230 + SetY = 4,85 + SetX = 5,268 + SetY = 5,72 + SetX = 6,300 + SetY = 6,79 + SetX = 7,332 + SetY = 7,110 + SetX = 8,345 + SetY = 8,129 + SetX = 9,390 + SetY = 9,104 + SetX = 10,345 + SetY = 10,129 +#------------------------------- +[OppMove,LEECHSEED] +Name = LEECHSEED + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,384 + SetY = 2,98 + SetX = 3,352 + SetY = 3,72 + SetX = 4,307 + SetY = 4,60 + SetX = 5,256 + SetY = 5,72 + SetX = 6,185 + SetY = 6,110 + SetX = 7,121 + SetY = 7,173 + SetX = 8,128 + SetY = 8,249 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,384 + SetY = 4,98 + SetX = 5,352 + SetY = 5,79 + SetX = 6,307 + SetY = 6,72 + SetX = 8,211 + SetY = 8,142 + SetX = 10,160 + SetY = 10,249 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,384 + SetY = 0,98 + SetVisible = 0,true + SetX = 1,352 + SetY = 1,79 + SetX = 2,313 + SetY = 2,72 + SetX = 3,256 + SetY = 3,85 + SetX = 4,211 + SetY = 4,123 + SetX = 5,160 + SetY = 5,186 + SetX = 6,128 + SetY = 6,249 + SetX = 7,249 + SetY = 7,91 + SetX = 8,89 + SetY = 8,249 + SetX = 9,179 + SetY = 9,198 + SetX = 10,96 + SetY = 10,249 diff --git a/PBS/Animations/Converted/Move/LEER.txt b/PBS/Animations/Converted/Move/LEER.txt new file mode 100644 index 000000000..f249bfc7e --- /dev/null +++ b/PBS/Animations/Converted/Move/LEER.txt @@ -0,0 +1,49 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LEER] +Name = LEER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leer + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,205 + SetVisible = 0,true + SetY = 1,203 + SetX = 2,148 + SetY = 2,201 + SetX = 3,144 + SetY = 3,203 + SetX = 4,153 + SetY = 4,201 + + Play = 0,Saint9,100,100 +#------------------------------- +[OppMove,LEER] +Name = LEER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leer + Focus = UserAndTarget + SetX = 0,350 + SetY = 0,79 + SetVisible = 0,true + SetY = 1,77 + SetX = 2,352 + SetY = 2,75 + SetX = 3,347 + SetY = 3,77 + SetX = 4,356 + SetY = 4,75 + + Play = 0,Saint9,100,100 diff --git a/PBS/Animations/Converted/Move/LICK.txt b/PBS/Animations/Converted/Move/LICK.txt new file mode 100644 index 000000000..d53ff8346 --- /dev/null +++ b/PBS/Animations/Converted/Move/LICK.txt @@ -0,0 +1,22 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LICK] +Name = LICK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ghost1 + Focus = Target + SetX = 0,400 + SetY = 0,142 + SetVisible = 0,true + SetY = 1,118 + SetY = 2,94 + SetY = 3,70 + SetY = 4,54 + SetY = 5,46 + SetOpacity = 6,100 diff --git a/PBS/Animations/Converted/Move/LIGHTSCREEN.txt b/PBS/Animations/Converted/Move/LIGHTSCREEN.txt new file mode 100644 index 000000000..bb25a6bbc --- /dev/null +++ b/PBS/Animations/Converted/Move/LIGHTSCREEN.txt @@ -0,0 +1,84 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LIGHTSCREEN] +Name = LIGHTSCREEN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 1,442 + SetY = 1,57 + SetX = 2,446 + SetY = 2,55 + SetX = 3,434 + SetY = 3,63 + SetY = 4,62 + SetX = 5,368 + SetY = 5,111 + SetX = 6,428 + SetY = 6,61 + SetX = 7,349 + SetY = 7,131 + SetX = 8,347 + SetY = 8,145 + SetX = 9,391 + SetY = 9,46 + SetX = 10,430 + SetY = 10,57 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 4,368 + SetY = 4,111 + SetX = 5,412 + SetY = 5,72 + SetX = 6,357 + SetY = 6,125 + SetX = 7,430 + SetY = 7,66 + SetX = 8,450 + SetY = 8,160 + SetX = 9,339 + SetY = 9,144 + SetX = 10,377 + SetY = 10,58 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 7,440 + SetY = 7,160 + SetX = 8,421 + SetY = 8,72 + SetX = 9,445 + SetY = 9,162 + SetX = 10,347 + SetY = 10,135 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 8,384 + SetY = 8,42 + SetX = 9,421 + SetY = 9,65 + SetX = 10,448 + SetY = 10,162 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetBlending = 1,1 + SetX = 1,390 + SetY = 1,95 + SetOpacity = 1,154 + + Play = 3,Flash2,100,170 + Play = 6,Flash2,100,180 diff --git a/PBS/Animations/Converted/Move/LOCKON.txt b/PBS/Animations/Converted/Move/LOCKON.txt new file mode 100644 index 000000000..f727be89d --- /dev/null +++ b/PBS/Animations/Converted/Move/LOCKON.txt @@ -0,0 +1,81 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LOCKON] +Name = LOCKON + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = mixed + Focus = Target + SetVisible = 0,true + SetX = 2,395 + SetY = 2,95 + SetZoomX = 2,200 + SetZoomY = 2,200 + SetX = 3,394 + SetY = 3,97 + SetX = 7,396 + SetY = 7,89 + + Graphic = mixed + Focus = Target + SetX = 0,395 + SetY = 0,99 + SetZoomX = 0,200 + SetZoomY = 0,200 + SetVisible = 0,true + SetX = 1,397 + SetY = 1,94 + SetX = 4,404 + SetY = 4,88 + SetX = 5,406 + SetY = 5,92 + SetY = 6,87 + SetX = 8,395 + SetY = 8,89 + SetX = 9,394 + SetY = 9,88 + SetX = 10,393 + SetY = 10,89 + SetY = 11,91 + SetX = 12,394 + SetY = 12,90 + SetX = 14,393 + SetY = 14,88 + SetX = 15,397 + SetX = 16,393 + SetY = 16,91 + SetX = 17,397 + SetY = 17,88 + SetX = 18,395 + SetY = 18,90 + SetX = 19,399 + SetY = 19,92 + SetX = 20,395 + SetY = 20,88 + SetX = 21,394 + SetY = 21,86 + SetX = 22,392 + SetY = 22,88 + SetX = 23,391 + SetY = 23,90 + SetX = 24,395 + SetY = 24,89 + SetX = 25,397 + SetX = 26,394 + SetY = 26,88 + SetX = 27,395 + SetY = 27,92 + SetOpacity = 27,236 + SetX = 28,393 + SetY = 28,90 + SetOpacity = 28,239 + SetX = 29,396 + SetY = 29,93 + SetOpacity = 29,168 + + Play = 0,Lock On,88,100 diff --git a/PBS/Animations/Converted/Move/LOVELYKISS.txt b/PBS/Animations/Converted/Move/LOVELYKISS.txt new file mode 100644 index 000000000..5893079bc --- /dev/null +++ b/PBS/Animations/Converted/Move/LOVELYKISS.txt @@ -0,0 +1,105 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LOVELYKISS] +Name = LOVELYKISS + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poi.hear.mus + Focus = UserAndTarget + SetX = 0,395 + SetY = 0,130 + SetVisible = 0,true + SetX = 1,383 + SetY = 1,102 + SetX = 2,382 + SetY = 2,112 + SetX = 3,351 + SetY = 3,103 + SetX = 4,349 + SetY = 4,106 + SetX = 5,359 + SetY = 5,131 + SetX = 6,368 + SetX = 7,360 + SetY = 7,134 + SetX = 8,353 + SetY = 8,108 + SetX = 9,357 + SetY = 9,106 + + Graphic = poi.hear.mus + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,376 + SetY = 1,94 + SetX = 2,405 + SetY = 2,120 + SetX = 3,368 + SetY = 3,116 + SetY = 4,131 + SetX = 5,377 + SetY = 5,108 + SetX = 6,340 + SetY = 6,114 + SetX = 7,332 + SetY = 7,115 + SetX = 8,372 + SetY = 8,98 + SetX = 9,366 + SetY = 9,56 + + Graphic = poi.hear.mus + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,407 + SetY = 1,139 + SetX = 2,372 + SetY = 2,90 + SetX = 3,361 + SetY = 3,85 + SetX = 4,363 + SetY = 4,76 + SetX = 5,349 + SetY = 5,90 + SetX = 6,364 + SetY = 6,93 + SetX = 7,367 + SetY = 7,97 + SetX = 8,356 + SetY = 8,79 + SetX = 9,370 + SetY = 9,86 + + Graphic = poi.hear.mus + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,370 + SetY = 5,70 + SetX = 6,337 + SetY = 6,80 + SetX = 7,332 + SetX = 8,330 + SetY = 8,73 + SetX = 9,368 + SetY = 9,72 + + Graphic = poi.hear.mus + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,359 + SetY = 6,56 + SetX = 7,355 + SetY = 7,60 + + Graphic = poi.hear.mus + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,331 + SetY = 7,59 + + Play = 0,Lovely Kiss,85,100 diff --git a/PBS/Animations/Converted/Move/LOWKICK.txt b/PBS/Animations/Converted/Move/LOWKICK.txt new file mode 100644 index 000000000..886fe934b --- /dev/null +++ b/PBS/Animations/Converted/Move/LOWKICK.txt @@ -0,0 +1,31 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LOWKICK] +Name = LOWKICK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetX = 0,480 + SetY = 0,158 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetOpacity = 0,100 + SetX = 1,424 + SetY = 1,134 + SetOpacity = 1,255 + SetX = 2,400 + SetY = 2,118 + SetX = 3,392 + SetY = 3,110 + SetZoomX = 4,100 + SetZoomY = 4,100 + SetOpacity = 5,100 + + Play = 2,Blow1,80,100 diff --git a/PBS/Animations/Converted/Move/LUCKYCHANT.txt b/PBS/Animations/Converted/Move/LUCKYCHANT.txt new file mode 100644 index 000000000..ef1cc6d17 --- /dev/null +++ b/PBS/Animations/Converted/Move/LUCKYCHANT.txt @@ -0,0 +1,296 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,LUCKYCHANT] +Name = LUCKYCHANT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet + Focus = UserAndTarget + SetX = 0,375 + SetY = 0,100 + SetVisible = 0,true + SetOpacity = 0,220 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetX = 0,336 + SetY = 0,87 + SetVisible = 0,true + SetX = 1,426 + SetY = 1,151 + SetX = 2,352 + SetY = 2,147 + SetX = 3,362 + SetY = 3,135 + SetX = 4,351 + SetY = 4,133 + SetX = 5,345 + SetY = 5,120 + SetX = 6,355 + SetY = 6,85 + SetX = 7,358 + SetY = 7,82 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetX = 0,336 + SetY = 0,104 + SetVisible = 0,true + SetX = 1,341 + SetY = 1,130 + SetX = 2,346 + SetY = 2,134 + SetX = 3,372 + SetY = 3,144 + SetX = 4,365 + SetY = 4,134 + SetX = 5,356 + SetY = 5,127 + SetX = 6,366 + SetY = 6,75 + SetX = 7,370 + SetY = 7,68 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,343 + SetY = 1,143 + SetX = 2,358 + SetY = 2,129 + SetX = 3,355 + SetY = 3,144 + SetX = 4,356 + SetY = 4,122 + SetX = 5,362 + SetY = 5,140 + SetX = 6,347 + SetY = 6,98 + SetX = 7,383 + SetY = 7,64 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,361 + SetY = 1,150 + SetX = 2,417 + SetY = 2,135 + SetX = 3,346 + SetY = 3,127 + SetX = 4,377 + SetY = 4,146 + SetX = 5,352 + SetY = 5,108 + SetY = 6,120 + SetX = 7,394 + SetY = 7,64 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,432 + SetY = 2,129 + SetX = 3,351 + SetY = 3,113 + SetX = 4,392 + SetY = 4,152 + SetX = 5,344 + SetY = 5,99 + SetX = 6,366 + SetY = 6,133 + SetX = 7,372 + SetY = 7,53 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,423 + SetY = 2,144 + SetX = 3,339 + SetY = 3,98 + SetX = 4,397 + SetY = 4,146 + SetX = 5,374 + SetY = 5,136 + SetX = 6,379 + SetY = 6,145 + SetX = 7,343 + SetY = 7,95 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,406 + SetY = 2,145 + SetX = 3,425 + SetY = 3,133 + SetX = 4,412 + SetY = 4,143 + SetX = 5,380 + SetY = 5,150 + SetX = 6,393 + SetY = 6,154 + SetX = 7,354 + SetY = 7,104 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,427 + SetY = 2,111 + SetX = 3,435 + SetY = 3,130 + SetX = 4,423 + SetY = 4,143 + SetX = 5,391 + SetY = 5,145 + SetX = 6,411 + SetY = 6,149 + SetX = 7,346 + SetY = 7,125 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,358 + SetY = 2,109 + SetX = 3,432 + SetY = 3,116 + SetX = 4,429 + SetY = 4,129 + SetX = 5,407 + SetY = 5,150 + SetX = 6,428 + SetY = 6,138 + SetX = 7,365 + SetY = 7,127 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,439 + SetY = 3,105 + SetY = 4,126 + SetX = 5,415 + SetY = 5,139 + SetX = 6,441 + SetY = 6,119 + SetX = 7,366 + SetY = 7,145 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,353 + SetY = 3,96 + SetX = 4,435 + SetY = 4,113 + SetX = 5,428 + SetY = 5,134 + SetX = 6,443 + SetY = 6,101 + SetX = 7,385 + SetY = 7,139 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,429 + SetY = 3,94 + SetX = 4,444 + SetY = 4,102 + SetX = 5,439 + SetY = 5,122 + SetX = 6,331 + SetY = 6,110 + SetX = 7,401 + SetY = 7,155 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,427 + SetY = 4,91 + SetX = 5,434 + SetY = 5,102 + SetX = 6,324 + SetY = 6,125 + SetX = 7,417 + SetY = 7,137 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,345 + SetY = 4,106 + SetX = 6,326 + SetY = 6,93 + SetX = 7,433 + SetY = 7,118 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,340 + SetY = 6,76 + SetX = 7,446 + SetY = 7,105 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,431 + SetY = 7,94 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,442 + SetY = 7,82 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,420 + SetY = 7,64 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,407 + SetY = 7,55 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,413 + SetY = 7,68 + SetOpacity = 9,128 + + Play = 0,Lucky Chant,100,100 diff --git a/PBS/Animations/Converted/Move/MACHPUNCH.txt b/PBS/Animations/Converted/Move/MACHPUNCH.txt new file mode 100644 index 000000000..02c950ce4 --- /dev/null +++ b/PBS/Animations/Converted/Move/MACHPUNCH.txt @@ -0,0 +1,74 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MACHPUNCH] +Name = MACHPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,399 + SetY = 2,95 + + Graphic = punches + Focus = Target + SetX = 0,403 + SetY = 0,97 + SetZoomX = 0,80 + SetZoomY = 0,80 + SetVisible = 0,true + SetX = 1,400 + SetY = 1,96 + SetZoomX = 1,90 + SetZoomY = 1,90 + SetX = 2,388 + SetY = 2,90 + SetZoomX = 2,100 + SetZoomY = 2,100 + SetX = 3,403 + SetY = 3,95 + SetZoomX = 3,110 + SetZoomY = 3,110 + SetY = 4,92 + SetZoomX = 4,120 + SetZoomY = 4,120 + SetX = 5,402 + SetZoomX = 5,130 + SetZoomY = 5,130 + SetX = 6,404 + SetY = 6,90 + SetZoomX = 6,140 + SetZoomY = 6,140 + SetX = 7,401 + SetY = 7,88 + SetZoomX = 7,160 + SetZoomY = 7,160 + SetX = 8,399 + SetZoomX = 8,170 + SetZoomY = 8,170 + SetX = 9,401 + SetY = 9,85 + SetZoomX = 9,180 + SetZoomY = 9,180 + SetOpacity = 9,220 + SetY = 10,89 + SetZoomX = 10,190 + SetZoomY = 10,190 + SetOpacity = 10,200 + SetX = 11,406 + SetY = 11,90 + SetZoomX = 11,220 + SetZoomY = 11,220 + SetOpacity = 11,130 + SetX = 12,415 + SetY = 12,96 + SetZoomX = 12,250 + SetZoomY = 12,250 + SetOpacity = 12,100 + + Play = 0,Mega Punch,100,94 diff --git a/PBS/Animations/Converted/Move/MAGICCOAT.txt b/PBS/Animations/Converted/Move/MAGICCOAT.txt new file mode 100644 index 000000000..d90492136 --- /dev/null +++ b/PBS/Animations/Converted/Move/MAGICCOAT.txt @@ -0,0 +1,127 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MAGICCOAT] +Name = MAGICCOAT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = anim sheet + Focus = Target + SetX = 0,385 + SetY = 0,98 + SetVisible = 0,true + SetOpacity = 0,37 + SetOpacity = 1,74 + SetOpacity = 9,72 + SetOpacity = 10,37 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 2,388 + SetY = 2,27 + SetX = 3,372 + SetY = 3,161 + SetX = 4,446 + SetY = 4,149 + SetX = 5,335 + SetY = 5,98 + SetX = 6,351 + SetY = 6,148 + SetX = 7,385 + SetY = 7,147 + SetX = 8,392 + SetY = 8,151 + SetX = 9,352 + SetY = 9,89 + SetX = 10,390 + SetY = 10,146 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 2,403 + SetY = 2,46 + SetX = 3,353 + SetY = 3,99 + SetX = 4,453 + SetY = 4,137 + SetX = 5,346 + SetY = 5,105 + SetX = 6,359 + SetY = 6,143 + SetX = 7,402 + SetY = 7,151 + SetX = 8,379 + SetY = 8,154 + SetX = 9,344 + SetY = 9,100 + SetX = 10,447 + SetY = 10,55 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 2,428 + SetY = 2,159 + SetX = 3,340 + SetY = 3,95 + SetY = 4,169 + SetX = 5,443 + SetY = 5,88 + SetX = 6,396 + SetY = 6,52 + SetX = 7,397 + SetY = 7,69 + SetX = 8,434 + SetY = 8,64 + SetX = 9,445 + SetY = 9,110 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 2,405 + SetY = 2,164 + SetX = 3,417 + SetY = 3,54 + SetX = 4,329 + SetY = 4,162 + SetX = 5,443 + SetY = 5,104 + SetX = 6,409 + SetY = 6,59 + SetX = 7,386 + SetY = 7,58 + SetX = 8,436 + SetY = 8,79 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 2,337 + SetY = 2,147 + SetX = 3,430 + SetY = 3,71 + SetX = 6,441 + SetY = 6,151 + SetX = 8,357 + SetY = 8,77 + + Graphic = anim sheet + Focus = Target + SetVisible = 0,true + SetX = 2,337 + SetY = 2,120 + SetX = 6,453 + SetY = 6,160 + SetX = 8,369 + SetY = 8,89 + + Play = 0,Sword2,80,100 + Play = 0,Sword2,80,101 + Play = 4,Sword2,80,100 diff --git a/PBS/Animations/Converted/Move/MEANLOOK.txt b/PBS/Animations/Converted/Move/MEANLOOK.txt new file mode 100644 index 000000000..48745cc06 --- /dev/null +++ b/PBS/Animations/Converted/Move/MEANLOOK.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MEANLOOK] +Name = MEANLOOK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = face and eye + Focus = Target + SetX = 0,384 + SetY = 0,92 + SetVisible = 0,true + SetY = 1,96 + SetY = 2,94 + SetX = 3,385 + SetY = 3,95 + SetX = 4,384 + SetY = 4,93 + SetY = 5,94 diff --git a/PBS/Animations/Converted/Move/MEGADRAIN.txt b/PBS/Animations/Converted/Move/MEGADRAIN.txt new file mode 100644 index 000000000..412c324fd --- /dev/null +++ b/PBS/Animations/Converted/Move/MEGADRAIN.txt @@ -0,0 +1,268 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MEGADRAIN] +Name = MEGADRAIN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = UserAndTarget + SetX = 0,345 + SetY = 0,91 + SetVisible = 0,true + SetX = 1,294 + SetY = 1,98 + SetX = 2,211 + SetY = 2,123 + SetX = 3,160 + SetY = 3,161 + SetX = 4,128 + SetY = 4,205 + SetX = 5,134 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,396 + SetY = 1,116 + SetX = 2,358 + SetY = 2,148 + SetX = 3,307 + SetY = 3,186 + SetX = 4,217 + SetY = 4,217 + SetX = 5,147 + SetY = 5,186 + SetX = 6,172 + SetY = 6,173 + SetX = 7,160 + SetY = 7,198 + SetX = 9,166 + SetY = 9,211 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,339 + SetY = 2,104 + SetX = 3,262 + SetY = 3,135 + SetX = 4,185 + SetY = 4,167 + SetX = 5,204 + SetY = 5,192 + SetX = 6,275 + SetY = 6,173 + SetX = 7,198 + SetY = 7,192 + SetX = 8,128 + SetY = 8,173 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,371 + SetY = 3,123 + SetX = 4,320 + SetY = 4,154 + SetX = 5,256 + SetY = 5,135 + SetY = 6,98 + SetX = 7,172 + SetY = 7,135 + SetX = 8,230 + SetY = 8,192 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,371 + SetY = 3,91 + SetX = 4,307 + SetY = 4,110 + SetX = 5,339 + SetY = 5,135 + SetX = 6,371 + SetY = 6,91 + SetX = 7,326 + SetY = 7,135 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,377 + SetY = 4,104 + SetX = 5,352 + SetY = 5,85 + SetX = 6,256 + SetY = 6,154 + SetX = 7,185 + SetY = 7,173 + + Graphic = rockice + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,371 + SetY = 4,85 + SetX = 5,313 + SetY = 5,116 + + Play = 0,Absorb2,80,100 + Play = 2,Absorb2,80,100 + Play = 5,Absorb2,80,100 + Play = 7,Absorb2,80,100 +#------------------------------- +[OppMove,MEGADRAIN] +Name = MEGADRAIN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,129 + SetY = 1,237 + SetX = 2,191 + SetY = 2,195 + SetX = 3,294 + SetY = 3,192 + SetX = 4,236 + SetY = 4,217 + SetX = 5,395 + SetY = 5,99 + SetX = 10,369 + SetY = 10,79 + SetX = 11,351 + SetX = 12,346 + SetY = 12,62 + SetX = 13,344 + SetY = 13,58 + SetX = 14,351 + SetY = 14,60 + SetX = 15,348 + SetY = 15,76 + SetX = 16,387 + SetY = 16,55 + SetX = 17,356 + SetY = 17,107 + SetX = 18,419 + SetY = 18,76 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,129 + SetY = 2,218 + SetX = 3,211 + SetY = 3,199 + SetX = 4,256 + SetY = 4,148 + SetX = 5,344 + SetY = 5,142 + SetX = 6,394 + SetY = 6,98 + SetX = 7,393 + SetY = 7,97 + SetX = 11,399 + SetY = 11,72 + SetX = 12,398 + SetY = 12,56 + SetX = 13,401 + SetY = 13,55 + SetX = 14,414 + SetY = 14,56 + SetX = 15,379 + SetY = 15,81 + SetX = 16,363 + SetY = 16,107 + SetX = 17,416 + SetY = 17,79 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,132 + SetY = 3,224 + SetX = 4,349 + SetY = 4,180 + SetX = 5,294 + SetY = 5,192 + SetX = 6,383 + SetY = 6,171 + SetX = 7,390 + SetY = 7,143 + SetX = 8,399 + SetY = 8,99 + SetX = 12,365 + SetY = 12,127 + SetX = 13,354 + SetY = 13,133 + SetX = 14,366 + SetY = 14,123 + SetX = 15,356 + SetY = 15,113 + SetX = 16,415 + SetY = 16,78 + + Graphic = leech-seed + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,307 + SetY = 4,97 + SetX = 5,249 + SetY = 5,116 + SetX = 6,324 + SetY = 6,113 + SetX = 13,399 + SetY = 13,87 + SetX = 14,401 + SetX = 15,406 + SetY = 15,71 + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,219 + SetVisible = 0,true + SetX = 1,149 + SetY = 1,233 + SetX = 2,221 + SetY = 2,174 + SetX = 3,204 + SetY = 3,123 + SetX = 4,147 + SetY = 4,167 + SetX = 5,372 + SetY = 5,100 + SetX = 7,356 + SetY = 7,98 + SetX = 9,395 + SetY = 9,97 + SetX = 10,400 + SetY = 10,96 + SetX = 11,391 + SetX = 12,393 + SetY = 12,99 + SetX = 13,395 + SetX = 14,401 + SetY = 14,100 + SetX = 15,395 + SetY = 15,99 + SetX = 16,345 + SetY = 16,82 + SetX = 17,395 + SetY = 17,57 + SetX = 18,364 + SetY = 18,108 + SetX = 19,408 + SetY = 19,80 + + Play = 0,Present - Heal,100,100 diff --git a/PBS/Animations/Converted/Move/MEGAHORN.txt b/PBS/Animations/Converted/Move/MEGAHORN.txt new file mode 100644 index 000000000..bf49b1268 --- /dev/null +++ b/PBS/Animations/Converted/Move/MEGAHORN.txt @@ -0,0 +1,104 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MEGAHORN] +Name = MEGAHORN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,51 + SetY = 0,116 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetVisible = 0,true + SetX = 1,89 + SetY = 1,154 + SetX = 2,140 + SetY = 2,192 + SetX = 3,153 + SetY = 3,167 + SetX = 4,211 + SetY = 4,154 + SetX = 5,192 + SetY = 5,236 + SetX = 9,345 + SetY = 9,98 + SetZoomX = 9,100 + SetZoomY = 9,100 + SetOpacity = 9,100 + SetZoomX = 10,125 + SetZoomY = 10,125 + SetOpacity = 10,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,275 + SetY = 0,242 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetVisible = 0,true + SetX = 1,185 + SetY = 1,148 + SetX = 2,179 + SetY = 2,179 + SetX = 3,236 + SetY = 3,116 + SetX = 4,89 + SetY = 4,173 + SetX = 5,185 + SetY = 5,186 + SetZoomX = 5,150 + SetZoomY = 5,150 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,204 + SetY = 0,104 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetVisible = 0,true + SetX = 1,224 + SetY = 1,224 + SetX = 2,185 + SetY = 2,205 + SetX = 4,211 + SetY = 4,249 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,121 + SetY = 2,110 + SetZoomX = 2,25 + SetZoomY = 2,25 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,185 + SetY = 0,186 + SetZoomX = 0,150 + SetZoomY = 0,150 + SetVisible = 0,true + SetX = 5,115 + SetY = 5,198 + SetZoomX = 5,25 + SetZoomY = 5,25 + SetX = 6,185 + SetY = 6,186 + SetZoomX = 6,150 + SetZoomY = 6,150 + SetX = 7,249 + SetY = 7,154 + SetX = 8,313 + SetY = 8,129 + SetX = 9,339 + SetY = 9,110 + + Play = 0,Up,80,100 + Play = 4,throw,80,100 + Play = 7,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/MEGAKICK.txt b/PBS/Animations/Converted/Move/MEGAKICK.txt new file mode 100644 index 000000000..f538fdb61 --- /dev/null +++ b/PBS/Animations/Converted/Move/MEGAKICK.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MEGAKICK] +Name = MEGAKICK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetVisible = 0,true + SetX = 3,384 + SetY = 3,110 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,376 + SetY = 0,86 + SetVisible = 0,true + SetY = 1,94 + SetAngle = 1,45 + SetX = 2,384 + SetY = 2,110 + SetAngle = 2,90 + SetAngle = 3,0 + SetOpacity = 3,100 + SetOpacity = 4,255 + SetZoomX = 8,120 + SetZoomY = 8,120 + SetOpacity = 9,100 + + Play = 0,Wind7,80,100 + Play = 3,Blow5,80,100 diff --git a/PBS/Animations/Converted/Move/MEGAPUNCH.txt b/PBS/Animations/Converted/Move/MEGAPUNCH.txt new file mode 100644 index 000000000..f76c6b848 --- /dev/null +++ b/PBS/Animations/Converted/Move/MEGAPUNCH.txt @@ -0,0 +1,64 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MEGAPUNCH] +Name = MEGAPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,396 + SetY = 2,104 + SetX = 3,397 + SetX = 4,395 + SetY = 4,101 + SetX = 6,400 + SetX = 7,397 + SetY = 7,106 + SetX = 8,395 + SetY = 8,107 + SetX = 9,399 + SetY = 9,101 + SetOpacity = 9,200 + + Graphic = punches + Focus = Target + SetX = 0,384 + SetY = 0,95 + SetVisible = 0,true + SetX = 1,385 + SetY = 1,93 + SetX = 2,384 + SetY = 2,97 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,386 + SetY = 3,99 + SetZoomX = 3,70 + SetZoomY = 3,70 + SetX = 4,385 + SetY = 4,97 + SetZoomX = 4,80 + SetZoomY = 4,80 + SetX = 6,386 + SetY = 6,92 + SetZoomX = 6,100 + SetZoomY = 6,100 + SetX = 7,385 + SetY = 7,94 + SetZoomX = 7,105 + SetZoomY = 7,105 + SetX = 8,383 + SetZoomX = 8,120 + SetZoomY = 8,120 + SetX = 9,385 + SetY = 9,91 + SetZoomX = 9,140 + SetZoomY = 9,140 + + Play = 0,Mega Punch,100,105 diff --git a/PBS/Animations/Converted/Move/METALCLAW.txt b/PBS/Animations/Converted/Move/METALCLAW.txt new file mode 100644 index 000000000..64a659556 --- /dev/null +++ b/PBS/Animations/Converted/Move/METALCLAW.txt @@ -0,0 +1,30 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,METALCLAW] +Name = METALCLAW + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = dragon claw + Focus = UserAndTarget + SetX = 0,387 + SetY = 0,70 + SetVisible = 0,true + SetX = 1,392 + SetY = 1,73 + SetX = 2,402 + SetY = 2,79 + SetX = 3,400 + SetY = 3,98 + SetX = 4,397 + SetY = 4,91 + SetY = 5,96 + SetX = 6,392 + SetX = 7,384 + + Play = 0,metal,100,110 + Play = 4,metal,100,100 diff --git a/PBS/Animations/Converted/Move/METEORMASH.txt b/PBS/Animations/Converted/Move/METEORMASH.txt new file mode 100644 index 000000000..eed1a141c --- /dev/null +++ b/PBS/Animations/Converted/Move/METEORMASH.txt @@ -0,0 +1,124 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,METEORMASH] +Name = METEORMASH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = UserAndTarget + SetX = 0,390 + SetY = 0,98 + SetVisible = 0,true + SetX = 1,395 + SetY = 1,100 + SetX = 2,390 + SetY = 2,98 + SetX = 6,395 + SetY = 6,100 + SetX = 7,390 + SetY = 7,98 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,389 + SetY = 1,150 + SetX = 2,386 + SetY = 2,151 + SetX = 3,384 + SetY = 3,150 + SetX = 4,361 + SetY = 4,59 + SetX = 5,387 + SetY = 5,134 + SetX = 6,433 + SetY = 6,115 + SetX = 7,368 + SetY = 7,143 + SetX = 8,344 + SetY = 8,38 + SetX = 9,416 + SetY = 9,141 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,340 + SetY = 1,116 + SetX = 2,334 + SetY = 2,106 + SetY = 3,103 + SetX = 4,419 + SetY = 4,142 + SetX = 5,414 + SetY = 5,129 + SetX = 6,356 + SetY = 6,141 + SetX = 7,405 + SetY = 7,58 + SetX = 8,335 + SetY = 8,83 + SetX = 9,361 + SetY = 9,149 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,419 + SetY = 2,61 + SetX = 3,412 + SetY = 3,78 + SetX = 4,421 + SetY = 4,74 + SetX = 5,409 + SetY = 5,69 + SetX = 6,347 + SetY = 6,75 + SetX = 7,427 + SetY = 7,111 + SetX = 8,411 + SetY = 8,71 + SetX = 9,402 + SetY = 9,57 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,429 + SetY = 2,131 + SetY = 3,136 + SetX = 4,386 + SetY = 4,139 + SetX = 5,440 + SetY = 5,102 + SetX = 6,356 + SetY = 6,103 + SetX = 7,346 + SetY = 7,52 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,369 + SetY = 3,68 + SetX = 5,341 + SetY = 5,105 + SetX = 6,426 + SetY = 6,96 + SetX = 7,335 + SetY = 7,85 + + Graphic = punches + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,371 + SetY = 5,67 + SetX = 6,385 + SetY = 6,64 + + Play = 0,superdamage,100,100 diff --git a/PBS/Animations/Converted/Move/METRONOME.txt b/PBS/Animations/Converted/Move/METRONOME.txt new file mode 100644 index 000000000..af2ba4ab4 --- /dev/null +++ b/PBS/Animations/Converted/Move/METRONOME.txt @@ -0,0 +1,93 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,METRONOME] +Name = METRONOME + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetX = 0,174 + SetY = 0,222 + SetZoomX = 0,200 + SetZoomY = 0,200 + SetVisible = 0,true + SetX = 1,187 + SetY = 1,233 + SetX = 2,200 + SetX = 3,214 + SetY = 3,234 + SetX = 4,202 + SetY = 4,228 + SetX = 5,179 + SetX = 6,162 + SetY = 6,233 + SetX = 7,178 + SetY = 7,227 + SetX = 8,197 + SetY = 8,236 + SetX = 9,213 + SetY = 9,238 + SetX = 10,222 + SetY = 10,226 + SetX = 11,199 + SetY = 11,225 + SetX = 12,184 + SetY = 12,230 + SetX = 13,176 + SetY = 13,238 + SetX = 14,183 + SetY = 14,245 + + Play = 0,Metronome,94,100 +#------------------------------- +[OppMove,METRONOME] +Name = METRONOME + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = finger.spoon + Focus = Target + SetX = 0,382 + SetY = 0,100 + SetZoomX = 0,200 + SetZoomY = 0,200 + SetVisible = 0,true + SetX = 1,375 + SetY = 1,101 + SetX = 2,366 + SetY = 2,100 + SetX = 3,360 + SetY = 3,104 + SetX = 4,373 + SetY = 4,107 + SetX = 5,391 + SetY = 5,110 + SetX = 6,406 + SetY = 6,106 + SetX = 7,399 + SetY = 7,107 + SetX = 8,377 + SetY = 8,108 + SetX = 9,368 + SetY = 9,110 + SetX = 10,382 + SetY = 10,112 + SetX = 11,398 + SetY = 11,115 + SetX = 12,409 + SetY = 12,111 + SetX = 13,403 + SetY = 13,114 + SetX = 14,392 + SetY = 14,113 + + Play = 0,Metronome,80,100 diff --git a/PBS/Animations/Converted/Move/MIST.txt b/PBS/Animations/Converted/Move/MIST.txt new file mode 100644 index 000000000..c877db2fb --- /dev/null +++ b/PBS/Animations/Converted/Move/MIST.txt @@ -0,0 +1,57 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MIST] +Name = MIST + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,414 + SetY = 4,101 + SetX = 5,393 + SetY = 5,66 + SetX = 6,422 + SetY = 6,113 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 5,426 + SetY = 5,116 + SetX = 6,381 + SetY = 6,64 + + Graphic = fly copy + Focus = Target + SetX = 0,385 + SetY = 0,99 + SetVisible = 0,true + SetOpacity = 0,144 + SetX = 1,392 + SetY = 1,96 + SetOpacity = 1,174 + SetX = 2,385 + SetY = 2,100 + SetOpacity = 2,209 + SetX = 3,382 + SetY = 3,99 + SetOpacity = 3,255 + SetX = 4,362 + SetY = 4,100 + SetX = 5,359 + SetY = 5,103 + SetX = 6,351 + SetY = 6,119 + SetX = 7,388 + SetY = 7,96 + SetX = 8,392 + SetY = 8,93 + SetOpacity = 8,200 + + Play = 0,Smokescreen,80,100 diff --git a/PBS/Animations/Converted/Move/MISTBALL.txt b/PBS/Animations/Converted/Move/MISTBALL.txt new file mode 100644 index 000000000..8435f989a --- /dev/null +++ b/PBS/Animations/Converted/Move/MISTBALL.txt @@ -0,0 +1,59 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MISTBALL] +Name = MISTBALL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,386 + SetY = 3,108 + SetOpacity = 3,200 + SetX = 4,388 + SetY = 4,110 + SetY = 5,109 + SetOpacity = 5,143 + SetX = 6,391 + SetY = 6,110 + SetOpacity = 6,69 + SetX = 7,388 + SetY = 7,101 + SetOpacity = 7,144 + + Graphic = fly copy + Focus = UserAndTarget + SetX = 0,385 + SetY = 0,98 + SetVisible = 0,true + SetOpacity = 0,200 + SetX = 1,383 + SetY = 1,99 + SetX = 2,382 + SetY = 2,100 + SetX = 3,385 + SetY = 3,97 + SetOpacity = 3,255 + SetX = 4,386 + SetY = 4,96 + SetZoomX = 4,110 + SetZoomY = 4,110 + SetX = 5,384 + SetY = 5,97 + SetZoomX = 5,100 + SetZoomY = 5,100 + SetX = 6,387 + SetY = 6,99 + SetX = 7,385 + SetY = 7,98 + SetX = 8,378 + SetY = 8,92 + SetX = 9,377 + SetY = 9,101 + + Play = 5,Wring Out,80,100 diff --git a/PBS/Animations/Converted/Move/MOONLIGHT.txt b/PBS/Animations/Converted/Move/MOONLIGHT.txt new file mode 100644 index 000000000..c15b1de27 --- /dev/null +++ b/PBS/Animations/Converted/Move/MOONLIGHT.txt @@ -0,0 +1,35 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MOONLIGHT] +Name = MOONLIGHT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal2 + Focus = Target + SetX = 0,384 + SetY = 0,206 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetVisible = 0,true + SetY = 1,190 + SetY = 2,158 + SetY = 3,110 + SetY = 4,70 + SetY = 5,38 + SetY = 6,14 + SetY = 7,-10 + SetZoomX = 7,60 + SetZoomY = 7,60 + SetZoomX = 8,70 + SetZoomY = 8,70 + SetOpacity = 8,150 + SetZoomX = 9,80 + SetZoomY = 9,80 + SetOpacity = 9,100 + + Play = 0,Saint6,80,100 diff --git a/PBS/Animations/Converted/Move/MORNINGSUN.txt b/PBS/Animations/Converted/Move/MORNINGSUN.txt new file mode 100644 index 000000000..08f2106a3 --- /dev/null +++ b/PBS/Animations/Converted/Move/MORNINGSUN.txt @@ -0,0 +1,27 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MORNINGSUN] +Name = MORNINGSUN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Heal3 + Focus = Target + SetVisible = 0,true + SetX = 10,384 + SetY = 10,70 + SetOpacity = 10,100 + + Graphic = Heal3 + Focus = Target + SetX = 0,384 + SetY = 0,70 + SetVisible = 0,true + SetOpacity = 13,150 + SetOpacity = 14,100 + + Play = 0,Saint7,80,100 diff --git a/PBS/Animations/Converted/Move/NIGHTMARE.txt b/PBS/Animations/Converted/Move/NIGHTMARE.txt new file mode 100644 index 000000000..3a50d73e9 --- /dev/null +++ b/PBS/Animations/Converted/Move/NIGHTMARE.txt @@ -0,0 +1,123 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,NIGHTMARE] +Name = NIGHTMARE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 022-Darkness01 + Focus = Target + SetVisible = 0,true + SetX = 1,424 + SetY = 1,46 + SetFlip = 5,true + SetX = 5,344 + SetY = 5,78 + SetFlip = 6,false + SetX = 6,376 + SetY = 6,118 + SetOpacity = 6,120 + SetX = 7,424 + SetY = 7,86 + SetOpacity = 7,255 + SetZoomX = 8,110 + SetZoomY = 8,110 + SetOpacity = 8,150 + SetFlip = 9,true + SetX = 9,336 + SetY = 9,70 + SetZoomX = 9,100 + SetZoomY = 9,100 + SetOpacity = 9,255 + SetZoomX = 10,110 + SetZoomY = 10,110 + SetOpacity = 10,150 + SetX = 11,376 + SetY = 11,94 + SetZoomX = 11,100 + SetZoomY = 11,100 + + Graphic = 022-Darkness01 + Focus = Target + SetVisible = 0,true + SetFlip = 2,true + SetX = 2,344 + SetY = 2,78 + SetFlip = 5,false + SetX = 5,376 + SetY = 5,118 + SetOpacity = 5,110 + SetX = 6,424 + SetY = 6,86 + SetOpacity = 6,255 + SetFlip = 7,true + SetX = 7,336 + SetY = 7,70 + SetX = 9,376 + SetY = 9,94 + SetOpacity = 9,200 + SetOpacity = 10,255 + + Graphic = 022-Darkness01 + Focus = Target + SetVisible = 0,true + SetX = 4,376 + SetY = 4,118 + SetOpacity = 4,100 + SetX = 5,424 + SetY = 5,86 + SetOpacity = 5,255 + SetFlip = 6,true + SetX = 6,336 + SetY = 6,30 + SetFlip = 7,false + SetX = 7,392 + SetY = 7,94 + SetOpacity = 8,150 + + Graphic = 022-Darkness01 + Focus = Target + SetVisible = 0,true + SetX = 4,424 + SetY = 4,86 + SetX = 5,392 + SetY = 5,94 + SetOpacity = 5,100 + SetOpacity = 6,200 + SetFlip = 8,true + SetX = 8,376 + SetOpacity = 8,100 + + Graphic = 022-Darkness01 + Focus = Target + SetX = 0,384 + SetY = 0,102 + SetVisible = 0,true + SetOpacity = 0,100 + SetOpacity = 1,150 + SetOpacity = 2,200 + SetFlip = 3,true + SetOpacity = 3,255 + SetOpacity = 4,150 + SetFlip = 5,false + SetX = 5,424 + SetY = 5,46 + SetZoomX = 5,110 + SetZoomY = 5,110 + SetFlip = 6,true + SetX = 6,344 + SetY = 6,78 + SetFlip = 7,false + SetX = 7,376 + SetY = 7,118 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetOpacity = 7,100 + SetOpacity = 8,90 + SetOpacity = 9,80 + SetOpacity = 10,70 + SetOpacity = 11,50 diff --git a/PBS/Animations/Converted/Move/OUTRAGE.txt b/PBS/Animations/Converted/Move/OUTRAGE.txt new file mode 100644 index 000000000..c53e47016 --- /dev/null +++ b/PBS/Animations/Converted/Move/OUTRAGE.txt @@ -0,0 +1,174 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,OUTRAGE] +Name = OUTRAGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Fogo - 01 + Focus = UserAndTarget + SetX = 0,102 + SetY = 0,161 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetVisible = 0,true + SetFlip = 3,true + SetFlip = 5,false + SetX = 5,262 + SetY = 5,135 + SetX = 6,307 + SetY = 6,91 + SetFlip = 7,true + SetX = 7,332 + SetY = 7,72 + SetOpacity = 7,100 + SetFlip = 8,false + SetX = 8,396 + SetY = 8,104 + SetX = 9,320 + SetY = 9,72 + SetFlip = 10,true + SetX = 10,275 + SetY = 10,91 + SetOpacity = 10,255 + SetX = 11,294 + SetY = 11,72 + SetOpacity = 11,100 + SetFlip = 12,false + SetX = 12,371 + SetY = 12,98 + + Graphic = Fogo - 01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,179 + SetY = 2,198 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetOpacity = 2,100 + SetX = 3,204 + SetY = 3,173 + SetOpacity = 3,255 + SetX = 4,230 + SetY = 4,154 + SetFlip = 5,true + SetX = 5,179 + SetY = 5,85 + SetX = 6,211 + SetY = 6,60 + SetOpacity = 6,100 + SetFlip = 7,false + SetX = 7,345 + SetY = 7,135 + SetOpacity = 7,255 + SetX = 8,428 + SetY = 8,179 + SetOpacity = 8,100 + SetFlip = 9,true + SetX = 9,243 + SetY = 9,123 + SetOpacity = 9,255 + SetFlip = 10,false + SetX = 10,230 + SetY = 10,66 + SetX = 11,339 + SetY = 11,129 + + Graphic = Fogo - 01 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 3,true + SetX = 3,89 + SetY = 3,161 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,140 + SetY = 4,116 + SetFlip = 5,false + SetX = 5,249 + SetY = 5,198 + SetX = 6,307 + SetY = 6,161 + SetFlip = 7,true + SetX = 7,160 + SetY = 7,66 + SetOpacity = 7,100 + SetFlip = 8,false + SetX = 8,288 + SetY = 8,104 + SetOpacity = 8,255 + SetX = 9,198 + SetY = 9,91 + SetX = 10,288 + SetY = 10,148 + + Graphic = Fogo - 01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,185 + SetY = 4,224 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetFlip = 5,true + SetX = 5,115 + SetY = 5,154 + SetX = 6,128 + SetY = 6,110 + SetFlip = 7,false + SetX = 7,371 + SetY = 7,198 + SetOpacity = 7,100 + SetFlip = 8,true + SetX = 8,204 + SetY = 8,154 + SetOpacity = 8,255 + SetFlip = 9,false + SetX = 9,224 + SetY = 9,186 + + Graphic = Fogo - 01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,224 + SetY = 5,217 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetOpacity = 5,100 + SetX = 6,294 + SetOpacity = 6,255 + SetX = 7,249 + SetY = 7,135 + SetX = 8,166 + + Graphic = Fogo - 01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,166 + SetY = 5,198 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetX = 6,204 + SetY = 6,173 + SetFlip = 7,true + SetX = 7,172 + SetY = 7,186 + SetFlip = 8,false + SetY = 8,217 + + Graphic = Fogo - 01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,128 + SetY = 7,186 + SetZoomX = 7,50 + SetZoomY = 7,50 + + Play = 0,Fire2,80,100 + Play = 0,Explosion6,80,100 + Play = 2,Fire2,80,100 + Play = 5,Fire2,80,100 + Play = 8,Fire2,80,100 diff --git a/PBS/Animations/Converted/Move/OVERHEAT.txt b/PBS/Animations/Converted/Move/OVERHEAT.txt new file mode 100644 index 000000000..198b1b719 --- /dev/null +++ b/PBS/Animations/Converted/Move/OVERHEAT.txt @@ -0,0 +1,113 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,OVERHEAT] +Name = OVERHEAT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fire4 + Focus = UserAndTarget + SetX = 0,134 + SetY = 0,179 + SetVisible = 0,true + SetY = 1,173 + SetY = 2,167 + SetY = 3,161 + SetY = 4,154 + SetY = 5,148 + SetY = 6,142 + SetY = 7,135 + SetY = 8,129 + SetY = 9,123 + SetY = 10,116 + SetY = 11,110 + + Graphic = fire4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,172 + SetY = 1,179 + SetX = 2,179 + SetY = 2,198 + SetX = 4,313 + SetY = 4,123 + SetX = 5,364 + SetY = 5,110 + SetX = 6,140 + SetY = 6,41 + SetFlip = 7,true + SetX = 7,467 + SetY = 7,211 + SetOpacity = 7,100 + + Graphic = fire4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,211 + SetY = 2,123 + SetX = 3,243 + SetY = 3,167 + SetX = 4,51 + SetY = 4,85 + SetX = 5,32 + SetY = 5,60 + SetX = 6,377 + SetY = 6,211 + + Graphic = fire4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,224 + SetX = 3,243 + SetY = 3,79 + SetX = 4,345 + SetY = 4,224 + SetX = 5,435 + SetY = 5,230 + SetOpacity = 5,100 + SetFlip = 6,true + SetX = 6,288 + SetY = 6,53 + SetOpacity = 6,255 + + Graphic = fire4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,96 + SetY = 3,167 + SetX = 4,140 + SetY = 4,129 + SetY = 5,72 + + Graphic = fire4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,256 + SetY = 3,217 + SetX = 4,192 + SetY = 4,198 + SetX = 5,268 + SetY = 5,205 + + Graphic = fire4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,83 + SetY = 4,186 + SetX = 5,32 + SetY = 5,192 + + Graphic = fire4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,179 + SetY = 4,135 + SetX = 5,236 + SetY = 5,79 + + Play = 0,Fire3,80,100 diff --git a/PBS/Animations/Converted/Move/PAYDAY.txt b/PBS/Animations/Converted/Move/PAYDAY.txt new file mode 100644 index 000000000..f144fce82 --- /dev/null +++ b/PBS/Animations/Converted/Move/PAYDAY.txt @@ -0,0 +1,67 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,PAYDAY] +Name = PAYDAY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,128 + SetY = 2,236 + SetX = 3,172 + SetY = 3,148 + SetX = 4,204 + SetY = 4,79 + SetX = 5,300 + SetY = 5,53 + SetX = 6,198 + SetY = 6,60 + SetX = 7,224 + SetY = 7,53 + SetX = 8,313 + SetY = 8,79 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,128 + SetY = 4,236 + SetX = 5,153 + SetY = 5,135 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,128 + SetY = 5,236 + + Graphic = 008-Weapon03 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,172 + SetY = 1,142 + SetX = 2,224 + SetY = 2,91 + SetX = 3,262 + SetY = 3,66 + SetX = 4,326 + SetY = 4,79 + SetX = 5,358 + SetY = 5,110 + SetX = 7,313 + SetY = 7,79 + SetX = 8,358 + SetY = 8,110 + + Play = 0,Select,80,100 + Play = 2,Select,80,100 + Play = 5,Select,80,100 + Play = 7,Select,80,100 diff --git a/PBS/Animations/Converted/Move/PETALDANCE.txt b/PBS/Animations/Converted/Move/PETALDANCE.txt new file mode 100644 index 000000000..e68b0492b --- /dev/null +++ b/PBS/Animations/Converted/Move/PETALDANCE.txt @@ -0,0 +1,105 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,PETALDANCE] +Name = PETALDANCE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Anima (1) + Focus = Target + SetVisible = 0,true + SetX = 2,576 + SetY = 2,-42 + SetX = 3,544 + SetY = 3,6 + SetFlip = 4,true + SetX = 4,504 + SetY = 4,62 + SetX = 5,448 + SetY = 5,126 + SetX = 6,408 + SetY = 6,166 + SetX = 7,392 + SetY = 7,222 + SetFlip = 8,false + SetX = 8,552 + SetY = 8,166 + SetX = 9,400 + SetY = 9,70 + SetZoomX = 9,120 + SetZoomY = 9,120 + + Graphic = Anima (1) + Focus = Target + SetVisible = 0,true + SetX = 3,344 + SetY = 3,-50 + SetX = 4,384 + SetY = 4,-2 + SetX = 5,416 + SetY = 5,38 + SetX = 6,464 + SetY = 6,86 + SetX = 7,512 + SetY = 7,142 + SetFlip = 8,true + SetX = 8,96 + SetY = 8,62 + + Graphic = Anima (1) + Focus = Target + SetVisible = 0,true + SetX = 5,320 + SetY = 5,-42 + SetX = 6,280 + SetY = 6,6 + SetX = 7,192 + SetY = 7,30 + SetX = 8,360 + SetY = 8,22 + + Graphic = Anima (1) + Focus = Target + SetVisible = 0,true + SetX = 7,320 + SetY = 7,-58 + + Graphic = Anima (1) + Focus = Target + SetX = 0,224 + SetY = 0,-34 + SetVisible = 0,true + SetX = 1,240 + SetY = 1,6 + SetX = 2,272 + SetY = 2,38 + SetX = 3,320 + SetY = 3,94 + SetFlip = 4,true + SetX = 4,376 + SetX = 5,360 + SetY = 5,102 + SetX = 6,320 + SetY = 6,126 + SetX = 7,264 + SetY = 7,174 + SetX = 8,200 + SetY = 8,222 + SetX = 9,72 + SetY = 9,86 + SetFlip = 10,false + SetX = 10,464 + SetY = 10,118 + SetZoomX = 10,120 + SetZoomY = 10,120 + SetFlip = 11,true + SetX = 11,568 + SetY = 11,182 + SetZoomX = 11,100 + SetZoomY = 11,100 + + Play = 0,Saint6,80,100 diff --git a/PBS/Animations/Converted/Move/PINMISSILE.txt b/PBS/Animations/Converted/Move/PINMISSILE.txt new file mode 100644 index 000000000..66ddefa6d --- /dev/null +++ b/PBS/Animations/Converted/Move/PINMISSILE.txt @@ -0,0 +1,491 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,PINMISSILE] +Name = PINMISSILE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,173 + SetX = 3,185 + SetY = 3,135 + SetX = 4,230 + SetY = 4,104 + SetAngle = 4,345 + SetX = 5,268 + SetY = 5,85 + SetAngle = 5,335 + SetX = 6,236 + SetY = 6,98 + SetAngle = 6,345 + SetX = 7,384 + SetY = 7,91 + SetAngle = 7,300 + SetX = 8,377 + SetAngle = 8,0 + SetOpacity = 8,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,166 + SetY = 4,161 + SetX = 5,198 + SetY = 5,129 + SetX = 6,364 + SetY = 6,85 + SetZoomX = 6,125 + SetZoomY = 6,125 + SetOpacity = 6,50 + SetX = 7,403 + SetY = 7,91 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetZoomX = 8,125 + SetZoomY = 8,125 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,364 + SetY = 5,91 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,179 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,142 + SetX = 2,211 + SetY = 2,110 + SetAngle = 2,345 + SetX = 3,243 + SetY = 3,104 + SetAngle = 3,335 + SetX = 4,294 + SetY = 4,85 + SetAngle = 4,325 + SetX = 5,345 + SetY = 5,91 + SetAngle = 5,300 + SetX = 6,313 + SetY = 6,79 + SetAngle = 6,325 + SetX = 7,288 + SetY = 7,72 + SetX = 8,358 + SetY = 8,91 + SetAngle = 8,300 + SetX = 9,377 + SetZoomX = 9,125 + SetZoomY = 9,125 + SetAngle = 9,0 + SetOpacity = 9,50 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 4,throw,80,100 + Play = 4,Slash10,80,100 + Play = 6,Slash10,80,100 + Play = 8,Slash10,80,100 +#------------------------------- +[Move,PINMISSILE,1] +Name = Pin Missile hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,179 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,142 + SetX = 2,211 + SetY = 2,110 + SetAngle = 2,345 + SetX = 3,243 + SetY = 3,104 + SetAngle = 3,335 + SetX = 4,294 + SetY = 4,85 + SetAngle = 4,325 + SetX = 5,345 + SetY = 5,91 + SetAngle = 5,300 + SetX = 6,313 + SetY = 6,79 + SetAngle = 6,325 + SetX = 7,288 + SetY = 7,72 + SetX = 8,358 + SetY = 8,91 + SetAngle = 8,300 + SetX = 9,377 + SetZoomX = 9,125 + SetZoomY = 9,125 + SetAngle = 9,0 + SetOpacity = 9,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,173 + SetX = 3,185 + SetY = 3,135 + SetX = 4,230 + SetY = 4,104 + SetAngle = 4,345 + SetX = 5,268 + SetY = 5,85 + SetAngle = 5,335 + SetX = 6,236 + SetY = 6,98 + SetAngle = 6,345 + SetX = 7,384 + SetY = 7,91 + SetAngle = 7,300 + SetX = 8,377 + SetAngle = 8,0 + SetOpacity = 8,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,166 + SetY = 4,161 + SetX = 5,198 + SetY = 5,129 + SetX = 6,364 + SetY = 6,85 + SetZoomX = 6,125 + SetZoomY = 6,125 + SetOpacity = 6,50 + SetX = 7,403 + SetY = 7,91 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetZoomX = 8,125 + SetZoomY = 8,125 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,364 + SetY = 5,91 + SetOpacity = 5,50 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 4,throw,80,100 + Play = 4,Slash10,80,100 + Play = 6,Slash10,80,100 + Play = 8,Slash10,80,100 +#------------------------------- +[Move,PINMISSILE,2] +Name = Pin Missile hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,364 + SetY = 5,91 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,179 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,142 + SetX = 2,211 + SetY = 2,110 + SetAngle = 2,345 + SetX = 3,243 + SetY = 3,104 + SetAngle = 3,335 + SetX = 4,294 + SetY = 4,85 + SetAngle = 4,325 + SetX = 5,345 + SetY = 5,91 + SetAngle = 5,300 + SetX = 6,313 + SetY = 6,79 + SetAngle = 6,325 + SetX = 7,288 + SetY = 7,72 + SetX = 8,358 + SetY = 8,91 + SetAngle = 8,300 + SetX = 9,377 + SetZoomX = 9,125 + SetZoomY = 9,125 + SetAngle = 9,0 + SetOpacity = 9,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,173 + SetX = 3,185 + SetY = 3,135 + SetX = 4,230 + SetY = 4,104 + SetAngle = 4,345 + SetX = 5,268 + SetY = 5,85 + SetAngle = 5,335 + SetX = 6,236 + SetY = 6,98 + SetAngle = 6,345 + SetX = 7,384 + SetY = 7,91 + SetAngle = 7,300 + SetX = 8,377 + SetAngle = 8,0 + SetOpacity = 8,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,166 + SetY = 4,161 + SetX = 5,198 + SetY = 5,129 + SetX = 6,364 + SetY = 6,85 + SetZoomX = 6,125 + SetZoomY = 6,125 + SetOpacity = 6,50 + SetX = 7,403 + SetY = 7,91 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetZoomX = 8,125 + SetZoomY = 8,125 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 4,throw,80,100 + Play = 4,Slash10,80,100 + Play = 6,Slash10,80,100 + Play = 8,Slash10,80,100 +#------------------------------- +[Move,PINMISSILE,3] +Name = Pin Missile hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,166 + SetY = 4,161 + SetX = 5,198 + SetY = 5,129 + SetX = 6,364 + SetY = 6,85 + SetZoomX = 6,125 + SetZoomY = 6,125 + SetOpacity = 6,50 + SetX = 7,403 + SetY = 7,91 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetZoomX = 8,125 + SetZoomY = 8,125 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,364 + SetY = 5,91 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,179 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,142 + SetX = 2,211 + SetY = 2,110 + SetAngle = 2,345 + SetX = 3,243 + SetY = 3,104 + SetAngle = 3,335 + SetX = 4,294 + SetY = 4,85 + SetAngle = 4,325 + SetX = 5,345 + SetY = 5,91 + SetAngle = 5,300 + SetX = 6,313 + SetY = 6,79 + SetAngle = 6,325 + SetX = 7,288 + SetY = 7,72 + SetX = 8,358 + SetY = 8,91 + SetAngle = 8,300 + SetX = 9,377 + SetZoomX = 9,125 + SetZoomY = 9,125 + SetAngle = 9,0 + SetOpacity = 9,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,173 + SetX = 3,185 + SetY = 3,135 + SetX = 4,230 + SetY = 4,104 + SetAngle = 4,345 + SetX = 5,268 + SetY = 5,85 + SetAngle = 5,335 + SetX = 6,236 + SetY = 6,98 + SetAngle = 6,345 + SetX = 7,384 + SetY = 7,91 + SetAngle = 7,300 + SetX = 8,377 + SetAngle = 8,0 + SetOpacity = 8,50 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 4,throw,80,100 + Play = 4,Slash10,80,100 + Play = 6,Slash10,80,100 + Play = 8,Slash10,80,100 +#------------------------------- +[Move,PINMISSILE,4] +Name = Pin Missile hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,173 + SetX = 3,185 + SetY = 3,135 + SetX = 4,230 + SetY = 4,104 + SetAngle = 4,345 + SetX = 5,268 + SetY = 5,85 + SetAngle = 5,335 + SetX = 6,236 + SetY = 6,98 + SetAngle = 6,345 + SetX = 7,384 + SetY = 7,91 + SetAngle = 7,300 + SetX = 8,377 + SetAngle = 8,0 + SetOpacity = 8,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,166 + SetY = 4,161 + SetX = 5,198 + SetY = 5,129 + SetX = 6,364 + SetY = 6,85 + SetZoomX = 6,125 + SetZoomY = 6,125 + SetOpacity = 6,50 + SetX = 7,403 + SetY = 7,91 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetZoomX = 8,125 + SetZoomY = 8,125 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,364 + SetY = 5,91 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,179 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,142 + SetX = 2,211 + SetY = 2,110 + SetAngle = 2,345 + SetX = 3,243 + SetY = 3,104 + SetAngle = 3,335 + SetX = 4,294 + SetY = 4,85 + SetAngle = 4,325 + SetX = 5,345 + SetY = 5,91 + SetAngle = 5,300 + SetX = 6,313 + SetY = 6,79 + SetAngle = 6,325 + SetX = 7,288 + SetY = 7,72 + SetX = 8,358 + SetY = 8,91 + SetAngle = 8,300 + SetX = 9,377 + SetZoomX = 9,125 + SetZoomY = 9,125 + SetAngle = 9,0 + SetOpacity = 9,50 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 4,throw,80,100 + Play = 4,Slash10,80,100 + Play = 6,Slash10,80,100 + Play = 8,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/POISONFANG.txt b/PBS/Animations/Converted/Move/POISONFANG.txt new file mode 100644 index 000000000..d91828359 --- /dev/null +++ b/PBS/Animations/Converted/Move/POISONFANG.txt @@ -0,0 +1,55 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,POISONFANG] +Name = POISONFANG + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 7,354 + SetY = 7,107 + SetX = 8,359 + SetY = 8,100 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 7,450 + SetY = 7,106 + SetX = 8,444 + SetY = 8,101 + + Graphic = element fangs + Focus = Target + SetX = 0,390 + SetY = 0,104 + SetVisible = 0,true + SetY = 1,103 + SetX = 2,389 + SetY = 2,93 + SetX = 3,386 + SetY = 3,102 + SetX = 4,385 + SetY = 4,101 + SetX = 5,392 + SetY = 5,95 + SetX = 6,390 + SetY = 6,98 + SetX = 7,392 + SetY = 7,103 + SetY = 8,93 + SetX = 9,387 + SetY = 9,97 + SetX = 10,392 + SetX = 11,389 + SetY = 11,96 + SetX = 12,391 + SetY = 12,98 + + Play = 6,Voltorb Flip Mark,100,161 diff --git a/PBS/Animations/Converted/Move/POISONGAS.txt b/PBS/Animations/Converted/Move/POISONGAS.txt new file mode 100644 index 000000000..59ed75f0b --- /dev/null +++ b/PBS/Animations/Converted/Move/POISONGAS.txt @@ -0,0 +1,142 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,POISONGAS] +Name = POISONGAS + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,160 + SetY = 1,192 + SetX = 2,204 + SetY = 2,173 + SetX = 3,249 + SetY = 3,148 + SetX = 4,307 + SetY = 4,123 + SetX = 5,358 + SetY = 5,110 + SetOpacity = 12,200 + SetOpacity = 13,100 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,128 + SetY = 1,236 + SetX = 2,160 + SetY = 2,192 + SetX = 3,204 + SetY = 3,173 + SetX = 4,249 + SetY = 4,148 + SetFlip = 5,true + SetX = 5,307 + SetY = 5,123 + SetFlip = 6,false + SetX = 6,320 + SetY = 6,142 + SetX = 7,300 + SetY = 7,135 + SetX = 8,313 + SetY = 8,129 + SetFlip = 9,true + SetX = 9,320 + SetY = 9,148 + SetFlip = 10,false + SetX = 10,300 + SetY = 10,135 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,128 + SetY = 2,236 + SetX = 3,160 + SetY = 3,192 + SetX = 4,204 + SetY = 4,173 + SetX = 5,249 + SetY = 5,148 + SetX = 6,256 + SetY = 6,167 + SetX = 7,275 + SetX = 8,256 + SetY = 8,135 + SetX = 9,288 + SetX = 10,332 + SetY = 10,161 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,166 + SetY = 3,224 + SetX = 4,160 + SetY = 4,192 + SetX = 5,217 + SetY = 5,154 + SetX = 6,332 + SetY = 6,161 + SetX = 7,230 + SetY = 7,148 + SetX = 8,262 + SetY = 8,154 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetX = 4,198 + SetY = 4,205 + SetX = 5,192 + SetY = 5,179 + SetX = 6,256 + SetY = 6,129 + SetFlip = 7,true + SetX = 7,236 + SetY = 7,198 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 5,true + SetX = 5,230 + SetY = 5,198 + SetFlip = 6,false + SetX = 6,288 + SetY = 6,186 + SetX = 7,217 + SetY = 7,192 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,230 + SetY = 6,192 + SetX = 7,320 + SetY = 7,186 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,243 + SetY = 6,148 + + Graphic = poison + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 6,true + SetX = 6,204 + SetY = 6,173 + + Play = 0,Wind8,80,100 diff --git a/PBS/Animations/Converted/Move/POISONPOWDER.txt b/PBS/Animations/Converted/Move/POISONPOWDER.txt new file mode 100644 index 000000000..4ce8223eb --- /dev/null +++ b/PBS/Animations/Converted/Move/POISONPOWDER.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,POISONPOWDER] +Name = POISONPOWDER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Special5 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/POISONSTING.txt b/PBS/Animations/Converted/Move/POISONSTING.txt new file mode 100644 index 000000000..31b7f52ed --- /dev/null +++ b/PBS/Animations/Converted/Move/POISONSTING.txt @@ -0,0 +1,68 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,POISONSTING] +Name = POISONSTING + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,166 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,256 + SetY = 3,142 + SetX = 4,288 + SetY = 4,123 + SetX = 5,300 + SetY = 5,129 + SetX = 6,352 + SetY = 6,110 + SetX = 7,358 + + Play = 0,throw,80,100 + Play = 6,Slash10,80,100 +#------------------------------- +[OppMove,POISONSTING] +Name = POISONSTING + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetX = 0,351 + SetY = 0,139 + SetAngle = 0,180 + SetVisible = 0,true + SetX = 1,319 + SetY = 1,154 + SetX = 2,287 + SetY = 2,168 + SetX = 3,255 + SetY = 3,183 + SetX = 4,223 + SetY = 4,197 + SetX = 5,191 + SetY = 5,211 + SetX = 6,159 + SetY = 6,226 + SetX = 7,122 + SetY = 7,221 + SetAngle = 7,0 + SetX = 8,128 + SetY = 8,236 + + Play = 0,throw,80,100 + Play = 6,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/POISONTAIL.txt b/PBS/Animations/Converted/Move/POISONTAIL.txt new file mode 100644 index 000000000..a9a41e53f --- /dev/null +++ b/PBS/Animations/Converted/Move/POISONTAIL.txt @@ -0,0 +1,25 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,POISONTAIL] +Name = POISONTAIL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = firepoison + Focus = Target + SetX = 0,392 + SetY = 0,94 + SetVisible = 0,true + SetX = 1,384 + SetY = 2,86 + SetX = 4,376 + SetZoomX = 7,110 + SetZoomY = 7,110 + SetOpacity = 7,100 + + Play = 0,Blow3,80,100 + Play = 0,Poison,80,100 diff --git a/PBS/Animations/Converted/Move/POUND.txt b/PBS/Animations/Converted/Move/POUND.txt new file mode 100644 index 000000000..f1d2c5320 --- /dev/null +++ b/PBS/Animations/Converted/Move/POUND.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,POUND] +Name = POUND + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = many + Focus = Target + SetVisible = 0,true + SetX = 3,392 + SetY = 3,94 + SetOpacity = 4,100 + + Graphic = many + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + SetOpacity = 0,100 + SetOpacity = 1,255 + SetZoomX = 2,120 + SetZoomY = 2,120 + SetZoomX = 3,130 + SetZoomY = 3,130 + SetZoomX = 4,110 + SetZoomY = 4,110 + SetZoomX = 5,100 + SetZoomY = 5,100 + SetOpacity = 5,100 + + Play = 0,Blow1,80,100 diff --git a/PBS/Animations/Converted/Move/PSYCHIC.txt b/PBS/Animations/Converted/Move/PSYCHIC.txt new file mode 100644 index 000000000..44f9da64b --- /dev/null +++ b/PBS/Animations/Converted/Move/PSYCHIC.txt @@ -0,0 +1,74 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,PSYCHIC] +Name = PSYCHIC + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = efftest4 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + SetZoomX = 5,160 + SetZoomY = 5,160 + SetOpacity = 5,180 + SetZoomX = 6,190 + SetZoomY = 6,190 + SetZoomX = 7,250 + SetZoomY = 7,250 + SetZoomX = 8,300 + SetZoomY = 8,300 + SetZoomX = 9,100 + SetZoomY = 9,100 + SetOpacity = 9,255 + SetZoomX = 12,300 + SetZoomY = 12,300 + SetOpacity = 12,180 + SetX = 14,376 + SetY = 14,86 + SetY = 15,94 + SetX = 17,384 + SetZoomX = 17,100 + SetZoomY = 17,100 + SetOpacity = 17,75 + + Graphic = efftest4 + Focus = Target + SetVisible = 0,true + SetX = 9,384 + SetY = 9,94 + SetZoomX = 9,300 + SetZoomY = 9,300 + SetOpacity = 9,180 + + Graphic = efftest4 + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetVisible = 0,true + SetY = 3,94 + SetZoomX = 3,120 + SetZoomY = 3,120 + SetZoomX = 4,140 + SetZoomY = 4,140 + SetOpacity = 4,220 + SetZoomX = 5,100 + SetZoomY = 5,100 + SetOpacity = 5,150 + SetOpacity = 7,100 + SetOpacity = 9,50 + SetOpacity = 12,255 + SetOpacity = 13,150 + SetOpacity = 14,255 + SetZoomX = 15,80 + SetZoomY = 15,80 + SetZoomX = 16,70 + SetZoomY = 16,70 + SetOpacity = 16,150 + + Play = 2,Darkness2,80,100 diff --git a/PBS/Animations/Converted/Move/PSYCHOCUT.txt b/PBS/Animations/Converted/Move/PSYCHOCUT.txt new file mode 100644 index 000000000..eb2bf6919 --- /dev/null +++ b/PBS/Animations/Converted/Move/PSYCHOCUT.txt @@ -0,0 +1,184 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,PSYCHOCUT] +Name = PSYCHOCUT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Psycho Cut + Focus = Target + SetX = 0,140 + SetY = 0,248 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,141 + SetY = 1,257 + SetOpacity = 1,236 + SetX = 2,138 + SetY = 2,261 + SetOpacity = 2,107 + SetX = 4,126 + SetY = 4,283 + SetOpacity = 4,255 + SetX = 6,144 + SetY = 6,296 + SetX = 8,163 + SetY = 8,267 + SetX = 9,196 + SetY = 9,233 + SetX = 11,237 + SetY = 11,209 + SetX = 12,264 + SetY = 12,200 + SetZoomX = 12,120 + SetZoomY = 12,120 + SetX = 13,278 + SetY = 13,190 + SetZoomX = 13,140 + SetZoomY = 13,140 + SetX = 14,294 + SetY = 14,184 + SetZoomX = 14,160 + SetZoomY = 14,160 + SetX = 15,326 + SetY = 15,165 + SetZoomX = 15,180 + SetZoomY = 15,180 + SetOpacity = 15,200 + SetX = 16,358 + SetY = 16,143 + SetOpacity = 16,139 + SetX = 17,383 + SetY = 17,123 + SetOpacity = 17,100 + SetX = 18,439 + SetY = 18,97 + SetOpacity = 18,60 + + Graphic = Psycho Cut + Focus = Target + SetVisible = 0,true + SetX = 1,163 + SetY = 1,256 + SetX = 2,142 + SetY = 2,252 + SetX = 3,134 + SetY = 3,263 + SetX = 5,131 + SetY = 5,292 + SetX = 7,160 + SetY = 7,288 + SetX = 9,161 + SetY = 9,253 + SetX = 10,146 + SetY = 10,240 + SetOpacity = 10,200 + SetX = 11,127 + SetY = 11,255 + SetOpacity = 11,100 + SetX = 12,123 + SetY = 12,264 + SetOpacity = 12,50 + + Play = 0,Psycho Cut,100,100 +#------------------------------- +[OppMove,PSYCHOCUT] +Name = PSYCHOCUT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Psycho Cut + Focus = UserAndTarget + SetX = 0,396 + SetY = 0,111 + SetVisible = 0,true + SetOpacity = 0,128 + SetX = 1,375 + SetY = 1,125 + SetOpacity = 1,255 + SetX = 2,370 + SetY = 2,138 + SetX = 3,380 + SetY = 3,150 + SetX = 4,396 + SetY = 4,157 + SetX = 5,412 + SetY = 5,146 + SetX = 6,416 + SetY = 6,131 + SetX = 7,415 + SetY = 7,123 + SetX = 8,396 + SetY = 8,111 + SetX = 9,375 + SetY = 9,125 + SetFlip = 10,true + SetX = 10,349 + SetY = 10,143 + SetOpacity = 10,128 + SetX = 11,319 + SetY = 11,164 + SetOpacity = 11,255 + SetX = 12,297 + SetY = 12,170 + SetZoomX = 12,125 + SetZoomY = 12,125 + SetX = 13,283 + SetY = 13,183 + SetZoomX = 13,150 + SetZoomY = 13,150 + SetX = 14,251 + SetY = 14,191 + SetZoomX = 14,160 + SetZoomY = 14,160 + SetX = 15,223 + SetY = 15,208 + SetZoomX = 15,170 + SetZoomY = 15,170 + SetX = 16,188 + SetY = 16,215 + SetZoomX = 16,180 + SetZoomY = 16,180 + SetOpacity = 16,192 + SetX = 17,150 + SetY = 17,241 + SetOpacity = 17,128 + SetX = 18,114 + SetY = 18,264 + SetOpacity = 18,64 + + Graphic = Psycho Cut + Focus = UserAndTarget + SetX = 0,389 + SetY = 0,126 + SetVisible = 0,true + SetOpacity = 0,128 + SetAngle = 1,45 + SetOpacity = 1,255 + SetAngle = 2,90 + SetAngle = 3,135 + SetAngle = 4,180 + SetAngle = 5,225 + SetAngle = 6,270 + SetAngle = 7,316 + SetAngle = 8,0 + SetAngle = 9,45 + SetAngle = 10,90 + SetAngle = 11,135 + SetAngle = 12,180 + SetAngle = 13,225 + SetAngle = 14,270 + SetAngle = 15,315 + SetOpacity = 15,170 + SetAngle = 16,0 + SetOpacity = 16,85 + + Play = 0,Psycho Cut,100,100 diff --git a/PBS/Animations/Converted/Move/QUICKATTACK.txt b/PBS/Animations/Converted/Move/QUICKATTACK.txt new file mode 100644 index 000000000..e68670b59 --- /dev/null +++ b/PBS/Animations/Converted/Move/QUICKATTACK.txt @@ -0,0 +1,60 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,QUICKATTACK] +Name = QUICKATTACK + + SetX = 0,128 + SetY = 0,224 + SetOpacity = 1,170 + SetOpacity = 2,85 + SetOpacity = 6,255 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Tackle_B + Focus = User + SetVisible = 0,true + SetX = 2,59 + SetY = 2,258 + SetOpacity = 3,170 + SetOpacity = 4,85 + + Graphic = Tackle_B + Focus = User + SetVisible = 0,true + SetX = 3,100 + SetY = 3,272 + SetOpacity = 4,170 + SetOpacity = 5,85 + + Graphic = Tackle_B + Focus = User + SetVisible = 0,true + SetX = 4,163 + SetY = 4,259 + SetOpacity = 5,170 + SetOpacity = 6,85 + + Graphic = Tackle_B + Focus = User + SetVisible = 0,true + SetX = 5,140 + SetY = 5,230 + SetOpacity = 6,170 + SetOpacity = 7,85 + + Graphic = Tackle_B + Focus = Target + SetVisible = 0,true + SetX = 1,76 + SetY = 1,230 + SetOpacity = 2,170 + SetOpacity = 3,85 + SetX = 7,384 + SetY = 7,96 + SetOpacity = 7,128 + SetOpacity = 8,255 + SetOpacity = 11,128 + + Play = 7,Blow4,100,100 diff --git a/PBS/Animations/Converted/Move/RAINDANCE.txt b/PBS/Animations/Converted/Move/RAINDANCE.txt new file mode 100644 index 000000000..fc842e871 --- /dev/null +++ b/PBS/Animations/Converted/Move/RAINDANCE.txt @@ -0,0 +1,251 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,RAINDANCE] +Name = RAINDANCE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,197 + SetY = 0,25 + SetVisible = 0,true + SetX = 1,72 + SetY = 1,49 + SetX = 2,60 + SetY = 2,42 + SetX = 3,43 + SetY = 3,62 + SetY = 4,66 + SetX = 5,480 + SetY = 5,78 + SetX = 6,201 + SetY = 6,65 + SetX = 7,80 + SetY = 7,62 + SetX = 8,265 + SetY = 8,218 + SetX = 9,99 + SetY = 9,55 + + Graphic = weather + Focus = Screen + SetX = 0,275 + SetY = 0,47 + SetVisible = 0,true + SetX = 1,229 + SetY = 1,216 + SetX = 2,193 + SetY = 2,131 + SetX = 3,205 + SetY = 3,111 + SetX = 4,122 + SetY = 4,73 + SetX = 5,361 + SetY = 5,34 + SetX = 6,278 + SetY = 6,211 + SetX = 7,239 + SetY = 7,122 + SetX = 8,398 + SetY = 8,251 + SetX = 9,253 + SetY = 9,148 + + Graphic = weather + Focus = Screen + SetX = 0,355 + SetY = 0,51 + SetVisible = 0,true + SetX = 1,109 + SetY = 1,217 + SetX = 2,265 + SetY = 2,233 + SetX = 3,289 + SetY = 3,227 + SetX = 4,148 + SetY = 4,143 + SetX = 5,404 + SetY = 5,152 + SetX = 6,397 + SetY = 6,257 + SetX = 7,172 + SetY = 7,23 + SetX = 8,270 + SetY = 8,110 + SetX = 9,254 + SetY = 9,274 + + Graphic = weather + Focus = Screen + SetX = 0,450 + SetY = 0,50 + SetVisible = 0,true + SetX = 1,223 + SetY = 1,110 + SetX = 2,228 + SetY = 2,82 + SetX = 3,279 + SetY = 3,63 + SetX = 4,203 + SetY = 4,141 + SetX = 5,274 + SetY = 5,69 + SetX = 6,478 + SetY = 6,170 + SetX = 7,25 + SetY = 7,169 + SetX = 8,491 + SetY = 8,59 + SetX = 9,418 + SetY = 9,243 + + Graphic = weather + Focus = Screen + SetX = 0,83 + SetY = 0,81 + SetVisible = 0,true + SetX = 1,399 + SetY = 1,120 + SetX = 2,350 + SetY = 2,43 + SetX = 3,31 + SetY = 3,176 + SetX = 4,101 + SetY = 4,242 + SetX = 5,54 + SetY = 5,71 + SetX = 6,480 + SetY = 6,53 + SetX = 7,263 + SetY = 7,251 + SetX = 8,492 + SetY = 8,204 + SetX = 9,181 + SetY = 9,238 + + Graphic = weather + Focus = Screen + SetX = 0,231 + SetY = 0,170 + SetVisible = 0,true + SetX = 1,480 + SetY = 1,83 + SetX = 2,399 + SetY = 2,154 + SetX = 3,475 + SetY = 3,231 + SetX = 4,185 + SetY = 4,249 + SetX = 5,155 + SetY = 5,126 + SetX = 6,28 + SetY = 6,111 + SetX = 7,146 + SetY = 7,249 + SetX = 8,91 + SetY = 8,63 + SetX = 9,108 + SetY = 9,245 + + Graphic = weather + Focus = Screen + SetX = 0,352 + SetY = 0,212 + SetVisible = 0,true + SetX = 1,362 + SetY = 1,63 + SetX = 2,488 + SetY = 2,60 + SetX = 3,482 + SetY = 3,85 + SetX = 4,290 + SetY = 4,114 + SetX = 5,210 + SetY = 5,242 + SetX = 6,119 + SetY = 6,59 + SetX = 7,29 + SetY = 7,266 + SetX = 8,35 + SetY = 8,173 + SetX = 9,25 + SetY = 9,205 + + Graphic = weather + Focus = Screen + SetX = 0,467 + SetY = 0,254 + SetVisible = 0,true + SetX = 1,376 + SetY = 1,192 + SetX = 2,434 + SetY = 2,253 + SetX = 3,381 + SetY = 3,12 + SetX = 4,440 + SetY = 4,119 + SetX = 5,55 + SetY = 5,232 + SetX = 6,77 + SetY = 6,215 + SetX = 7,367 + SetY = 7,134 + SetX = 8,187 + SetY = 8,144 + SetX = 9,148 + SetY = 9,25 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 1,482 + SetY = 1,244 + SetX = 2,121 + SetY = 2,249 + SetX = 3,382 + SetY = 3,209 + SetX = 4,378 + SetY = 4,150 + SetX = 5,422 + SetY = 5,252 + SetX = 7,471 + SetY = 7,126 + SetX = 9,247 + SetY = 9,72 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 2,27 + SetY = 2,241 + SetX = 3,88 + SetY = 3,177 + SetX = 4,337 + SetY = 4,243 + SetX = 5,319 + SetY = 5,241 + SetX = 7,363 + SetY = 7,237 + SetX = 9,365 + SetY = 9,42 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 4,409 + SetY = 4,203 + SetX = 7,443 + SetY = 7,194 + SetX = 9,479 + SetY = 9,180 + + Graphic = weather + Focus = Screen + SetVisible = 0,true + SetX = 9,474 + SetY = 9,41 diff --git a/PBS/Animations/Converted/Move/RAZORLEAF.txt b/PBS/Animations/Converted/Move/RAZORLEAF.txt new file mode 100644 index 000000000..f5a5fd552 --- /dev/null +++ b/PBS/Animations/Converted/Move/RAZORLEAF.txt @@ -0,0 +1,128 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,RAZORLEAF] +Name = RAZORLEAF + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,144 + SetY = 1,204 + SetX = 2,175 + SetY = 2,184 + SetX = 3,211 + SetY = 3,158 + SetX = 4,268 + SetY = 4,132 + SetX = 5,331 + SetY = 5,116 + SetX = 6,274 + SetY = 6,134 + SetX = 7,331 + SetY = 7,116 + SetX = 8,237 + SetY = 8,160 + SetX = 9,268 + SetY = 9,140 + SetX = 10,331 + SetY = 10,116 + SetX = 11,326 + SetY = 11,178 + SetX = 12,331 + SetY = 12,116 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,154 + SetY = 2,120 + SetX = 3,123 + SetY = 3,108 + SetX = 4,164 + SetY = 4,172 + SetX = 5,222 + SetY = 5,154 + SetX = 6,196 + SetY = 6,96 + SetX = 7,185 + SetY = 7,172 + SetX = 8,118 + SetY = 8,114 + SetX = 9,216 + SetY = 9,112 + SetX = 10,201 + SetY = 10,130 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,258 + SetY = 3,208 + SetX = 4,263 + SetY = 4,242 + SetX = 5,175 + SetY = 5,80 + SetX = 6,284 + SetY = 6,210 + SetX = 7,232 + SetY = 7,214 + SetX = 8,274 + SetY = 8,270 + SetX = 10,357 + SetY = 10,182 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,211 + SetY = 4,78 + SetX = 5,118 + SetY = 5,178 + SetX = 6,336 + SetY = 6,158 + SetX = 7,362 + SetY = 7,176 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,336 + SetY = 4,166 + SetX = 5,305 + SetY = 5,282 + SetX = 7,289 + SetY = 7,108 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,154 + SetY = 4,136 + SetX = 5,346 + SetY = 5,194 + SetX = 7,154 + SetY = 7,112 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,216 + SetY = 5,96 + + Graphic = grass + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,279 + SetY = 5,144 + + Play = 1,Slash8,80,100 + Play = 3,Slash8,80,100 + Play = 6,Slash8,80,100 + Play = 8,Slash8,80,100 + Play = 10,Slash8,80,100 diff --git a/PBS/Animations/Converted/Move/REFLECT.txt b/PBS/Animations/Converted/Move/REFLECT.txt new file mode 100644 index 000000000..9dc65e5a7 --- /dev/null +++ b/PBS/Animations/Converted/Move/REFLECT.txt @@ -0,0 +1,93 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,REFLECT] +Name = REFLECT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal2 + Focus = Target + SetX = 0,376 + SetY = 0,86 + SetVisible = 0,true + SetOpacity = 0,75 + SetOpacity = 1,100 + SetOpacity = 2,150 + SetOpacity = 3,255 + SetOpacity = 6,150 + SetOpacity = 7,100 + + Graphic = normal2 + Focus = Target + SetVisible = 0,true + SetX = 1,328 + SetY = 1,-18 + SetX = 2,304 + SetY = 2,22 + SetX = 3,288 + SetY = 3,86 + SetOpacity = 3,200 + SetX = 4,296 + SetY = 4,158 + SetOpacity = 4,255 + SetX = 5,280 + SetY = 5,214 + SetX = 6,416 + SetY = 6,238 + SetX = 7,312 + SetY = 7,222 + + Graphic = normal2 + Focus = Target + SetVisible = 0,true + SetX = 1,464 + SetY = 1,-10 + SetX = 2,488 + SetY = 2,38 + SetX = 3,480 + SetY = 3,94 + SetX = 4,512 + SetY = 4,158 + SetX = 5,496 + SetY = 5,230 + SetX = 6,336 + SetY = 6,150 + SetX = 7,432 + SetY = 7,230 + + Graphic = normal2 + Focus = Target + SetVisible = 0,true + SetX = 2,392 + SetY = 2,-18 + SetY = 3,22 + SetX = 4,424 + SetY = 4,102 + SetX = 5,376 + SetY = 5,166 + SetX = 6,464 + SetY = 6,126 + + Graphic = normal2 + Focus = Target + SetVisible = 0,true + SetX = 3,328 + SetY = 3,-18 + SetX = 4,352 + SetY = 4,38 + SetX = 5,320 + SetY = 5,78 + + Graphic = normal2 + Focus = Target + SetVisible = 0,true + SetX = 4,432 + SetY = 4,-10 + SetX = 5,400 + SetY = 5,54 + + Play = 0,Saint7,80,100 diff --git a/PBS/Animations/Converted/Move/REST.txt b/PBS/Animations/Converted/Move/REST.txt new file mode 100644 index 000000000..7bdefd721 --- /dev/null +++ b/PBS/Animations/Converted/Move/REST.txt @@ -0,0 +1,34 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,REST] +Name = REST + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetX = 0,357 + SetY = 0,67 + SetVisible = 0,true + SetX = 1,338 + SetY = 1,49 + SetX = 2,320 + SetY = 2,30 + SetX = 3,307 + SetY = 3,21 + SetX = 4,317 + SetY = 4,38 + SetX = 5,294 + SetY = 5,1 + SetX = 6,348 + SetY = 6,50 + SetX = 7,330 + SetY = 7,37 + SetX = 8,308 + SetY = 8,10 + + Play = 0,Refresh,80,100 diff --git a/PBS/Animations/Converted/Move/ROAR.txt b/PBS/Animations/Converted/Move/ROAR.txt new file mode 100644 index 000000000..1d3d74fa2 --- /dev/null +++ b/PBS/Animations/Converted/Move/ROAR.txt @@ -0,0 +1,104 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ROAR] +Name = ROAR + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Growl + Focus = Target + SetX = 0,193 + SetY = 0,215 + SetAngle = 0,10 + SetVisible = 0,true + SetX = 1,214 + SetY = 1,194 + SetX = 2,228 + SetY = 2,176 + SetX = 3,273 + SetY = 3,153 + SetX = 4,301 + SetY = 4,155 + + Graphic = Growl + Focus = Target + SetX = 0,176 + SetY = 0,199 + SetVisible = 0,true + SetX = 1,190 + SetY = 1,170 + SetX = 2,214 + SetY = 2,142 + SetX = 3,252 + SetY = 3,112 + SetX = 4,282 + SetY = 4,89 + + Graphic = Growl + Focus = Target + SetX = 0,182 + SetY = 0,245 + SetVisible = 0,true + SetX = 1,209 + SetY = 1,238 + SetAngle = 1,6 + SetX = 2,223 + SetY = 2,220 + SetX = 3,258 + SetY = 3,213 + SetX = 4,292 + SetY = 4,239 + + Play = 0,Wring Out,100,160 +#------------------------------- +[OppMove,ROAR] +Name = ROAR + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Growl + Focus = Target + SetFlip = 0,true + SetX = 0,352 + SetY = 0,70 + SetVisible = 0,true + SetX = 1,328 + SetY = 1,66 + SetX = 2,296 + SetY = 2,41 + SetX = 3,248 + SetY = 3,35 + + Graphic = Growl + Focus = Target + SetX = 0,352 + SetY = 0,132 + SetVisible = 0,true + SetX = 1,328 + SetY = 1,145 + SetX = 2,296 + SetY = 2,164 + SetX = 3,264 + SetY = 3,200 + + Graphic = Growl + Focus = Target + SetFlip = 0,true + SetX = 0,344 + SetY = 0,100 + SetVisible = 0,true + SetX = 1,312 + SetX = 2,296 + SetY = 2,92 + SetX = 3,248 + SetY = 3,108 + + Play = 0,Wring Out,100,160 diff --git a/PBS/Animations/Converted/Move/ROCKSMASH.txt b/PBS/Animations/Converted/Move/ROCKSMASH.txt new file mode 100644 index 000000000..bcfc5f5f8 --- /dev/null +++ b/PBS/Animations/Converted/Move/ROCKSMASH.txt @@ -0,0 +1,19 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ROCKSMASH] +Name = ROCKSMASH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = rockice + Focus = Target + SetX = 0,392 + SetY = 0,86 + SetVisible = 0,true + + Play = 2,Earth1,80,100 + Play = 2,Blow6,80,100 diff --git a/PBS/Animations/Converted/Move/ROCKTHROW.txt b/PBS/Animations/Converted/Move/ROCKTHROW.txt new file mode 100644 index 000000000..4800686fe --- /dev/null +++ b/PBS/Animations/Converted/Move/ROCKTHROW.txt @@ -0,0 +1,31 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ROCKTHROW] +Name = ROCKTHROW + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Earth1 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,352 + SetY = 3,110 + + Graphic = Earth1 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,198 + SetY = 1,186 + SetX = 2,307 + SetY = 2,123 + SetX = 3,352 + SetY = 3,110 + + Play = 0,throw,80,100 + Play = 3,Earth1,80,100 diff --git a/PBS/Animations/Converted/Move/ROLLINGKICK.txt b/PBS/Animations/Converted/Move/ROLLINGKICK.txt new file mode 100644 index 000000000..cf6a934d7 --- /dev/null +++ b/PBS/Animations/Converted/Move/ROLLINGKICK.txt @@ -0,0 +1,46 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ROLLINGKICK] +Name = ROLLINGKICK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetVisible = 0,true + SetX = 4,360 + SetY = 4,78 + SetOpacity = 4,50 + SetX = 5,384 + SetY = 5,94 + SetX = 6,400 + SetY = 6,110 + SetOpacity = 6,25 + + Graphic = normal1 + Focus = Target + SetX = 0,232 + SetY = 0,102 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetX = 1,264 + SetY = 1,54 + SetX = 2,288 + SetY = 2,22 + SetX = 3,312 + SetY = 3,30 + SetX = 4,360 + SetY = 4,78 + SetX = 5,416 + SetY = 5,126 + SetX = 6,440 + SetY = 6,150 + SetX = 7,448 + SetY = 7,158 + + Play = 4,Blow4,80,100 diff --git a/PBS/Animations/Converted/Move/SANDATTACK.txt b/PBS/Animations/Converted/Move/SANDATTACK.txt new file mode 100644 index 000000000..44cc1df38 --- /dev/null +++ b/PBS/Animations/Converted/Move/SANDATTACK.txt @@ -0,0 +1,564 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SANDATTACK] +Name = SANDATTACK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetX = 0,134 + SetY = 0,280 + SetVisible = 0,true + SetX = 2,121 + SetY = 2,268 + SetX = 3,166 + SetY = 3,249 + SetX = 4,200 + SetY = 4,224 + SetX = 5,235 + SetY = 5,200 + SetX = 6,268 + SetY = 6,176 + SetX = 7,302 + SetY = 7,153 + SetX = 8,336 + SetY = 8,128 + SetX = 9,371 + SetY = 9,104 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,179 + SetY = 3,261 + SetX = 4,217 + SetY = 4,240 + SetX = 5,256 + SetY = 5,219 + SetX = 6,294 + SetY = 6,198 + SetX = 7,332 + SetY = 7,177 + SetX = 8,371 + SetY = 8,157 + SetX = 9,409 + SetY = 9,135 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,147 + SetY = 1,249 + SetX = 2,179 + SetY = 2,224 + SetX = 3,211 + SetY = 3,198 + SetX = 4,243 + SetY = 4,173 + SetX = 5,275 + SetY = 5,148 + SetX = 6,307 + SetY = 6,123 + SetX = 7,339 + SetY = 7,98 + SetFlip = 8,true + SetX = 8,115 + SetY = 8,287 + SetX = 9,147 + SetY = 9,268 + SetX = 10,181 + SetY = 10,241 + SetX = 11,216 + SetY = 11,215 + SetX = 12,249 + SetY = 12,189 + SetX = 13,283 + SetY = 13,162 + SetX = 14,317 + SetY = 14,137 + SetX = 15,352 + SetY = 15,110 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,134 + SetY = 1,230 + SetX = 2,171 + SetY = 2,208 + SetX = 3,207 + SetY = 3,186 + SetX = 4,243 + SetY = 4,164 + SetX = 5,279 + SetY = 5,142 + SetX = 6,315 + SetY = 6,120 + SetX = 7,352 + SetY = 7,98 + SetX = 9,160 + SetY = 9,261 + SetX = 10,196 + SetY = 10,235 + SetX = 11,232 + SetY = 11,209 + SetX = 12,268 + SetY = 12,183 + SetX = 13,304 + SetY = 13,157 + SetX = 14,340 + SetY = 14,131 + SetX = 15,377 + SetY = 15,104 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,268 + SetX = 2,200 + SetY = 2,246 + SetX = 3,239 + SetY = 3,225 + SetX = 4,278 + SetY = 4,205 + SetX = 5,317 + SetY = 5,183 + SetX = 6,356 + SetY = 6,162 + SetX = 7,396 + SetY = 7,142 + SetFlip = 9,true + SetX = 9,179 + SetY = 9,249 + SetX = 10,219 + SetY = 10,225 + SetX = 11,257 + SetY = 11,202 + SetX = 12,297 + SetY = 12,179 + SetX = 13,336 + SetY = 13,157 + SetX = 14,376 + SetY = 14,134 + SetX = 15,416 + SetY = 15,110 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,153 + SetY = 3,242 + SetX = 4,191 + SetY = 4,219 + SetX = 5,228 + SetY = 5,196 + SetX = 6,265 + SetY = 6,173 + SetX = 7,302 + SetY = 7,150 + SetX = 8,340 + SetY = 8,127 + SetX = 9,377 + SetY = 9,104 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,115 + SetY = 4,261 + SetX = 5,134 + SetY = 5,242 + SetX = 6,171 + SetY = 6,215 + SetX = 7,207 + SetY = 7,187 + SetX = 8,243 + SetY = 8,161 + SetX = 9,279 + SetY = 9,134 + SetX = 10,315 + SetY = 10,106 + SetX = 11,352 + SetY = 11,79 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,166 + SetY = 5,274 + SetX = 6,204 + SetY = 6,249 + SetX = 7,241 + SetY = 7,224 + SetX = 8,278 + SetY = 8,198 + SetX = 9,315 + SetY = 9,173 + SetX = 10,352 + SetY = 10,148 + SetX = 11,390 + SetY = 11,123 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,160 + SetY = 5,268 + SetX = 6,200 + SetY = 6,243 + SetX = 7,239 + SetY = 7,219 + SetX = 8,278 + SetY = 8,195 + SetX = 9,317 + SetY = 9,171 + SetX = 10,356 + SetY = 10,147 + SetX = 11,396 + SetY = 11,123 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,121 + SetY = 6,274 + SetX = 7,147 + SetY = 7,249 + SetX = 8,181 + SetY = 8,222 + SetX = 9,216 + SetY = 9,196 + SetX = 10,249 + SetY = 10,170 + SetX = 11,283 + SetY = 11,144 + SetX = 12,317 + SetY = 12,118 + SetX = 13,352 + SetY = 13,91 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,172 + SetY = 7,268 + SetX = 8,209 + SetY = 8,243 + SetX = 9,245 + SetY = 9,219 + SetX = 10,281 + SetY = 10,195 + SetX = 11,317 + SetY = 11,171 + SetX = 12,353 + SetY = 12,147 + SetX = 13,390 + SetY = 13,123 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,179 + SetY = 7,274 + SetX = 8,219 + SetY = 8,252 + SetX = 9,257 + SetY = 9,230 + SetX = 10,297 + SetY = 10,208 + SetX = 11,336 + SetY = 11,186 + SetX = 12,376 + SetY = 12,164 + SetX = 13,416 + SetY = 13,142 + + Play = 0,Sand,100,100 +#------------------------------- +[OppMove,SANDATTACK] +Name = SANDATTACK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetX = 0,377 + SetY = 0,126 + SetVisible = 0,true + SetX = 1,352 + SetY = 1,142 + SetX = 2,314 + SetY = 2,159 + SetX = 3,276 + SetY = 3,176 + SetX = 4,240 + SetY = 4,194 + SetX = 5,203 + SetY = 5,211 + SetX = 6,165 + SetY = 6,228 + SetX = 7,128 + SetY = 7,246 + SetX = 8,364 + SetY = 8,142 + SetAngle = 8,270 + SetX = 9,320 + SetY = 9,154 + SetX = 10,284 + SetY = 10,167 + SetX = 11,249 + SetY = 11,179 + SetX = 12,214 + SetY = 12,192 + SetX = 13,179 + SetY = 13,205 + SetX = 14,144 + SetY = 14,217 + SetX = 15,108 + SetY = 15,230 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,339 + SetY = 1,123 + SetX = 2,300 + SetY = 2,138 + SetX = 3,262 + SetY = 3,153 + SetX = 4,224 + SetY = 4,168 + SetX = 5,185 + SetY = 5,183 + SetX = 6,147 + SetY = 6,198 + SetX = 7,108 + SetY = 7,214 + SetX = 9,339 + SetY = 9,154 + SetX = 10,302 + SetY = 10,164 + SetX = 11,266 + SetY = 11,173 + SetX = 12,230 + SetY = 12,183 + SetX = 13,194 + SetY = 13,192 + SetX = 14,158 + SetY = 14,201 + SetX = 15,121 + SetY = 15,211 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,352 + SetY = 1,142 + SetX = 2,313 + SetY = 2,155 + SetX = 3,275 + SetY = 3,168 + SetX = 4,236 + SetY = 4,181 + SetX = 5,198 + SetY = 5,194 + SetX = 6,160 + SetY = 6,207 + SetX = 7,121 + SetY = 7,220 + SetX = 9,339 + SetY = 9,154 + SetX = 10,304 + SetY = 10,168 + SetX = 11,268 + SetY = 11,183 + SetX = 12,233 + SetY = 12,198 + SetX = 13,198 + SetY = 13,212 + SetX = 14,163 + SetY = 14,227 + SetX = 15,128 + SetY = 15,242 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,371 + SetY = 2,116 + SetX = 3,326 + SetY = 3,129 + SetX = 4,291 + SetY = 4,143 + SetX = 5,256 + SetY = 5,157 + SetX = 6,220 + SetY = 6,170 + SetX = 7,185 + SetY = 7,183 + SetX = 8,150 + SetY = 8,197 + SetX = 9,115 + SetY = 9,211 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,339 + SetY = 3,148 + SetX = 4,302 + SetY = 4,159 + SetX = 5,266 + SetY = 5,168 + SetX = 6,230 + SetY = 6,179 + SetX = 7,194 + SetY = 7,190 + SetX = 8,158 + SetY = 8,200 + SetX = 9,121 + SetY = 9,211 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,339 + SetY = 3,148 + SetX = 4,304 + SetY = 4,164 + SetX = 5,270 + SetY = 5,181 + SetX = 6,236 + SetY = 6,198 + SetX = 7,203 + SetY = 7,215 + SetX = 8,168 + SetY = 8,231 + SetX = 9,134 + SetY = 9,249 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,396 + SetY = 4,142 + SetX = 5,352 + SetY = 5,167 + SetX = 6,317 + SetY = 6,181 + SetX = 7,283 + SetY = 7,196 + SetX = 8,249 + SetY = 8,211 + SetX = 9,216 + SetY = 9,225 + SetX = 10,181 + SetY = 10,240 + SetX = 11,147 + SetY = 11,255 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,332 + SetY = 5,142 + SetX = 6,296 + SetY = 6,154 + SetX = 7,260 + SetY = 7,167 + SetX = 8,224 + SetY = 8,179 + SetX = 9,188 + SetY = 9,192 + SetX = 10,152 + SetY = 10,205 + SetX = 11,115 + SetY = 11,217 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,339 + SetY = 5,148 + SetX = 6,301 + SetY = 6,159 + SetX = 7,264 + SetY = 7,168 + SetX = 8,227 + SetY = 8,179 + SetX = 9,190 + SetY = 9,190 + SetX = 10,152 + SetY = 10,200 + SetX = 11,115 + SetY = 11,211 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 6,true + SetX = 6,377 + SetY = 6,142 + SetX = 7,332 + SetY = 7,154 + SetX = 8,296 + SetY = 8,167 + SetX = 9,260 + SetY = 9,179 + SetX = 10,224 + SetY = 10,192 + SetX = 11,188 + SetY = 11,205 + SetX = 12,153 + SetY = 12,217 + SetX = 13,115 + SetY = 13,230 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,326 + SetY = 7,129 + SetX = 8,289 + SetY = 8,140 + SetX = 9,254 + SetY = 9,150 + SetX = 10,217 + SetY = 10,161 + SetX = 11,181 + SetY = 11,171 + SetX = 12,145 + SetY = 12,181 + SetX = 13,108 + SetY = 13,192 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 7,true + SetX = 7,358 + SetY = 7,135 + SetX = 8,323 + SetY = 8,151 + SetX = 9,288 + SetY = 9,167 + SetX = 10,252 + SetY = 10,183 + SetX = 11,217 + SetY = 11,198 + SetX = 12,182 + SetY = 12,214 + SetX = 13,147 + SetY = 13,230 + + Play = 0,Sand,100,100 diff --git a/PBS/Animations/Converted/Move/SANDSTORM.txt b/PBS/Animations/Converted/Move/SANDSTORM.txt new file mode 100644 index 000000000..7293ec5fc --- /dev/null +++ b/PBS/Animations/Converted/Move/SANDSTORM.txt @@ -0,0 +1,288 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SANDSTORM] +Name = SANDSTORM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,-350 + SetY = 0,-30 + SetVisible = 0,true + SetX = 1,153 + SetY = 1,62 + SetX = 2,-350 + SetY = 2,-30 + SetX = 3,153 + SetY = 3,62 + SetX = 4,139 + SetY = 4,48 + SetX = 5,-350 + SetY = 5,-30 + SetX = 6,153 + SetY = 6,62 + SetX = 7,-350 + SetY = 7,-30 + SetX = 8,153 + SetY = 8,62 + SetX = 9,32 + SetY = 9,252 + + Graphic = weather + Focus = Screen + SetX = 0,31 + SetY = 0,69 + SetVisible = 0,true + SetX = 1,56 + SetY = 1,85 + SetX = 2,31 + SetY = 2,69 + SetX = 3,56 + SetY = 3,85 + SetX = 4,42 + SetY = 4,82 + SetX = 5,31 + SetY = 5,69 + SetX = 6,56 + SetY = 6,85 + SetX = 7,31 + SetY = 7,69 + SetX = 8,56 + SetY = 8,85 + SetX = 9,119 + SetY = 9,175 + + Graphic = weather + Focus = Screen + SetX = 0,156 + SetY = 0,106 + SetVisible = 0,true + SetX = 1,74 + SetY = 1,223 + SetX = 2,156 + SetY = 2,106 + SetX = 3,74 + SetY = 3,223 + SetX = 4,157 + SetY = 4,167 + SetX = 5,156 + SetY = 5,106 + SetX = 6,74 + SetY = 6,223 + SetX = 7,156 + SetY = 7,106 + SetX = 8,74 + SetY = 8,223 + SetX = 9,143 + SetY = 9,267 + + Graphic = weather + Focus = Screen + SetX = 0,165 + SetY = 0,220 + SetVisible = 0,true + SetX = 1,220 + SetY = 1,207 + SetX = 2,165 + SetY = 2,220 + SetX = 3,220 + SetY = 3,207 + SetX = 4,58 + SetY = 4,225 + SetX = 5,165 + SetY = 5,220 + SetX = 6,220 + SetY = 6,207 + SetX = 7,165 + SetY = 7,220 + SetX = 8,220 + SetY = 8,207 + SetX = 9,222 + SetY = 9,197 + + Graphic = weather + Focus = Screen + SetX = 0,267 + SetY = 0,178 + SetVisible = 0,true + SetX = 1,352 + SetY = 1,253 + SetX = 2,267 + SetY = 2,178 + SetX = 3,352 + SetY = 3,253 + SetX = 4,178 + SetY = 4,273 + SetX = 5,267 + SetY = 5,178 + SetX = 6,352 + SetY = 6,253 + SetX = 7,267 + SetY = 7,178 + SetX = 8,352 + SetY = 8,253 + SetX = 9,162 + SetY = 9,82 + + Graphic = weather + Focus = Screen + SetX = 0,309 + SetY = 0,248 + SetVisible = 0,true + SetX = 1,464 + SetY = 1,227 + SetX = 2,309 + SetY = 2,248 + SetX = 3,464 + SetY = 3,227 + SetX = 4,284 + SetY = 4,217 + SetX = 5,309 + SetY = 5,248 + SetX = 6,464 + SetY = 6,227 + SetX = 7,309 + SetY = 7,248 + SetX = 8,464 + SetY = 8,227 + SetX = 9,49 + SetY = 9,61 + + Graphic = weather + Focus = Screen + SetX = 0,388 + SetY = 0,142 + SetVisible = 0,true + SetX = 1,484 + SetY = 1,76 + SetX = 2,388 + SetY = 2,142 + SetX = 3,484 + SetY = 3,76 + SetX = 4,377 + SetY = 4,143 + SetX = 5,388 + SetY = 5,142 + SetX = 6,484 + SetY = 6,76 + SetX = 7,388 + SetY = 7,142 + SetX = 8,484 + SetY = 8,76 + SetX = 9,21 + SetY = 9,158 + + Graphic = weather + Focus = Screen + SetX = 0,448 + SetY = 0,243 + SetVisible = 0,true + SetX = 1,378 + SetY = 1,130 + SetX = 2,448 + SetY = 2,243 + SetX = 3,378 + SetY = 3,130 + SetX = 4,403 + SetY = 4,259 + SetX = 5,448 + SetY = 5,243 + SetX = 6,378 + SetY = 6,130 + SetX = 7,448 + SetY = 7,243 + SetX = 8,378 + SetY = 8,130 + SetX = 9,350 + SetY = 9,240 + + Graphic = weather + Focus = Screen + SetX = 0,35 + SetY = 0,216 + SetVisible = 0,true + SetX = 1,285 + SetY = 1,142 + SetX = 2,35 + SetY = 2,216 + SetX = 3,285 + SetY = 3,142 + SetX = 4,500 + SetY = 4,230 + SetX = 5,35 + SetY = 5,216 + SetX = 6,285 + SetY = 6,142 + SetX = 7,35 + SetY = 7,216 + SetX = 8,285 + SetY = 8,142 + SetX = 9,481 + SetY = 9,206 + + Graphic = weather + Focus = Screen + SetX = 0,276 + SetY = 0,34 + SetVisible = 0,true + SetX = 1,316 + SetY = 1,22 + SetX = 2,276 + SetY = 2,34 + SetX = 3,316 + SetY = 3,22 + SetX = 4,481 + SetY = 4,77 + SetX = 5,276 + SetY = 5,34 + SetX = 6,316 + SetY = 6,22 + SetX = 7,276 + SetY = 7,34 + SetX = 8,316 + SetY = 8,22 + SetX = 9,456 + SetY = 9,64 + + Graphic = weather + Focus = Screen + SetX = 0,487 + SetY = 0,32 + SetVisible = 0,true + SetX = 4,358 + SetY = 4,16 + SetX = 5,487 + SetY = 5,32 + SetX = 9,311 + SetY = 9,55 + + Graphic = weather + Focus = Screen + SetX = 0,492 + SetY = 0,135 + SetVisible = 0,true + SetX = 4,267 + SetY = 4,63 + SetX = 5,492 + SetY = 5,135 + SetX = 9,328 + SetY = 9,146 + + Graphic = weather + Focus = Screen + SetX = 0,387 + SetY = 0,18 + SetVisible = 0,true + SetX = 9,251 + SetY = 9,305 + + Graphic = weather + Focus = Screen + SetX = 0,148 + SetY = 0,9 + SetVisible = 0,true diff --git a/PBS/Animations/Converted/Move/SCARYFACE.txt b/PBS/Animations/Converted/Move/SCARYFACE.txt new file mode 100644 index 000000000..7b9f70283 --- /dev/null +++ b/PBS/Animations/Converted/Move/SCARYFACE.txt @@ -0,0 +1,35 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SCARYFACE] +Name = SCARYFACE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal2 + Focus = Target + SetX = 0,384 + SetY = 0,102 + SetVisible = 0,true + SetOpacity = 0,150 + SetZoomX = 1,125 + SetZoomY = 1,125 + SetOpacity = 1,200 + SetZoomX = 2,150 + SetZoomY = 2,150 + SetOpacity = 2,255 + SetZoomX = 3,175 + SetZoomY = 3,175 + SetZoomX = 4,200 + SetZoomY = 4,200 + SetZoomX = 5,225 + SetZoomY = 5,225 + SetOpacity = 6,150 + SetZoomX = 7,200 + SetZoomY = 7,200 + SetOpacity = 7,100 + + Play = 2,Stare,80,100 diff --git a/PBS/Animations/Converted/Move/SCRATCH.txt b/PBS/Animations/Converted/Move/SCRATCH.txt new file mode 100644 index 000000000..99c9a86d9 --- /dev/null +++ b/PBS/Animations/Converted/Move/SCRATCH.txt @@ -0,0 +1,25 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SCRATCH] +Name = SCRATCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = scratchbattle + Focus = Target + SetVisible = 0,true + SetX = 1,399 + SetY = 1,74 + SetX = 2,383 + SetY = 2,90 + SetX = 3,367 + SetY = 3,106 + SetX = 4,351 + SetY = 4,122 + SetY = 5,138 + + Play = 0,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/SCREECH.txt b/PBS/Animations/Converted/Move/SCREECH.txt new file mode 100644 index 000000000..b5eb8342e --- /dev/null +++ b/PBS/Animations/Converted/Move/SCREECH.txt @@ -0,0 +1,53 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SCREECH] +Name = SCREECH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Growl + Focus = UserAndTarget + SetX = 0,179 + SetY = 0,142 + SetVisible = 0,true + SetY = 1,135 + SetY = 2,236 + SetY = 3,135 + SetY = 5,129 + SetY = 6,135 + SetY = 7,123 + SetY = 8,129 + SetY = 9,135 + + Graphic = Growl + Focus = UserAndTarget + SetX = 0,179 + SetY = 0,230 + SetVisible = 0,true + SetY = 1,224 + SetY = 2,129 + SetY = 3,217 + SetY = 4,236 + SetY = 5,224 + SetY = 6,230 + SetY = 7,224 + SetY = 9,230 + + Graphic = Growl + Focus = UserAndTarget + SetX = 0,179 + SetY = 0,186 + SetVisible = 0,true + SetY = 1,179 + SetY = 2,192 + SetY = 3,179 + SetY = 4,192 + SetY = 6,179 + SetY = 7,173 + SetY = 9,179 + + PlayUserCry = 0,100,100 diff --git a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt new file mode 100644 index 000000000..0371432bd --- /dev/null +++ b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt @@ -0,0 +1,74 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SELFDESTRUCT] +Name = SELFDESTRUCT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 030-Explosion01 + Focus = Target + SetVisible = 0,true + SetX = 2,464 + SetY = 2,142 + SetX = 3,296 + SetY = 3,78 + SetX = 4,464 + SetY = 4,142 + SetX = 6,360 + SetY = 6,166 + SetX = 9,336 + SetY = 9,70 + SetX = 12,448 + SetY = 12,118 + SetX = 14,360 + SetY = 14,182 + + Graphic = 030-Explosion01 + Focus = Target + SetVisible = 0,true + SetX = 3,464 + SetY = 3,142 + SetX = 8,336 + SetY = 8,70 + SetX = 10,448 + SetY = 10,118 + SetX = 12,360 + SetY = 12,182 + SetX = 13,448 + SetY = 13,118 + SetX = 14,360 + SetY = 14,182 + + Graphic = 030-Explosion01 + Focus = Target + SetVisible = 0,true + SetX = 5,360 + SetY = 5,166 + SetY = 11,174 + SetY = 13,182 + + Graphic = 030-Explosion01 + Focus = Target + SetX = 0,296 + SetY = 0,78 + SetVisible = 0,true + SetX = 6,464 + SetY = 6,142 + SetX = 8,360 + SetY = 8,166 + SetX = 11,336 + SetY = 11,70 + SetX = 14,448 + SetY = 14,118 + SetX = 16,360 + SetY = 16,182 + + Play = 0,Explosion1,80,100 + Play = 3,Explosion2,80,100 + Play = 6,Explosion3,80,100 + Play = 10,Explosion4,80,100 + Play = 12,Explosion7,80,100 diff --git a/PBS/Animations/Converted/Move/SHADOWBALL.txt b/PBS/Animations/Converted/Move/SHADOWBALL.txt new file mode 100644 index 000000000..ae75a4746 --- /dev/null +++ b/PBS/Animations/Converted/Move/SHADOWBALL.txt @@ -0,0 +1,52 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SHADOWBALL] +Name = SHADOWBALL + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 009-Weapon04 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 7,263 + SetY = 7,74 + SetZoomX = 7,25 + SetZoomY = 7,25 + + Graphic = 009-Weapon04 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,144 + SetY = 1,204 + SetX = 2,154 + SetY = 2,176 + SetX = 3,175 + SetY = 3,152 + SetX = 4,201 + SetY = 4,130 + SetX = 5,227 + SetY = 5,108 + SetX = 6,248 + SetY = 6,100 + SetX = 8,294 + SetY = 8,86 + SetZoomX = 8,50 + SetZoomY = 8,50 + SetOpacity = 8,100 + SetX = 9,315 + SetY = 9,102 + SetZoomX = 9,100 + SetZoomY = 9,100 + SetOpacity = 9,255 + SetX = 10,320 + SetY = 10,112 + SetX = 11,331 + SetY = 11,116 + SetOpacity = 12,100 + SetOpacity = 13,50 + + Play = 0,Collapse1,80,100 diff --git a/PBS/Animations/Converted/Move/SIGNALBEAM.txt b/PBS/Animations/Converted/Move/SIGNALBEAM.txt new file mode 100644 index 000000000..5919c3458 --- /dev/null +++ b/PBS/Animations/Converted/Move/SIGNALBEAM.txt @@ -0,0 +1,390 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SIGNALBEAM] +Name = SIGNALBEAM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Ultra Beam + Focus = Target + SetX = 0,224 + SetY = 0,150 + SetVisible = 0,true + SetX = 1,232 + SetY = 1,158 + SetX = 2,240 + SetY = 2,166 + SetX = 3,248 + SetY = 3,174 + SetX = 4,336 + SetY = 4,46 + SetX = 5,256 + SetY = 5,182 + SetX = 6,248 + SetY = 6,174 + SetX = 7,240 + SetY = 7,166 + SetX = 8,232 + SetY = 8,150 + SetX = 9,440 + SetY = 9,166 + SetX = 10,432 + SetY = 10,158 + SetX = 11,392 + SetY = 11,126 + SetX = 12,240 + SetY = 12,158 + SetX = 13,248 + SetY = 13,166 + SetX = 14,256 + SetY = 14,174 + SetX = 16,368 + SetY = 16,86 + SetX = 17,392 + SetY = 17,134 + SetX = 18,520 + SetY = 18,22 + SetX = 19,440 + SetY = 19,174 + + Graphic = Ultra Beam + Focus = Target + SetVisible = 0,true + SetX = 1,384 + SetY = 1,110 + SetX = 2,352 + SetY = 2,62 + SetX = 3,328 + SetY = 3,38 + SetX = 4,544 + SetY = 4,46 + SetX = 6,536 + SetY = 6,38 + SetX = 7,528 + SetY = 7,30 + SetX = 8,520 + SetY = 8,22 + SetX = 9,224 + SetY = 9,142 + SetX = 11,232 + SetY = 11,150 + SetX = 12,528 + SetY = 12,30 + SetX = 13,536 + SetY = 13,38 + SetX = 14,544 + SetY = 14,46 + SetX = 16,536 + SetY = 16,38 + SetX = 17,240 + SetY = 17,158 + SetX = 19,528 + SetY = 19,30 + + Graphic = Ultra Beam + Focus = Target + SetVisible = 0,true + SetX = 2,528 + SetY = 2,22 + SetX = 3,536 + SetY = 3,38 + SetX = 4,256 + SetY = 4,182 + SetX = 5,352 + SetY = 5,70 + SetX = 6,376 + SetY = 6,102 + SetX = 7,400 + SetY = 7,126 + SetX = 8,432 + SetY = 8,158 + SetX = 9,512 + SetY = 9,14 + SetX = 11,520 + SetY = 11,22 + SetX = 12,360 + SetY = 12,94 + SetX = 13,352 + SetY = 13,54 + SetX = 14,336 + SetY = 14,38 + SetX = 15,352 + SetY = 15,46 + SetX = 16,248 + SetY = 16,166 + SetX = 17,528 + SetY = 17,30 + SetX = 18,416 + SetY = 18,158 + SetX = 19,560 + SetY = 19,70 + + Graphic = Ultra Beam + Focus = Target + SetX = 0,312 + SetY = 0,158 + SetVisible = 0,true + SetY = 1,142 + SetX = 2,296 + SetY = 2,110 + SetX = 3,280 + SetY = 3,102 + SetX = 5,296 + SetY = 5,126 + SetX = 6,312 + SetY = 6,134 + SetX = 7,320 + SetY = 7,150 + SetY = 8,174 + SetY = 10,158 + SetX = 11,312 + SetY = 11,142 + SetX = 12,296 + SetY = 12,126 + SetX = 13,288 + SetY = 13,102 + SetX = 14,280 + SetY = 14,94 + SetX = 15,296 + SetX = 16,304 + SetY = 16,118 + SetX = 17,312 + SetY = 17,150 + SetX = 18,320 + SetY = 18,166 + SetX = 19,352 + SetY = 19,54 + + Graphic = Ultra Beam + Focus = Target + SetVisible = 0,true + SetX = 1,464 + SetY = 1,62 + SetX = 2,440 + SetY = 2,30 + SetX = 3,416 + SetY = 3,14 + SetY = 4,22 + SetX = 5,432 + SetY = 5,46 + SetX = 6,448 + SetY = 6,62 + SetX = 7,464 + SetY = 7,86 + SetX = 8,496 + SetY = 8,102 + SetY = 9,86 + SetX = 10,488 + SetY = 10,94 + SetX = 11,464 + SetY = 11,78 + SetX = 12,440 + SetY = 12,62 + SetX = 13,424 + SetY = 13,38 + SetY = 14,22 + SetX = 15,440 + SetY = 15,38 + SetX = 16,448 + SetY = 16,54 + SetX = 17,472 + SetY = 17,86 + SetX = 18,488 + SetY = 18,94 + SetX = 19,448 + SetY = 19,30 + + Graphic = Ultra Beam + Focus = Target + SetX = 0,264 + SetY = 0,190 + SetVisible = 0,true + SetX = 1,256 + SetY = 1,182 + SetX = 2,248 + SetY = 2,174 + SetX = 3,240 + SetY = 3,166 + SetX = 4,528 + SetY = 4,30 + SetX = 5,424 + SetY = 5,134 + SetX = 6,408 + SetY = 6,118 + SetX = 7,272 + SetY = 7,198 + SetX = 8,280 + SetY = 8,206 + SetX = 9,344 + SetY = 9,46 + SetX = 10,272 + SetY = 10,198 + SetX = 11,400 + SetY = 11,102 + SetX = 12,256 + SetY = 12,182 + SetX = 13,440 + SetY = 13,150 + SetX = 14,456 + SetY = 14,158 + SetX = 15,440 + SetY = 15,142 + SetX = 16,408 + SetY = 16,118 + SetX = 17,384 + SetY = 17,94 + SetX = 18,360 + SetY = 18,62 + SetX = 19,512 + SetY = 19,118 + + Graphic = Ultra Beam + Focus = Target + SetVisible = 0,true + SetX = 2,544 + SetY = 2,38 + SetX = 3,440 + SetY = 3,134 + SetX = 4,240 + SetY = 4,166 + SetX = 5,248 + SetY = 5,174 + SetX = 6,264 + SetY = 6,190 + SetX = 7,376 + SetY = 7,86 + SetX = 8,352 + SetY = 8,54 + SetX = 9,280 + SetY = 9,206 + SetX = 10,560 + SetY = 10,62 + SetX = 11,264 + SetY = 11,190 + SetX = 12,544 + SetY = 12,46 + SetX = 13,248 + SetY = 13,174 + SetX = 14,528 + SetY = 14,30 + SetX = 15,248 + SetY = 15,166 + SetX = 16,552 + SetY = 16,54 + SetX = 17,560 + SetY = 17,62 + SetX = 18,568 + SetY = 18,70 + + Graphic = Ultra Beam + Focus = Target + SetVisible = 0,true + SetX = 1,376 + SetY = 1,54 + SetX = 2,408 + SetY = 2,102 + SetX = 3,536 + SetY = 3,30 + SetX = 4,448 + SetY = 4,150 + SetX = 5,536 + SetY = 5,38 + SetX = 6,552 + SetY = 6,54 + SetX = 7,560 + SetY = 7,62 + SetX = 8,568 + SetY = 8,70 + SetX = 10,368 + SetX = 11,552 + SetY = 11,54 + SetX = 12,424 + SetY = 12,134 + SetX = 13,536 + SetY = 13,38 + SetX = 14,240 + SetY = 14,158 + SetX = 15,536 + SetY = 15,38 + SetX = 16,264 + SetY = 16,182 + SetX = 17,272 + SetY = 17,190 + + Graphic = Ultra Beam + Focus = Target + SetX = 0,304 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,312 + SetX = 2,328 + SetY = 2,142 + SetX = 3,344 + SetY = 3,158 + SetY = 4,166 + SetX = 5,336 + SetY = 5,158 + SetY = 6,150 + SetX = 7,320 + SetY = 7,134 + SetX = 8,304 + SetY = 8,118 + SetX = 9,288 + SetX = 10,304 + SetY = 10,126 + SetX = 11,328 + SetY = 11,142 + SetX = 12,344 + SetY = 12,158 + SetY = 13,166 + SetY = 14,174 + SetY = 15,158 + SetX = 16,328 + SetY = 16,150 + SetX = 17,320 + SetY = 17,142 + SetX = 18,312 + SetY = 18,118 + + Graphic = Ultra Beam + Focus = Target + SetVisible = 0,true + SetX = 1,464 + SetY = 1,38 + SetX = 2,480 + SetY = 2,70 + SetX = 3,496 + SetY = 3,94 + SetX = 4,512 + SetX = 5,496 + SetY = 5,102 + SetX = 6,480 + SetY = 6,78 + SetX = 7,456 + SetY = 7,62 + SetY = 8,38 + SetY = 9,30 + SetY = 10,46 + SetX = 11,480 + SetY = 11,78 + SetX = 12,488 + SetY = 12,86 + SetX = 13,504 + SetY = 13,94 + SetX = 14,512 + SetY = 14,102 + SetX = 15,496 + SetY = 15,94 + SetX = 16,488 + SetY = 16,86 + SetX = 17,472 + SetY = 17,78 + SetX = 18,456 + SetY = 18,54 + + Play = 0,Teleport,80,100 + Play = 2,Twine,80,100 diff --git a/PBS/Animations/Converted/Move/SILVERWIND.txt b/PBS/Animations/Converted/Move/SILVERWIND.txt new file mode 100644 index 000000000..b02728c25 --- /dev/null +++ b/PBS/Animations/Converted/Move/SILVERWIND.txt @@ -0,0 +1,278 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SILVERWIND] +Name = SILVERWIND + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Heal5 + Focus = Target + SetX = 0,168 + SetY = 0,-10 + SetZoomX = 0,20 + SetZoomY = 0,20 + SetVisible = 0,true + SetX = 1,208 + SetY = 1,22 + SetX = 2,248 + SetY = 2,62 + SetX = 3,304 + SetY = 3,102 + SetX = 4,368 + SetY = 4,142 + SetX = 5,440 + SetY = 5,182 + SetX = 6,504 + SetY = 6,214 + SetX = 7,560 + SetY = 7,238 + SetX = 8,688 + SetY = 8,166 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 1,96 + SetY = 1,30 + SetZoomX = 1,20 + SetZoomY = 1,20 + SetX = 2,264 + SetY = 2,-42 + SetX = 3,312 + SetY = 3,-2 + SetX = 4,368 + SetY = 4,46 + SetX = 5,448 + SetY = 5,86 + SetX = 6,520 + SetY = 6,110 + SetX = 7,608 + SetY = 7,142 + SetX = 8,576 + SetY = 8,230 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 1,136 + SetY = 1,-42 + SetZoomX = 1,20 + SetZoomY = 1,20 + SetX = 2,152 + SetY = 2,94 + SetX = 3,216 + SetY = 3,150 + SetX = 4,296 + SetY = 4,198 + SetX = 5,368 + SetY = 5,238 + SetX = 6,448 + SetY = 6,166 + SetX = 7,512 + SetY = 7,206 + SetX = 8,656 + SetY = 8,134 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 2,192 + SetY = 2,6 + SetZoomX = 2,20 + SetZoomY = 2,20 + SetX = 3,248 + SetY = 3,54 + SetX = 4,312 + SetY = 4,102 + SetX = 5,384 + SetY = 5,142 + SetX = 6,344 + SetY = 6,230 + SetX = 7,576 + SetY = 7,102 + SetX = 8,456 + SetY = 8,222 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 2,104 + SetY = 2,6 + SetZoomX = 2,20 + SetZoomY = 2,20 + SetX = 3,160 + SetY = 3,70 + SetX = 4,224 + SetY = 4,134 + SetX = 5,280 + SetY = 5,190 + SetX = 6,480 + SetY = 6,70 + SetX = 7,272 + SetY = 7,230 + SetX = 8,488 + SetY = 8,134 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 3,240 + SetY = 3,-42 + SetZoomX = 3,20 + SetZoomY = 3,20 + SetX = 4,304 + SetY = 4,-10 + SetX = 5,384 + SetY = 5,30 + SetX = 6,224 + SetY = 6,174 + SetX = 7,376 + SetY = 7,158 + SetFlip = 8,true + SetX = 8,336 + SetY = 8,110 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetOpacity = 8,50 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 3,96 + SetY = 3,-10 + SetZoomX = 3,20 + SetZoomY = 3,20 + SetX = 4,128 + SetY = 4,46 + SetX = 5,176 + SetY = 5,118 + SetX = 6,296 + SetY = 6,94 + SetX = 7,192 + SetY = 7,214 + SetX = 8,264 + SetY = 8,222 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 3,216 + SetY = 3,38 + SetOpacity = 3,50 + SetX = 4,168 + SetY = 4,-26 + SetZoomX = 4,20 + SetZoomY = 4,20 + SetOpacity = 4,255 + SetX = 5,232 + SetY = 5,38 + SetX = 6,152 + SetY = 6,150 + SetX = 7,664 + SetY = 7,78 + SetX = 8,624 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 4,408 + SetY = 4,-42 + SetZoomX = 4,20 + SetZoomY = 4,20 + SetX = 5,104 + SetY = 5,86 + SetX = 6,576 + SetY = 6,30 + SetFlip = 7,true + SetX = 7,336 + SetY = 7,110 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetOpacity = 7,50 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 4,216 + SetY = 4,38 + SetOpacity = 4,50 + SetX = 5,496 + SetY = 5,-10 + SetZoomX = 5,20 + SetZoomY = 5,20 + SetOpacity = 5,255 + SetX = 6,456 + SetY = 6,134 + SetZoomX = 6,100 + SetZoomY = 6,100 + SetOpacity = 6,50 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 5,424 + SetY = 5,6 + SetOpacity = 5,50 + SetX = 7,344 + SetY = 7,54 + SetZoomX = 7,20 + SetZoomY = 7,20 + SetOpacity = 7,255 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 5,184 + SetY = 5,-34 + SetZoomX = 5,20 + SetZoomY = 5,20 + SetX = 6,136 + SetY = 6,230 + SetX = 7,208 + SetY = 7,142 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 5,88 + SetY = 5,166 + SetZoomX = 5,20 + SetZoomY = 5,20 + SetX = 6,264 + SetY = 6,6 + SetX = 7,520 + SetY = 7,30 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 5,96 + SetY = 5,6 + SetZoomX = 5,20 + SetZoomY = 5,20 + SetX = 6,144 + SetY = 6,54 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetX = 5,376 + SetY = 5,-50 + SetZoomX = 5,20 + SetZoomY = 5,20 + SetX = 6,440 + SetY = 6,-2 + + Graphic = Heal5 + Focus = Target + SetVisible = 0,true + SetFlip = 5,true + SetX = 5,184 + SetY = 5,142 + SetOpacity = 5,50 + + Play = 0,Wind8,80,100 diff --git a/PBS/Animations/Converted/Move/SING.txt b/PBS/Animations/Converted/Move/SING.txt new file mode 100644 index 000000000..22ffeaac5 --- /dev/null +++ b/PBS/Animations/Converted/Move/SING.txt @@ -0,0 +1,868 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SING] +Name = SING + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poi.hear.mus + Focus = Target + SetX = 0,200 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,212 + SetY = 1,227 + SetX = 2,219 + SetY = 2,223 + SetX = 3,241 + SetY = 3,193 + SetX = 4,255 + SetY = 4,194 + SetX = 5,252 + SetY = 5,198 + SetX = 6,264 + SetY = 6,163 + SetX = 7,310 + SetY = 7,172 + SetX = 8,336 + SetY = 8,142 + SetX = 9,240 + SetY = 9,223 + SetX = 10,255 + SetY = 10,220 + SetX = 11,350 + SetY = 11,115 + SetX = 12,249 + SetY = 12,208 + SetX = 13,262 + SetY = 13,202 + SetX = 14,293 + SetY = 14,188 + SetX = 15,228 + SetY = 15,222 + SetX = 16,241 + SetY = 16,215 + SetX = 17,281 + SetY = 17,220 + SetX = 18,316 + SetY = 18,186 + SetX = 19,345 + SetY = 19,170 + SetX = 20,247 + SetY = 20,225 + SetX = 21,296 + SetY = 21,218 + SetX = 22,229 + SetY = 22,243 + SetX = 23,255 + SetY = 23,236 + SetX = 24,401 + SetY = 24,90 + SetX = 25,272 + SetY = 25,217 + SetX = 26,286 + SetY = 26,208 + SetX = 27,318 + SetY = 27,207 + SetX = 28,265 + SetY = 28,213 + SetX = 29,285 + SetY = 29,218 + SetX = 30,315 + SetY = 30,202 + SetX = 31,251 + SetY = 31,221 + SetX = 32,278 + SetY = 32,213 + SetX = 33,314 + SetY = 33,197 + SetX = 34,280 + SetY = 34,207 + SetX = 35,317 + SetY = 35,212 + SetX = 36,218 + SetY = 36,234 + SetX = 37,299 + SetY = 37,197 + SetX = 38,349 + SetY = 38,171 + SetX = 39,404 + SetY = 39,142 + SetX = 40,427 + SetY = 40,104 + SetX = 41,431 + SetY = 41,90 + SetX = 42,410 + SetY = 42,88 + SetY = 43,93 + SetX = 44,355 + SetY = 44,65 + SetX = 45,388 + SetY = 45,57 + SetX = 46,400 + SetY = 46,48 + SetX = 47,410 + SetY = 47,36 + SetX = 48,436 + SetX = 49,432 + SetY = 49,14 + SetX = 50,435 + SetY = 50,9 + SetX = 51,438 + SetY = 51,11 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 1,211 + SetY = 1,212 + SetX = 2,217 + SetY = 2,209 + SetX = 3,237 + SetY = 3,201 + SetX = 4,245 + SetY = 4,206 + SetX = 5,251 + SetY = 5,207 + SetX = 6,293 + SetY = 6,194 + SetX = 7,284 + SetY = 7,149 + SetX = 8,300 + SetY = 8,150 + SetX = 9,244 + SetY = 9,192 + SetX = 10,338 + SetY = 10,123 + SetX = 11,259 + SetY = 11,205 + SetX = 12,383 + SetY = 12,96 + SetX = 13,264 + SetY = 13,200 + SetX = 14,301 + SetY = 14,185 + SetX = 15,236 + SetY = 15,232 + SetX = 16,241 + SetY = 16,220 + SetX = 17,292 + SetY = 17,211 + SetX = 18,324 + SetY = 18,200 + SetX = 19,318 + SetY = 19,162 + SetX = 20,244 + SetY = 20,201 + SetX = 21,309 + SetY = 21,193 + SetX = 22,244 + SetY = 22,218 + SetX = 23,272 + SetY = 23,228 + SetX = 24,381 + SetY = 24,113 + SetX = 25,253 + SetY = 25,222 + SetX = 26,286 + SetY = 26,209 + SetX = 27,344 + SetY = 27,191 + SetX = 28,257 + SetY = 28,222 + SetX = 29,286 + SetY = 29,193 + SetX = 30,293 + SetY = 30,190 + SetX = 31,230 + SetY = 31,209 + SetX = 32,287 + SetY = 32,201 + SetX = 33,322 + SetY = 33,208 + SetX = 34,277 + SetY = 34,206 + SetX = 35,297 + SetY = 35,176 + SetX = 36,247 + SetY = 36,226 + SetX = 37,296 + SetY = 37,195 + SetX = 38,360 + SetY = 38,148 + SetX = 39,374 + SetY = 39,130 + SetX = 40,399 + SetY = 40,113 + SetX = 41,425 + SetY = 41,101 + SetX = 42,376 + SetY = 42,77 + SetX = 43,411 + SetY = 43,86 + SetX = 44,360 + SetY = 44,87 + SetX = 45,393 + SetY = 45,48 + SetX = 46,397 + SetY = 46,55 + SetX = 47,407 + SetY = 47,57 + SetX = 48,428 + SetY = 48,48 + SetY = 49,45 + SetX = 50,429 + SetY = 50,7 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 2,236 + SetY = 2,216 + SetX = 4,257 + SetY = 4,202 + SetX = 5,256 + SetY = 5,174 + SetX = 6,294 + SetY = 6,173 + SetX = 7,306 + SetY = 7,166 + SetX = 8,234 + SetY = 8,243 + SetX = 9,342 + SetY = 9,145 + SetX = 10,338 + SetY = 10,132 + SetX = 11,230 + SetY = 11,198 + SetX = 12,260 + SetY = 12,195 + SetX = 13,401 + SetY = 13,107 + SetX = 14,427 + SetY = 14,108 + SetX = 15,329 + SetY = 15,174 + SetX = 16,274 + SetY = 16,212 + SetX = 17,293 + SetY = 17,181 + SetX = 18,304 + SetY = 18,178 + SetX = 19,227 + SetY = 19,247 + SetX = 20,354 + SetY = 20,147 + SetX = 21,276 + SetY = 21,191 + SetX = 22,321 + SetY = 22,192 + SetX = 23,266 + SetY = 23,209 + SetX = 24,352 + SetY = 24,168 + SetX = 25,372 + SetY = 25,118 + SetX = 26,420 + SetY = 26,111 + SetX = 27,316 + SetY = 27,181 + SetX = 28,347 + SetY = 28,169 + SetX = 29,376 + SetY = 29,138 + SetX = 30,403 + SetY = 30,127 + SetX = 31,340 + SetY = 31,194 + SetX = 32,347 + SetY = 32,177 + SetX = 33,222 + SetY = 33,235 + SetX = 34,397 + SetY = 34,183 + SetX = 35,341 + SetY = 35,180 + SetX = 36,334 + SetY = 36,184 + SetX = 37,383 + SetY = 37,137 + SetX = 38,355 + SetY = 38,145 + SetX = 39,410 + SetY = 39,107 + SetX = 40,403 + SetY = 40,118 + SetX = 41,417 + SetY = 41,63 + SetX = 42,407 + SetY = 42,55 + SetX = 43,394 + SetY = 43,77 + SetX = 44,364 + SetY = 44,50 + SetX = 45,396 + SetY = 45,51 + SetX = 46,415 + SetY = 46,43 + SetX = 47,437 + SetY = 47,49 + SetX = 48,436 + SetY = 48,44 + SetX = 49,437 + SetY = 49,5 + SetX = 50,424 + SetY = 50,20 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 8,222 + SetY = 8,198 + SetX = 9,351 + SetY = 9,130 + SetX = 10,257 + SetY = 10,192 + SetX = 11,355 + SetY = 11,107 + SetX = 12,394 + SetY = 12,113 + SetX = 13,419 + SetY = 13,90 + SetX = 14,430 + SetY = 14,96 + SetX = 15,331 + SetY = 15,164 + SetX = 16,373 + SetY = 16,152 + SetX = 17,353 + SetY = 17,142 + SetX = 18,445 + SetY = 18,95 + SetX = 19,231 + SetY = 19,236 + SetX = 20,363 + SetY = 20,162 + SetX = 21,400 + SetY = 21,118 + SetX = 22,324 + SetY = 22,186 + SetX = 23,378 + SetY = 23,141 + SetX = 24,357 + SetY = 24,173 + SetX = 25,383 + SetY = 25,135 + SetX = 26,426 + SetY = 26,116 + SetX = 27,419 + SetY = 27,94 + SetX = 28,344 + SetY = 28,163 + SetX = 29,378 + SetY = 29,148 + SetX = 30,425 + SetY = 30,113 + SetX = 31,312 + SetY = 31,182 + SetX = 32,370 + SetY = 32,165 + SetX = 33,253 + SetY = 33,226 + SetX = 34,390 + SetY = 34,148 + SetX = 35,439 + SetY = 35,113 + SetX = 36,348 + SetY = 36,154 + SetX = 37,405 + SetY = 37,121 + SetX = 38,432 + SetY = 38,113 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 13,282 + SetY = 13,189 + SetX = 14,226 + SetY = 14,238 + SetX = 15,448 + SetY = 15,78 + SetX = 16,356 + SetY = 16,148 + SetX = 17,384 + SetY = 17,150 + SetX = 18,442 + SetY = 18,83 + SetX = 19,427 + SetY = 19,72 + SetX = 20,345 + SetY = 20,152 + SetX = 21,368 + SetY = 21,119 + SetX = 22,416 + SetY = 22,113 + SetX = 23,356 + SetY = 23,155 + SetX = 24,221 + SetY = 24,234 + SetX = 25,352 + SetY = 25,134 + SetX = 26,403 + SetY = 26,86 + SetX = 27,416 + SetY = 27,109 + SetX = 28,423 + SetY = 28,116 + SetX = 29,392 + SetY = 29,153 + SetX = 30,231 + SetY = 30,240 + SetX = 31,394 + SetY = 31,133 + SetX = 32,345 + SetY = 32,145 + SetX = 33,387 + SetY = 33,146 + SetX = 34,421 + SetY = 34,114 + SetX = 35,408 + SetY = 35,98 + SetX = 36,423 + SetY = 36,119 + SetX = 37,379 + SetY = 37,104 + SetX = 38,422 + SetY = 38,90 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 15,429 + SetY = 15,91 + SetX = 16,352 + SetY = 16,157 + SetX = 18,426 + SetY = 18,99 + SetX = 19,425 + SetY = 19,95 + SetX = 20,412 + SetY = 20,93 + SetX = 21,391 + SetY = 21,122 + SetX = 22,424 + SetY = 22,105 + SetX = 24,255 + SetY = 24,224 + SetX = 27,232 + SetY = 27,226 + SetX = 28,421 + SetY = 28,88 + SetX = 31,402 + SetY = 31,130 + SetX = 32,423 + SetY = 32,124 + SetX = 33,390 + SetY = 33,139 + SetX = 34,447 + SetY = 34,96 + SetX = 35,433 + SetY = 35,112 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 15,437 + SetY = 15,85 + SetX = 16,416 + SetY = 16,84 + SetX = 25,413 + SetY = 25,98 + SetX = 27,209 + SetY = 27,217 + SetX = 31,400 + SetY = 31,125 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 16,417 + SetY = 16,89 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 16,417 + SetY = 16,93 + + Play = 0,Sing,80,100 +#------------------------------- +[OppMove,SING] +Name = SING + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poi.hear.mus + Focus = Target + SetX = 0,364 + SetY = 0,92 + SetVisible = 0,true + SetX = 1,369 + SetY = 1,117 + SetX = 2,358 + SetY = 2,154 + SetX = 3,332 + SetY = 3,182 + SetX = 4,382 + SetY = 4,106 + SetX = 5,365 + SetY = 5,96 + SetX = 6,212 + SetY = 6,246 + SetX = 7,356 + SetY = 7,172 + SetX = 8,320 + SetY = 8,192 + SetX = 9,298 + SetY = 9,201 + SetX = 10,265 + SetY = 10,239 + SetX = 11,231 + SetY = 11,255 + SetX = 12,282 + SetY = 12,196 + SetX = 13,255 + SetY = 13,253 + SetX = 14,348 + SetY = 14,175 + SetX = 15,303 + SetY = 15,213 + SetX = 16,384 + SetY = 16,110 + SetX = 17,355 + SetY = 17,167 + SetX = 18,316 + SetY = 18,200 + SetX = 19,289 + SetY = 19,223 + SetX = 20,244 + SetY = 20,239 + SetX = 21,313 + SetY = 21,199 + SetX = 22,281 + SetY = 22,248 + SetX = 23,238 + SetY = 23,242 + SetX = 24,341 + SetY = 24,194 + SetX = 25,296 + SetY = 25,225 + SetX = 26,369 + SetY = 26,116 + SetX = 27,326 + SetY = 27,171 + SetX = 28,186 + SetY = 28,240 + SetX = 29,156 + SetY = 29,241 + SetX = 30,150 + SetX = 31,180 + SetY = 31,214 + SetX = 32,183 + SetX = 33,193 + SetY = 33,171 + SetX = 34,161 + SetY = 34,235 + SetX = 35,190 + SetY = 35,195 + SetX = 36,164 + SetY = 36,176 + SetX = 37,167 + SetY = 37,175 + SetX = 38,159 + SetY = 38,143 + SetX = 39,202 + SetY = 39,108 + SetOpacity = 39,243 + SetX = 40,183 + SetY = 40,119 + SetOpacity = 40,255 + + Graphic = poi.hear.mus + Focus = Target + SetX = 0,365 + SetY = 0,125 + SetVisible = 0,true + SetX = 1,350 + SetY = 1,146 + SetX = 2,356 + SetY = 2,143 + SetX = 3,304 + SetY = 3,177 + SetX = 4,294 + SetY = 4,203 + SetX = 5,383 + SetY = 5,125 + SetX = 6,228 + SetY = 6,232 + SetX = 7,375 + SetY = 7,166 + SetX = 8,344 + SetY = 8,188 + SetX = 9,282 + SetY = 9,205 + SetX = 10,287 + SetY = 10,225 + SetX = 11,242 + SetY = 11,244 + SetX = 12,314 + SetY = 12,207 + SetX = 13,240 + SetY = 13,244 + SetX = 14,342 + SetY = 14,181 + SetX = 15,332 + SetY = 15,221 + SetX = 16,377 + SetY = 16,126 + SetX = 17,360 + SetY = 17,154 + SetX = 18,309 + SetY = 18,211 + SetX = 19,284 + SetY = 19,236 + SetX = 20,252 + SetY = 20,256 + SetX = 21,345 + SetY = 21,203 + SetX = 22,300 + SetY = 22,240 + SetX = 23,231 + SetY = 23,245 + SetX = 24,350 + SetY = 24,216 + SetX = 25,306 + SetY = 25,242 + SetX = 26,361 + SetY = 26,143 + SetX = 27,333 + SetY = 27,171 + SetX = 28,183 + SetY = 28,258 + SetX = 29,163 + SetY = 29,239 + SetX = 30,176 + SetY = 30,223 + SetX = 31,173 + SetY = 31,204 + SetX = 32,159 + SetY = 32,186 + SetX = 33,182 + SetY = 33,191 + SetX = 34,153 + SetY = 34,221 + SetX = 35,181 + SetY = 35,163 + SetX = 36,193 + SetY = 36,197 + SetX = 37,191 + SetY = 37,163 + SetX = 38,172 + SetY = 38,161 + SetX = 39,204 + SetY = 39,163 + SetX = 40,183 + SetY = 40,100 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 4,300 + SetY = 4,200 + SetX = 5,262 + SetY = 5,233 + SetX = 6,369 + SetY = 6,129 + SetX = 7,334 + SetY = 7,162 + SetX = 8,316 + SetY = 8,166 + SetX = 9,305 + SetY = 9,207 + SetX = 10,263 + SetY = 10,215 + SetX = 11,214 + SetY = 11,227 + SetX = 12,328 + SetY = 12,211 + SetX = 13,243 + SetY = 13,222 + SetX = 14,319 + SetY = 14,174 + SetX = 15,338 + SetY = 15,219 + SetX = 16,287 + SetY = 16,257 + SetX = 17,252 + SetY = 17,240 + SetX = 18,341 + SetY = 18,216 + SetX = 19,388 + SetY = 19,118 + SetX = 20,365 + SetY = 20,153 + SetX = 21,222 + SetY = 21,259 + SetX = 22,268 + SetY = 22,239 + SetX = 23,234 + SetY = 23,242 + SetX = 24,316 + SetY = 24,212 + SetX = 25,305 + SetY = 25,234 + SetX = 26,239 + SetY = 26,246 + SetX = 27,346 + SetY = 27,201 + SetX = 28,212 + SetY = 28,248 + SetX = 29,181 + SetY = 29,253 + SetX = 30,167 + SetY = 30,247 + SetX = 31,196 + SetY = 31,222 + SetX = 32,180 + SetY = 32,271 + SetX = 33,189 + SetY = 33,192 + SetX = 34,169 + SetY = 34,208 + SetX = 35,198 + SetY = 35,169 + SetX = 36,197 + SetY = 36,163 + SetX = 37,155 + SetY = 37,173 + SetX = 38,189 + SetY = 38,155 + SetX = 39,178 + SetY = 39,142 + SetX = 40,169 + SetY = 40,139 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 4,305 + SetY = 4,227 + SetX = 5,275 + SetY = 5,241 + SetX = 6,370 + SetY = 6,121 + SetX = 9,381 + SetY = 9,113 + SetX = 10,378 + SetY = 10,125 + SetX = 11,348 + SetY = 11,181 + SetX = 12,391 + SetY = 12,104 + SetX = 13,377 + SetY = 13,141 + SetX = 16,287 + SetY = 16,252 + SetX = 17,233 + SetY = 17,251 + SetX = 19,378 + SetY = 19,135 + SetX = 20,372 + SetY = 20,173 + SetX = 21,237 + SetY = 21,267 + SetX = 22,390 + SetY = 22,124 + SetX = 23,368 + SetY = 23,151 + SetX = 26,272 + SetY = 26,240 + SetX = 27,236 + SetY = 27,247 + SetX = 28,300 + SetY = 28,211 + SetX = 29,278 + SetY = 29,252 + SetX = 30,275 + SetY = 30,253 + SetX = 31,226 + SetY = 31,269 + SetX = 32,150 + SetY = 32,250 + SetX = 33,161 + SetY = 33,260 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 10,380 + SetY = 10,124 + SetX = 11,349 + SetY = 11,180 + SetX = 12,379 + SetY = 12,122 + SetX = 13,371 + SetY = 13,140 + SetX = 16,282 + SetY = 16,252 + SetX = 17,238 + SetY = 17,245 + SetX = 20,367 + SetY = 20,183 + SetX = 21,292 + SetY = 21,204 + SetX = 23,369 + SetY = 23,179 + SetX = 26,250 + SetY = 26,250 + SetX = 27,218 + SetY = 27,255 + SetX = 28,308 + SetY = 28,205 + SetX = 29,279 + SetY = 29,245 + SetX = 30,263 + SetY = 30,244 + SetX = 31,218 + SetY = 31,254 + SetX = 32,181 + SetY = 32,263 + SetX = 33,132 + SetY = 33,243 + + Graphic = poi.hear.mus + Focus = Target + SetVisible = 0,true + SetX = 11,319 + SetY = 11,172 + SetX = 13,361 + SetY = 13,158 + SetX = 23,335 + SetY = 23,156 + SetX = 27,241 + SetY = 27,261 + SetX = 28,327 + SetY = 28,222 + SetX = 30,262 + SetY = 30,252 + + Play = 0,Sing,95,100 diff --git a/PBS/Animations/Converted/Move/SKETCH.txt b/PBS/Animations/Converted/Move/SKETCH.txt new file mode 100644 index 000000000..e4cc4f39f --- /dev/null +++ b/PBS/Animations/Converted/Move/SKETCH.txt @@ -0,0 +1,57 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SKETCH] +Name = SKETCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal2 + Focus = Target + SetX = 0,152 + SetY = 0,30 + SetZoomX = 0,75 + SetZoomY = 0,75 + SetVisible = 0,true + SetX = 1,184 + SetY = 1,54 + SetX = 2,224 + SetY = 2,86 + SetX = 3,288 + SetY = 3,134 + SetX = 4,368 + SetY = 4,174 + SetX = 5,464 + SetY = 5,166 + SetX = 6,424 + SetY = 6,134 + SetX = 7,320 + SetY = 7,102 + SetX = 8,224 + SetY = 8,54 + SetX = 9,216 + SetY = 9,6 + SetX = 10,272 + SetY = 10,38 + SetX = 11,320 + SetY = 11,70 + SetX = 12,400 + SetY = 12,110 + SetX = 13,480 + SetY = 13,150 + SetX = 14,504 + SetY = 14,158 + SetX = 15,488 + SetY = 15,110 + SetX = 16,424 + SetY = 16,54 + SetX = 17,344 + SetY = 17,-18 + + Play = 0,Slash6,80,100 + Play = 6,Slash6,80,100 + Play = 10,Slash6,80,100 + Play = 15,Slash6,80,100 diff --git a/PBS/Animations/Converted/Move/SLAM.txt b/PBS/Animations/Converted/Move/SLAM.txt new file mode 100644 index 000000000..8a9f01a12 --- /dev/null +++ b/PBS/Animations/Converted/Move/SLAM.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SLAM] +Name = SLAM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Blow6,80,100 diff --git a/PBS/Animations/Converted/Move/SLASH.txt b/PBS/Animations/Converted/Move/SLASH.txt new file mode 100644 index 000000000..3df39ea50 --- /dev/null +++ b/PBS/Animations/Converted/Move/SLASH.txt @@ -0,0 +1,47 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SLASH] +Name = SLASH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = zan03 + Focus = Target + SetX = 0,280 + SetY = 0,6 + SetVisible = 0,true + SetX = 1,344 + SetY = 1,54 + SetX = 2,376 + SetY = 2,70 + SetX = 3,384 + SetY = 3,94 + + Graphic = zan03 + Focus = Target + SetX = 0,304 + SetY = 0,-26 + SetVisible = 0,true + SetX = 1,320 + SetY = 1,86 + SetX = 2,336 + SetX = 3,352 + SetY = 3,118 + + Graphic = zan03 + Focus = Target + SetX = 0,256 + SetY = 0,38 + SetVisible = 0,true + SetX = 1,368 + SetY = 1,30 + SetX = 2,408 + SetY = 2,54 + SetX = 3,416 + SetY = 3,78 + + Play = 0,Slash3,80,100 diff --git a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt new file mode 100644 index 000000000..6227d2564 --- /dev/null +++ b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SLEEPPOWDER] +Name = SLEEPPOWDER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Special5 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/SLUDGE.txt b/PBS/Animations/Converted/Move/SLUDGE.txt new file mode 100644 index 000000000..89d0af95e --- /dev/null +++ b/PBS/Animations/Converted/Move/SLUDGE.txt @@ -0,0 +1,30 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SLUDGE] +Name = SLUDGE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = State1 + Focus = Target + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,172 + SetY = 1,186 + SetAngle = 1,325 + SetX = 2,249 + SetY = 2,148 + SetX = 3,313 + SetY = 3,129 + SetX = 4,358 + SetY = 4,91 + SetY = 5,110 + SetAngle = 5,0 + + Play = 0,throw,80,100 + Play = 7,Poison,80,100 diff --git a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt new file mode 100644 index 000000000..13a11267f --- /dev/null +++ b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt @@ -0,0 +1,79 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SLUDGEBOMB] +Name = SLUDGEBOMB + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison4 + Focus = UserAndTarget + SetX = 0,140 + SetY = 0,217 + SetVisible = 0,true + SetX = 1,172 + SetY = 1,211 + SetX = 2,134 + SetX = 3,179 + SetY = 3,148 + SetX = 4,243 + SetY = 4,104 + SetX = 5,294 + SetY = 5,79 + SetX = 6,256 + SetY = 6,135 + + Graphic = poison4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,147 + SetY = 1,198 + SetX = 2,211 + SetY = 2,186 + SetX = 3,262 + SetY = 3,142 + SetX = 4,326 + SetY = 4,135 + SetX = 5,236 + SetY = 5,148 + + Graphic = poison4 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,166 + SetY = 2,186 + SetX = 3,192 + SetY = 3,167 + SetX = 4,217 + SetY = 4,154 + + Graphic = poison4 + Focus = UserAndTarget + SetX = 0,134 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,166 + SetY = 1,173 + SetX = 2,198 + SetY = 2,148 + SetX = 3,281 + SetY = 3,104 + SetX = 4,358 + SetY = 4,110 + SetX = 5,345 + SetX = 7,275 + SetY = 7,123 + SetX = 8,288 + SetY = 8,116 + SetX = 9,307 + SetY = 9,110 + SetX = 10,332 + SetX = 11,352 + SetX = 12,358 + + Play = 3,Poison,80,100 + Play = 5,Poison,80,100 + Play = 7,Poison,80,100 diff --git a/PBS/Animations/Converted/Move/SMOG.txt b/PBS/Animations/Converted/Move/SMOG.txt new file mode 100644 index 000000000..acd1951ff --- /dev/null +++ b/PBS/Animations/Converted/Move/SMOG.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SMOG] +Name = SMOG + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison + Focus = Target + SetX = 0,392 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Wind8,80,100 diff --git a/PBS/Animations/Converted/Move/SMOKESCREEN.txt b/PBS/Animations/Converted/Move/SMOKESCREEN.txt new file mode 100644 index 000000000..5233e994a --- /dev/null +++ b/PBS/Animations/Converted/Move/SMOKESCREEN.txt @@ -0,0 +1,102 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SMOKESCREEN] +Name = SMOKESCREEN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Anima (2) + Focus = Target + SetX = 0,384 + SetY = 0,102 + SetVisible = 0,true + SetFlip = 5,true + SetZoomX = 5,110 + SetZoomY = 5,110 + SetZoomX = 6,100 + SetZoomY = 6,100 + SetFlip = 10,false + SetX = 10,336 + SetY = 10,78 + SetX = 11,408 + SetY = 11,62 + SetX = 12,440 + SetY = 12,110 + SetOpacity = 14,150 + + Graphic = Anima (2) + Focus = Target + SetVisible = 0,true + SetX = 2,336 + SetY = 2,78 + SetX = 10,408 + SetY = 10,62 + SetX = 11,440 + SetY = 11,110 + SetX = 12,320 + SetOpacity = 13,150 + + Graphic = Anima (2) + Focus = Target + SetVisible = 0,true + SetX = 3,408 + SetY = 3,62 + SetX = 10,440 + SetY = 10,110 + SetX = 11,320 + SetFlip = 12,true + SetX = 12,352 + SetY = 12,126 + SetOpacity = 13,150 + + Graphic = Anima (2) + Focus = Target + SetVisible = 0,true + SetFlip = 3,true + SetX = 3,352 + SetY = 3,126 + SetFlip = 4,false + SetX = 4,440 + SetY = 4,110 + SetFlip = 9,true + SetZoomX = 9,125 + SetZoomY = 9,125 + SetFlip = 10,false + SetX = 10,320 + SetZoomX = 10,100 + SetZoomY = 10,100 + SetFlip = 11,true + SetX = 11,352 + SetY = 11,126 + + Graphic = Anima (2) + Focus = Target + SetVisible = 0,true + SetFlip = 4,true + SetX = 4,352 + SetY = 4,126 + SetFlip = 5,false + SetX = 5,320 + SetY = 5,110 + SetFlip = 10,true + SetX = 10,352 + SetY = 10,126 + + Graphic = Anima (2) + Focus = Target + SetVisible = 0,true + SetFlip = 5,true + SetX = 5,352 + SetY = 5,126 + SetFlip = 8,false + SetZoomX = 8,125 + SetZoomY = 8,125 + SetFlip = 9,true + SetZoomX = 9,100 + SetZoomY = 9,100 + + Play = 0,Wind8,80,100 diff --git a/PBS/Animations/Converted/Move/SPIDERWEB.txt b/PBS/Animations/Converted/Move/SPIDERWEB.txt new file mode 100644 index 000000000..ebf3da7d5 --- /dev/null +++ b/PBS/Animations/Converted/Move/SPIDERWEB.txt @@ -0,0 +1,69 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SPIDERWEB] +Name = SPIDERWEB + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ghost2 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 3,true + SetX = 3,358 + SetY = 3,98 + SetOpacity = 3,20 + SetFlip = 4,false + SetX = 4,281 + SetY = 4,142 + SetZoomX = 4,110 + SetZoomY = 4,110 + SetAngle = 4,330 + SetOpacity = 4,255 + SetX = 5,288 + SetZoomX = 5,100 + SetZoomY = 5,100 + SetX = 6,307 + SetY = 6,129 + SetZoomX = 6,75 + SetZoomY = 6,75 + SetX = 7,320 + SetY = 7,123 + SetZoomX = 7,50 + SetZoomY = 7,50 + + Graphic = ghost2 + Focus = UserAndTarget + SetX = 0,192 + SetY = 0,205 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetAngle = 0,330 + SetVisible = 0,true + SetX = 1,204 + SetY = 1,192 + SetZoomX = 1,75 + SetZoomY = 1,75 + SetX = 2,217 + SetY = 2,179 + SetZoomX = 2,100 + SetZoomY = 2,100 + SetX = 3,249 + SetY = 3,161 + SetZoomX = 3,110 + SetZoomY = 3,110 + SetFlip = 4,true + SetX = 4,358 + SetY = 4,98 + SetZoomX = 4,100 + SetZoomY = 4,100 + SetAngle = 4,0 + SetOpacity = 4,50 + SetOpacity = 5,255 + SetOpacity = 8,150 + SetOpacity = 9,50 + + Play = 0,throw,80,100 diff --git a/PBS/Animations/Converted/Move/SPIKECANNON.txt b/PBS/Animations/Converted/Move/SPIKECANNON.txt new file mode 100644 index 000000000..16f71dc2f --- /dev/null +++ b/PBS/Animations/Converted/Move/SPIKECANNON.txt @@ -0,0 +1,376 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SPIKECANNON] +Name = SPIKECANNON + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,135 + SetX = 3,358 + SetY = 3,110 + SetY = 4,104 + SetX = 5,364 + SetY = 5,123 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,262 + SetY = 3,142 + SetX = 4,345 + SetY = 4,148 + SetX = 5,320 + SetY = 5,104 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,217 + SetY = 2,205 + SetX = 3,268 + SetY = 3,179 + SetX = 4,281 + SetY = 4,129 + SetX = 5,371 + SetY = 5,110 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,192 + SetX = 3,198 + SetY = 3,167 + SetX = 4,371 + SetY = 4,85 + SetOpacity = 4,50 + SetX = 5,332 + SetY = 5,91 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,364 + SetY = 3,98 + SetOpacity = 3,50 + + Play = 0,Slash10,80,100 + Play = 2,Slash10,80,100 + Play = 4,Slash10,80,100 +#------------------------------- +[Move,SPIKECANNON,1] +Name = Spike Cannon hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,364 + SetY = 3,98 + SetOpacity = 3,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,135 + SetX = 3,358 + SetY = 3,110 + SetY = 4,104 + SetX = 5,364 + SetY = 5,123 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,262 + SetY = 3,142 + SetX = 4,345 + SetY = 4,148 + SetX = 5,320 + SetY = 5,104 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,217 + SetY = 2,205 + SetX = 3,268 + SetY = 3,179 + SetX = 4,281 + SetY = 4,129 + SetX = 5,371 + SetY = 5,110 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,192 + SetX = 3,198 + SetY = 3,167 + SetX = 4,371 + SetY = 4,85 + SetOpacity = 4,50 + SetX = 5,332 + SetY = 5,91 + + Play = 0,Slash10,80,100 + Play = 2,Slash10,80,100 + Play = 4,Slash10,80,100 +#------------------------------- +[Move,SPIKECANNON,2] +Name = Spike Cannon hit 3 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,192 + SetX = 3,198 + SetY = 3,167 + SetX = 4,371 + SetY = 4,85 + SetOpacity = 4,50 + SetX = 5,332 + SetY = 5,91 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,364 + SetY = 3,98 + SetOpacity = 3,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,135 + SetX = 3,358 + SetY = 3,110 + SetY = 4,104 + SetX = 5,364 + SetY = 5,123 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,262 + SetY = 3,142 + SetX = 4,345 + SetY = 4,148 + SetX = 5,320 + SetY = 5,104 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,217 + SetY = 2,205 + SetX = 3,268 + SetY = 3,179 + SetX = 4,281 + SetY = 4,129 + SetX = 5,371 + SetY = 5,110 + SetOpacity = 5,50 + + Play = 0,Slash10,80,100 + Play = 2,Slash10,80,100 + Play = 4,Slash10,80,100 +#------------------------------- +[Move,SPIKECANNON,3] +Name = Spike Cannon hit 4 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,217 + SetY = 2,205 + SetX = 3,268 + SetY = 3,179 + SetX = 4,281 + SetY = 4,129 + SetX = 5,371 + SetY = 5,110 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,192 + SetX = 3,198 + SetY = 3,167 + SetX = 4,371 + SetY = 4,85 + SetOpacity = 4,50 + SetX = 5,332 + SetY = 5,91 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,364 + SetY = 3,98 + SetOpacity = 3,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,135 + SetX = 3,358 + SetY = 3,110 + SetY = 4,104 + SetX = 5,364 + SetY = 5,123 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,262 + SetY = 3,142 + SetX = 4,345 + SetY = 4,148 + SetX = 5,320 + SetY = 5,104 + + Play = 0,Slash10,80,100 + Play = 2,Slash10,80,100 + Play = 4,Slash10,80,100 +#------------------------------- +[Move,SPIKECANNON,4] +Name = Spike Cannon hit 5 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,160 + SetY = 1,198 + SetX = 2,211 + SetY = 2,173 + SetX = 3,262 + SetY = 3,142 + SetX = 4,345 + SetY = 4,148 + SetX = 5,320 + SetY = 5,104 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,217 + SetY = 2,205 + SetX = 3,268 + SetY = 3,179 + SetX = 4,281 + SetY = 4,129 + SetX = 5,371 + SetY = 5,110 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,153 + SetY = 2,192 + SetX = 3,198 + SetY = 3,167 + SetX = 4,371 + SetY = 4,85 + SetOpacity = 4,50 + SetX = 5,332 + SetY = 5,91 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,364 + SetY = 3,98 + SetOpacity = 3,50 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,147 + SetY = 0,211 + SetVisible = 0,true + SetX = 1,217 + SetY = 1,179 + SetX = 2,294 + SetY = 2,135 + SetX = 3,358 + SetY = 3,110 + SetY = 4,104 + SetX = 5,364 + SetY = 5,123 + + Play = 0,Slash10,80,100 + Play = 2,Slash10,80,100 + Play = 4,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/SPIKES.txt b/PBS/Animations/Converted/Move/SPIKES.txt new file mode 100644 index 000000000..7e0b722e2 --- /dev/null +++ b/PBS/Animations/Converted/Move/SPIKES.txt @@ -0,0 +1,84 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SPIKES] +Name = SPIKES + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal2 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,128 + SetY = 3,236 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,153 + SetY = 4,154 + SetX = 5,185 + SetY = 5,110 + SetX = 6,128 + SetY = 6,230 + SetX = 7,147 + SetY = 7,148 + SetX = 8,371 + SetY = 8,66 + SetX = 9,409 + SetY = 9,129 + SetX = 10,307 + SetX = 12,358 + SetY = 12,110 + SetX = 13,307 + SetY = 13,129 + + Graphic = normal2 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,243 + SetY = 6,85 + SetZoomX = 6,50 + SetZoomY = 6,50 + SetX = 7,307 + SetY = 7,129 + SetX = 8,204 + SetY = 8,85 + SetX = 9,307 + SetY = 9,129 + SetX = 10,409 + + Graphic = normal2 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,211 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetVisible = 0,true + SetX = 1,140 + SetY = 1,161 + SetX = 2,166 + SetY = 2,116 + SetX = 3,211 + SetY = 3,85 + SetX = 4,268 + SetY = 4,91 + SetX = 5,307 + SetY = 5,129 + SetX = 7,288 + SetY = 7,60 + SetX = 8,307 + SetY = 8,129 + SetY = 9,47 + SetX = 10,358 + SetY = 10,110 + SetX = 12,307 + SetY = 12,129 + SetX = 13,358 + SetY = 13,110 + + Play = 1,throw,80,100 + Play = 5,Sword1,80,100 + Play = 8,Sword1,80,100 + Play = 10,Sword1,80,100 diff --git a/PBS/Animations/Converted/Move/SPLASH.txt b/PBS/Animations/Converted/Move/SPLASH.txt new file mode 100644 index 000000000..b26799194 --- /dev/null +++ b/PBS/Animations/Converted/Move/SPLASH.txt @@ -0,0 +1,69 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SPLASH] +Name = SPLASH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison2 + Focus = User + SetVisible = 0,true + SetFlip = 1,true + SetX = 1,56 + SetY = 1,230 + SetX = 3,40 + SetY = 3,214 + SetX = 4,32 + SetY = 4,206 + SetX = 5,16 + SetY = 5,222 + SetFlip = 6,false + SetX = 6,240 + SetY = 6,206 + SetFlip = 7,true + SetX = 7,48 + SetX = 8,32 + SetY = 8,198 + SetX = 9,8 + + Graphic = poison2 + Focus = User + SetVisible = 0,true + SetX = 2,200 + SetY = 2,222 + SetX = 4,208 + SetX = 5,224 + SetY = 5,214 + SetFlip = 6,true + SetX = 6,64 + + Graphic = poison2 + Focus = User + SetX = 0,184 + SetY = 0,238 + SetVisible = 0,true + SetX = 1,192 + SetY = 1,230 + SetFlip = 2,true + SetX = 2,48 + SetY = 2,222 + SetFlip = 3,false + SetX = 3,208 + SetX = 4,224 + SetY = 4,230 + SetX = 5,232 + SetY = 5,238 + SetFlip = 6,true + SetX = 6,8 + SetFlip = 7,false + SetX = 7,248 + SetY = 7,198 + SetX = 8,264 + SetX = 9,272 + SetY = 9,206 + + Play = 0,Water2,40,70 diff --git a/PBS/Animations/Converted/Move/SPORE.txt b/PBS/Animations/Converted/Move/SPORE.txt new file mode 100644 index 000000000..1c43bba5a --- /dev/null +++ b/PBS/Animations/Converted/Move/SPORE.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SPORE] +Name = SPORE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Special5 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/STEALTHROCK.txt b/PBS/Animations/Converted/Move/STEALTHROCK.txt new file mode 100644 index 000000000..7182c4ef5 --- /dev/null +++ b/PBS/Animations/Converted/Move/STEALTHROCK.txt @@ -0,0 +1,479 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,STEALTHROCK] +Name = STEALTHROCK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Rock Tomb + Focus = Screen + SetX = 0,128 + SetY = 0,224 + SetVisible = 0,true + SetX = 1,150 + SetY = 1,192 + SetX = 2,180 + SetY = 2,158 + SetX = 3,208 + SetY = 3,124 + SetX = 4,248 + SetY = 4,104 + SetX = 5,290 + SetY = 5,96 + SetX = 6,336 + SetY = 6,110 + SetX = 7,370 + SetY = 7,136 + SetX = 8,384 + SetY = 8,166 + SetX = 9,290 + SetY = 9,96 + SetX = 10,336 + SetY = 10,110 + SetX = 11,370 + SetY = 11,136 + SetX = 12,384 + SetY = 12,166 + SetX = 13,290 + SetY = 13,96 + SetX = 14,336 + SetY = 14,110 + SetX = 15,370 + SetY = 15,136 + SetX = 16,384 + SetY = 16,166 + SetX = 17,290 + SetY = 17,96 + SetX = 18,336 + SetY = 18,110 + SetX = 19,370 + SetY = 19,136 + SetX = 20,384 + SetY = 20,166 + SetX = 21,323 + SetY = 21,169 + SetOpacity = 22,192 + SetOpacity = 23,128 + SetOpacity = 24,64 + SetX = 25,288 + SetY = 25,181 + SetOpacity = 25,255 + SetOpacity = 26,192 + SetOpacity = 27,128 + SetOpacity = 28,64 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 4,128 + SetY = 4,224 + SetX = 5,150 + SetY = 5,192 + SetX = 6,180 + SetY = 6,158 + SetX = 7,208 + SetY = 7,124 + SetX = 8,248 + SetY = 8,104 + SetX = 9,150 + SetY = 9,192 + SetX = 10,180 + SetY = 10,158 + SetX = 11,208 + SetY = 11,124 + SetX = 12,248 + SetY = 12,104 + SetX = 13,150 + SetY = 13,192 + SetX = 14,180 + SetY = 14,158 + SetX = 15,208 + SetY = 15,124 + SetX = 16,248 + SetY = 16,104 + SetX = 17,352 + SetY = 17,186 + SetX = 18,475 + SetY = 18,175 + SetOpacity = 18,192 + SetX = 19,352 + SetY = 19,186 + SetOpacity = 19,128 + SetX = 20,475 + SetY = 20,175 + SetOpacity = 20,64 + SetX = 21,395 + SetY = 21,190 + SetOpacity = 21,255 + SetOpacity = 22,192 + SetOpacity = 23,128 + SetOpacity = 24,64 + SetX = 25,444 + SetY = 25,176 + SetOpacity = 25,255 + SetOpacity = 26,192 + SetOpacity = 27,128 + SetOpacity = 28,64 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 7,431 + SetY = 7,188 + SetOpacity = 7,128 + SetX = 8,128 + SetY = 8,224 + SetOpacity = 8,255 + SetX = 9,431 + SetY = 9,188 + SetX = 10,295 + SetY = 10,174 + SetX = 12,128 + SetY = 12,224 + SetX = 13,295 + SetY = 13,174 + SetOpacity = 14,192 + SetOpacity = 15,128 + SetOpacity = 16,64 + SetX = 17,475 + SetY = 17,175 + SetOpacity = 17,255 + SetX = 18,352 + SetY = 18,186 + SetOpacity = 18,192 + SetX = 19,475 + SetY = 19,175 + SetOpacity = 19,128 + SetX = 20,352 + SetY = 20,186 + SetOpacity = 20,64 + SetX = 21,288 + SetY = 21,181 + SetOpacity = 21,255 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 8,295 + SetY = 8,174 + SetOpacity = 8,192 + SetOpacity = 9,255 + SetX = 10,431 + SetY = 10,188 + SetOpacity = 14,192 + SetOpacity = 15,128 + SetOpacity = 16,64 + SetX = 17,323 + SetY = 17,169 + SetOpacity = 17,255 + SetX = 21,444 + SetY = 21,176 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 7,295 + SetY = 7,174 + SetOpacity = 7,128 + SetX = 8,431 + SetY = 8,188 + SetOpacity = 8,192 + SetX = 11,352 + SetY = 11,186 + SetOpacity = 11,128 + SetX = 12,295 + SetY = 12,174 + SetOpacity = 12,255 + SetX = 13,352 + SetY = 13,186 + SetX = 16,475 + SetY = 16,175 + SetX = 17,395 + SetY = 17,190 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 11,475 + SetY = 11,175 + SetOpacity = 11,128 + SetOpacity = 12,192 + SetOpacity = 13,255 + SetX = 16,352 + SetY = 16,186 + SetX = 19,444 + SetY = 19,176 + SetOpacity = 19,128 + SetX = 20,288 + SetY = 20,181 + SetOpacity = 20,192 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 12,352 + SetY = 12,186 + SetOpacity = 12,192 + SetX = 15,323 + SetY = 15,169 + SetOpacity = 15,128 + SetOpacity = 16,192 + SetX = 19,288 + SetY = 19,181 + SetOpacity = 19,128 + SetX = 20,444 + SetY = 20,176 + SetOpacity = 20,192 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 15,395 + SetY = 15,190 + SetOpacity = 15,128 + SetOpacity = 16,192 + + Play = 0,Slam,80,100 +#------------------------------- +[OppMove,STEALTHROCK] +Name = STEALTHROCK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Rock Tomb + Focus = Screen + SetX = 0,376 + SetY = 0,84 + SetVisible = 0,true + SetX = 1,332 + SetY = 1,72 + SetX = 2,294 + SetY = 2,62 + SetX = 3,250 + SetY = 3,74 + SetX = 4,214 + SetY = 4,104 + SetX = 5,178 + SetY = 5,142 + SetX = 6,152 + SetY = 6,178 + SetX = 7,128 + SetY = 7,224 + SetX = 8,114 + SetY = 8,274 + SetX = 9,178 + SetY = 9,142 + SetX = 10,152 + SetY = 10,178 + SetX = 11,128 + SetY = 11,224 + SetX = 12,114 + SetY = 12,274 + SetX = 13,178 + SetY = 13,142 + SetX = 14,152 + SetY = 14,178 + SetX = 15,128 + SetY = 15,224 + SetX = 16,114 + SetY = 16,274 + SetX = 17,178 + SetY = 17,142 + SetX = 18,152 + SetY = 18,178 + SetX = 19,128 + SetY = 19,224 + SetX = 20,114 + SetY = 20,274 + SetX = 21,99 + SetY = 21,265 + SetOpacity = 22,192 + SetOpacity = 23,128 + SetOpacity = 24,64 + SetX = 25,64 + SetY = 25,277 + SetOpacity = 25,255 + SetOpacity = 26,192 + SetOpacity = 27,128 + SetOpacity = 28,64 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 4,376 + SetY = 4,84 + SetX = 5,332 + SetY = 5,72 + SetX = 6,294 + SetY = 6,62 + SetX = 7,250 + SetY = 7,74 + SetX = 8,214 + SetY = 8,104 + SetX = 9,332 + SetY = 9,72 + SetX = 10,294 + SetY = 10,62 + SetX = 11,250 + SetY = 11,74 + SetX = 12,214 + SetY = 12,104 + SetX = 13,332 + SetY = 13,72 + SetX = 14,294 + SetY = 14,62 + SetX = 15,250 + SetY = 15,74 + SetX = 16,214 + SetY = 16,104 + SetX = 17,128 + SetY = 17,282 + SetX = 18,251 + SetY = 18,271 + SetOpacity = 18,192 + SetX = 19,128 + SetY = 19,282 + SetOpacity = 19,128 + SetX = 20,251 + SetY = 20,271 + SetOpacity = 20,64 + SetX = 21,171 + SetY = 21,286 + SetOpacity = 21,255 + SetOpacity = 22,192 + SetOpacity = 23,128 + SetOpacity = 24,64 + SetX = 25,220 + SetY = 25,272 + SetOpacity = 25,255 + SetOpacity = 26,192 + SetOpacity = 27,128 + SetOpacity = 28,64 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 7,207 + SetY = 7,284 + SetOpacity = 7,128 + SetX = 8,376 + SetY = 8,84 + SetOpacity = 8,255 + SetX = 9,207 + SetY = 9,284 + SetX = 10,71 + SetY = 10,270 + SetX = 12,376 + SetY = 12,84 + SetX = 13,71 + SetY = 13,270 + SetOpacity = 14,192 + SetOpacity = 15,128 + SetOpacity = 16,64 + SetX = 17,251 + SetY = 17,271 + SetOpacity = 17,255 + SetX = 18,128 + SetY = 18,282 + SetOpacity = 18,192 + SetX = 19,251 + SetY = 19,271 + SetOpacity = 19,128 + SetX = 20,128 + SetY = 20,282 + SetOpacity = 20,64 + SetX = 21,64 + SetY = 21,277 + SetOpacity = 21,255 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 8,71 + SetY = 8,270 + SetOpacity = 8,192 + SetOpacity = 9,255 + SetX = 10,207 + SetY = 10,284 + SetOpacity = 14,192 + SetOpacity = 15,128 + SetOpacity = 16,64 + SetX = 17,99 + SetY = 17,265 + SetOpacity = 17,255 + SetX = 21,220 + SetY = 21,272 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 7,71 + SetY = 7,270 + SetOpacity = 7,128 + SetX = 8,207 + SetY = 8,284 + SetOpacity = 8,192 + SetX = 11,128 + SetY = 11,282 + SetOpacity = 11,128 + SetX = 12,71 + SetY = 12,270 + SetOpacity = 12,255 + SetX = 13,128 + SetY = 13,282 + SetX = 16,251 + SetY = 16,271 + SetX = 17,171 + SetY = 17,286 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 11,251 + SetY = 11,271 + SetOpacity = 11,128 + SetOpacity = 12,192 + SetOpacity = 13,255 + SetX = 16,128 + SetY = 16,282 + SetX = 19,220 + SetY = 19,272 + SetOpacity = 19,128 + SetX = 20,64 + SetY = 20,277 + SetOpacity = 20,192 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 12,128 + SetY = 12,282 + SetOpacity = 12,192 + SetX = 15,99 + SetY = 15,265 + SetOpacity = 15,128 + SetOpacity = 16,192 + SetX = 19,64 + SetY = 19,277 + SetOpacity = 19,128 + SetX = 20,220 + SetY = 20,272 + SetOpacity = 20,192 + + Graphic = Rock Tomb + Focus = Screen + SetVisible = 0,true + SetX = 15,171 + SetY = 15,286 + SetOpacity = 15,128 + SetOpacity = 16,192 + + Play = 0,Slam,80,100 diff --git a/PBS/Animations/Converted/Move/STOMP.txt b/PBS/Animations/Converted/Move/STOMP.txt new file mode 100644 index 000000000..1eae1b62a --- /dev/null +++ b/PBS/Animations/Converted/Move/STOMP.txt @@ -0,0 +1,22 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,STOMP] +Name = STOMP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = normal1 + Focus = Target + SetX = 0,384 + SetY = 0,-18 + SetVisible = 0,true + SetY = 1,22 + SetY = 2,54 + SetY = 3,70 + SetY = 4,78 + + Play = 2,Blow6,80,100 diff --git a/PBS/Animations/Converted/Move/STRINGSHOT.txt b/PBS/Animations/Converted/Move/STRINGSHOT.txt new file mode 100644 index 000000000..76b6e013c --- /dev/null +++ b/PBS/Animations/Converted/Move/STRINGSHOT.txt @@ -0,0 +1,121 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,STRINGSHOT] +Name = STRINGSHOT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = water3 + Focus = Target + SetVisible = 0,true + SetX = 1,128 + SetY = 1,236 + SetZoomX = 1,25 + SetZoomY = 1,25 + SetX = 2,211 + SetY = 2,179 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetX = 3,281 + SetY = 3,142 + SetZoomX = 3,75 + SetZoomY = 3,75 + SetX = 4,382 + SetY = 4,135 + SetZoomX = 4,100 + SetZoomY = 4,100 + SetZoomX = 5,90 + SetZoomY = 5,90 + SetX = 6,382 + SetY = 6,135 + SetZoomX = 7,95 + SetZoomY = 7,95 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetZoomX = 10,95 + SetZoomY = 10,95 + SetZoomX = 11,90 + SetZoomY = 11,90 + SetZoomX = 13,95 + SetZoomY = 13,95 + SetZoomX = 14,100 + SetZoomY = 14,100 + SetOpacity = 15,100 + + Graphic = water3 + Focus = Target + SetVisible = 0,true + SetX = 2,128 + SetY = 2,236 + SetZoomX = 2,25 + SetZoomY = 2,25 + SetX = 3,204 + SetY = 3,186 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,281 + SetY = 4,161 + SetZoomX = 4,75 + SetZoomY = 4,75 + SetX = 5,382 + SetZoomX = 5,100 + SetZoomY = 5,100 + SetZoomX = 6,96 + SetZoomY = 6,96 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetZoomX = 10,95 + SetZoomY = 10,95 + SetZoomX = 11,90 + SetZoomY = 11,90 + SetZoomX = 13,95 + SetZoomY = 13,95 + SetZoomX = 14,100 + SetZoomY = 14,100 + SetOpacity = 15,100 + + Graphic = water3 + Focus = Target + SetX = 0,128 + SetY = 0,236 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetVisible = 0,true + SetX = 1,211 + SetY = 1,179 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetX = 2,294 + SetY = 2,129 + SetZoomX = 2,75 + SetZoomY = 2,75 + SetX = 3,382 + SetY = 3,110 + SetZoomX = 3,100 + SetZoomY = 3,100 + SetZoomX = 4,95 + SetZoomY = 4,95 + SetZoomX = 5,90 + SetZoomY = 5,90 + SetX = 6,382 + SetY = 6,110 + SetZoomX = 7,95 + SetZoomY = 7,95 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetZoomX = 10,95 + SetZoomY = 10,95 + SetZoomX = 11,90 + SetZoomY = 11,90 + SetZoomX = 13,95 + SetZoomY = 13,95 + SetZoomX = 14,100 + SetZoomY = 14,100 + SetOpacity = 15,100 + + Play = 0,throw,80,100 + Play = 0,Battle1,80,100 diff --git a/PBS/Animations/Converted/Move/STRUGGLE.txt b/PBS/Animations/Converted/Move/STRUGGLE.txt new file mode 100644 index 000000000..905dc6092 --- /dev/null +++ b/PBS/Animations/Converted/Move/STRUGGLE.txt @@ -0,0 +1,55 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,STRUGGLE] +Name = STRUGGLE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Struggle + Focus = User + SetX = 0,168 + SetY = 0,230 + SetVisible = 0,true + SetX = 1,176 + SetY = 1,238 + SetY = 2,222 + SetFlip = 3,true + SetY = 3,238 + SetX = 4,184 + SetY = 4,222 + SetFlip = 5,false + SetX = 5,176 + SetY = 5,230 + SetY = 6,214 + SetX = 7,168 + SetY = 7,230 + SetX = 8,80 + SetY = 8,206 + SetX = 9,72 + SetY = 9,238 + + Graphic = Struggle + Focus = User + SetX = 0,88 + SetY = 0,230 + SetVisible = 0,true + SetY = 1,246 + SetX = 2,96 + SetY = 2,230 + SetFlip = 3,true + SetY = 3,222 + SetX = 4,88 + SetY = 4,238 + SetFlip = 5,false + SetY = 5,222 + SetX = 6,96 + SetY = 6,206 + SetX = 7,80 + SetY = 7,230 + SetX = 8,168 + SetY = 8,214 + SetY = 9,230 diff --git a/PBS/Animations/Converted/Move/STUNSPORE.txt b/PBS/Animations/Converted/Move/STUNSPORE.txt new file mode 100644 index 000000000..711a09d1a --- /dev/null +++ b/PBS/Animations/Converted/Move/STUNSPORE.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,STUNSPORE] +Name = STUNSPORE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Special5 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/SUNNYDAY.txt b/PBS/Animations/Converted/Move/SUNNYDAY.txt new file mode 100644 index 000000000..8638ce4f2 --- /dev/null +++ b/PBS/Animations/Converted/Move/SUNNYDAY.txt @@ -0,0 +1,41 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SUNNYDAY] +Name = SUNNYDAY + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = weather + Focus = Screen + SetX = 0,64 + SetY = 0,64 + SetVisible = 0,true + SetOpacity = 0,64 + SetX = 1,72 + SetY = 1,72 + SetOpacity = 1,128 + SetX = 2,80 + SetY = 2,80 + SetOpacity = 2,192 + SetX = 3,88 + SetY = 3,88 + SetOpacity = 3,224 + SetX = 4,94 + SetY = 4,94 + SetOpacity = 4,255 + SetX = 12,88 + SetY = 12,88 + SetOpacity = 12,224 + SetX = 13,80 + SetY = 13,80 + SetOpacity = 13,192 + SetX = 14,72 + SetY = 14,72 + SetOpacity = 14,128 + SetX = 15,64 + SetY = 15,64 + SetOpacity = 15,64 diff --git a/PBS/Animations/Converted/Move/SUPERSONIC.txt b/PBS/Animations/Converted/Move/SUPERSONIC.txt new file mode 100644 index 000000000..3478e0c88 --- /dev/null +++ b/PBS/Animations/Converted/Move/SUPERSONIC.txt @@ -0,0 +1,103 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SUPERSONIC] +Name = SUPERSONIC + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Struggle + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,147 + SetY = 2,224 + SetAngle = 2,20 + SetX = 3,166 + SetY = 3,205 + SetZoomX = 3,120 + SetZoomY = 3,120 + SetX = 4,204 + SetY = 4,179 + SetZoomX = 4,130 + SetZoomY = 4,130 + SetX = 5,224 + SetY = 5,173 + SetZoomX = 5,120 + SetZoomY = 5,120 + SetX = 6,204 + SetY = 6,186 + SetX = 7,236 + SetY = 7,161 + SetZoomX = 7,130 + SetZoomY = 7,130 + SetX = 8,243 + SetY = 8,167 + SetZoomX = 8,120 + SetZoomY = 8,120 + SetX = 9,230 + SetX = 10,236 + SetY = 10,179 + SetZoomX = 10,130 + SetZoomY = 10,130 + + Graphic = Struggle + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,160 + SetY = 4,211 + SetAngle = 4,20 + SetX = 5,172 + SetY = 5,205 + SetX = 7,185 + SetY = 7,192 + SetX = 8,192 + SetY = 8,198 + + Graphic = Struggle + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetAngle = 1,20 + SetX = 2,172 + SetY = 2,205 + SetZoomX = 2,120 + SetZoomY = 2,120 + SetX = 3,211 + SetY = 3,179 + SetZoomX = 3,130 + SetZoomY = 3,130 + SetX = 4,256 + SetY = 4,154 + SetZoomX = 4,150 + SetZoomY = 4,150 + SetX = 5,281 + SetY = 5,142 + SetX = 6,256 + SetY = 6,154 + SetZoomX = 6,130 + SetZoomY = 6,130 + SetX = 7,294 + SetY = 7,135 + SetZoomX = 7,150 + SetZoomY = 7,150 + SetX = 8,300 + SetX = 9,294 + SetZoomX = 9,130 + SetZoomY = 9,130 + SetY = 10,142 + SetZoomX = 10,150 + SetZoomY = 10,150 + SetX = 11,275 + SetY = 11,161 + SetX = 12,358 + SetY = 12,110 + SetZoomX = 12,100 + SetZoomY = 12,100 + SetAngle = 12,0 + SetOpacity = 12,100 + + Play = 0,Twine,80,100 diff --git a/PBS/Animations/Converted/Move/SWAGGER.txt b/PBS/Animations/Converted/Move/SWAGGER.txt new file mode 100644 index 000000000..e68e8a1e9 --- /dev/null +++ b/PBS/Animations/Converted/Move/SWAGGER.txt @@ -0,0 +1,43 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SWAGGER] +Name = SWAGGER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = mixed status + Focus = Target + SetVisible = 0,true + SetX = 4,405 + SetY = 4,40 + SetX = 5,402 + SetY = 5,38 + SetX = 6,372 + SetY = 6,68 + SetX = 7,374 + SetY = 7,72 + SetX = 8,433 + SetY = 8,66 + SetX = 9,427 + SetY = 9,63 + SetX = 10,361 + SetY = 10,46 + SetX = 11,362 + SetX = 12,407 + SetY = 12,59 + SetX = 13,405 + SetY = 13,55 + SetX = 14,367 + SetY = 14,69 + SetX = 15,374 + SetY = 15,72 + SetX = 16,409 + SetY = 16,65 + SetX = 17,411 + SetY = 17,61 + + Play = 0,Swagger,100,100 diff --git a/PBS/Animations/Converted/Move/SWEETKISS.txt b/PBS/Animations/Converted/Move/SWEETKISS.txt new file mode 100644 index 000000000..febbb9392 --- /dev/null +++ b/PBS/Animations/Converted/Move/SWEETKISS.txt @@ -0,0 +1,75 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SWEETKISS] +Name = SWEETKISS + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = electric2 + Focus = Target + SetVisible = 0,true + SetX = 8,368 + SetY = 8,54 + SetX = 9,376 + SetY = 9,46 + SetX = 10,384 + SetY = 10,38 + SetY = 11,30 + SetFlip = 12,true + SetX = 12,296 + SetY = 12,46 + SetZoomX = 12,75 + SetZoomY = 12,75 + + Graphic = electric2 + Focus = Target + SetX = 0,440 + SetY = 0,134 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetVisible = 0,true + SetOpacity = 0,100 + SetX = 1,416 + SetY = 1,118 + SetZoomX = 1,75 + SetZoomY = 1,75 + SetOpacity = 1,200 + SetX = 2,384 + SetY = 2,110 + SetOpacity = 2,255 + SetX = 3,368 + SetY = 3,102 + SetX = 4,352 + SetY = 4,86 + SetX = 5,328 + SetY = 5,62 + SetX = 6,312 + SetY = 6,54 + SetX = 7,304 + SetFlip = 8,true + SetX = 8,296 + SetY = 8,46 + SetFlip = 12,false + SetX = 12,376 + SetY = 12,22 + SetZoomX = 12,100 + SetZoomY = 12,100 + SetX = 13,368 + SetY = 13,14 + SetY = 14,6 + SetX = 15,376 + SetY = 15,-2 + SetX = 16,384 + SetY = 16,-10 + SetY = 17,-18 + SetFlip = 18,true + SetX = 18,296 + SetY = 18,46 + SetZoomX = 18,75 + SetZoomY = 18,75 + + Play = 4,Saint1,80,100 diff --git a/PBS/Animations/Converted/Move/SWIFT.txt b/PBS/Animations/Converted/Move/SWIFT.txt new file mode 100644 index 000000000..733ef2834 --- /dev/null +++ b/PBS/Animations/Converted/Move/SWIFT.txt @@ -0,0 +1,117 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SWIFT] +Name = SWIFT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 007-Weapon02 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,236 + SetVisible = 0,true + SetX = 1,179 + SetY = 1,211 + SetX = 2,217 + SetY = 2,186 + SetX = 3,288 + SetY = 3,142 + SetX = 4,358 + SetY = 4,110 + SetX = 5,256 + SetY = 5,116 + SetX = 6,288 + SetY = 6,98 + SetX = 7,352 + SetY = 7,79 + SetX = 8,288 + SetY = 8,91 + SetX = 9,307 + SetY = 9,135 + SetX = 10,358 + SetY = 10,104 + + Graphic = 007-Weapon02 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,128 + SetY = 1,236 + SetX = 2,172 + SetY = 2,211 + SetX = 3,236 + SetY = 3,173 + SetX = 4,288 + SetY = 4,135 + SetX = 5,339 + SetY = 5,110 + SetX = 6,300 + SetY = 6,135 + SetX = 7,294 + SetY = 7,85 + SetX = 8,332 + SetY = 8,110 + SetX = 9,262 + SetY = 9,148 + SetX = 10,313 + SetY = 10,123 + + Graphic = 007-Weapon02 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,128 + SetY = 2,217 + SetX = 3,179 + SetY = 3,179 + SetX = 4,224 + SetY = 4,148 + SetX = 5,256 + SetY = 5,186 + SetX = 6,236 + SetY = 6,135 + SetX = 7,288 + SetY = 7,142 + SetX = 8,262 + SetY = 8,167 + + Graphic = 007-Weapon02 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,192 + SetY = 3,224 + SetX = 4,224 + SetY = 4,205 + SetX = 5,172 + SetY = 5,161 + SetX = 6,230 + SetY = 6,173 + SetX = 7,217 + SetY = 7,186 + SetX = 8,204 + + Graphic = 007-Weapon02 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,115 + SetY = 3,205 + SetX = 4,147 + SetY = 4,179 + SetX = 5,179 + SetY = 5,205 + SetX = 6,185 + SetY = 6,211 + SetX = 7,166 + + Graphic = 007-Weapon02 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,128 + SetY = 4,242 + + Play = 0,Saint3,80,100 + Play = 2,Saint3,80,100 + Play = 5,Saint3,80,100 + Play = 8,Saint3,80,100 diff --git a/PBS/Animations/Converted/Move/SWORDSDANCE.txt b/PBS/Animations/Converted/Move/SWORDSDANCE.txt new file mode 100644 index 000000000..4b2c60a32 --- /dev/null +++ b/PBS/Animations/Converted/Move/SWORDSDANCE.txt @@ -0,0 +1,102 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SWORDSDANCE] +Name = SWORDSDANCE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = Target + SetX = 0,436 + SetY = 0,219 + SetVisible = 0,true + SetX = 1,434 + SetY = 1,177 + SetX = 2,348 + SetY = 2,150 + SetX = 3,350 + SetY = 3,81 + SetX = 4,435 + SetY = 4,32 + SetX = 5,341 + SetY = 5,107 + SetX = 6,369 + SetY = 6,127 + SetX = 7,403 + SetY = 7,81 + SetX = 8,383 + SetY = 8,117 + SetX = 9,317 + SetY = 9,129 + SetX = 10,331 + SetY = 10,98 + SetX = 11,332 + SetY = 11,45 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 1,393 + SetY = 1,4 + SetX = 2,435 + SetY = 2,155 + SetX = 3,427 + SetY = 3,75 + SetX = 4,396 + SetY = 4,162 + SetX = 5,382 + SetY = 5,103 + SetX = 6,393 + SetY = 6,113 + SetX = 8,361 + SetY = 8,123 + SetX = 9,435 + SetY = 9,106 + SetX = 10,304 + SetY = 10,82 + SetY = 11,40 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,458 + SetY = 4,119 + + Graphic = fly copy + Focus = Target + SetVisible = 0,true + SetX = 4,303 + SetY = 4,111 + + Graphic = fly copy + Focus = Target + SetX = 0,343 + SetY = 0,215 + SetVisible = 0,true + SetX = 1,341 + SetY = 1,177 + SetX = 2,391 + SetY = 2,58 + SetX = 3,384 + SetY = 3,133 + SetX = 4,362 + SetY = 4,35 + SetX = 5,424 + SetY = 5,108 + SetX = 6,397 + SetY = 6,114 + SetX = 7,385 + SetY = 7,123 + SetX = 8,417 + SetY = 8,103 + SetX = 9,351 + SetY = 9,120 + SetX = 10,461 + SetY = 10,53 + SetX = 11,465 + + Play = 0,Swords Dance,90,100 diff --git a/PBS/Animations/Converted/Move/TACKLE.txt b/PBS/Animations/Converted/Move/TACKLE.txt new file mode 100644 index 000000000..a11171b34 --- /dev/null +++ b/PBS/Animations/Converted/Move/TACKLE.txt @@ -0,0 +1,22 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TACKLE] +Name = TACKLE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Tackle_B + Focus = Target + SetVisible = 0,true + SetX = 2,384 + SetY = 2,99 + SetOpacity = 2,150 + SetOpacity = 3,255 + SetOpacity = 8,150 + SetOpacity = 9,100 + + Play = 0,Blow1,80,100 diff --git a/PBS/Animations/Converted/Move/TAILGLOW.txt b/PBS/Animations/Converted/Move/TAILGLOW.txt new file mode 100644 index 000000000..279ece532 --- /dev/null +++ b/PBS/Animations/Converted/Move/TAILGLOW.txt @@ -0,0 +1,39 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TAILGLOW] +Name = TAILGLOW + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Light1 + Focus = Target + SetX = 0,384 + SetY = 0,94 + SetVisible = 0,true + SetOpacity = 0,50 + SetOpacity = 1,255 + SetZoomX = 7,110 + SetZoomY = 7,110 + SetZoomX = 8,115 + SetZoomY = 8,115 + SetZoomX = 9,110 + SetZoomY = 9,110 + SetZoomX = 10,100 + SetZoomY = 10,100 + SetZoomX = 11,110 + SetZoomY = 11,110 + SetZoomX = 12,115 + SetZoomY = 12,115 + SetZoomX = 13,110 + SetZoomY = 13,110 + SetZoomX = 14,100 + SetZoomY = 14,100 + SetZoomX = 15,110 + SetZoomY = 15,110 + SetOpacity = 15,100 + + Play = 0,Saint4,80,100 diff --git a/PBS/Animations/Converted/Move/TAILWHIP.txt b/PBS/Animations/Converted/Move/TAILWHIP.txt new file mode 100644 index 000000000..0a30e16aa --- /dev/null +++ b/PBS/Animations/Converted/Move/TAILWHIP.txt @@ -0,0 +1,36 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TAILWHIP] +Name = TAILWHIP + + SetX = 0,128 + SetY = 0,224 + SetX = 1,149 + SetY = 1,227 + SetX = 2,168 + SetY = 2,235 + SetX = 3,143 + SetY = 3,238 + SetX = 4,107 + SetX = 5,84 + SetY = 5,230 + SetX = 6,106 + SetY = 6,228 + SetX = 7,128 + SetY = 7,224 + SetX = 9,149 + SetY = 9,227 + SetX = 10,168 + SetY = 10,235 + SetX = 11,143 + SetY = 11,238 + SetX = 12,107 + SetX = 13,84 + SetY = 13,230 + SetX = 14,106 + SetY = 14,228 + SetX = 15,128 + SetY = 15,224 + + SetX = 0,384 + SetY = 0,96 diff --git a/PBS/Animations/Converted/Move/TELEPORT.txt b/PBS/Animations/Converted/Move/TELEPORT.txt new file mode 100644 index 000000000..02d0abd95 --- /dev/null +++ b/PBS/Animations/Converted/Move/TELEPORT.txt @@ -0,0 +1,63 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TELEPORT] +Name = TELEPORT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = ! + Focus = User + SetX = 0,123 + SetY = 0,374 + SetVisible = 0,true + SetX = 1,114 + SetY = 1,338 + SetX = 2,119 + SetY = 2,324 + SetX = 3,112 + SetY = 3,284 + SetX = 4,116 + SetY = 4,256 + SetX = 5,123 + SetY = 5,216 + SetX = 6,124 + SetY = 6,184 + + Graphic = ! + Focus = User + SetVisible = 0,true + SetX = 1,145 + SetY = 1,363 + SetX = 2,148 + SetY = 2,300 + SetX = 3,133 + SetY = 3,255 + SetX = 4,144 + SetY = 4,214 + SetX = 5,146 + SetY = 5,203 + SetX = 6,142 + SetY = 6,135 + + Graphic = ! + Focus = User + SetX = 0,74 + SetY = 0,358 + SetVisible = 0,true + SetX = 1,87 + SetY = 1,304 + SetX = 2,93 + SetY = 2,305 + SetX = 3,91 + SetY = 3,268 + SetX = 4,94 + SetY = 4,230 + SetY = 5,182 + SetX = 6,104 + SetY = 6,153 + + Play = 0,Trump Card,80,100 diff --git a/PBS/Animations/Converted/Move/THUNDER.txt b/PBS/Animations/Converted/Move/THUNDER.txt new file mode 100644 index 000000000..deafb82c0 --- /dev/null +++ b/PBS/Animations/Converted/Move/THUNDER.txt @@ -0,0 +1,66 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,THUNDER] +Name = THUNDER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Trovao + Focus = Target + SetVisible = 0,true + SetFlip = 1,true + SetX = 1,376 + SetY = 1,86 + SetFlip = 2,false + SetY = 2,46 + SetY = 3,78 + SetX = 4,392 + SetY = 4,54 + SetX = 5,368 + SetY = 5,86 + SetX = 9,376 + SetY = 9,102 + SetOpacity = 9,100 + + Graphic = Trovao + Focus = Target + SetVisible = 0,true + SetX = 2,400 + SetY = 2,150 + SetX = 3,376 + SetX = 4,384 + SetY = 4,110 + SetX = 5,376 + SetY = 5,118 + + Graphic = Trovao + Focus = Target + SetFlip = 0,true + SetX = 0,392 + SetY = 0,-58 + SetVisible = 0,true + SetX = 1,352 + SetFlip = 2,false + SetX = 2,376 + SetY = 2,-66 + SetX = 3,400 + SetY = 3,-34 + SetX = 4,384 + SetY = 4,-42 + SetX = 5,392 + SetY = 5,-34 + SetX = 6,376 + SetY = 6,102 + SetFlip = 9,true + SetFlip = 10,false + SetOpacity = 10,100 + SetFlip = 11,true + SetZoomX = 11,150 + SetZoomY = 11,150 + SetOpacity = 11,20 + + Play = 0,Thunder1,80,100 diff --git a/PBS/Animations/Converted/Move/THUNDERBOLT.txt b/PBS/Animations/Converted/Move/THUNDERBOLT.txt new file mode 100644 index 000000000..c57c3c0eb --- /dev/null +++ b/PBS/Animations/Converted/Move/THUNDERBOLT.txt @@ -0,0 +1,40 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,THUNDERBOLT] +Name = THUNDERBOLT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 017-Thunder01 + Focus = Target + SetVisible = 0,true + SetX = 5,384 + SetY = 5,94 + SetY = 6,54 + SetOpacity = 6,100 + + Graphic = 017-Thunder01 + Focus = Target + SetX = 0,384 + SetY = 0,54 + SetVisible = 0,true + SetFlip = 4,true + SetOpacity = 4,200 + SetOpacity = 5,100 + SetFlip = 6,false + SetY = 6,94 + SetOpacity = 6,255 + SetFlip = 7,true + SetFlip = 9,false + SetZoomX = 9,120 + SetZoomY = 9,120 + SetOpacity = 9,100 + SetOpacity = 10,50 + SetFlip = 11,true + SetOpacity = 11,20 + + Play = 0,Thunder9,80,100 diff --git a/PBS/Animations/Converted/Move/THUNDERFANG.txt b/PBS/Animations/Converted/Move/THUNDERFANG.txt new file mode 100644 index 000000000..2cfdef107 --- /dev/null +++ b/PBS/Animations/Converted/Move/THUNDERFANG.txt @@ -0,0 +1,71 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,THUNDERFANG] +Name = THUNDERFANG + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 6,327 + SetY = 6,73 + SetX = 7,326 + SetX = 8,327 + SetY = 8,70 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 7,471 + SetY = 7,67 + SetX = 8,314 + SetY = 8,124 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 8,481 + SetY = 8,124 + + Graphic = element fangs + Focus = Target + SetVisible = 0,true + SetX = 8,471 + SetY = 8,60 + + Graphic = element fangs + Focus = Target + SetX = 0,391 + SetY = 0,96 + SetVisible = 0,true + SetY = 1,90 + SetX = 2,386 + SetY = 2,92 + SetX = 3,390 + SetY = 3,98 + SetX = 4,386 + SetY = 4,95 + SetX = 5,392 + SetY = 5,101 + SetX = 6,386 + SetY = 6,100 + SetX = 7,389 + SetY = 7,99 + SetX = 8,388 + SetY = 8,92 + SetX = 9,386 + SetY = 9,100 + SetX = 10,394 + SetY = 10,95 + SetX = 11,387 + SetY = 11,94 + SetX = 12,384 + SetY = 12,97 + + Play = 6,Super Fang,100,100 + Play = 7,Uproar,83,137 diff --git a/PBS/Animations/Converted/Move/THUNDERPUNCH.txt b/PBS/Animations/Converted/Move/THUNDERPUNCH.txt new file mode 100644 index 000000000..e75c78fe3 --- /dev/null +++ b/PBS/Animations/Converted/Move/THUNDERPUNCH.txt @@ -0,0 +1,111 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,THUNDERPUNCH] +Name = THUNDERPUNCH + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = punches + Focus = Target + SetX = 0,385 + SetY = 0,97 + SetVisible = 0,true + SetX = 1,384 + SetY = 1,93 + SetX = 2,395 + SetY = 2,76 + SetX = 3,429 + SetY = 3,54 + SetX = 4,381 + SetY = 4,102 + SetX = 5,363 + SetY = 5,104 + SetX = 6,474 + SetY = 6,46 + SetX = 7,410 + SetY = 7,11 + SetX = 8,343 + SetY = 8,142 + SetX = 9,487 + SetY = 9,1 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,412 + SetY = 2,82 + SetX = 3,378 + SetY = 3,108 + SetX = 4,410 + SetY = 4,105 + SetX = 5,390 + SetY = 5,126 + SetX = 6,440 + SetY = 6,16 + SetX = 7,478 + SetY = 7,55 + SetX = 8,450 + SetY = 8,47 + SetX = 9,305 + SetY = 9,184 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 2,385 + SetY = 2,92 + SetX = 3,386 + SetY = 3,98 + SetX = 4,429 + SetY = 4,67 + SetX = 5,391 + SetY = 5,58 + SetX = 6,311 + SetY = 6,144 + SetX = 7,317 + SetY = 7,138 + SetX = 8,386 + SetY = 8,94 + SetX = 9,383 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 4,387 + SetY = 4,70 + SetX = 5,443 + SetY = 5,55 + SetX = 6,357 + SetY = 6,171 + SetX = 7,358 + SetY = 7,163 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 4,389 + SetY = 4,99 + SetX = 5,385 + SetY = 5,93 + SetY = 6,97 + SetX = 7,424 + SetY = 7,60 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 7,351 + SetY = 7,135 + + Graphic = punches + Focus = Target + SetVisible = 0,true + SetX = 7,384 + SetY = 7,97 + + Play = 0,Mega Punch,100,89 + Play = 0,Work Up,100,111 diff --git a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt new file mode 100644 index 000000000..394e1a0c9 --- /dev/null +++ b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt @@ -0,0 +1,20 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,THUNDERSHOCK] +Name = THUNDERSHOCK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = electric1 + Focus = Target + SetX = 0,376 + SetY = 0,94 + SetVisible = 0,true + SetFlip = 9,true + SetOpacity = 12,100 + + Play = 0,Thunder1,80,100 diff --git a/PBS/Animations/Converted/Move/THUNDERWAVE.txt b/PBS/Animations/Converted/Move/THUNDERWAVE.txt new file mode 100644 index 000000000..f2ffb755a --- /dev/null +++ b/PBS/Animations/Converted/Move/THUNDERWAVE.txt @@ -0,0 +1,47 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,THUNDERWAVE] +Name = THUNDERWAVE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = T. Shock + Focus = Target + SetVisible = 0,true + SetX = 6,392 + SetY = 6,114 + SetX = 7,368 + SetX = 8,408 + SetX = 9,360 + SetX = 12,344 + SetX = 13,352 + SetX = 14,360 + SetX = 15,368 + + Graphic = T. Shock + Focus = Target + SetVisible = 0,true + SetX = 6,368 + SetY = 6,114 + + Graphic = T. Shock + Focus = Target + SetVisible = 0,true + SetX = 1,392 + SetY = 1,42 + SetY = 2,58 + SetY = 3,82 + SetY = 4,98 + SetY = 5,114 + SetX = 6,408 + SetX = 8,368 + SetX = 9,416 + SetX = 12,424 + SetX = 13,432 + SetX = 14,424 + + Play = 2,Paralyze1,80,100 diff --git a/PBS/Animations/Converted/Move/TOXIC.txt b/PBS/Animations/Converted/Move/TOXIC.txt new file mode 100644 index 000000000..37d7a3c08 --- /dev/null +++ b/PBS/Animations/Converted/Move/TOXIC.txt @@ -0,0 +1,62 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TOXIC] +Name = TOXIC + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = State1 + Focus = Target + SetVisible = 0,true + SetX = 2,440 + SetY = 2,86 + SetX = 14,400 + SetY = 14,142 + SetX = 15,352 + SetY = 15,102 + SetX = 17,328 + SetY = 17,134 + + Graphic = State1 + Focus = Target + SetVisible = 0,true + SetX = 3,400 + SetY = 3,142 + SetX = 14,352 + SetY = 14,102 + SetX = 15,328 + SetY = 15,134 + + Graphic = State1 + Focus = Target + SetVisible = 0,true + SetX = 4,352 + SetY = 4,102 + SetX = 14,328 + SetY = 14,134 + + Graphic = State1 + Focus = Target + SetVisible = 0,true + SetX = 5,328 + SetY = 5,134 + + Graphic = State1 + Focus = Target + SetX = 0,304 + SetY = 0,118 + SetVisible = 0,true + SetX = 14,440 + SetY = 14,86 + SetX = 15,400 + SetY = 15,142 + SetX = 17,352 + SetY = 17,102 + + Play = 0,Poison,80,100 + Play = 4,Poison,80,100 + Play = 8,Poison,80,100 diff --git a/PBS/Animations/Converted/Move/TRICKROOM.txt b/PBS/Animations/Converted/Move/TRICKROOM.txt new file mode 100644 index 000000000..b1be0296c --- /dev/null +++ b/PBS/Animations/Converted/Move/TRICKROOM.txt @@ -0,0 +1,33 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TRICKROOM] +Name = TRICKROOM + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = mixed status + Focus = UserAndTarget + SetX = 0,310 + SetY = 0,210 + SetZoomX = 0,446 + SetZoomY = 0,273 + SetVisible = 0,true + SetX = 1,311 + SetY = 1,209 + SetX = 3,313 + SetY = 3,211 + SetX = 4,311 + SetX = 5,313 + SetY = 5,212 + SetX = 6,311 + SetY = 7,211 + SetX = 8,313 + SetY = 8,213 + SetX = 9,310 + SetY = 9,211 + + Play = 0,MiningPing,100,84 diff --git a/PBS/Animations/Converted/Move/TWINEEDLE.txt b/PBS/Animations/Converted/Move/TWINEEDLE.txt new file mode 100644 index 000000000..22d9da1b0 --- /dev/null +++ b/PBS/Animations/Converted/Move/TWINEEDLE.txt @@ -0,0 +1,123 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TWINEEDLE] +Name = TWINEEDLE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,364 + SetY = 4,104 + SetOpacity = 4,50 + SetX = 5,396 + SetY = 5,116 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,192 + SetVisible = 0,true + SetX = 1,185 + SetY = 1,173 + SetX = 2,256 + SetY = 2,154 + SetX = 3,300 + SetY = 3,129 + SetX = 4,358 + SetY = 4,116 + SetX = 5,390 + SetY = 5,129 + SetX = 6,396 + SetY = 6,116 + SetZoomX = 6,125 + SetZoomY = 6,125 + SetOpacity = 6,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,185 + SetY = 1,217 + SetX = 2,256 + SetY = 2,198 + SetX = 3,307 + SetY = 3,173 + SetX = 4,364 + SetY = 4,154 + SetX = 5,371 + SetY = 5,104 + SetZoomX = 5,125 + SetZoomY = 5,125 + SetOpacity = 5,50 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 4,Slash10,80,100 + Play = 6,Slash10,80,100 +#------------------------------- +[Move,TWINEEDLE,1] +Name = Twineedle hit 2 + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,185 + SetY = 1,217 + SetX = 2,256 + SetY = 2,198 + SetX = 3,307 + SetY = 3,173 + SetX = 4,364 + SetY = 4,154 + SetX = 5,371 + SetY = 5,104 + SetZoomX = 5,125 + SetZoomY = 5,125 + SetOpacity = 5,50 + + Graphic = poison3 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,364 + SetY = 4,104 + SetOpacity = 4,50 + SetX = 5,396 + SetY = 5,116 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,128 + SetY = 0,192 + SetVisible = 0,true + SetX = 1,185 + SetY = 1,173 + SetX = 2,256 + SetY = 2,154 + SetX = 3,300 + SetY = 3,129 + SetX = 4,358 + SetY = 4,116 + SetX = 5,390 + SetY = 5,129 + SetX = 6,396 + SetY = 6,116 + SetZoomX = 6,125 + SetZoomY = 6,125 + SetOpacity = 6,50 + + Play = 0,throw,80,100 + Play = 2,throw,80,100 + Play = 4,Slash10,80,100 + Play = 6,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/TWISTER.txt b/PBS/Animations/Converted/Move/TWISTER.txt new file mode 100644 index 000000000..c361e6a7d --- /dev/null +++ b/PBS/Animations/Converted/Move/TWISTER.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TWISTER] +Name = TWISTER + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = water3 + Focus = Target + SetX = 0,384 + SetY = 0,78 + SetVisible = 0,true + SetFlip = 11,true + + Play = 0,Water3,80,100 + Play = 0,Twine,80,100 + Play = 2,Water1,80,100 + Play = 5,Water2,80,100 + Play = 9,Water1,80,100 diff --git a/PBS/Animations/Converted/Move/VINEWHIP.txt b/PBS/Animations/Converted/Move/VINEWHIP.txt new file mode 100644 index 000000000..274907428 --- /dev/null +++ b/PBS/Animations/Converted/Move/VINEWHIP.txt @@ -0,0 +1,34 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,VINEWHIP] +Name = VINEWHIP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 003-Attack01 + Focus = Target + SetVisible = 0,true + SetX = 2,368 + SetY = 2,118 + SetOpacity = 2,150 + SetX = 3,336 + SetOpacity = 3,255 + SetX = 4,304 + SetY = 4,142 + + Graphic = 003-Attack01 + Focus = Target + SetX = 0,448 + SetY = 0,14 + SetVisible = 0,true + SetX = 1,408 + SetY = 1,46 + SetX = 2,368 + SetY = 2,94 + SetY = 3,118 + + Play = 2,Slash1,80,100 diff --git a/PBS/Animations/Converted/Move/WATERGUN.txt b/PBS/Animations/Converted/Move/WATERGUN.txt new file mode 100644 index 000000000..2835dc896 --- /dev/null +++ b/PBS/Animations/Converted/Move/WATERGUN.txt @@ -0,0 +1,209 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,WATERGUN] +Name = WATERGUN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = UserAndTarget + SetX = 0,160 + SetY = 0,200 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetVisible = 0,true + SetOpacity = 0,235 + SetX = 7,184 + SetY = 7,184 + SetX = 8,208 + SetY = 8,168 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,184 + SetY = 1,181 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetOpacity = 1,235 + SetY = 2,190 + SetX = 3,185 + SetY = 3,181 + SetX = 7,208 + SetY = 7,165 + SetX = 8,232 + SetY = 8,149 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,208 + SetY = 2,173 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetOpacity = 2,235 + SetY = 3,162 + SetX = 7,232 + SetY = 7,146 + SetX = 8,256 + SetY = 8,122 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,232 + SetY = 3,145 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetOpacity = 3,235 + SetX = 7,256 + SetY = 7,121 + SetX = 8,280 + SetY = 8,105 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,252 + SetY = 4,124 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetOpacity = 4,235 + SetX = 7,280 + SetY = 7,108 + SetX = 8,304 + SetY = 8,100 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,280 + SetY = 5,109 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetOpacity = 5,235 + SetX = 7,304 + SetY = 7,101 + SetX = 8,336 + SetY = 8,93 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,305 + SetY = 6,99 + SetZoomX = 6,50 + SetZoomY = 6,50 + SetOpacity = 6,235 + SetX = 7,336 + SetY = 7,91 + SetX = 8,368 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 8,380 + SetY = 8,108 + SetZoomX = 8,70 + SetOpacity = 8,224 + + Play = 0,Yawn,88,100 +#------------------------------- +[OppMove,WATERGUN] +Name = WATERGUN + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = fly copy + Focus = UserAndTarget + SetX = 0,352 + SetY = 0,81 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetVisible = 0,true + SetOpacity = 0,235 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 1,328 + SetY = 1,96 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetOpacity = 1,235 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 2,304 + SetY = 2,118 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetOpacity = 2,235 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,280 + SetY = 3,134 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetOpacity = 3,235 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 4,258 + SetY = 4,161 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetOpacity = 4,235 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 5,232 + SetY = 5,179 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetOpacity = 5,235 + + Graphic = fly copy + Focus = UserAndTarget + SetVisible = 0,true + SetX = 6,202 + SetY = 6,196 + SetZoomX = 6,50 + SetZoomY = 6,50 + SetOpacity = 6,235 + + Graphic = fly copy + Focus = User + SetVisible = 0,true + SetX = 7,167 + SetY = 7,217 + SetZoomX = 7,50 + SetZoomY = 7,50 + SetOpacity = 7,235 + SetX = 9,129 + SetY = 9,220 + SetZoomX = 9,100 + SetZoomY = 9,100 + SetOpacity = 9,255 + + Graphic = fly copy + Focus = User + SetVisible = 0,true + SetX = 8,128 + SetY = 8,220 + SetOpacity = 8,240 + + Play = 0,Yawn,88,100 diff --git a/PBS/Animations/Converted/Move/WATERPULSE.txt b/PBS/Animations/Converted/Move/WATERPULSE.txt new file mode 100644 index 000000000..514c19bb4 --- /dev/null +++ b/PBS/Animations/Converted/Move/WATERPULSE.txt @@ -0,0 +1,45 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,WATERPULSE] +Name = WATERPULSE + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + SetToneBlue = 15,255 + SetToneBlue = 18,0 + + Graphic = Water pulse + Focus = UserAndTarget + SetX = 0,131 + SetY = 0,229 + SetVisible = 0,true + SetX = 1,208 + SetY = 1,192 + SetX = 2,232 + SetY = 2,184 + SetX = 3,240 + SetY = 3,176 + SetX = 4,264 + SetY = 4,160 + SetX = 5,280 + SetY = 5,144 + SetX = 6,304 + SetY = 6,128 + SetX = 7,337 + SetY = 7,114 + SetX = 8,361 + SetY = 8,110 + SetX = 9,356 + SetY = 9,104 + SetX = 10,350 + SetY = 10,107 + SetX = 11,354 + SetY = 11,105 + SetX = 12,349 + SetY = 12,100 + SetX = 13,350 + SetY = 13,122 + SetX = 14,344 diff --git a/PBS/Animations/Converted/Move/WHIRLWIND.txt b/PBS/Animations/Converted/Move/WHIRLWIND.txt new file mode 100644 index 000000000..a558ae68f --- /dev/null +++ b/PBS/Animations/Converted/Move/WHIRLWIND.txt @@ -0,0 +1,18 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,WHIRLWIND] +Name = WHIRLWIND + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Wind1 + Focus = Target + SetX = 0,392 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Wind1,80,100 diff --git a/PBS/Animations/Converted/Move/WILLOWISP.txt b/PBS/Animations/Converted/Move/WILLOWISP.txt new file mode 100644 index 000000000..96f546661 --- /dev/null +++ b/PBS/Animations/Converted/Move/WILLOWISP.txt @@ -0,0 +1,70 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,WILLOWISP] +Name = WILLOWISP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = 015-Fire01 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 1,true + SetX = 1,134 + SetY = 1,179 + SetAngle = 1,90 + SetX = 2,172 + SetY = 2,161 + SetX = 3,243 + SetY = 3,129 + SetX = 4,332 + SetY = 4,148 + SetFlip = 5,false + SetX = 5,358 + SetY = 5,110 + SetAngle = 5,0 + + Graphic = 015-Fire01 + Focus = UserAndTarget + SetVisible = 0,true + SetFlip = 2,true + SetX = 2,224 + SetY = 2,186 + SetAngle = 2,90 + SetX = 3,288 + SetY = 3,167 + SetFlip = 4,false + SetX = 4,358 + SetY = 4,110 + SetAngle = 4,0 + + Graphic = 015-Fire01 + Focus = UserAndTarget + SetVisible = 0,true + SetX = 3,358 + SetY = 3,110 + + Graphic = 015-Fire01 + Focus = UserAndTarget + SetFlip = 0,true + SetX = 0,160 + SetY = 0,186 + SetAngle = 0,90 + SetVisible = 0,true + SetX = 1,198 + SetY = 1,167 + SetX = 2,262 + SetY = 2,129 + SetX = 3,320 + SetY = 3,104 + SetX = 4,300 + SetX = 5,352 + SetY = 5,110 + SetFlip = 6,false + SetX = 6,358 + SetAngle = 6,0 + + Play = 0,Fire2,80,100 diff --git a/PBS/Animations/Converted/Move/WINGATTACK.txt b/PBS/Animations/Converted/Move/WINGATTACK.txt new file mode 100644 index 000000000..83916406d --- /dev/null +++ b/PBS/Animations/Converted/Move/WINGATTACK.txt @@ -0,0 +1,19 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,WINGATTACK] +Name = WINGATTACK + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Wind1 + Focus = Target + SetX = 0,392 + SetY = 0,94 + SetVisible = 0,true + + Play = 0,Wind1,80,100 + Play = 2,Wind5,80,100 diff --git a/PBS/Animations/Converted/Move/WRAP.txt b/PBS/Animations/Converted/Move/WRAP.txt new file mode 100644 index 000000000..ce82fd671 --- /dev/null +++ b/PBS/Animations/Converted/Move/WRAP.txt @@ -0,0 +1,47 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,WRAP] +Name = WRAP + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Struggle + Focus = Target + SetX = 0,440 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,480 + SetY = 1,94 + SetX = 2,488 + SetY = 2,102 + SetX = 3,464 + SetY = 3,94 + SetX = 4,432 + SetX = 5,464 + SetX = 6,496 + SetY = 6,102 + SetX = 7,480 + + Graphic = Struggle + Focus = Target + SetX = 0,320 + SetY = 0,102 + SetVisible = 0,true + SetX = 1,288 + SetY = 1,94 + SetX = 2,240 + SetY = 2,102 + SetX = 3,264 + SetY = 3,94 + SetX = 4,296 + SetX = 5,256 + SetX = 6,216 + SetX = 7,264 + + Play = 0,Slash10,80,100 + Play = 3,Slash10,80,100 + Play = 6,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/WRINGOUT.txt b/PBS/Animations/Converted/Move/WRINGOUT.txt new file mode 100644 index 000000000..76db75cdd --- /dev/null +++ b/PBS/Animations/Converted/Move/WRINGOUT.txt @@ -0,0 +1,56 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,WRINGOUT] +Name = WRINGOUT + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Fakeout + Focus = Target + SetX = 0,273 + SetY = 0,84 + SetVisible = 0,true + SetX = 1,283 + SetY = 1,139 + SetX = 2,323 + SetY = 2,177 + SetX = 3,361 + SetY = 3,183 + SetX = 4,391 + SetY = 4,168 + SetX = 5,399 + SetY = 5,127 + SetX = 6,408 + SetY = 6,104 + SetX = 7,375 + SetY = 7,75 + SetX = 8,314 + SetY = 8,66 + SetX = 9,288 + SetY = 9,118 + SetX = 10,299 + SetY = 10,166 + SetX = 11,358 + SetY = 11,178 + SetX = 12,400 + SetY = 12,153 + SetX = 13,401 + SetY = 13,108 + SetX = 14,376 + SetY = 14,79 + SetX = 15,320 + SetY = 15,73 + SetX = 16,290 + SetY = 16,115 + SetX = 17,305 + SetY = 17,158 + SetX = 18,366 + SetY = 18,185 + SetX = 19,430 + SetY = 19,161 + + Play = 0,Wring Out,100,100 diff --git a/PBS/Animations/Converted/Move/XSCISSOR.txt b/PBS/Animations/Converted/Move/XSCISSOR.txt new file mode 100644 index 000000000..1f3b439a6 --- /dev/null +++ b/PBS/Animations/Converted/Move/XSCISSOR.txt @@ -0,0 +1,40 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,XSCISSOR] +Name = XSCISSOR + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = X-Scizzor + Focus = Target + SetX = 0,319 + SetY = 0,36 + SetVisible = 0,true + SetX = 1,351 + SetY = 1,62 + SetX = 2,384 + SetY = 2,96 + SetX = 3,347 + SetY = 3,135 + SetX = 4,455 + SetY = 4,165 + + Graphic = X-Scizzor + Focus = Target + SetX = 0,455 + SetY = 0,37 + SetVisible = 0,true + SetX = 1,420 + SetY = 1,62 + SetX = 2,384 + SetY = 2,96 + SetX = 3,418 + SetY = 3,135 + SetX = 4,307 + SetY = 4,164 + + Play = 0,Slash,80,100 diff --git a/PBS/Animations/Converted/Move/ZAPCANNON.txt b/PBS/Animations/Converted/Move/ZAPCANNON.txt new file mode 100644 index 000000000..57468e979 --- /dev/null +++ b/PBS/Animations/Converted/Move/ZAPCANNON.txt @@ -0,0 +1,22 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ZAPCANNON] +Name = ZAPCANNON + + SetX = 0,128 + SetY = 0,224 + + SetX = 0,384 + SetY = 0,96 + + Graphic = Thunder2 + Focus = Target + SetX = 0,384 + SetY = 0,86 + SetVisible = 0,true + SetFlip = 6,true + SetAngle = 6,180 + SetOpacity = 7,100 + SetAngle = 8,18 + + Play = 0,Thunder9,80,100 From b4e7b765d13ae61629c636a1fd49d4b3a0b2a082 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 2 Dec 2023 01:39:43 +0000 Subject: [PATCH 14/49] Added the animation properties pop-up window --- .../801_UI controls/002_ControlsContainer.rb | 19 +-- .../Control elements/001_BaseControl.rb | 1 - .../Control elements/002_Label.rb | 16 +-- .../Control elements/004_TextBox.rb | 2 +- .../Control elements/009_DropdownList.rb | 7 +- .../902_Anim GameData/001_Animation.rb | 10 +- .../100_convert old anims to new.rb | 18 ++- .../904_Anim Editor/001_AnimationEditor.rb | 113 ++++++++++++++++-- .../002_AnimationEditor_popups.rb | 49 ++++++++ .../904_Anim Editor/010_AnimationSelector.rb | 6 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 8 ++ PBS/Animations/Converted/Common/Attract.txt | 4 - PBS/Animations/Converted/Common/Bind.txt | 2 - PBS/Animations/Converted/Common/Burn.txt | 1 - PBS/Animations/Converted/Common/Confusion.txt | 1 - PBS/Animations/Converted/Common/FireSpin.txt | 20 ---- PBS/Animations/Converted/Common/Frozen.txt | 3 - PBS/Animations/Converted/Common/Hail.txt | 9 -- .../Converted/Common/HealthDown.txt | 9 -- PBS/Animations/Converted/Common/HealthUp.txt | 3 - PBS/Animations/Converted/Common/LeechSeed.txt | 5 - PBS/Animations/Converted/Common/Paralysis.txt | 2 - .../Converted/Common/ParentalBond.txt | 1 - PBS/Animations/Converted/Common/Poison.txt | 1 - PBS/Animations/Converted/Common/Rain.txt | 12 -- PBS/Animations/Converted/Common/Sandstorm.txt | 14 --- PBS/Animations/Converted/Common/Shadow.txt | 4 - PBS/Animations/Converted/Common/ShadowSky.txt | 1 - PBS/Animations/Converted/Common/Shiny.txt | 4 - PBS/Animations/Converted/Common/Sleep.txt | 3 - PBS/Animations/Converted/Common/StatDown.txt | 9 -- PBS/Animations/Converted/Common/StatUp.txt | 6 - PBS/Animations/Converted/Common/Sun.txt | 1 - .../Converted/Common/SuperShiny.txt | 4 - PBS/Animations/Converted/Common/Toxic.txt | 1 - PBS/Animations/Converted/Common/Wrap.txt | 2 - PBS/Animations/Converted/Move/ABSORB.txt | 7 -- PBS/Animations/Converted/Move/ACID.txt | 3 - PBS/Animations/Converted/Move/ACIDARMOR.txt | 1 - PBS/Animations/Converted/Move/ACIDSPRAY.txt | 6 - PBS/Animations/Converted/Move/ACROBATICS.txt | 2 - PBS/Animations/Converted/Move/ACUPRESSURE.txt | 9 -- PBS/Animations/Converted/Move/AERIALACE.txt | 17 --- PBS/Animations/Converted/Move/AGILITY.txt | 5 - PBS/Animations/Converted/Move/ALLYSWITCH.txt | 1 - PBS/Animations/Converted/Move/AMNESIA.txt | 1 - .../Converted/Move/ANCIENTPOWER.txt | 8 -- PBS/Animations/Converted/Move/AQUARING.txt | 5 - .../Converted/Move/AROMATHERAPY.txt | 10 -- PBS/Animations/Converted/Move/AURORABEAM.txt | 11 -- PBS/Animations/Converted/Move/BARRIER.txt | 2 - PBS/Animations/Converted/Move/BEATUP.txt | 12 -- PBS/Animations/Converted/Move/BIND.txt | 2 - PBS/Animations/Converted/Move/BITE.txt | 1 - PBS/Animations/Converted/Move/BLASTBURN.txt | 8 -- PBS/Animations/Converted/Move/BLOCK.txt | 1 - PBS/Animations/Converted/Move/BLUEFLARE.txt | 1 - PBS/Animations/Converted/Move/BODYSLAM.txt | 1 - PBS/Animations/Converted/Move/BRICKBREAK.txt | 1 - PBS/Animations/Converted/Move/BUBBLE.txt | 11 -- PBS/Animations/Converted/Move/BUBBLEBEAM.txt | 16 --- PBS/Animations/Converted/Move/BULKUP.txt | 2 - PBS/Animations/Converted/Move/BULLETPUNCH.txt | 4 - PBS/Animations/Converted/Move/BULLETSEED.txt | 25 ---- PBS/Animations/Converted/Move/CHARGE.txt | 6 - PBS/Animations/Converted/Move/CHARM.txt | 3 - PBS/Animations/Converted/Move/CLEARSMOG.txt | 1 - PBS/Animations/Converted/Move/CLOSECOMBAT.txt | 10 -- PBS/Animations/Converted/Move/COMETPUNCH.txt | 10 -- PBS/Animations/Converted/Move/CONFUSERAY.txt | 1 - PBS/Animations/Converted/Move/COTTONGUARD.txt | 6 - PBS/Animations/Converted/Move/COTTONSPORE.txt | 1 - PBS/Animations/Converted/Move/COUNTER.txt | 10 -- PBS/Animations/Converted/Move/CRUNCH.txt | 6 - PBS/Animations/Converted/Move/CRUSHCLAW.txt | 1 - PBS/Animations/Converted/Move/CURSE.txt | 1 - PBS/Animations/Converted/Move/CUT.txt | 1 - PBS/Animations/Converted/Move/DEFENSECURL.txt | 1 - PBS/Animations/Converted/Move/DETECT.txt | 1 - PBS/Animations/Converted/Move/DISABLE.txt | 3 - PBS/Animations/Converted/Move/DIZZYPUNCH.txt | 9 -- PBS/Animations/Converted/Move/DOUBLEEDGE.txt | 3 - PBS/Animations/Converted/Move/DOUBLEKICK.txt | 4 - PBS/Animations/Converted/Move/DOUBLESLAP.txt | 10 -- .../Converted/Move/DRAGONBREATH.txt | 8 -- PBS/Animations/Converted/Move/DRAGONCLAW.txt | 1 - PBS/Animations/Converted/Move/DRAGONDANCE.txt | 2 - PBS/Animations/Converted/Move/DRAGONRAGE.txt | 4 - .../Converted/Move/DYNAMICPUNCH.txt | 2 - PBS/Animations/Converted/Move/EMBER.txt | 2 - PBS/Animations/Converted/Move/ENCORE.txt | 2 - PBS/Animations/Converted/Move/ENERGYBALL.txt | 1 - PBS/Animations/Converted/Move/ERUPTION.txt | 3 - PBS/Animations/Converted/Move/EXPLOSION.txt | 4 - PBS/Animations/Converted/Move/FAKEOUT.txt | 2 - PBS/Animations/Converted/Move/FAKETEARS.txt | 4 - PBS/Animations/Converted/Move/FIERYDANCE.txt | 6 - PBS/Animations/Converted/Move/FINALGAMBIT.txt | 1 - PBS/Animations/Converted/Move/FIREBLAST.txt | 1 - PBS/Animations/Converted/Move/FIREFANG.txt | 9 -- PBS/Animations/Converted/Move/FIREPLEDGE.txt | 1 - PBS/Animations/Converted/Move/FIREPUNCH.txt | 11 -- PBS/Animations/Converted/Move/FIRESPIN.txt | 1 - PBS/Animations/Converted/Move/FLAIL.txt | 1 - PBS/Animations/Converted/Move/FLAMEBURST.txt | 17 --- PBS/Animations/Converted/Move/FLAMECHARGE.txt | 10 -- .../Converted/Move/FLAMETHROWER.txt | 19 --- PBS/Animations/Converted/Move/FLAMEWHEEL.txt | 32 ----- PBS/Animations/Converted/Move/FLASH.txt | 1 - PBS/Animations/Converted/Move/FLY.txt | 2 - PBS/Animations/Converted/Move/FOCUSENERGY.txt | 2 - PBS/Animations/Converted/Move/FOLLOWME.txt | 4 - PBS/Animations/Converted/Move/FORESIGHT.txt | 1 - PBS/Animations/Converted/Move/FRENZYPLANT.txt | 1 - PBS/Animations/Converted/Move/FURYATTACK.txt | 20 ---- PBS/Animations/Converted/Move/FURYCUTTER.txt | 1 - PBS/Animations/Converted/Move/FURYSWIPES.txt | 50 -------- PBS/Animations/Converted/Move/FUTURESIGHT.txt | 2 - PBS/Animations/Converted/Move/GASTROACID.txt | 5 - PBS/Animations/Converted/Move/GIGADRAIN.txt | 10 -- PBS/Animations/Converted/Move/GLARE.txt | 2 - .../Converted/Move/GRASSWHISTLE.txt | 7 -- PBS/Animations/Converted/Move/GROWL.txt | 6 - PBS/Animations/Converted/Move/GRUDGE.txt | 9 -- PBS/Animations/Converted/Move/GUST.txt | 2 - PBS/Animations/Converted/Move/HAIL.txt | 9 -- PBS/Animations/Converted/Move/HARDEN.txt | 1 - PBS/Animations/Converted/Move/HEADBUTT.txt | 1 - PBS/Animations/Converted/Move/HEATWAVE.txt | 1 - .../Converted/Move/HIGHJUMPKICK.txt | 1 - PBS/Animations/Converted/Move/HORNATTACK.txt | 2 - PBS/Animations/Converted/Move/HYDROPUMP.txt | 3 - PBS/Animations/Converted/Move/HYPERFANG.txt | 1 - PBS/Animations/Converted/Move/ICEBALL.txt | 1 - PBS/Animations/Converted/Move/ICEFANG.txt | 6 - PBS/Animations/Converted/Move/ICEPUNCH.txt | 12 -- PBS/Animations/Converted/Move/ICICLESPEAR.txt | 5 - PBS/Animations/Converted/Move/ICYWIND.txt | 3 - PBS/Animations/Converted/Move/INFERNO.txt | 19 --- PBS/Animations/Converted/Move/IRONHEAD.txt | 6 - PBS/Animations/Converted/Move/JUMPKICK.txt | 1 - PBS/Animations/Converted/Move/KARATECHOP.txt | 1 - PBS/Animations/Converted/Move/KINESIS.txt | 1 - PBS/Animations/Converted/Move/LEAFBLADE.txt | 1 - PBS/Animations/Converted/Move/LEECHLIFE.txt | 8 -- PBS/Animations/Converted/Move/LEECHSEED.txt | 6 - PBS/Animations/Converted/Move/LEER.txt | 2 - PBS/Animations/Converted/Move/LICK.txt | 1 - PBS/Animations/Converted/Move/LIGHTSCREEN.txt | 5 - PBS/Animations/Converted/Move/LOCKON.txt | 2 - PBS/Animations/Converted/Move/LOVELYKISS.txt | 6 - PBS/Animations/Converted/Move/LOWKICK.txt | 1 - PBS/Animations/Converted/Move/LUCKYCHANT.txt | 21 ---- PBS/Animations/Converted/Move/MACHPUNCH.txt | 2 - PBS/Animations/Converted/Move/MAGICCOAT.txt | 7 -- PBS/Animations/Converted/Move/MEANLOOK.txt | 1 - PBS/Animations/Converted/Move/MEGADRAIN.txt | 12 -- PBS/Animations/Converted/Move/MEGAHORN.txt | 5 - PBS/Animations/Converted/Move/MEGAKICK.txt | 2 - PBS/Animations/Converted/Move/MEGAPUNCH.txt | 2 - PBS/Animations/Converted/Move/METALCLAW.txt | 1 - PBS/Animations/Converted/Move/METEORMASH.txt | 7 -- PBS/Animations/Converted/Move/METRONOME.txt | 2 - PBS/Animations/Converted/Move/MIST.txt | 3 - PBS/Animations/Converted/Move/MISTBALL.txt | 2 - PBS/Animations/Converted/Move/MOONLIGHT.txt | 1 - PBS/Animations/Converted/Move/MORNINGSUN.txt | 2 - PBS/Animations/Converted/Move/NIGHTMARE.txt | 5 - PBS/Animations/Converted/Move/OUTRAGE.txt | 7 -- PBS/Animations/Converted/Move/OVERHEAT.txt | 8 -- PBS/Animations/Converted/Move/PAYDAY.txt | 4 - PBS/Animations/Converted/Move/PETALDANCE.txt | 5 - PBS/Animations/Converted/Move/PINMISSILE.txt | 20 ---- PBS/Animations/Converted/Move/POISONFANG.txt | 3 - PBS/Animations/Converted/Move/POISONGAS.txt | 9 -- .../Converted/Move/POISONPOWDER.txt | 1 - PBS/Animations/Converted/Move/POISONSTING.txt | 2 - PBS/Animations/Converted/Move/POISONTAIL.txt | 1 - PBS/Animations/Converted/Move/POUND.txt | 2 - PBS/Animations/Converted/Move/PSYCHIC.txt | 3 - PBS/Animations/Converted/Move/PSYCHOCUT.txt | 4 - PBS/Animations/Converted/Move/QUICKATTACK.txt | 5 - PBS/Animations/Converted/Move/RAINDANCE.txt | 12 -- PBS/Animations/Converted/Move/RAZORLEAF.txt | 8 -- PBS/Animations/Converted/Move/REFLECT.txt | 6 - PBS/Animations/Converted/Move/REST.txt | 1 - PBS/Animations/Converted/Move/ROAR.txt | 6 - PBS/Animations/Converted/Move/ROCKSMASH.txt | 1 - PBS/Animations/Converted/Move/ROCKTHROW.txt | 2 - PBS/Animations/Converted/Move/ROLLINGKICK.txt | 2 - PBS/Animations/Converted/Move/SANDATTACK.txt | 24 ---- PBS/Animations/Converted/Move/SANDSTORM.txt | 14 --- PBS/Animations/Converted/Move/SCARYFACE.txt | 1 - PBS/Animations/Converted/Move/SCRATCH.txt | 1 - PBS/Animations/Converted/Move/SCREECH.txt | 3 - .../Converted/Move/SELFDESTRUCT.txt | 4 - PBS/Animations/Converted/Move/SHADOWBALL.txt | 2 - PBS/Animations/Converted/Move/SIGNALBEAM.txt | 10 -- PBS/Animations/Converted/Move/SILVERWIND.txt | 16 --- PBS/Animations/Converted/Move/SING.txt | 15 --- PBS/Animations/Converted/Move/SKETCH.txt | 1 - PBS/Animations/Converted/Move/SLAM.txt | 1 - PBS/Animations/Converted/Move/SLASH.txt | 3 - PBS/Animations/Converted/Move/SLEEPPOWDER.txt | 1 - PBS/Animations/Converted/Move/SLUDGE.txt | 1 - PBS/Animations/Converted/Move/SLUDGEBOMB.txt | 4 - PBS/Animations/Converted/Move/SMOG.txt | 1 - PBS/Animations/Converted/Move/SMOKESCREEN.txt | 6 - PBS/Animations/Converted/Move/SPIDERWEB.txt | 2 - PBS/Animations/Converted/Move/SPIKECANNON.txt | 25 ---- PBS/Animations/Converted/Move/SPIKES.txt | 3 - PBS/Animations/Converted/Move/SPLASH.txt | 3 - PBS/Animations/Converted/Move/SPORE.txt | 1 - PBS/Animations/Converted/Move/STEALTHROCK.txt | 16 --- PBS/Animations/Converted/Move/STOMP.txt | 1 - PBS/Animations/Converted/Move/STRINGSHOT.txt | 3 - PBS/Animations/Converted/Move/STRUGGLE.txt | 2 - PBS/Animations/Converted/Move/STUNSPORE.txt | 1 - PBS/Animations/Converted/Move/SUNNYDAY.txt | 1 - PBS/Animations/Converted/Move/SUPERSONIC.txt | 3 - PBS/Animations/Converted/Move/SWAGGER.txt | 1 - PBS/Animations/Converted/Move/SWEETKISS.txt | 2 - PBS/Animations/Converted/Move/SWIFT.txt | 6 - PBS/Animations/Converted/Move/SWORDSDANCE.txt | 5 - PBS/Animations/Converted/Move/TACKLE.txt | 1 - PBS/Animations/Converted/Move/TAILGLOW.txt | 1 - PBS/Animations/Converted/Move/TELEPORT.txt | 3 - PBS/Animations/Converted/Move/THUNDER.txt | 3 - PBS/Animations/Converted/Move/THUNDERBOLT.txt | 2 - PBS/Animations/Converted/Move/THUNDERFANG.txt | 5 - .../Converted/Move/THUNDERPUNCH.txt | 7 -- .../Converted/Move/THUNDERSHOCK.txt | 1 - PBS/Animations/Converted/Move/THUNDERWAVE.txt | 3 - PBS/Animations/Converted/Move/TOXIC.txt | 5 - PBS/Animations/Converted/Move/TRICKROOM.txt | 1 - PBS/Animations/Converted/Move/TWINEEDLE.txt | 6 - PBS/Animations/Converted/Move/TWISTER.txt | 1 - PBS/Animations/Converted/Move/VINEWHIP.txt | 2 - PBS/Animations/Converted/Move/WATERGUN.txt | 17 --- PBS/Animations/Converted/Move/WATERPULSE.txt | 1 - PBS/Animations/Converted/Move/WHIRLWIND.txt | 1 - PBS/Animations/Converted/Move/WILLOWISP.txt | 4 - PBS/Animations/Converted/Move/WINGATTACK.txt | 1 - PBS/Animations/Converted/Move/WRAP.txt | 2 - PBS/Animations/Converted/Move/WRINGOUT.txt | 1 - PBS/Animations/Converted/Move/XSCISSOR.txt | 2 - PBS/Animations/Converted/Move/ZAPCANNON.txt | 1 - 247 files changed, 203 insertions(+), 1245 deletions(-) diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index 237922040..a357dd28b 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -13,11 +13,12 @@ # don't think is ideal. #=============================================================================== class UIControls::ControlsContainer - attr_reader :x, :y - attr_reader :controls - attr_reader :values - attr_reader :visible - attr_reader :viewport + attr_reader :x, :y + attr_accessor :label_offset_x, :label_offset_y + attr_reader :controls + attr_reader :values + attr_reader :visible + attr_reader :viewport LINE_SPACING = 28 OFFSET_FROM_LABEL_X = 90 @@ -30,6 +31,8 @@ class UIControls::ControlsContainer @y = y @width = width @height = height + @label_offset_x = OFFSET_FROM_LABEL_X + @label_offset_y = OFFSET_FROM_LABEL_Y @controls = [] @row_count = 0 @pixel_offset = 0 @@ -196,7 +199,7 @@ class UIControls::ControlsContainer def control_size(has_label = false) if has_label - return @width - OFFSET_FROM_LABEL_X, LINE_SPACING - OFFSET_FROM_LABEL_Y + return @width - @label_offset_x, LINE_SPACING - @label_offset_y end return @width, LINE_SPACING end @@ -213,9 +216,9 @@ class UIControls::ControlsContainer i = @controls.length row_x = 0 row_y = (add_offset ? @row_count - 1 : @row_count) * LINE_SPACING - ctrl_x = row_x + (add_offset ? OFFSET_FROM_LABEL_X : 0) + ctrl_x = row_x + (add_offset ? @label_offset_x : 0) ctrl_x += 4 if control.is_a?(UIControls::List) - ctrl_y = row_y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) + @pixel_offset + ctrl_y = row_y + (add_offset ? @label_offset_y : 0) + @pixel_offset add_control_at(id, control, ctrl_x, ctrl_y) @row_count += rows if !add_offset @pixel_offset -= (LINE_SPACING - UIControls::List::ROW_HEIGHT) * (rows - 1) if control.is_a?(UIControls::List) diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index 6ac78b8f6..a86deb547 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -1,4 +1,3 @@ -# TODO: Add "disabled" greying out/non-editable. # TODO: Add indicator of whether the control's value is "lerping" between frames # (use yellow somehow?). diff --git a/Data/Scripts/801_UI controls/Control elements/002_Label.rb b/Data/Scripts/801_UI controls/Control elements/002_Label.rb index 2dd898ab9..65676c40a 100644 --- a/Data/Scripts/801_UI controls/Control elements/002_Label.rb +++ b/Data/Scripts/801_UI controls/Control elements/002_Label.rb @@ -2,19 +2,19 @@ # #=============================================================================== class UIControls::Label < UIControls::BaseControl - attr_reader :label + attr_reader :text LABEL_END_X = 80 TEXT_OFFSET_Y = 5 - def initialize(width, height, viewport, label) + def initialize(width, height, viewport, text) super(width, height, viewport) - @label = label + @text = text @header = false end - def label=(value) - @label = value + def text=(value) + @text = value refresh end @@ -26,11 +26,11 @@ class UIControls::Label < UIControls::BaseControl def refresh super if @header - draw_text_centered(self.bitmap, 0, TEXT_OFFSET_Y, width, @label) - text_size = self.bitmap.text_size(@label) + draw_text_centered(self.bitmap, 0, TEXT_OFFSET_Y, width, @text) + text_size = self.bitmap.text_size(@text) self.bitmap.fill_rect((width - text_size.width) / 2, TEXT_OFFSET_Y + text_size.height, text_size.width, 1, TEXT_COLOR) else - draw_text(self.bitmap, 4, TEXT_OFFSET_Y, @label) + draw_text(self.bitmap, 4, TEXT_OFFSET_Y, @text) end end end diff --git a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb index 032d77552..eebb16824 100644 --- a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb @@ -7,7 +7,7 @@ #=============================================================================== class UIControls::TextBox < UIControls::BaseControl TEXT_BOX_X = 2 - TEXT_BOX_WIDTH = 172 + TEXT_BOX_WIDTH = 200 TEXT_BOX_HEIGHT = 24 TEXT_BOX_PADDING = 4 # Gap between sides of text box and text TEXT_OFFSET_Y = 5 diff --git a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb index c374d4bf1..2a7978dde 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb @@ -3,18 +3,21 @@ #=============================================================================== class UIControls::DropdownList < UIControls::BaseControl TEXT_BOX_X = 2 - TEXT_BOX_WIDTH = 172 + TEXT_BOX_WIDTH = 200 TEXT_BOX_HEIGHT = 24 TEXT_BOX_PADDING = 4 # Gap between sides of text box and text TEXT_OFFSET_Y = 5 MAX_LIST_ROWS = 8 + attr_accessor :max_rows + def initialize(width, height, viewport, options, value) # NOTE: options is a hash: keys are symbols, values are display names. super(width, height, viewport) @options = options @value = value @toggling_dropdown_list = false + @max_rows = MAX_LIST_ROWS end def dispose @@ -46,7 +49,7 @@ class UIControls::DropdownList < UIControls::BaseControl #----------------------------------------------------------------------------- def make_dropdown_menu - menu_height = UIControls::List::ROW_HEIGHT * [@options.length, MAX_LIST_ROWS].min + menu_height = UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min # Draw menu's background @dropdown_menu_bg = BitmapSprite.new(@button_rect.width, menu_height + 4, self.viewport) @dropdown_menu_bg.x = self.x + @button_rect.x diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 8d05f83e3..da0e02564 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -5,6 +5,7 @@ module GameData attr_reader :version # Hit number attr_reader :name # Shown in the sublist; cosmetic only attr_reader :no_target # Whether there is no "Target" particle (false by default) + attr_reader :ignore # Whether the animation can't be played in battle attr_reader :flags attr_reader :pbs_path # Whole path minus "PBS/Animations/" at start and ".txt" at end attr_reader :particles @@ -29,6 +30,7 @@ module GameData "Common" => :common, "OppCommon" => :opp_common}], "Name" => [:name, "s"], "NoTarget" => [:no_target, "b"], + "Ignore" => [:ignore, "b"], # TODO: Boolean for whether the animation will be played if the target is # on the same side as the user. # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage @@ -98,6 +100,7 @@ module GameData # TODO: Add "SetColor"/"SetTone" as shorthand for the above? They'd be # converted in the Compiler. # TODO: Bitmap masking. + # TODO: Sprite cropping. # TODO: Hue? I don't think so; color/tone do the same job. # These properties are specifically for the "SE" particle. @@ -187,6 +190,7 @@ module GameData @version = hash[:version] || 0 @name = hash[:name] @no_target = hash[:no_target] || false + @ignore = hash[:ignore] || false @particles = hash[:particles] || [] @flags = hash[:flags] || [] @pbs_path = hash[:pbs_path] || @move @@ -197,9 +201,9 @@ module GameData def clone_as_hash ret = {} ret[:type] = @type - ret[:move] = @move - ret[:version] = @version - ret[:name] = @name + ret[:move] = @move.dup + ret[:version] = @version.dup + ret[:name] = @name.dup ret[:particles] = [] # Clone the @particles array, which is nested hashes and arrays @particles.each do |particle| new_p = {} diff --git a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb index e1e8bfb70..17fe78c07 100644 --- a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb +++ b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb @@ -98,8 +98,6 @@ module AnimationConverter particle[:name] = "User" elsif i == 1 particle[:name] = "Target" - else - particle[:visible] = [[0, 0, true]] end last_frame = last_frame_values[i] || default_frame.clone @@ -165,11 +163,11 @@ end #=============================================================================== # Add to Debug menu. #=============================================================================== -MenuHandlers.add(:debug_menu, :convert_anims, { - "name" => "Convert old animation to PBS files", - "parent" => :main, - "description" => "This is just for the sake of having lots of example animation PBS files.", - "effect" => proc { - AnimationConverter.convert_old_animations_to_new - } -}) +# MenuHandlers.add(:debug_menu, :convert_anims, { +# "name" => "Convert old animation to PBS files", +# "parent" => :main, +# "description" => "This is just for the sake of having lots of example animation PBS files.", +# "effect" => proc { +# AnimationConverter.convert_old_animations_to_new +# } +# }) diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index b1a8e5064..b3108fb3c 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -45,10 +45,15 @@ class AnimationEditor PARTICLE_LIST_WIDTH = WINDOW_WIDTH - (BORDER_THICKNESS * 2) PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y - BORDER_THICKNESS + ANIM_PROPERTIES_WIDTH = SIDE_PANE_WIDTH + 80 + ANIM_PROPERTIES_HEIGHT = WINDOW_HEIGHT * 3 / 4 + ANIM_PROPERTIES_X = (WINDOW_WIDTH - ANIM_PROPERTIES_WIDTH) / 2 + ANIM_PROPERTIES_Y = (WINDOW_HEIGHT - ANIM_PROPERTIES_HEIGHT) / 2 + def initialize(anim_id, anim) @anim_id = anim_id @anim = anim - @pbs_path = anim[:pbs_path] + @pbs_path = anim[:pbs_path].dup @quit = false # Viewports @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @@ -92,12 +97,19 @@ class AnimationEditor PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport ) @components[:particle_list].set_interactive_rects + # Animation properties pop-up window + @components[:animation_properties] = UIControls::ControlsContainer.new( + ANIM_PROPERTIES_X + 4, ANIM_PROPERTIES_Y + 4, ANIM_PROPERTIES_WIDTH - 8, ANIM_PROPERTIES_HEIGHT - 8 + ) + @components[:animation_properties].viewport.z = @pop_up_viewport.z + 1 + @components[:animation_properties].label_offset_x = 170 @captured = nil set_menu_bar_contents set_canvas_contents + set_play_controls_contents set_side_panes_contents set_particle_list_contents - set_play_controls_contents + set_animation_properties_contents refresh end @@ -155,6 +167,10 @@ class AnimationEditor @components[:canvas].bg_name = "indoor1" end + def set_play_controls_contents + @components[:play_controls].duration = @components[:particle_list].duration + end + def set_commands_pane_contents commands_pane = @components[:commands_pane] commands_pane.add_header_label(:header, _INTL("Edit particle at keyframe")) @@ -246,8 +262,44 @@ class AnimationEditor @components[:particle_list].set_particles(@anim[:particles]) end - def set_play_controls_contents - @components[:play_controls].duration = @components[:particle_list].duration + def set_animation_properties_contents + anim_properties = @components[:animation_properties] + anim_properties.add_header_label(:header, _INTL("Animation properties")) + # Create animation type control + anim_properties.add_labelled_dropdown_list(:type, _INTL("Animation type"), { + :move => _INTL("Move"), + :common => _INTL("Common") + }, :move) + # Create "opp" variant + anim_properties.add_labelled_checkbox(:opp_variant, _INTL("User is opposing?"), false) + # Create move control + # TODO: Also make a TextBox here for common animations, and toggle these two + # controls' visibility depending on :type? + move_list = [] + GameData::Move.each { |m| move_list.push([m.id.to_s, m.name]) } + move_list.sort! { |a, b| a[1] <=> b[1] } + # TODO: Make this a TextBoxDropdownList instead. + anim_properties.add_labelled_dropdown_list(:move, _INTL("Move"), move_list.to_h, move_list[0][0]) + move_ctrl = anim_properties.get_control(:move) + move_ctrl.max_rows = 16 + common_text = UIControls::TextBox.new(move_ctrl.width, move_ctrl.height, move_ctrl.viewport, "") + anim_properties.add_control_at(:common_anim, common_text, move_ctrl.x, move_ctrl.y) + # Create version control + anim_properties.add_labelled_number_text_box(:version, _INTL("Version"), 0, 99, 0) + # Create animation name control + anim_properties.add_labelled_text_box(:name, _INTL("Name"), "") + # Create filepath controls + # TODO: Have two TextBoxes, one for folder and one for filename? + anim_properties.add_labelled_text_box(:pbs_path, _INTL("PBS filepath"), "") + # Create "involves a target" control + anim_properties.add_labelled_checkbox(:has_target, _INTL("Involves a target?"), true) + # Create flags control + # TODO: List, TextBox and some Buttons to add/delete. + # Create "usable in battle" control + anim_properties.add_labelled_checkbox(:usable, _INTL("Can be used in battle?"), true) + # TODO: "Play if target is on the same side as the user". + anim_properties.add_button(:close, _INTL("Close")) + anim_properties.visible = false end #----------------------------------------------------------------------------- @@ -367,7 +419,7 @@ class AnimationEditor "TARGET_BACK" => _INTL("[[Target's back sprite]]"), } graphic_name = graphic_override_names[graphic_name] if graphic_override_names[graphic_name] - component.get_control(:graphic_name).label = graphic_name + component.get_control(:graphic_name).text = graphic_name # Enable/disable the Graphic and Focus controls for "User"/"Target" if ["User", "Target"].include?(@anim[:particles][particle_index][:name]) component.get_control(:graphic).disable @@ -376,6 +428,20 @@ class AnimationEditor component.get_control(:graphic).enable component.get_control(:focus).enable end + when :animation_properties + case @anim[:type] + when :move, :opp_move + component.get_control(:move_label).text = _INTL("Move") + component.get_control(:move).visible = true + component.get_control(:move).value = @anim[:move].dup + component.get_control(:common_anim).visible = false + when :common, :opp_common + component.get_control(:move_label).text = _INTL("Common animation") + component.get_control(:move).visible = false + component.get_control(:common_anim).visible = true + component.get_control(:common_anim).value = @anim[:move].dup + end + # TODO: Maybe other things as well? end end @@ -403,12 +469,17 @@ class AnimationEditor when :save save when :name - # TODO: Open the animation properties pop-up window. - echoln "Animation's name button clicked" + edit_animation_properties + @components[:menu_bar].anim_name = get_animation_display_name + # TODO: May need to refresh other things. + refresh_component(:particle_list) end when :canvas # TODO: Detect and apply changes made in canvas, e.g. moving particle, # double-clicking to add particle, deleting particle. + when :play_controls + # TODO: Will the play controls ever signal themselves as changed? I don't + # think so. when :commands_pane case property when :color_tone # Button @@ -486,9 +557,31 @@ class AnimationEditor when :particle_list # refresh if keyframe != old_keyframe || particle_index != old_particle_index # TODO: Lots of stuff here when buttons are added to it. - when :play_controls - # TODO: Will the play controls ever signal themselves as changed? I don't - # think so. + when :animation_properties + case property + when :type, :opp_variant + type = @components[:animation_properties].get_control(:type).value + opp = @components[:animation_properties].get_control(:opp_variant).value + case type + when :move + @anim[:type] = (opp) ? :opp_move : :move + when :common + @anim[:type] = (opp) ? :opp_common : :common + end + refresh_component(:animation_properties) + when :common_anim + @anim[:move] = value + when :pbs_path + txt = value.dup.gsub!(/\.txt$/, "") + @anim[property] = txt + when :has_target + @anim[:no_target] = !value + # TODO: Add/delete the "Target" particle accordingly. + when :usable + @anim[:ignore] = !value + else + @anim[property] = value + end end end diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index b26795569..c452f7297 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -344,4 +344,53 @@ class AnimationEditor @pop_up_bg_bitmap.visible = false return [ret, vol, ptch] end + + #----------------------------------------------------------------------------- + + def edit_animation_properties + # Show pop-up window + @pop_up_bg_bitmap.visible = true + bg_bitmap = create_pop_up_window(ANIM_PROPERTIES_WIDTH, ANIM_PROPERTIES_HEIGHT) + # TODO: Draw box around list control(s), i.e. flags. + @components[:animation_properties].visible = true + # Set control values + anim_properties = @components[:animation_properties] + case @anim[:type] + when :move, :opp_move + anim_properties.get_control(:type).value = :move + when :common, :opp_common + anim_properties.get_control(:type).value = :common + end + anim_properties.get_control(:opp_variant).value = ([:opp_move, :opp_common].include?(@anim[:type])) + anim_properties.get_control(:version).value = @anim[:version] || 0 + anim_properties.get_control(:name).value = @anim[:name] || "" + anim_properties.get_control(:pbs_path).value = (@anim[:pbs_path] || "unsorted") + ".txt" + anim_properties.get_control(:has_target).value = !@anim[:no_target] + anim_properties.get_control(:usable).value = !(@anim[:ignore] || false) + # TODO: Populate flags. + refresh_component(:animation_properties) # This sets the :move control's value + # Interaction loop + ret = nil + captured = nil + loop do + Graphics.update + Input.update + anim_properties.update + if anim_properties.changed? + break if anim_properties.values.keys.include?(:close) + anim_properties.values.each_pair do |property, value| + apply_changed_value(:animation_properties, property, value) + end + anim_properties.clear_changed + end + break if !anim_properties.busy? && Input.trigger?(Input::BACK) + anim_properties.repaint + end + # Dispose and return + bg_bitmap.dispose + @pop_up_bg_bitmap.visible = false + anim_properties.clear_changed + anim_properties.visible = false + end + end diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 901d15b8d..54c2acc4b 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -118,7 +118,7 @@ class AnimationEditor::AnimationSelector name = "" name += _INTL("[Foe]") + " " if anim.opposing_animation? name += "[#{anim.version}]" + " " if anim.version > 0 - name += anim.name + name += (anim.name || anim.move) if anim.move_animation? move_name = GameData::Move.try_get(anim.move)&.name || anim.move @move_list.push([anim.move, move_name]) if !@move_animations[anim.move] @@ -161,12 +161,12 @@ class AnimationEditor::AnimationSelector @components.get_control(:moves).disable @components.get_control(:commons).enable @components.get_control(:moves_list).values = @move_list - @components.get_control(:moves_label).label = _INTL("Moves") + @components.get_control(:moves_label).text = _INTL("Moves") when 1 @components.get_control(:moves).enable @components.get_control(:commons).disable @components.get_control(:moves_list).values = @common_list - @components.get_control(:moves_label).label = _INTL("Common animations") + @components.get_control(:moves_label).text = _INTL("Common animations") end # Put the correct list into the animations list @components.get_control(:animations_list).values = selected_move_animations diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 3d9393d38..6d1144050 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -87,6 +87,14 @@ module AnimationEditor::ParticleDataHelper value = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[:visible] value = true if ["User", "Target", "SE"].include?(particle[:name]) ret = [] + if !["User", "Target", "SE"].include?(particle[:name]) + earliest = duration + particle.each_pair do |prop, value| + next if !value.is_a?(Array) || value.length == 0 + earliest = value[0][0] if earliest > value[0][0] + end + ret[earliest] = true + end if particle[:visible] particle[:visible].each { |cmd| ret[cmd[0]] = cmd[2] } end diff --git a/PBS/Animations/Converted/Common/Attract.txt b/PBS/Animations/Converted/Common/Attract.txt index f5869b092..2a7d1749b 100644 --- a/PBS/Animations/Converted/Common/Attract.txt +++ b/PBS/Animations/Converted/Common/Attract.txt @@ -11,7 +11,6 @@ Name = Attract Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 7,355 SetY = 7,50 SetX = 8,341 @@ -37,7 +36,6 @@ Name = Attract Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 8,349 SetY = 8,50 SetX = 9,333 @@ -61,7 +59,6 @@ Name = Attract Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 12,397 SetY = 12,93 SetX = 13,411 @@ -80,7 +77,6 @@ Name = Attract Focus = Target SetX = 0,374 SetY = 0,67 - SetVisible = 0,true SetX = 1,407 SetY = 1,65 SetX = 2,432 diff --git a/PBS/Animations/Converted/Common/Bind.txt b/PBS/Animations/Converted/Common/Bind.txt index 8d8ba9ca8..787db6238 100644 --- a/PBS/Animations/Converted/Common/Bind.txt +++ b/PBS/Animations/Converted/Common/Bind.txt @@ -13,7 +13,6 @@ Name = Bind Focus = Target SetX = 0,440 SetY = 0,102 - SetVisible = 0,true SetX = 1,480 SetY = 1,94 SetX = 2,488 @@ -30,7 +29,6 @@ Name = Bind Focus = Target SetX = 0,320 SetY = 0,102 - SetVisible = 0,true SetX = 1,288 SetY = 1,94 SetX = 2,240 diff --git a/PBS/Animations/Converted/Common/Burn.txt b/PBS/Animations/Converted/Common/Burn.txt index 00cd7ee39..a07989e8e 100644 --- a/PBS/Animations/Converted/Common/Burn.txt +++ b/PBS/Animations/Converted/Common/Burn.txt @@ -15,6 +15,5 @@ Name = Burn SetY = 0,96 SetZoomX = 0,200 SetZoomY = 0,200 - SetVisible = 0,true Play = 0,Fire2,80,100 diff --git a/PBS/Animations/Converted/Common/Confusion.txt b/PBS/Animations/Converted/Common/Confusion.txt index c41559284..5f56c00df 100644 --- a/PBS/Animations/Converted/Common/Confusion.txt +++ b/PBS/Animations/Converted/Common/Confusion.txt @@ -13,7 +13,6 @@ Name = Confusion Focus = Target SetX = 0,384 SetY = 0,63 - SetVisible = 0,true SetY = 1,64 SetY = 2,57 SetX = 3,385 diff --git a/PBS/Animations/Converted/Common/FireSpin.txt b/PBS/Animations/Converted/Common/FireSpin.txt index 17597c6cd..05b72cf19 100644 --- a/PBS/Animations/Converted/Common/FireSpin.txt +++ b/PBS/Animations/Converted/Common/FireSpin.txt @@ -13,119 +13,99 @@ Name = FireSpin Focus = Target SetX = 0,355 SetY = 0,136 - SetVisible = 0,true Graphic = fly copy Focus = Target SetX = 0,393 SetY = 0,138 - SetVisible = 0,true Graphic = fly copy Focus = Target SetX = 0,428 SetY = 0,137 - SetVisible = 0,true Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,355 SetY = 1,121 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,394 SetY = 1,123 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,431 SetY = 1,122 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 2,359 SetY = 2,108 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 2,395 SetY = 2,107 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 2,433 SetY = 2,105 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 3,357 SetY = 3,92 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 3,396 SetY = 3,91 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 3,431 SetY = 3,89 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,356 SetY = 4,77 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,397 SetY = 4,78 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,435 SetY = 4,76 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 5,355 SetY = 5,62 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 5,397 SetY = 5,63 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 5,434 SetY = 5,61 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 5,374 SetY = 5,137 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 5,415 SetY = 5,138 diff --git a/PBS/Animations/Converted/Common/Frozen.txt b/PBS/Animations/Converted/Common/Frozen.txt index 157f962e6..77f017aed 100644 --- a/PBS/Animations/Converted/Common/Frozen.txt +++ b/PBS/Animations/Converted/Common/Frozen.txt @@ -13,7 +13,6 @@ Name = Frozen Focus = Target SetX = 0,328 SetY = 0,14 - SetVisible = 0,true SetX = 1,360 SetY = 1,30 SetX = 8,384 @@ -31,7 +30,6 @@ Name = Frozen Graphic = 016-Ice01 Focus = Target - SetVisible = 0,true SetX = 1,384 SetY = 1,94 SetOpacity = 6,192 @@ -51,7 +49,6 @@ Name = Frozen Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true SetOpacity = 1,128 SetOpacity = 2,255 SetOpacity = 7,192 diff --git a/PBS/Animations/Converted/Common/Hail.txt b/PBS/Animations/Converted/Common/Hail.txt index aa5c04c19..87b8f9195 100644 --- a/PBS/Animations/Converted/Common/Hail.txt +++ b/PBS/Animations/Converted/Common/Hail.txt @@ -13,7 +13,6 @@ Name = Hail Focus = Screen SetX = 0,37 SetY = 0,26 - SetVisible = 0,true SetX = 1,207 SetY = 1,56 SetX = 2,84 @@ -39,7 +38,6 @@ Name = Hail Focus = Screen SetX = 0,164 SetY = 0,136 - SetVisible = 0,true SetX = 1,464 SetY = 1,117 SetX = 3,441 @@ -57,7 +55,6 @@ Name = Hail Focus = Screen SetX = 0,302 SetY = 0,79 - SetVisible = 0,true SetX = 1,201 SetY = 1,204 SetX = 2,228 @@ -79,7 +76,6 @@ Name = Hail Focus = Screen SetX = 0,440 SetY = 0,194 - SetVisible = 0,true SetX = 1,51 SetY = 1,161 SetX = 2,263 @@ -107,7 +103,6 @@ Name = Hail Focus = Screen SetX = 0,362 SetY = 0,252 - SetVisible = 0,true SetX = 2,78 SetY = 2,206 SetX = 4,259 @@ -131,7 +126,6 @@ Name = Hail Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 4,72 SetY = 4,220 SetX = 6,161 @@ -145,7 +139,6 @@ Name = Hail Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 9,28 SetY = 9,57 SetX = 10,294 @@ -157,12 +150,10 @@ Name = Hail Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 11,299 SetY = 11,47 Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 12,449 SetY = 12,237 diff --git a/PBS/Animations/Converted/Common/HealthDown.txt b/PBS/Animations/Converted/Common/HealthDown.txt index b88442155..860bda06f 100644 --- a/PBS/Animations/Converted/Common/HealthDown.txt +++ b/PBS/Animations/Converted/Common/HealthDown.txt @@ -13,7 +13,6 @@ Name = HealthDown Focus = Target SetX = 0,334 SetY = 0,43 - SetVisible = 0,true SetOpacity = 0,126 SetToneRed = 0,255 SetToneGreen = 0,64 @@ -35,7 +34,6 @@ Name = HealthDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 1,419 SetY = 1,64 SetOpacity = 1,126 @@ -56,7 +54,6 @@ Name = HealthDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 1,406 SetY = 1,87 SetOpacity = 1,126 @@ -80,7 +77,6 @@ Name = HealthDown Focus = Target SetX = 0,419 SetY = 0,44 - SetVisible = 0,true SetOpacity = 0,126 SetToneRed = 0,255 SetToneGreen = 0,64 @@ -98,7 +94,6 @@ Name = HealthDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 2,368 SetY = 2,87 SetOpacity = 2,126 @@ -116,7 +111,6 @@ Name = HealthDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 2,383 SetY = 2,39 SetOpacity = 2,126 @@ -132,7 +126,6 @@ Name = HealthDown Focus = Target SetX = 0,406 SetY = 0,67 - SetVisible = 0,true SetOpacity = 0,126 SetToneRed = 0,255 SetToneGreen = 0,64 @@ -146,7 +139,6 @@ Name = HealthDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 3,409 SetY = 3,68 SetOpacity = 3,126 @@ -159,7 +151,6 @@ Name = HealthDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 2,343 SetY = 2,58 SetOpacity = 2,126 diff --git a/PBS/Animations/Converted/Common/HealthUp.txt b/PBS/Animations/Converted/Common/HealthUp.txt index 05fde7f52..98cb6594e 100644 --- a/PBS/Animations/Converted/Common/HealthUp.txt +++ b/PBS/Animations/Converted/Common/HealthUp.txt @@ -11,7 +11,6 @@ Name = HealthUp Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 1,432 SetY = 1,54 SetX = 10,344 @@ -19,7 +18,6 @@ Name = HealthUp Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 4,344 SetY = 4,70 @@ -27,7 +25,6 @@ Name = HealthUp Focus = Target SetX = 0,392 SetY = 0,94 - SetVisible = 0,true SetX = 10,432 SetY = 10,54 SetX = 11,344 diff --git a/PBS/Animations/Converted/Common/LeechSeed.txt b/PBS/Animations/Converted/Common/LeechSeed.txt index b01686e44..eb64a861e 100644 --- a/PBS/Animations/Converted/Common/LeechSeed.txt +++ b/PBS/Animations/Converted/Common/LeechSeed.txt @@ -11,7 +11,6 @@ Name = LeechSeed Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,339 SetY = 1,98 SetX = 2,345 @@ -33,7 +32,6 @@ Name = LeechSeed Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,384 SetY = 2,98 SetX = 3,313 @@ -54,7 +52,6 @@ Name = LeechSeed Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,371 SetY = 3,98 SetX = 4,345 @@ -73,7 +70,6 @@ Name = LeechSeed Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,313 SetY = 4,104 SetX = 5,249 @@ -87,7 +83,6 @@ Name = LeechSeed Focus = UserAndTarget SetX = 0,384 SetY = 0,98 - SetVisible = 0,true SetY = 1,110 SetX = 2,275 SetY = 2,98 diff --git a/PBS/Animations/Converted/Common/Paralysis.txt b/PBS/Animations/Converted/Common/Paralysis.txt index b5ac92c97..08454e973 100644 --- a/PBS/Animations/Converted/Common/Paralysis.txt +++ b/PBS/Animations/Converted/Common/Paralysis.txt @@ -11,7 +11,6 @@ Name = Paralysis Graphic = Struggle Focus = Target - SetVisible = 0,true SetX = 1,424 SetY = 1,102 SetX = 2,456 @@ -32,7 +31,6 @@ Name = Paralysis Graphic = Struggle Focus = Target - SetVisible = 0,true SetX = 1,336 SetY = 1,94 SetX = 2,304 diff --git a/PBS/Animations/Converted/Common/ParentalBond.txt b/PBS/Animations/Converted/Common/ParentalBond.txt index a15dcdda1..63ac812b2 100644 --- a/PBS/Animations/Converted/Common/ParentalBond.txt +++ b/PBS/Animations/Converted/Common/ParentalBond.txt @@ -11,7 +11,6 @@ Name = ParentalBond Graphic = Tackle_B Focus = Target - SetVisible = 0,true SetX = 2,384 SetY = 2,99 SetOpacity = 2,150 diff --git a/PBS/Animations/Converted/Common/Poison.txt b/PBS/Animations/Converted/Common/Poison.txt index c2117053b..5bfc39143 100644 --- a/PBS/Animations/Converted/Common/Poison.txt +++ b/PBS/Animations/Converted/Common/Poison.txt @@ -11,7 +11,6 @@ Name = Poison Graphic = State1 Focus = Target - SetVisible = 0,true SetX = 1,384 SetY = 1,86 diff --git a/PBS/Animations/Converted/Common/Rain.txt b/PBS/Animations/Converted/Common/Rain.txt index 8a3955508..b129b9457 100644 --- a/PBS/Animations/Converted/Common/Rain.txt +++ b/PBS/Animations/Converted/Common/Rain.txt @@ -13,7 +13,6 @@ Name = Rain Focus = Screen SetX = 0,197 SetY = 0,25 - SetVisible = 0,true SetX = 1,72 SetY = 1,49 SetX = 2,60 @@ -36,7 +35,6 @@ Name = Rain Focus = Screen SetX = 0,275 SetY = 0,47 - SetVisible = 0,true SetX = 1,229 SetY = 1,216 SetX = 2,193 @@ -60,7 +58,6 @@ Name = Rain Focus = Screen SetX = 0,355 SetY = 0,51 - SetVisible = 0,true SetX = 1,109 SetY = 1,217 SetX = 2,265 @@ -84,7 +81,6 @@ Name = Rain Focus = Screen SetX = 0,450 SetY = 0,50 - SetVisible = 0,true SetX = 1,223 SetY = 1,110 SetX = 2,228 @@ -108,7 +104,6 @@ Name = Rain Focus = Screen SetX = 0,83 SetY = 0,81 - SetVisible = 0,true SetX = 1,399 SetY = 1,120 SetX = 2,350 @@ -132,7 +127,6 @@ Name = Rain Focus = Screen SetX = 0,231 SetY = 0,170 - SetVisible = 0,true SetX = 1,480 SetY = 1,83 SetX = 2,399 @@ -156,7 +150,6 @@ Name = Rain Focus = Screen SetX = 0,352 SetY = 0,212 - SetVisible = 0,true SetX = 1,362 SetY = 1,63 SetX = 2,488 @@ -180,7 +173,6 @@ Name = Rain Focus = Screen SetX = 0,467 SetY = 0,254 - SetVisible = 0,true SetX = 1,376 SetY = 1,192 SetX = 2,434 @@ -202,7 +194,6 @@ Name = Rain Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 1,482 SetY = 1,244 SetX = 2,121 @@ -220,7 +211,6 @@ Name = Rain Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 2,27 SetY = 2,241 SetX = 3,88 @@ -236,7 +226,6 @@ Name = Rain Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 4,409 SetY = 4,203 SetX = 7,443 @@ -246,6 +235,5 @@ Name = Rain Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 9,474 SetY = 9,41 diff --git a/PBS/Animations/Converted/Common/Sandstorm.txt b/PBS/Animations/Converted/Common/Sandstorm.txt index b2716c99a..053a308aa 100644 --- a/PBS/Animations/Converted/Common/Sandstorm.txt +++ b/PBS/Animations/Converted/Common/Sandstorm.txt @@ -13,7 +13,6 @@ Name = Sandstorm Focus = Screen SetX = 0,-350 SetY = 0,-30 - SetVisible = 0,true SetX = 1,153 SetY = 1,62 SetX = 2,-350 @@ -37,7 +36,6 @@ Name = Sandstorm Focus = Screen SetX = 0,31 SetY = 0,69 - SetVisible = 0,true SetX = 1,56 SetY = 1,85 SetX = 2,31 @@ -61,7 +59,6 @@ Name = Sandstorm Focus = Screen SetX = 0,156 SetY = 0,106 - SetVisible = 0,true SetX = 1,74 SetY = 1,223 SetX = 2,156 @@ -85,7 +82,6 @@ Name = Sandstorm Focus = Screen SetX = 0,165 SetY = 0,220 - SetVisible = 0,true SetX = 1,220 SetY = 1,207 SetX = 2,165 @@ -109,7 +105,6 @@ Name = Sandstorm Focus = Screen SetX = 0,267 SetY = 0,178 - SetVisible = 0,true SetX = 1,352 SetY = 1,253 SetX = 2,267 @@ -133,7 +128,6 @@ Name = Sandstorm Focus = Screen SetX = 0,309 SetY = 0,248 - SetVisible = 0,true SetX = 1,464 SetY = 1,227 SetX = 2,309 @@ -157,7 +151,6 @@ Name = Sandstorm Focus = Screen SetX = 0,388 SetY = 0,142 - SetVisible = 0,true SetX = 1,484 SetY = 1,76 SetX = 2,388 @@ -181,7 +174,6 @@ Name = Sandstorm Focus = Screen SetX = 0,448 SetY = 0,243 - SetVisible = 0,true SetX = 1,378 SetY = 1,130 SetX = 2,448 @@ -205,7 +197,6 @@ Name = Sandstorm Focus = Screen SetX = 0,35 SetY = 0,216 - SetVisible = 0,true SetX = 1,285 SetY = 1,142 SetX = 2,35 @@ -229,7 +220,6 @@ Name = Sandstorm Focus = Screen SetX = 0,276 SetY = 0,34 - SetVisible = 0,true SetX = 1,316 SetY = 1,22 SetX = 2,276 @@ -253,7 +243,6 @@ Name = Sandstorm Focus = Screen SetX = 0,487 SetY = 0,32 - SetVisible = 0,true SetX = 4,358 SetY = 4,16 SetX = 5,487 @@ -265,7 +254,6 @@ Name = Sandstorm Focus = Screen SetX = 0,492 SetY = 0,135 - SetVisible = 0,true SetX = 4,267 SetY = 4,63 SetX = 5,492 @@ -277,7 +265,6 @@ Name = Sandstorm Focus = Screen SetX = 0,387 SetY = 0,18 - SetVisible = 0,true SetX = 9,251 SetY = 9,305 @@ -285,4 +272,3 @@ Name = Sandstorm Focus = Screen SetX = 0,148 SetY = 0,9 - SetVisible = 0,true diff --git a/PBS/Animations/Converted/Common/Shadow.txt b/PBS/Animations/Converted/Common/Shadow.txt index 69e8f6a00..2d360a86d 100644 --- a/PBS/Animations/Converted/Common/Shadow.txt +++ b/PBS/Animations/Converted/Common/Shadow.txt @@ -11,7 +11,6 @@ Name = Shadow Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 2,440 SetY = 2,126 SetX = 4,296 @@ -27,7 +26,6 @@ Name = Shadow Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 3,296 SetY = 3,86 SetX = 4,360 @@ -41,7 +39,6 @@ Name = Shadow Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 5,416 SetY = 5,54 SetX = 6,368 @@ -53,7 +50,6 @@ Name = Shadow Focus = Target SetX = 0,360 SetY = 0,110 - SetVisible = 0,true SetX = 4,440 SetY = 4,126 SetX = 6,296 diff --git a/PBS/Animations/Converted/Common/ShadowSky.txt b/PBS/Animations/Converted/Common/ShadowSky.txt index 268835620..a42b68bb6 100644 --- a/PBS/Animations/Converted/Common/ShadowSky.txt +++ b/PBS/Animations/Converted/Common/ShadowSky.txt @@ -15,7 +15,6 @@ Name = ShadowSky SetY = 0,132 SetZoomX = 0,327 SetZoomY = 0,242 - SetVisible = 0,true SetOpacity = 0,128 SetOpacity = 1,192 SetOpacity = 2,249 diff --git a/PBS/Animations/Converted/Common/Shiny.txt b/PBS/Animations/Converted/Common/Shiny.txt index 67a6dcded..967b68ad3 100644 --- a/PBS/Animations/Converted/Common/Shiny.txt +++ b/PBS/Animations/Converted/Common/Shiny.txt @@ -11,7 +11,6 @@ Name = Shiny Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 2,440 SetY = 2,126 SetX = 4,327 @@ -27,7 +26,6 @@ Name = Shiny Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 3,327 SetY = 3,78 SetX = 4,366 @@ -41,7 +39,6 @@ Name = Shiny Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 5,416 SetY = 5,54 SetX = 6,368 @@ -53,7 +50,6 @@ Name = Shiny Focus = Target SetX = 0,360 SetY = 0,110 - SetVisible = 0,true SetX = 4,440 SetY = 4,126 SetX = 6,327 diff --git a/PBS/Animations/Converted/Common/Sleep.txt b/PBS/Animations/Converted/Common/Sleep.txt index 6366e3274..4d8437e6a 100644 --- a/PBS/Animations/Converted/Common/Sleep.txt +++ b/PBS/Animations/Converted/Common/Sleep.txt @@ -11,7 +11,6 @@ Name = Sleep Graphic = 028-State01 Focus = Target - SetVisible = 0,true SetX = 3,424 SetY = 3,54 SetZoomX = 3,50 @@ -35,7 +34,6 @@ Name = Sleep Graphic = 028-State01 Focus = Target - SetVisible = 0,true SetX = 5,370 SetY = 5,64 SetZoomX = 5,50 @@ -45,7 +43,6 @@ Name = Sleep Graphic = 028-State01 Focus = Target - SetVisible = 0,true SetX = 1,408 SetY = 1,78 SetZoomX = 1,50 diff --git a/PBS/Animations/Converted/Common/StatDown.txt b/PBS/Animations/Converted/Common/StatDown.txt index 74666f4d1..5fca9a09e 100644 --- a/PBS/Animations/Converted/Common/StatDown.txt +++ b/PBS/Animations/Converted/Common/StatDown.txt @@ -13,7 +13,6 @@ Name = StatDown Focus = Target SetX = 0,334 SetY = 0,43 - SetVisible = 0,true SetOpacity = 0,126 SetY = 1,63 SetY = 2,83 @@ -32,7 +31,6 @@ Name = StatDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 1,419 SetY = 1,64 SetOpacity = 1,126 @@ -50,7 +48,6 @@ Name = StatDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 1,406 SetY = 1,87 SetOpacity = 1,126 @@ -71,7 +68,6 @@ Name = StatDown Focus = Target SetX = 0,419 SetY = 0,44 - SetVisible = 0,true SetOpacity = 0,126 SetX = 1,398 SetY = 1,49 @@ -86,7 +82,6 @@ Name = StatDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 2,368 SetY = 2,87 SetOpacity = 2,126 @@ -101,7 +96,6 @@ Name = StatDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 2,383 SetY = 2,39 SetOpacity = 2,126 @@ -114,7 +108,6 @@ Name = StatDown Focus = Target SetX = 0,406 SetY = 0,67 - SetVisible = 0,true SetOpacity = 0,126 SetX = 1,368 SetX = 3,343 @@ -125,7 +118,6 @@ Name = StatDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 3,409 SetY = 3,68 SetOpacity = 3,126 @@ -135,7 +127,6 @@ Name = StatDown Graphic = ! Focus = Target - SetVisible = 0,true SetX = 2,343 SetY = 2,58 SetOpacity = 2,126 diff --git a/PBS/Animations/Converted/Common/StatUp.txt b/PBS/Animations/Converted/Common/StatUp.txt index dbbb93721..da79493c3 100644 --- a/PBS/Animations/Converted/Common/StatUp.txt +++ b/PBS/Animations/Converted/Common/StatUp.txt @@ -13,7 +13,6 @@ Name = StatUp Focus = Target SetX = 0,343 SetY = 0,234 - SetVisible = 0,true SetOpacity = 0,126 SetY = 1,210 SetY = 2,178 @@ -31,7 +30,6 @@ Name = StatUp Focus = Target SetX = 0,391 SetY = 0,202 - SetVisible = 0,true SetOpacity = 0,126 SetY = 1,170 SetY = 2,138 @@ -49,7 +47,6 @@ Name = StatUp Focus = Target SetX = 0,439 SetY = 0,234 - SetVisible = 0,true SetOpacity = 0,126 SetY = 1,210 SetX = 2,447 @@ -67,7 +64,6 @@ Name = StatUp Graphic = ! Focus = Target - SetVisible = 0,true SetX = 2,375 SetY = 2,234 SetOpacity = 2,126 @@ -83,7 +79,6 @@ Name = StatUp Graphic = ! Focus = Target - SetVisible = 0,true SetX = 3,423 SetY = 3,234 SetOpacity = 3,126 @@ -98,7 +93,6 @@ Name = StatUp Graphic = ! Focus = Target - SetVisible = 0,true SetX = 5,359 SetY = 5,234 SetOpacity = 5,126 diff --git a/PBS/Animations/Converted/Common/Sun.txt b/PBS/Animations/Converted/Common/Sun.txt index 826992724..e35de2664 100644 --- a/PBS/Animations/Converted/Common/Sun.txt +++ b/PBS/Animations/Converted/Common/Sun.txt @@ -13,7 +13,6 @@ Name = Sun Focus = Screen SetX = 0,64 SetY = 0,64 - SetVisible = 0,true SetOpacity = 0,64 SetX = 1,72 SetY = 1,72 diff --git a/PBS/Animations/Converted/Common/SuperShiny.txt b/PBS/Animations/Converted/Common/SuperShiny.txt index a1d1e3820..af81538b9 100644 --- a/PBS/Animations/Converted/Common/SuperShiny.txt +++ b/PBS/Animations/Converted/Common/SuperShiny.txt @@ -11,7 +11,6 @@ Name = SuperShiny Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 2,440 SetY = 2,126 SetX = 4,327 @@ -27,7 +26,6 @@ Name = SuperShiny Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 3,327 SetY = 3,78 SetX = 4,366 @@ -41,7 +39,6 @@ Name = SuperShiny Graphic = leech-seed Focus = Target - SetVisible = 0,true SetX = 5,416 SetY = 5,54 SetX = 6,368 @@ -53,7 +50,6 @@ Name = SuperShiny Focus = Target SetX = 0,360 SetY = 0,110 - SetVisible = 0,true SetX = 4,440 SetY = 4,126 SetX = 6,327 diff --git a/PBS/Animations/Converted/Common/Toxic.txt b/PBS/Animations/Converted/Common/Toxic.txt index 2118dde8e..c9c13427d 100644 --- a/PBS/Animations/Converted/Common/Toxic.txt +++ b/PBS/Animations/Converted/Common/Toxic.txt @@ -11,7 +11,6 @@ Name = Toxic Graphic = State1 Focus = Target - SetVisible = 0,true SetX = 1,384 SetY = 1,86 diff --git a/PBS/Animations/Converted/Common/Wrap.txt b/PBS/Animations/Converted/Common/Wrap.txt index 3859df54b..ed3678e7e 100644 --- a/PBS/Animations/Converted/Common/Wrap.txt +++ b/PBS/Animations/Converted/Common/Wrap.txt @@ -13,7 +13,6 @@ Name = Wrap Focus = Target SetX = 0,440 SetY = 0,102 - SetVisible = 0,true SetX = 1,480 SetY = 1,94 SetX = 2,488 @@ -30,7 +29,6 @@ Name = Wrap Focus = Target SetX = 0,320 SetY = 0,102 - SetVisible = 0,true SetX = 1,288 SetY = 1,94 SetX = 2,240 diff --git a/PBS/Animations/Converted/Move/ABSORB.txt b/PBS/Animations/Converted/Move/ABSORB.txt index a043a9215..f7e9d431f 100644 --- a/PBS/Animations/Converted/Move/ABSORB.txt +++ b/PBS/Animations/Converted/Move/ABSORB.txt @@ -13,7 +13,6 @@ Name = ABSORB Focus = UserAndTarget SetX = 0,358 SetY = 0,91 - SetVisible = 0,true SetX = 1,300 SetY = 1,98 SetX = 2,198 @@ -51,7 +50,6 @@ Name = ABSORB Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,396 SetY = 1,104 SetX = 2,364 @@ -87,7 +85,6 @@ Name = ABSORB Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,364 SetY = 1,85 SetX = 2,300 @@ -119,7 +116,6 @@ Name = ABSORB Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,384 SetY = 2,91 SetX = 3,345 @@ -145,7 +141,6 @@ Name = ABSORB Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,345 SetY = 2,85 SetX = 3,307 @@ -164,7 +159,6 @@ Name = ABSORB Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,390 SetY = 3,110 SetX = 4,371 @@ -174,7 +168,6 @@ Name = ABSORB Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,345 SetY = 4,91 SetX = 5,364 diff --git a/PBS/Animations/Converted/Move/ACID.txt b/PBS/Animations/Converted/Move/ACID.txt index eb44a3ac3..5ac855e08 100644 --- a/PBS/Animations/Converted/Move/ACID.txt +++ b/PBS/Animations/Converted/Move/ACID.txt @@ -11,7 +11,6 @@ Name = ACID Graphic = poison2 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,147 SetY = 1,211 SetX = 2,172 @@ -26,7 +25,6 @@ Name = ACID Graphic = poison2 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,153 SetY = 3,211 SetX = 4,204 @@ -38,7 +36,6 @@ Name = ACID Focus = UserAndTarget SetX = 0,147 SetY = 0,211 - SetVisible = 0,true SetX = 1,179 SetY = 1,161 SetX = 2,217 diff --git a/PBS/Animations/Converted/Move/ACIDARMOR.txt b/PBS/Animations/Converted/Move/ACIDARMOR.txt index b2cb5a71d..8b24cdd04 100644 --- a/PBS/Animations/Converted/Move/ACIDARMOR.txt +++ b/PBS/Animations/Converted/Move/ACIDARMOR.txt @@ -13,7 +13,6 @@ Name = ACIDARMOR Focus = Target SetX = 0,392 SetY = 0,94 - SetVisible = 0,true SetX = 4,400 SetY = 4,86 SetX = 5,392 diff --git a/PBS/Animations/Converted/Move/ACIDSPRAY.txt b/PBS/Animations/Converted/Move/ACIDSPRAY.txt index fa4fb5cab..57bf69718 100644 --- a/PBS/Animations/Converted/Move/ACIDSPRAY.txt +++ b/PBS/Animations/Converted/Move/ACIDSPRAY.txt @@ -15,7 +15,6 @@ Name = ACIDSPRAY SetY = 0,8 SetZoomX = 0,85 SetZoomY = 0,85 - SetVisible = 0,true SetY = 1,17 SetX = 3,335 SetY = 3,48 @@ -35,7 +34,6 @@ Name = ACIDSPRAY Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,366 SetY = 1,8 SetZoomX = 1,85 @@ -57,7 +55,6 @@ Name = ACIDSPRAY Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,394 SetY = 1,17 SetZoomX = 1,85 @@ -78,7 +75,6 @@ Name = ACIDSPRAY Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 2,418 SetY = 2,9 SetZoomX = 2,85 @@ -101,7 +97,6 @@ Name = ACIDSPRAY Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 2,441 SetY = 2,12 SetZoomX = 2,85 @@ -123,7 +118,6 @@ Name = ACIDSPRAY Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 5,361 SetY = 5,86 SetZoomX = 5,85 diff --git a/PBS/Animations/Converted/Move/ACROBATICS.txt b/PBS/Animations/Converted/Move/ACROBATICS.txt index 9edff535c..7c8abd8c3 100644 --- a/PBS/Animations/Converted/Move/ACROBATICS.txt +++ b/PBS/Animations/Converted/Move/ACROBATICS.txt @@ -11,7 +11,6 @@ Name = ACROBATICS Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 2,376 SetY = 2,133 SetZoomX = 2,41 @@ -31,7 +30,6 @@ Name = ACROBATICS SetY = 0,86 SetZoomX = 0,25 SetZoomY = 0,25 - SetVisible = 0,true SetZoomX = 1,47 SetZoomY = 1,47 SetZoomX = 3,70 diff --git a/PBS/Animations/Converted/Move/ACUPRESSURE.txt b/PBS/Animations/Converted/Move/ACUPRESSURE.txt index 7fe639f06..7c385096c 100644 --- a/PBS/Animations/Converted/Move/ACUPRESSURE.txt +++ b/PBS/Animations/Converted/Move/ACUPRESSURE.txt @@ -13,7 +13,6 @@ Name = ACUPRESSURE Focus = Target SetX = 0,399 SetY = 0,93 - SetVisible = 0,true SetX = 1,397 SetY = 1,94 SetX = 2,395 @@ -31,7 +30,6 @@ Name = ACUPRESSURE Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 4,385 SetY = 4,84 SetX = 5,389 @@ -43,7 +41,6 @@ Name = ACUPRESSURE Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 5,367 SetY = 5,127 SetX = 6,369 @@ -55,7 +52,6 @@ Name = ACUPRESSURE Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 6,427 SetY = 6,92 SetX = 7,449 @@ -65,32 +61,27 @@ Name = ACUPRESSURE Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 7,428 SetY = 7,91 SetY = 8,90 Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 8,430 SetY = 8,92 Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 8,445 SetY = 8,115 Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 8,368 SetY = 8,121 Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 8,395 SetY = 8,80 diff --git a/PBS/Animations/Converted/Move/AERIALACE.txt b/PBS/Animations/Converted/Move/AERIALACE.txt index 17cb1aa7b..05f7a1772 100644 --- a/PBS/Animations/Converted/Move/AERIALACE.txt +++ b/PBS/Animations/Converted/Move/AERIALACE.txt @@ -17,7 +17,6 @@ Name = AERIALACE Focus = Target SetX = 0,468 SetY = 0,46 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,76 SetY = 1,230 @@ -53,7 +52,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 1,442 SetY = 1,71 SetToneRed = 1,-37 @@ -84,7 +82,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 2,411 SetY = 2,98 SetToneRed = 2,-74 @@ -117,7 +114,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 3,371 SetY = 3,137 SetX = 4,100 @@ -142,7 +138,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 5,100 SetY = 5,272 SetOpacity = 5,85 @@ -162,7 +157,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 6,410 SetY = 6,109 SetOpacity = 6,128 @@ -179,7 +173,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 6,408 SetY = 6,125 SetOpacity = 6,128 @@ -193,7 +186,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 6,363 SetY = 6,112 SetOpacity = 6,128 @@ -207,7 +199,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 7,432 SetY = 7,86 SetX = 8,455 @@ -234,7 +225,6 @@ Name = AERIALACE Focus = User SetX = 0,229 SetY = 0,168 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,209 SetY = 1,185 @@ -246,7 +236,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 1,333 SetY = 1,114 SetOpacity = 2,170 @@ -259,7 +248,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = User - SetVisible = 0,true SetX = 2,368 SetY = 2,140 SetX = 3,418 @@ -286,7 +274,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = Target - SetVisible = 0,true SetX = 3,368 SetY = 3,140 SetOpacity = 3,170 @@ -296,7 +283,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = User - SetVisible = 0,true SetX = 5,158 SetY = 5,237 SetOpacity = 5,128 @@ -315,7 +301,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = User - SetVisible = 0,true SetX = 5,125 SetY = 5,227 SetOpacity = 5,128 @@ -335,7 +320,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = User - SetVisible = 0,true SetX = 5,101 SetY = 5,250 SetOpacity = 5,128 @@ -357,7 +341,6 @@ Name = AERIALACE Graphic = Aerial Ace Focus = User - SetVisible = 0,true SetX = 5,147 SetY = 5,274 SetOpacity = 5,128 diff --git a/PBS/Animations/Converted/Move/AGILITY.txt b/PBS/Animations/Converted/Move/AGILITY.txt index bae4af56a..ee99355e8 100644 --- a/PBS/Animations/Converted/Move/AGILITY.txt +++ b/PBS/Animations/Converted/Move/AGILITY.txt @@ -14,7 +14,6 @@ Name = AGILITY SetX = 0,30 SetY = 0,188 SetAngle = 0,90 - SetVisible = 0,true SetX = 1,55 SetX = 2,80 SetX = 3,110 @@ -30,7 +29,6 @@ Name = AGILITY SetX = 0,75 SetY = 0,131 SetAngle = 0,90 - SetVisible = 0,true SetX = 1,105 SetX = 2,140 SetX = 3,175 @@ -41,7 +39,6 @@ Name = AGILITY Graphic = ! Focus = User - SetVisible = 0,true SetX = 1,40 SetY = 1,273 SetAngle = 1,90 @@ -56,7 +53,6 @@ Name = AGILITY Graphic = ! Focus = User - SetVisible = 0,true SetX = 2,30 SetY = 2,144 SetAngle = 2,90 @@ -73,7 +69,6 @@ Name = AGILITY SetX = 0,52 SetY = 0,237 SetAngle = 0,90 - SetVisible = 0,true SetX = 1,82 SetX = 2,112 SetX = 3,142 diff --git a/PBS/Animations/Converted/Move/ALLYSWITCH.txt b/PBS/Animations/Converted/Move/ALLYSWITCH.txt index 032ca80f7..50ce77018 100644 --- a/PBS/Animations/Converted/Move/ALLYSWITCH.txt +++ b/PBS/Animations/Converted/Move/ALLYSWITCH.txt @@ -13,7 +13,6 @@ Name = ALLYSWITCH Focus = User SetX = 0,137 SetY = 0,222 - SetVisible = 0,true SetX = 1,139 SetY = 1,224 SetX = 2,137 diff --git a/PBS/Animations/Converted/Move/AMNESIA.txt b/PBS/Animations/Converted/Move/AMNESIA.txt index 950913c9a..bb9d7a75e 100644 --- a/PBS/Animations/Converted/Move/AMNESIA.txt +++ b/PBS/Animations/Converted/Move/AMNESIA.txt @@ -13,7 +13,6 @@ Name = AMNESIA Focus = Target SetX = 0,428 SetY = 0,80 - SetVisible = 0,true SetOpacity = 0,200 SetOpacity = 1,220 SetOpacity = 2,250 diff --git a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt index 6d3e30c2e..b76bd1959 100644 --- a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt +++ b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt @@ -13,7 +13,6 @@ Name = ANCIENTPOWER Focus = UserAndTarget SetX = 0,39 SetY = 0,228 - SetVisible = 0,true SetX = 1,43 SetY = 1,205 SetX = 2,53 @@ -59,7 +58,6 @@ Name = ANCIENTPOWER Focus = UserAndTarget SetX = 0,305 SetY = 0,244 - SetVisible = 0,true SetX = 1,304 SetY = 1,212 SetX = 2,300 @@ -98,7 +96,6 @@ Name = ANCIENTPOWER Focus = UserAndTarget SetX = 0,140 SetY = 0,275 - SetVisible = 0,true SetY = 1,251 SetX = 2,139 SetY = 2,236 @@ -139,7 +136,6 @@ Name = ANCIENTPOWER Graphic = Ancient-PowerFilesheet Focus = UserAndTarget - SetVisible = 0,true SetX = 6,72 SetY = 6,235 SetY = 7,211 @@ -179,7 +175,6 @@ Name = ANCIENTPOWER Graphic = Ancient-PowerFilesheet Focus = UserAndTarget - SetVisible = 0,true SetX = 6,240 SetY = 6,241 SetY = 7,217 @@ -210,7 +205,6 @@ Name = ANCIENTPOWER Graphic = Ancient-PowerFilesheet Focus = UserAndTarget - SetVisible = 0,true SetX = 6,160 SetY = 6,265 SetY = 7,241 @@ -248,7 +242,6 @@ Name = ANCIENTPOWER Graphic = Ancient-PowerFilesheet Focus = UserAndTarget - SetVisible = 0,true SetX = 8,184 SetY = 8,221 SetY = 9,197 @@ -278,7 +271,6 @@ Name = ANCIENTPOWER Graphic = Ancient-PowerFilesheet Focus = UserAndTarget - SetVisible = 0,true SetX = 10,184 SetY = 10,280 SetY = 11,248 diff --git a/PBS/Animations/Converted/Move/AQUARING.txt b/PBS/Animations/Converted/Move/AQUARING.txt index 535c45261..255a36b67 100644 --- a/PBS/Animations/Converted/Move/AQUARING.txt +++ b/PBS/Animations/Converted/Move/AQUARING.txt @@ -11,7 +11,6 @@ Name = AQUARING Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 2,389 SetY = 2,108 SetX = 3,387 @@ -23,7 +22,6 @@ Name = AQUARING Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 3,396 SetY = 3,111 SetX = 4,374 @@ -33,13 +31,11 @@ Name = AQUARING Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 4,380 SetY = 4,94 Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 4,386 SetY = 4,104 @@ -47,7 +43,6 @@ Name = AQUARING Focus = UserAndTarget SetX = 0,394 SetY = 0,105 - SetVisible = 0,true SetX = 1,395 SetY = 1,107 SetX = 2,388 diff --git a/PBS/Animations/Converted/Move/AROMATHERAPY.txt b/PBS/Animations/Converted/Move/AROMATHERAPY.txt index 7e25e5d70..bd41c83cd 100644 --- a/PBS/Animations/Converted/Move/AROMATHERAPY.txt +++ b/PBS/Animations/Converted/Move/AROMATHERAPY.txt @@ -13,7 +13,6 @@ Name = AROMATHERAPY Focus = Screen SetX = 0,608 SetY = 0,-50 - SetVisible = 0,true SetX = 1,560 SetY = 1,-2 SetX = 2,496 @@ -35,7 +34,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 1,664 SetY = 1,22 SetX = 2,608 @@ -57,7 +55,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 2,584 SetY = 2,-34 SetX = 3,528 @@ -75,7 +72,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 2,464 SetY = 2,-42 SetX = 3,408 @@ -91,7 +87,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 3,672 SetY = 3,46 SetX = 4,544 @@ -105,7 +100,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 3,664 SetY = 3,118 SetX = 4,616 @@ -119,7 +113,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 3,640 SetY = 3,-26 SetX = 4,576 @@ -130,7 +123,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 4,336 SetY = 4,-26 SetX = 5,184 @@ -140,7 +132,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 5,680 SetY = 5,30 SetX = 6,504 @@ -148,7 +139,6 @@ Name = AROMATHERAPY Graphic = Anima (1) Focus = Screen - SetVisible = 0,true SetX = 5,552 SetY = 5,-26 SetX = 6,368 diff --git a/PBS/Animations/Converted/Move/AURORABEAM.txt b/PBS/Animations/Converted/Move/AURORABEAM.txt index 635dbd6df..bcf4d9c11 100644 --- a/PBS/Animations/Converted/Move/AURORABEAM.txt +++ b/PBS/Animations/Converted/Move/AURORABEAM.txt @@ -13,7 +13,6 @@ Name = AURORABEAM Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,313 SetY = 1,186 SetZoomX = 1,50 @@ -52,7 +51,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,102 SetY = 1,72 SetZoomX = 1,50 @@ -89,7 +87,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,128 SetY = 1,236 SetX = 2,192 @@ -118,7 +115,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,128 SetY = 2,236 SetX = 3,179 @@ -139,7 +135,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,64 SetY = 2,66 SetZoomX = 2,50 @@ -161,7 +156,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,345 SetY = 2,236 SetZoomX = 2,50 @@ -178,7 +172,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = User - SetVisible = 0,true SetX = 2,313 SetY = 2,110 SetZoomX = 2,50 @@ -190,7 +183,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = User - SetVisible = 0,true SetX = 3,115 SetY = 3,148 SetZoomX = 3,50 @@ -200,7 +192,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = User - SetVisible = 0,true SetX = 3,326 SetY = 3,224 SetZoomX = 3,50 @@ -210,7 +201,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = User - SetVisible = 0,true SetX = 3,262 SetY = 3,148 SetZoomX = 3,50 @@ -219,7 +209,6 @@ Name = AURORABEAM Graphic = 023-Burst01 Focus = User - SetVisible = 0,true SetX = 4,339 SetY = 4,236 SetZoomX = 4,50 diff --git a/PBS/Animations/Converted/Move/BARRIER.txt b/PBS/Animations/Converted/Move/BARRIER.txt index d2c036b2d..fd453db3d 100644 --- a/PBS/Animations/Converted/Move/BARRIER.txt +++ b/PBS/Animations/Converted/Move/BARRIER.txt @@ -11,7 +11,6 @@ Name = BARRIER Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 1,356 SetY = 1,65 SetX = 2,437 @@ -33,7 +32,6 @@ Name = BARRIER Focus = Target SetX = 0,392 SetY = 0,95 - SetVisible = 0,true SetOpacity = 0,154 SetX = 1,393 SetY = 1,90 diff --git a/PBS/Animations/Converted/Move/BEATUP.txt b/PBS/Animations/Converted/Move/BEATUP.txt index ef260272a..ae35e324f 100644 --- a/PBS/Animations/Converted/Move/BEATUP.txt +++ b/PBS/Animations/Converted/Move/BEATUP.txt @@ -15,7 +15,6 @@ Name = BEATUP SetY = 0,86 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetOpacity = 0,150 SetZoomX = 1,100 SetZoomY = 1,100 @@ -26,7 +25,6 @@ Name = BEATUP Graphic = many Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,86 SetOpacity = 1,100 @@ -49,7 +47,6 @@ Name = Beat Up hit 2 Graphic = many Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,86 SetOpacity = 1,100 @@ -65,7 +62,6 @@ Name = Beat Up hit 2 SetY = 0,86 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetOpacity = 0,150 SetZoomX = 1,100 SetZoomY = 1,100 @@ -91,7 +87,6 @@ Name = Beat Up hit 3 SetY = 0,86 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetOpacity = 0,150 SetZoomX = 1,100 SetZoomY = 1,100 @@ -102,7 +97,6 @@ Name = Beat Up hit 3 Graphic = many Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,86 SetOpacity = 1,100 @@ -125,7 +119,6 @@ Name = Beat Up hit 4 Graphic = many Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,86 SetOpacity = 1,100 @@ -141,7 +134,6 @@ Name = Beat Up hit 4 SetY = 0,86 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetOpacity = 0,150 SetZoomX = 1,100 SetZoomY = 1,100 @@ -167,7 +159,6 @@ Name = Beat Up hit 5 SetY = 0,86 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetOpacity = 0,150 SetZoomX = 1,100 SetZoomY = 1,100 @@ -178,7 +169,6 @@ Name = Beat Up hit 5 Graphic = many Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,86 SetOpacity = 1,100 @@ -201,7 +191,6 @@ Name = Beat Up hit 6 Graphic = many Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,86 SetOpacity = 1,100 @@ -217,7 +206,6 @@ Name = Beat Up hit 6 SetY = 0,86 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetOpacity = 0,150 SetZoomX = 1,100 SetZoomY = 1,100 diff --git a/PBS/Animations/Converted/Move/BIND.txt b/PBS/Animations/Converted/Move/BIND.txt index 6b773d2c4..3a943da03 100644 --- a/PBS/Animations/Converted/Move/BIND.txt +++ b/PBS/Animations/Converted/Move/BIND.txt @@ -13,7 +13,6 @@ Name = BIND Focus = Target SetX = 0,440 SetY = 0,102 - SetVisible = 0,true SetX = 1,480 SetY = 1,94 SetX = 2,488 @@ -30,7 +29,6 @@ Name = BIND Focus = Target SetX = 0,320 SetY = 0,102 - SetVisible = 0,true SetX = 1,288 SetY = 1,94 SetX = 2,240 diff --git a/PBS/Animations/Converted/Move/BITE.txt b/PBS/Animations/Converted/Move/BITE.txt index 70f19d810..1c784e0c3 100644 --- a/PBS/Animations/Converted/Move/BITE.txt +++ b/PBS/Animations/Converted/Move/BITE.txt @@ -13,7 +13,6 @@ Name = BITE Focus = Target SetX = 0,386 SetY = 0,96 - SetVisible = 0,true SetOpacity = 0,128 SetOpacity = 2,192 SetX = 3,385 diff --git a/PBS/Animations/Converted/Move/BLASTBURN.txt b/PBS/Animations/Converted/Move/BLASTBURN.txt index 53f0b8c02..b2a9b8fc8 100644 --- a/PBS/Animations/Converted/Move/BLASTBURN.txt +++ b/PBS/Animations/Converted/Move/BLASTBURN.txt @@ -13,7 +13,6 @@ Name = BLASTBURN Focus = Target SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetFlip = 1,true SetAngle = 1,20 SetX = 2,160 @@ -62,7 +61,6 @@ Name = BLASTBURN Graphic = Firebird Focus = Target - SetVisible = 0,true SetFlip = 5,true SetX = 5,358 SetY = 5,110 @@ -102,7 +100,6 @@ Name = BLASTBURN Graphic = Firebird Focus = Target - SetVisible = 0,true SetX = 6,358 SetY = 6,123 SetX = 7,390 @@ -132,7 +129,6 @@ Name = BLASTBURN Graphic = Firebird Focus = Target - SetVisible = 0,true SetX = 7,364 SetY = 7,154 SetX = 9,326 @@ -153,7 +149,6 @@ Name = BLASTBURN Graphic = Firebird Focus = Target - SetVisible = 0,true SetX = 9,384 SetY = 9,91 SetX = 10,345 @@ -172,7 +167,6 @@ Name = BLASTBURN Graphic = Firebird Focus = Target - SetVisible = 0,true SetX = 9,441 SetY = 9,167 SetX = 10,339 @@ -187,7 +181,6 @@ Name = BLASTBURN Graphic = Firebird Focus = Target - SetVisible = 0,true SetX = 10,371 SetY = 10,66 SetX = 11,320 @@ -200,7 +193,6 @@ Name = BLASTBURN Graphic = Firebird Focus = Target - SetVisible = 0,true SetX = 10,339 SetY = 10,179 diff --git a/PBS/Animations/Converted/Move/BLOCK.txt b/PBS/Animations/Converted/Move/BLOCK.txt index 29e8b9088..fbfdf533f 100644 --- a/PBS/Animations/Converted/Move/BLOCK.txt +++ b/PBS/Animations/Converted/Move/BLOCK.txt @@ -13,6 +13,5 @@ Name = BLOCK Focus = Target SetX = 0,385 SetY = 0,96 - SetVisible = 0,true Play = 0,buzzer,80,100 diff --git a/PBS/Animations/Converted/Move/BLUEFLARE.txt b/PBS/Animations/Converted/Move/BLUEFLARE.txt index b06b53173..905b8c7c1 100644 --- a/PBS/Animations/Converted/Move/BLUEFLARE.txt +++ b/PBS/Animations/Converted/Move/BLUEFLARE.txt @@ -13,7 +13,6 @@ Name = BLUEFLARE Focus = Target SetX = 0,382 SetY = 0,103 - SetVisible = 0,true SetX = 1,379 SetY = 1,93 SetX = 2,384 diff --git a/PBS/Animations/Converted/Move/BODYSLAM.txt b/PBS/Animations/Converted/Move/BODYSLAM.txt index 4b8192cef..4d6e3b6c1 100644 --- a/PBS/Animations/Converted/Move/BODYSLAM.txt +++ b/PBS/Animations/Converted/Move/BODYSLAM.txt @@ -13,6 +13,5 @@ Name = BODYSLAM Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Damage1,80,100 diff --git a/PBS/Animations/Converted/Move/BRICKBREAK.txt b/PBS/Animations/Converted/Move/BRICKBREAK.txt index f0f1063e6..0116ba4c2 100644 --- a/PBS/Animations/Converted/Move/BRICKBREAK.txt +++ b/PBS/Animations/Converted/Move/BRICKBREAK.txt @@ -13,7 +13,6 @@ Name = BRICKBREAK Focus = Target SetX = 0,296 SetY = 0,38 - SetVisible = 0,true SetX = 1,320 SetAngle = 1,345 SetX = 2,352 diff --git a/PBS/Animations/Converted/Move/BUBBLE.txt b/PBS/Animations/Converted/Move/BUBBLE.txt index da11ec2ca..8936ab239 100644 --- a/PBS/Animations/Converted/Move/BUBBLE.txt +++ b/PBS/Animations/Converted/Move/BUBBLE.txt @@ -13,7 +13,6 @@ Name = BUBBLE Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,153 SetY = 1,224 SetX = 2,198 @@ -39,7 +38,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,134 SetY = 1,217 SetX = 2,153 @@ -65,7 +63,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,128 SetY = 1,236 SetX = 2,179 @@ -90,7 +87,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,128 SetY = 2,236 SetX = 3,166 @@ -115,7 +111,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,140 SetY = 3,211 SetX = 4,211 @@ -135,7 +130,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetX = 4,179 @@ -155,7 +149,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,166 SetY = 4,186 SetX = 5,192 @@ -171,7 +164,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,128 SetY = 5,236 SetX = 6,230 @@ -183,7 +175,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 6,160 SetY = 6,236 SetX = 7,217 @@ -195,7 +186,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 6,352 SetY = 6,85 SetOpacity = 6,100 @@ -213,7 +203,6 @@ Name = BUBBLE Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 8,358 SetY = 8,91 SetOpacity = 8,100 diff --git a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt index e143f6567..3b61e820a 100644 --- a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt +++ b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt @@ -13,7 +13,6 @@ Name = BUBBLEBEAM Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,179 SetY = 1,205 SetX = 2,243 @@ -46,7 +45,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,140 SetY = 1,186 SetX = 2,192 @@ -77,7 +75,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,192 SetY = 1,179 SetX = 2,204 @@ -108,7 +105,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,128 SetY = 2,236 SetX = 3,262 @@ -137,7 +133,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,211 SetX = 3,198 @@ -165,7 +160,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,275 SetY = 3,154 SetX = 4,313 @@ -193,7 +187,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,211 SetY = 3,161 SetX = 4,198 @@ -215,7 +208,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,160 SetY = 3,217 SetX = 4,275 @@ -241,7 +233,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,185 SetY = 4,186 SetX = 5,230 @@ -263,7 +254,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,172 SetY = 4,224 SetX = 5,313 @@ -282,7 +272,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,288 SetY = 4,211 SetX = 5,281 @@ -301,7 +290,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,243 SetY = 4,211 SetX = 5,134 @@ -321,7 +309,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,217 SetY = 4,129 SetY = 5,211 @@ -340,7 +327,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,288 SetY = 4,179 SetX = 5,371 @@ -359,7 +345,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 6,185 SetY = 6,236 SetX = 7,249 @@ -373,7 +358,6 @@ Name = BUBBLEBEAM Graphic = 018-Water01 Focus = UserAndTarget - SetVisible = 0,true SetX = 6,307 SetY = 6,186 SetX = 7,326 diff --git a/PBS/Animations/Converted/Move/BULKUP.txt b/PBS/Animations/Converted/Move/BULKUP.txt index 92604056c..fd72ed3dc 100644 --- a/PBS/Animations/Converted/Move/BULKUP.txt +++ b/PBS/Animations/Converted/Move/BULKUP.txt @@ -13,7 +13,6 @@ Name = BULKUP Focus = Target SetX = 0,344 SetY = 0,102 - SetVisible = 0,true SetOpacity = 0,200 SetY = 1,94 SetOpacity = 1,150 @@ -42,7 +41,6 @@ Name = BULKUP Focus = Target SetX = 0,464 SetY = 0,102 - SetVisible = 0,true SetOpacity = 0,200 SetY = 1,94 SetOpacity = 1,150 diff --git a/PBS/Animations/Converted/Move/BULLETPUNCH.txt b/PBS/Animations/Converted/Move/BULLETPUNCH.txt index 0d964e561..cce126307 100644 --- a/PBS/Animations/Converted/Move/BULLETPUNCH.txt +++ b/PBS/Animations/Converted/Move/BULLETPUNCH.txt @@ -13,7 +13,6 @@ Name = BULLETPUNCH Focus = Target SetX = 0,386 SetY = 0,99 - SetVisible = 0,true SetX = 1,391 SetY = 1,95 SetX = 2,403 @@ -46,7 +45,6 @@ Name = BULLETPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,426 SetY = 2,69 SetX = 4,372 @@ -58,7 +56,6 @@ Name = BULLETPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,405 SetY = 2,67 SetX = 4,352 @@ -72,7 +69,6 @@ Name = BULLETPUNCH Focus = Target SetX = 0,398 SetY = 0,100 - SetVisible = 0,true SetX = 1,406 SetY = 1,95 SetX = 2,384 diff --git a/PBS/Animations/Converted/Move/BULLETSEED.txt b/PBS/Animations/Converted/Move/BULLETSEED.txt index ed67310f3..a6702f39c 100644 --- a/PBS/Animations/Converted/Move/BULLETSEED.txt +++ b/PBS/Animations/Converted/Move/BULLETSEED.txt @@ -13,7 +13,6 @@ Name = BULLETSEED Focus = UserAndTarget SetX = 0,160 SetY = 0,198 - SetVisible = 0,true SetX = 1,211 SetY = 1,173 SetX = 2,249 @@ -38,7 +37,6 @@ Name = BULLETSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -60,7 +58,6 @@ Name = BULLETSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,172 SetY = 2,198 SetX = 3,211 @@ -76,7 +73,6 @@ Name = BULLETSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,172 SetY = 3,205 SetX = 4,217 @@ -89,7 +85,6 @@ Name = BULLETSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,179 SetY = 4,217 SetX = 5,217 @@ -116,7 +111,6 @@ Name = Bullet Seed hit 2 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,179 SetY = 4,217 SetX = 5,217 @@ -128,7 +122,6 @@ Name = Bullet Seed hit 2 Focus = UserAndTarget SetX = 0,160 SetY = 0,198 - SetVisible = 0,true SetX = 1,211 SetY = 1,173 SetX = 2,249 @@ -153,7 +146,6 @@ Name = Bullet Seed hit 2 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -175,7 +167,6 @@ Name = Bullet Seed hit 2 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,172 SetY = 2,198 SetX = 3,211 @@ -191,7 +182,6 @@ Name = Bullet Seed hit 2 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,172 SetY = 3,205 SetX = 4,217 @@ -221,7 +211,6 @@ Name = Bullet Seed hit 3 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,172 SetY = 3,205 SetX = 4,217 @@ -234,7 +223,6 @@ Name = Bullet Seed hit 3 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,179 SetY = 4,217 SetX = 5,217 @@ -246,7 +234,6 @@ Name = Bullet Seed hit 3 Focus = UserAndTarget SetX = 0,160 SetY = 0,198 - SetVisible = 0,true SetX = 1,211 SetY = 1,173 SetX = 2,249 @@ -271,7 +258,6 @@ Name = Bullet Seed hit 3 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -293,7 +279,6 @@ Name = Bullet Seed hit 3 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,172 SetY = 2,198 SetX = 3,211 @@ -326,7 +311,6 @@ Name = Bullet Seed hit 4 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,172 SetY = 2,198 SetX = 3,211 @@ -342,7 +326,6 @@ Name = Bullet Seed hit 4 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,172 SetY = 3,205 SetX = 4,217 @@ -355,7 +338,6 @@ Name = Bullet Seed hit 4 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,179 SetY = 4,217 SetX = 5,217 @@ -367,7 +349,6 @@ Name = Bullet Seed hit 4 Focus = UserAndTarget SetX = 0,160 SetY = 0,198 - SetVisible = 0,true SetX = 1,211 SetY = 1,173 SetX = 2,249 @@ -392,7 +373,6 @@ Name = Bullet Seed hit 4 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -431,7 +411,6 @@ Name = Bullet Seed hit 5 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -453,7 +432,6 @@ Name = Bullet Seed hit 5 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,172 SetY = 2,198 SetX = 3,211 @@ -469,7 +447,6 @@ Name = Bullet Seed hit 5 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,172 SetY = 3,205 SetX = 4,217 @@ -482,7 +459,6 @@ Name = Bullet Seed hit 5 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,179 SetY = 4,217 SetX = 5,217 @@ -494,7 +470,6 @@ Name = Bullet Seed hit 5 Focus = UserAndTarget SetX = 0,160 SetY = 0,198 - SetVisible = 0,true SetX = 1,211 SetY = 1,173 SetX = 2,249 diff --git a/PBS/Animations/Converted/Move/CHARGE.txt b/PBS/Animations/Converted/Move/CHARGE.txt index d593e3dcc..756810b36 100644 --- a/PBS/Animations/Converted/Move/CHARGE.txt +++ b/PBS/Animations/Converted/Move/CHARGE.txt @@ -13,7 +13,6 @@ Name = CHARGE Focus = User SetX = 0,328 SetY = 0,238 - SetVisible = 0,true SetX = 1,296 SetX = 2,216 SetY = 2,230 @@ -32,7 +31,6 @@ Name = CHARGE Graphic = electric2 Focus = User - SetVisible = 0,true SetX = 1,-32 SetY = 1,230 SetX = 2,0 @@ -53,7 +51,6 @@ Name = CHARGE Graphic = electric2 Focus = User - SetVisible = 0,true SetX = 3,328 SetY = 3,238 SetX = 4,280 @@ -71,7 +68,6 @@ Name = CHARGE Graphic = electric2 Focus = User - SetVisible = 0,true SetX = 4,-72 SetY = 4,238 SetX = 5,-24 @@ -83,7 +79,6 @@ Name = CHARGE Graphic = electric2 Focus = User - SetVisible = 0,true SetX = 5,344 SetY = 5,246 SetX = 6,304 @@ -94,7 +89,6 @@ Name = CHARGE Graphic = electric2 Focus = User - SetVisible = 0,true SetX = 7,176 SetY = 7,286 diff --git a/PBS/Animations/Converted/Move/CHARM.txt b/PBS/Animations/Converted/Move/CHARM.txt index 517d67946..30fb19aa7 100644 --- a/PBS/Animations/Converted/Move/CHARM.txt +++ b/PBS/Animations/Converted/Move/CHARM.txt @@ -11,7 +11,6 @@ Name = CHARM Graphic = electric2 Focus = Target - SetVisible = 0,true SetX = 2,440 SetY = 2,142 SetX = 3,432 @@ -25,7 +24,6 @@ Name = CHARM Graphic = electric2 Focus = Target - SetVisible = 0,true SetX = 5,376 SetY = 5,102 @@ -33,7 +31,6 @@ Name = CHARM Focus = Target SetX = 0,336 SetY = 0,126 - SetVisible = 0,true SetX = 1,344 SetY = 1,118 SetX = 2,352 diff --git a/PBS/Animations/Converted/Move/CLEARSMOG.txt b/PBS/Animations/Converted/Move/CLEARSMOG.txt index 535bebd48..3eece1025 100644 --- a/PBS/Animations/Converted/Move/CLEARSMOG.txt +++ b/PBS/Animations/Converted/Move/CLEARSMOG.txt @@ -13,7 +13,6 @@ Name = CLEARSMOG Focus = UserAndTarget SetX = 0,384 SetY = 0,98 - SetVisible = 0,true SetX = 2,385 SetY = 2,95 SetY = 3,98 diff --git a/PBS/Animations/Converted/Move/CLOSECOMBAT.txt b/PBS/Animations/Converted/Move/CLOSECOMBAT.txt index e705bc9a1..6a107c3a0 100644 --- a/PBS/Animations/Converted/Move/CLOSECOMBAT.txt +++ b/PBS/Animations/Converted/Move/CLOSECOMBAT.txt @@ -11,7 +11,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 4,383 SetY = 4,57 SetOpacity = 4,47 @@ -40,7 +39,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 1,361 SetY = 1,125 SetX = 2,344 @@ -77,7 +75,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 1,332 SetY = 1,147 SetX = 2,370 @@ -112,7 +109,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 1,353 SetY = 1,137 SetX = 2,361 @@ -140,7 +136,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 2,417 SetY = 2,104 SetX = 3,374 @@ -164,7 +159,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 2,379 SetY = 2,83 SetX = 3,421 @@ -188,7 +182,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 2,400 SetY = 2,94 SetX = 3,397 @@ -202,7 +195,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 3,413 SetY = 3,138 SetX = 4,369 @@ -212,7 +204,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 3,377 SetY = 3,126 SetX = 4,359 @@ -222,7 +213,6 @@ Name = CLOSECOMBAT Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 3,399 SetY = 3,127 diff --git a/PBS/Animations/Converted/Move/COMETPUNCH.txt b/PBS/Animations/Converted/Move/COMETPUNCH.txt index 46bbfe90f..bed99c4cc 100644 --- a/PBS/Animations/Converted/Move/COMETPUNCH.txt +++ b/PBS/Animations/Converted/Move/COMETPUNCH.txt @@ -11,7 +11,6 @@ Name = COMETPUNCH Graphic = 003-Attack01 Focus = Target - SetVisible = 0,true SetX = 2,432 SetY = 2,78 SetX = 3,368 @@ -23,7 +22,6 @@ Name = COMETPUNCH Focus = Target SetX = 0,352 SetY = 0,102 - SetVisible = 0,true SetX = 3,432 SetY = 3,78 SetX = 5,368 @@ -48,7 +46,6 @@ Name = Comet Punch hit 2 Focus = Target SetX = 0,352 SetY = 0,102 - SetVisible = 0,true SetX = 3,432 SetY = 3,78 SetX = 5,368 @@ -58,7 +55,6 @@ Name = Comet Punch hit 2 Graphic = 003-Attack01 Focus = Target - SetVisible = 0,true SetX = 2,432 SetY = 2,78 SetX = 3,368 @@ -81,7 +77,6 @@ Name = Comet Punch hit 3 Graphic = 003-Attack01 Focus = Target - SetVisible = 0,true SetX = 2,432 SetY = 2,78 SetX = 3,368 @@ -93,7 +88,6 @@ Name = Comet Punch hit 3 Focus = Target SetX = 0,352 SetY = 0,102 - SetVisible = 0,true SetX = 3,432 SetY = 3,78 SetX = 5,368 @@ -118,7 +112,6 @@ Name = Comet Punch hit 4 Focus = Target SetX = 0,352 SetY = 0,102 - SetVisible = 0,true SetX = 3,432 SetY = 3,78 SetX = 5,368 @@ -128,7 +121,6 @@ Name = Comet Punch hit 4 Graphic = 003-Attack01 Focus = Target - SetVisible = 0,true SetX = 2,432 SetY = 2,78 SetX = 3,368 @@ -151,7 +143,6 @@ Name = Comet Punch hit 5 Graphic = 003-Attack01 Focus = Target - SetVisible = 0,true SetX = 2,432 SetY = 2,78 SetX = 3,368 @@ -163,7 +154,6 @@ Name = Comet Punch hit 5 Focus = Target SetX = 0,352 SetY = 0,102 - SetVisible = 0,true SetX = 3,432 SetY = 3,78 SetX = 5,368 diff --git a/PBS/Animations/Converted/Move/CONFUSERAY.txt b/PBS/Animations/Converted/Move/CONFUSERAY.txt index 984f810b0..516224080 100644 --- a/PBS/Animations/Converted/Move/CONFUSERAY.txt +++ b/PBS/Animations/Converted/Move/CONFUSERAY.txt @@ -13,7 +13,6 @@ Name = CONFUSERAY Focus = UserAndTarget SetX = 0,153 SetY = 0,211 - SetVisible = 0,true SetX = 1,166 SetY = 1,205 SetX = 2,172 diff --git a/PBS/Animations/Converted/Move/COTTONGUARD.txt b/PBS/Animations/Converted/Move/COTTONGUARD.txt index 421b13336..89a63c72d 100644 --- a/PBS/Animations/Converted/Move/COTTONGUARD.txt +++ b/PBS/Animations/Converted/Move/COTTONGUARD.txt @@ -13,7 +13,6 @@ Name = COTTONGUARD Focus = User SetX = 0,113 SetY = 0,263 - SetVisible = 0,true SetX = 1,123 SetY = 1,272 SetX = 2,135 @@ -28,7 +27,6 @@ Name = COTTONGUARD Graphic = animsheet Focus = User - SetVisible = 0,true SetX = 1,156 SetY = 1,258 SetX = 2,166 @@ -44,7 +42,6 @@ Name = COTTONGUARD Graphic = animsheet Focus = User - SetVisible = 0,true SetX = 3,133 SetY = 3,263 SetX = 4,170 @@ -56,7 +53,6 @@ Name = COTTONGUARD Graphic = animsheet Focus = User - SetVisible = 0,true SetX = 3,167 SetY = 3,266 SetX = 4,138 @@ -68,7 +64,6 @@ Name = COTTONGUARD Graphic = animsheet Focus = User - SetVisible = 0,true SetX = 3,176 SetY = 3,220 SetX = 4,190 @@ -80,7 +75,6 @@ Name = COTTONGUARD Graphic = animsheet Focus = User - SetVisible = 0,true SetX = 4,129 SetY = 4,237 diff --git a/PBS/Animations/Converted/Move/COTTONSPORE.txt b/PBS/Animations/Converted/Move/COTTONSPORE.txt index 46a500475..cbf7c77d7 100644 --- a/PBS/Animations/Converted/Move/COTTONSPORE.txt +++ b/PBS/Animations/Converted/Move/COTTONSPORE.txt @@ -13,6 +13,5 @@ Name = COTTONSPORE Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/COUNTER.txt b/PBS/Animations/Converted/Move/COUNTER.txt index e0167d6d8..200e049e4 100644 --- a/PBS/Animations/Converted/Move/COUNTER.txt +++ b/PBS/Animations/Converted/Move/COUNTER.txt @@ -13,7 +13,6 @@ Name = COUNTER Focus = UserAndTarget SetX = 0,384 SetY = 0,98 - SetVisible = 0,true SetX = 1,408 SetY = 1,80 SetZoomX = 1,50 @@ -33,7 +32,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 1,387 SetY = 1,99 SetX = 2,408 @@ -49,7 +47,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 1,352 SetY = 1,99 SetZoomX = 1,50 @@ -65,7 +62,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 2,400 SetY = 2,101 SetZoomX = 2,50 @@ -78,7 +74,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 3,408 SetY = 3,85 SetZoomX = 3,50 @@ -90,7 +85,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 3,386 SetY = 3,98 SetX = 4,384 @@ -101,7 +95,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 4,384 SetY = 4,96 SetX = 5,400 @@ -111,7 +104,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 5,352 SetY = 5,131 SetZoomX = 5,50 @@ -119,7 +111,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 5,376 SetY = 5,26 SetZoomX = 5,50 @@ -127,7 +118,6 @@ Name = COUNTER Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 5,399 SetY = 5,92 diff --git a/PBS/Animations/Converted/Move/CRUNCH.txt b/PBS/Animations/Converted/Move/CRUNCH.txt index a8a99eb00..88bb19b1b 100644 --- a/PBS/Animations/Converted/Move/CRUNCH.txt +++ b/PBS/Animations/Converted/Move/CRUNCH.txt @@ -13,7 +13,6 @@ Name = CRUNCH Focus = Target SetX = 0,396 SetY = 0,97 - SetVisible = 0,true SetX = 1,391 SetY = 1,98 SetX = 2,387 @@ -39,7 +38,6 @@ Name = CRUNCH Graphic = teeth Focus = Target - SetVisible = 0,true SetX = 7,444 SetY = 7,115 SetX = 8,418 @@ -51,7 +49,6 @@ Name = CRUNCH Graphic = teeth Focus = Target - SetVisible = 0,true SetX = 7,343 SetY = 7,94 SetX = 8,329 @@ -63,7 +60,6 @@ Name = CRUNCH Graphic = teeth Focus = Target - SetVisible = 0,true SetX = 8,343 SetY = 8,95 SetX = 9,327 @@ -73,7 +69,6 @@ Name = CRUNCH Graphic = teeth Focus = Target - SetVisible = 0,true SetX = 8,442 SetY = 8,99 SetX = 9,391 @@ -83,7 +78,6 @@ Name = CRUNCH Graphic = teeth Focus = Target - SetVisible = 0,true SetX = 10,325 SetY = 10,96 diff --git a/PBS/Animations/Converted/Move/CRUSHCLAW.txt b/PBS/Animations/Converted/Move/CRUSHCLAW.txt index 8d14eb5a0..a956ca693 100644 --- a/PBS/Animations/Converted/Move/CRUSHCLAW.txt +++ b/PBS/Animations/Converted/Move/CRUSHCLAW.txt @@ -13,7 +13,6 @@ Name = CRUSHCLAW Focus = Target SetX = 0,387 SetY = 0,84 - SetVisible = 0,true SetX = 1,392 SetY = 1,87 SetX = 2,402 diff --git a/PBS/Animations/Converted/Move/CURSE.txt b/PBS/Animations/Converted/Move/CURSE.txt index 96df1b0bd..588da81c9 100644 --- a/PBS/Animations/Converted/Move/CURSE.txt +++ b/PBS/Animations/Converted/Move/CURSE.txt @@ -14,7 +14,6 @@ Name = CURSE SetX = 0,392 SetY = 0,14 SetAngle = 0,90 - SetVisible = 0,true SetY = 1,54 SetY = 2,70 SetY = 3,78 diff --git a/PBS/Animations/Converted/Move/CUT.txt b/PBS/Animations/Converted/Move/CUT.txt index b886d071d..2cd0db97a 100644 --- a/PBS/Animations/Converted/Move/CUT.txt +++ b/PBS/Animations/Converted/Move/CUT.txt @@ -13,7 +13,6 @@ Name = CUT Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Slash10,80,100 Play = 3,Slash2,80,100 diff --git a/PBS/Animations/Converted/Move/DEFENSECURL.txt b/PBS/Animations/Converted/Move/DEFENSECURL.txt index 1fa57c611..b7a2b639e 100644 --- a/PBS/Animations/Converted/Move/DEFENSECURL.txt +++ b/PBS/Animations/Converted/Move/DEFENSECURL.txt @@ -13,7 +13,6 @@ Name = DEFENSECURL Focus = User SetX = 0,133 SetY = 0,224 - SetVisible = 0,true SetOpacity = 0,100 SetX = 1,131 SetY = 1,223 diff --git a/PBS/Animations/Converted/Move/DETECT.txt b/PBS/Animations/Converted/Move/DETECT.txt index c315e2446..1356f7b1e 100644 --- a/PBS/Animations/Converted/Move/DETECT.txt +++ b/PBS/Animations/Converted/Move/DETECT.txt @@ -13,7 +13,6 @@ Name = DETECT Focus = UserAndTarget SetX = 0,422 SetY = 0,66 - SetVisible = 0,true SetX = 1,423 SetY = 1,68 SetX = 2,416 diff --git a/PBS/Animations/Converted/Move/DISABLE.txt b/PBS/Animations/Converted/Move/DISABLE.txt index 5d42c0824..a8b2bfb59 100644 --- a/PBS/Animations/Converted/Move/DISABLE.txt +++ b/PBS/Animations/Converted/Move/DISABLE.txt @@ -11,14 +11,12 @@ Name = DISABLE Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,385 SetY = 4,96 SetAngle = 4,45 Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 6,388 SetY = 6,96 @@ -26,7 +24,6 @@ Name = DISABLE Focus = UserAndTarget SetX = 0,385 SetY = 0,101 - SetVisible = 0,true SetX = 1,384 SetY = 1,98 SetY = 2,99 diff --git a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt index 87e0160e3..3a996ece8 100644 --- a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt +++ b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt @@ -13,7 +13,6 @@ Name = DIZZYPUNCH Focus = Target SetX = 0,384 SetY = 0,97 - SetVisible = 0,true SetY = 1,96 SetY = 2,91 SetX = 4,387 @@ -38,7 +37,6 @@ Name = DIZZYPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 1,388 SetY = 1,102 SetX = 2,390 @@ -68,7 +66,6 @@ Name = DIZZYPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,447 SetY = 2,80 SetX = 4,469 @@ -96,7 +93,6 @@ Name = DIZZYPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,471 SetY = 2,88 SetX = 4,356 @@ -124,7 +120,6 @@ Name = DIZZYPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 3,346 SetY = 3,82 SetX = 4,329 @@ -148,7 +143,6 @@ Name = DIZZYPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 3,316 SetY = 3,91 SetX = 5,377 @@ -168,7 +162,6 @@ Name = DIZZYPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 7,426 SetY = 7,103 SetX = 8,361 @@ -180,13 +173,11 @@ Name = DIZZYPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 8,427 SetY = 8,74 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 8,447 SetY = 8,64 diff --git a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt index 55e09ccfc..0fed874ae 100644 --- a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt +++ b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt @@ -11,7 +11,6 @@ Name = DOUBLEEDGE Graphic = Divine_Smash Focus = Target - SetVisible = 0,true SetX = 1,198 SetY = 1,236 SetY = 2,179 @@ -22,7 +21,6 @@ Name = DOUBLEEDGE Graphic = Divine_Smash Focus = User - SetVisible = 0,true SetX = 2,96 SetY = 2,230 @@ -30,7 +28,6 @@ Name = DOUBLEEDGE Focus = Target SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetY = 1,192 SetY = 2,129 SetX = 3,198 diff --git a/PBS/Animations/Converted/Move/DOUBLEKICK.txt b/PBS/Animations/Converted/Move/DOUBLEKICK.txt index 184a1d627..003c548b6 100644 --- a/PBS/Animations/Converted/Move/DOUBLEKICK.txt +++ b/PBS/Animations/Converted/Move/DOUBLEKICK.txt @@ -15,7 +15,6 @@ Name = DOUBLEKICK SetY = 0,94 SetZoomX = 0,110 SetZoomY = 0,110 - SetVisible = 0,true SetOpacity = 0,100 SetZoomX = 1,100 SetZoomY = 1,100 @@ -26,7 +25,6 @@ Name = DOUBLEKICK Graphic = normal1 Focus = Target - SetVisible = 0,true SetX = 2,440 SetY = 2,78 SetZoomX = 2,110 @@ -47,7 +45,6 @@ Name = Double Kick hit 2 Graphic = normal1 Focus = Target - SetVisible = 0,true SetX = 2,440 SetY = 2,78 SetZoomX = 2,110 @@ -60,7 +57,6 @@ Name = Double Kick hit 2 SetY = 0,94 SetZoomX = 0,110 SetZoomY = 0,110 - SetVisible = 0,true SetOpacity = 0,100 SetZoomX = 1,100 SetZoomY = 1,100 diff --git a/PBS/Animations/Converted/Move/DOUBLESLAP.txt b/PBS/Animations/Converted/Move/DOUBLESLAP.txt index 714c55ca7..9b53ea48b 100644 --- a/PBS/Animations/Converted/Move/DOUBLESLAP.txt +++ b/PBS/Animations/Converted/Move/DOUBLESLAP.txt @@ -11,7 +11,6 @@ Name = DOUBLESLAP Graphic = many Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,94 SetOpacity = 3,100 @@ -22,7 +21,6 @@ Name = DOUBLESLAP Focus = Target SetX = 0,520 SetY = 0,94 - SetVisible = 0,true SetX = 1,480 SetX = 2,424 SetX = 3,392 @@ -48,7 +46,6 @@ Name = DoubleSlap hit 2 Focus = Target SetX = 0,520 SetY = 0,94 - SetVisible = 0,true SetX = 1,480 SetX = 2,424 SetX = 3,392 @@ -60,7 +57,6 @@ Name = DoubleSlap hit 2 Graphic = many Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,94 SetOpacity = 3,100 @@ -81,7 +77,6 @@ Name = DoubleSlap hit 3 Graphic = many Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,94 SetOpacity = 3,100 @@ -92,7 +87,6 @@ Name = DoubleSlap hit 3 Focus = Target SetX = 0,520 SetY = 0,94 - SetVisible = 0,true SetX = 1,480 SetX = 2,424 SetX = 3,392 @@ -118,7 +112,6 @@ Name = DoubleSlap hit 4 Focus = Target SetX = 0,520 SetY = 0,94 - SetVisible = 0,true SetX = 1,480 SetX = 2,424 SetX = 3,392 @@ -130,7 +123,6 @@ Name = DoubleSlap hit 4 Graphic = many Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,94 SetOpacity = 3,100 @@ -151,7 +143,6 @@ Name = DoubleSlap hit 5 Graphic = many Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,94 SetOpacity = 3,100 @@ -162,7 +153,6 @@ Name = DoubleSlap hit 5 Focus = Target SetX = 0,520 SetY = 0,94 - SetVisible = 0,true SetX = 1,480 SetX = 2,424 SetX = 3,392 diff --git a/PBS/Animations/Converted/Move/DRAGONBREATH.txt b/PBS/Animations/Converted/Move/DRAGONBREATH.txt index d81ff174f..54b64ea4d 100644 --- a/PBS/Animations/Converted/Move/DRAGONBREATH.txt +++ b/PBS/Animations/Converted/Move/DRAGONBREATH.txt @@ -13,7 +13,6 @@ Name = DRAGONBREATH Focus = UserAndTarget SetX = 0,153 SetY = 0,205 - SetVisible = 0,true SetX = 1,204 SetY = 1,186 SetX = 2,256 @@ -27,7 +26,6 @@ Name = DRAGONBREATH Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,179 SetY = 1,198 SetX = 2,217 @@ -44,7 +42,6 @@ Name = DRAGONBREATH Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 2,true SetX = 2,217 SetY = 2,186 @@ -60,7 +57,6 @@ Name = DRAGONBREATH Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 2,true SetX = 2,179 SetY = 2,205 @@ -73,7 +69,6 @@ Name = DRAGONBREATH Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,236 SetY = 2,154 SetZoomX = 2,50 @@ -85,7 +80,6 @@ Name = DRAGONBREATH Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 3,true SetX = 3,345 SetY = 3,154 @@ -94,7 +88,6 @@ Name = DRAGONBREATH Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 3,true SetX = 3,294 SetY = 3,142 @@ -103,7 +96,6 @@ Name = DRAGONBREATH Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,211 SetY = 3,211 SetZoomX = 3,75 diff --git a/PBS/Animations/Converted/Move/DRAGONCLAW.txt b/PBS/Animations/Converted/Move/DRAGONCLAW.txt index 7d2ff7bf7..a0f183140 100644 --- a/PBS/Animations/Converted/Move/DRAGONCLAW.txt +++ b/PBS/Animations/Converted/Move/DRAGONCLAW.txt @@ -13,7 +13,6 @@ Name = DRAGONCLAW Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true SetX = 1,360 SetAngle = 1,25 SetY = 2,102 diff --git a/PBS/Animations/Converted/Move/DRAGONDANCE.txt b/PBS/Animations/Converted/Move/DRAGONDANCE.txt index 7b153acd7..ed8467bca 100644 --- a/PBS/Animations/Converted/Move/DRAGONDANCE.txt +++ b/PBS/Animations/Converted/Move/DRAGONDANCE.txt @@ -11,14 +11,12 @@ Name = DRAGONDANCE Graphic = electric1 Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,46 SetY = 7,94 Graphic = electric1 Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,94 SetY = 7,46 diff --git a/PBS/Animations/Converted/Move/DRAGONRAGE.txt b/PBS/Animations/Converted/Move/DRAGONRAGE.txt index 4dedd0b8b..32de1aac5 100644 --- a/PBS/Animations/Converted/Move/DRAGONRAGE.txt +++ b/PBS/Animations/Converted/Move/DRAGONRAGE.txt @@ -11,7 +11,6 @@ Name = DRAGONRAGE Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,179 SetY = 1,198 SetX = 2,217 @@ -28,7 +27,6 @@ Name = DRAGONRAGE Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 2,true SetX = 2,217 SetY = 2,186 @@ -40,7 +38,6 @@ Name = DRAGONRAGE Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 3,true SetX = 3,230 SetY = 3,198 @@ -49,7 +46,6 @@ Name = DRAGONRAGE Focus = UserAndTarget SetX = 0,153 SetY = 0,205 - SetVisible = 0,true SetX = 1,204 SetY = 1,186 SetX = 2,256 diff --git a/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt b/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt index 49411b87e..69a9ec67c 100644 --- a/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt +++ b/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt @@ -11,7 +11,6 @@ Name = DYNAMICPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 1,389 SetY = 1,99 SetX = 2,386 @@ -26,7 +25,6 @@ Name = DYNAMICPUNCH Focus = Target SetX = 0,389 SetY = 0,98 - SetVisible = 0,true SetX = 1,386 SetY = 1,96 SetX = 2,389 diff --git a/PBS/Animations/Converted/Move/EMBER.txt b/PBS/Animations/Converted/Move/EMBER.txt index 00eedaf36..e5603c5c6 100644 --- a/PBS/Animations/Converted/Move/EMBER.txt +++ b/PBS/Animations/Converted/Move/EMBER.txt @@ -11,7 +11,6 @@ Name = EMBER Graphic = Flames Focus = UserAndTarget - SetVisible = 0,true SetX = 1,144 SetY = 1,204 SetFlip = 2,true @@ -37,7 +36,6 @@ Name = EMBER Graphic = Flames Focus = UserAndTarget - SetVisible = 0,true SetX = 9,310 SetY = 9,126 SetFlip = 10,true diff --git a/PBS/Animations/Converted/Move/ENCORE.txt b/PBS/Animations/Converted/Move/ENCORE.txt index 10fd4af71..96559fbcb 100644 --- a/PBS/Animations/Converted/Move/ENCORE.txt +++ b/PBS/Animations/Converted/Move/ENCORE.txt @@ -13,7 +13,6 @@ Name = ENCORE Focus = UserAndTarget SetX = 0,96 SetY = 0,186 - SetVisible = 0,true SetX = 1,108 SetX = 2,121 SetX = 3,160 @@ -37,7 +36,6 @@ Name = ENCORE Focus = UserAndTarget SetX = 0,172 SetY = 0,186 - SetVisible = 0,true SetX = 1,160 SetX = 2,140 SetX = 3,108 diff --git a/PBS/Animations/Converted/Move/ENERGYBALL.txt b/PBS/Animations/Converted/Move/ENERGYBALL.txt index 16c08fc5c..f83878026 100644 --- a/PBS/Animations/Converted/Move/ENERGYBALL.txt +++ b/PBS/Animations/Converted/Move/ENERGYBALL.txt @@ -15,7 +15,6 @@ Name = ENERGYBALL SetY = 0,117 SetZoomX = 0,80 SetZoomY = 0,80 - SetVisible = 0,true SetZoomX = 1,90 SetZoomY = 1,90 SetZoomX = 2,100 diff --git a/PBS/Animations/Converted/Move/ERUPTION.txt b/PBS/Animations/Converted/Move/ERUPTION.txt index d9d9fbab1..fe658d7e2 100644 --- a/PBS/Animations/Converted/Move/ERUPTION.txt +++ b/PBS/Animations/Converted/Move/ERUPTION.txt @@ -11,7 +11,6 @@ Name = ERUPTION Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,211 SetY = 2,167 SetAngle = 2,30 @@ -31,7 +30,6 @@ Name = ERUPTION Graphic = fire5 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,147 SetY = 4,161 SetAngle = 4,30 @@ -46,7 +44,6 @@ Name = ERUPTION SetX = 0,160 SetY = 0,167 SetAngle = 0,30 - SetVisible = 0,true SetX = 1,198 SetY = 1,148 SetAngle = 1,15 diff --git a/PBS/Animations/Converted/Move/EXPLOSION.txt b/PBS/Animations/Converted/Move/EXPLOSION.txt index db7ed24e0..9bed1bc2c 100644 --- a/PBS/Animations/Converted/Move/EXPLOSION.txt +++ b/PBS/Animations/Converted/Move/EXPLOSION.txt @@ -13,7 +13,6 @@ Name = EXPLOSION Focus = Target SetX = 0,424 SetY = 0,46 - SetVisible = 0,true SetOpacity = 0,50 SetX = 2,400 SetY = 2,142 @@ -26,7 +25,6 @@ Name = EXPLOSION Graphic = Fire3 Focus = Target - SetVisible = 0,true SetX = 2,424 SetY = 2,46 SetOpacity = 2,100 @@ -40,7 +38,6 @@ Name = EXPLOSION Graphic = Fire3 Focus = Target - SetVisible = 0,true SetX = 6,424 SetY = 6,46 @@ -48,7 +45,6 @@ Name = EXPLOSION Focus = Target SetX = 0,296 SetY = 0,94 - SetVisible = 0,true SetOpacity = 12,150 SetX = 13,400 SetY = 13,142 diff --git a/PBS/Animations/Converted/Move/FAKEOUT.txt b/PBS/Animations/Converted/Move/FAKEOUT.txt index d66b1e19b..bebf82263 100644 --- a/PBS/Animations/Converted/Move/FAKEOUT.txt +++ b/PBS/Animations/Converted/Move/FAKEOUT.txt @@ -14,7 +14,6 @@ Name = FAKEOUT SetFlip = 0,true SetX = 0,480 SetY = 0,102 - SetVisible = 0,true SetX = 6,464 SetX = 7,448 SetX = 8,400 @@ -28,7 +27,6 @@ Name = FAKEOUT Focus = Target SetX = 0,288 SetY = 0,102 - SetVisible = 0,true SetX = 6,304 SetX = 7,320 SetX = 8,368 diff --git a/PBS/Animations/Converted/Move/FAKETEARS.txt b/PBS/Animations/Converted/Move/FAKETEARS.txt index 19aa120a0..1a9858b3f 100644 --- a/PBS/Animations/Converted/Move/FAKETEARS.txt +++ b/PBS/Animations/Converted/Move/FAKETEARS.txt @@ -11,7 +11,6 @@ Name = FAKETEARS Graphic = poison2 Focus = User - SetVisible = 0,true SetFlip = 1,true SetX = 1,56 SetY = 1,230 @@ -33,7 +32,6 @@ Name = FAKETEARS Graphic = poison2 Focus = User - SetVisible = 0,true SetX = 2,200 SetY = 2,222 SetX = 4,221 @@ -46,7 +44,6 @@ Name = FAKETEARS Graphic = poison2 Focus = User - SetVisible = 0,true SetFlip = 5,true SetX = 5,10 SetY = 5,204 @@ -55,7 +52,6 @@ Name = FAKETEARS Focus = User SetX = 0,184 SetY = 0,238 - SetVisible = 0,true SetX = 1,192 SetY = 1,230 SetFlip = 2,true diff --git a/PBS/Animations/Converted/Move/FIERYDANCE.txt b/PBS/Animations/Converted/Move/FIERYDANCE.txt index 5314da5b6..af9715f9f 100644 --- a/PBS/Animations/Converted/Move/FIERYDANCE.txt +++ b/PBS/Animations/Converted/Move/FIERYDANCE.txt @@ -13,7 +13,6 @@ Name = FIERYDANCE Focus = Target SetX = 0,419 SetY = 0,80 - SetVisible = 0,true SetX = 1,424 SetY = 1,86 SetX = 2,425 @@ -41,7 +40,6 @@ Name = FIERYDANCE Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,364 SetY = 1,85 SetX = 2,359 @@ -65,7 +63,6 @@ Name = FIERYDANCE Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,411 SetY = 1,49 SetX = 2,407 @@ -87,7 +84,6 @@ Name = FIERYDANCE Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 3,338 SetY = 3,51 SetX = 4,321 @@ -101,7 +97,6 @@ Name = FIERYDANCE Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,373 SetY = 4,55 SetX = 7,359 @@ -111,7 +106,6 @@ Name = FIERYDANCE Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 7,351 SetY = 7,107 diff --git a/PBS/Animations/Converted/Move/FINALGAMBIT.txt b/PBS/Animations/Converted/Move/FINALGAMBIT.txt index 97898ffb8..356329d43 100644 --- a/PBS/Animations/Converted/Move/FINALGAMBIT.txt +++ b/PBS/Animations/Converted/Move/FINALGAMBIT.txt @@ -13,7 +13,6 @@ Name = FINALGAMBIT Focus = Target SetX = 0,364 SetY = 0,126 - SetVisible = 0,true SetX = 1,362 SetY = 1,122 SetX = 2,391 diff --git a/PBS/Animations/Converted/Move/FIREBLAST.txt b/PBS/Animations/Converted/Move/FIREBLAST.txt index a5dc2f575..37cb404fd 100644 --- a/PBS/Animations/Converted/Move/FIREBLAST.txt +++ b/PBS/Animations/Converted/Move/FIREBLAST.txt @@ -13,7 +13,6 @@ Name = FIREBLAST Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true SetY = 2,95 SetY = 3,92 SetX = 4,383 diff --git a/PBS/Animations/Converted/Move/FIREFANG.txt b/PBS/Animations/Converted/Move/FIREFANG.txt index f2c66f643..1967501cd 100644 --- a/PBS/Animations/Converted/Move/FIREFANG.txt +++ b/PBS/Animations/Converted/Move/FIREFANG.txt @@ -13,7 +13,6 @@ Name = FIREFANG Focus = Target SetX = 0,391 SetY = 0,94 - SetVisible = 0,true SetX = 1,394 SetY = 1,96 SetX = 2,386 @@ -38,7 +37,6 @@ Name = FIREFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 7,411 SetY = 7,88 SetY = 8,89 @@ -48,7 +46,6 @@ Name = FIREFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 8,418 SetY = 8,70 SetX = 9,414 @@ -58,7 +55,6 @@ Name = FIREFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 8,353 SetY = 8,73 SetX = 9,349 @@ -68,7 +64,6 @@ Name = FIREFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 9,359 SetY = 9,33 SetX = 10,348 @@ -76,25 +71,21 @@ Name = FIREFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 10,358 SetY = 10,44 Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 10,375 SetY = 10,40 Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 10,356 SetY = 10,104 Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 10,365 SetY = 10,32 diff --git a/PBS/Animations/Converted/Move/FIREPLEDGE.txt b/PBS/Animations/Converted/Move/FIREPLEDGE.txt index c8f63d4dd..3fcf10d50 100644 --- a/PBS/Animations/Converted/Move/FIREPLEDGE.txt +++ b/PBS/Animations/Converted/Move/FIREPLEDGE.txt @@ -14,7 +14,6 @@ Name = FIREPLEDGE SetX = 0,388 SetY = 0,135 SetZoomY = 0,30 - SetVisible = 0,true SetX = 1,387 SetY = 1,123 SetZoomY = 1,50 diff --git a/PBS/Animations/Converted/Move/FIREPUNCH.txt b/PBS/Animations/Converted/Move/FIREPUNCH.txt index 3badeb032..7ca7e4a67 100644 --- a/PBS/Animations/Converted/Move/FIREPUNCH.txt +++ b/PBS/Animations/Converted/Move/FIREPUNCH.txt @@ -13,7 +13,6 @@ Name = FIREPUNCH Focus = Target SetX = 0,387 SetY = 0,97 - SetVisible = 0,true SetX = 1,402 SetY = 1,88 SetX = 2,403 @@ -29,7 +28,6 @@ Name = FIREPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 1,390 SetY = 1,95 SetX = 2,384 @@ -45,7 +43,6 @@ Name = FIREPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 3,385 SetY = 3,101 SetX = 4,395 @@ -57,7 +54,6 @@ Name = FIREPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 4,384 SetY = 4,103 SetX = 5,381 @@ -67,7 +63,6 @@ Name = FIREPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 5,387 SetY = 5,104 SetX = 6,392 @@ -75,37 +70,31 @@ Name = FIREPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 7,403 SetY = 7,82 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 8,374 SetY = 8,81 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 9,398 SetY = 9,64 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 10,388 SetY = 10,102 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 11,403 SetY = 11,110 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 11,377 SetY = 11,115 diff --git a/PBS/Animations/Converted/Move/FIRESPIN.txt b/PBS/Animations/Converted/Move/FIRESPIN.txt index 0170aedc9..9a1bb0b6b 100644 --- a/PBS/Animations/Converted/Move/FIRESPIN.txt +++ b/PBS/Animations/Converted/Move/FIRESPIN.txt @@ -15,7 +15,6 @@ Name = FIRESPIN SetY = 0,94 SetZoomX = 0,25 SetZoomY = 0,25 - SetVisible = 0,true SetOpacity = 0,100 SetZoomX = 1,50 SetZoomY = 1,50 diff --git a/PBS/Animations/Converted/Move/FLAIL.txt b/PBS/Animations/Converted/Move/FLAIL.txt index 10ff3fe80..37e9f28b1 100644 --- a/PBS/Animations/Converted/Move/FLAIL.txt +++ b/PBS/Animations/Converted/Move/FLAIL.txt @@ -13,7 +13,6 @@ Name = FLAIL Focus = UserAndTarget SetX = 0,354 SetY = 0,117 - SetVisible = 0,true SetX = 1,374 SetY = 1,111 SetX = 2,415 diff --git a/PBS/Animations/Converted/Move/FLAMEBURST.txt b/PBS/Animations/Converted/Move/FLAMEBURST.txt index 07c1373c7..37b142961 100644 --- a/PBS/Animations/Converted/Move/FLAMEBURST.txt +++ b/PBS/Animations/Converted/Move/FLAMEBURST.txt @@ -13,7 +13,6 @@ Name = FLAMEBURST Focus = Target SetX = 0,385 SetY = 0,101 - SetVisible = 0,true SetY = 1,98 SetX = 2,375 SetY = 2,109 @@ -32,7 +31,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,400 SetY = 1,114 SetX = 2,365 @@ -51,7 +49,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,371 SetY = 1,110 SetX = 2,397 @@ -71,7 +68,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 2,389 SetY = 2,94 SetX = 3,367 @@ -88,7 +84,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,399 SetY = 3,83 SetX = 4,382 @@ -104,7 +99,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,410 SetY = 3,111 SetX = 4,400 @@ -120,7 +114,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,380 SetY = 3,78 SetX = 4,358 @@ -136,7 +129,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,369 SetY = 4,77 SetX = 5,372 @@ -150,7 +142,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,394 SetY = 4,77 SetX = 5,400 @@ -164,7 +155,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,413 SetY = 4,107 SetX = 5,400 @@ -178,7 +168,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 5,414 SetY = 5,114 SetX = 6,413 @@ -190,7 +179,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 5,420 SetY = 5,92 SetX = 6,388 @@ -202,7 +190,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 5,405 SetY = 5,82 SetX = 6,367 @@ -214,7 +201,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 6,422 SetY = 6,130 SetX = 7,377 @@ -223,7 +209,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 6,344 SetY = 6,76 SetX = 7,354 @@ -233,7 +218,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 7,405 SetY = 7,61 SetX = 8,431 @@ -241,7 +225,6 @@ Name = FLAMEBURST Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 7,391 SetY = 7,49 diff --git a/PBS/Animations/Converted/Move/FLAMECHARGE.txt b/PBS/Animations/Converted/Move/FLAMECHARGE.txt index a200b1edb..902c575d5 100644 --- a/PBS/Animations/Converted/Move/FLAMECHARGE.txt +++ b/PBS/Animations/Converted/Move/FLAMECHARGE.txt @@ -13,59 +13,49 @@ Name = FLAMECHARGE Focus = Target SetX = 0,356 SetY = 0,113 - SetVisible = 0,true Graphic = Flames Focus = Target SetX = 0,371 SetY = 0,121 - SetVisible = 0,true Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,390 SetY = 1,124 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 2,408 SetY = 2,112 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,405 SetY = 3,90 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,393 SetY = 4,76 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 5,378 SetY = 5,73 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 6,360 SetY = 6,76 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 7,357 SetY = 7,95 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 8,382 SetY = 8,104 SetX = 9,381 diff --git a/PBS/Animations/Converted/Move/FLAMETHROWER.txt b/PBS/Animations/Converted/Move/FLAMETHROWER.txt index 4910a4465..01fd1b833 100644 --- a/PBS/Animations/Converted/Move/FLAMETHROWER.txt +++ b/PBS/Animations/Converted/Move/FLAMETHROWER.txt @@ -13,53 +13,44 @@ Name = FLAMETHROWER Focus = Target SetX = 0,165 SetY = 0,215 - SetVisible = 0,true Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,183 SetY = 1,207 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 2,197 SetY = 2,193 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,223 SetY = 3,175 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,255 SetY = 4,153 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 5,285 SetY = 5,126 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 6,315 SetY = 6,104 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 7,352 SetY = 7,84 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 8,379 SetY = 8,72 @@ -78,7 +69,6 @@ Name = FLAMETHROWER Focus = Target SetX = 0,381 SetY = 0,98 - SetVisible = 0,true SetX = 1,384 SetX = 2,383 SetY = 2,95 @@ -117,7 +107,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,361 SetY = 1,105 SetX = 2,362 @@ -151,7 +140,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 2,342 SetY = 2,112 SetX = 3,339 @@ -184,7 +172,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,313 SetY = 3,120 SetX = 4,323 @@ -213,7 +200,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,299 SetY = 4,137 SetX = 5,296 @@ -238,7 +224,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 5,267 SetY = 5,134 SetY = 6,143 @@ -258,7 +243,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 6,238 SetY = 6,152 SetX = 7,215 @@ -276,7 +260,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 8,189 SetY = 8,164 SetX = 9,165 @@ -290,7 +273,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 9,136 SetY = 9,194 SetX = 10,143 @@ -298,7 +280,6 @@ Name = FLAMETHROWER Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 10,122 SetY = 10,227 diff --git a/PBS/Animations/Converted/Move/FLAMEWHEEL.txt b/PBS/Animations/Converted/Move/FLAMEWHEEL.txt index 646bd7a5f..58f2da32b 100644 --- a/PBS/Animations/Converted/Move/FLAMEWHEEL.txt +++ b/PBS/Animations/Converted/Move/FLAMEWHEEL.txt @@ -13,7 +13,6 @@ Name = FLAMEWHEEL Focus = UserAndTarget SetX = 0,156 SetY = 0,171 - SetVisible = 0,true SetX = 8,398 SetY = 8,100 SetX = 9,396 @@ -25,13 +24,11 @@ Name = FLAMEWHEEL Focus = UserAndTarget SetX = 0,186 SetY = 0,191 - SetVisible = 0,true SetX = 10,423 SetY = 10,124 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 1,193 SetY = 1,230 SetX = 7,191 @@ -41,7 +38,6 @@ Name = FLAMEWHEEL Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 2,162 SetY = 2,256 SetX = 11,378 @@ -49,7 +45,6 @@ Name = FLAMEWHEEL Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,254 SetX = 11,423 @@ -57,79 +52,66 @@ Name = FLAMEWHEEL Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 4,113 SetY = 4,228 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 5,116 SetY = 5,191 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 6,130 SetY = 6,172 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,159 SetY = 7,165 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,187 SetY = 7,185 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,188 SetY = 7,222 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,168 SetY = 7,246 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,143 SetY = 7,250 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,121 SetY = 7,241 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,109 SetY = 7,217 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,112 SetY = 7,192 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,125 SetY = 7,172 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,174 SetY = 7,172 @@ -148,7 +130,6 @@ Name = FLAMEWHEEL Focus = UserAndTarget SetX = 0,397 SetY = 0,63 - SetVisible = 0,true SetX = 8,139 SetY = 8,227 SetX = 9,133 @@ -162,14 +143,12 @@ Name = FLAMEWHEEL Focus = UserAndTarget SetX = 0,417 SetY = 0,75 - SetVisible = 0,true SetX = 10,176 SetY = 10,187 SetX = 11,163 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 1,422 SetY = 1,102 SetX = 10,119 @@ -179,7 +158,6 @@ Name = FLAMEWHEEL Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 2,407 SetY = 2,120 SetX = 11,110 @@ -187,7 +165,6 @@ Name = FLAMEWHEEL Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 3,380 SetY = 3,110 SetX = 4,377 @@ -197,55 +174,46 @@ Name = FLAMEWHEEL Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 4,366 SetY = 4,92 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 5,376 SetY = 5,71 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 6,388 SetY = 6,62 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 6,408 SetY = 6,71 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 6,422 SetY = 6,95 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 6,406 SetY = 6,113 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,384 SetY = 7,108 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,374 SetY = 7,86 Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 7,379 SetY = 7,70 diff --git a/PBS/Animations/Converted/Move/FLASH.txt b/PBS/Animations/Converted/Move/FLASH.txt index 3ab0a9ecd..8def28f80 100644 --- a/PBS/Animations/Converted/Move/FLASH.txt +++ b/PBS/Animations/Converted/Move/FLASH.txt @@ -13,6 +13,5 @@ Name = FLASH Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Saint7,80,100 diff --git a/PBS/Animations/Converted/Move/FLY.txt b/PBS/Animations/Converted/Move/FLY.txt index dd7d49560..1daa4bec4 100644 --- a/PBS/Animations/Converted/Move/FLY.txt +++ b/PBS/Animations/Converted/Move/FLY.txt @@ -14,7 +14,6 @@ Name = FLY SetX = 0,281 SetY = 0,-22 SetAngle = 0,207 - SetVisible = 0,true SetX = 1,312 SetY = 1,26 SetX = 2,335 @@ -43,7 +42,6 @@ Name = Fly charging Focus = User SetX = 0,134 SetY = 0,260 - SetVisible = 0,true SetX = 1,138 SetY = 1,247 SetX = 2,136 diff --git a/PBS/Animations/Converted/Move/FOCUSENERGY.txt b/PBS/Animations/Converted/Move/FOCUSENERGY.txt index 97b830814..0adfa658a 100644 --- a/PBS/Animations/Converted/Move/FOCUSENERGY.txt +++ b/PBS/Animations/Converted/Move/FOCUSENERGY.txt @@ -11,7 +11,6 @@ Name = FOCUSENERGY Graphic = Fire3 Focus = User - SetVisible = 0,true SetX = 4,144 SetY = 4,222 @@ -19,7 +18,6 @@ Name = FOCUSENERGY Focus = User SetX = 0,144 SetY = 0,222 - SetVisible = 0,true Play = 0,Up,80,100 Play = 3,Up,80,100 diff --git a/PBS/Animations/Converted/Move/FOLLOWME.txt b/PBS/Animations/Converted/Move/FOLLOWME.txt index 0d6cf5391..bfcd37a00 100644 --- a/PBS/Animations/Converted/Move/FOLLOWME.txt +++ b/PBS/Animations/Converted/Move/FOLLOWME.txt @@ -13,7 +13,6 @@ Name = FOLLOWME Focus = Target SetX = 0,386 SetY = 0,97 - SetVisible = 0,true SetX = 1,377 SetY = 1,112 SetX = 2,359 @@ -36,7 +35,6 @@ Name = FOLLOWME Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 6,267 SetY = 6,216 @@ -53,7 +51,6 @@ Name = FOLLOWME Graphic = finger.spoon Focus = Target - SetVisible = 0,true SetX = 5,282 SetY = 5,206 @@ -61,7 +58,6 @@ Name = FOLLOWME Focus = Target SetX = 0,191 SetY = 0,221 - SetVisible = 0,true SetX = 1,212 SetY = 1,218 SetX = 2,230 diff --git a/PBS/Animations/Converted/Move/FORESIGHT.txt b/PBS/Animations/Converted/Move/FORESIGHT.txt index 81d8a9353..8570a3516 100644 --- a/PBS/Animations/Converted/Move/FORESIGHT.txt +++ b/PBS/Animations/Converted/Move/FORESIGHT.txt @@ -15,7 +15,6 @@ Name = FORESIGHT SetY = 0,22 SetZoomX = 0,50 SetZoomY = 0,50 - SetVisible = 0,true SetOpacity = 0,150 SetX = 1,304 SetY = 1,54 diff --git a/PBS/Animations/Converted/Move/FRENZYPLANT.txt b/PBS/Animations/Converted/Move/FRENZYPLANT.txt index 002ace82e..0999ffc26 100644 --- a/PBS/Animations/Converted/Move/FRENZYPLANT.txt +++ b/PBS/Animations/Converted/Move/FRENZYPLANT.txt @@ -13,7 +13,6 @@ Name = FRENZYPLANT Focus = UserAndTarget SetX = 0,172 SetY = 0,192 - SetVisible = 0,true SetX = 1,192 SetY = 1,186 SetX = 2,217 diff --git a/PBS/Animations/Converted/Move/FURYATTACK.txt b/PBS/Animations/Converted/Move/FURYATTACK.txt index 62ef374fc..f594847f3 100644 --- a/PBS/Animations/Converted/Move/FURYATTACK.txt +++ b/PBS/Animations/Converted/Move/FURYATTACK.txt @@ -13,7 +13,6 @@ Name = FURYATTACK Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -23,7 +22,6 @@ Name = FURYATTACK Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetX = 4,199 @@ -45,7 +43,6 @@ Name = Fury Attack hit 2 Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetX = 4,199 @@ -57,7 +54,6 @@ Name = Fury Attack hit 2 Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -81,7 +77,6 @@ Name = Fury Attack hit 3 Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -91,7 +86,6 @@ Name = Fury Attack hit 3 Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetX = 4,199 @@ -113,7 +107,6 @@ Name = Fury Attack hit 4 Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetX = 4,199 @@ -125,7 +118,6 @@ Name = Fury Attack hit 4 Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -149,7 +141,6 @@ Name = Fury Attack hit 5 Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -159,7 +150,6 @@ Name = Fury Attack hit 5 Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetX = 4,199 @@ -181,7 +171,6 @@ Name = FURYATTACK Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,332 SetY = 3,127 SetAngle = 3,180 @@ -195,7 +184,6 @@ Name = FURYATTACK SetX = 0,338 SetY = 0,128 SetAngle = 0,180 - SetVisible = 0,true SetX = 1,288 SetY = 1,155 SetX = 2,213 @@ -221,7 +209,6 @@ Name = Fury Attack hit 2 opp SetX = 0,338 SetY = 0,128 SetAngle = 0,180 - SetVisible = 0,true SetX = 1,288 SetY = 1,155 SetX = 2,213 @@ -232,7 +219,6 @@ Name = Fury Attack hit 2 opp Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,332 SetY = 3,127 SetAngle = 3,180 @@ -255,7 +241,6 @@ Name = Fury Attack hit 3 opp Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,332 SetY = 3,127 SetAngle = 3,180 @@ -269,7 +254,6 @@ Name = Fury Attack hit 3 opp SetX = 0,338 SetY = 0,128 SetAngle = 0,180 - SetVisible = 0,true SetX = 1,288 SetY = 1,155 SetX = 2,213 @@ -295,7 +279,6 @@ Name = Fury Attack hit 4 opp SetX = 0,338 SetY = 0,128 SetAngle = 0,180 - SetVisible = 0,true SetX = 1,288 SetY = 1,155 SetX = 2,213 @@ -306,7 +289,6 @@ Name = Fury Attack hit 4 opp Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,332 SetY = 3,127 SetAngle = 3,180 @@ -329,7 +311,6 @@ Name = Fury Attack hit 5 opp Graphic = 003-Attack01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,332 SetY = 3,127 SetAngle = 3,180 @@ -343,7 +324,6 @@ Name = Fury Attack hit 5 opp SetX = 0,338 SetY = 0,128 SetAngle = 0,180 - SetVisible = 0,true SetX = 1,288 SetY = 1,155 SetX = 2,213 diff --git a/PBS/Animations/Converted/Move/FURYCUTTER.txt b/PBS/Animations/Converted/Move/FURYCUTTER.txt index a297b365d..dede42d27 100644 --- a/PBS/Animations/Converted/Move/FURYCUTTER.txt +++ b/PBS/Animations/Converted/Move/FURYCUTTER.txt @@ -13,6 +13,5 @@ Name = FURYCUTTER Focus = Target SetX = 0,384 SetY = 0,86 - SetVisible = 0,true Play = 0,Slash10,80,100 diff --git a/PBS/Animations/Converted/Move/FURYSWIPES.txt b/PBS/Animations/Converted/Move/FURYSWIPES.txt index cdaa5b755..b733e714b 100644 --- a/PBS/Animations/Converted/Move/FURYSWIPES.txt +++ b/PBS/Animations/Converted/Move/FURYSWIPES.txt @@ -13,7 +13,6 @@ Name = FURYSWIPES Focus = Target SetX = 0,437 SetY = 0,65 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,424 SetY = 1,81 @@ -40,7 +39,6 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 2,397 SetY = 2,125 SetX = 3,371 @@ -65,7 +63,6 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 3,403 SetY = 3,138 SetX = 4,366 @@ -83,7 +80,6 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,332 SetY = 4,127 SetX = 5,474 @@ -95,7 +91,6 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,439 SetY = 4,134 SetX = 5,507 @@ -107,7 +102,6 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,267 SetY = 5,180 SetX = 10,459 @@ -115,7 +109,6 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,337 SetY = 5,191 SetX = 10,480 @@ -123,7 +116,6 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,399 SetY = 5,177 SetX = 10,331 @@ -131,13 +123,11 @@ Name = FURYSWIPES Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,457 SetY = 5,180 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,483 SetY = 5,143 @@ -156,7 +146,6 @@ Name = Fury Swipes hit 2 Focus = Target SetX = 0,437 SetY = 0,65 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,424 SetY = 1,81 @@ -183,7 +172,6 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 2,397 SetY = 2,125 SetX = 3,371 @@ -208,7 +196,6 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 3,403 SetY = 3,138 SetX = 4,366 @@ -226,7 +213,6 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,332 SetY = 4,127 SetX = 5,474 @@ -238,7 +224,6 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,439 SetY = 4,134 SetX = 5,507 @@ -250,7 +235,6 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,267 SetY = 5,180 SetX = 10,459 @@ -258,7 +242,6 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,337 SetY = 5,191 SetX = 10,480 @@ -266,7 +249,6 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,399 SetY = 5,177 SetX = 10,331 @@ -274,13 +256,11 @@ Name = Fury Swipes hit 2 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,457 SetY = 5,180 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,483 SetY = 5,143 @@ -299,7 +279,6 @@ Name = Fury Swipes hit 3 Focus = Target SetX = 0,437 SetY = 0,65 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,424 SetY = 1,81 @@ -326,7 +305,6 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 2,397 SetY = 2,125 SetX = 3,371 @@ -351,7 +329,6 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 3,403 SetY = 3,138 SetX = 4,366 @@ -369,7 +346,6 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,332 SetY = 4,127 SetX = 5,474 @@ -381,7 +357,6 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,439 SetY = 4,134 SetX = 5,507 @@ -393,7 +368,6 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,267 SetY = 5,180 SetX = 10,459 @@ -401,7 +375,6 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,337 SetY = 5,191 SetX = 10,480 @@ -409,7 +382,6 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,399 SetY = 5,177 SetX = 10,331 @@ -417,13 +389,11 @@ Name = Fury Swipes hit 3 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,457 SetY = 5,180 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,483 SetY = 5,143 @@ -442,7 +412,6 @@ Name = Fury Swipes hit 4 Focus = Target SetX = 0,437 SetY = 0,65 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,424 SetY = 1,81 @@ -469,7 +438,6 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 2,397 SetY = 2,125 SetX = 3,371 @@ -494,7 +462,6 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 3,403 SetY = 3,138 SetX = 4,366 @@ -512,7 +479,6 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,332 SetY = 4,127 SetX = 5,474 @@ -524,7 +490,6 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,439 SetY = 4,134 SetX = 5,507 @@ -536,7 +501,6 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,267 SetY = 5,180 SetX = 10,459 @@ -544,7 +508,6 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,337 SetY = 5,191 SetX = 10,480 @@ -552,7 +515,6 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,399 SetY = 5,177 SetX = 10,331 @@ -560,13 +522,11 @@ Name = Fury Swipes hit 4 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,457 SetY = 5,180 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,483 SetY = 5,143 @@ -585,7 +545,6 @@ Name = Fury Swipes hit 5 Focus = Target SetX = 0,437 SetY = 0,65 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,424 SetY = 1,81 @@ -612,7 +571,6 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 2,397 SetY = 2,125 SetX = 3,371 @@ -637,7 +595,6 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 3,403 SetY = 3,138 SetX = 4,366 @@ -655,7 +612,6 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,332 SetY = 4,127 SetX = 5,474 @@ -667,7 +623,6 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 4,439 SetY = 4,134 SetX = 5,507 @@ -679,7 +634,6 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,267 SetY = 5,180 SetX = 10,459 @@ -687,7 +641,6 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,337 SetY = 5,191 SetX = 10,480 @@ -695,7 +648,6 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,399 SetY = 5,177 SetX = 10,331 @@ -703,13 +655,11 @@ Name = Fury Swipes hit 5 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,457 SetY = 5,180 Graphic = Scratch + Shadow Claw Focus = Target - SetVisible = 0,true SetX = 5,483 SetY = 5,143 diff --git a/PBS/Animations/Converted/Move/FUTURESIGHT.txt b/PBS/Animations/Converted/Move/FUTURESIGHT.txt index 000ce25bf..02912f9e6 100644 --- a/PBS/Animations/Converted/Move/FUTURESIGHT.txt +++ b/PBS/Animations/Converted/Move/FUTURESIGHT.txt @@ -13,7 +13,6 @@ Name = FUTURESIGHT Focus = User SetX = 0,145 SetY = 0,224 - SetVisible = 0,true SetX = 2,141 SetY = 2,222 SetX = 3,131 @@ -40,7 +39,6 @@ Name = Future Sight hit Focus = Target SetX = 0,401 SetY = 0,96 - SetVisible = 0,true SetX = 2,397 SetY = 2,94 SetX = 3,387 diff --git a/PBS/Animations/Converted/Move/GASTROACID.txt b/PBS/Animations/Converted/Move/GASTROACID.txt index 66e9533b5..387e07912 100644 --- a/PBS/Animations/Converted/Move/GASTROACID.txt +++ b/PBS/Animations/Converted/Move/GASTROACID.txt @@ -11,7 +11,6 @@ Name = GASTROACID Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,393 SetY = 1,120 SetZoomX = 1,85 @@ -36,7 +35,6 @@ Name = GASTROACID Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 2,363 SetY = 2,114 SetZoomX = 2,85 @@ -55,7 +53,6 @@ Name = GASTROACID Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 3,402 SetY = 3,119 SetZoomX = 3,85 @@ -66,7 +63,6 @@ Name = GASTROACID Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,344 SetY = 4,23 SetZoomX = 4,85 @@ -79,7 +75,6 @@ Name = GASTROACID SetY = 0,110 SetZoomX = 0,85 SetZoomY = 0,85 - SetVisible = 0,true SetOpacity = 0,200 SetX = 1,352 SetY = 1,85 diff --git a/PBS/Animations/Converted/Move/GIGADRAIN.txt b/PBS/Animations/Converted/Move/GIGADRAIN.txt index 8d6bba803..4cd4e9b1a 100644 --- a/PBS/Animations/Converted/Move/GIGADRAIN.txt +++ b/PBS/Animations/Converted/Move/GIGADRAIN.txt @@ -13,7 +13,6 @@ Name = GIGADRAIN Focus = UserAndTarget SetX = 0,345 SetY = 0,91 - SetVisible = 0,true SetX = 1,294 SetY = 1,98 SetX = 2,211 @@ -28,7 +27,6 @@ Name = GIGADRAIN Focus = UserAndTarget SetX = 0,371 SetY = 0,110 - SetVisible = 0,true SetX = 1,396 SetY = 1,116 SetX = 2,358 @@ -48,7 +46,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 1,345 SetY = 1,142 SetX = 2,339 @@ -70,7 +67,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 1,339 SetY = 1,85 SetX = 2,268 @@ -89,7 +85,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 2,288 SetY = 2,91 SetX = 3,371 @@ -106,7 +101,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 2,377 SetY = 2,104 SetX = 3,166 @@ -122,7 +116,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 3,236 SetY = 3,116 SetX = 4,371 @@ -136,7 +129,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 3,326 SetY = 3,142 SetX = 4,166 @@ -146,7 +138,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 4,275 SetY = 4,167 SetX = 5,179 @@ -154,7 +145,6 @@ Name = GIGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 4,396 SetY = 4,104 SetX = 5,371 diff --git a/PBS/Animations/Converted/Move/GLARE.txt b/PBS/Animations/Converted/Move/GLARE.txt index 491ead574..541214ad2 100644 --- a/PBS/Animations/Converted/Move/GLARE.txt +++ b/PBS/Animations/Converted/Move/GLARE.txt @@ -13,7 +13,6 @@ Name = GLARE Focus = UserAndTarget SetX = 0,437 SetY = 0,88 - SetVisible = 0,true SetX = 1,421 SetY = 1,86 SetX = 2,415 @@ -27,7 +26,6 @@ Name = GLARE Focus = UserAndTarget SetX = 0,355 SetY = 0,85 - SetVisible = 0,true SetX = 1,346 SetY = 1,84 SetX = 2,333 diff --git a/PBS/Animations/Converted/Move/GRASSWHISTLE.txt b/PBS/Animations/Converted/Move/GRASSWHISTLE.txt index eddf3a25e..e803d0e41 100644 --- a/PBS/Animations/Converted/Move/GRASSWHISTLE.txt +++ b/PBS/Animations/Converted/Move/GRASSWHISTLE.txt @@ -13,7 +13,6 @@ Name = GRASSWHISTLE Focus = UserAndTarget SetX = 0,147 SetY = 0,205 - SetVisible = 0,true SetX = 1,172 SetY = 1,179 SetX = 2,204 @@ -45,7 +44,6 @@ Name = GRASSWHISTLE Graphic = normal1 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,140 SetY = 2,192 SetX = 3,179 @@ -75,7 +73,6 @@ Name = GRASSWHISTLE Graphic = normal1 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,142 SetX = 3,192 @@ -104,7 +101,6 @@ Name = GRASSWHISTLE Graphic = normal1 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,236 SetY = 4,110 SetX = 5,307 @@ -126,7 +122,6 @@ Name = GRASSWHISTLE Graphic = normal1 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,185 SetY = 4,179 SetX = 5,249 @@ -144,7 +139,6 @@ Name = GRASSWHISTLE Graphic = normal1 Focus = UserAndTarget - SetVisible = 0,true SetX = 6,300 SetY = 6,167 SetX = 8,320 @@ -154,7 +148,6 @@ Name = GRASSWHISTLE Graphic = normal1 Focus = UserAndTarget - SetVisible = 0,true SetX = 6,172 SetY = 6,135 SetY = 8,186 diff --git a/PBS/Animations/Converted/Move/GROWL.txt b/PBS/Animations/Converted/Move/GROWL.txt index 2cb9a947b..8ced56c54 100644 --- a/PBS/Animations/Converted/Move/GROWL.txt +++ b/PBS/Animations/Converted/Move/GROWL.txt @@ -14,7 +14,6 @@ Name = GROWL SetFlip = 0,true SetX = 0,185 SetY = 0,230 - SetVisible = 0,true SetX = 1,200 SetY = 1,240 SetX = 2,216 @@ -34,7 +33,6 @@ Name = GROWL Focus = User SetX = 0,192 SetY = 0,211 - SetVisible = 0,true SetX = 1,209 SetX = 2,226 SetX = 3,243 @@ -47,7 +45,6 @@ Name = GROWL Focus = User SetX = 0,185 SetY = 0,205 - SetVisible = 0,true SetX = 1,200 SetY = 1,192 SetX = 2,216 @@ -79,7 +76,6 @@ Name = GROWL SetFlip = 0,true SetX = 0,326 SetY = 0,98 - SetVisible = 0,true SetX = 1,313 SetY = 1,85 SetX = 2,300 @@ -99,7 +95,6 @@ Name = GROWL Focus = Target SetX = 0,326 SetY = 0,135 - SetVisible = 0,true SetX = 1,313 SetY = 1,148 SetX = 2,300 @@ -120,7 +115,6 @@ Name = GROWL SetFlip = 0,true SetX = 0,326 SetY = 0,110 - SetVisible = 0,true SetX = 1,311 SetX = 2,296 SetX = 3,281 diff --git a/PBS/Animations/Converted/Move/GRUDGE.txt b/PBS/Animations/Converted/Move/GRUDGE.txt index 8a3ebd876..32397e7eb 100644 --- a/PBS/Animations/Converted/Move/GRUDGE.txt +++ b/PBS/Animations/Converted/Move/GRUDGE.txt @@ -13,7 +13,6 @@ Name = GRUDGE Focus = Target SetX = 0,512 SetY = 0,102 - SetVisible = 0,true SetX = 1,456 SetY = 1,118 SetX = 2,416 @@ -37,7 +36,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 1,512 SetY = 1,102 SetX = 2,456 @@ -59,7 +57,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 2,512 SetY = 2,102 SetX = 3,456 @@ -80,7 +77,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 3,512 SetY = 3,102 SetX = 4,472 @@ -102,7 +98,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 4,512 SetY = 4,78 SetX = 5,448 @@ -121,7 +116,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 6,504 SetY = 6,102 SetX = 7,464 @@ -137,7 +131,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 7,504 SetY = 7,86 SetX = 8,456 @@ -151,7 +144,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 8,496 SetY = 8,102 SetX = 9,448 @@ -162,7 +154,6 @@ Name = GRUDGE Graphic = ghost1 Focus = Target - SetVisible = 0,true SetX = 10,432 SetY = 10,126 SetX = 11,392 diff --git a/PBS/Animations/Converted/Move/GUST.txt b/PBS/Animations/Converted/Move/GUST.txt index 5cee17c4b..2c57810a5 100644 --- a/PBS/Animations/Converted/Move/GUST.txt +++ b/PBS/Animations/Converted/Move/GUST.txt @@ -13,7 +13,6 @@ Name = GUST Focus = Target SetX = 0,384 SetY = 0,101 - SetVisible = 0,true SetX = 1,400 SetX = 2,416 SetY = 2,99 @@ -78,7 +77,6 @@ Name = GUST SetY = 0,229 SetZoomX = 0,200 SetZoomY = 0,200 - SetVisible = 0,true SetX = 1,144 SetX = 2,160 SetY = 2,227 diff --git a/PBS/Animations/Converted/Move/HAIL.txt b/PBS/Animations/Converted/Move/HAIL.txt index edfea81ee..01709140e 100644 --- a/PBS/Animations/Converted/Move/HAIL.txt +++ b/PBS/Animations/Converted/Move/HAIL.txt @@ -13,7 +13,6 @@ Name = HAIL Focus = Screen SetX = 0,37 SetY = 0,26 - SetVisible = 0,true SetX = 1,207 SetY = 1,56 SetX = 2,84 @@ -39,7 +38,6 @@ Name = HAIL Focus = Screen SetX = 0,164 SetY = 0,136 - SetVisible = 0,true SetX = 1,464 SetY = 1,117 SetX = 3,441 @@ -57,7 +55,6 @@ Name = HAIL Focus = Screen SetX = 0,302 SetY = 0,79 - SetVisible = 0,true SetX = 1,201 SetY = 1,204 SetX = 2,228 @@ -79,7 +76,6 @@ Name = HAIL Focus = Screen SetX = 0,440 SetY = 0,194 - SetVisible = 0,true SetX = 1,51 SetY = 1,161 SetX = 2,263 @@ -107,7 +103,6 @@ Name = HAIL Focus = Screen SetX = 0,362 SetY = 0,252 - SetVisible = 0,true SetX = 2,78 SetY = 2,206 SetX = 4,259 @@ -131,7 +126,6 @@ Name = HAIL Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 4,72 SetY = 4,220 SetX = 6,161 @@ -145,7 +139,6 @@ Name = HAIL Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 9,28 SetY = 9,57 SetX = 10,294 @@ -157,13 +150,11 @@ Name = HAIL Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 11,299 SetY = 11,47 Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 12,449 SetY = 12,237 diff --git a/PBS/Animations/Converted/Move/HARDEN.txt b/PBS/Animations/Converted/Move/HARDEN.txt index c32165dd6..294b55a8a 100644 --- a/PBS/Animations/Converted/Move/HARDEN.txt +++ b/PBS/Animations/Converted/Move/HARDEN.txt @@ -13,7 +13,6 @@ Name = HARDEN Focus = User SetX = 0,133 SetY = 0,221 - SetVisible = 0,true SetOpacity = 0,70 SetOpacity = 1,105 SetOpacity = 2,140 diff --git a/PBS/Animations/Converted/Move/HEADBUTT.txt b/PBS/Animations/Converted/Move/HEADBUTT.txt index 4fabdc679..bf56e390d 100644 --- a/PBS/Animations/Converted/Move/HEADBUTT.txt +++ b/PBS/Animations/Converted/Move/HEADBUTT.txt @@ -13,7 +13,6 @@ Name = HEADBUTT Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true SetAngle = 2,90 SetAngle = 3,0 SetZoomX = 4,120 diff --git a/PBS/Animations/Converted/Move/HEATWAVE.txt b/PBS/Animations/Converted/Move/HEATWAVE.txt index 69e04be3d..614c2bc35 100644 --- a/PBS/Animations/Converted/Move/HEATWAVE.txt +++ b/PBS/Animations/Converted/Move/HEATWAVE.txt @@ -13,7 +13,6 @@ Name = HEATWAVE Focus = UserAndTarget SetX = 0,256 SetY = 0,167 - SetVisible = 0,true SetZoomX = 1,110 SetZoomY = 1,110 SetOpacity = 1,240 diff --git a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt index 4df3731c5..d1a881638 100644 --- a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt +++ b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt @@ -15,7 +15,6 @@ Name = HIGHJUMPKICK SetY = 0,142 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetX = 1,488 SetY = 1,110 SetX = 2,456 diff --git a/PBS/Animations/Converted/Move/HORNATTACK.txt b/PBS/Animations/Converted/Move/HORNATTACK.txt index 66c8f2a43..336fadd2a 100644 --- a/PBS/Animations/Converted/Move/HORNATTACK.txt +++ b/PBS/Animations/Converted/Move/HORNATTACK.txt @@ -11,7 +11,6 @@ Name = HORNATTACK Graphic = Cosmo-01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,390 SetY = 4,85 SetZoomX = 4,50 @@ -22,7 +21,6 @@ Name = HORNATTACK Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,179 SetY = 1,192 SetX = 2,236 diff --git a/PBS/Animations/Converted/Move/HYDROPUMP.txt b/PBS/Animations/Converted/Move/HYDROPUMP.txt index cf4852a92..e5ba9e1e0 100644 --- a/PBS/Animations/Converted/Move/HYDROPUMP.txt +++ b/PBS/Animations/Converted/Move/HYDROPUMP.txt @@ -11,13 +11,11 @@ Name = HYDROPUMP Graphic = icewater Focus = Target - SetVisible = 0,true SetX = 2,480 SetY = 2,94 Graphic = icewater Focus = Target - SetVisible = 0,true SetX = 5,296 SetY = 5,94 @@ -25,7 +23,6 @@ Name = HYDROPUMP Focus = Target SetX = 0,384 SetY = 0,118 - SetVisible = 0,true SetX = 3,392 SetX = 4,400 SetX = 5,376 diff --git a/PBS/Animations/Converted/Move/HYPERFANG.txt b/PBS/Animations/Converted/Move/HYPERFANG.txt index d6b8645d9..7d8c46a95 100644 --- a/PBS/Animations/Converted/Move/HYPERFANG.txt +++ b/PBS/Animations/Converted/Move/HYPERFANG.txt @@ -13,7 +13,6 @@ Name = HYPERFANG Focus = Target SetX = 0,376 SetY = 0,94 - SetVisible = 0,true SetX = 2,384 SetY = 2,102 SetX = 4,376 diff --git a/PBS/Animations/Converted/Move/ICEBALL.txt b/PBS/Animations/Converted/Move/ICEBALL.txt index d7600d61e..79e6be78c 100644 --- a/PBS/Animations/Converted/Move/ICEBALL.txt +++ b/PBS/Animations/Converted/Move/ICEBALL.txt @@ -13,7 +13,6 @@ Name = ICEBALL Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,140 SetY = 1,198 SetX = 2,172 diff --git a/PBS/Animations/Converted/Move/ICEFANG.txt b/PBS/Animations/Converted/Move/ICEFANG.txt index 5b67cde7e..5b1207c2b 100644 --- a/PBS/Animations/Converted/Move/ICEFANG.txt +++ b/PBS/Animations/Converted/Move/ICEFANG.txt @@ -13,7 +13,6 @@ Name = ICEFANG Focus = Target SetX = 0,395 SetY = 0,94 - SetVisible = 0,true SetX = 1,390 SetY = 1,92 SetX = 2,389 @@ -41,7 +40,6 @@ Name = ICEFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 7,330 SetY = 7,111 SetOpacity = 7,208 @@ -60,7 +58,6 @@ Name = ICEFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 8,332 SetY = 8,111 SetOpacity = 8,133 @@ -76,7 +73,6 @@ Name = ICEFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 8,473 SetY = 8,65 SetOpacity = 8,213 @@ -89,7 +85,6 @@ Name = ICEFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 9,399 SetY = 9,30 SetOpacity = 9,144 @@ -98,7 +93,6 @@ Name = ICEFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 10,450 SetY = 10,90 SetOpacity = 10,154 diff --git a/PBS/Animations/Converted/Move/ICEPUNCH.txt b/PBS/Animations/Converted/Move/ICEPUNCH.txt index a8205d262..72c370442 100644 --- a/PBS/Animations/Converted/Move/ICEPUNCH.txt +++ b/PBS/Animations/Converted/Move/ICEPUNCH.txt @@ -13,7 +13,6 @@ Name = ICEPUNCH Focus = Target SetX = 0,384 SetY = 0,93 - SetVisible = 0,true SetY = 1,91 SetX = 2,409 SetY = 2,116 @@ -34,7 +33,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 1,387 SetY = 1,96 SetX = 2,385 @@ -55,7 +53,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,348 SetY = 2,107 SetX = 3,334 @@ -75,7 +72,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 3,383 SetY = 3,63 SetX = 4,393 @@ -91,7 +87,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,118 SetX = 4,375 @@ -107,7 +102,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 4,408 SetY = 4,127 SetX = 5,391 @@ -121,7 +115,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 4,378 SetY = 4,99 SetX = 5,399 @@ -133,7 +126,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 5,332 SetY = 5,33 SetX = 6,380 @@ -143,7 +135,6 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 5,381 SetY = 5,93 SetX = 6,383 @@ -153,19 +144,16 @@ Name = ICEPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 7,392 SetY = 7,104 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 7,363 SetY = 7,85 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 7,393 SetY = 7,83 diff --git a/PBS/Animations/Converted/Move/ICICLESPEAR.txt b/PBS/Animations/Converted/Move/ICICLESPEAR.txt index d6023337c..358436765 100644 --- a/PBS/Animations/Converted/Move/ICICLESPEAR.txt +++ b/PBS/Animations/Converted/Move/ICICLESPEAR.txt @@ -15,7 +15,6 @@ Name = ICICLESPEAR SetX = 0,192 SetY = 0,192 SetAngle = 0,135 - SetVisible = 0,true SetX = 1,256 SetY = 1,173 SetX = 2,294 @@ -46,7 +45,6 @@ Name = Icicle Spear hit 2 SetX = 0,192 SetY = 0,192 SetAngle = 0,135 - SetVisible = 0,true SetX = 1,256 SetY = 1,173 SetX = 2,294 @@ -77,7 +75,6 @@ Name = Icicle Spear hit 3 SetX = 0,192 SetY = 0,192 SetAngle = 0,135 - SetVisible = 0,true SetX = 1,256 SetY = 1,173 SetX = 2,294 @@ -108,7 +105,6 @@ Name = Icicle Spear hit 4 SetX = 0,192 SetY = 0,192 SetAngle = 0,135 - SetVisible = 0,true SetX = 1,256 SetY = 1,173 SetX = 2,294 @@ -139,7 +135,6 @@ Name = Icicle Spear hit 5 SetX = 0,192 SetY = 0,192 SetAngle = 0,135 - SetVisible = 0,true SetX = 1,256 SetY = 1,173 SetX = 2,294 diff --git a/PBS/Animations/Converted/Move/ICYWIND.txt b/PBS/Animations/Converted/Move/ICYWIND.txt index 07942e8df..312999e1c 100644 --- a/PBS/Animations/Converted/Move/ICYWIND.txt +++ b/PBS/Animations/Converted/Move/ICYWIND.txt @@ -11,7 +11,6 @@ Name = ICYWIND Graphic = Ice1 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,134 SetY = 1,192 SetX = 2,179 @@ -26,7 +25,6 @@ Name = ICYWIND Graphic = Ice1 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,172 SetY = 3,179 SetX = 4,204 @@ -38,7 +36,6 @@ Name = ICYWIND Focus = UserAndTarget SetX = 0,140 SetY = 0,192 - SetVisible = 0,true SetX = 1,166 SetY = 1,186 SetX = 2,236 diff --git a/PBS/Animations/Converted/Move/INFERNO.txt b/PBS/Animations/Converted/Move/INFERNO.txt index 53d44698f..b04444834 100644 --- a/PBS/Animations/Converted/Move/INFERNO.txt +++ b/PBS/Animations/Converted/Move/INFERNO.txt @@ -13,7 +13,6 @@ Name = INFERNO Focus = Target SetX = 0,368 SetY = 0,128 - SetVisible = 0,true SetX = 1,361 SetY = 1,122 SetX = 2,360 @@ -36,7 +35,6 @@ Name = INFERNO Focus = Target SetX = 0,405 SetY = 0,123 - SetVisible = 0,true SetX = 1,410 SetY = 1,121 SetX = 2,383 @@ -57,7 +55,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,387 SetY = 1,119 SetX = 2,407 @@ -79,7 +76,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,377 SetY = 1,105 SetX = 2,380 @@ -101,7 +97,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 1,402 SetY = 1,107 SetX = 2,397 @@ -123,7 +118,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 2,364 SetY = 2,103 SetX = 3,409 @@ -143,7 +137,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 2,386 SetY = 2,95 SetX = 3,349 @@ -163,7 +156,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 2,349 SetY = 2,92 SetX = 3,373 @@ -183,7 +175,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,393 SetY = 3,99 SetX = 4,402 @@ -199,7 +190,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,357 SetY = 3,89 SetX = 4,395 @@ -215,7 +205,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,412 SetY = 3,95 SetX = 4,357 @@ -227,7 +216,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 3,380 SetY = 3,81 SetX = 4,385 @@ -239,7 +227,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,367 SetY = 4,74 SetX = 7,355 @@ -249,7 +236,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,343 SetY = 4,79 SetX = 7,383 @@ -259,7 +245,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,402 SetY = 4,76 SetX = 7,419 @@ -269,7 +254,6 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 4,382 SetY = 4,58 SetX = 7,422 @@ -279,19 +263,16 @@ Name = INFERNO Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 8,423 SetY = 8,116 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 8,414 SetY = 8,138 Graphic = Flames Focus = Target - SetVisible = 0,true SetX = 8,396 SetY = 8,33 diff --git a/PBS/Animations/Converted/Move/IRONHEAD.txt b/PBS/Animations/Converted/Move/IRONHEAD.txt index 0367927d5..fbc6f1109 100644 --- a/PBS/Animations/Converted/Move/IRONHEAD.txt +++ b/PBS/Animations/Converted/Move/IRONHEAD.txt @@ -11,14 +11,12 @@ Name = IRONHEAD Graphic = Iron Head Focus = Target - SetVisible = 0,true SetX = 1,384 SetY = 1,97 SetOpacity = 7,128 Graphic = Iron Head Focus = Target - SetVisible = 0,true SetX = 2,331 SetY = 2,114 SetX = 3,278 @@ -29,7 +27,6 @@ Name = IRONHEAD Graphic = Iron Head Focus = Target - SetVisible = 0,true SetX = 2,437 SetY = 2,118 SetX = 3,485 @@ -40,7 +37,6 @@ Name = IRONHEAD Graphic = Iron Head Focus = Target - SetVisible = 0,true SetX = 3,279 SetY = 3,82 SetX = 4,266 @@ -48,7 +44,6 @@ Name = IRONHEAD Graphic = Iron Head Focus = Target - SetVisible = 0,true SetX = 3,461 SetY = 3,69 SetX = 4,513 @@ -56,7 +51,6 @@ Name = IRONHEAD Graphic = Iron Head Focus = Target - SetVisible = 0,true SetX = 3,275 SetY = 3,33 diff --git a/PBS/Animations/Converted/Move/JUMPKICK.txt b/PBS/Animations/Converted/Move/JUMPKICK.txt index 7bba3a7d1..3fa89ffc6 100644 --- a/PBS/Animations/Converted/Move/JUMPKICK.txt +++ b/PBS/Animations/Converted/Move/JUMPKICK.txt @@ -15,7 +15,6 @@ Name = JUMPKICK SetY = 0,142 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetX = 1,488 SetY = 1,110 SetX = 2,456 diff --git a/PBS/Animations/Converted/Move/KARATECHOP.txt b/PBS/Animations/Converted/Move/KARATECHOP.txt index d06410fb5..a07dbb49f 100644 --- a/PBS/Animations/Converted/Move/KARATECHOP.txt +++ b/PBS/Animations/Converted/Move/KARATECHOP.txt @@ -13,7 +13,6 @@ Name = KARATECHOP Focus = Target SetX = 0,232 SetY = 0,30 - SetVisible = 0,true SetX = 1,272 SetY = 1,38 SetAngle = 1,350 diff --git a/PBS/Animations/Converted/Move/KINESIS.txt b/PBS/Animations/Converted/Move/KINESIS.txt index bfba0b1c8..4dccdbafa 100644 --- a/PBS/Animations/Converted/Move/KINESIS.txt +++ b/PBS/Animations/Converted/Move/KINESIS.txt @@ -13,7 +13,6 @@ Name = KINESIS Focus = Target SetX = 0,383 SetY = 0,94 - SetVisible = 0,true SetX = 1,385 SetX = 2,384 SetY = 2,95 diff --git a/PBS/Animations/Converted/Move/LEAFBLADE.txt b/PBS/Animations/Converted/Move/LEAFBLADE.txt index 1ae4b8b6b..aed421ebc 100644 --- a/PBS/Animations/Converted/Move/LEAFBLADE.txt +++ b/PBS/Animations/Converted/Move/LEAFBLADE.txt @@ -13,7 +13,6 @@ Name = LEAFBLADE Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Sword1,80,100 Play = 3,Slash3,80,100 diff --git a/PBS/Animations/Converted/Move/LEECHLIFE.txt b/PBS/Animations/Converted/Move/LEECHLIFE.txt index 0f70cd82e..72872cbff 100644 --- a/PBS/Animations/Converted/Move/LEECHLIFE.txt +++ b/PBS/Animations/Converted/Move/LEECHLIFE.txt @@ -13,7 +13,6 @@ Name = LEECHLIFE Focus = UserAndTarget SetX = 0,166 SetY = 0,224 - SetVisible = 0,true SetX = 1,224 SetY = 1,179 SetX = 2,294 @@ -43,7 +42,6 @@ Name = LEECHLIFE Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 4,339 SetY = 4,98 SetX = 5,332 @@ -62,7 +60,6 @@ Name = LEECHLIFE Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 4,384 SetY = 4,154 SetX = 5,345 @@ -80,7 +77,6 @@ Name = LEECHLIFE Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 6,384 SetY = 6,116 SetX = 7,326 @@ -92,7 +88,6 @@ Name = LEECHLIFE Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 6,339 SetY = 6,79 SetX = 7,256 @@ -101,20 +96,17 @@ Name = LEECHLIFE Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 7,377 SetY = 7,85 SetX = 8,268 Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 7,320 SetY = 7,79 Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 7,396 SetY = 7,129 diff --git a/PBS/Animations/Converted/Move/LEECHSEED.txt b/PBS/Animations/Converted/Move/LEECHSEED.txt index 179abdccc..817fcbfb5 100644 --- a/PBS/Animations/Converted/Move/LEECHSEED.txt +++ b/PBS/Animations/Converted/Move/LEECHSEED.txt @@ -11,7 +11,6 @@ Name = LEECHSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,147 SetY = 4,205 SetX = 5,179 @@ -27,7 +26,6 @@ Name = LEECHSEED Focus = UserAndTarget SetX = 0,147 SetY = 0,205 - SetVisible = 0,true SetX = 1,198 SetY = 1,142 SetX = 2,249 @@ -46,7 +44,6 @@ Name = LEECHSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,147 SetY = 2,205 SetX = 3,185 @@ -77,7 +74,6 @@ Name = LEECHSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,384 SetY = 2,98 SetX = 3,352 @@ -95,7 +91,6 @@ Name = LEECHSEED Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,384 SetY = 4,98 SetX = 5,352 @@ -111,7 +106,6 @@ Name = LEECHSEED Focus = UserAndTarget SetX = 0,384 SetY = 0,98 - SetVisible = 0,true SetX = 1,352 SetY = 1,79 SetX = 2,313 diff --git a/PBS/Animations/Converted/Move/LEER.txt b/PBS/Animations/Converted/Move/LEER.txt index f249bfc7e..de90a011c 100644 --- a/PBS/Animations/Converted/Move/LEER.txt +++ b/PBS/Animations/Converted/Move/LEER.txt @@ -13,7 +13,6 @@ Name = LEER Focus = UserAndTarget SetX = 0,147 SetY = 0,205 - SetVisible = 0,true SetY = 1,203 SetX = 2,148 SetY = 2,201 @@ -37,7 +36,6 @@ Name = LEER Focus = UserAndTarget SetX = 0,350 SetY = 0,79 - SetVisible = 0,true SetY = 1,77 SetX = 2,352 SetY = 2,75 diff --git a/PBS/Animations/Converted/Move/LICK.txt b/PBS/Animations/Converted/Move/LICK.txt index d53ff8346..3b4abbf58 100644 --- a/PBS/Animations/Converted/Move/LICK.txt +++ b/PBS/Animations/Converted/Move/LICK.txt @@ -13,7 +13,6 @@ Name = LICK Focus = Target SetX = 0,400 SetY = 0,142 - SetVisible = 0,true SetY = 1,118 SetY = 2,94 SetY = 3,70 diff --git a/PBS/Animations/Converted/Move/LIGHTSCREEN.txt b/PBS/Animations/Converted/Move/LIGHTSCREEN.txt index bb25a6bbc..3b4b76603 100644 --- a/PBS/Animations/Converted/Move/LIGHTSCREEN.txt +++ b/PBS/Animations/Converted/Move/LIGHTSCREEN.txt @@ -11,7 +11,6 @@ Name = LIGHTSCREEN Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 1,442 SetY = 1,57 SetX = 2,446 @@ -34,7 +33,6 @@ Name = LIGHTSCREEN Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 4,368 SetY = 4,111 SetX = 5,412 @@ -52,7 +50,6 @@ Name = LIGHTSCREEN Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 7,440 SetY = 7,160 SetX = 8,421 @@ -64,7 +61,6 @@ Name = LIGHTSCREEN Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 8,384 SetY = 8,42 SetX = 9,421 @@ -74,7 +70,6 @@ Name = LIGHTSCREEN Graphic = anim sheet Focus = Target - SetVisible = 0,true SetBlending = 1,1 SetX = 1,390 SetY = 1,95 diff --git a/PBS/Animations/Converted/Move/LOCKON.txt b/PBS/Animations/Converted/Move/LOCKON.txt index f727be89d..513771eb9 100644 --- a/PBS/Animations/Converted/Move/LOCKON.txt +++ b/PBS/Animations/Converted/Move/LOCKON.txt @@ -11,7 +11,6 @@ Name = LOCKON Graphic = mixed Focus = Target - SetVisible = 0,true SetX = 2,395 SetY = 2,95 SetZoomX = 2,200 @@ -27,7 +26,6 @@ Name = LOCKON SetY = 0,99 SetZoomX = 0,200 SetZoomY = 0,200 - SetVisible = 0,true SetX = 1,397 SetY = 1,94 SetX = 4,404 diff --git a/PBS/Animations/Converted/Move/LOVELYKISS.txt b/PBS/Animations/Converted/Move/LOVELYKISS.txt index 5893079bc..428427970 100644 --- a/PBS/Animations/Converted/Move/LOVELYKISS.txt +++ b/PBS/Animations/Converted/Move/LOVELYKISS.txt @@ -13,7 +13,6 @@ Name = LOVELYKISS Focus = UserAndTarget SetX = 0,395 SetY = 0,130 - SetVisible = 0,true SetX = 1,383 SetY = 1,102 SetX = 2,382 @@ -34,7 +33,6 @@ Name = LOVELYKISS Graphic = poi.hear.mus Focus = UserAndTarget - SetVisible = 0,true SetX = 1,376 SetY = 1,94 SetX = 2,405 @@ -55,7 +53,6 @@ Name = LOVELYKISS Graphic = poi.hear.mus Focus = UserAndTarget - SetVisible = 0,true SetX = 1,407 SetY = 1,139 SetX = 2,372 @@ -77,7 +74,6 @@ Name = LOVELYKISS Graphic = poi.hear.mus Focus = UserAndTarget - SetVisible = 0,true SetX = 5,370 SetY = 5,70 SetX = 6,337 @@ -90,7 +86,6 @@ Name = LOVELYKISS Graphic = poi.hear.mus Focus = UserAndTarget - SetVisible = 0,true SetX = 6,359 SetY = 6,56 SetX = 7,355 @@ -98,7 +93,6 @@ Name = LOVELYKISS Graphic = poi.hear.mus Focus = UserAndTarget - SetVisible = 0,true SetX = 7,331 SetY = 7,59 diff --git a/PBS/Animations/Converted/Move/LOWKICK.txt b/PBS/Animations/Converted/Move/LOWKICK.txt index 886fe934b..240cf5b6a 100644 --- a/PBS/Animations/Converted/Move/LOWKICK.txt +++ b/PBS/Animations/Converted/Move/LOWKICK.txt @@ -15,7 +15,6 @@ Name = LOWKICK SetY = 0,158 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetOpacity = 0,100 SetX = 1,424 SetY = 1,134 diff --git a/PBS/Animations/Converted/Move/LUCKYCHANT.txt b/PBS/Animations/Converted/Move/LUCKYCHANT.txt index ef1cc6d17..494a48d97 100644 --- a/PBS/Animations/Converted/Move/LUCKYCHANT.txt +++ b/PBS/Animations/Converted/Move/LUCKYCHANT.txt @@ -13,7 +13,6 @@ Name = LUCKYCHANT Focus = UserAndTarget SetX = 0,375 SetY = 0,100 - SetVisible = 0,true SetOpacity = 0,220 SetOpacity = 9,128 @@ -21,7 +20,6 @@ Name = LUCKYCHANT Focus = UserAndTarget SetX = 0,336 SetY = 0,87 - SetVisible = 0,true SetX = 1,426 SetY = 1,151 SetX = 2,352 @@ -42,7 +40,6 @@ Name = LUCKYCHANT Focus = UserAndTarget SetX = 0,336 SetY = 0,104 - SetVisible = 0,true SetX = 1,341 SetY = 1,130 SetX = 2,346 @@ -61,7 +58,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 1,343 SetY = 1,143 SetX = 2,358 @@ -80,7 +76,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 1,361 SetY = 1,150 SetX = 2,417 @@ -98,7 +93,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 2,432 SetY = 2,129 SetX = 3,351 @@ -115,7 +109,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 2,423 SetY = 2,144 SetX = 3,339 @@ -132,7 +125,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 2,406 SetY = 2,145 SetX = 3,425 @@ -149,7 +141,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 2,427 SetY = 2,111 SetX = 3,435 @@ -166,7 +157,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 2,358 SetY = 2,109 SetX = 3,432 @@ -183,7 +173,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 3,439 SetY = 3,105 SetY = 4,126 @@ -197,7 +186,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 3,353 SetY = 3,96 SetX = 4,435 @@ -212,7 +200,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 3,429 SetY = 3,94 SetX = 4,444 @@ -227,7 +214,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 4,427 SetY = 4,91 SetX = 5,434 @@ -240,7 +226,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 4,345 SetY = 4,106 SetX = 6,326 @@ -251,7 +236,6 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 6,340 SetY = 6,76 SetX = 7,446 @@ -260,35 +244,30 @@ Name = LUCKYCHANT Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 7,431 SetY = 7,94 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 7,442 SetY = 7,82 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 7,420 SetY = 7,64 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 7,407 SetY = 7,55 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetVisible = 0,true SetX = 7,413 SetY = 7,68 SetOpacity = 9,128 diff --git a/PBS/Animations/Converted/Move/MACHPUNCH.txt b/PBS/Animations/Converted/Move/MACHPUNCH.txt index 02c950ce4..6d82c624b 100644 --- a/PBS/Animations/Converted/Move/MACHPUNCH.txt +++ b/PBS/Animations/Converted/Move/MACHPUNCH.txt @@ -11,7 +11,6 @@ Name = MACHPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,399 SetY = 2,95 @@ -21,7 +20,6 @@ Name = MACHPUNCH SetY = 0,97 SetZoomX = 0,80 SetZoomY = 0,80 - SetVisible = 0,true SetX = 1,400 SetY = 1,96 SetZoomX = 1,90 diff --git a/PBS/Animations/Converted/Move/MAGICCOAT.txt b/PBS/Animations/Converted/Move/MAGICCOAT.txt index d90492136..01aa6f885 100644 --- a/PBS/Animations/Converted/Move/MAGICCOAT.txt +++ b/PBS/Animations/Converted/Move/MAGICCOAT.txt @@ -13,7 +13,6 @@ Name = MAGICCOAT Focus = Target SetX = 0,385 SetY = 0,98 - SetVisible = 0,true SetOpacity = 0,37 SetOpacity = 1,74 SetOpacity = 9,72 @@ -21,7 +20,6 @@ Name = MAGICCOAT Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 2,388 SetY = 2,27 SetX = 3,372 @@ -43,7 +41,6 @@ Name = MAGICCOAT Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 2,403 SetY = 2,46 SetX = 3,353 @@ -65,7 +62,6 @@ Name = MAGICCOAT Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 2,428 SetY = 2,159 SetX = 3,340 @@ -84,7 +80,6 @@ Name = MAGICCOAT Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 2,405 SetY = 2,164 SetX = 3,417 @@ -102,7 +97,6 @@ Name = MAGICCOAT Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 2,337 SetY = 2,147 SetX = 3,430 @@ -114,7 +108,6 @@ Name = MAGICCOAT Graphic = anim sheet Focus = Target - SetVisible = 0,true SetX = 2,337 SetY = 2,120 SetX = 6,453 diff --git a/PBS/Animations/Converted/Move/MEANLOOK.txt b/PBS/Animations/Converted/Move/MEANLOOK.txt index 48745cc06..e46d20ec6 100644 --- a/PBS/Animations/Converted/Move/MEANLOOK.txt +++ b/PBS/Animations/Converted/Move/MEANLOOK.txt @@ -13,7 +13,6 @@ Name = MEANLOOK Focus = Target SetX = 0,384 SetY = 0,92 - SetVisible = 0,true SetY = 1,96 SetY = 2,94 SetX = 3,385 diff --git a/PBS/Animations/Converted/Move/MEGADRAIN.txt b/PBS/Animations/Converted/Move/MEGADRAIN.txt index 412c324fd..0e6f42c6e 100644 --- a/PBS/Animations/Converted/Move/MEGADRAIN.txt +++ b/PBS/Animations/Converted/Move/MEGADRAIN.txt @@ -13,7 +13,6 @@ Name = MEGADRAIN Focus = UserAndTarget SetX = 0,345 SetY = 0,91 - SetVisible = 0,true SetX = 1,294 SetY = 1,98 SetX = 2,211 @@ -26,7 +25,6 @@ Name = MEGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 1,396 SetY = 1,116 SetX = 2,358 @@ -46,7 +44,6 @@ Name = MEGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 2,339 SetY = 2,104 SetX = 3,262 @@ -64,7 +61,6 @@ Name = MEGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 3,371 SetY = 3,123 SetX = 4,320 @@ -79,7 +75,6 @@ Name = MEGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 3,371 SetY = 3,91 SetX = 4,307 @@ -93,7 +88,6 @@ Name = MEGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 4,377 SetY = 4,104 SetX = 5,352 @@ -105,7 +99,6 @@ Name = MEGADRAIN Graphic = rockice Focus = UserAndTarget - SetVisible = 0,true SetX = 4,371 SetY = 4,85 SetX = 5,313 @@ -127,7 +120,6 @@ Name = MEGADRAIN Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 1,129 SetY = 1,237 SetX = 2,191 @@ -158,7 +150,6 @@ Name = MEGADRAIN Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 2,129 SetY = 2,218 SetX = 3,211 @@ -188,7 +179,6 @@ Name = MEGADRAIN Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 3,132 SetY = 3,224 SetX = 4,349 @@ -214,7 +204,6 @@ Name = MEGADRAIN Graphic = leech-seed Focus = UserAndTarget - SetVisible = 0,true SetX = 4,307 SetY = 4,97 SetX = 5,249 @@ -231,7 +220,6 @@ Name = MEGADRAIN Focus = UserAndTarget SetX = 0,128 SetY = 0,219 - SetVisible = 0,true SetX = 1,149 SetY = 1,233 SetX = 2,221 diff --git a/PBS/Animations/Converted/Move/MEGAHORN.txt b/PBS/Animations/Converted/Move/MEGAHORN.txt index bf49b1268..af277292e 100644 --- a/PBS/Animations/Converted/Move/MEGAHORN.txt +++ b/PBS/Animations/Converted/Move/MEGAHORN.txt @@ -15,7 +15,6 @@ Name = MEGAHORN SetY = 0,116 SetZoomX = 0,25 SetZoomY = 0,25 - SetVisible = 0,true SetX = 1,89 SetY = 1,154 SetX = 2,140 @@ -41,7 +40,6 @@ Name = MEGAHORN SetY = 0,242 SetZoomX = 0,25 SetZoomY = 0,25 - SetVisible = 0,true SetX = 1,185 SetY = 1,148 SetX = 2,179 @@ -61,7 +59,6 @@ Name = MEGAHORN SetY = 0,104 SetZoomX = 0,25 SetZoomY = 0,25 - SetVisible = 0,true SetX = 1,224 SetY = 1,224 SetX = 2,185 @@ -71,7 +68,6 @@ Name = MEGAHORN Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,121 SetY = 2,110 SetZoomX = 2,25 @@ -83,7 +79,6 @@ Name = MEGAHORN SetY = 0,186 SetZoomX = 0,150 SetZoomY = 0,150 - SetVisible = 0,true SetX = 5,115 SetY = 5,198 SetZoomX = 5,25 diff --git a/PBS/Animations/Converted/Move/MEGAKICK.txt b/PBS/Animations/Converted/Move/MEGAKICK.txt index f538fdb61..90605be90 100644 --- a/PBS/Animations/Converted/Move/MEGAKICK.txt +++ b/PBS/Animations/Converted/Move/MEGAKICK.txt @@ -11,7 +11,6 @@ Name = MEGAKICK Graphic = 003-Attack01 Focus = Target - SetVisible = 0,true SetX = 3,384 SetY = 3,110 @@ -19,7 +18,6 @@ Name = MEGAKICK Focus = Target SetX = 0,376 SetY = 0,86 - SetVisible = 0,true SetY = 1,94 SetAngle = 1,45 SetX = 2,384 diff --git a/PBS/Animations/Converted/Move/MEGAPUNCH.txt b/PBS/Animations/Converted/Move/MEGAPUNCH.txt index f76c6b848..0f872a763 100644 --- a/PBS/Animations/Converted/Move/MEGAPUNCH.txt +++ b/PBS/Animations/Converted/Move/MEGAPUNCH.txt @@ -11,7 +11,6 @@ Name = MEGAPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,396 SetY = 2,104 SetX = 3,397 @@ -30,7 +29,6 @@ Name = MEGAPUNCH Focus = Target SetX = 0,384 SetY = 0,95 - SetVisible = 0,true SetX = 1,385 SetY = 1,93 SetX = 2,384 diff --git a/PBS/Animations/Converted/Move/METALCLAW.txt b/PBS/Animations/Converted/Move/METALCLAW.txt index 64a659556..cd12b125e 100644 --- a/PBS/Animations/Converted/Move/METALCLAW.txt +++ b/PBS/Animations/Converted/Move/METALCLAW.txt @@ -13,7 +13,6 @@ Name = METALCLAW Focus = UserAndTarget SetX = 0,387 SetY = 0,70 - SetVisible = 0,true SetX = 1,392 SetY = 1,73 SetX = 2,402 diff --git a/PBS/Animations/Converted/Move/METEORMASH.txt b/PBS/Animations/Converted/Move/METEORMASH.txt index eed1a141c..e908306ec 100644 --- a/PBS/Animations/Converted/Move/METEORMASH.txt +++ b/PBS/Animations/Converted/Move/METEORMASH.txt @@ -13,7 +13,6 @@ Name = METEORMASH Focus = UserAndTarget SetX = 0,390 SetY = 0,98 - SetVisible = 0,true SetX = 1,395 SetY = 1,100 SetX = 2,390 @@ -25,7 +24,6 @@ Name = METEORMASH Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 1,389 SetY = 1,150 SetX = 2,386 @@ -47,7 +45,6 @@ Name = METEORMASH Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 1,340 SetY = 1,116 SetX = 2,334 @@ -68,7 +65,6 @@ Name = METEORMASH Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 2,419 SetY = 2,61 SetX = 3,412 @@ -88,7 +84,6 @@ Name = METEORMASH Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 2,429 SetY = 2,131 SetY = 3,136 @@ -103,7 +98,6 @@ Name = METEORMASH Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 3,369 SetY = 3,68 SetX = 5,341 @@ -115,7 +109,6 @@ Name = METEORMASH Graphic = punches Focus = UserAndTarget - SetVisible = 0,true SetX = 5,371 SetY = 5,67 SetX = 6,385 diff --git a/PBS/Animations/Converted/Move/METRONOME.txt b/PBS/Animations/Converted/Move/METRONOME.txt index af2ba4ab4..3aa7d2c56 100644 --- a/PBS/Animations/Converted/Move/METRONOME.txt +++ b/PBS/Animations/Converted/Move/METRONOME.txt @@ -15,7 +15,6 @@ Name = METRONOME SetY = 0,222 SetZoomX = 0,200 SetZoomY = 0,200 - SetVisible = 0,true SetX = 1,187 SetY = 1,233 SetX = 2,200 @@ -60,7 +59,6 @@ Name = METRONOME SetY = 0,100 SetZoomX = 0,200 SetZoomY = 0,200 - SetVisible = 0,true SetX = 1,375 SetY = 1,101 SetX = 2,366 diff --git a/PBS/Animations/Converted/Move/MIST.txt b/PBS/Animations/Converted/Move/MIST.txt index c877db2fb..9ba7d3d2e 100644 --- a/PBS/Animations/Converted/Move/MIST.txt +++ b/PBS/Animations/Converted/Move/MIST.txt @@ -11,7 +11,6 @@ Name = MIST Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,414 SetY = 4,101 SetX = 5,393 @@ -21,7 +20,6 @@ Name = MIST Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 5,426 SetY = 5,116 SetX = 6,381 @@ -31,7 +29,6 @@ Name = MIST Focus = Target SetX = 0,385 SetY = 0,99 - SetVisible = 0,true SetOpacity = 0,144 SetX = 1,392 SetY = 1,96 diff --git a/PBS/Animations/Converted/Move/MISTBALL.txt b/PBS/Animations/Converted/Move/MISTBALL.txt index 8435f989a..1b30e4464 100644 --- a/PBS/Animations/Converted/Move/MISTBALL.txt +++ b/PBS/Animations/Converted/Move/MISTBALL.txt @@ -11,7 +11,6 @@ Name = MISTBALL Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 3,386 SetY = 3,108 SetOpacity = 3,200 @@ -30,7 +29,6 @@ Name = MISTBALL Focus = UserAndTarget SetX = 0,385 SetY = 0,98 - SetVisible = 0,true SetOpacity = 0,200 SetX = 1,383 SetY = 1,99 diff --git a/PBS/Animations/Converted/Move/MOONLIGHT.txt b/PBS/Animations/Converted/Move/MOONLIGHT.txt index c15b1de27..da9045a65 100644 --- a/PBS/Animations/Converted/Move/MOONLIGHT.txt +++ b/PBS/Animations/Converted/Move/MOONLIGHT.txt @@ -15,7 +15,6 @@ Name = MOONLIGHT SetY = 0,206 SetZoomX = 0,50 SetZoomY = 0,50 - SetVisible = 0,true SetY = 1,190 SetY = 2,158 SetY = 3,110 diff --git a/PBS/Animations/Converted/Move/MORNINGSUN.txt b/PBS/Animations/Converted/Move/MORNINGSUN.txt index 08f2106a3..e96efb2ff 100644 --- a/PBS/Animations/Converted/Move/MORNINGSUN.txt +++ b/PBS/Animations/Converted/Move/MORNINGSUN.txt @@ -11,7 +11,6 @@ Name = MORNINGSUN Graphic = Heal3 Focus = Target - SetVisible = 0,true SetX = 10,384 SetY = 10,70 SetOpacity = 10,100 @@ -20,7 +19,6 @@ Name = MORNINGSUN Focus = Target SetX = 0,384 SetY = 0,70 - SetVisible = 0,true SetOpacity = 13,150 SetOpacity = 14,100 diff --git a/PBS/Animations/Converted/Move/NIGHTMARE.txt b/PBS/Animations/Converted/Move/NIGHTMARE.txt index 3a50d73e9..ece9c7e97 100644 --- a/PBS/Animations/Converted/Move/NIGHTMARE.txt +++ b/PBS/Animations/Converted/Move/NIGHTMARE.txt @@ -11,7 +11,6 @@ Name = NIGHTMARE Graphic = 022-Darkness01 Focus = Target - SetVisible = 0,true SetX = 1,424 SetY = 1,46 SetFlip = 5,true @@ -43,7 +42,6 @@ Name = NIGHTMARE Graphic = 022-Darkness01 Focus = Target - SetVisible = 0,true SetFlip = 2,true SetX = 2,344 SetY = 2,78 @@ -64,7 +62,6 @@ Name = NIGHTMARE Graphic = 022-Darkness01 Focus = Target - SetVisible = 0,true SetX = 4,376 SetY = 4,118 SetOpacity = 4,100 @@ -81,7 +78,6 @@ Name = NIGHTMARE Graphic = 022-Darkness01 Focus = Target - SetVisible = 0,true SetX = 4,424 SetY = 4,86 SetX = 5,392 @@ -96,7 +92,6 @@ Name = NIGHTMARE Focus = Target SetX = 0,384 SetY = 0,102 - SetVisible = 0,true SetOpacity = 0,100 SetOpacity = 1,150 SetOpacity = 2,200 diff --git a/PBS/Animations/Converted/Move/OUTRAGE.txt b/PBS/Animations/Converted/Move/OUTRAGE.txt index c53e47016..48367cebb 100644 --- a/PBS/Animations/Converted/Move/OUTRAGE.txt +++ b/PBS/Animations/Converted/Move/OUTRAGE.txt @@ -15,7 +15,6 @@ Name = OUTRAGE SetY = 0,161 SetZoomX = 0,50 SetZoomY = 0,50 - SetVisible = 0,true SetFlip = 3,true SetFlip = 5,false SetX = 5,262 @@ -44,7 +43,6 @@ Name = OUTRAGE Graphic = Fogo - 01 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,179 SetY = 2,198 SetZoomX = 2,50 @@ -80,7 +78,6 @@ Name = OUTRAGE Graphic = Fogo - 01 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 3,true SetX = 3,89 SetY = 3,161 @@ -108,7 +105,6 @@ Name = OUTRAGE Graphic = Fogo - 01 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,185 SetY = 4,224 SetZoomX = 4,50 @@ -132,7 +128,6 @@ Name = OUTRAGE Graphic = Fogo - 01 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,224 SetY = 5,217 SetZoomX = 5,50 @@ -146,7 +141,6 @@ Name = OUTRAGE Graphic = Fogo - 01 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,166 SetY = 5,198 SetZoomX = 5,50 @@ -161,7 +155,6 @@ Name = OUTRAGE Graphic = Fogo - 01 Focus = UserAndTarget - SetVisible = 0,true SetX = 7,128 SetY = 7,186 SetZoomX = 7,50 diff --git a/PBS/Animations/Converted/Move/OVERHEAT.txt b/PBS/Animations/Converted/Move/OVERHEAT.txt index 198b1b719..2d605b937 100644 --- a/PBS/Animations/Converted/Move/OVERHEAT.txt +++ b/PBS/Animations/Converted/Move/OVERHEAT.txt @@ -13,7 +13,6 @@ Name = OVERHEAT Focus = UserAndTarget SetX = 0,134 SetY = 0,179 - SetVisible = 0,true SetY = 1,173 SetY = 2,167 SetY = 3,161 @@ -28,7 +27,6 @@ Name = OVERHEAT Graphic = fire4 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,172 SetY = 1,179 SetX = 2,179 @@ -46,7 +44,6 @@ Name = OVERHEAT Graphic = fire4 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,211 SetY = 2,123 SetX = 3,243 @@ -60,7 +57,6 @@ Name = OVERHEAT Graphic = fire4 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,224 SetX = 3,243 @@ -77,7 +73,6 @@ Name = OVERHEAT Graphic = fire4 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,96 SetY = 3,167 SetX = 4,140 @@ -86,7 +81,6 @@ Name = OVERHEAT Graphic = fire4 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,256 SetY = 3,217 SetX = 4,192 @@ -96,7 +90,6 @@ Name = OVERHEAT Graphic = fire4 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,83 SetY = 4,186 SetX = 5,32 @@ -104,7 +97,6 @@ Name = OVERHEAT Graphic = fire4 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,179 SetY = 4,135 SetX = 5,236 diff --git a/PBS/Animations/Converted/Move/PAYDAY.txt b/PBS/Animations/Converted/Move/PAYDAY.txt index f144fce82..b2490294c 100644 --- a/PBS/Animations/Converted/Move/PAYDAY.txt +++ b/PBS/Animations/Converted/Move/PAYDAY.txt @@ -11,7 +11,6 @@ Name = PAYDAY Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,128 SetY = 2,236 SetX = 3,172 @@ -29,7 +28,6 @@ Name = PAYDAY Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,128 SetY = 4,236 SetX = 5,153 @@ -37,7 +35,6 @@ Name = PAYDAY Graphic = 008-Weapon03 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,128 SetY = 5,236 @@ -45,7 +42,6 @@ Name = PAYDAY Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,172 SetY = 1,142 SetX = 2,224 diff --git a/PBS/Animations/Converted/Move/PETALDANCE.txt b/PBS/Animations/Converted/Move/PETALDANCE.txt index e68b0492b..084656fa5 100644 --- a/PBS/Animations/Converted/Move/PETALDANCE.txt +++ b/PBS/Animations/Converted/Move/PETALDANCE.txt @@ -11,7 +11,6 @@ Name = PETALDANCE Graphic = Anima (1) Focus = Target - SetVisible = 0,true SetX = 2,576 SetY = 2,-42 SetX = 3,544 @@ -35,7 +34,6 @@ Name = PETALDANCE Graphic = Anima (1) Focus = Target - SetVisible = 0,true SetX = 3,344 SetY = 3,-50 SetX = 4,384 @@ -52,7 +50,6 @@ Name = PETALDANCE Graphic = Anima (1) Focus = Target - SetVisible = 0,true SetX = 5,320 SetY = 5,-42 SetX = 6,280 @@ -64,7 +61,6 @@ Name = PETALDANCE Graphic = Anima (1) Focus = Target - SetVisible = 0,true SetX = 7,320 SetY = 7,-58 @@ -72,7 +68,6 @@ Name = PETALDANCE Focus = Target SetX = 0,224 SetY = 0,-34 - SetVisible = 0,true SetX = 1,240 SetY = 1,6 SetX = 2,272 diff --git a/PBS/Animations/Converted/Move/PINMISSILE.txt b/PBS/Animations/Converted/Move/PINMISSILE.txt index 66ddefa6d..48f375896 100644 --- a/PBS/Animations/Converted/Move/PINMISSILE.txt +++ b/PBS/Animations/Converted/Move/PINMISSILE.txt @@ -11,7 +11,6 @@ Name = PINMISSILE Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,173 SetX = 3,185 @@ -34,7 +33,6 @@ Name = PINMISSILE Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,166 SetY = 4,161 SetX = 5,198 @@ -53,7 +51,6 @@ Name = PINMISSILE Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,364 SetY = 5,91 SetOpacity = 5,50 @@ -62,7 +59,6 @@ Name = PINMISSILE Focus = UserAndTarget SetX = 0,160 SetY = 0,179 - SetVisible = 0,true SetX = 1,179 SetY = 1,142 SetX = 2,211 @@ -111,7 +107,6 @@ Name = Pin Missile hit 2 Focus = UserAndTarget SetX = 0,160 SetY = 0,179 - SetVisible = 0,true SetX = 1,179 SetY = 1,142 SetX = 2,211 @@ -142,7 +137,6 @@ Name = Pin Missile hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,173 SetX = 3,185 @@ -165,7 +159,6 @@ Name = Pin Missile hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,166 SetY = 4,161 SetX = 5,198 @@ -184,7 +177,6 @@ Name = Pin Missile hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,364 SetY = 5,91 SetOpacity = 5,50 @@ -207,7 +199,6 @@ Name = Pin Missile hit 3 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,364 SetY = 5,91 SetOpacity = 5,50 @@ -216,7 +207,6 @@ Name = Pin Missile hit 3 Focus = UserAndTarget SetX = 0,160 SetY = 0,179 - SetVisible = 0,true SetX = 1,179 SetY = 1,142 SetX = 2,211 @@ -247,7 +237,6 @@ Name = Pin Missile hit 3 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,173 SetX = 3,185 @@ -270,7 +259,6 @@ Name = Pin Missile hit 3 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,166 SetY = 4,161 SetX = 5,198 @@ -305,7 +293,6 @@ Name = Pin Missile hit 4 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,166 SetY = 4,161 SetX = 5,198 @@ -324,7 +311,6 @@ Name = Pin Missile hit 4 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,364 SetY = 5,91 SetOpacity = 5,50 @@ -333,7 +319,6 @@ Name = Pin Missile hit 4 Focus = UserAndTarget SetX = 0,160 SetY = 0,179 - SetVisible = 0,true SetX = 1,179 SetY = 1,142 SetX = 2,211 @@ -364,7 +349,6 @@ Name = Pin Missile hit 4 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,173 SetX = 3,185 @@ -403,7 +387,6 @@ Name = Pin Missile hit 5 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,173 SetX = 3,185 @@ -426,7 +409,6 @@ Name = Pin Missile hit 5 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,166 SetY = 4,161 SetX = 5,198 @@ -445,7 +427,6 @@ Name = Pin Missile hit 5 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 5,364 SetY = 5,91 SetOpacity = 5,50 @@ -454,7 +435,6 @@ Name = Pin Missile hit 5 Focus = UserAndTarget SetX = 0,160 SetY = 0,179 - SetVisible = 0,true SetX = 1,179 SetY = 1,142 SetX = 2,211 diff --git a/PBS/Animations/Converted/Move/POISONFANG.txt b/PBS/Animations/Converted/Move/POISONFANG.txt index d91828359..7bd32d518 100644 --- a/PBS/Animations/Converted/Move/POISONFANG.txt +++ b/PBS/Animations/Converted/Move/POISONFANG.txt @@ -11,7 +11,6 @@ Name = POISONFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 7,354 SetY = 7,107 SetX = 8,359 @@ -19,7 +18,6 @@ Name = POISONFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 7,450 SetY = 7,106 SetX = 8,444 @@ -29,7 +27,6 @@ Name = POISONFANG Focus = Target SetX = 0,390 SetY = 0,104 - SetVisible = 0,true SetY = 1,103 SetX = 2,389 SetY = 2,93 diff --git a/PBS/Animations/Converted/Move/POISONGAS.txt b/PBS/Animations/Converted/Move/POISONGAS.txt index 59ed75f0b..6f204bb68 100644 --- a/PBS/Animations/Converted/Move/POISONGAS.txt +++ b/PBS/Animations/Converted/Move/POISONGAS.txt @@ -13,7 +13,6 @@ Name = POISONGAS Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,160 SetY = 1,192 SetX = 2,204 @@ -29,7 +28,6 @@ Name = POISONGAS Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetX = 1,128 SetY = 1,236 SetX = 2,160 @@ -57,7 +55,6 @@ Name = POISONGAS Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetX = 2,128 SetY = 2,236 SetX = 3,160 @@ -77,7 +74,6 @@ Name = POISONGAS Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetX = 3,166 SetY = 3,224 SetX = 4,160 @@ -93,7 +89,6 @@ Name = POISONGAS Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetX = 4,198 @@ -108,7 +103,6 @@ Name = POISONGAS Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetFlip = 5,true SetX = 5,230 SetY = 5,198 @@ -120,7 +114,6 @@ Name = POISONGAS Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetX = 6,230 SetY = 6,192 SetX = 7,320 @@ -128,13 +121,11 @@ Name = POISONGAS Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetX = 6,243 SetY = 6,148 Graphic = poison Focus = UserAndTarget - SetVisible = 0,true SetFlip = 6,true SetX = 6,204 SetY = 6,173 diff --git a/PBS/Animations/Converted/Move/POISONPOWDER.txt b/PBS/Animations/Converted/Move/POISONPOWDER.txt index 4ce8223eb..b50079f86 100644 --- a/PBS/Animations/Converted/Move/POISONPOWDER.txt +++ b/PBS/Animations/Converted/Move/POISONPOWDER.txt @@ -13,6 +13,5 @@ Name = POISONPOWDER Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/POISONSTING.txt b/PBS/Animations/Converted/Move/POISONSTING.txt index 31b7f52ed..ec8f5ccce 100644 --- a/PBS/Animations/Converted/Move/POISONSTING.txt +++ b/PBS/Animations/Converted/Move/POISONSTING.txt @@ -13,7 +13,6 @@ Name = POISONSTING Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,166 SetY = 1,198 SetX = 2,211 @@ -45,7 +44,6 @@ Name = POISONSTING SetX = 0,351 SetY = 0,139 SetAngle = 0,180 - SetVisible = 0,true SetX = 1,319 SetY = 1,154 SetX = 2,287 diff --git a/PBS/Animations/Converted/Move/POISONTAIL.txt b/PBS/Animations/Converted/Move/POISONTAIL.txt index a9a41e53f..f213f5127 100644 --- a/PBS/Animations/Converted/Move/POISONTAIL.txt +++ b/PBS/Animations/Converted/Move/POISONTAIL.txt @@ -13,7 +13,6 @@ Name = POISONTAIL Focus = Target SetX = 0,392 SetY = 0,94 - SetVisible = 0,true SetX = 1,384 SetY = 2,86 SetX = 4,376 diff --git a/PBS/Animations/Converted/Move/POUND.txt b/PBS/Animations/Converted/Move/POUND.txt index f1d2c5320..e4b692327 100644 --- a/PBS/Animations/Converted/Move/POUND.txt +++ b/PBS/Animations/Converted/Move/POUND.txt @@ -11,7 +11,6 @@ Name = POUND Graphic = many Focus = Target - SetVisible = 0,true SetX = 3,392 SetY = 3,94 SetOpacity = 4,100 @@ -20,7 +19,6 @@ Name = POUND Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true SetOpacity = 0,100 SetOpacity = 1,255 SetZoomX = 2,120 diff --git a/PBS/Animations/Converted/Move/PSYCHIC.txt b/PBS/Animations/Converted/Move/PSYCHIC.txt index 44f9da64b..e8afa352a 100644 --- a/PBS/Animations/Converted/Move/PSYCHIC.txt +++ b/PBS/Animations/Converted/Move/PSYCHIC.txt @@ -13,7 +13,6 @@ Name = PSYCHIC Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true SetZoomX = 5,160 SetZoomY = 5,160 SetOpacity = 5,180 @@ -39,7 +38,6 @@ Name = PSYCHIC Graphic = efftest4 Focus = Target - SetVisible = 0,true SetX = 9,384 SetY = 9,94 SetZoomX = 9,300 @@ -50,7 +48,6 @@ Name = PSYCHIC Focus = Target SetX = 0,384 SetY = 0,86 - SetVisible = 0,true SetY = 3,94 SetZoomX = 3,120 SetZoomY = 3,120 diff --git a/PBS/Animations/Converted/Move/PSYCHOCUT.txt b/PBS/Animations/Converted/Move/PSYCHOCUT.txt index eb2bf6919..65dbebcaa 100644 --- a/PBS/Animations/Converted/Move/PSYCHOCUT.txt +++ b/PBS/Animations/Converted/Move/PSYCHOCUT.txt @@ -13,7 +13,6 @@ Name = PSYCHOCUT Focus = Target SetX = 0,140 SetY = 0,248 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,141 SetY = 1,257 @@ -61,7 +60,6 @@ Name = PSYCHOCUT Graphic = Psycho Cut Focus = Target - SetVisible = 0,true SetX = 1,163 SetY = 1,256 SetX = 2,142 @@ -99,7 +97,6 @@ Name = PSYCHOCUT Focus = UserAndTarget SetX = 0,396 SetY = 0,111 - SetVisible = 0,true SetOpacity = 0,128 SetX = 1,375 SetY = 1,125 @@ -159,7 +156,6 @@ Name = PSYCHOCUT Focus = UserAndTarget SetX = 0,389 SetY = 0,126 - SetVisible = 0,true SetOpacity = 0,128 SetAngle = 1,45 SetOpacity = 1,255 diff --git a/PBS/Animations/Converted/Move/QUICKATTACK.txt b/PBS/Animations/Converted/Move/QUICKATTACK.txt index e68670b59..de51c8f63 100644 --- a/PBS/Animations/Converted/Move/QUICKATTACK.txt +++ b/PBS/Animations/Converted/Move/QUICKATTACK.txt @@ -14,7 +14,6 @@ Name = QUICKATTACK Graphic = Tackle_B Focus = User - SetVisible = 0,true SetX = 2,59 SetY = 2,258 SetOpacity = 3,170 @@ -22,7 +21,6 @@ Name = QUICKATTACK Graphic = Tackle_B Focus = User - SetVisible = 0,true SetX = 3,100 SetY = 3,272 SetOpacity = 4,170 @@ -30,7 +28,6 @@ Name = QUICKATTACK Graphic = Tackle_B Focus = User - SetVisible = 0,true SetX = 4,163 SetY = 4,259 SetOpacity = 5,170 @@ -38,7 +35,6 @@ Name = QUICKATTACK Graphic = Tackle_B Focus = User - SetVisible = 0,true SetX = 5,140 SetY = 5,230 SetOpacity = 6,170 @@ -46,7 +42,6 @@ Name = QUICKATTACK Graphic = Tackle_B Focus = Target - SetVisible = 0,true SetX = 1,76 SetY = 1,230 SetOpacity = 2,170 diff --git a/PBS/Animations/Converted/Move/RAINDANCE.txt b/PBS/Animations/Converted/Move/RAINDANCE.txt index fc842e871..6f6354775 100644 --- a/PBS/Animations/Converted/Move/RAINDANCE.txt +++ b/PBS/Animations/Converted/Move/RAINDANCE.txt @@ -13,7 +13,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,197 SetY = 0,25 - SetVisible = 0,true SetX = 1,72 SetY = 1,49 SetX = 2,60 @@ -36,7 +35,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,275 SetY = 0,47 - SetVisible = 0,true SetX = 1,229 SetY = 1,216 SetX = 2,193 @@ -60,7 +58,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,355 SetY = 0,51 - SetVisible = 0,true SetX = 1,109 SetY = 1,217 SetX = 2,265 @@ -84,7 +81,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,450 SetY = 0,50 - SetVisible = 0,true SetX = 1,223 SetY = 1,110 SetX = 2,228 @@ -108,7 +104,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,83 SetY = 0,81 - SetVisible = 0,true SetX = 1,399 SetY = 1,120 SetX = 2,350 @@ -132,7 +127,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,231 SetY = 0,170 - SetVisible = 0,true SetX = 1,480 SetY = 1,83 SetX = 2,399 @@ -156,7 +150,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,352 SetY = 0,212 - SetVisible = 0,true SetX = 1,362 SetY = 1,63 SetX = 2,488 @@ -180,7 +173,6 @@ Name = RAINDANCE Focus = Screen SetX = 0,467 SetY = 0,254 - SetVisible = 0,true SetX = 1,376 SetY = 1,192 SetX = 2,434 @@ -202,7 +194,6 @@ Name = RAINDANCE Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 1,482 SetY = 1,244 SetX = 2,121 @@ -220,7 +211,6 @@ Name = RAINDANCE Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 2,27 SetY = 2,241 SetX = 3,88 @@ -236,7 +226,6 @@ Name = RAINDANCE Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 4,409 SetY = 4,203 SetX = 7,443 @@ -246,6 +235,5 @@ Name = RAINDANCE Graphic = weather Focus = Screen - SetVisible = 0,true SetX = 9,474 SetY = 9,41 diff --git a/PBS/Animations/Converted/Move/RAZORLEAF.txt b/PBS/Animations/Converted/Move/RAZORLEAF.txt index f5a5fd552..ac52f1ddf 100644 --- a/PBS/Animations/Converted/Move/RAZORLEAF.txt +++ b/PBS/Animations/Converted/Move/RAZORLEAF.txt @@ -11,7 +11,6 @@ Name = RAZORLEAF Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 1,144 SetY = 1,204 SetX = 2,175 @@ -39,7 +38,6 @@ Name = RAZORLEAF Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 2,154 SetY = 2,120 SetX = 3,123 @@ -61,7 +59,6 @@ Name = RAZORLEAF Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 3,258 SetY = 3,208 SetX = 4,263 @@ -79,7 +76,6 @@ Name = RAZORLEAF Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 4,211 SetY = 4,78 SetX = 5,118 @@ -91,7 +87,6 @@ Name = RAZORLEAF Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 4,336 SetY = 4,166 SetX = 5,305 @@ -101,7 +96,6 @@ Name = RAZORLEAF Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 4,154 SetY = 4,136 SetX = 5,346 @@ -111,13 +105,11 @@ Name = RAZORLEAF Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 5,216 SetY = 5,96 Graphic = grass Focus = UserAndTarget - SetVisible = 0,true SetX = 5,279 SetY = 5,144 diff --git a/PBS/Animations/Converted/Move/REFLECT.txt b/PBS/Animations/Converted/Move/REFLECT.txt index 9dc65e5a7..a03b93c98 100644 --- a/PBS/Animations/Converted/Move/REFLECT.txt +++ b/PBS/Animations/Converted/Move/REFLECT.txt @@ -13,7 +13,6 @@ Name = REFLECT Focus = Target SetX = 0,376 SetY = 0,86 - SetVisible = 0,true SetOpacity = 0,75 SetOpacity = 1,100 SetOpacity = 2,150 @@ -23,7 +22,6 @@ Name = REFLECT Graphic = normal2 Focus = Target - SetVisible = 0,true SetX = 1,328 SetY = 1,-18 SetX = 2,304 @@ -43,7 +41,6 @@ Name = REFLECT Graphic = normal2 Focus = Target - SetVisible = 0,true SetX = 1,464 SetY = 1,-10 SetX = 2,488 @@ -61,7 +58,6 @@ Name = REFLECT Graphic = normal2 Focus = Target - SetVisible = 0,true SetX = 2,392 SetY = 2,-18 SetY = 3,22 @@ -74,7 +70,6 @@ Name = REFLECT Graphic = normal2 Focus = Target - SetVisible = 0,true SetX = 3,328 SetY = 3,-18 SetX = 4,352 @@ -84,7 +79,6 @@ Name = REFLECT Graphic = normal2 Focus = Target - SetVisible = 0,true SetX = 4,432 SetY = 4,-10 SetX = 5,400 diff --git a/PBS/Animations/Converted/Move/REST.txt b/PBS/Animations/Converted/Move/REST.txt index 7bdefd721..fd8cb9331 100644 --- a/PBS/Animations/Converted/Move/REST.txt +++ b/PBS/Animations/Converted/Move/REST.txt @@ -13,7 +13,6 @@ Name = REST Focus = Target SetX = 0,357 SetY = 0,67 - SetVisible = 0,true SetX = 1,338 SetY = 1,49 SetX = 2,320 diff --git a/PBS/Animations/Converted/Move/ROAR.txt b/PBS/Animations/Converted/Move/ROAR.txt index 1d3d74fa2..d186951e3 100644 --- a/PBS/Animations/Converted/Move/ROAR.txt +++ b/PBS/Animations/Converted/Move/ROAR.txt @@ -14,7 +14,6 @@ Name = ROAR SetX = 0,193 SetY = 0,215 SetAngle = 0,10 - SetVisible = 0,true SetX = 1,214 SetY = 1,194 SetX = 2,228 @@ -28,7 +27,6 @@ Name = ROAR Focus = Target SetX = 0,176 SetY = 0,199 - SetVisible = 0,true SetX = 1,190 SetY = 1,170 SetX = 2,214 @@ -42,7 +40,6 @@ Name = ROAR Focus = Target SetX = 0,182 SetY = 0,245 - SetVisible = 0,true SetX = 1,209 SetY = 1,238 SetAngle = 1,6 @@ -69,7 +66,6 @@ Name = ROAR SetFlip = 0,true SetX = 0,352 SetY = 0,70 - SetVisible = 0,true SetX = 1,328 SetY = 1,66 SetX = 2,296 @@ -81,7 +77,6 @@ Name = ROAR Focus = Target SetX = 0,352 SetY = 0,132 - SetVisible = 0,true SetX = 1,328 SetY = 1,145 SetX = 2,296 @@ -94,7 +89,6 @@ Name = ROAR SetFlip = 0,true SetX = 0,344 SetY = 0,100 - SetVisible = 0,true SetX = 1,312 SetX = 2,296 SetY = 2,92 diff --git a/PBS/Animations/Converted/Move/ROCKSMASH.txt b/PBS/Animations/Converted/Move/ROCKSMASH.txt index bcfc5f5f8..3541bed3f 100644 --- a/PBS/Animations/Converted/Move/ROCKSMASH.txt +++ b/PBS/Animations/Converted/Move/ROCKSMASH.txt @@ -13,7 +13,6 @@ Name = ROCKSMASH Focus = Target SetX = 0,392 SetY = 0,86 - SetVisible = 0,true Play = 2,Earth1,80,100 Play = 2,Blow6,80,100 diff --git a/PBS/Animations/Converted/Move/ROCKTHROW.txt b/PBS/Animations/Converted/Move/ROCKTHROW.txt index 4800686fe..d9612cc38 100644 --- a/PBS/Animations/Converted/Move/ROCKTHROW.txt +++ b/PBS/Animations/Converted/Move/ROCKTHROW.txt @@ -11,7 +11,6 @@ Name = ROCKTHROW Graphic = Earth1 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,352 SetY = 3,110 @@ -19,7 +18,6 @@ Name = ROCKTHROW Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,198 SetY = 1,186 SetX = 2,307 diff --git a/PBS/Animations/Converted/Move/ROLLINGKICK.txt b/PBS/Animations/Converted/Move/ROLLINGKICK.txt index cf6a934d7..bef4339dd 100644 --- a/PBS/Animations/Converted/Move/ROLLINGKICK.txt +++ b/PBS/Animations/Converted/Move/ROLLINGKICK.txt @@ -11,7 +11,6 @@ Name = ROLLINGKICK Graphic = normal1 Focus = Target - SetVisible = 0,true SetX = 4,360 SetY = 4,78 SetOpacity = 4,50 @@ -27,7 +26,6 @@ Name = ROLLINGKICK SetY = 0,102 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetX = 1,264 SetY = 1,54 SetX = 2,288 diff --git a/PBS/Animations/Converted/Move/SANDATTACK.txt b/PBS/Animations/Converted/Move/SANDATTACK.txt index 44cc1df38..10e5dda60 100644 --- a/PBS/Animations/Converted/Move/SANDATTACK.txt +++ b/PBS/Animations/Converted/Move/SANDATTACK.txt @@ -13,7 +13,6 @@ Name = SANDATTACK Focus = UserAndTarget SetX = 0,134 SetY = 0,280 - SetVisible = 0,true SetX = 2,121 SetY = 2,268 SetX = 3,166 @@ -33,7 +32,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 3,179 SetY = 3,261 SetX = 4,217 @@ -51,7 +49,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 1,147 SetY = 1,249 SetX = 2,179 @@ -86,7 +83,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 1,134 SetY = 1,230 SetX = 2,171 @@ -118,7 +114,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,268 SetX = 2,200 @@ -151,7 +146,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 3,153 SetY = 3,242 SetX = 4,191 @@ -169,7 +163,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 4,115 SetY = 4,261 SetX = 5,134 @@ -189,7 +182,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 5,166 SetY = 5,274 SetX = 6,204 @@ -207,7 +199,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 5,160 SetY = 5,268 SetX = 6,200 @@ -225,7 +216,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 6,121 SetY = 6,274 SetX = 7,147 @@ -245,7 +235,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 7,172 SetY = 7,268 SetX = 8,209 @@ -263,7 +252,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 7,179 SetY = 7,274 SetX = 8,219 @@ -294,7 +282,6 @@ Name = SANDATTACK Focus = UserAndTarget SetX = 0,377 SetY = 0,126 - SetVisible = 0,true SetX = 1,352 SetY = 1,142 SetX = 2,314 @@ -329,7 +316,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 1,339 SetY = 1,123 SetX = 2,300 @@ -361,7 +347,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 1,352 SetY = 1,142 SetX = 2,313 @@ -393,7 +378,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 2,371 SetY = 2,116 SetX = 3,326 @@ -413,7 +397,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 3,339 SetY = 3,148 SetX = 4,302 @@ -431,7 +414,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 3,339 SetY = 3,148 SetX = 4,304 @@ -449,7 +431,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 4,396 SetY = 4,142 SetX = 5,352 @@ -469,7 +450,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 5,332 SetY = 5,142 SetX = 6,296 @@ -487,7 +467,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 5,339 SetY = 5,148 SetX = 6,301 @@ -505,7 +484,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetFlip = 6,true SetX = 6,377 SetY = 6,142 @@ -526,7 +504,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetX = 7,326 SetY = 7,129 SetX = 8,289 @@ -544,7 +521,6 @@ Name = SANDATTACK Graphic = Sand-Attack Focus = UserAndTarget - SetVisible = 0,true SetFlip = 7,true SetX = 7,358 SetY = 7,135 diff --git a/PBS/Animations/Converted/Move/SANDSTORM.txt b/PBS/Animations/Converted/Move/SANDSTORM.txt index 7293ec5fc..aa4124b83 100644 --- a/PBS/Animations/Converted/Move/SANDSTORM.txt +++ b/PBS/Animations/Converted/Move/SANDSTORM.txt @@ -13,7 +13,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,-350 SetY = 0,-30 - SetVisible = 0,true SetX = 1,153 SetY = 1,62 SetX = 2,-350 @@ -37,7 +36,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,31 SetY = 0,69 - SetVisible = 0,true SetX = 1,56 SetY = 1,85 SetX = 2,31 @@ -61,7 +59,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,156 SetY = 0,106 - SetVisible = 0,true SetX = 1,74 SetY = 1,223 SetX = 2,156 @@ -85,7 +82,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,165 SetY = 0,220 - SetVisible = 0,true SetX = 1,220 SetY = 1,207 SetX = 2,165 @@ -109,7 +105,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,267 SetY = 0,178 - SetVisible = 0,true SetX = 1,352 SetY = 1,253 SetX = 2,267 @@ -133,7 +128,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,309 SetY = 0,248 - SetVisible = 0,true SetX = 1,464 SetY = 1,227 SetX = 2,309 @@ -157,7 +151,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,388 SetY = 0,142 - SetVisible = 0,true SetX = 1,484 SetY = 1,76 SetX = 2,388 @@ -181,7 +174,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,448 SetY = 0,243 - SetVisible = 0,true SetX = 1,378 SetY = 1,130 SetX = 2,448 @@ -205,7 +197,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,35 SetY = 0,216 - SetVisible = 0,true SetX = 1,285 SetY = 1,142 SetX = 2,35 @@ -229,7 +220,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,276 SetY = 0,34 - SetVisible = 0,true SetX = 1,316 SetY = 1,22 SetX = 2,276 @@ -253,7 +243,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,487 SetY = 0,32 - SetVisible = 0,true SetX = 4,358 SetY = 4,16 SetX = 5,487 @@ -265,7 +254,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,492 SetY = 0,135 - SetVisible = 0,true SetX = 4,267 SetY = 4,63 SetX = 5,492 @@ -277,7 +265,6 @@ Name = SANDSTORM Focus = Screen SetX = 0,387 SetY = 0,18 - SetVisible = 0,true SetX = 9,251 SetY = 9,305 @@ -285,4 +272,3 @@ Name = SANDSTORM Focus = Screen SetX = 0,148 SetY = 0,9 - SetVisible = 0,true diff --git a/PBS/Animations/Converted/Move/SCARYFACE.txt b/PBS/Animations/Converted/Move/SCARYFACE.txt index 7b9f70283..dbfc455c8 100644 --- a/PBS/Animations/Converted/Move/SCARYFACE.txt +++ b/PBS/Animations/Converted/Move/SCARYFACE.txt @@ -13,7 +13,6 @@ Name = SCARYFACE Focus = Target SetX = 0,384 SetY = 0,102 - SetVisible = 0,true SetOpacity = 0,150 SetZoomX = 1,125 SetZoomY = 1,125 diff --git a/PBS/Animations/Converted/Move/SCRATCH.txt b/PBS/Animations/Converted/Move/SCRATCH.txt index 99c9a86d9..7b342e237 100644 --- a/PBS/Animations/Converted/Move/SCRATCH.txt +++ b/PBS/Animations/Converted/Move/SCRATCH.txt @@ -11,7 +11,6 @@ Name = SCRATCH Graphic = scratchbattle Focus = Target - SetVisible = 0,true SetX = 1,399 SetY = 1,74 SetX = 2,383 diff --git a/PBS/Animations/Converted/Move/SCREECH.txt b/PBS/Animations/Converted/Move/SCREECH.txt index b5eb8342e..143e18863 100644 --- a/PBS/Animations/Converted/Move/SCREECH.txt +++ b/PBS/Animations/Converted/Move/SCREECH.txt @@ -13,7 +13,6 @@ Name = SCREECH Focus = UserAndTarget SetX = 0,179 SetY = 0,142 - SetVisible = 0,true SetY = 1,135 SetY = 2,236 SetY = 3,135 @@ -27,7 +26,6 @@ Name = SCREECH Focus = UserAndTarget SetX = 0,179 SetY = 0,230 - SetVisible = 0,true SetY = 1,224 SetY = 2,129 SetY = 3,217 @@ -41,7 +39,6 @@ Name = SCREECH Focus = UserAndTarget SetX = 0,179 SetY = 0,186 - SetVisible = 0,true SetY = 1,179 SetY = 2,192 SetY = 3,179 diff --git a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt index 0371432bd..098724aff 100644 --- a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt +++ b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt @@ -11,7 +11,6 @@ Name = SELFDESTRUCT Graphic = 030-Explosion01 Focus = Target - SetVisible = 0,true SetX = 2,464 SetY = 2,142 SetX = 3,296 @@ -29,7 +28,6 @@ Name = SELFDESTRUCT Graphic = 030-Explosion01 Focus = Target - SetVisible = 0,true SetX = 3,464 SetY = 3,142 SetX = 8,336 @@ -45,7 +43,6 @@ Name = SELFDESTRUCT Graphic = 030-Explosion01 Focus = Target - SetVisible = 0,true SetX = 5,360 SetY = 5,166 SetY = 11,174 @@ -55,7 +52,6 @@ Name = SELFDESTRUCT Focus = Target SetX = 0,296 SetY = 0,78 - SetVisible = 0,true SetX = 6,464 SetY = 6,142 SetX = 8,360 diff --git a/PBS/Animations/Converted/Move/SHADOWBALL.txt b/PBS/Animations/Converted/Move/SHADOWBALL.txt index ae75a4746..c4c822ebe 100644 --- a/PBS/Animations/Converted/Move/SHADOWBALL.txt +++ b/PBS/Animations/Converted/Move/SHADOWBALL.txt @@ -11,7 +11,6 @@ Name = SHADOWBALL Graphic = 009-Weapon04 Focus = UserAndTarget - SetVisible = 0,true SetX = 7,263 SetY = 7,74 SetZoomX = 7,25 @@ -19,7 +18,6 @@ Name = SHADOWBALL Graphic = 009-Weapon04 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,144 SetY = 1,204 SetX = 2,154 diff --git a/PBS/Animations/Converted/Move/SIGNALBEAM.txt b/PBS/Animations/Converted/Move/SIGNALBEAM.txt index 5919c3458..836621a37 100644 --- a/PBS/Animations/Converted/Move/SIGNALBEAM.txt +++ b/PBS/Animations/Converted/Move/SIGNALBEAM.txt @@ -13,7 +13,6 @@ Name = SIGNALBEAM Focus = Target SetX = 0,224 SetY = 0,150 - SetVisible = 0,true SetX = 1,232 SetY = 1,158 SetX = 2,240 @@ -53,7 +52,6 @@ Name = SIGNALBEAM Graphic = Ultra Beam Focus = Target - SetVisible = 0,true SetX = 1,384 SetY = 1,110 SetX = 2,352 @@ -87,7 +85,6 @@ Name = SIGNALBEAM Graphic = Ultra Beam Focus = Target - SetVisible = 0,true SetX = 2,528 SetY = 2,22 SetX = 3,536 @@ -127,7 +124,6 @@ Name = SIGNALBEAM Focus = Target SetX = 0,312 SetY = 0,158 - SetVisible = 0,true SetY = 1,142 SetX = 2,296 SetY = 2,110 @@ -161,7 +157,6 @@ Name = SIGNALBEAM Graphic = Ultra Beam Focus = Target - SetVisible = 0,true SetX = 1,464 SetY = 1,62 SetX = 2,440 @@ -202,7 +197,6 @@ Name = SIGNALBEAM Focus = Target SetX = 0,264 SetY = 0,190 - SetVisible = 0,true SetX = 1,256 SetY = 1,182 SetX = 2,248 @@ -244,7 +238,6 @@ Name = SIGNALBEAM Graphic = Ultra Beam Focus = Target - SetVisible = 0,true SetX = 2,544 SetY = 2,38 SetX = 3,440 @@ -282,7 +275,6 @@ Name = SIGNALBEAM Graphic = Ultra Beam Focus = Target - SetVisible = 0,true SetX = 1,376 SetY = 1,54 SetX = 2,408 @@ -319,7 +311,6 @@ Name = SIGNALBEAM Focus = Target SetX = 0,304 SetY = 0,102 - SetVisible = 0,true SetX = 1,312 SetX = 2,328 SetY = 2,142 @@ -352,7 +343,6 @@ Name = SIGNALBEAM Graphic = Ultra Beam Focus = Target - SetVisible = 0,true SetX = 1,464 SetY = 1,38 SetX = 2,480 diff --git a/PBS/Animations/Converted/Move/SILVERWIND.txt b/PBS/Animations/Converted/Move/SILVERWIND.txt index b02728c25..d600c39fe 100644 --- a/PBS/Animations/Converted/Move/SILVERWIND.txt +++ b/PBS/Animations/Converted/Move/SILVERWIND.txt @@ -15,7 +15,6 @@ Name = SILVERWIND SetY = 0,-10 SetZoomX = 0,20 SetZoomY = 0,20 - SetVisible = 0,true SetX = 1,208 SetY = 1,22 SetX = 2,248 @@ -35,7 +34,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 1,96 SetY = 1,30 SetZoomX = 1,20 @@ -57,7 +55,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 1,136 SetY = 1,-42 SetZoomX = 1,20 @@ -79,7 +76,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 2,192 SetY = 2,6 SetZoomX = 2,20 @@ -99,7 +95,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 2,104 SetY = 2,6 SetZoomX = 2,20 @@ -119,7 +114,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 3,240 SetY = 3,-42 SetZoomX = 3,20 @@ -141,7 +135,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 3,96 SetY = 3,-10 SetZoomX = 3,20 @@ -159,7 +152,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 3,216 SetY = 3,38 SetOpacity = 3,50 @@ -178,7 +170,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 4,408 SetY = 4,-42 SetZoomX = 4,20 @@ -196,7 +187,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 4,216 SetY = 4,38 SetOpacity = 4,50 @@ -213,7 +203,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 5,424 SetY = 5,6 SetOpacity = 5,50 @@ -225,7 +214,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 5,184 SetY = 5,-34 SetZoomX = 5,20 @@ -237,7 +225,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 5,88 SetY = 5,166 SetZoomX = 5,20 @@ -249,7 +236,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 5,96 SetY = 5,6 SetZoomX = 5,20 @@ -259,7 +245,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetX = 5,376 SetY = 5,-50 SetZoomX = 5,20 @@ -269,7 +254,6 @@ Name = SILVERWIND Graphic = Heal5 Focus = Target - SetVisible = 0,true SetFlip = 5,true SetX = 5,184 SetY = 5,142 diff --git a/PBS/Animations/Converted/Move/SING.txt b/PBS/Animations/Converted/Move/SING.txt index 22ffeaac5..4f4a0dac1 100644 --- a/PBS/Animations/Converted/Move/SING.txt +++ b/PBS/Animations/Converted/Move/SING.txt @@ -13,7 +13,6 @@ Name = SING Focus = Target SetX = 0,200 SetY = 0,211 - SetVisible = 0,true SetX = 1,212 SetY = 1,227 SetX = 2,219 @@ -117,7 +116,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 1,211 SetY = 1,212 SetX = 2,217 @@ -220,7 +218,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 2,236 SetY = 2,216 SetX = 4,257 @@ -320,7 +317,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 8,222 SetY = 8,198 SetX = 9,351 @@ -386,7 +382,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 13,282 SetY = 13,189 SetX = 14,226 @@ -442,7 +437,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 15,429 SetY = 15,91 SetX = 16,352 @@ -476,7 +470,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 15,437 SetY = 15,85 SetX = 16,416 @@ -490,13 +483,11 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 16,417 SetY = 16,89 Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 16,417 SetY = 16,93 @@ -515,7 +506,6 @@ Name = SING Focus = Target SetX = 0,364 SetY = 0,92 - SetVisible = 0,true SetX = 1,369 SetY = 1,117 SetX = 2,358 @@ -601,7 +591,6 @@ Name = SING Focus = Target SetX = 0,365 SetY = 0,125 - SetVisible = 0,true SetX = 1,350 SetY = 1,146 SetX = 2,356 @@ -685,7 +674,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 4,300 SetY = 4,200 SetX = 5,262 @@ -763,7 +751,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 4,305 SetY = 4,227 SetX = 5,275 @@ -813,7 +800,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 10,380 SetY = 10,124 SetX = 11,349 @@ -851,7 +837,6 @@ Name = SING Graphic = poi.hear.mus Focus = Target - SetVisible = 0,true SetX = 11,319 SetY = 11,172 SetX = 13,361 diff --git a/PBS/Animations/Converted/Move/SKETCH.txt b/PBS/Animations/Converted/Move/SKETCH.txt index e4cc4f39f..4dc09d457 100644 --- a/PBS/Animations/Converted/Move/SKETCH.txt +++ b/PBS/Animations/Converted/Move/SKETCH.txt @@ -15,7 +15,6 @@ Name = SKETCH SetY = 0,30 SetZoomX = 0,75 SetZoomY = 0,75 - SetVisible = 0,true SetX = 1,184 SetY = 1,54 SetX = 2,224 diff --git a/PBS/Animations/Converted/Move/SLAM.txt b/PBS/Animations/Converted/Move/SLAM.txt index 8a9f01a12..6db7c5146 100644 --- a/PBS/Animations/Converted/Move/SLAM.txt +++ b/PBS/Animations/Converted/Move/SLAM.txt @@ -13,6 +13,5 @@ Name = SLAM Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Blow6,80,100 diff --git a/PBS/Animations/Converted/Move/SLASH.txt b/PBS/Animations/Converted/Move/SLASH.txt index 3df39ea50..9e891b386 100644 --- a/PBS/Animations/Converted/Move/SLASH.txt +++ b/PBS/Animations/Converted/Move/SLASH.txt @@ -13,7 +13,6 @@ Name = SLASH Focus = Target SetX = 0,280 SetY = 0,6 - SetVisible = 0,true SetX = 1,344 SetY = 1,54 SetX = 2,376 @@ -25,7 +24,6 @@ Name = SLASH Focus = Target SetX = 0,304 SetY = 0,-26 - SetVisible = 0,true SetX = 1,320 SetY = 1,86 SetX = 2,336 @@ -36,7 +34,6 @@ Name = SLASH Focus = Target SetX = 0,256 SetY = 0,38 - SetVisible = 0,true SetX = 1,368 SetY = 1,30 SetX = 2,408 diff --git a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt index 6227d2564..b759d2386 100644 --- a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt +++ b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt @@ -13,6 +13,5 @@ Name = SLEEPPOWDER Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/SLUDGE.txt b/PBS/Animations/Converted/Move/SLUDGE.txt index 89d0af95e..b02674b5a 100644 --- a/PBS/Animations/Converted/Move/SLUDGE.txt +++ b/PBS/Animations/Converted/Move/SLUDGE.txt @@ -13,7 +13,6 @@ Name = SLUDGE Focus = Target SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,172 SetY = 1,186 SetAngle = 1,325 diff --git a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt index 13a11267f..ec62e26b5 100644 --- a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt +++ b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt @@ -13,7 +13,6 @@ Name = SLUDGEBOMB Focus = UserAndTarget SetX = 0,140 SetY = 0,217 - SetVisible = 0,true SetX = 1,172 SetY = 1,211 SetX = 2,134 @@ -28,7 +27,6 @@ Name = SLUDGEBOMB Graphic = poison4 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,147 SetY = 1,198 SetX = 2,211 @@ -42,7 +40,6 @@ Name = SLUDGEBOMB Graphic = poison4 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,166 SetY = 2,186 SetX = 3,192 @@ -54,7 +51,6 @@ Name = SLUDGEBOMB Focus = UserAndTarget SetX = 0,134 SetY = 0,211 - SetVisible = 0,true SetX = 1,166 SetY = 1,173 SetX = 2,198 diff --git a/PBS/Animations/Converted/Move/SMOG.txt b/PBS/Animations/Converted/Move/SMOG.txt index acd1951ff..8ac55505a 100644 --- a/PBS/Animations/Converted/Move/SMOG.txt +++ b/PBS/Animations/Converted/Move/SMOG.txt @@ -13,6 +13,5 @@ Name = SMOG Focus = Target SetX = 0,392 SetY = 0,94 - SetVisible = 0,true Play = 0,Wind8,80,100 diff --git a/PBS/Animations/Converted/Move/SMOKESCREEN.txt b/PBS/Animations/Converted/Move/SMOKESCREEN.txt index 5233e994a..ecd17d68c 100644 --- a/PBS/Animations/Converted/Move/SMOKESCREEN.txt +++ b/PBS/Animations/Converted/Move/SMOKESCREEN.txt @@ -13,7 +13,6 @@ Name = SMOKESCREEN Focus = Target SetX = 0,384 SetY = 0,102 - SetVisible = 0,true SetFlip = 5,true SetZoomX = 5,110 SetZoomY = 5,110 @@ -30,7 +29,6 @@ Name = SMOKESCREEN Graphic = Anima (2) Focus = Target - SetVisible = 0,true SetX = 2,336 SetY = 2,78 SetX = 10,408 @@ -42,7 +40,6 @@ Name = SMOKESCREEN Graphic = Anima (2) Focus = Target - SetVisible = 0,true SetX = 3,408 SetY = 3,62 SetX = 10,440 @@ -55,7 +52,6 @@ Name = SMOKESCREEN Graphic = Anima (2) Focus = Target - SetVisible = 0,true SetFlip = 3,true SetX = 3,352 SetY = 3,126 @@ -75,7 +71,6 @@ Name = SMOKESCREEN Graphic = Anima (2) Focus = Target - SetVisible = 0,true SetFlip = 4,true SetX = 4,352 SetY = 4,126 @@ -88,7 +83,6 @@ Name = SMOKESCREEN Graphic = Anima (2) Focus = Target - SetVisible = 0,true SetFlip = 5,true SetX = 5,352 SetY = 5,126 diff --git a/PBS/Animations/Converted/Move/SPIDERWEB.txt b/PBS/Animations/Converted/Move/SPIDERWEB.txt index ebf3da7d5..262951082 100644 --- a/PBS/Animations/Converted/Move/SPIDERWEB.txt +++ b/PBS/Animations/Converted/Move/SPIDERWEB.txt @@ -11,7 +11,6 @@ Name = SPIDERWEB Graphic = ghost2 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 3,true SetX = 3,358 SetY = 3,98 @@ -42,7 +41,6 @@ Name = SPIDERWEB SetZoomX = 0,50 SetZoomY = 0,50 SetAngle = 0,330 - SetVisible = 0,true SetX = 1,204 SetY = 1,192 SetZoomX = 1,75 diff --git a/PBS/Animations/Converted/Move/SPIKECANNON.txt b/PBS/Animations/Converted/Move/SPIKECANNON.txt index 16f71dc2f..50f4c129b 100644 --- a/PBS/Animations/Converted/Move/SPIKECANNON.txt +++ b/PBS/Animations/Converted/Move/SPIKECANNON.txt @@ -13,7 +13,6 @@ Name = SPIKECANNON Focus = UserAndTarget SetX = 0,147 SetY = 0,211 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -26,7 +25,6 @@ Name = SPIKECANNON Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -40,7 +38,6 @@ Name = SPIKECANNON Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,217 SetY = 2,205 SetX = 3,268 @@ -53,7 +50,6 @@ Name = SPIKECANNON Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,192 SetX = 3,198 @@ -66,7 +62,6 @@ Name = SPIKECANNON Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,364 SetY = 3,98 SetOpacity = 3,50 @@ -86,7 +81,6 @@ Name = Spike Cannon hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,364 SetY = 3,98 SetOpacity = 3,50 @@ -95,7 +89,6 @@ Name = Spike Cannon hit 2 Focus = UserAndTarget SetX = 0,147 SetY = 0,211 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -108,7 +101,6 @@ Name = Spike Cannon hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -122,7 +114,6 @@ Name = Spike Cannon hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,217 SetY = 2,205 SetX = 3,268 @@ -135,7 +126,6 @@ Name = Spike Cannon hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,192 SetX = 3,198 @@ -161,7 +151,6 @@ Name = Spike Cannon hit 3 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,192 SetX = 3,198 @@ -174,7 +163,6 @@ Name = Spike Cannon hit 3 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,364 SetY = 3,98 SetOpacity = 3,50 @@ -183,7 +171,6 @@ Name = Spike Cannon hit 3 Focus = UserAndTarget SetX = 0,147 SetY = 0,211 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -196,7 +183,6 @@ Name = Spike Cannon hit 3 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -210,7 +196,6 @@ Name = Spike Cannon hit 3 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,217 SetY = 2,205 SetX = 3,268 @@ -236,7 +221,6 @@ Name = Spike Cannon hit 4 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,217 SetY = 2,205 SetX = 3,268 @@ -249,7 +233,6 @@ Name = Spike Cannon hit 4 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,192 SetX = 3,198 @@ -262,7 +245,6 @@ Name = Spike Cannon hit 4 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,364 SetY = 3,98 SetOpacity = 3,50 @@ -271,7 +253,6 @@ Name = Spike Cannon hit 4 Focus = UserAndTarget SetX = 0,147 SetY = 0,211 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 @@ -284,7 +265,6 @@ Name = Spike Cannon hit 4 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -311,7 +291,6 @@ Name = Spike Cannon hit 5 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,160 SetY = 1,198 SetX = 2,211 @@ -325,7 +304,6 @@ Name = Spike Cannon hit 5 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,217 SetY = 2,205 SetX = 3,268 @@ -338,7 +316,6 @@ Name = Spike Cannon hit 5 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,153 SetY = 2,192 SetX = 3,198 @@ -351,7 +328,6 @@ Name = Spike Cannon hit 5 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,364 SetY = 3,98 SetOpacity = 3,50 @@ -360,7 +336,6 @@ Name = Spike Cannon hit 5 Focus = UserAndTarget SetX = 0,147 SetY = 0,211 - SetVisible = 0,true SetX = 1,217 SetY = 1,179 SetX = 2,294 diff --git a/PBS/Animations/Converted/Move/SPIKES.txt b/PBS/Animations/Converted/Move/SPIKES.txt index 7e0b722e2..de954ffac 100644 --- a/PBS/Animations/Converted/Move/SPIKES.txt +++ b/PBS/Animations/Converted/Move/SPIKES.txt @@ -11,7 +11,6 @@ Name = SPIKES Graphic = normal2 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,128 SetY = 3,236 SetZoomX = 3,50 @@ -36,7 +35,6 @@ Name = SPIKES Graphic = normal2 Focus = UserAndTarget - SetVisible = 0,true SetX = 6,243 SetY = 6,85 SetZoomX = 6,50 @@ -55,7 +53,6 @@ Name = SPIKES SetY = 0,211 SetZoomX = 0,50 SetZoomY = 0,50 - SetVisible = 0,true SetX = 1,140 SetY = 1,161 SetX = 2,166 diff --git a/PBS/Animations/Converted/Move/SPLASH.txt b/PBS/Animations/Converted/Move/SPLASH.txt index b26799194..0866bc270 100644 --- a/PBS/Animations/Converted/Move/SPLASH.txt +++ b/PBS/Animations/Converted/Move/SPLASH.txt @@ -11,7 +11,6 @@ Name = SPLASH Graphic = poison2 Focus = User - SetVisible = 0,true SetFlip = 1,true SetX = 1,56 SetY = 1,230 @@ -32,7 +31,6 @@ Name = SPLASH Graphic = poison2 Focus = User - SetVisible = 0,true SetX = 2,200 SetY = 2,222 SetX = 4,208 @@ -45,7 +43,6 @@ Name = SPLASH Focus = User SetX = 0,184 SetY = 0,238 - SetVisible = 0,true SetX = 1,192 SetY = 1,230 SetFlip = 2,true diff --git a/PBS/Animations/Converted/Move/SPORE.txt b/PBS/Animations/Converted/Move/SPORE.txt index 1c43bba5a..d6bb54d59 100644 --- a/PBS/Animations/Converted/Move/SPORE.txt +++ b/PBS/Animations/Converted/Move/SPORE.txt @@ -13,6 +13,5 @@ Name = SPORE Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/STEALTHROCK.txt b/PBS/Animations/Converted/Move/STEALTHROCK.txt index 7182c4ef5..650a8a3ed 100644 --- a/PBS/Animations/Converted/Move/STEALTHROCK.txt +++ b/PBS/Animations/Converted/Move/STEALTHROCK.txt @@ -13,7 +13,6 @@ Name = STEALTHROCK Focus = Screen SetX = 0,128 SetY = 0,224 - SetVisible = 0,true SetX = 1,150 SetY = 1,192 SetX = 2,180 @@ -68,7 +67,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 4,128 SetY = 4,224 SetX = 5,150 @@ -121,7 +119,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 7,431 SetY = 7,188 SetOpacity = 7,128 @@ -157,7 +154,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 8,295 SetY = 8,174 SetOpacity = 8,192 @@ -175,7 +171,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 7,295 SetY = 7,174 SetOpacity = 7,128 @@ -197,7 +192,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 11,475 SetY = 11,175 SetOpacity = 11,128 @@ -214,7 +208,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 12,352 SetY = 12,186 SetOpacity = 12,192 @@ -231,7 +224,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 15,395 SetY = 15,190 SetOpacity = 15,128 @@ -252,7 +244,6 @@ Name = STEALTHROCK Focus = Screen SetX = 0,376 SetY = 0,84 - SetVisible = 0,true SetX = 1,332 SetY = 1,72 SetX = 2,294 @@ -307,7 +298,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 4,376 SetY = 4,84 SetX = 5,332 @@ -360,7 +350,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 7,207 SetY = 7,284 SetOpacity = 7,128 @@ -396,7 +385,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 8,71 SetY = 8,270 SetOpacity = 8,192 @@ -414,7 +402,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 7,71 SetY = 7,270 SetOpacity = 7,128 @@ -436,7 +423,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 11,251 SetY = 11,271 SetOpacity = 11,128 @@ -453,7 +439,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 12,128 SetY = 12,282 SetOpacity = 12,192 @@ -470,7 +455,6 @@ Name = STEALTHROCK Graphic = Rock Tomb Focus = Screen - SetVisible = 0,true SetX = 15,171 SetY = 15,286 SetOpacity = 15,128 diff --git a/PBS/Animations/Converted/Move/STOMP.txt b/PBS/Animations/Converted/Move/STOMP.txt index 1eae1b62a..2542cb549 100644 --- a/PBS/Animations/Converted/Move/STOMP.txt +++ b/PBS/Animations/Converted/Move/STOMP.txt @@ -13,7 +13,6 @@ Name = STOMP Focus = Target SetX = 0,384 SetY = 0,-18 - SetVisible = 0,true SetY = 1,22 SetY = 2,54 SetY = 3,70 diff --git a/PBS/Animations/Converted/Move/STRINGSHOT.txt b/PBS/Animations/Converted/Move/STRINGSHOT.txt index 76b6e013c..b5b27c0ef 100644 --- a/PBS/Animations/Converted/Move/STRINGSHOT.txt +++ b/PBS/Animations/Converted/Move/STRINGSHOT.txt @@ -11,7 +11,6 @@ Name = STRINGSHOT Graphic = water3 Focus = Target - SetVisible = 0,true SetX = 1,128 SetY = 1,236 SetZoomX = 1,25 @@ -48,7 +47,6 @@ Name = STRINGSHOT Graphic = water3 Focus = Target - SetVisible = 0,true SetX = 2,128 SetY = 2,236 SetZoomX = 2,25 @@ -84,7 +82,6 @@ Name = STRINGSHOT SetY = 0,236 SetZoomX = 0,25 SetZoomY = 0,25 - SetVisible = 0,true SetX = 1,211 SetY = 1,179 SetZoomX = 1,50 diff --git a/PBS/Animations/Converted/Move/STRUGGLE.txt b/PBS/Animations/Converted/Move/STRUGGLE.txt index 905dc6092..29db02205 100644 --- a/PBS/Animations/Converted/Move/STRUGGLE.txt +++ b/PBS/Animations/Converted/Move/STRUGGLE.txt @@ -13,7 +13,6 @@ Name = STRUGGLE Focus = User SetX = 0,168 SetY = 0,230 - SetVisible = 0,true SetX = 1,176 SetY = 1,238 SetY = 2,222 @@ -36,7 +35,6 @@ Name = STRUGGLE Focus = User SetX = 0,88 SetY = 0,230 - SetVisible = 0,true SetY = 1,246 SetX = 2,96 SetY = 2,230 diff --git a/PBS/Animations/Converted/Move/STUNSPORE.txt b/PBS/Animations/Converted/Move/STUNSPORE.txt index 711a09d1a..70d8276b4 100644 --- a/PBS/Animations/Converted/Move/STUNSPORE.txt +++ b/PBS/Animations/Converted/Move/STUNSPORE.txt @@ -13,6 +13,5 @@ Name = STUNSPORE Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true Play = 0,Sand,80,100 diff --git a/PBS/Animations/Converted/Move/SUNNYDAY.txt b/PBS/Animations/Converted/Move/SUNNYDAY.txt index 8638ce4f2..758ce8b0c 100644 --- a/PBS/Animations/Converted/Move/SUNNYDAY.txt +++ b/PBS/Animations/Converted/Move/SUNNYDAY.txt @@ -13,7 +13,6 @@ Name = SUNNYDAY Focus = Screen SetX = 0,64 SetY = 0,64 - SetVisible = 0,true SetOpacity = 0,64 SetX = 1,72 SetY = 1,72 diff --git a/PBS/Animations/Converted/Move/SUPERSONIC.txt b/PBS/Animations/Converted/Move/SUPERSONIC.txt index 3478e0c88..0063125f6 100644 --- a/PBS/Animations/Converted/Move/SUPERSONIC.txt +++ b/PBS/Animations/Converted/Move/SUPERSONIC.txt @@ -11,7 +11,6 @@ Name = SUPERSONIC Graphic = Struggle Focus = UserAndTarget - SetVisible = 0,true SetX = 2,147 SetY = 2,224 SetAngle = 2,20 @@ -45,7 +44,6 @@ Name = SUPERSONIC Graphic = Struggle Focus = UserAndTarget - SetVisible = 0,true SetX = 4,160 SetY = 4,211 SetAngle = 4,20 @@ -60,7 +58,6 @@ Name = SUPERSONIC Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetAngle = 1,20 SetX = 2,172 SetY = 2,205 diff --git a/PBS/Animations/Converted/Move/SWAGGER.txt b/PBS/Animations/Converted/Move/SWAGGER.txt index e68e8a1e9..0b48a742f 100644 --- a/PBS/Animations/Converted/Move/SWAGGER.txt +++ b/PBS/Animations/Converted/Move/SWAGGER.txt @@ -11,7 +11,6 @@ Name = SWAGGER Graphic = mixed status Focus = Target - SetVisible = 0,true SetX = 4,405 SetY = 4,40 SetX = 5,402 diff --git a/PBS/Animations/Converted/Move/SWEETKISS.txt b/PBS/Animations/Converted/Move/SWEETKISS.txt index febbb9392..7debed7ea 100644 --- a/PBS/Animations/Converted/Move/SWEETKISS.txt +++ b/PBS/Animations/Converted/Move/SWEETKISS.txt @@ -11,7 +11,6 @@ Name = SWEETKISS Graphic = electric2 Focus = Target - SetVisible = 0,true SetX = 8,368 SetY = 8,54 SetX = 9,376 @@ -31,7 +30,6 @@ Name = SWEETKISS SetY = 0,134 SetZoomX = 0,50 SetZoomY = 0,50 - SetVisible = 0,true SetOpacity = 0,100 SetX = 1,416 SetY = 1,118 diff --git a/PBS/Animations/Converted/Move/SWIFT.txt b/PBS/Animations/Converted/Move/SWIFT.txt index 733ef2834..fb3177a33 100644 --- a/PBS/Animations/Converted/Move/SWIFT.txt +++ b/PBS/Animations/Converted/Move/SWIFT.txt @@ -13,7 +13,6 @@ Name = SWIFT Focus = UserAndTarget SetX = 0,128 SetY = 0,236 - SetVisible = 0,true SetX = 1,179 SetY = 1,211 SetX = 2,217 @@ -37,7 +36,6 @@ Name = SWIFT Graphic = 007-Weapon02 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,128 SetY = 1,236 SetX = 2,172 @@ -61,7 +59,6 @@ Name = SWIFT Graphic = 007-Weapon02 Focus = UserAndTarget - SetVisible = 0,true SetX = 2,128 SetY = 2,217 SetX = 3,179 @@ -79,7 +76,6 @@ Name = SWIFT Graphic = 007-Weapon02 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,192 SetY = 3,224 SetX = 4,224 @@ -94,7 +90,6 @@ Name = SWIFT Graphic = 007-Weapon02 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,115 SetY = 3,205 SetX = 4,147 @@ -107,7 +102,6 @@ Name = SWIFT Graphic = 007-Weapon02 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,128 SetY = 4,242 diff --git a/PBS/Animations/Converted/Move/SWORDSDANCE.txt b/PBS/Animations/Converted/Move/SWORDSDANCE.txt index 4b2c60a32..df2970c55 100644 --- a/PBS/Animations/Converted/Move/SWORDSDANCE.txt +++ b/PBS/Animations/Converted/Move/SWORDSDANCE.txt @@ -13,7 +13,6 @@ Name = SWORDSDANCE Focus = Target SetX = 0,436 SetY = 0,219 - SetVisible = 0,true SetX = 1,434 SetY = 1,177 SetX = 2,348 @@ -39,7 +38,6 @@ Name = SWORDSDANCE Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 1,393 SetY = 1,4 SetX = 2,435 @@ -62,13 +60,11 @@ Name = SWORDSDANCE Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,458 SetY = 4,119 Graphic = fly copy Focus = Target - SetVisible = 0,true SetX = 4,303 SetY = 4,111 @@ -76,7 +72,6 @@ Name = SWORDSDANCE Focus = Target SetX = 0,343 SetY = 0,215 - SetVisible = 0,true SetX = 1,341 SetY = 1,177 SetX = 2,391 diff --git a/PBS/Animations/Converted/Move/TACKLE.txt b/PBS/Animations/Converted/Move/TACKLE.txt index a11171b34..d935521c5 100644 --- a/PBS/Animations/Converted/Move/TACKLE.txt +++ b/PBS/Animations/Converted/Move/TACKLE.txt @@ -11,7 +11,6 @@ Name = TACKLE Graphic = Tackle_B Focus = Target - SetVisible = 0,true SetX = 2,384 SetY = 2,99 SetOpacity = 2,150 diff --git a/PBS/Animations/Converted/Move/TAILGLOW.txt b/PBS/Animations/Converted/Move/TAILGLOW.txt index 279ece532..c7cf74678 100644 --- a/PBS/Animations/Converted/Move/TAILGLOW.txt +++ b/PBS/Animations/Converted/Move/TAILGLOW.txt @@ -13,7 +13,6 @@ Name = TAILGLOW Focus = Target SetX = 0,384 SetY = 0,94 - SetVisible = 0,true SetOpacity = 0,50 SetOpacity = 1,255 SetZoomX = 7,110 diff --git a/PBS/Animations/Converted/Move/TELEPORT.txt b/PBS/Animations/Converted/Move/TELEPORT.txt index 02d0abd95..337d8698c 100644 --- a/PBS/Animations/Converted/Move/TELEPORT.txt +++ b/PBS/Animations/Converted/Move/TELEPORT.txt @@ -13,7 +13,6 @@ Name = TELEPORT Focus = User SetX = 0,123 SetY = 0,374 - SetVisible = 0,true SetX = 1,114 SetY = 1,338 SetX = 2,119 @@ -29,7 +28,6 @@ Name = TELEPORT Graphic = ! Focus = User - SetVisible = 0,true SetX = 1,145 SetY = 1,363 SetX = 2,148 @@ -47,7 +45,6 @@ Name = TELEPORT Focus = User SetX = 0,74 SetY = 0,358 - SetVisible = 0,true SetX = 1,87 SetY = 1,304 SetX = 2,93 diff --git a/PBS/Animations/Converted/Move/THUNDER.txt b/PBS/Animations/Converted/Move/THUNDER.txt index deafb82c0..8f0dfc251 100644 --- a/PBS/Animations/Converted/Move/THUNDER.txt +++ b/PBS/Animations/Converted/Move/THUNDER.txt @@ -11,7 +11,6 @@ Name = THUNDER Graphic = Trovao Focus = Target - SetVisible = 0,true SetFlip = 1,true SetX = 1,376 SetY = 1,86 @@ -28,7 +27,6 @@ Name = THUNDER Graphic = Trovao Focus = Target - SetVisible = 0,true SetX = 2,400 SetY = 2,150 SetX = 3,376 @@ -42,7 +40,6 @@ Name = THUNDER SetFlip = 0,true SetX = 0,392 SetY = 0,-58 - SetVisible = 0,true SetX = 1,352 SetFlip = 2,false SetX = 2,376 diff --git a/PBS/Animations/Converted/Move/THUNDERBOLT.txt b/PBS/Animations/Converted/Move/THUNDERBOLT.txt index c57c3c0eb..507fe5e36 100644 --- a/PBS/Animations/Converted/Move/THUNDERBOLT.txt +++ b/PBS/Animations/Converted/Move/THUNDERBOLT.txt @@ -11,7 +11,6 @@ Name = THUNDERBOLT Graphic = 017-Thunder01 Focus = Target - SetVisible = 0,true SetX = 5,384 SetY = 5,94 SetY = 6,54 @@ -21,7 +20,6 @@ Name = THUNDERBOLT Focus = Target SetX = 0,384 SetY = 0,54 - SetVisible = 0,true SetFlip = 4,true SetOpacity = 4,200 SetOpacity = 5,100 diff --git a/PBS/Animations/Converted/Move/THUNDERFANG.txt b/PBS/Animations/Converted/Move/THUNDERFANG.txt index 2cfdef107..676935647 100644 --- a/PBS/Animations/Converted/Move/THUNDERFANG.txt +++ b/PBS/Animations/Converted/Move/THUNDERFANG.txt @@ -11,7 +11,6 @@ Name = THUNDERFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 6,327 SetY = 6,73 SetX = 7,326 @@ -20,7 +19,6 @@ Name = THUNDERFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 7,471 SetY = 7,67 SetX = 8,314 @@ -28,13 +26,11 @@ Name = THUNDERFANG Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 8,481 SetY = 8,124 Graphic = element fangs Focus = Target - SetVisible = 0,true SetX = 8,471 SetY = 8,60 @@ -42,7 +38,6 @@ Name = THUNDERFANG Focus = Target SetX = 0,391 SetY = 0,96 - SetVisible = 0,true SetY = 1,90 SetX = 2,386 SetY = 2,92 diff --git a/PBS/Animations/Converted/Move/THUNDERPUNCH.txt b/PBS/Animations/Converted/Move/THUNDERPUNCH.txt index e75c78fe3..2cb6a3a47 100644 --- a/PBS/Animations/Converted/Move/THUNDERPUNCH.txt +++ b/PBS/Animations/Converted/Move/THUNDERPUNCH.txt @@ -13,7 +13,6 @@ Name = THUNDERPUNCH Focus = Target SetX = 0,385 SetY = 0,97 - SetVisible = 0,true SetX = 1,384 SetY = 1,93 SetX = 2,395 @@ -35,7 +34,6 @@ Name = THUNDERPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,412 SetY = 2,82 SetX = 3,378 @@ -55,7 +53,6 @@ Name = THUNDERPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 2,385 SetY = 2,92 SetX = 3,386 @@ -74,7 +71,6 @@ Name = THUNDERPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 4,387 SetY = 4,70 SetX = 5,443 @@ -86,7 +82,6 @@ Name = THUNDERPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 4,389 SetY = 4,99 SetX = 5,385 @@ -97,13 +92,11 @@ Name = THUNDERPUNCH Graphic = punches Focus = Target - SetVisible = 0,true SetX = 7,351 SetY = 7,135 Graphic = punches Focus = Target - SetVisible = 0,true SetX = 7,384 SetY = 7,97 diff --git a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt index 394e1a0c9..b80f65e2a 100644 --- a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt +++ b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt @@ -13,7 +13,6 @@ Name = THUNDERSHOCK Focus = Target SetX = 0,376 SetY = 0,94 - SetVisible = 0,true SetFlip = 9,true SetOpacity = 12,100 diff --git a/PBS/Animations/Converted/Move/THUNDERWAVE.txt b/PBS/Animations/Converted/Move/THUNDERWAVE.txt index f2ffb755a..18112c1f9 100644 --- a/PBS/Animations/Converted/Move/THUNDERWAVE.txt +++ b/PBS/Animations/Converted/Move/THUNDERWAVE.txt @@ -11,7 +11,6 @@ Name = THUNDERWAVE Graphic = T. Shock Focus = Target - SetVisible = 0,true SetX = 6,392 SetY = 6,114 SetX = 7,368 @@ -24,13 +23,11 @@ Name = THUNDERWAVE Graphic = T. Shock Focus = Target - SetVisible = 0,true SetX = 6,368 SetY = 6,114 Graphic = T. Shock Focus = Target - SetVisible = 0,true SetX = 1,392 SetY = 1,42 SetY = 2,58 diff --git a/PBS/Animations/Converted/Move/TOXIC.txt b/PBS/Animations/Converted/Move/TOXIC.txt index 37d7a3c08..f900b6b5b 100644 --- a/PBS/Animations/Converted/Move/TOXIC.txt +++ b/PBS/Animations/Converted/Move/TOXIC.txt @@ -11,7 +11,6 @@ Name = TOXIC Graphic = State1 Focus = Target - SetVisible = 0,true SetX = 2,440 SetY = 2,86 SetX = 14,400 @@ -23,7 +22,6 @@ Name = TOXIC Graphic = State1 Focus = Target - SetVisible = 0,true SetX = 3,400 SetY = 3,142 SetX = 14,352 @@ -33,7 +31,6 @@ Name = TOXIC Graphic = State1 Focus = Target - SetVisible = 0,true SetX = 4,352 SetY = 4,102 SetX = 14,328 @@ -41,7 +38,6 @@ Name = TOXIC Graphic = State1 Focus = Target - SetVisible = 0,true SetX = 5,328 SetY = 5,134 @@ -49,7 +45,6 @@ Name = TOXIC Focus = Target SetX = 0,304 SetY = 0,118 - SetVisible = 0,true SetX = 14,440 SetY = 14,86 SetX = 15,400 diff --git a/PBS/Animations/Converted/Move/TRICKROOM.txt b/PBS/Animations/Converted/Move/TRICKROOM.txt index b1be0296c..6cfcdfb38 100644 --- a/PBS/Animations/Converted/Move/TRICKROOM.txt +++ b/PBS/Animations/Converted/Move/TRICKROOM.txt @@ -15,7 +15,6 @@ Name = TRICKROOM SetY = 0,210 SetZoomX = 0,446 SetZoomY = 0,273 - SetVisible = 0,true SetX = 1,311 SetY = 1,209 SetX = 3,313 diff --git a/PBS/Animations/Converted/Move/TWINEEDLE.txt b/PBS/Animations/Converted/Move/TWINEEDLE.txt index 22d9da1b0..a90b6b91e 100644 --- a/PBS/Animations/Converted/Move/TWINEEDLE.txt +++ b/PBS/Animations/Converted/Move/TWINEEDLE.txt @@ -11,7 +11,6 @@ Name = TWINEEDLE Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,364 SetY = 4,104 SetOpacity = 4,50 @@ -22,7 +21,6 @@ Name = TWINEEDLE Focus = UserAndTarget SetX = 0,128 SetY = 0,192 - SetVisible = 0,true SetX = 1,185 SetY = 1,173 SetX = 2,256 @@ -41,7 +39,6 @@ Name = TWINEEDLE Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,185 SetY = 1,217 SetX = 2,256 @@ -72,7 +69,6 @@ Name = Twineedle hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 1,185 SetY = 1,217 SetX = 2,256 @@ -89,7 +85,6 @@ Name = Twineedle hit 2 Graphic = poison3 Focus = UserAndTarget - SetVisible = 0,true SetX = 4,364 SetY = 4,104 SetOpacity = 4,50 @@ -100,7 +95,6 @@ Name = Twineedle hit 2 Focus = UserAndTarget SetX = 0,128 SetY = 0,192 - SetVisible = 0,true SetX = 1,185 SetY = 1,173 SetX = 2,256 diff --git a/PBS/Animations/Converted/Move/TWISTER.txt b/PBS/Animations/Converted/Move/TWISTER.txt index c361e6a7d..395f59e90 100644 --- a/PBS/Animations/Converted/Move/TWISTER.txt +++ b/PBS/Animations/Converted/Move/TWISTER.txt @@ -13,7 +13,6 @@ Name = TWISTER Focus = Target SetX = 0,384 SetY = 0,78 - SetVisible = 0,true SetFlip = 11,true Play = 0,Water3,80,100 diff --git a/PBS/Animations/Converted/Move/VINEWHIP.txt b/PBS/Animations/Converted/Move/VINEWHIP.txt index 274907428..c40565c68 100644 --- a/PBS/Animations/Converted/Move/VINEWHIP.txt +++ b/PBS/Animations/Converted/Move/VINEWHIP.txt @@ -11,7 +11,6 @@ Name = VINEWHIP Graphic = 003-Attack01 Focus = Target - SetVisible = 0,true SetX = 2,368 SetY = 2,118 SetOpacity = 2,150 @@ -24,7 +23,6 @@ Name = VINEWHIP Focus = Target SetX = 0,448 SetY = 0,14 - SetVisible = 0,true SetX = 1,408 SetY = 1,46 SetX = 2,368 diff --git a/PBS/Animations/Converted/Move/WATERGUN.txt b/PBS/Animations/Converted/Move/WATERGUN.txt index 2835dc896..4bbea5b73 100644 --- a/PBS/Animations/Converted/Move/WATERGUN.txt +++ b/PBS/Animations/Converted/Move/WATERGUN.txt @@ -15,7 +15,6 @@ Name = WATERGUN SetY = 0,200 SetZoomX = 0,50 SetZoomY = 0,50 - SetVisible = 0,true SetOpacity = 0,235 SetX = 7,184 SetY = 7,184 @@ -24,7 +23,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 1,184 SetY = 1,181 SetZoomX = 1,50 @@ -40,7 +38,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 2,208 SetY = 2,173 SetZoomX = 2,50 @@ -54,7 +51,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 3,232 SetY = 3,145 SetZoomX = 3,50 @@ -67,7 +63,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 4,252 SetY = 4,124 SetZoomX = 4,50 @@ -80,7 +75,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 5,280 SetY = 5,109 SetZoomX = 5,50 @@ -93,7 +87,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 6,305 SetY = 6,99 SetZoomX = 6,50 @@ -105,7 +98,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 8,380 SetY = 8,108 SetZoomX = 8,70 @@ -128,12 +120,10 @@ Name = WATERGUN SetY = 0,81 SetZoomX = 0,50 SetZoomY = 0,50 - SetVisible = 0,true SetOpacity = 0,235 Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 1,328 SetY = 1,96 SetZoomX = 1,50 @@ -142,7 +132,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 2,304 SetY = 2,118 SetZoomX = 2,50 @@ -151,7 +140,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 3,280 SetY = 3,134 SetZoomX = 3,50 @@ -160,7 +148,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 4,258 SetY = 4,161 SetZoomX = 4,50 @@ -169,7 +156,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 5,232 SetY = 5,179 SetZoomX = 5,50 @@ -178,7 +164,6 @@ Name = WATERGUN Graphic = fly copy Focus = UserAndTarget - SetVisible = 0,true SetX = 6,202 SetY = 6,196 SetZoomX = 6,50 @@ -187,7 +172,6 @@ Name = WATERGUN Graphic = fly copy Focus = User - SetVisible = 0,true SetX = 7,167 SetY = 7,217 SetZoomX = 7,50 @@ -201,7 +185,6 @@ Name = WATERGUN Graphic = fly copy Focus = User - SetVisible = 0,true SetX = 8,128 SetY = 8,220 SetOpacity = 8,240 diff --git a/PBS/Animations/Converted/Move/WATERPULSE.txt b/PBS/Animations/Converted/Move/WATERPULSE.txt index 514c19bb4..5cb28905b 100644 --- a/PBS/Animations/Converted/Move/WATERPULSE.txt +++ b/PBS/Animations/Converted/Move/WATERPULSE.txt @@ -15,7 +15,6 @@ Name = WATERPULSE Focus = UserAndTarget SetX = 0,131 SetY = 0,229 - SetVisible = 0,true SetX = 1,208 SetY = 1,192 SetX = 2,232 diff --git a/PBS/Animations/Converted/Move/WHIRLWIND.txt b/PBS/Animations/Converted/Move/WHIRLWIND.txt index a558ae68f..8b9446104 100644 --- a/PBS/Animations/Converted/Move/WHIRLWIND.txt +++ b/PBS/Animations/Converted/Move/WHIRLWIND.txt @@ -13,6 +13,5 @@ Name = WHIRLWIND Focus = Target SetX = 0,392 SetY = 0,94 - SetVisible = 0,true Play = 0,Wind1,80,100 diff --git a/PBS/Animations/Converted/Move/WILLOWISP.txt b/PBS/Animations/Converted/Move/WILLOWISP.txt index 96f546661..b2859f9ae 100644 --- a/PBS/Animations/Converted/Move/WILLOWISP.txt +++ b/PBS/Animations/Converted/Move/WILLOWISP.txt @@ -11,7 +11,6 @@ Name = WILLOWISP Graphic = 015-Fire01 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 1,true SetX = 1,134 SetY = 1,179 @@ -29,7 +28,6 @@ Name = WILLOWISP Graphic = 015-Fire01 Focus = UserAndTarget - SetVisible = 0,true SetFlip = 2,true SetX = 2,224 SetY = 2,186 @@ -43,7 +41,6 @@ Name = WILLOWISP Graphic = 015-Fire01 Focus = UserAndTarget - SetVisible = 0,true SetX = 3,358 SetY = 3,110 @@ -53,7 +50,6 @@ Name = WILLOWISP SetX = 0,160 SetY = 0,186 SetAngle = 0,90 - SetVisible = 0,true SetX = 1,198 SetY = 1,167 SetX = 2,262 diff --git a/PBS/Animations/Converted/Move/WINGATTACK.txt b/PBS/Animations/Converted/Move/WINGATTACK.txt index 83916406d..b669899ba 100644 --- a/PBS/Animations/Converted/Move/WINGATTACK.txt +++ b/PBS/Animations/Converted/Move/WINGATTACK.txt @@ -13,7 +13,6 @@ Name = WINGATTACK Focus = Target SetX = 0,392 SetY = 0,94 - SetVisible = 0,true Play = 0,Wind1,80,100 Play = 2,Wind5,80,100 diff --git a/PBS/Animations/Converted/Move/WRAP.txt b/PBS/Animations/Converted/Move/WRAP.txt index ce82fd671..2078ef39c 100644 --- a/PBS/Animations/Converted/Move/WRAP.txt +++ b/PBS/Animations/Converted/Move/WRAP.txt @@ -13,7 +13,6 @@ Name = WRAP Focus = Target SetX = 0,440 SetY = 0,102 - SetVisible = 0,true SetX = 1,480 SetY = 1,94 SetX = 2,488 @@ -30,7 +29,6 @@ Name = WRAP Focus = Target SetX = 0,320 SetY = 0,102 - SetVisible = 0,true SetX = 1,288 SetY = 1,94 SetX = 2,240 diff --git a/PBS/Animations/Converted/Move/WRINGOUT.txt b/PBS/Animations/Converted/Move/WRINGOUT.txt index 76db75cdd..81a65f211 100644 --- a/PBS/Animations/Converted/Move/WRINGOUT.txt +++ b/PBS/Animations/Converted/Move/WRINGOUT.txt @@ -13,7 +13,6 @@ Name = WRINGOUT Focus = Target SetX = 0,273 SetY = 0,84 - SetVisible = 0,true SetX = 1,283 SetY = 1,139 SetX = 2,323 diff --git a/PBS/Animations/Converted/Move/XSCISSOR.txt b/PBS/Animations/Converted/Move/XSCISSOR.txt index 1f3b439a6..d0b01b057 100644 --- a/PBS/Animations/Converted/Move/XSCISSOR.txt +++ b/PBS/Animations/Converted/Move/XSCISSOR.txt @@ -13,7 +13,6 @@ Name = XSCISSOR Focus = Target SetX = 0,319 SetY = 0,36 - SetVisible = 0,true SetX = 1,351 SetY = 1,62 SetX = 2,384 @@ -27,7 +26,6 @@ Name = XSCISSOR Focus = Target SetX = 0,455 SetY = 0,37 - SetVisible = 0,true SetX = 1,420 SetY = 1,62 SetX = 2,384 diff --git a/PBS/Animations/Converted/Move/ZAPCANNON.txt b/PBS/Animations/Converted/Move/ZAPCANNON.txt index 57468e979..c374be347 100644 --- a/PBS/Animations/Converted/Move/ZAPCANNON.txt +++ b/PBS/Animations/Converted/Move/ZAPCANNON.txt @@ -13,7 +13,6 @@ Name = ZAPCANNON Focus = Target SetX = 0,384 SetY = 0,86 - SetVisible = 0,true SetFlip = 6,true SetAngle = 6,180 SetOpacity = 7,100 From 2f231a25bbf99ba9ba96ec9965c65e6ff1838536 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 3 Dec 2023 23:47:38 +0000 Subject: [PATCH 15/49] Tidied up TODO comments, misc tweaks to Anim Editor --- .../801_UI controls/002_ControlsContainer.rb | 15 - .../Control elements/001_BaseControl.rb | 15 +- .../Control elements/002_Label.rb | 7 +- .../Control elements/004_TextBox.rb | 18 +- .../Control elements/005_NumberSlider.rb | 4 +- .../Control elements/007_Button.rb | 21 +- .../Control elements/008_List.rb | 8 +- .../Control elements/009_DropdownList.rb | 17 +- .../Control elements/101_Scrollbar.rb | 7 +- .../901_Anim utilities/001_Anim utilities.rb | 9 + .../902_Anim GameData/001_Animation.rb | 50 +-- .../904_Anim Editor/001_AnimationEditor.rb | 202 ++++++++---- .../002_AnimationEditor_popups.rb | 304 +++++++----------- .../904_Anim Editor/010_AnimationSelector.rb | 22 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 1 - .../Anim Editor elements/001_Canvas.rb | 6 +- .../Anim Editor elements/002_PlayControls.rb | 2 - .../Anim Editor elements/003_ParticleList.rb | 17 +- .../Anim Editor elements/004_Menu bar.rb | 6 +- PBS/Animations/Converted/Common/Attract.txt | 2 +- PBS/Animations/Converted/Common/Bind.txt | 6 +- PBS/Animations/Converted/Common/Burn.txt | 2 +- PBS/Animations/Converted/Common/Confusion.txt | 2 +- PBS/Animations/Converted/Common/FireSpin.txt | 2 +- PBS/Animations/Converted/Common/Frozen.txt | 2 +- PBS/Animations/Converted/Common/HealthUp.txt | 6 +- PBS/Animations/Converted/Common/Paralysis.txt | 2 +- .../Converted/Common/ParentalBond.txt | 2 +- PBS/Animations/Converted/Common/Poison.txt | 2 +- PBS/Animations/Converted/Common/Shadow.txt | 2 +- PBS/Animations/Converted/Common/Shiny.txt | 2 +- PBS/Animations/Converted/Common/Sleep.txt | 2 +- PBS/Animations/Converted/Common/StatDown.txt | 2 +- PBS/Animations/Converted/Common/StatUp.txt | 2 +- .../Converted/Common/SuperShiny.txt | 32 +- PBS/Animations/Converted/Common/Wrap.txt | 6 +- PBS/Animations/Converted/Move/ABSORB.txt | 12 +- PBS/Animations/Converted/Move/ACID.txt | 4 +- PBS/Animations/Converted/Move/ACIDARMOR.txt | 6 +- PBS/Animations/Converted/Move/ACIDSPRAY.txt | 2 +- PBS/Animations/Converted/Move/ACUPRESSURE.txt | 2 +- PBS/Animations/Converted/Move/AERIALACE.txt | 4 +- PBS/Animations/Converted/Move/ALLYSWITCH.txt | 2 +- PBS/Animations/Converted/Move/AMNESIA.txt | 2 +- .../Converted/Move/ANCIENTPOWER.txt | 4 +- PBS/Animations/Converted/Move/AQUARING.txt | 2 +- .../Converted/Move/AROMATHERAPY.txt | 2 +- PBS/Animations/Converted/Move/AURORABEAM.txt | 4 +- PBS/Animations/Converted/Move/BARRIER.txt | 2 +- PBS/Animations/Converted/Move/BEATUP.txt | 12 +- PBS/Animations/Converted/Move/BIND.txt | 6 +- PBS/Animations/Converted/Move/BITE.txt | 2 +- PBS/Animations/Converted/Move/BLASTBURN.txt | 2 +- PBS/Animations/Converted/Move/BLOCK.txt | 2 +- PBS/Animations/Converted/Move/BODYSLAM.txt | 2 +- PBS/Animations/Converted/Move/BRICKBREAK.txt | 2 +- PBS/Animations/Converted/Move/BUBBLE.txt | 2 +- PBS/Animations/Converted/Move/BUBBLEBEAM.txt | 12 +- PBS/Animations/Converted/Move/BULLETSEED.txt | 70 ++-- PBS/Animations/Converted/Move/CHARGE.txt | 10 +- PBS/Animations/Converted/Move/CLEARSMOG.txt | 2 +- PBS/Animations/Converted/Move/COMETPUNCH.txt | 30 +- PBS/Animations/Converted/Move/CONFUSERAY.txt | 4 +- PBS/Animations/Converted/Move/COTTONGUARD.txt | 2 +- PBS/Animations/Converted/Move/COTTONSPORE.txt | 2 +- PBS/Animations/Converted/Move/COUNTER.txt | 2 +- PBS/Animations/Converted/Move/CURSE.txt | 2 +- PBS/Animations/Converted/Move/CUT.txt | 6 +- PBS/Animations/Converted/Move/DEFENSECURL.txt | 2 +- PBS/Animations/Converted/Move/DIZZYPUNCH.txt | 2 +- PBS/Animations/Converted/Move/DOUBLEEDGE.txt | 4 +- PBS/Animations/Converted/Move/DOUBLEKICK.txt | 8 +- PBS/Animations/Converted/Move/DOUBLESLAP.txt | 20 +- .../Converted/Move/DRAGONBREATH.txt | 2 +- PBS/Animations/Converted/Move/DRAGONCLAW.txt | 4 +- PBS/Animations/Converted/Move/DRAGONDANCE.txt | 2 +- PBS/Animations/Converted/Move/DRAGONRAGE.txt | 2 +- PBS/Animations/Converted/Move/EMBER.txt | 2 +- PBS/Animations/Converted/Move/ENCORE.txt | 2 +- PBS/Animations/Converted/Move/ERUPTION.txt | 8 +- PBS/Animations/Converted/Move/EXPLOSION.txt | 8 +- PBS/Animations/Converted/Move/FIERYDANCE.txt | 2 +- PBS/Animations/Converted/Move/FINALGAMBIT.txt | 2 +- PBS/Animations/Converted/Move/FIREPLEDGE.txt | 2 +- PBS/Animations/Converted/Move/FIREPUNCH.txt | 2 +- PBS/Animations/Converted/Move/FIRESPIN.txt | 2 +- PBS/Animations/Converted/Move/FLAIL.txt | 2 +- PBS/Animations/Converted/Move/FLASH.txt | 2 +- PBS/Animations/Converted/Move/FLY.txt | 2 +- PBS/Animations/Converted/Move/FOCUSENERGY.txt | 6 +- PBS/Animations/Converted/Move/FOLLOWME.txt | 2 +- PBS/Animations/Converted/Move/FRENZYPLANT.txt | 4 +- PBS/Animations/Converted/Move/FURYATTACK.txt | 40 +-- PBS/Animations/Converted/Move/FURYCUTTER.txt | 2 +- PBS/Animations/Converted/Move/FURYSWIPES.txt | 10 +- PBS/Animations/Converted/Move/GASTROACID.txt | 2 +- PBS/Animations/Converted/Move/GIGADRAIN.txt | 8 +- PBS/Animations/Converted/Move/GLARE.txt | 2 +- PBS/Animations/Converted/Move/GROWL.txt | 4 +- PBS/Animations/Converted/Move/GRUDGE.txt | 2 +- PBS/Animations/Converted/Move/GUST.txt | 4 +- PBS/Animations/Converted/Move/HARDEN.txt | 2 +- PBS/Animations/Converted/Move/HEADBUTT.txt | 2 +- PBS/Animations/Converted/Move/HEATWAVE.txt | 8 +- .../Converted/Move/HIGHJUMPKICK.txt | 4 +- PBS/Animations/Converted/Move/HORNATTACK.txt | 2 +- PBS/Animations/Converted/Move/HYDROPUMP.txt | 6 +- PBS/Animations/Converted/Move/HYPERFANG.txt | 2 +- PBS/Animations/Converted/Move/ICEBALL.txt | 4 +- PBS/Animations/Converted/Move/ICEFANG.txt | 2 +- PBS/Animations/Converted/Move/ICICLESPEAR.txt | 20 +- PBS/Animations/Converted/Move/ICYWIND.txt | 4 +- PBS/Animations/Converted/Move/IRONHEAD.txt | 2 +- PBS/Animations/Converted/Move/JUMPKICK.txt | 2 +- PBS/Animations/Converted/Move/KARATECHOP.txt | 4 +- PBS/Animations/Converted/Move/KINESIS.txt | 2 +- PBS/Animations/Converted/Move/LEAFBLADE.txt | 10 +- PBS/Animations/Converted/Move/LEECHLIFE.txt | 6 +- PBS/Animations/Converted/Move/LEER.txt | 4 +- PBS/Animations/Converted/Move/LOCKON.txt | 2 +- PBS/Animations/Converted/Move/LOVELYKISS.txt | 2 +- PBS/Animations/Converted/Move/LOWKICK.txt | 2 +- PBS/Animations/Converted/Move/LUCKYCHANT.txt | 2 +- PBS/Animations/Converted/Move/MAGICCOAT.txt | 4 +- PBS/Animations/Converted/Move/MEGADRAIN.txt | 10 +- PBS/Animations/Converted/Move/MEGAHORN.txt | 6 +- PBS/Animations/Converted/Move/MEGAKICK.txt | 4 +- PBS/Animations/Converted/Move/METALCLAW.txt | 2 +- PBS/Animations/Converted/Move/METEORMASH.txt | 2 +- PBS/Animations/Converted/Move/METRONOME.txt | 4 +- PBS/Animations/Converted/Move/MIST.txt | 2 +- PBS/Animations/Converted/Move/MISTBALL.txt | 2 +- PBS/Animations/Converted/Move/MOONLIGHT.txt | 2 +- PBS/Animations/Converted/Move/MORNINGSUN.txt | 2 +- PBS/Animations/Converted/Move/OUTRAGE.txt | 10 +- PBS/Animations/Converted/Move/OVERHEAT.txt | 2 +- PBS/Animations/Converted/Move/PAYDAY.txt | 8 +- PBS/Animations/Converted/Move/PETALDANCE.txt | 2 +- PBS/Animations/Converted/Move/PINMISSILE.txt | 60 ++-- PBS/Animations/Converted/Move/POISONGAS.txt | 2 +- .../Converted/Move/POISONPOWDER.txt | 2 +- PBS/Animations/Converted/Move/POISONSTING.txt | 8 +- PBS/Animations/Converted/Move/POISONTAIL.txt | 4 +- PBS/Animations/Converted/Move/POUND.txt | 2 +- PBS/Animations/Converted/Move/PSYCHIC.txt | 2 +- PBS/Animations/Converted/Move/PSYCHOCUT.txt | 4 +- PBS/Animations/Converted/Move/QUICKATTACK.txt | 2 +- PBS/Animations/Converted/Move/RAZORLEAF.txt | 10 +- PBS/Animations/Converted/Move/REFLECT.txt | 2 +- PBS/Animations/Converted/Move/REST.txt | 2 +- PBS/Animations/Converted/Move/ROCKSMASH.txt | 4 +- PBS/Animations/Converted/Move/ROCKTHROW.txt | 4 +- PBS/Animations/Converted/Move/ROLLINGKICK.txt | 2 +- PBS/Animations/Converted/Move/SANDATTACK.txt | 4 +- PBS/Animations/Converted/Move/SCARYFACE.txt | 2 +- PBS/Animations/Converted/Move/SCRATCH.txt | 2 +- PBS/Animations/Converted/Move/SCREECH.txt | 2 +- .../Converted/Move/SELFDESTRUCT.txt | 10 +- PBS/Animations/Converted/Move/SHADOWBALL.txt | 2 +- PBS/Animations/Converted/Move/SIGNALBEAM.txt | 4 +- PBS/Animations/Converted/Move/SILVERWIND.txt | 2 +- PBS/Animations/Converted/Move/SING.txt | 4 +- PBS/Animations/Converted/Move/SKETCH.txt | 8 +- PBS/Animations/Converted/Move/SLAM.txt | 2 +- PBS/Animations/Converted/Move/SLASH.txt | 2 +- PBS/Animations/Converted/Move/SLEEPPOWDER.txt | 2 +- PBS/Animations/Converted/Move/SLUDGE.txt | 4 +- PBS/Animations/Converted/Move/SLUDGEBOMB.txt | 6 +- PBS/Animations/Converted/Move/SMOG.txt | 2 +- PBS/Animations/Converted/Move/SMOKESCREEN.txt | 2 +- PBS/Animations/Converted/Move/SPIDERWEB.txt | 2 +- PBS/Animations/Converted/Move/SPIKECANNON.txt | 30 +- PBS/Animations/Converted/Move/SPIKES.txt | 8 +- PBS/Animations/Converted/Move/SPORE.txt | 2 +- PBS/Animations/Converted/Move/STEALTHROCK.txt | 4 +- PBS/Animations/Converted/Move/STOMP.txt | 2 +- PBS/Animations/Converted/Move/STRINGSHOT.txt | 4 +- PBS/Animations/Converted/Move/STUNSPORE.txt | 2 +- PBS/Animations/Converted/Move/SUPERSONIC.txt | 2 +- PBS/Animations/Converted/Move/SWAGGER.txt | 2 +- PBS/Animations/Converted/Move/SWEETKISS.txt | 2 +- PBS/Animations/Converted/Move/SWIFT.txt | 8 +- PBS/Animations/Converted/Move/SWORDSDANCE.txt | 2 +- PBS/Animations/Converted/Move/TACKLE.txt | 2 +- PBS/Animations/Converted/Move/TAILGLOW.txt | 2 +- PBS/Animations/Converted/Move/TELEPORT.txt | 2 +- PBS/Animations/Converted/Move/THUNDER.txt | 2 +- PBS/Animations/Converted/Move/THUNDERBOLT.txt | 2 +- PBS/Animations/Converted/Move/THUNDERFANG.txt | 2 +- .../Converted/Move/THUNDERSHOCK.txt | 2 +- PBS/Animations/Converted/Move/THUNDERWAVE.txt | 2 +- PBS/Animations/Converted/Move/TOXIC.txt | 6 +- PBS/Animations/Converted/Move/TWINEEDLE.txt | 16 +- PBS/Animations/Converted/Move/TWISTER.txt | 10 +- PBS/Animations/Converted/Move/VINEWHIP.txt | 2 +- PBS/Animations/Converted/Move/WATERGUN.txt | 4 +- PBS/Animations/Converted/Move/WHIRLWIND.txt | 2 +- PBS/Animations/Converted/Move/WILLOWISP.txt | 2 +- PBS/Animations/Converted/Move/WINGATTACK.txt | 4 +- PBS/Animations/Converted/Move/WRAP.txt | 6 +- PBS/Animations/Converted/Move/WRINGOUT.txt | 2 +- PBS/Animations/Converted/Move/XSCISSOR.txt | 2 +- PBS/Animations/Converted/Move/ZAPCANNON.txt | 2 +- 203 files changed, 813 insertions(+), 852 deletions(-) diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index a357dd28b..e8c0c76e4 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -1,16 +1,6 @@ #=============================================================================== # Controls are arranged in a list in self's bitmap. Each control is given an # area of size "self's bitmap's width" x LINE_SPACING to draw itself in. -# TODO: The act of "capturing" a control makes other controls in this container -# not update themselves, i.e. they won't colour themselves with a hover -# highlight if the mouse happens to move over it while another control is -# captured. Is there a better way of dealing with this? I'm leaning -# towards the control itself deciding if it's captured, and it being -# treated as uncaptured once it says its value has changed, but I think -# this would require manually telling all other controls in this container -# that something else is captured and they shouldn't show a hover -# highlight when updated (perhaps as a parameter in def update), which I -# don't think is ideal. #=============================================================================== class UIControls::ControlsContainer attr_reader :x, :y @@ -171,11 +161,6 @@ class UIControls::ControlsContainer return if !@visible # Update controls if @captured - # TODO: Ideally all controls will be updated here, if only to redraw - # themselves if they happen to be invalidated somehow. But that - # involves telling each control whether any other control is busy, - # to ensure that they don't show their hover colours or anything, - # which is fiddly and I'm not sure if it's the best approach. @captured.update @captured = nil if !@captured.busy? else diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index a86deb547..98b9a0591 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -10,6 +10,7 @@ class UIControls::BaseControl < BitmapSprite TEXT_COLOR = Color.black TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set + TEXT_OFFSET_Y = 5 HOVER_COLOR = Color.cyan # For clickable area when hovering over it CAPTURE_COLOR = Color.pink # For area you clicked in but aren't hovering over DISABLED_COLOR = Color.gray @@ -19,7 +20,6 @@ class UIControls::BaseControl < BitmapSprite super(width, height, viewport) self.bitmap.font.color = TEXT_COLOR self.bitmap.font.size = TEXT_SIZE - @disabled = false @hover_area = nil # Is a symbol from the keys for @interactions if the mouse is hovering over that interaction @captured_area = nil # Is a symbol from the keys for @interactions (or :none) if this control is clicked in @@ -51,10 +51,7 @@ class UIControls::BaseControl < BitmapSprite return false if !@interactions || @interactions.empty? mouse_x, mouse_y = mouse_pos return false if !mouse_x || !mouse_y - @interactions.each_pair do |area, rect| - return true if rect.contains?(mouse_x, mouse_y) - end - return false + return @interactions.any? { |area, rect| rect.contains?(mouse_x, mouse_y) } end #----------------------------------------------------------------------------- @@ -84,7 +81,7 @@ class UIControls::BaseControl < BitmapSprite @invalid = true end - # Makes the control no longer invalid. + # Makes the control no longer invalid. Called after repainting. def validate @invalid = false end @@ -125,7 +122,6 @@ class UIControls::BaseControl < BitmapSprite end def refresh - # Paint over control to erase contents (intentionally not using self.bitmap.clear) self.bitmap.clear draw_area_highlight end @@ -194,10 +190,8 @@ class UIControls::BaseControl < BitmapSprite # Updates the logic on the control, invalidating it if necessary. def update return if !self.visible - return if disabled? && !busy? - + return if disabled? && !busy? # This control still works if it becomes disabled while using it update_hover_highlight - # Detect a mouse press/release if @interactions && !@interactions.empty? if Input.trigger?(Input::MOUSELEFT) @@ -206,6 +200,5 @@ class UIControls::BaseControl < BitmapSprite on_mouse_release end end - end end diff --git a/Data/Scripts/801_UI controls/Control elements/002_Label.rb b/Data/Scripts/801_UI controls/Control elements/002_Label.rb index 65676c40a..122cd9bb2 100644 --- a/Data/Scripts/801_UI controls/Control elements/002_Label.rb +++ b/Data/Scripts/801_UI controls/Control elements/002_Label.rb @@ -4,9 +4,6 @@ class UIControls::Label < UIControls::BaseControl attr_reader :text - LABEL_END_X = 80 - TEXT_OFFSET_Y = 5 - def initialize(width, height, viewport, text) super(width, height, viewport) @text = text @@ -27,8 +24,10 @@ class UIControls::Label < UIControls::BaseControl super if @header draw_text_centered(self.bitmap, 0, TEXT_OFFSET_Y, width, @text) + # Draw underline text_size = self.bitmap.text_size(@text) - self.bitmap.fill_rect((width - text_size.width) / 2, TEXT_OFFSET_Y + text_size.height, text_size.width, 1, TEXT_COLOR) + self.bitmap.fill_rect((width - text_size.width) / 2, TEXT_OFFSET_Y + text_size.height, + text_size.width, 1, TEXT_COLOR) else draw_text(self.bitmap, 4, TEXT_OFFSET_Y, @text) end diff --git a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb index eebb16824..940e68cfa 100644 --- a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb @@ -1,20 +1,18 @@ #=============================================================================== -# TODO: Support selecting part of the text by remembering the initial -# cursor position and using it and the current cursor position to -# decide which characters are selected. Maybe? Note that this method -# is only triggered upon the initial mouse press, and isn't repeated -# while it's still held down. +# #=============================================================================== class UIControls::TextBox < UIControls::BaseControl + attr_accessor :box_width + TEXT_BOX_X = 2 TEXT_BOX_WIDTH = 200 TEXT_BOX_HEIGHT = 24 TEXT_BOX_PADDING = 4 # Gap between sides of text box and text - TEXT_OFFSET_Y = 5 def initialize(width, height, viewport, value = "") super(width, height, viewport) @value = value + @box_width = TEXT_BOX_WIDTH @cursor_pos = -1 @display_pos = 0 @cursor_timer = nil @@ -22,9 +20,13 @@ class UIControls::TextBox < UIControls::BaseControl @blacklist = [] end + def value + return @value.dup + end + def value=(new_value) return if @value == new_value - @value = new_value + @value = new_value.dup invalidate end @@ -59,7 +61,7 @@ class UIControls::TextBox < UIControls::BaseControl def set_interactive_rects @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, - [TEXT_BOX_WIDTH, width].min, TEXT_BOX_HEIGHT) + [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) @interactions = { :text_box => @text_box_rect } diff --git a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb index 97e0df00d..4201f20a5 100644 --- a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb +++ b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb @@ -1,6 +1,5 @@ #=============================================================================== -# TODO: Is there a better knob design than a big black rectangle? I'd rather -# it not be a different colour. +# #=============================================================================== class UIControls::NumberSlider < UIControls::BaseControl attr_reader :min_value @@ -14,7 +13,6 @@ class UIControls::NumberSlider < UIControls::BaseControl SLIDER_LENGTH = 128 PLUS_X = SLIDER_X + SLIDER_LENGTH + SLIDER_PADDING VALUE_X = PLUS_X + PLUS_MINUS_SIZE + 5 - TEXT_OFFSET_Y = 5 def initialize(width, height, viewport, min_value, max_value, value) super(width, height, viewport) diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index 403419004..4a87efbe1 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -4,8 +4,8 @@ class UIControls::Button < UIControls::BaseControl BUTTON_X = 2 BUTTON_Y = 2 - BUTTON_PADDING = 10 - BUTTON_HEIGHT = 28 + BUTTON_PADDING = 10 # Used when @fixed_size is false + BUTTON_HEIGHT = 28 # Used when @fixed_size is false # TODO: This will also depend on the font size. TEXT_BASE_OFFSET_Y = 18 # Text is centred vertically in the button @@ -20,6 +20,7 @@ class UIControls::Button < UIControls::BaseControl end def set_interactive_rects + @interactions&.clear button_width = (@fixed_size) ? width - (BUTTON_X * 2) : self.bitmap.text_size(@text).width + (BUTTON_PADDING * 2) button_height = (@fixed_size) ? height - (2 * BUTTON_Y) : BUTTON_HEIGHT button_height = [button_height, height - (2 * BUTTON_Y)].min @@ -29,10 +30,10 @@ class UIControls::Button < UIControls::BaseControl } end - # TODO: This won't change the button's size. This is probably okay. def set_text(val) return if @text == val @text = val + set_interactive_rects if !@fixed_size invalidate end @@ -60,12 +61,14 @@ class UIControls::Button < UIControls::BaseControl self.bitmap.outline_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, self.bitmap.font.color) - # TODO: Make buttons look more different to text boxes? - # shade = self.bitmap.font.color.clone - # shade.alpha = 96 - # self.bitmap.outline_rect(@button_rect.x + 1, @button_rect.y + 1, - # @button_rect.width - 2, @button_rect.height - 2, - # shade, 3) + # Draw inner grey ring that shows this is a button rather than a text box + if !disabled? + shade = self.bitmap.font.color.clone + shade.alpha = 64 + self.bitmap.outline_rect(@button_rect.x + 2, @button_rect.y + 2, + @button_rect.width - 4, @button_rect.height - 4, + shade, 1) + end # Draw button text draw_text_centered(self.bitmap, @button_rect.x, @button_rect.y + (@button_rect.height - TEXT_BASE_OFFSET_Y) / 2, diff --git a/Data/Scripts/801_UI controls/Control elements/008_List.rb b/Data/Scripts/801_UI controls/Control elements/008_List.rb index fbd4cc35a..972f8497d 100644 --- a/Data/Scripts/801_UI controls/Control elements/008_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_List.rb @@ -1,11 +1,5 @@ #=============================================================================== -# TODO: Do I need to split self's bitmap into two (one for highlights and one -# for text)? This would be to reduce lag caused by redrawing text even if -# you're just waving the mouse over the control. There doesn't seem to be -# any lag at the moment with a tall list. -# TODO: Make a viewport for the list, and allow scrolling positions halfway -# through a line? Nah. -# TODO: This control cannot be disabled. +# #=============================================================================== class UIControls::List < UIControls::BaseControl LIST_X = 0 diff --git a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb index 2a7978dde..c98589ee9 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb @@ -2,22 +2,23 @@ # #=============================================================================== class UIControls::DropdownList < UIControls::BaseControl + attr_accessor :box_width + attr_accessor :max_rows + TEXT_BOX_X = 2 TEXT_BOX_WIDTH = 200 TEXT_BOX_HEIGHT = 24 TEXT_BOX_PADDING = 4 # Gap between sides of text box and text - TEXT_OFFSET_Y = 5 MAX_LIST_ROWS = 8 - attr_accessor :max_rows - + # NOTE: options is a hash: keys are symbols, values are display names. def initialize(width, height, viewport, options, value) - # NOTE: options is a hash: keys are symbols, values are display names. super(width, height, viewport) - @options = options - @value = value + @options = options + @value = value + @box_width = TEXT_BOX_WIDTH @toggling_dropdown_list = false - @max_rows = MAX_LIST_ROWS + @max_rows = MAX_LIST_ROWS end def dispose @@ -33,7 +34,7 @@ class UIControls::DropdownList < UIControls::BaseControl def set_interactive_rects @button_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, - [TEXT_BOX_WIDTH, width].min, TEXT_BOX_HEIGHT) + [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) @interactions = { :button => @button_rect } diff --git a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb index 7a1b28323..d0a9f5c38 100644 --- a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb +++ b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb @@ -1,7 +1,5 @@ #=============================================================================== -# TODO: Make the slider a separate sprite that moves, instead of redrawing this -# sprite's bitmap whenever it moves? Intended to reduce lag. There doesn't -# seem to be any lag at the moment with a tall scrollbar. +# #=============================================================================== class UIControls::Scrollbar < UIControls::BaseControl SLIDER_WIDTH = 16 @@ -122,9 +120,6 @@ class UIControls::Scrollbar < UIControls::BaseControl return if !self.visible super if @captured_area == :slider - # TODO: Have a display y position for the slider bar which is in pixels, - # and round it to the nearest row when setting @top_row? This is - # just to make the slider bar movement smoother. mouse_x, mouse_y = mouse_pos return if !mouse_x || !mouse_y long_coord = (@horizontal) ? mouse_x : mouse_y diff --git a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb index 86db9c772..b64095f19 100644 --- a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb +++ b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb @@ -6,6 +6,15 @@ class Bitmap fill_rect(x + width - thickness, y, thickness, height, color) end + # Draws a series of concentric outline_rects around the defined area. From + # inside to outside, the color of each ring alternates. + def border_rect(x, y, width, height, thickness, color1, color2) + thickness.times do |i| + col = (i.even?) ? color1 : color2 + outline_rect(x - i - 1, y - i - 1, width + (i * 2) + 2, height + (i * 2) + 2, col) + end + end + def fill_diamond(x, y, radius, color) ((radius * 2) + 1).times do |i| height = (i <= radius) ? (i * 2) + 1 : (((radius * 2) - i) * 2) + 1 diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index da0e02564..4bee10e5b 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -25,7 +25,6 @@ module GameData # Properties that apply to the animation in general, not to individual # particles. They don't change during the animation. SCHEMA = { - # TODO: Add support for overworld animations. "SectionName" => [:id, "esU", {"Move" => :move, "OppMove" => :opp_move, "Common" => :common, "OppCommon" => :opp_common}], "Name" => [:name, "s"], @@ -36,8 +35,6 @@ module GameData # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage # animations start playing). "Flags" => [:flags, "*s"], - # TODO: If this is changed to be more than just a string, edit the - # compiler's current_particle definition accordingly. "Particle" => [:particles, "s"] # Is a subheader line like } # For individual particles. Any property whose schema begins with "^" can @@ -49,9 +46,9 @@ module GameData # These properties cannot be changed partway through the animation. # NOTE: "Name" isn't a property here, because the particle's name comes # from the "Particle" property above. + "Graphic" => [:graphic, "s"], # TODO: If more focus types are added, add ones that involve a target to # the Compiler's check relating to "NoTarget". - "Graphic" => [:graphic, "s"], "Focus" => [:focus, "e", {"User" => :user, "Target" => :target, "UserAndTarget" => :user_and_target, "Screen" => :screen}], @@ -59,8 +56,8 @@ module GameData # All properties below are "SetXYZ" or "MoveXYZ". "SetXYZ" has the # keyframe and the value, and "MoveXYZ" has the keyframe, duration and the - # value. All are "^". "SetXYZ" is turned into "MoveXYZ" when compiling by - # inserting a duration (second value) of 0. + # value. All have "^" in their schema. "SetXYZ" is turned into "MoveXYZ" + # when compiling by inserting a duration (second value) of 0. "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet "MoveFrame" => [:frame, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 @@ -144,7 +141,7 @@ module GameData :target_cry => nil } - @@cmd_to_pbs_name = nil # USed for writing animation PBS files + @@cmd_to_pbs_name = nil # Used for writing animation PBS files extend ClassMethodsIDNumbers include InstanceMethods @@ -162,27 +159,6 @@ module GameData DATA[(id_num >= 0) ? id_num : DATA.keys.length] = self.new(hash) end - # TODO: Rewrite this to query animations from other criteria. Remember that - # multiple animations could have the same move/version. Odds are this - # method won't be used much at all. - # TODO: Separate exists? methods for move and common animations? -# def exists?(other) -# end - - # TODO: Rewrite this to get animations from other criteria. Remember that - # multiple animations could have the same move/version. Odds are this - # method won't be used much at all. - # TODO: Separate get methods for move and common animations? -# def get(other) -# end - - # TODO: Rewrite this to get animations from other criteria. Remember that - # multiple animations could have the same move/version. Odds are this - # method won't be used much at all. - # TODO: Separate try_get methods for move and common animations? -# def try_get(other) -# end - def initialize(hash) # NOTE: hash has an :id entry, but it's unused here. @type = hash[:type] @@ -201,9 +177,9 @@ module GameData def clone_as_hash ret = {} ret[:type] = @type - ret[:move] = @move.dup - ret[:version] = @version.dup - ret[:name] = @name.dup + ret[:move] = @move + ret[:version] = @version + ret[:name] = @name ret[:particles] = [] # Clone the @particles array, which is nested hashes and arrays @particles.each do |particle| new_p = {} @@ -254,10 +230,6 @@ module GameData # The User and Target particles have hardcoded graphics/foci, so they # don't need writing to PBS ret = nil if ["User", "Target"].include?(@particles[index][:name]) - when "Play" - # TODO: Turn volume/pitch of 100 into nil. - when "PlayUserCry", "PlayTargetCry" - # TODO: Turn volume/pitch of 100 into nil. when "AllCommands" # Get translations of all properties to their names as seen in PBS # animation files @@ -283,6 +255,14 @@ module GameData new_cmd.pop if new_cmd.last == :linear # This is the default ret.push([@@cmd_to_pbs_name[key][1]] + new_cmd) # ["MoveXYZ", keyframe, duration, value] else + case key + when :se + new_cmd[4] = nil if new_cmd[4] == 100 # Pitch + new_cmd[3] = nil if new_cmd[4].nil? && new_cmd[3] == 100 # Volume + when :user_cry, :target_cry + new_cmd[3] = nil if new_cmd[3] == 100 # Pitch + new_cmd[2] = nil if new_cmd[3].nil? && new_cmd[2] == 100 # Volume + end ret.push([@@cmd_to_pbs_name[key][0]] + new_cmd) # ["SetXYZ", keyframe, duration, value] end end diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index b3108fb3c..30c1273f4 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -1,20 +1,5 @@ -# TODO: Should I split this code into visual and mechanical classes, a la the -# other UI screens? #=============================================================================== -# TODO: When creating a new particle, blacklist the names "User", "Target" and -# "SE". Make particles with those names undeletable. -# TODO: Remove the particle named "Target" if the animation's focus is changed -# to one that doesn't include a target, and vice versa. Do the same for -# "User"(?). -# TODO: Things that need pop-up windows (draws a semi-transparent grey over the -# whole screen behind the window): -# - animation properties (Move/OppMove/Common/OppCommon, move, version, -# extra name, target, filepath, flags, etc.) -# - editor settings (theme, canvas BG graphics, user/target graphics, -# display of canvas particle boxes, etc.) -# TODO: While playing the animation, draw a semi-transparent grey over the -# screen except for the canvas and playback controls. Can't edit anything -# while it's playing. +# #=============================================================================== class AnimationEditor WINDOW_WIDTH = Settings::SCREEN_WIDTH + (32 * 10) @@ -22,6 +7,7 @@ class AnimationEditor BORDER_THICKNESS = 4 + # Components MENU_BAR_WIDTH = WINDOW_WIDTH MENU_BAR_HEIGHT = 30 @@ -45,15 +31,43 @@ class AnimationEditor PARTICLE_LIST_WIDTH = WINDOW_WIDTH - (BORDER_THICKNESS * 2) PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y - BORDER_THICKNESS - ANIM_PROPERTIES_WIDTH = SIDE_PANE_WIDTH + 80 - ANIM_PROPERTIES_HEIGHT = WINDOW_HEIGHT * 3 / 4 - ANIM_PROPERTIES_X = (WINDOW_WIDTH - ANIM_PROPERTIES_WIDTH) / 2 - ANIM_PROPERTIES_Y = (WINDOW_HEIGHT - ANIM_PROPERTIES_HEIGHT) / 2 + # Pop-up windows + ANIM_PROPERTIES_LABEL_WIDTH = UIControls::ControlsContainer::OFFSET_FROM_LABEL_X + 80 + ANIM_PROPERTIES_WIDTH = SIDE_PANE_WIDTH + 80 + 8 + ANIM_PROPERTIES_HEIGHT = WINDOW_HEIGHT * 3 / 4 + ANIM_PROPERTIES_X = (WINDOW_WIDTH - ANIM_PROPERTIES_WIDTH) / 2 + ANIM_PROPERTIES_Y = (WINDOW_HEIGHT - ANIM_PROPERTIES_HEIGHT) / 2 + + MESSAGE_BOX_WIDTH = WINDOW_WIDTH * 3 / 4 + MESSAGE_BOX_HEIGHT = 160 + MESSAGE_BOX_BUTTON_WIDTH = 150 + MESSAGE_BOX_BUTTON_HEIGHT = 32 + MESSAGE_BOX_SPACING = 16 + + CHOOSER_BUTTON_WIDTH = 150 + CHOOSER_BUTTON_HEIGHT = MESSAGE_BOX_BUTTON_HEIGHT + CHOOSER_FILE_LIST_X = 8 + CHOOSER_FILE_LIST_Y = 32 + CHOOSER_FILE_LIST_WIDTH = CHOOSER_BUTTON_WIDTH * 2 + CHOOSER_FILE_LIST_HEIGHT = UIControls::List::ROW_HEIGHT * 15 + + GRAPHIC_CHOOSER_PREVIEW_SIZE = 320 # Square + GRAPHIC_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 10 + GRAPHIC_CHOOSER_PREVIEW_SIZE + 8 + (BORDER_THICKNESS * 2) + GRAPHIC_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 + (BORDER_THICKNESS * 2) + GRAPHIC_CHOOSER_X = ((WINDOW_WIDTH - GRAPHIC_CHOOSER_WINDOW_WIDTH) / 2) + GRAPHIC_CHOOSER_Y = ((WINDOW_HEIGHT - GRAPHIC_CHOOSER_WINDOW_HEIGHT) / 2) + + AUDIO_CHOOSER_LABEL_WIDTH = UIControls::ControlsContainer::OFFSET_FROM_LABEL_X + AUDIO_CHOOSER_SLIDER_WIDTH = (CHOOSER_BUTTON_WIDTH * 2) - AUDIO_CHOOSER_LABEL_WIDTH + AUDIO_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 8 + (CHOOSER_BUTTON_WIDTH * 2) + 4 + (BORDER_THICKNESS * 2) + AUDIO_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 + (BORDER_THICKNESS * 2) + AUDIO_CHOOSER_X = ((WINDOW_WIDTH - AUDIO_CHOOSER_WINDOW_WIDTH) / 2) + AUDIO_CHOOSER_Y = ((WINDOW_HEIGHT - AUDIO_CHOOSER_WINDOW_HEIGHT) / 2) def initialize(anim_id, anim) @anim_id = anim_id @anim = anim - @pbs_path = anim[:pbs_path].dup + @pbs_path = anim[:pbs_path] @quit = false # Viewports @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @@ -85,13 +99,10 @@ class AnimationEditor [:commands_pane, :se_pane, :particle_pane, :keyframe_pane].each do |pane| @components[pane] = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) end - # TODO: Make more side panes for: - # - colour/tone editor (accessed from @components[:commands_pane] via - # a button; has Apply/Cancel buttons to only apply all its values at - # the end of editing them, although canvas will be updated in real - # time to show the changes) - # - effects particle properties (depends on keyframe; for screen - # shake, etc.) + # TODO: Make a side pane for colour/tone editor (accessed from + # @components[:commands_pane] via a button; has Apply/Cancel buttons + # to retain/undo all its changes, although changes are made normally + # while in it and canvas is updated accordingly. # Timeline/particle list @components[:particle_list] = AnimationEditor::ParticleList.new( PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport @@ -99,17 +110,25 @@ class AnimationEditor @components[:particle_list].set_interactive_rects # Animation properties pop-up window @components[:animation_properties] = UIControls::ControlsContainer.new( - ANIM_PROPERTIES_X + 4, ANIM_PROPERTIES_Y + 4, ANIM_PROPERTIES_WIDTH - 8, ANIM_PROPERTIES_HEIGHT - 8 + ANIM_PROPERTIES_X + BORDER_THICKNESS + 4, ANIM_PROPERTIES_Y + BORDER_THICKNESS, + ANIM_PROPERTIES_WIDTH - ((BORDER_THICKNESS + 4) * 2), ANIM_PROPERTIES_HEIGHT - (BORDER_THICKNESS * 2) ) @components[:animation_properties].viewport.z = @pop_up_viewport.z + 1 @components[:animation_properties].label_offset_x = 170 + # Graphic chooser pop-up window + @components[:graphic_chooser] = UIControls::ControlsContainer.new( + GRAPHIC_CHOOSER_X + BORDER_THICKNESS, GRAPHIC_CHOOSER_Y + BORDER_THICKNESS, + GRAPHIC_CHOOSER_WINDOW_WIDTH - (BORDER_THICKNESS * 2), GRAPHIC_CHOOSER_WINDOW_HEIGHT - (BORDER_THICKNESS * 2) + ) + @components[:graphic_chooser].viewport.z = @pop_up_viewport.z + 1 + # Audio chooser pop-up window + @components[:audio_chooser] = UIControls::ControlsContainer.new( + AUDIO_CHOOSER_X + BORDER_THICKNESS, AUDIO_CHOOSER_Y + BORDER_THICKNESS, + AUDIO_CHOOSER_WINDOW_WIDTH - (BORDER_THICKNESS * 2), AUDIO_CHOOSER_WINDOW_HEIGHT - (BORDER_THICKNESS * 2) + ) + @components[:audio_chooser].viewport.z = @pop_up_viewport.z + 1 @captured = nil - set_menu_bar_contents - set_canvas_contents - set_play_controls_contents - set_side_panes_contents - set_particle_list_contents - set_animation_properties_contents + set_components_contents refresh end @@ -121,6 +140,7 @@ class AnimationEditor @components.clear @viewport.dispose @canvas_viewport.dispose + @pop_up_viewport.dispose end def keyframe @@ -178,8 +198,12 @@ class AnimationEditor # sprite, make this instead a choice of front/back/same as the main sprite/ # opposite of the main sprite. Probably need two controls in the same space # and refresh_component(:commands_pane) makes the appropriate one visible. - commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -128, CANVAS_WIDTH + 128, 64) - commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -128, CANVAS_HEIGHT + 128, 96) + commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -(CANVAS_WIDTH + 128), CANVAS_WIDTH + 128, 0) + commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -(CANVAS_WIDTH + 128), CANVAS_HEIGHT + 128, 0) + # TODO: If the graphic is user's sprite/target's sprite, make :frame instead + # a choice of front/back/same as the main sprite/opposite of the main + # sprite. Will need two controls in the same space. + commands_pane.add_labelled_number_text_box(:frame, _INTL("Frame"), 0, 99, 0) commands_pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) commands_pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) commands_pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) @@ -273,12 +297,14 @@ class AnimationEditor # Create "opp" variant anim_properties.add_labelled_checkbox(:opp_variant, _INTL("User is opposing?"), false) # Create move control - # TODO: Also make a TextBox here for common animations, and toggle these two - # controls' visibility depending on :type? + # TODO: Instead of having the :common_anim TextBox control, make this a + # TextBoxDropdownList control instead. Make it allow custom text + # as well as any option in the list. Its options will be changed + # depending on the animation's type. Also have a list of existing + # Common animation names for it. move_list = [] GameData::Move.each { |m| move_list.push([m.id.to_s, m.name]) } move_list.sort! { |a, b| a[1] <=> b[1] } - # TODO: Make this a TextBoxDropdownList instead. anim_properties.add_labelled_dropdown_list(:move, _INTL("Move"), move_list.to_h, move_list[0][0]) move_ctrl = anim_properties.get_control(:move) move_ctrl.max_rows = 16 @@ -297,11 +323,71 @@ class AnimationEditor # TODO: List, TextBox and some Buttons to add/delete. # Create "usable in battle" control anim_properties.add_labelled_checkbox(:usable, _INTL("Can be used in battle?"), true) - # TODO: "Play if target is on the same side as the user". anim_properties.add_button(:close, _INTL("Close")) anim_properties.visible = false end + def set_graphic_chooser_contents + graphic_chooser = @components[:graphic_chooser] + graphic_chooser.add_header_label(:header, _INTL("Choose a file")) + # List of files + list = UIControls::List.new(CHOOSER_FILE_LIST_WIDTH, CHOOSER_FILE_LIST_HEIGHT, graphic_chooser.viewport, []) + graphic_chooser.add_control_at(:list, list, CHOOSER_FILE_LIST_X, CHOOSER_FILE_LIST_Y) + # Buttons + [[:ok, _INTL("OK")], [:cancel, _INTL("Cancel")]].each_with_index do |option, i| + btn = UIControls::Button.new(CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, graphic_chooser.viewport, option[1]) + btn.set_fixed_size + graphic_chooser.add_control_at(option[0], btn, + CHOOSER_FILE_LIST_X + (CHOOSER_BUTTON_WIDTH * i), + CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 4) + end + graphic_chooser.visible = false + end + + def set_audio_chooser_contents + audio_chooser = @components[:audio_chooser] + audio_chooser.add_header_label(:header, _INTL("Choose a file")) + # List of files + list = UIControls::List.new(CHOOSER_FILE_LIST_WIDTH, CHOOSER_FILE_LIST_HEIGHT, audio_chooser.viewport, []) + audio_chooser.add_control_at(:list, list, CHOOSER_FILE_LIST_X, CHOOSER_FILE_LIST_Y) + # Buttons + [[:ok, _INTL("OK")], [:cancel, _INTL("Cancel")]].each_with_index do |option, i| + btn = UIControls::Button.new(CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, audio_chooser.viewport, option[1]) + btn.set_fixed_size + audio_chooser.add_control_at(option[0], btn, + CHOOSER_FILE_LIST_X + (CHOOSER_BUTTON_WIDTH * i), + CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 4) + end + # Volume and pitch sliders + [[:volume, _INTL("Volume"), 0, 100], [:pitch, _INTL("Pitch"), 0, 200]].each_with_index do |option, i| + label = UIControls::Label.new(AUDIO_CHOOSER_LABEL_WIDTH, 28, audio_chooser.viewport, option[1]) + audio_chooser.add_control_at((option[0].to_s + "_label").to_sym, label, + list.x + list.width + 8, list.y + (28 * i)) + slider = UIControls::NumberSlider.new(AUDIO_CHOOSER_SLIDER_WIDTH, 28, audio_chooser.viewport, option[2], option[3], 100) + audio_chooser.add_control_at(option[0], slider, label.x + label.width, label.y) + end + # Playback buttons + [[:play, _INTL("Play")], [:stop, _INTL("Stop")]].each_with_index do |option, i| + btn = UIControls::Button.new(CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, audio_chooser.viewport, option[1]) + btn.set_fixed_size + audio_chooser.add_control_at(option[0], btn, + list.x + list.width + 8 + (CHOOSER_BUTTON_WIDTH * i), + list.y + (28 * 2)) + end + audio_chooser.visible = false + end + + def set_components_contents + set_menu_bar_contents + set_canvas_contents + set_play_controls_contents + set_side_panes_contents + set_particle_list_contents + set_animation_properties_contents + set_graphic_chooser_contents + set_audio_chooser_contents + end + #----------------------------------------------------------------------------- def save @@ -320,19 +406,17 @@ class AnimationEditor #----------------------------------------------------------------------------- def draw_editor_background - draw_big_outline = lambda do |bitmap, x, y, width, height| - BORDER_THICKNESS.times do |i| - col = (i.even?) ? Color.white : Color.black - bitmap.outline_rect(x - i - 1, y - i - 1, width + (i * 2) + 2, height + (i * 2) + 2, col) - end - end # Fill the whole screen with white @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.white) # Outline around elements - draw_big_outline.call(@screen_bitmap.bitmap, CANVAS_X, CANVAS_Y, CANVAS_WIDTH, CANVAS_HEIGHT) - draw_big_outline.call(@screen_bitmap.bitmap, PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT) - draw_big_outline.call(@screen_bitmap.bitmap, SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) - draw_big_outline.call(@screen_bitmap.bitmap, PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT) + @screen_bitmap.bitmap.border_rect(CANVAS_X, CANVAS_Y, CANVAS_WIDTH, CANVAS_HEIGHT, + BORDER_THICKNESS, Color.white, Color.black) + @screen_bitmap.bitmap.border_rect(PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, + BORDER_THICKNESS, Color.white, Color.black) + @screen_bitmap.bitmap.border_rect(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, + BORDER_THICKNESS, Color.white, Color.black) + @screen_bitmap.bitmap.border_rect(PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, + BORDER_THICKNESS, Color.white, Color.black) # Draw box around SE list box in side pane @se_list_box_bitmap.bitmap.outline_rect(SIDE_PANE_X + 3, SIDE_PANE_Y + 24 + 4, SIDE_PANE_WIDTH - 6, (5 * UIControls::List::ROW_HEIGHT) + 4, Color.black) @@ -365,14 +449,14 @@ class AnimationEditor case component_sym when :commands_pane new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) - # TODO: Need to do something special for :color, :tone and :frame which - # all have button controls. component.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, # which should be indicated somehow in ctrl[1]. end + # TODO: component.get_control(:frame).disable if the particle's graphic is + # not a spritesheet or is "USER"/"TARGET"/etc. (enable otherwise). when :se_pane se_particle = @anim[:particles].select { |p| p[:name] == "SE" }[0] kyfrm = keyframe @@ -428,18 +512,20 @@ class AnimationEditor component.get_control(:graphic).enable component.get_control(:focus).enable end + # TODO: Set the possible focus options depending on whether the animation + # has a target/user. when :animation_properties case @anim[:type] when :move, :opp_move component.get_control(:move_label).text = _INTL("Move") component.get_control(:move).visible = true - component.get_control(:move).value = @anim[:move].dup + component.get_control(:move).value = @anim[:move] component.get_control(:common_anim).visible = false when :common, :opp_common component.get_control(:move_label).text = _INTL("Common animation") component.get_control(:move).visible = false component.get_control(:common_anim).visible = true - component.get_control(:common_anim).value = @anim[:move].dup + component.get_control(:common_anim).value = @anim[:move] end # TODO: Maybe other things as well? end @@ -458,8 +544,6 @@ class AnimationEditor #----------------------------------------------------------------------------- - # TODO: Every component that contains a button, etc. should respond to - # "values", which returns the changed elements. def apply_changed_value(component_sym, property, value) case component_sym when :menu_bar @@ -544,7 +628,7 @@ class AnimationEditor if @anim[:particles][p_index][:graphic] != new_file @anim[:particles][p_index][:graphic] = new_file refresh_component(:particle_pane) - # TODO: refresh_component(:canvas) + refresh_component(:canvas) end else particle = @anim[:particles][particle_index] @@ -572,7 +656,7 @@ class AnimationEditor when :common_anim @anim[:move] = value when :pbs_path - txt = value.dup.gsub!(/\.txt$/, "") + txt = value.gsub!(/\.txt$/, "") @anim[property] = txt when :has_target @anim[:no_target] = !value diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index c452f7297..88323098f 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -2,20 +2,6 @@ # #=============================================================================== class AnimationEditor - MESSAGE_BOX_WIDTH = WINDOW_WIDTH * 3 / 4 - MESSAGE_BOX_HEIGHT = 160 - MESSAGE_BOX_BUTTON_WIDTH = 150 - MESSAGE_BOX_BUTTON_HEIGHT = 32 - MESSAGE_BOX_SPACING = 16 - - GRAPHIC_CHOOSER_BUTTON_WIDTH = 150 - GRAPHIC_CHOOSER_BUTTON_HEIGHT = MESSAGE_BOX_BUTTON_HEIGHT - GRAPHIC_CHOOSER_FILE_LIST_WIDTH = GRAPHIC_CHOOSER_BUTTON_WIDTH * 2 - GRAPHIC_CHOOSER_FILE_LIST_HEIGHT = 15 * UIControls::List::ROW_HEIGHT - GRAPHIC_CHOOSER_PREVIEW_SIZE = 320 - GRAPHIC_CHOOSER_WINDOW_WIDTH = GRAPHIC_CHOOSER_FILE_LIST_WIDTH + GRAPHIC_CHOOSER_PREVIEW_SIZE + (MESSAGE_BOX_SPACING * 2) + 8 - GRAPHIC_CHOOSER_WINDOW_HEIGHT = GRAPHIC_CHOOSER_FILE_LIST_HEIGHT + GRAPHIC_CHOOSER_BUTTON_HEIGHT + 24 + (MESSAGE_BOX_SPACING * 2) + 2 - def create_pop_up_window(width, height) ret = BitmapSprite.new(width, height, @pop_up_viewport) ret.x = (WINDOW_WIDTH - width) / 2 @@ -24,10 +10,9 @@ class AnimationEditor ret.bitmap.font.color = Color.black ret.bitmap.font.size = 18 # Draw message box border - BORDER_THICKNESS.times do |i| - col = (i.even?) ? Color.black : Color.white - ret.bitmap.outline_rect(i, i, ret.width - (i * 2), ret.height - (i * 2), col) - end + ret.bitmap.border_rect(BORDER_THICKNESS, BORDER_THICKNESS, + ret.width - (BORDER_THICKNESS * 2), ret.height - (BORDER_THICKNESS * 2), + BORDER_THICKNESS, Color.white, Color.black) # Fill message box with white ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, ret.width - (BORDER_THICKNESS * 2), @@ -94,66 +79,64 @@ class AnimationEditor #----------------------------------------------------------------------------- + # Generates a list of all files in the given folder which have a file + # extension that matches one in exts. Removes any files from the list whose + # filename is the same as one in prepends (case insensitive), and then adds + # all the files in prepends to the start of the list. + def get_all_files_in_folder_and_prepend(folder, exts, prepends) + ret = [] + Dir.chdir(folder) do + exts.each do |type| + Dir.glob(type) { |f| ret.push([File.basename(f, ".*"), f]) } + end + end + ret.delete_if { |f| prepends.any? { |add| add[0] == f[0].upcase } } + ret.sort! { |a, b| a[0].downcase <=> b[0].downcase } + ret.prepend(*prepends) + return ret + end + def choose_graphic_file(selected) selected ||= "" sprite_folder = "Graphics/Battle animations/" + # Show pop-up window + @pop_up_bg_bitmap.visible = true + bg_bitmap = create_pop_up_window(GRAPHIC_CHOOSER_WINDOW_WIDTH, GRAPHIC_CHOOSER_WINDOW_HEIGHT) + graphic_chooser = @components[:graphic_chooser] + graphic_chooser.visible = true + # Draw box around list control + list = graphic_chooser.get_control(:list) + bg_bitmap.bitmap.outline_rect(list.x + BORDER_THICKNESS - 2, list.y + BORDER_THICKNESS - 2, + list.width + 4, list.height + 4, Color.black) # Get a list of files - files = [] - Dir.chdir(sprite_folder) do - Dir.glob("*.png") { |f| files.push([File.basename(f, ".*"), f]) } - Dir.glob("*.jpg") { |f| files.push([File.basename(f, ".*"), f]) } - Dir.glob("*.jpeg") { |f| files.push([File.basename(f, ".*"), f]) } - end - files.delete_if { |f| ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", - "TARGET", "TARGET_OPP", "TARGET_FRONT", - "TARGET_BACK"].include?(f[0].upcase) } - files.sort! { |a, b| a[0].downcase <=> b[0].downcase } - files.prepend(["USER", _INTL("[[User's sprite]]")], - ["USER_OPP", _INTL("[[User's other side sprite]]")], - ["USER_FRONT", _INTL("[[User's front sprite]]")], - ["USER_BACK", _INTL("[[User's back sprite]]")], - ["TARGET", _INTL("[[Target's sprite]]")], - ["TARGET_OPP", _INTL("[[Target's other side sprite]]")], - ["TARGET_FRONT", _INTL("[[Target's front sprite]]")], - ["TARGET_BACK", _INTL("[[Target's back sprite]]")]) + files = get_all_files_in_folder_and_prepend( + sprite_folder, ["*.png", "*.jpg", "*.jpeg"], + [["USER", _INTL("[[User's sprite]]")], + ["USER_OPP", _INTL("[[User's other side sprite]]")], + ["USER_FRONT", _INTL("[[User's front sprite]]")], + ["USER_BACK", _INTL("[[User's back sprite]]")], + ["TARGET", _INTL("[[Target's sprite]]")], + ["TARGET_OPP", _INTL("[[Target's other side sprite]]")], + ["TARGET_FRONT", _INTL("[[Target's front sprite]]")], + ["TARGET_BACK", _INTL("[[Target's back sprite]]")]] + ) idx = 0 files.each_with_index do |f, i| next if f[0] != selected idx = i break end - # Show pop-up window - @pop_up_bg_bitmap.visible = true - bg_bitmap = create_pop_up_window(GRAPHIC_CHOOSER_WINDOW_WIDTH, GRAPHIC_CHOOSER_WINDOW_HEIGHT) - text = _INTL("Choose a file...") - text_size = bg_bitmap.bitmap.text_size(text) - bg_bitmap.bitmap.draw_text(MESSAGE_BOX_SPACING, 11, bg_bitmap.width, text_size.height, text, 0) - # Create list of files - list = UIControls::List.new(GRAPHIC_CHOOSER_FILE_LIST_WIDTH, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT, @pop_up_viewport, files) - list.x = bg_bitmap.x + MESSAGE_BOX_SPACING - list.y = bg_bitmap.y + MESSAGE_BOX_SPACING + 24 + # Set control values + list.values = files list.selected = idx - list.set_interactive_rects - list.repaint - bg_bitmap.bitmap.outline_rect(MESSAGE_BOX_SPACING - 2, MESSAGE_BOX_SPACING + 24 - 2, - GRAPHIC_CHOOSER_FILE_LIST_WIDTH + 4, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT + 4, Color.black) - # Create buttons - buttons = [] - [[:ok, _INTL("OK")], [:cancel, _INTL("Cancel")]].each_with_index do |option, i| - btn = UIControls::Button.new(GRAPHIC_CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) - btn.x = list.x + (GRAPHIC_CHOOSER_BUTTON_WIDTH * i) - btn.y = list.y + list.height + 2 - btn.set_fixed_size - btn.set_interactive_rects - buttons.push([option[0], btn]) - end # Create sprite preview - bg_bitmap.bitmap.outline_rect(MESSAGE_BOX_SPACING + list.width + 6, MESSAGE_BOX_SPACING + 24 - 2, + bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x + list.width + 10 - 2, + BORDER_THICKNESS + list.y - 2, GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, Color.black) preview_sprite = Sprite.new(@pop_up_viewport) - preview_sprite.x = list.x + list.width + 8 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) - preview_sprite.y = list.y + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) + preview_sprite.x = graphic_chooser.x + list.x + list.width + 10 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) + preview_sprite.y = graphic_chooser.y + list.y + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) preview_bitmap = nil set_preview_graphic = lambda do |sprite, filename| preview_bitmap&.dispose @@ -166,7 +149,7 @@ class AnimationEditor else preview_bitmap = AnimatedBitmap.new(sprite_folder + filename) end - bg_bitmap.bitmap.fill_rect(MESSAGE_BOX_SPACING + list.width + 8, MESSAGE_BOX_SPACING + 24, + bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + list.x + list.width + 10, BORDER_THICKNESS + list.y, GRAPHIC_CHOOSER_PREVIEW_SIZE, GRAPHIC_CHOOSER_PREVIEW_SIZE, Color.white) next if !preview_bitmap @@ -176,52 +159,42 @@ class AnimationEditor sprite.zoom_x = sprite.zoom_y = zoom sprite.ox = sprite.width / 2 sprite.oy = sprite.height / 2 - bg_bitmap.bitmap.fill_rect(MESSAGE_BOX_SPACING + list.width + 8 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) - (sprite.width * sprite.zoom_x / 2), - MESSAGE_BOX_SPACING + 24 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) - (sprite.height * sprite.zoom_y / 2), + bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + sprite.x - graphic_chooser.x - (sprite.width * sprite.zoom_x / 2), + BORDER_THICKNESS + sprite.y - graphic_chooser.y - (sprite.height * sprite.zoom_y / 2), sprite.width * sprite.zoom_x, sprite.height * sprite.zoom_y, Color.magenta) end set_preview_graphic.call(preview_sprite, list.value) # Interaction loop ret = nil - captured = nil loop do Graphics.update Input.update - if captured - captured.update - captured = nil if !captured.busy? - else - list.update - captured = list if list.busy? - buttons.each do |btn| - btn[1].update - captured = btn[1] if btn[1].busy? + graphic_chooser.update + if graphic_chooser.changed? + graphic_chooser.values.each_pair do |ctrl, value| + case ctrl + when :ok + ret = list.value + when :cancel + ret = selected + when :list + set_preview_graphic.call(preview_sprite, list.value) + end + graphic_chooser.clear_changed end + ret = selected if !graphic_chooser.busy? && Input.trigger?(Input::BACK) + break if ret + graphic_chooser.repaint end - if list.changed? - set_preview_graphic.call(preview_sprite, list.value) - list.clear_changed - end - buttons.each do |btn| - next if !btn[1].changed? - ret = list.value if btn[0] == :ok - ret = selected if btn[0] == :cancel - break - end - ret = selected if Input.trigger?(Input::BACK) - break if ret - list.repaint - buttons.each { |btn| btn[1].repaint } end # Dispose and return - list.dispose - buttons.each { |btn| btn[1].dispose } - buttons.clear bg_bitmap.dispose preview_sprite.dispose preview_bitmap&.dispose @pop_up_bg_bitmap.visible = false + graphic_chooser.clear_changed + graphic_chooser.visible = false return ret end @@ -229,119 +202,75 @@ class AnimationEditor def choose_audio_file(selected, volume = 100, pitch = 100) selected ||= "" - sprite_folder = "Audio/SE/Anim/" + audio_folder = "Audio/SE/Anim/" + # Show pop-up window + @pop_up_bg_bitmap.visible = true + bg_bitmap = create_pop_up_window(AUDIO_CHOOSER_WINDOW_WIDTH, AUDIO_CHOOSER_WINDOW_HEIGHT) + audio_chooser = @components[:audio_chooser] + audio_chooser.visible = true + # Draw box around list control + list = audio_chooser.get_control(:list) + bg_bitmap.bitmap.outline_rect(list.x + BORDER_THICKNESS - 2, list.y + BORDER_THICKNESS - 2, + list.width + 4, list.height + 4, Color.black) # Get a list of files - files = [] - Dir.chdir(sprite_folder) do - Dir.glob("*.wav") { |f| files.push([File.basename(f, ".*"), f]) } - Dir.glob("*.ogg") { |f| files.push([File.basename(f, ".*"), f]) } - Dir.glob("*.mp3") { |f| files.push([File.basename(f, ".*"), f]) } - Dir.glob("*.wma") { |f| files.push([File.basename(f, ".*"), f]) } - end - files.delete_if { |f| ["USER", "TARGET"].include?(f[0].upcase) } - files.sort! { |a, b| a[0].downcase <=> b[0].downcase } - files.prepend(["USER", _INTL("[[User's cry]]")], - ["TARGET", _INTL("[[Target's cry]]")]) + files = get_all_files_in_folder_and_prepend( + audio_folder, ["*.wav", "*.ogg", "*.mp3", "*.wma"], + [["USER", _INTL("[[User's cry]]")], + ["TARGET", _INTL("[[Target's cry]]")]] + ) idx = 0 files.each_with_index do |f, i| next if f[0] != selected idx = i break end - # Show pop-up window - @pop_up_bg_bitmap.visible = true - bg_bitmap = create_pop_up_window(GRAPHIC_CHOOSER_WINDOW_WIDTH - 24, GRAPHIC_CHOOSER_WINDOW_HEIGHT) - text = _INTL("Choose a file...") - text_size = bg_bitmap.bitmap.text_size(text) - bg_bitmap.bitmap.draw_text(MESSAGE_BOX_SPACING, 11, bg_bitmap.width, text_size.height, text, 0) - # Create list of files - list = UIControls::List.new(GRAPHIC_CHOOSER_FILE_LIST_WIDTH, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT, @pop_up_viewport, files) - list.x = bg_bitmap.x + MESSAGE_BOX_SPACING - list.y = bg_bitmap.y + MESSAGE_BOX_SPACING + 24 + # Set control values + list.values = files list.selected = idx - list.set_interactive_rects - list.repaint - bg_bitmap.bitmap.outline_rect(MESSAGE_BOX_SPACING - 2, MESSAGE_BOX_SPACING + 24 - 2, - GRAPHIC_CHOOSER_FILE_LIST_WIDTH + 4, GRAPHIC_CHOOSER_FILE_LIST_HEIGHT + 4, Color.black) - # Create buttons - buttons = [] - [[:ok, _INTL("OK")], [:cancel, _INTL("Cancel")]].each_with_index do |option, i| - btn = UIControls::Button.new(GRAPHIC_CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) - btn.x = list.x + (GRAPHIC_CHOOSER_BUTTON_WIDTH * i) - btn.y = list.y + list.height + 2 - btn.set_fixed_size - btn.set_interactive_rects - buttons.push([option[0], btn]) - end - # Create audio player controls - [[:volume, _INTL("Volume"), 0, 100], [:pitch, _INTL("Pitch"), 0, 200]].each_with_index do |option, i| - label = UIControls::Label.new(90, 28, @pop_up_viewport, option[1]) - label.x = list.x + list.width + 8 - label.y = list.y + (28 * i) - label.set_interactive_rects - buttons.push([(option[0].to_s + "_label").to_sym, label]) - slider = UIControls::NumberSlider.new(250, 28, @pop_up_viewport, option[2], option[3], (i == 0 ? volume : pitch)) - slider.x = list.x + list.width + 8 + label.width - slider.y = list.y + (28 * i) - slider.set_interactive_rects - buttons.push([option[0], slider]) - end - [[:play, _INTL("Play")], [:stop, _INTL("Stop")]].each_with_index do |option, i| - btn = UIControls::Button.new(GRAPHIC_CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) - btn.x = list.x + list.width + 8 + (GRAPHIC_CHOOSER_BUTTON_WIDTH * i) - btn.y = list.y + (28 * 2) - btn.set_fixed_size - btn.set_interactive_rects - buttons.push([option[0], btn]) - end + audio_chooser.get_control(:volume).value = volume + audio_chooser.get_control(:pitch).value = pitch # Interaction loop ret = nil - captured = nil + cancel = false loop do Graphics.update Input.update - if captured - captured.update - captured = nil if !captured.busy? - else - list.update - captured = list if list.busy? - buttons.each do |btn| - btn[1].update - captured = btn[1] if btn[1].busy? + audio_chooser.update + if audio_chooser.changed? + audio_chooser.values.each_pair do |ctrl, value| + case ctrl + when :ok + ret = list.value + when :cancel + ret = selected + cancel = true + when :play + vol = audio_chooser.get_control(:volume).value + ptch = audio_chooser.get_control(:pitch).value + # TODO: Play appropriate things if a cry is selected. See which + # battlers are defined in the editor's settings, and use their + # cries. + pbSEPlay(RPG::AudioFile.new("Anim/" + list.value, vol, ptch)) + when :stop + pbSEStop + end + audio_chooser.clear_changed end - end - buttons.each do |btn| - next if !btn[1].changed? - case btn[0] - when :ok - ret = list.value - when :cancel + if !audio_chooser.busy? && Input.trigger?(Input::BACK) ret = selected - when :play - vol = buttons.select { |b| b[0] == :volume }[0][1].value - ptch = buttons.select { |b| b[0] == :pitch }[0][1].value - # TODO: Play appropriate things if a cry is selected. - pbSEPlay(RPG::AudioFile.new("Anim/" + list.value, vol, ptch)) - when :stop - pbSEStop + cance = true end - btn[1].clear_changed - break + break if ret + audio_chooser.repaint end - ret = selected if Input.trigger?(Input::BACK) - break if ret - list.repaint - buttons.each { |btn| btn[1].repaint } end - vol = buttons.select { |b| b[0] == :volume }[0][1].value - ptch = buttons.select { |b| b[0] == :pitch }[0][1].value + vol = (cancel) ? volume : audio_chooser.get_control(:volume).value + ptch = (cancel) ? pitch : audio_chooser.get_control(:pitch).value # Dispose and return - list.dispose - buttons.each { |btn| btn[1].dispose } - buttons.clear bg_bitmap.dispose @pop_up_bg_bitmap.visible = false + audio_chooser.clear_changed + audio_chooser.visible = false return [ret, vol, ptch] end @@ -352,9 +281,9 @@ class AnimationEditor @pop_up_bg_bitmap.visible = true bg_bitmap = create_pop_up_window(ANIM_PROPERTIES_WIDTH, ANIM_PROPERTIES_HEIGHT) # TODO: Draw box around list control(s), i.e. flags. - @components[:animation_properties].visible = true - # Set control values anim_properties = @components[:animation_properties] + anim_properties.visible = true + # Set control values case @anim[:type] when :move, :opp_move anim_properties.get_control(:type).value = :move @@ -371,7 +300,6 @@ class AnimationEditor refresh_component(:animation_properties) # This sets the :move control's value # Interaction loop ret = nil - captured = nil loop do Graphics.update Input.update diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 54c2acc4b..5431e666c 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -66,11 +66,11 @@ class AnimationEditor::AnimationSelector btn.set_fixed_size @components.add_control_at(val[0], btn, TYPE_BUTTONS_X, TYPE_BUTTONS_Y + (i * TYPE_BUTTON_HEIGHT)) end - # TODO: Filter text box for :moves_list's contents. Applies the filter upon - # every change to the text box's value. Perhaps it should only do so - # after 0.5 seconds of non-typing. What exactly should the filter be - # applied to? Animation's name, move's name (if there is one), what - # else? + # TODO: Add filter text box for :moves_list's contents. Applies the filter + # upon every change to the text box's value. Perhaps it should only do + # so after 0.5 seconds of non-typing. What exactly should the filter + # be applied to? Animation's name, move's name (if there is one), what + # else? Flags? # Moves list label label = UIControls::Label.new(MOVES_LIST_WIDTH, TYPE_BUTTON_HEIGHT, @viewport, _INTL("Moves")) label.header = true @@ -190,7 +190,11 @@ class AnimationEditor::AnimationSelector @quit = true return # Don't need to refresh the screen when :new - # TODO: New animation. + # TODO: New animation. Create a new animation hash with some default + # contents, go into the edit screen and immediately open the + # animation properties pop-up window. Use the first available ID + # number from GameData::Animation for it. Don't register the + # animation hash here, though. when :moves @animation_type = 0 @components.get_control(:moves_list).selected = -1 @@ -204,19 +208,17 @@ class AnimationEditor::AnimationSelector if anim_id screen = AnimationEditor.new(anim_id, GameData::Animation.get(anim_id).clone_as_hash) screen.run - # TODO: Might want to select whichever options in each list get to - # the animation with ID anim_id. generate_lists end when :copy anim_id = selected_animation_id if anim_id - # TODO: Copy animation. + # TODO: Copy animation. Append "(copy)" to its name. end when :delete anim_id = selected_animation_id if anim_id - # TODO: Delete animation. + # TODO: Delete animation. Ask the user if they're sure. end end refresh diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 6d1144050..30be2bcee 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -146,7 +146,6 @@ module AnimationEditor::ParticleDataHelper if cmd[1] > 0 # MoveXYZ dur = cmd[1] dur *= -1 if cmd[2] < val - # TODO: Support multiple interpolation types here (will be cmd[3]). ret[cmd[0]] = [dur, cmd[3] || :linear] ret[cmd[0] + cmd[1]] = 0 else # SetXYZ diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index ad22723b7..d4d70328a 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -7,7 +7,6 @@ class AnimationEditor::Canvas < Sprite def initialize(viewport) super @bg_val = "" - # TODO: Add a second bg sprite for screen shake purposes. player_base_pos = Battle::Scene.pbBattlerPosition(0) @player_base = IconSprite.new(*player_base_pos, viewport) @player_base.z = 1 @@ -28,8 +27,9 @@ class AnimationEditor::Canvas < Sprite def bg_name=(val) return if @bg_name == val @bg_name = val - # TODO: Come up with a better way to define the base filenames, based on - # which files actually exist. + # TODO: Make the choice of background graphics match the in-battle one in + # def pbCreateBackdropSprites. Ideally make that method a class method + # so the canvas can use it rather than duplicate it. self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_bg") @player_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") @player_base.ox = @player_base.bitmap.width / 2 diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb index b308aeac8..c4c39c772 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb @@ -2,8 +2,6 @@ # TODO #=============================================================================== class AnimationEditor::PlayControls < UIControls::BaseControl - TEXT_OFFSET_Y = 5 - def initialize(x, y, width, height, viewport) super(width, height, viewport) self.x = x diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 4a48387ed..b99123201 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -1,8 +1,5 @@ #=============================================================================== -# TODO: Would be nice to make command sprites wider than their viewport and -# change @commands_viewport's ox to @left_pos, similar to how the vertical -# scrollbar works, i.e. every visible @commands_sprites isn't redrawn each -# time the horizontal scrollbar changes. +# #=============================================================================== class AnimationEditor::ParticleList < UIControls::BaseControl VIEWPORT_SPACING = 1 @@ -247,8 +244,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl #----------------------------------------------------------------------------- def calculate_duration - # TODO: Refresh lots of things if the duration changed (e.g. SE command - # line). @duration = AnimationEditor::ParticleDataHelper.get_duration(@particles) @duration += DURATION_BUFFER end @@ -269,7 +264,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end def calculate_commands_for_particle(index) - # TODO: Delete everything from @commands that includes index. + @commands.delete_if { |cmd| cmd == index || (cmd.is_a?(Array) && cmd[0] == index) } overall_commands = [] @particles[index].each_pair do |property, value| next if !value.is_a?(Array) @@ -290,8 +285,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl # Returns whether the sprites need replacing due to the addition or # subtraction of one. def ensure_sprites - # TODO: Check through @particle_list to ensure only ones are shown which - # correspond to something in @particles. # Go through all @particles to ensure there are sprites for each of them missing = false @particles.each_with_index do |particle, index| @@ -379,7 +372,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def property_display_name(property) return { - :frame => _INTL("Graphic frame"), + :frame => _INTL("Frame"), :blending => _INTL("Blending"), :flip => _INTL("Flip"), :x => _INTL("X"), @@ -438,7 +431,9 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end - # TODO: Add indicator that this is selected (if so). + # TODO: Add indicator that this is selected (if so). Some kind of arrow on the + # left, or a red horizontal line (like the keyframe's vertical line), or + # fill_rect with colour instead of outline_rect? def refresh_particle_list_sprite(index) spr = @list_sprites[index] return if !spr diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb index b8e589bea..c489365b9 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb @@ -1,9 +1,5 @@ #=============================================================================== -# TODO: Ideally the menu buttons (add_button) will be replaced by a proper -# menu control (basically multiple DropdownList controls where the headers -# have fixed names and, while captured, hovering over a header changes -# which list is displayed). The menu control should go under UI controls -# rather than be unique to the Animation Editor. +# #=============================================================================== class AnimationEditor::MenuBar < UIControls::ControlsContainer MENU_BUTTON_WIDTH = 80 diff --git a/PBS/Animations/Converted/Common/Attract.txt b/PBS/Animations/Converted/Common/Attract.txt index 2a7d1749b..9747de73e 100644 --- a/PBS/Animations/Converted/Common/Attract.txt +++ b/PBS/Animations/Converted/Common/Attract.txt @@ -109,4 +109,4 @@ Name = Attract SetY = 17,-17 SetOpacity = 17,64 - Play = 0,infatuated,100,100 + Play = 0,infatuated diff --git a/PBS/Animations/Converted/Common/Bind.txt b/PBS/Animations/Converted/Common/Bind.txt index 787db6238..437798e74 100644 --- a/PBS/Animations/Converted/Common/Bind.txt +++ b/PBS/Animations/Converted/Common/Bind.txt @@ -40,6 +40,6 @@ Name = Bind SetX = 6,216 SetX = 7,264 - Play = 0,Slash10,80,100 - Play = 3,Slash10,80,100 - Play = 6,Slash10,80,100 + Play = 0,Slash10,80 + Play = 3,Slash10,80 + Play = 6,Slash10,80 diff --git a/PBS/Animations/Converted/Common/Burn.txt b/PBS/Animations/Converted/Common/Burn.txt index a07989e8e..b17827594 100644 --- a/PBS/Animations/Converted/Common/Burn.txt +++ b/PBS/Animations/Converted/Common/Burn.txt @@ -16,4 +16,4 @@ Name = Burn SetZoomX = 0,200 SetZoomY = 0,200 - Play = 0,Fire2,80,100 + Play = 0,Fire2,80 diff --git a/PBS/Animations/Converted/Common/Confusion.txt b/PBS/Animations/Converted/Common/Confusion.txt index 5f56c00df..470397831 100644 --- a/PBS/Animations/Converted/Common/Confusion.txt +++ b/PBS/Animations/Converted/Common/Confusion.txt @@ -45,4 +45,4 @@ Name = Confusion SetY = 17,39 SetOpacity = 17,154 - Play = 0,throw,80,100 + Play = 0,throw,80 diff --git a/PBS/Animations/Converted/Common/FireSpin.txt b/PBS/Animations/Converted/Common/FireSpin.txt index 05b72cf19..af05394dc 100644 --- a/PBS/Animations/Converted/Common/FireSpin.txt +++ b/PBS/Animations/Converted/Common/FireSpin.txt @@ -109,4 +109,4 @@ Name = FireSpin SetX = 5,415 SetY = 5,138 - Play = 0,throw,80,100 + Play = 0,throw,80 diff --git a/PBS/Animations/Converted/Common/Frozen.txt b/PBS/Animations/Converted/Common/Frozen.txt index 77f017aed..92b1bc1a9 100644 --- a/PBS/Animations/Converted/Common/Frozen.txt +++ b/PBS/Animations/Converted/Common/Frozen.txt @@ -58,4 +58,4 @@ Name = Frozen SetY = 14,134 SetOpacity = 14,255 - Play = 0,Ice5,80,100 + Play = 0,Ice5,80 diff --git a/PBS/Animations/Converted/Common/HealthUp.txt b/PBS/Animations/Converted/Common/HealthUp.txt index 98cb6594e..22a50a158 100644 --- a/PBS/Animations/Converted/Common/HealthUp.txt +++ b/PBS/Animations/Converted/Common/HealthUp.txt @@ -30,6 +30,6 @@ Name = HealthUp SetX = 11,344 SetY = 11,70 - Play = 0,Recovery,75,100 - Play = 2,Recovery,80,100 - Play = 5,Recovery,80,100 + Play = 0,Recovery,75 + Play = 2,Recovery,80 + Play = 5,Recovery,80 diff --git a/PBS/Animations/Converted/Common/Paralysis.txt b/PBS/Animations/Converted/Common/Paralysis.txt index 08454e973..a8d2838ff 100644 --- a/PBS/Animations/Converted/Common/Paralysis.txt +++ b/PBS/Animations/Converted/Common/Paralysis.txt @@ -50,4 +50,4 @@ Name = Paralysis SetX = 10,448 SetX = 11,312 - Play = 0,Paralyze3,80,100 + Play = 0,Paralyze3,80 diff --git a/PBS/Animations/Converted/Common/ParentalBond.txt b/PBS/Animations/Converted/Common/ParentalBond.txt index 63ac812b2..09b0120f9 100644 --- a/PBS/Animations/Converted/Common/ParentalBond.txt +++ b/PBS/Animations/Converted/Common/ParentalBond.txt @@ -18,4 +18,4 @@ Name = ParentalBond SetOpacity = 8,150 SetOpacity = 9,100 - Play = 0,Blow1,80,100 + Play = 0,Blow1,80 diff --git a/PBS/Animations/Converted/Common/Poison.txt b/PBS/Animations/Converted/Common/Poison.txt index 5bfc39143..4d9ec2ac2 100644 --- a/PBS/Animations/Converted/Common/Poison.txt +++ b/PBS/Animations/Converted/Common/Poison.txt @@ -14,4 +14,4 @@ Name = Poison SetX = 1,384 SetY = 1,86 - Play = 0,Poison,80,100 + Play = 0,Poison,80 diff --git a/PBS/Animations/Converted/Common/Shadow.txt b/PBS/Animations/Converted/Common/Shadow.txt index 2d360a86d..5728bd3eb 100644 --- a/PBS/Animations/Converted/Common/Shadow.txt +++ b/PBS/Animations/Converted/Common/Shadow.txt @@ -63,4 +63,4 @@ Name = Shadow SetX = 10,416 SetY = 10,118 - Play = 0,Saint6,75,100 + Play = 0,Saint6,75 diff --git a/PBS/Animations/Converted/Common/Shiny.txt b/PBS/Animations/Converted/Common/Shiny.txt index 967b68ad3..62b3758ed 100644 --- a/PBS/Animations/Converted/Common/Shiny.txt +++ b/PBS/Animations/Converted/Common/Shiny.txt @@ -63,4 +63,4 @@ Name = Shiny SetX = 10,416 SetY = 10,118 - Play = 0,Shiny sparkle,100,100 + Play = 0,Shiny sparkle diff --git a/PBS/Animations/Converted/Common/Sleep.txt b/PBS/Animations/Converted/Common/Sleep.txt index 4d8437e6a..2b723ec04 100644 --- a/PBS/Animations/Converted/Common/Sleep.txt +++ b/PBS/Animations/Converted/Common/Sleep.txt @@ -64,4 +64,4 @@ Name = Sleep SetX = 10,309 SetY = 10,25 - Play = 0,Sleep,80,100 + Play = 0,Sleep,80 diff --git a/PBS/Animations/Converted/Common/StatDown.txt b/PBS/Animations/Converted/Common/StatDown.txt index 5fca9a09e..a48003d48 100644 --- a/PBS/Animations/Converted/Common/StatDown.txt +++ b/PBS/Animations/Converted/Common/StatDown.txt @@ -131,4 +131,4 @@ Name = StatDown SetY = 2,58 SetOpacity = 2,126 - Play = 0,decrease,100,100 + Play = 0,decrease diff --git a/PBS/Animations/Converted/Common/StatUp.txt b/PBS/Animations/Converted/Common/StatUp.txt index da79493c3..d73dd54fe 100644 --- a/PBS/Animations/Converted/Common/StatUp.txt +++ b/PBS/Animations/Converted/Common/StatUp.txt @@ -102,4 +102,4 @@ Name = StatUp SetY = 9,154 SetOpacity = 9,0 - Play = 0,increase,100,100 + Play = 0,increase diff --git a/PBS/Animations/Converted/Common/SuperShiny.txt b/PBS/Animations/Converted/Common/SuperShiny.txt index af81538b9..3b12f329f 100644 --- a/PBS/Animations/Converted/Common/SuperShiny.txt +++ b/PBS/Animations/Converted/Common/SuperShiny.txt @@ -8,21 +8,6 @@ Name = SuperShiny SetX = 0,384 SetY = 0,96 - - Graphic = leech-seed - Focus = Target - SetX = 2,440 - SetY = 2,126 - SetX = 4,327 - SetY = 4,78 - SetX = 6,366 - SetY = 6,129 - SetX = 7,416 - SetY = 7,54 - SetX = 8,368 - SetY = 8,67 - SetX = 9,416 - SetY = 9,118 Graphic = leech-seed Focus = Target @@ -62,5 +47,20 @@ Name = SuperShiny SetY = 9,67 SetX = 10,416 SetY = 10,118 + + Graphic = leech-seed + Focus = Target + SetX = 2,440 + SetY = 2,126 + SetX = 4,327 + SetY = 4,78 + SetX = 6,366 + SetY = 6,129 + SetX = 7,416 + SetY = 7,54 + SetX = 8,368 + SetY = 8,67 + SetX = 9,416 + SetY = 9,118 - Play = 0,Shiny sparkle,100,100 + Play = 0,Shiny sparkle diff --git a/PBS/Animations/Converted/Common/Wrap.txt b/PBS/Animations/Converted/Common/Wrap.txt index ed3678e7e..261430354 100644 --- a/PBS/Animations/Converted/Common/Wrap.txt +++ b/PBS/Animations/Converted/Common/Wrap.txt @@ -40,6 +40,6 @@ Name = Wrap SetX = 6,216 SetX = 7,264 - Play = 0,Slash10,80,100 - Play = 3,Slash10,80,100 - Play = 6,Slash10,80,100 + Play = 0,Slash10,80 + Play = 3,Slash10,80 + Play = 6,Slash10,80 diff --git a/PBS/Animations/Converted/Move/ABSORB.txt b/PBS/Animations/Converted/Move/ABSORB.txt index f7e9d431f..2718ae812 100644 --- a/PBS/Animations/Converted/Move/ABSORB.txt +++ b/PBS/Animations/Converted/Move/ABSORB.txt @@ -173,9 +173,9 @@ Name = ABSORB SetX = 5,364 SetY = 5,98 - Play = 0,Absorb2,80,100 - Play = 0,Absorb2,80,100 - Play = 2,Absorb2,80,100 - Play = 5,Absorb2,80,100 - Play = 7,Absorb2,80,100 - Play = 8,Saint7,80,100 + Play = 0,Absorb2,80 + Play = 0,Absorb2,80 + Play = 2,Absorb2,80 + Play = 5,Absorb2,80 + Play = 7,Absorb2,80 + Play = 8,Saint7,80 diff --git a/PBS/Animations/Converted/Move/ACID.txt b/PBS/Animations/Converted/Move/ACID.txt index 5ac855e08..5b57aadbc 100644 --- a/PBS/Animations/Converted/Move/ACID.txt +++ b/PBS/Animations/Converted/Move/ACID.txt @@ -46,5 +46,5 @@ Name = ACID SetY = 4,110 SetOpacity = 12,100 - Play = 0,throw,80,100 - Play = 3,Poison,80,100 + Play = 0,throw,80 + Play = 3,Poison,80 diff --git a/PBS/Animations/Converted/Move/ACIDARMOR.txt b/PBS/Animations/Converted/Move/ACIDARMOR.txt index 8b24cdd04..68c6c1170 100644 --- a/PBS/Animations/Converted/Move/ACIDARMOR.txt +++ b/PBS/Animations/Converted/Move/ACIDARMOR.txt @@ -18,6 +18,6 @@ Name = ACIDARMOR SetX = 5,392 SetY = 6,78 - Play = 0,throw,80,100 - Play = 0,Sound2,80,100 - Play = 0,Pollen,80,100 + Play = 0,throw,80 + Play = 0,Sound2,80 + Play = 0,Pollen,80 diff --git a/PBS/Animations/Converted/Move/ACIDSPRAY.txt b/PBS/Animations/Converted/Move/ACIDSPRAY.txt index 57bf69718..159e1f129 100644 --- a/PBS/Animations/Converted/Move/ACIDSPRAY.txt +++ b/PBS/Animations/Converted/Move/ACIDSPRAY.txt @@ -124,4 +124,4 @@ Name = ACIDSPRAY SetZoomY = 5,85 SetAngle = 5,180 - Play = 0,Substitute,80,100 + Play = 0,Substitute,80 diff --git a/PBS/Animations/Converted/Move/ACUPRESSURE.txt b/PBS/Animations/Converted/Move/ACUPRESSURE.txt index 7c385096c..0a57e47f1 100644 --- a/PBS/Animations/Converted/Move/ACUPRESSURE.txt +++ b/PBS/Animations/Converted/Move/ACUPRESSURE.txt @@ -85,4 +85,4 @@ Name = ACUPRESSURE SetX = 8,395 SetY = 8,80 - Play = 0,Acupressure,100,100 + Play = 0,Acupressure diff --git a/PBS/Animations/Converted/Move/AERIALACE.txt b/PBS/Animations/Converted/Move/AERIALACE.txt index 05f7a1772..81643c31d 100644 --- a/PBS/Animations/Converted/Move/AERIALACE.txt +++ b/PBS/Animations/Converted/Move/AERIALACE.txt @@ -206,7 +206,7 @@ Name = AERIALACE SetX = 9,487 SetY = 9,62 - Play = 0,Ace,80,100 + Play = 0,Ace,80 #------------------------------- [OppMove,AERIALACE] Name = AERIALACE @@ -352,4 +352,4 @@ Name = AERIALACE SetX = 8,211 SetY = 8,284 - Play = 0,Ace,80,100 + Play = 0,Ace,80 diff --git a/PBS/Animations/Converted/Move/ALLYSWITCH.txt b/PBS/Animations/Converted/Move/ALLYSWITCH.txt index 50ce77018..b3d4f3914 100644 --- a/PBS/Animations/Converted/Move/ALLYSWITCH.txt +++ b/PBS/Animations/Converted/Move/ALLYSWITCH.txt @@ -48,4 +48,4 @@ Name = ALLYSWITCH SetOpacity = 18,42 SetOpacity = 19,0 - Play = 0,Uproar,100,100 + Play = 0,Uproar diff --git a/PBS/Animations/Converted/Move/AMNESIA.txt b/PBS/Animations/Converted/Move/AMNESIA.txt index bb9d7a75e..0792d07e3 100644 --- a/PBS/Animations/Converted/Move/AMNESIA.txt +++ b/PBS/Animations/Converted/Move/AMNESIA.txt @@ -18,4 +18,4 @@ Name = AMNESIA SetOpacity = 2,250 SetOpacity = 3,255 - Play = 0,Yawn,100,100 + Play = 0,Yawn diff --git a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt index b76bd1959..127ee5fa3 100644 --- a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt +++ b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt @@ -300,5 +300,5 @@ Name = ANCIENTPOWER SetX = 28,432 SetY = 28,136 - Play = 0,Earth4,100,100 - Play = 24,Earth5,100,100 + Play = 0,Earth4 + Play = 24,Earth5 diff --git a/PBS/Animations/Converted/Move/AQUARING.txt b/PBS/Animations/Converted/Move/AQUARING.txt index 255a36b67..212f5ad12 100644 --- a/PBS/Animations/Converted/Move/AQUARING.txt +++ b/PBS/Animations/Converted/Move/AQUARING.txt @@ -58,4 +58,4 @@ Name = AQUARING SetX = 5,394 SetY = 5,104 - Play = 0,Weatherball,80,100 + Play = 0,Weatherball,80 diff --git a/PBS/Animations/Converted/Move/AROMATHERAPY.txt b/PBS/Animations/Converted/Move/AROMATHERAPY.txt index bd41c83cd..308b072d4 100644 --- a/PBS/Animations/Converted/Move/AROMATHERAPY.txt +++ b/PBS/Animations/Converted/Move/AROMATHERAPY.txt @@ -143,4 +143,4 @@ Name = AROMATHERAPY SetY = 5,-26 SetX = 6,368 - Play = 0,Saint8,80,100 + Play = 0,Saint8,80 diff --git a/PBS/Animations/Converted/Move/AURORABEAM.txt b/PBS/Animations/Converted/Move/AURORABEAM.txt index bcf4d9c11..bc6472931 100644 --- a/PBS/Animations/Converted/Move/AURORABEAM.txt +++ b/PBS/Animations/Converted/Move/AURORABEAM.txt @@ -214,5 +214,5 @@ Name = AURORABEAM SetZoomX = 4,50 SetZoomY = 4,50 - Play = 1,Twine,80,100 - Play = 10,Fire3,80,100 + Play = 1,Twine,80 + Play = 10,Fire3,80 diff --git a/PBS/Animations/Converted/Move/BARRIER.txt b/PBS/Animations/Converted/Move/BARRIER.txt index fd453db3d..2d8270a42 100644 --- a/PBS/Animations/Converted/Move/BARRIER.txt +++ b/PBS/Animations/Converted/Move/BARRIER.txt @@ -51,4 +51,4 @@ Name = BARRIER SetX = 9,379 SetY = 9,85 - Play = 0,Flash2,80,100 + Play = 0,Flash2,80 diff --git a/PBS/Animations/Converted/Move/BEATUP.txt b/PBS/Animations/Converted/Move/BEATUP.txt index ae35e324f..597290d6a 100644 --- a/PBS/Animations/Converted/Move/BEATUP.txt +++ b/PBS/Animations/Converted/Move/BEATUP.txt @@ -34,7 +34,7 @@ Name = BEATUP SetZoomY = 3,125 SetOpacity = 3,50 - Play = 0,Blow4,80,100 + Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,1] Name = Beat Up hit 2 @@ -70,7 +70,7 @@ Name = Beat Up hit 2 SetZoomY = 3,125 SetOpacity = 3,100 - Play = 0,Blow4,80,100 + Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,2] Name = Beat Up hit 3 @@ -106,7 +106,7 @@ Name = Beat Up hit 3 SetZoomY = 3,125 SetOpacity = 3,50 - Play = 0,Blow4,80,100 + Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,3] Name = Beat Up hit 4 @@ -142,7 +142,7 @@ Name = Beat Up hit 4 SetZoomY = 3,125 SetOpacity = 3,100 - Play = 0,Blow4,80,100 + Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,4] Name = Beat Up hit 5 @@ -178,7 +178,7 @@ Name = Beat Up hit 5 SetZoomY = 3,125 SetOpacity = 3,50 - Play = 0,Blow4,80,100 + Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,5] Name = Beat Up hit 6 @@ -214,4 +214,4 @@ Name = Beat Up hit 6 SetZoomY = 3,125 SetOpacity = 3,100 - Play = 0,Blow4,80,100 + Play = 0,Blow4,80 diff --git a/PBS/Animations/Converted/Move/BIND.txt b/PBS/Animations/Converted/Move/BIND.txt index 3a943da03..5cc15aef0 100644 --- a/PBS/Animations/Converted/Move/BIND.txt +++ b/PBS/Animations/Converted/Move/BIND.txt @@ -40,6 +40,6 @@ Name = BIND SetX = 6,216 SetX = 7,264 - Play = 0,Slash10,80,100 - Play = 3,Slash10,80,100 - Play = 6,Slash10,80,100 + Play = 0,Slash10,80 + Play = 3,Slash10,80 + Play = 6,Slash10,80 diff --git a/PBS/Animations/Converted/Move/BITE.txt b/PBS/Animations/Converted/Move/BITE.txt index 1c784e0c3..92cf1ec84 100644 --- a/PBS/Animations/Converted/Move/BITE.txt +++ b/PBS/Animations/Converted/Move/BITE.txt @@ -20,4 +20,4 @@ Name = BITE SetOpacity = 3,255 SetOpacity = 13,128 - Play = 9,Sword2,80,100 + Play = 9,Sword2,80 diff --git a/PBS/Animations/Converted/Move/BLASTBURN.txt b/PBS/Animations/Converted/Move/BLASTBURN.txt index b2a9b8fc8..635ecb00b 100644 --- a/PBS/Animations/Converted/Move/BLASTBURN.txt +++ b/PBS/Animations/Converted/Move/BLASTBURN.txt @@ -196,4 +196,4 @@ Name = BLASTBURN SetX = 10,339 SetY = 10,179 - Play = 3,Fire2,80,100 + Play = 3,Fire2,80 diff --git a/PBS/Animations/Converted/Move/BLOCK.txt b/PBS/Animations/Converted/Move/BLOCK.txt index fbfdf533f..d0424b99d 100644 --- a/PBS/Animations/Converted/Move/BLOCK.txt +++ b/PBS/Animations/Converted/Move/BLOCK.txt @@ -14,4 +14,4 @@ Name = BLOCK SetX = 0,385 SetY = 0,96 - Play = 0,buzzer,80,100 + Play = 0,buzzer,80 diff --git a/PBS/Animations/Converted/Move/BODYSLAM.txt b/PBS/Animations/Converted/Move/BODYSLAM.txt index 4d6e3b6c1..d3876c207 100644 --- a/PBS/Animations/Converted/Move/BODYSLAM.txt +++ b/PBS/Animations/Converted/Move/BODYSLAM.txt @@ -14,4 +14,4 @@ Name = BODYSLAM SetX = 0,384 SetY = 0,94 - Play = 0,Damage1,80,100 + Play = 0,Damage1,80 diff --git a/PBS/Animations/Converted/Move/BRICKBREAK.txt b/PBS/Animations/Converted/Move/BRICKBREAK.txt index 0116ba4c2..8c03e9c35 100644 --- a/PBS/Animations/Converted/Move/BRICKBREAK.txt +++ b/PBS/Animations/Converted/Move/BRICKBREAK.txt @@ -32,4 +32,4 @@ Name = BRICKBREAK SetX = 7,440 SetY = 7,166 - Play = 4,Blow7,80,100 + Play = 4,Blow7,80 diff --git a/PBS/Animations/Converted/Move/BUBBLE.txt b/PBS/Animations/Converted/Move/BUBBLE.txt index 8936ab239..34266187f 100644 --- a/PBS/Animations/Converted/Move/BUBBLE.txt +++ b/PBS/Animations/Converted/Move/BUBBLE.txt @@ -207,4 +207,4 @@ Name = BUBBLE SetY = 8,91 SetOpacity = 8,100 - Play = 0,Water5,80,100 + Play = 0,Water5,80 diff --git a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt index 3b61e820a..6c549d996 100644 --- a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt +++ b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt @@ -369,9 +369,9 @@ Name = BUBBLEBEAM SetX = 10,153 SetY = 10,217 - Play = 0,Water5,80,100 - Play = 3,Blow1,80,100 - Play = 7,Blow1,80,100 - Play = 9,Blow1,80,100 - Play = 11,Blow1,80,100 - Play = 13,Blow1,80,100 + Play = 0,Water5,80 + Play = 3,Blow1,80 + Play = 7,Blow1,80 + Play = 9,Blow1,80 + Play = 11,Blow1,80 + Play = 13,Blow1,80 diff --git a/PBS/Animations/Converted/Move/BULLETSEED.txt b/PBS/Animations/Converted/Move/BULLETSEED.txt index a6702f39c..0db676408 100644 --- a/PBS/Animations/Converted/Move/BULLETSEED.txt +++ b/PBS/Animations/Converted/Move/BULLETSEED.txt @@ -92,13 +92,13 @@ Name = BULLETSEED SetX = 6,256 SetY = 6,161 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 5,throw,80,100 - Play = 5,Knock,80,100 - Play = 7,Knock,80,100 - Play = 8,throw,80,100 - Play = 9,Knock,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 5,throw,80 + Play = 5,Knock,80 + Play = 7,Knock,80 + Play = 8,throw,80 + Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,1] Name = Bullet Seed hit 2 @@ -192,13 +192,13 @@ Name = Bullet Seed hit 2 SetY = 6,129 SetX = 7,313 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 5,throw,80,100 - Play = 5,Knock,80,100 - Play = 7,Knock,80,100 - Play = 8,throw,80,100 - Play = 9,Knock,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 5,throw,80 + Play = 5,Knock,80 + Play = 7,Knock,80 + Play = 8,throw,80 + Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,2] Name = Bullet Seed hit 3 @@ -292,13 +292,13 @@ Name = Bullet Seed hit 3 SetX = 7,364 SetY = 8,110 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 5,throw,80,100 - Play = 5,Knock,80,100 - Play = 7,Knock,80,100 - Play = 8,throw,80,100 - Play = 9,Knock,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 5,throw,80 + Play = 5,Knock,80 + Play = 7,Knock,80 + Play = 8,throw,80 + Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,3] Name = Bullet Seed hit 4 @@ -392,13 +392,13 @@ Name = Bullet Seed hit 4 SetX = 9,364 SetY = 9,79 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 5,throw,80,100 - Play = 5,Knock,80,100 - Play = 7,Knock,80,100 - Play = 8,throw,80,100 - Play = 9,Knock,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 5,throw,80 + Play = 5,Knock,80 + Play = 7,Knock,80 + Play = 8,throw,80 + Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,4] Name = Bullet Seed hit 5 @@ -492,10 +492,10 @@ Name = Bullet Seed hit 5 SetX = 10,352 SetY = 10,47 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 5,throw,80,100 - Play = 5,Knock,80,100 - Play = 7,Knock,80,100 - Play = 8,throw,80,100 - Play = 9,Knock,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 5,throw,80 + Play = 5,Knock,80 + Play = 7,Knock,80 + Play = 8,throw,80 + Play = 9,Knock,80 diff --git a/PBS/Animations/Converted/Move/CHARGE.txt b/PBS/Animations/Converted/Move/CHARGE.txt index 756810b36..ac2b3b9c9 100644 --- a/PBS/Animations/Converted/Move/CHARGE.txt +++ b/PBS/Animations/Converted/Move/CHARGE.txt @@ -92,8 +92,8 @@ Name = CHARGE SetX = 7,176 SetY = 7,286 - Play = 0,Thunder3,80,100 - Play = 2,Thunder3,80,100 - Play = 4,Thunder3,80,100 - Play = 5,Thunder3,80,100 - Play = 7,Thunder3,80,100 + Play = 0,Thunder3,80 + Play = 2,Thunder3,80 + Play = 4,Thunder3,80 + Play = 5,Thunder3,80 + Play = 7,Thunder3,80 diff --git a/PBS/Animations/Converted/Move/CLEARSMOG.txt b/PBS/Animations/Converted/Move/CLEARSMOG.txt index 3eece1025..9b63da76c 100644 --- a/PBS/Animations/Converted/Move/CLEARSMOG.txt +++ b/PBS/Animations/Converted/Move/CLEARSMOG.txt @@ -22,4 +22,4 @@ Name = CLEARSMOG SetY = 5,101 SetX = 6,382 - Play = 0,Snore,86,100 + Play = 0,Snore,86 diff --git a/PBS/Animations/Converted/Move/COMETPUNCH.txt b/PBS/Animations/Converted/Move/COMETPUNCH.txt index bed99c4cc..ce0c751cd 100644 --- a/PBS/Animations/Converted/Move/COMETPUNCH.txt +++ b/PBS/Animations/Converted/Move/COMETPUNCH.txt @@ -29,9 +29,9 @@ Name = COMETPUNCH SetX = 6,432 SetY = 6,110 - Play = 0,Blow1,80,100 - Play = 2,Blow1,80,100 - Play = 5,Blow1,80,100 + Play = 0,Blow1,80 + Play = 2,Blow1,80 + Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,1] Name = Comet Punch hit 2 @@ -62,9 +62,9 @@ Name = Comet Punch hit 2 SetX = 5,432 SetY = 5,110 - Play = 0,Blow1,80,100 - Play = 2,Blow1,80,100 - Play = 5,Blow1,80,100 + Play = 0,Blow1,80 + Play = 2,Blow1,80 + Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,2] Name = Comet Punch hit 3 @@ -95,9 +95,9 @@ Name = Comet Punch hit 3 SetX = 6,432 SetY = 6,110 - Play = 0,Blow1,80,100 - Play = 2,Blow1,80,100 - Play = 5,Blow1,80,100 + Play = 0,Blow1,80 + Play = 2,Blow1,80 + Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,3] Name = Comet Punch hit 4 @@ -128,9 +128,9 @@ Name = Comet Punch hit 4 SetX = 5,432 SetY = 5,110 - Play = 0,Blow1,80,100 - Play = 2,Blow1,80,100 - Play = 5,Blow1,80,100 + Play = 0,Blow1,80 + Play = 2,Blow1,80 + Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,4] Name = Comet Punch hit 5 @@ -161,6 +161,6 @@ Name = Comet Punch hit 5 SetX = 6,432 SetY = 6,110 - Play = 0,Blow1,80,100 - Play = 2,Blow1,80,100 - Play = 5,Blow1,80,100 + Play = 0,Blow1,80 + Play = 2,Blow1,80 + Play = 5,Blow1,80 diff --git a/PBS/Animations/Converted/Move/CONFUSERAY.txt b/PBS/Animations/Converted/Move/CONFUSERAY.txt index 516224080..69f1bc358 100644 --- a/PBS/Animations/Converted/Move/CONFUSERAY.txt +++ b/PBS/Animations/Converted/Move/CONFUSERAY.txt @@ -47,5 +47,5 @@ Name = CONFUSERAY SetY = 16,110 SetOpacity = 17,100 - Play = 1,Twine,80,100 - Play = 12,Confuse,80,100 + Play = 1,Twine,80 + Play = 12,Confuse,80 diff --git a/PBS/Animations/Converted/Move/COTTONGUARD.txt b/PBS/Animations/Converted/Move/COTTONGUARD.txt index 89a63c72d..91064fe16 100644 --- a/PBS/Animations/Converted/Move/COTTONGUARD.txt +++ b/PBS/Animations/Converted/Move/COTTONGUARD.txt @@ -78,4 +78,4 @@ Name = COTTONGUARD SetX = 4,129 SetY = 4,237 - Play = 0,Substitute,80,100 + Play = 0,Substitute,80 diff --git a/PBS/Animations/Converted/Move/COTTONSPORE.txt b/PBS/Animations/Converted/Move/COTTONSPORE.txt index cbf7c77d7..31003665d 100644 --- a/PBS/Animations/Converted/Move/COTTONSPORE.txt +++ b/PBS/Animations/Converted/Move/COTTONSPORE.txt @@ -14,4 +14,4 @@ Name = COTTONSPORE SetX = 0,384 SetY = 0,94 - Play = 0,Sand,80,100 + Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/COUNTER.txt b/PBS/Animations/Converted/Move/COUNTER.txt index 200e049e4..96166a74f 100644 --- a/PBS/Animations/Converted/Move/COUNTER.txt +++ b/PBS/Animations/Converted/Move/COUNTER.txt @@ -121,4 +121,4 @@ Name = COUNTER SetX = 5,399 SetY = 5,92 - Play = 0,MiningCollapse,80,100 + Play = 0,MiningCollapse,80 diff --git a/PBS/Animations/Converted/Move/CURSE.txt b/PBS/Animations/Converted/Move/CURSE.txt index 588da81c9..c4ffd25bc 100644 --- a/PBS/Animations/Converted/Move/CURSE.txt +++ b/PBS/Animations/Converted/Move/CURSE.txt @@ -19,4 +19,4 @@ Name = CURSE SetY = 3,78 SetX = 4,384 - Play = 2,Darkness6,80,100 + Play = 2,Darkness6,80 diff --git a/PBS/Animations/Converted/Move/CUT.txt b/PBS/Animations/Converted/Move/CUT.txt index 2cd0db97a..74dbda42a 100644 --- a/PBS/Animations/Converted/Move/CUT.txt +++ b/PBS/Animations/Converted/Move/CUT.txt @@ -14,6 +14,6 @@ Name = CUT SetX = 0,384 SetY = 0,94 - Play = 0,Slash10,80,100 - Play = 3,Slash2,80,100 - Play = 6,Slash11,80,100 + Play = 0,Slash10,80 + Play = 3,Slash2,80 + Play = 6,Slash11,80 diff --git a/PBS/Animations/Converted/Move/DEFENSECURL.txt b/PBS/Animations/Converted/Move/DEFENSECURL.txt index b7a2b639e..419c2ccad 100644 --- a/PBS/Animations/Converted/Move/DEFENSECURL.txt +++ b/PBS/Animations/Converted/Move/DEFENSECURL.txt @@ -30,4 +30,4 @@ Name = DEFENSECURL SetX = 6,132 SetOpacity = 6,233 - Play = 0,Defense Curl,100,100 + Play = 0,Defense Curl diff --git a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt index 3a996ece8..cfec9938f 100644 --- a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt +++ b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt @@ -181,4 +181,4 @@ Name = DIZZYPUNCH SetX = 8,447 SetY = 8,64 - Play = 0,Dizzy Punch,100,100 + Play = 0,Dizzy Punch diff --git a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt index 0fed874ae..ef3ca320f 100644 --- a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt +++ b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt @@ -41,5 +41,5 @@ Name = DOUBLEEDGE SetX = 10,352 SetAngle = 10,90 - Play = 0,throw,80,100 - Play = 6,Damage1,80,100 + Play = 0,throw,80 + Play = 6,Damage1,80 diff --git a/PBS/Animations/Converted/Move/DOUBLEKICK.txt b/PBS/Animations/Converted/Move/DOUBLEKICK.txt index 003c548b6..2bd7a926e 100644 --- a/PBS/Animations/Converted/Move/DOUBLEKICK.txt +++ b/PBS/Animations/Converted/Move/DOUBLEKICK.txt @@ -31,8 +31,8 @@ Name = DOUBLEKICK SetZoomY = 2,110 SetOpacity = 2,100 - Play = 1,Blow3,80,100 - Play = 3,Blow3,80,100 + Play = 1,Blow3,80 + Play = 3,Blow3,80 #------------------------------- [Move,DOUBLEKICK,1] Name = Double Kick hit 2 @@ -65,5 +65,5 @@ Name = Double Kick hit 2 SetY = 3,78 SetOpacity = 5,100 - Play = 1,Blow3,80,100 - Play = 3,Blow3,80,100 + Play = 1,Blow3,80 + Play = 3,Blow3,80 diff --git a/PBS/Animations/Converted/Move/DOUBLESLAP.txt b/PBS/Animations/Converted/Move/DOUBLESLAP.txt index 9b53ea48b..db9801337 100644 --- a/PBS/Animations/Converted/Move/DOUBLESLAP.txt +++ b/PBS/Animations/Converted/Move/DOUBLESLAP.txt @@ -30,8 +30,8 @@ Name = DOUBLESLAP SetX = 7,384 SetOpacity = 8,100 - Play = 3,Blow5,80,100 - Play = 7,Blow5,80,100 + Play = 3,Blow5,80 + Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,1] Name = DoubleSlap hit 2 @@ -63,8 +63,8 @@ Name = DoubleSlap hit 2 SetX = 7,384 SetOpacity = 7,255 - Play = 3,Blow5,80,100 - Play = 7,Blow5,80,100 + Play = 3,Blow5,80 + Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,2] Name = DoubleSlap hit 3 @@ -96,8 +96,8 @@ Name = DoubleSlap hit 3 SetX = 7,384 SetOpacity = 8,100 - Play = 3,Blow5,80,100 - Play = 7,Blow5,80,100 + Play = 3,Blow5,80 + Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,3] Name = DoubleSlap hit 4 @@ -129,8 +129,8 @@ Name = DoubleSlap hit 4 SetX = 7,384 SetOpacity = 7,255 - Play = 3,Blow5,80,100 - Play = 7,Blow5,80,100 + Play = 3,Blow5,80 + Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,4] Name = DoubleSlap hit 5 @@ -162,5 +162,5 @@ Name = DoubleSlap hit 5 SetX = 7,384 SetOpacity = 8,100 - Play = 3,Blow5,80,100 - Play = 7,Blow5,80,100 + Play = 3,Blow5,80 + Play = 7,Blow5,80 diff --git a/PBS/Animations/Converted/Move/DRAGONBREATH.txt b/PBS/Animations/Converted/Move/DRAGONBREATH.txt index 54b64ea4d..aeb4df723 100644 --- a/PBS/Animations/Converted/Move/DRAGONBREATH.txt +++ b/PBS/Animations/Converted/Move/DRAGONBREATH.txt @@ -101,4 +101,4 @@ Name = DRAGONBREATH SetZoomX = 3,75 SetZoomY = 3,75 - Play = 0,Fire4,80,100 + Play = 0,Fire4,80 diff --git a/PBS/Animations/Converted/Move/DRAGONCLAW.txt b/PBS/Animations/Converted/Move/DRAGONCLAW.txt index a0f183140..e3e2f3f6b 100644 --- a/PBS/Animations/Converted/Move/DRAGONCLAW.txt +++ b/PBS/Animations/Converted/Move/DRAGONCLAW.txt @@ -18,5 +18,5 @@ Name = DRAGONCLAW SetY = 2,102 SetAngle = 2,0 - Play = 0,Slash9,80,100 - Play = 0,Thunder4,80,100 + Play = 0,Slash9,80 + Play = 0,Thunder4,80 diff --git a/PBS/Animations/Converted/Move/DRAGONDANCE.txt b/PBS/Animations/Converted/Move/DRAGONDANCE.txt index ed8467bca..cf5f2a0f3 100644 --- a/PBS/Animations/Converted/Move/DRAGONDANCE.txt +++ b/PBS/Animations/Converted/Move/DRAGONDANCE.txt @@ -23,4 +23,4 @@ Name = DRAGONDANCE SetY = 9,94 SetOpacity = 12,100 - Play = 0,Twine,80,100 + Play = 0,Twine,80 diff --git a/PBS/Animations/Converted/Move/DRAGONRAGE.txt b/PBS/Animations/Converted/Move/DRAGONRAGE.txt index 32de1aac5..f2d086b7a 100644 --- a/PBS/Animations/Converted/Move/DRAGONRAGE.txt +++ b/PBS/Animations/Converted/Move/DRAGONRAGE.txt @@ -57,4 +57,4 @@ Name = DRAGONRAGE SetX = 5,358 SetY = 5,110 - Play = 0,Fire6,80,100 + Play = 0,Fire6,80 diff --git a/PBS/Animations/Converted/Move/EMBER.txt b/PBS/Animations/Converted/Move/EMBER.txt index e5603c5c6..54ac80025 100644 --- a/PBS/Animations/Converted/Move/EMBER.txt +++ b/PBS/Animations/Converted/Move/EMBER.txt @@ -43,4 +43,4 @@ Name = EMBER SetY = 10,116 SetFlip = 11,false - Play = 1,Fire2,80,100 + Play = 1,Fire2,80 diff --git a/PBS/Animations/Converted/Move/ENCORE.txt b/PBS/Animations/Converted/Move/ENCORE.txt index 96559fbcb..fac07a3c7 100644 --- a/PBS/Animations/Converted/Move/ENCORE.txt +++ b/PBS/Animations/Converted/Move/ENCORE.txt @@ -55,4 +55,4 @@ Name = ENCORE SetX = 17,160 SetX = 18,128 - Play = 0,Applause,80,100 + Play = 0,Applause,80 diff --git a/PBS/Animations/Converted/Move/ERUPTION.txt b/PBS/Animations/Converted/Move/ERUPTION.txt index fe658d7e2..28a4d395b 100644 --- a/PBS/Animations/Converted/Move/ERUPTION.txt +++ b/PBS/Animations/Converted/Move/ERUPTION.txt @@ -66,7 +66,7 @@ Name = ERUPTION SetX = 10,371 SetY = 10,123 - Play = 0,Fire5,80,100 - Play = 0,Fire2,80,100 - Play = 3,Fire2,80,100 - Play = 6,Fire2,80,100 + Play = 0,Fire5,80 + Play = 0,Fire2,80 + Play = 3,Fire2,80 + Play = 6,Fire2,80 diff --git a/PBS/Animations/Converted/Move/EXPLOSION.txt b/PBS/Animations/Converted/Move/EXPLOSION.txt index 9bed1bc2c..94b10c561 100644 --- a/PBS/Animations/Converted/Move/EXPLOSION.txt +++ b/PBS/Animations/Converted/Move/EXPLOSION.txt @@ -56,7 +56,7 @@ Name = EXPLOSION SetOpacity = 16,200 SetOpacity = 17,150 - Play = 0,Explosion3,80,100 - Play = 2,Explosion7,80,100 - Play = 5,Explosion3,80,100 - Play = 8,Explosion2,80,100 + Play = 0,Explosion3,80 + Play = 2,Explosion7,80 + Play = 5,Explosion3,80 + Play = 8,Explosion2,80 diff --git a/PBS/Animations/Converted/Move/FIERYDANCE.txt b/PBS/Animations/Converted/Move/FIERYDANCE.txt index af9715f9f..b9bbccf60 100644 --- a/PBS/Animations/Converted/Move/FIERYDANCE.txt +++ b/PBS/Animations/Converted/Move/FIERYDANCE.txt @@ -109,4 +109,4 @@ Name = FIERYDANCE SetX = 7,351 SetY = 7,107 - Play = 0,Wring Out,80,100 + Play = 0,Wring Out,80 diff --git a/PBS/Animations/Converted/Move/FINALGAMBIT.txt b/PBS/Animations/Converted/Move/FINALGAMBIT.txt index 356329d43..e716d6058 100644 --- a/PBS/Animations/Converted/Move/FINALGAMBIT.txt +++ b/PBS/Animations/Converted/Move/FINALGAMBIT.txt @@ -53,4 +53,4 @@ Name = FINALGAMBIT SetX = 20,407 SetY = 20,108 - Play = 0,MiningCollapse,100,100 + Play = 0,MiningCollapse diff --git a/PBS/Animations/Converted/Move/FIREPLEDGE.txt b/PBS/Animations/Converted/Move/FIREPLEDGE.txt index 3fcf10d50..5da6e1901 100644 --- a/PBS/Animations/Converted/Move/FIREPLEDGE.txt +++ b/PBS/Animations/Converted/Move/FIREPLEDGE.txt @@ -32,4 +32,4 @@ Name = FIREPLEDGE SetY = 6,98 SetY = 7,95 - Play = 0,Mega Punch,100,100 + Play = 0,Mega Punch diff --git a/PBS/Animations/Converted/Move/FIREPUNCH.txt b/PBS/Animations/Converted/Move/FIREPUNCH.txt index 7ca7e4a67..7688dd2f1 100644 --- a/PBS/Animations/Converted/Move/FIREPUNCH.txt +++ b/PBS/Animations/Converted/Move/FIREPUNCH.txt @@ -99,4 +99,4 @@ Name = FIREPUNCH SetY = 11,115 Play = 0,Slam,100,115 - Play = 1,Explosion,100,100 + Play = 1,Explosion diff --git a/PBS/Animations/Converted/Move/FIRESPIN.txt b/PBS/Animations/Converted/Move/FIRESPIN.txt index 9a1bb0b6b..acbdaf814 100644 --- a/PBS/Animations/Converted/Move/FIRESPIN.txt +++ b/PBS/Animations/Converted/Move/FIRESPIN.txt @@ -34,4 +34,4 @@ Name = FIRESPIN SetZoomY = 11,50 SetOpacity = 11,100 - Play = 0,Fire5,80,100 + Play = 0,Fire5,80 diff --git a/PBS/Animations/Converted/Move/FLAIL.txt b/PBS/Animations/Converted/Move/FLAIL.txt index 37e9f28b1..94c44f213 100644 --- a/PBS/Animations/Converted/Move/FLAIL.txt +++ b/PBS/Animations/Converted/Move/FLAIL.txt @@ -59,4 +59,4 @@ Name = FLAIL SetX = 23,405 SetY = 23,95 - Play = 0,Flail,100,100 + Play = 0,Flail diff --git a/PBS/Animations/Converted/Move/FLASH.txt b/PBS/Animations/Converted/Move/FLASH.txt index 8def28f80..95dab807f 100644 --- a/PBS/Animations/Converted/Move/FLASH.txt +++ b/PBS/Animations/Converted/Move/FLASH.txt @@ -14,4 +14,4 @@ Name = FLASH SetX = 0,384 SetY = 0,94 - Play = 0,Saint7,80,100 + Play = 0,Saint7,80 diff --git a/PBS/Animations/Converted/Move/FLY.txt b/PBS/Animations/Converted/Move/FLY.txt index 1daa4bec4..a0fb125aa 100644 --- a/PBS/Animations/Converted/Move/FLY.txt +++ b/PBS/Animations/Converted/Move/FLY.txt @@ -57,4 +57,4 @@ Name = Fly charging SetX = 7,134 SetY = 7,166 - Play = 0,Trump Card,100,100 + Play = 0,Trump Card diff --git a/PBS/Animations/Converted/Move/FOCUSENERGY.txt b/PBS/Animations/Converted/Move/FOCUSENERGY.txt index 0adfa658a..917c998e8 100644 --- a/PBS/Animations/Converted/Move/FOCUSENERGY.txt +++ b/PBS/Animations/Converted/Move/FOCUSENERGY.txt @@ -19,6 +19,6 @@ Name = FOCUSENERGY SetX = 0,144 SetY = 0,222 - Play = 0,Up,80,100 - Play = 3,Up,80,100 - Play = 6,Up,80,100 + Play = 0,Up,80 + Play = 3,Up,80 + Play = 6,Up,80 diff --git a/PBS/Animations/Converted/Move/FOLLOWME.txt b/PBS/Animations/Converted/Move/FOLLOWME.txt index bfcd37a00..03ab116a8 100644 --- a/PBS/Animations/Converted/Move/FOLLOWME.txt +++ b/PBS/Animations/Converted/Move/FOLLOWME.txt @@ -83,4 +83,4 @@ Name = FOLLOWME SetX = 11,388 SetY = 11,111 - Play = 0,Follow Me,80,100 + Play = 0,Follow Me,80 diff --git a/PBS/Animations/Converted/Move/FRENZYPLANT.txt b/PBS/Animations/Converted/Move/FRENZYPLANT.txt index 0999ffc26..2b585b8a1 100644 --- a/PBS/Animations/Converted/Move/FRENZYPLANT.txt +++ b/PBS/Animations/Converted/Move/FRENZYPLANT.txt @@ -31,5 +31,5 @@ Name = FRENZYPLANT SetY = 13,98 SetOpacity = 16,100 - Play = 0,Earth4,80,100 - Play = 8,Earth5,80,100 + Play = 0,Earth4,80 + Play = 8,Earth5,80 diff --git a/PBS/Animations/Converted/Move/FURYATTACK.txt b/PBS/Animations/Converted/Move/FURYATTACK.txt index f594847f3..b9c9c73ec 100644 --- a/PBS/Animations/Converted/Move/FURYATTACK.txt +++ b/PBS/Animations/Converted/Move/FURYATTACK.txt @@ -29,8 +29,8 @@ Name = FURYATTACK SetX = 5,264 SetY = 5,146 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,1] Name = Fury Attack hit 2 @@ -61,8 +61,8 @@ Name = Fury Attack hit 2 SetX = 3,358 SetY = 3,110 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,2] Name = Fury Attack hit 3 @@ -93,8 +93,8 @@ Name = Fury Attack hit 3 SetX = 5,264 SetY = 5,146 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,3] Name = Fury Attack hit 4 @@ -125,8 +125,8 @@ Name = Fury Attack hit 4 SetX = 3,358 SetY = 3,110 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,4] Name = Fury Attack hit 5 @@ -157,8 +157,8 @@ Name = Fury Attack hit 5 SetX = 5,264 SetY = 5,146 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK] Name = FURYATTACK @@ -192,8 +192,8 @@ Name = FURYATTACK SetY = 3,242 SetAngle = 3,0 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,1] Name = Fury Attack hit 2 opp @@ -227,8 +227,8 @@ Name = Fury Attack hit 2 opp SetX = 5,220 SetY = 5,197 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,2] Name = Fury Attack hit 3 opp @@ -262,8 +262,8 @@ Name = Fury Attack hit 3 opp SetY = 3,242 SetAngle = 3,0 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,3] Name = Fury Attack hit 4 opp @@ -297,8 +297,8 @@ Name = Fury Attack hit 4 opp SetX = 5,220 SetY = 5,197 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,4] Name = Fury Attack hit 5 opp @@ -332,5 +332,5 @@ Name = Fury Attack hit 5 opp SetY = 3,242 SetAngle = 3,0 - Play = 3,normaldamage,80,100 - Play = 5,normaldamage,80,100 + Play = 3,normaldamage,80 + Play = 5,normaldamage,80 diff --git a/PBS/Animations/Converted/Move/FURYCUTTER.txt b/PBS/Animations/Converted/Move/FURYCUTTER.txt index dede42d27..1c3ee1748 100644 --- a/PBS/Animations/Converted/Move/FURYCUTTER.txt +++ b/PBS/Animations/Converted/Move/FURYCUTTER.txt @@ -14,4 +14,4 @@ Name = FURYCUTTER SetX = 0,384 SetY = 0,86 - Play = 0,Slash10,80,100 + Play = 0,Slash10,80 diff --git a/PBS/Animations/Converted/Move/FURYSWIPES.txt b/PBS/Animations/Converted/Move/FURYSWIPES.txt index b733e714b..2f899ba6f 100644 --- a/PBS/Animations/Converted/Move/FURYSWIPES.txt +++ b/PBS/Animations/Converted/Move/FURYSWIPES.txt @@ -131,7 +131,7 @@ Name = FURYSWIPES SetX = 5,483 SetY = 5,143 - Play = 0,Fury Swipes,100,100 + Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,1] Name = Fury Swipes hit 2 @@ -264,7 +264,7 @@ Name = Fury Swipes hit 2 SetX = 5,483 SetY = 5,143 - Play = 0,Fury Swipes,100,100 + Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,2] Name = Fury Swipes hit 3 @@ -397,7 +397,7 @@ Name = Fury Swipes hit 3 SetX = 5,483 SetY = 5,143 - Play = 0,Fury Swipes,100,100 + Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,3] Name = Fury Swipes hit 4 @@ -530,7 +530,7 @@ Name = Fury Swipes hit 4 SetX = 5,483 SetY = 5,143 - Play = 0,Fury Swipes,100,100 + Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,4] Name = Fury Swipes hit 5 @@ -663,4 +663,4 @@ Name = Fury Swipes hit 5 SetX = 5,483 SetY = 5,143 - Play = 0,Fury Swipes,100,100 + Play = 0,Fury Swipes diff --git a/PBS/Animations/Converted/Move/GASTROACID.txt b/PBS/Animations/Converted/Move/GASTROACID.txt index 387e07912..49669c6fd 100644 --- a/PBS/Animations/Converted/Move/GASTROACID.txt +++ b/PBS/Animations/Converted/Move/GASTROACID.txt @@ -96,4 +96,4 @@ Name = GASTROACID SetY = 9,83 SetX = 10,365 - Play = 0,Sweet Scent,100,100 + Play = 0,Sweet Scent diff --git a/PBS/Animations/Converted/Move/GIGADRAIN.txt b/PBS/Animations/Converted/Move/GIGADRAIN.txt index 4cd4e9b1a..8b1e1698a 100644 --- a/PBS/Animations/Converted/Move/GIGADRAIN.txt +++ b/PBS/Animations/Converted/Move/GIGADRAIN.txt @@ -150,7 +150,7 @@ Name = GIGADRAIN SetX = 5,371 SetY = 5,135 - Play = 0,Absorb2,80,100 - Play = 2,Absorb2,80,100 - Play = 5,Absorb2,80,100 - Play = 7,Absorb2,80,100 + Play = 0,Absorb2,80 + Play = 2,Absorb2,80 + Play = 5,Absorb2,80 + Play = 7,Absorb2,80 diff --git a/PBS/Animations/Converted/Move/GLARE.txt b/PBS/Animations/Converted/Move/GLARE.txt index 541214ad2..c8acab0e8 100644 --- a/PBS/Animations/Converted/Move/GLARE.txt +++ b/PBS/Animations/Converted/Move/GLARE.txt @@ -34,4 +34,4 @@ Name = GLARE SetY = 3,90 SetX = 4,420 - Play = 0,Scary Face,80,100 + Play = 0,Scary Face,80 diff --git a/PBS/Animations/Converted/Move/GROWL.txt b/PBS/Animations/Converted/Move/GROWL.txt index 8ced56c54..bca8cd074 100644 --- a/PBS/Animations/Converted/Move/GROWL.txt +++ b/PBS/Animations/Converted/Move/GROWL.txt @@ -60,7 +60,7 @@ Name = GROWL SetX = 7,230 SetY = 7,167 - PlayUserCry = 0,100,100 + PlayUserCry = 0 #------------------------------- [OppMove,GROWL] Name = GROWL @@ -123,4 +123,4 @@ Name = GROWL SetX = 6,296 SetX = 7,281 - PlayUserCry = 0,100,100 + PlayUserCry = 0 diff --git a/PBS/Animations/Converted/Move/GRUDGE.txt b/PBS/Animations/Converted/Move/GRUDGE.txt index 32397e7eb..9088b202b 100644 --- a/PBS/Animations/Converted/Move/GRUDGE.txt +++ b/PBS/Animations/Converted/Move/GRUDGE.txt @@ -159,4 +159,4 @@ Name = GRUDGE SetX = 11,392 SetY = 11,134 - Play = 0,Fire1,80,100 + Play = 0,Fire1,80 diff --git a/PBS/Animations/Converted/Move/GUST.txt b/PBS/Animations/Converted/Move/GUST.txt index 2c57810a5..31c760eed 100644 --- a/PBS/Animations/Converted/Move/GUST.txt +++ b/PBS/Animations/Converted/Move/GUST.txt @@ -60,7 +60,7 @@ Name = GUST SetOpacity = 25,150 Play = 0,gust,80,82 - Play = 21,hit,80,100 + Play = 21,hit,80 #------------------------------- [OppMove,GUST] Name = GUST @@ -124,4 +124,4 @@ Name = GUST SetOpacity = 25,150 Play = 0,gust,80,82 - Play = 21,hit,80,100 + Play = 21,hit,80 diff --git a/PBS/Animations/Converted/Move/HARDEN.txt b/PBS/Animations/Converted/Move/HARDEN.txt index 294b55a8a..271aa3545 100644 --- a/PBS/Animations/Converted/Move/HARDEN.txt +++ b/PBS/Animations/Converted/Move/HARDEN.txt @@ -19,4 +19,4 @@ Name = HARDEN SetOpacity = 6,105 SetOpacity = 7,70 - Play = 0,Harden,100,100 + Play = 0,Harden diff --git a/PBS/Animations/Converted/Move/HEADBUTT.txt b/PBS/Animations/Converted/Move/HEADBUTT.txt index bf56e390d..027a8253d 100644 --- a/PBS/Animations/Converted/Move/HEADBUTT.txt +++ b/PBS/Animations/Converted/Move/HEADBUTT.txt @@ -19,4 +19,4 @@ Name = HEADBUTT SetZoomY = 4,120 SetOpacity = 5,100 - Play = 0,Blow3,80,100 + Play = 0,Blow3,80 diff --git a/PBS/Animations/Converted/Move/HEATWAVE.txt b/PBS/Animations/Converted/Move/HEATWAVE.txt index 614c2bc35..b21c67a22 100644 --- a/PBS/Animations/Converted/Move/HEATWAVE.txt +++ b/PBS/Animations/Converted/Move/HEATWAVE.txt @@ -80,7 +80,7 @@ Name = HEATWAVE SetZoomY = 21,400 SetOpacity = 21,30 - Play = 0,Fire1,80,100 - Play = 2,Fire2,80,100 - Play = 6,Fire2,80,100 - Play = 8,Fire2,80,100 + Play = 0,Fire1,80 + Play = 2,Fire2,80 + Play = 6,Fire2,80 + Play = 8,Fire2,80 diff --git a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt index d1a881638..01b79db9d 100644 --- a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt +++ b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt @@ -31,5 +31,5 @@ Name = HIGHJUMPKICK SetY = 7,134 SetOpacity = 7,100 - Play = 0,throw,80,100 - Play = 3,Blow4,80,100 + Play = 0,throw,80 + Play = 3,Blow4,80 diff --git a/PBS/Animations/Converted/Move/HORNATTACK.txt b/PBS/Animations/Converted/Move/HORNATTACK.txt index 336fadd2a..b8f2fdbfb 100644 --- a/PBS/Animations/Converted/Move/HORNATTACK.txt +++ b/PBS/Animations/Converted/Move/HORNATTACK.txt @@ -31,4 +31,4 @@ Name = HORNATTACK SetY = 4,110 SetOpacity = 5,25 - Play = 3,normaldamage,80,100 + Play = 3,normaldamage,80 diff --git a/PBS/Animations/Converted/Move/HYDROPUMP.txt b/PBS/Animations/Converted/Move/HYDROPUMP.txt index e5ba9e1e0..12a81ad3a 100644 --- a/PBS/Animations/Converted/Move/HYDROPUMP.txt +++ b/PBS/Animations/Converted/Move/HYDROPUMP.txt @@ -35,6 +35,6 @@ Name = HYDROPUMP SetX = 14,296 SetY = 14,94 - Play = 1,Water1,80,100 - Play = 5,Water1,80,100 - Play = 9,Water1,80,100 + Play = 1,Water1,80 + Play = 5,Water1,80 + Play = 9,Water1,80 diff --git a/PBS/Animations/Converted/Move/HYPERFANG.txt b/PBS/Animations/Converted/Move/HYPERFANG.txt index 7d8c46a95..f514afd11 100644 --- a/PBS/Animations/Converted/Move/HYPERFANG.txt +++ b/PBS/Animations/Converted/Move/HYPERFANG.txt @@ -20,4 +20,4 @@ Name = HYPERFANG SetOpacity = 6,150 SetOpacity = 7,100 - Play = 0,Slash9,80,100 + Play = 0,Slash9,80 diff --git a/PBS/Animations/Converted/Move/ICEBALL.txt b/PBS/Animations/Converted/Move/ICEBALL.txt index 79e6be78c..8cdd1e7dd 100644 --- a/PBS/Animations/Converted/Move/ICEBALL.txt +++ b/PBS/Animations/Converted/Move/ICEBALL.txt @@ -26,5 +26,5 @@ Name = ICEBALL SetX = 6,358 SetY = 6,110 - Play = 0,throw,80,100 - Play = 7,Earth3,80,100 + Play = 0,throw,80 + Play = 7,Earth3,80 diff --git a/PBS/Animations/Converted/Move/ICEFANG.txt b/PBS/Animations/Converted/Move/ICEFANG.txt index 5b1207c2b..731baee18 100644 --- a/PBS/Animations/Converted/Move/ICEFANG.txt +++ b/PBS/Animations/Converted/Move/ICEFANG.txt @@ -97,4 +97,4 @@ Name = ICEFANG SetY = 10,90 SetOpacity = 10,154 - Play = 6,Super Fang,80,100 + Play = 6,Super Fang,80 diff --git a/PBS/Animations/Converted/Move/ICICLESPEAR.txt b/PBS/Animations/Converted/Move/ICICLESPEAR.txt index 358436765..a7a6ea5de 100644 --- a/PBS/Animations/Converted/Move/ICICLESPEAR.txt +++ b/PBS/Animations/Converted/Move/ICICLESPEAR.txt @@ -26,9 +26,9 @@ Name = ICICLESPEAR SetX = 5,352 SetY = 5,123 - Play = 0,throw,80,100 + Play = 0,throw,80 Play = 2,Crash,50,115 - Play = 2,Ice2,80,100 + Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,1] Name = Icicle Spear hit 2 @@ -56,9 +56,9 @@ Name = Icicle Spear hit 2 SetX = 5,352 SetY = 5,123 - Play = 0,throw,80,100 + Play = 0,throw,80 Play = 2,Crash,50,115 - Play = 2,Ice2,80,100 + Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,2] Name = Icicle Spear hit 3 @@ -86,9 +86,9 @@ Name = Icicle Spear hit 3 SetX = 5,352 SetY = 5,123 - Play = 0,throw,80,100 + Play = 0,throw,80 Play = 2,Crash,50,115 - Play = 2,Ice2,80,100 + Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,3] Name = Icicle Spear hit 4 @@ -116,9 +116,9 @@ Name = Icicle Spear hit 4 SetX = 5,352 SetY = 5,123 - Play = 0,throw,80,100 + Play = 0,throw,80 Play = 2,Crash,50,115 - Play = 2,Ice2,80,100 + Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,4] Name = Icicle Spear hit 5 @@ -146,6 +146,6 @@ Name = Icicle Spear hit 5 SetX = 5,352 SetY = 5,123 - Play = 0,throw,80,100 + Play = 0,throw,80 Play = 2,Crash,50,115 - Play = 2,Ice2,80,100 + Play = 2,Ice2,80 diff --git a/PBS/Animations/Converted/Move/ICYWIND.txt b/PBS/Animations/Converted/Move/ICYWIND.txt index 312999e1c..c89501de4 100644 --- a/PBS/Animations/Converted/Move/ICYWIND.txt +++ b/PBS/Animations/Converted/Move/ICYWIND.txt @@ -51,5 +51,5 @@ Name = ICYWIND SetY = 6,110 SetOpacity = 10,100 - Play = 0,throw,80,100 - Play = 1,Ice8,80,100 + Play = 0,throw,80 + Play = 1,Ice8,80 diff --git a/PBS/Animations/Converted/Move/IRONHEAD.txt b/PBS/Animations/Converted/Move/IRONHEAD.txt index fbc6f1109..b6099636f 100644 --- a/PBS/Animations/Converted/Move/IRONHEAD.txt +++ b/PBS/Animations/Converted/Move/IRONHEAD.txt @@ -54,4 +54,4 @@ Name = IRONHEAD SetX = 3,275 SetY = 3,33 - Play = 0,Damage1,100,100 + Play = 0,Damage1 diff --git a/PBS/Animations/Converted/Move/JUMPKICK.txt b/PBS/Animations/Converted/Move/JUMPKICK.txt index 3fa89ffc6..d0a65c63e 100644 --- a/PBS/Animations/Converted/Move/JUMPKICK.txt +++ b/PBS/Animations/Converted/Move/JUMPKICK.txt @@ -31,4 +31,4 @@ Name = JUMPKICK SetY = 7,134 SetOpacity = 7,100 - Play = 3,Blow3,80,100 + Play = 3,Blow3,80 diff --git a/PBS/Animations/Converted/Move/KARATECHOP.txt b/PBS/Animations/Converted/Move/KARATECHOP.txt index a07dbb49f..5ac41111b 100644 --- a/PBS/Animations/Converted/Move/KARATECHOP.txt +++ b/PBS/Animations/Converted/Move/KARATECHOP.txt @@ -30,5 +30,5 @@ Name = KARATECHOP SetY = 6,94 SetAngle = 6,0 - Play = 0,Wind1,80,100 - Play = 7,Blow3,80,100 + Play = 0,Wind1,80 + Play = 7,Blow3,80 diff --git a/PBS/Animations/Converted/Move/KINESIS.txt b/PBS/Animations/Converted/Move/KINESIS.txt index 4dccdbafa..5a693e1fc 100644 --- a/PBS/Animations/Converted/Move/KINESIS.txt +++ b/PBS/Animations/Converted/Move/KINESIS.txt @@ -26,4 +26,4 @@ Name = KINESIS SetX = 8,385 SetY = 8,93 - Play = 0,Trump Card,86,100 + Play = 0,Trump Card,86 diff --git a/PBS/Animations/Converted/Move/LEAFBLADE.txt b/PBS/Animations/Converted/Move/LEAFBLADE.txt index aed421ebc..653de87e9 100644 --- a/PBS/Animations/Converted/Move/LEAFBLADE.txt +++ b/PBS/Animations/Converted/Move/LEAFBLADE.txt @@ -14,8 +14,8 @@ Name = LEAFBLADE SetX = 0,384 SetY = 0,94 - Play = 0,Sword1,80,100 - Play = 3,Slash3,80,100 - Play = 7,Slash3,80,100 - Play = 11,Slash3,80,100 - Play = 15,Slash3,80,100 + Play = 0,Sword1,80 + Play = 3,Slash3,80 + Play = 7,Slash3,80 + Play = 11,Slash3,80 + Play = 15,Slash3,80 diff --git a/PBS/Animations/Converted/Move/LEECHLIFE.txt b/PBS/Animations/Converted/Move/LEECHLIFE.txt index 72872cbff..d7e84f41b 100644 --- a/PBS/Animations/Converted/Move/LEECHLIFE.txt +++ b/PBS/Animations/Converted/Move/LEECHLIFE.txt @@ -110,6 +110,6 @@ Name = LEECHLIFE SetX = 7,396 SetY = 7,129 - Play = 0,throw,80,100 - Play = 2,Twine,80,100 - Play = 3,Bow1,80,100 + Play = 0,throw,80 + Play = 2,Twine,80 + Play = 3,Bow1,80 diff --git a/PBS/Animations/Converted/Move/LEER.txt b/PBS/Animations/Converted/Move/LEER.txt index de90a011c..f2d93dc8c 100644 --- a/PBS/Animations/Converted/Move/LEER.txt +++ b/PBS/Animations/Converted/Move/LEER.txt @@ -21,7 +21,7 @@ Name = LEER SetX = 4,153 SetY = 4,201 - Play = 0,Saint9,100,100 + Play = 0,Saint9 #------------------------------- [OppMove,LEER] Name = LEER @@ -44,4 +44,4 @@ Name = LEER SetX = 4,356 SetY = 4,75 - Play = 0,Saint9,100,100 + Play = 0,Saint9 diff --git a/PBS/Animations/Converted/Move/LOCKON.txt b/PBS/Animations/Converted/Move/LOCKON.txt index 513771eb9..0b53a7468 100644 --- a/PBS/Animations/Converted/Move/LOCKON.txt +++ b/PBS/Animations/Converted/Move/LOCKON.txt @@ -76,4 +76,4 @@ Name = LOCKON SetY = 29,93 SetOpacity = 29,168 - Play = 0,Lock On,88,100 + Play = 0,Lock On,88 diff --git a/PBS/Animations/Converted/Move/LOVELYKISS.txt b/PBS/Animations/Converted/Move/LOVELYKISS.txt index 428427970..ec51567b1 100644 --- a/PBS/Animations/Converted/Move/LOVELYKISS.txt +++ b/PBS/Animations/Converted/Move/LOVELYKISS.txt @@ -96,4 +96,4 @@ Name = LOVELYKISS SetX = 7,331 SetY = 7,59 - Play = 0,Lovely Kiss,85,100 + Play = 0,Lovely Kiss,85 diff --git a/PBS/Animations/Converted/Move/LOWKICK.txt b/PBS/Animations/Converted/Move/LOWKICK.txt index 240cf5b6a..a6c1797bb 100644 --- a/PBS/Animations/Converted/Move/LOWKICK.txt +++ b/PBS/Animations/Converted/Move/LOWKICK.txt @@ -27,4 +27,4 @@ Name = LOWKICK SetZoomY = 4,100 SetOpacity = 5,100 - Play = 2,Blow1,80,100 + Play = 2,Blow1,80 diff --git a/PBS/Animations/Converted/Move/LUCKYCHANT.txt b/PBS/Animations/Converted/Move/LUCKYCHANT.txt index 494a48d97..aac41d278 100644 --- a/PBS/Animations/Converted/Move/LUCKYCHANT.txt +++ b/PBS/Animations/Converted/Move/LUCKYCHANT.txt @@ -272,4 +272,4 @@ Name = LUCKYCHANT SetY = 7,68 SetOpacity = 9,128 - Play = 0,Lucky Chant,100,100 + Play = 0,Lucky Chant diff --git a/PBS/Animations/Converted/Move/MAGICCOAT.txt b/PBS/Animations/Converted/Move/MAGICCOAT.txt index 01aa6f885..d7b138103 100644 --- a/PBS/Animations/Converted/Move/MAGICCOAT.txt +++ b/PBS/Animations/Converted/Move/MAGICCOAT.txt @@ -115,6 +115,6 @@ Name = MAGICCOAT SetX = 8,369 SetY = 8,89 - Play = 0,Sword2,80,100 + Play = 0,Sword2,80 Play = 0,Sword2,80,101 - Play = 4,Sword2,80,100 + Play = 4,Sword2,80 diff --git a/PBS/Animations/Converted/Move/MEGADRAIN.txt b/PBS/Animations/Converted/Move/MEGADRAIN.txt index 0e6f42c6e..edccbc759 100644 --- a/PBS/Animations/Converted/Move/MEGADRAIN.txt +++ b/PBS/Animations/Converted/Move/MEGADRAIN.txt @@ -104,10 +104,10 @@ Name = MEGADRAIN SetX = 5,313 SetY = 5,116 - Play = 0,Absorb2,80,100 - Play = 2,Absorb2,80,100 - Play = 5,Absorb2,80,100 - Play = 7,Absorb2,80,100 + Play = 0,Absorb2,80 + Play = 2,Absorb2,80 + Play = 5,Absorb2,80 + Play = 7,Absorb2,80 #------------------------------- [OppMove,MEGADRAIN] Name = MEGADRAIN @@ -253,4 +253,4 @@ Name = MEGADRAIN SetX = 19,408 SetY = 19,80 - Play = 0,Present - Heal,100,100 + Play = 0,Present - Heal diff --git a/PBS/Animations/Converted/Move/MEGAHORN.txt b/PBS/Animations/Converted/Move/MEGAHORN.txt index af277292e..a6d50e2b7 100644 --- a/PBS/Animations/Converted/Move/MEGAHORN.txt +++ b/PBS/Animations/Converted/Move/MEGAHORN.txt @@ -94,6 +94,6 @@ Name = MEGAHORN SetX = 9,339 SetY = 9,110 - Play = 0,Up,80,100 - Play = 4,throw,80,100 - Play = 7,Slash10,80,100 + Play = 0,Up,80 + Play = 4,throw,80 + Play = 7,Slash10,80 diff --git a/PBS/Animations/Converted/Move/MEGAKICK.txt b/PBS/Animations/Converted/Move/MEGAKICK.txt index 90605be90..cf325419a 100644 --- a/PBS/Animations/Converted/Move/MEGAKICK.txt +++ b/PBS/Animations/Converted/Move/MEGAKICK.txt @@ -30,5 +30,5 @@ Name = MEGAKICK SetZoomY = 8,120 SetOpacity = 9,100 - Play = 0,Wind7,80,100 - Play = 3,Blow5,80,100 + Play = 0,Wind7,80 + Play = 3,Blow5,80 diff --git a/PBS/Animations/Converted/Move/METALCLAW.txt b/PBS/Animations/Converted/Move/METALCLAW.txt index cd12b125e..f6c21e76b 100644 --- a/PBS/Animations/Converted/Move/METALCLAW.txt +++ b/PBS/Animations/Converted/Move/METALCLAW.txt @@ -26,4 +26,4 @@ Name = METALCLAW SetX = 7,384 Play = 0,metal,100,110 - Play = 4,metal,100,100 + Play = 4,metal diff --git a/PBS/Animations/Converted/Move/METEORMASH.txt b/PBS/Animations/Converted/Move/METEORMASH.txt index e908306ec..2489ed649 100644 --- a/PBS/Animations/Converted/Move/METEORMASH.txt +++ b/PBS/Animations/Converted/Move/METEORMASH.txt @@ -114,4 +114,4 @@ Name = METEORMASH SetX = 6,385 SetY = 6,64 - Play = 0,superdamage,100,100 + Play = 0,superdamage diff --git a/PBS/Animations/Converted/Move/METRONOME.txt b/PBS/Animations/Converted/Move/METRONOME.txt index 3aa7d2c56..42bda3aed 100644 --- a/PBS/Animations/Converted/Move/METRONOME.txt +++ b/PBS/Animations/Converted/Move/METRONOME.txt @@ -42,7 +42,7 @@ Name = METRONOME SetX = 14,183 SetY = 14,245 - Play = 0,Metronome,94,100 + Play = 0,Metronome,94 #------------------------------- [OppMove,METRONOME] Name = METRONOME @@ -88,4 +88,4 @@ Name = METRONOME SetX = 14,392 SetY = 14,113 - Play = 0,Metronome,80,100 + Play = 0,Metronome,80 diff --git a/PBS/Animations/Converted/Move/MIST.txt b/PBS/Animations/Converted/Move/MIST.txt index 9ba7d3d2e..fbd02b29f 100644 --- a/PBS/Animations/Converted/Move/MIST.txt +++ b/PBS/Animations/Converted/Move/MIST.txt @@ -51,4 +51,4 @@ Name = MIST SetY = 8,93 SetOpacity = 8,200 - Play = 0,Smokescreen,80,100 + Play = 0,Smokescreen,80 diff --git a/PBS/Animations/Converted/Move/MISTBALL.txt b/PBS/Animations/Converted/Move/MISTBALL.txt index 1b30e4464..886f752d7 100644 --- a/PBS/Animations/Converted/Move/MISTBALL.txt +++ b/PBS/Animations/Converted/Move/MISTBALL.txt @@ -54,4 +54,4 @@ Name = MISTBALL SetX = 9,377 SetY = 9,101 - Play = 5,Wring Out,80,100 + Play = 5,Wring Out,80 diff --git a/PBS/Animations/Converted/Move/MOONLIGHT.txt b/PBS/Animations/Converted/Move/MOONLIGHT.txt index da9045a65..9c94249d0 100644 --- a/PBS/Animations/Converted/Move/MOONLIGHT.txt +++ b/PBS/Animations/Converted/Move/MOONLIGHT.txt @@ -31,4 +31,4 @@ Name = MOONLIGHT SetZoomY = 9,80 SetOpacity = 9,100 - Play = 0,Saint6,80,100 + Play = 0,Saint6,80 diff --git a/PBS/Animations/Converted/Move/MORNINGSUN.txt b/PBS/Animations/Converted/Move/MORNINGSUN.txt index e96efb2ff..64c3a753c 100644 --- a/PBS/Animations/Converted/Move/MORNINGSUN.txt +++ b/PBS/Animations/Converted/Move/MORNINGSUN.txt @@ -22,4 +22,4 @@ Name = MORNINGSUN SetOpacity = 13,150 SetOpacity = 14,100 - Play = 0,Saint7,80,100 + Play = 0,Saint7,80 diff --git a/PBS/Animations/Converted/Move/OUTRAGE.txt b/PBS/Animations/Converted/Move/OUTRAGE.txt index 48367cebb..948a974a2 100644 --- a/PBS/Animations/Converted/Move/OUTRAGE.txt +++ b/PBS/Animations/Converted/Move/OUTRAGE.txt @@ -160,8 +160,8 @@ Name = OUTRAGE SetZoomX = 7,50 SetZoomY = 7,50 - Play = 0,Fire2,80,100 - Play = 0,Explosion6,80,100 - Play = 2,Fire2,80,100 - Play = 5,Fire2,80,100 - Play = 8,Fire2,80,100 + Play = 0,Fire2,80 + Play = 0,Explosion6,80 + Play = 2,Fire2,80 + Play = 5,Fire2,80 + Play = 8,Fire2,80 diff --git a/PBS/Animations/Converted/Move/OVERHEAT.txt b/PBS/Animations/Converted/Move/OVERHEAT.txt index 2d605b937..a62f45ed3 100644 --- a/PBS/Animations/Converted/Move/OVERHEAT.txt +++ b/PBS/Animations/Converted/Move/OVERHEAT.txt @@ -102,4 +102,4 @@ Name = OVERHEAT SetX = 5,236 SetY = 5,79 - Play = 0,Fire3,80,100 + Play = 0,Fire3,80 diff --git a/PBS/Animations/Converted/Move/PAYDAY.txt b/PBS/Animations/Converted/Move/PAYDAY.txt index b2490294c..bdbf2c636 100644 --- a/PBS/Animations/Converted/Move/PAYDAY.txt +++ b/PBS/Animations/Converted/Move/PAYDAY.txt @@ -57,7 +57,7 @@ Name = PAYDAY SetX = 8,358 SetY = 8,110 - Play = 0,Select,80,100 - Play = 2,Select,80,100 - Play = 5,Select,80,100 - Play = 7,Select,80,100 + Play = 0,Select,80 + Play = 2,Select,80 + Play = 5,Select,80 + Play = 7,Select,80 diff --git a/PBS/Animations/Converted/Move/PETALDANCE.txt b/PBS/Animations/Converted/Move/PETALDANCE.txt index 084656fa5..a620bc3d9 100644 --- a/PBS/Animations/Converted/Move/PETALDANCE.txt +++ b/PBS/Animations/Converted/Move/PETALDANCE.txt @@ -97,4 +97,4 @@ Name = PETALDANCE SetZoomX = 11,100 SetZoomY = 11,100 - Play = 0,Saint6,80,100 + Play = 0,Saint6,80 diff --git a/PBS/Animations/Converted/Move/PINMISSILE.txt b/PBS/Animations/Converted/Move/PINMISSILE.txt index 48f375896..8705f1517 100644 --- a/PBS/Animations/Converted/Move/PINMISSILE.txt +++ b/PBS/Animations/Converted/Move/PINMISSILE.txt @@ -87,12 +87,12 @@ Name = PINMISSILE SetAngle = 9,0 SetOpacity = 9,50 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 4,throw,80,100 - Play = 4,Slash10,80,100 - Play = 6,Slash10,80,100 - Play = 8,Slash10,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 4,throw,80 + Play = 4,Slash10,80 + Play = 6,Slash10,80 + Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,1] Name = Pin Missile hit 2 @@ -181,12 +181,12 @@ Name = Pin Missile hit 2 SetY = 5,91 SetOpacity = 5,50 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 4,throw,80,100 - Play = 4,Slash10,80,100 - Play = 6,Slash10,80,100 - Play = 8,Slash10,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 4,throw,80 + Play = 4,Slash10,80 + Play = 6,Slash10,80 + Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,2] Name = Pin Missile hit 3 @@ -275,12 +275,12 @@ Name = Pin Missile hit 3 SetZoomX = 8,125 SetZoomY = 8,125 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 4,throw,80,100 - Play = 4,Slash10,80,100 - Play = 6,Slash10,80,100 - Play = 8,Slash10,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 4,throw,80 + Play = 4,Slash10,80 + Play = 6,Slash10,80 + Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,3] Name = Pin Missile hit 4 @@ -369,12 +369,12 @@ Name = Pin Missile hit 4 SetAngle = 8,0 SetOpacity = 8,50 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 4,throw,80,100 - Play = 4,Slash10,80,100 - Play = 6,Slash10,80,100 - Play = 8,Slash10,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 4,throw,80 + Play = 4,Slash10,80 + Play = 6,Slash10,80 + Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,4] Name = Pin Missile hit 5 @@ -463,9 +463,9 @@ Name = Pin Missile hit 5 SetAngle = 9,0 SetOpacity = 9,50 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 4,throw,80,100 - Play = 4,Slash10,80,100 - Play = 6,Slash10,80,100 - Play = 8,Slash10,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 4,throw,80 + Play = 4,Slash10,80 + Play = 6,Slash10,80 + Play = 8,Slash10,80 diff --git a/PBS/Animations/Converted/Move/POISONGAS.txt b/PBS/Animations/Converted/Move/POISONGAS.txt index 6f204bb68..5f2275ee5 100644 --- a/PBS/Animations/Converted/Move/POISONGAS.txt +++ b/PBS/Animations/Converted/Move/POISONGAS.txt @@ -130,4 +130,4 @@ Name = POISONGAS SetX = 6,204 SetY = 6,173 - Play = 0,Wind8,80,100 + Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/POISONPOWDER.txt b/PBS/Animations/Converted/Move/POISONPOWDER.txt index b50079f86..80bdf66d8 100644 --- a/PBS/Animations/Converted/Move/POISONPOWDER.txt +++ b/PBS/Animations/Converted/Move/POISONPOWDER.txt @@ -14,4 +14,4 @@ Name = POISONPOWDER SetX = 0,384 SetY = 0,94 - Play = 0,Sand,80,100 + Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/POISONSTING.txt b/PBS/Animations/Converted/Move/POISONSTING.txt index ec8f5ccce..add95654f 100644 --- a/PBS/Animations/Converted/Move/POISONSTING.txt +++ b/PBS/Animations/Converted/Move/POISONSTING.txt @@ -27,8 +27,8 @@ Name = POISONSTING SetY = 6,110 SetX = 7,358 - Play = 0,throw,80,100 - Play = 6,Slash10,80,100 + Play = 0,throw,80 + Play = 6,Slash10,80 #------------------------------- [OppMove,POISONSTING] Name = POISONSTING @@ -62,5 +62,5 @@ Name = POISONSTING SetX = 8,128 SetY = 8,236 - Play = 0,throw,80,100 - Play = 6,Slash10,80,100 + Play = 0,throw,80 + Play = 6,Slash10,80 diff --git a/PBS/Animations/Converted/Move/POISONTAIL.txt b/PBS/Animations/Converted/Move/POISONTAIL.txt index f213f5127..2d1527eda 100644 --- a/PBS/Animations/Converted/Move/POISONTAIL.txt +++ b/PBS/Animations/Converted/Move/POISONTAIL.txt @@ -20,5 +20,5 @@ Name = POISONTAIL SetZoomY = 7,110 SetOpacity = 7,100 - Play = 0,Blow3,80,100 - Play = 0,Poison,80,100 + Play = 0,Blow3,80 + Play = 0,Poison,80 diff --git a/PBS/Animations/Converted/Move/POUND.txt b/PBS/Animations/Converted/Move/POUND.txt index e4b692327..73890318f 100644 --- a/PBS/Animations/Converted/Move/POUND.txt +++ b/PBS/Animations/Converted/Move/POUND.txt @@ -31,4 +31,4 @@ Name = POUND SetZoomY = 5,100 SetOpacity = 5,100 - Play = 0,Blow1,80,100 + Play = 0,Blow1,80 diff --git a/PBS/Animations/Converted/Move/PSYCHIC.txt b/PBS/Animations/Converted/Move/PSYCHIC.txt index e8afa352a..cf7a56cfd 100644 --- a/PBS/Animations/Converted/Move/PSYCHIC.txt +++ b/PBS/Animations/Converted/Move/PSYCHIC.txt @@ -68,4 +68,4 @@ Name = PSYCHIC SetZoomY = 16,70 SetOpacity = 16,150 - Play = 2,Darkness2,80,100 + Play = 2,Darkness2,80 diff --git a/PBS/Animations/Converted/Move/PSYCHOCUT.txt b/PBS/Animations/Converted/Move/PSYCHOCUT.txt index 65dbebcaa..ed53e6953 100644 --- a/PBS/Animations/Converted/Move/PSYCHOCUT.txt +++ b/PBS/Animations/Converted/Move/PSYCHOCUT.txt @@ -82,7 +82,7 @@ Name = PSYCHOCUT SetY = 12,264 SetOpacity = 12,50 - Play = 0,Psycho Cut,100,100 + Play = 0,Psycho Cut #------------------------------- [OppMove,PSYCHOCUT] Name = PSYCHOCUT @@ -177,4 +177,4 @@ Name = PSYCHOCUT SetAngle = 16,0 SetOpacity = 16,85 - Play = 0,Psycho Cut,100,100 + Play = 0,Psycho Cut diff --git a/PBS/Animations/Converted/Move/QUICKATTACK.txt b/PBS/Animations/Converted/Move/QUICKATTACK.txt index de51c8f63..519bbc8b4 100644 --- a/PBS/Animations/Converted/Move/QUICKATTACK.txt +++ b/PBS/Animations/Converted/Move/QUICKATTACK.txt @@ -52,4 +52,4 @@ Name = QUICKATTACK SetOpacity = 8,255 SetOpacity = 11,128 - Play = 7,Blow4,100,100 + Play = 7,Blow4 diff --git a/PBS/Animations/Converted/Move/RAZORLEAF.txt b/PBS/Animations/Converted/Move/RAZORLEAF.txt index ac52f1ddf..c60b249e6 100644 --- a/PBS/Animations/Converted/Move/RAZORLEAF.txt +++ b/PBS/Animations/Converted/Move/RAZORLEAF.txt @@ -113,8 +113,8 @@ Name = RAZORLEAF SetX = 5,279 SetY = 5,144 - Play = 1,Slash8,80,100 - Play = 3,Slash8,80,100 - Play = 6,Slash8,80,100 - Play = 8,Slash8,80,100 - Play = 10,Slash8,80,100 + Play = 1,Slash8,80 + Play = 3,Slash8,80 + Play = 6,Slash8,80 + Play = 8,Slash8,80 + Play = 10,Slash8,80 diff --git a/PBS/Animations/Converted/Move/REFLECT.txt b/PBS/Animations/Converted/Move/REFLECT.txt index a03b93c98..72271fd92 100644 --- a/PBS/Animations/Converted/Move/REFLECT.txt +++ b/PBS/Animations/Converted/Move/REFLECT.txt @@ -84,4 +84,4 @@ Name = REFLECT SetX = 5,400 SetY = 5,54 - Play = 0,Saint7,80,100 + Play = 0,Saint7,80 diff --git a/PBS/Animations/Converted/Move/REST.txt b/PBS/Animations/Converted/Move/REST.txt index fd8cb9331..6a3627b8e 100644 --- a/PBS/Animations/Converted/Move/REST.txt +++ b/PBS/Animations/Converted/Move/REST.txt @@ -30,4 +30,4 @@ Name = REST SetX = 8,308 SetY = 8,10 - Play = 0,Refresh,80,100 + Play = 0,Refresh,80 diff --git a/PBS/Animations/Converted/Move/ROCKSMASH.txt b/PBS/Animations/Converted/Move/ROCKSMASH.txt index 3541bed3f..1d829a92d 100644 --- a/PBS/Animations/Converted/Move/ROCKSMASH.txt +++ b/PBS/Animations/Converted/Move/ROCKSMASH.txt @@ -14,5 +14,5 @@ Name = ROCKSMASH SetX = 0,392 SetY = 0,86 - Play = 2,Earth1,80,100 - Play = 2,Blow6,80,100 + Play = 2,Earth1,80 + Play = 2,Blow6,80 diff --git a/PBS/Animations/Converted/Move/ROCKTHROW.txt b/PBS/Animations/Converted/Move/ROCKTHROW.txt index d9612cc38..3c69bdf7a 100644 --- a/PBS/Animations/Converted/Move/ROCKTHROW.txt +++ b/PBS/Animations/Converted/Move/ROCKTHROW.txt @@ -25,5 +25,5 @@ Name = ROCKTHROW SetX = 3,352 SetY = 3,110 - Play = 0,throw,80,100 - Play = 3,Earth1,80,100 + Play = 0,throw,80 + Play = 3,Earth1,80 diff --git a/PBS/Animations/Converted/Move/ROLLINGKICK.txt b/PBS/Animations/Converted/Move/ROLLINGKICK.txt index bef4339dd..e6384557e 100644 --- a/PBS/Animations/Converted/Move/ROLLINGKICK.txt +++ b/PBS/Animations/Converted/Move/ROLLINGKICK.txt @@ -41,4 +41,4 @@ Name = ROLLINGKICK SetX = 7,448 SetY = 7,158 - Play = 4,Blow4,80,100 + Play = 4,Blow4,80 diff --git a/PBS/Animations/Converted/Move/SANDATTACK.txt b/PBS/Animations/Converted/Move/SANDATTACK.txt index 10e5dda60..291a6fd8c 100644 --- a/PBS/Animations/Converted/Move/SANDATTACK.txt +++ b/PBS/Animations/Converted/Move/SANDATTACK.txt @@ -267,7 +267,7 @@ Name = SANDATTACK SetX = 13,416 SetY = 13,142 - Play = 0,Sand,100,100 + Play = 0,Sand #------------------------------- [OppMove,SANDATTACK] Name = SANDATTACK @@ -537,4 +537,4 @@ Name = SANDATTACK SetX = 13,147 SetY = 13,230 - Play = 0,Sand,100,100 + Play = 0,Sand diff --git a/PBS/Animations/Converted/Move/SCARYFACE.txt b/PBS/Animations/Converted/Move/SCARYFACE.txt index dbfc455c8..9609f0bed 100644 --- a/PBS/Animations/Converted/Move/SCARYFACE.txt +++ b/PBS/Animations/Converted/Move/SCARYFACE.txt @@ -31,4 +31,4 @@ Name = SCARYFACE SetZoomY = 7,200 SetOpacity = 7,100 - Play = 2,Stare,80,100 + Play = 2,Stare,80 diff --git a/PBS/Animations/Converted/Move/SCRATCH.txt b/PBS/Animations/Converted/Move/SCRATCH.txt index 7b342e237..699b0751c 100644 --- a/PBS/Animations/Converted/Move/SCRATCH.txt +++ b/PBS/Animations/Converted/Move/SCRATCH.txt @@ -21,4 +21,4 @@ Name = SCRATCH SetY = 4,122 SetY = 5,138 - Play = 0,Slash10,80,100 + Play = 0,Slash10,80 diff --git a/PBS/Animations/Converted/Move/SCREECH.txt b/PBS/Animations/Converted/Move/SCREECH.txt index 143e18863..248fc2c32 100644 --- a/PBS/Animations/Converted/Move/SCREECH.txt +++ b/PBS/Animations/Converted/Move/SCREECH.txt @@ -47,4 +47,4 @@ Name = SCREECH SetY = 7,173 SetY = 9,179 - PlayUserCry = 0,100,100 + PlayUserCry = 0 diff --git a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt index 098724aff..18b933ad8 100644 --- a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt +++ b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt @@ -63,8 +63,8 @@ Name = SELFDESTRUCT SetX = 16,360 SetY = 16,182 - Play = 0,Explosion1,80,100 - Play = 3,Explosion2,80,100 - Play = 6,Explosion3,80,100 - Play = 10,Explosion4,80,100 - Play = 12,Explosion7,80,100 + Play = 0,Explosion1,80 + Play = 3,Explosion2,80 + Play = 6,Explosion3,80 + Play = 10,Explosion4,80 + Play = 12,Explosion7,80 diff --git a/PBS/Animations/Converted/Move/SHADOWBALL.txt b/PBS/Animations/Converted/Move/SHADOWBALL.txt index c4c822ebe..08d221545 100644 --- a/PBS/Animations/Converted/Move/SHADOWBALL.txt +++ b/PBS/Animations/Converted/Move/SHADOWBALL.txt @@ -47,4 +47,4 @@ Name = SHADOWBALL SetOpacity = 12,100 SetOpacity = 13,50 - Play = 0,Collapse1,80,100 + Play = 0,Collapse1,80 diff --git a/PBS/Animations/Converted/Move/SIGNALBEAM.txt b/PBS/Animations/Converted/Move/SIGNALBEAM.txt index 836621a37..21eb384aa 100644 --- a/PBS/Animations/Converted/Move/SIGNALBEAM.txt +++ b/PBS/Animations/Converted/Move/SIGNALBEAM.txt @@ -376,5 +376,5 @@ Name = SIGNALBEAM SetX = 18,456 SetY = 18,54 - Play = 0,Teleport,80,100 - Play = 2,Twine,80,100 + Play = 0,Teleport,80 + Play = 2,Twine,80 diff --git a/PBS/Animations/Converted/Move/SILVERWIND.txt b/PBS/Animations/Converted/Move/SILVERWIND.txt index d600c39fe..4791fcd48 100644 --- a/PBS/Animations/Converted/Move/SILVERWIND.txt +++ b/PBS/Animations/Converted/Move/SILVERWIND.txt @@ -259,4 +259,4 @@ Name = SILVERWIND SetY = 5,142 SetOpacity = 5,50 - Play = 0,Wind8,80,100 + Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/SING.txt b/PBS/Animations/Converted/Move/SING.txt index 4f4a0dac1..69e50ac26 100644 --- a/PBS/Animations/Converted/Move/SING.txt +++ b/PBS/Animations/Converted/Move/SING.txt @@ -491,7 +491,7 @@ Name = SING SetX = 16,417 SetY = 16,93 - Play = 0,Sing,80,100 + Play = 0,Sing,80 #------------------------------- [OppMove,SING] Name = SING @@ -850,4 +850,4 @@ Name = SING SetX = 30,262 SetY = 30,252 - Play = 0,Sing,95,100 + Play = 0,Sing,95 diff --git a/PBS/Animations/Converted/Move/SKETCH.txt b/PBS/Animations/Converted/Move/SKETCH.txt index 4dc09d457..e34e1bcf1 100644 --- a/PBS/Animations/Converted/Move/SKETCH.txt +++ b/PBS/Animations/Converted/Move/SKETCH.txt @@ -50,7 +50,7 @@ Name = SKETCH SetX = 17,344 SetY = 17,-18 - Play = 0,Slash6,80,100 - Play = 6,Slash6,80,100 - Play = 10,Slash6,80,100 - Play = 15,Slash6,80,100 + Play = 0,Slash6,80 + Play = 6,Slash6,80 + Play = 10,Slash6,80 + Play = 15,Slash6,80 diff --git a/PBS/Animations/Converted/Move/SLAM.txt b/PBS/Animations/Converted/Move/SLAM.txt index 6db7c5146..980fc2447 100644 --- a/PBS/Animations/Converted/Move/SLAM.txt +++ b/PBS/Animations/Converted/Move/SLAM.txt @@ -14,4 +14,4 @@ Name = SLAM SetX = 0,384 SetY = 0,94 - Play = 0,Blow6,80,100 + Play = 0,Blow6,80 diff --git a/PBS/Animations/Converted/Move/SLASH.txt b/PBS/Animations/Converted/Move/SLASH.txt index 9e891b386..b6cbd331d 100644 --- a/PBS/Animations/Converted/Move/SLASH.txt +++ b/PBS/Animations/Converted/Move/SLASH.txt @@ -41,4 +41,4 @@ Name = SLASH SetX = 3,416 SetY = 3,78 - Play = 0,Slash3,80,100 + Play = 0,Slash3,80 diff --git a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt index b759d2386..fec800d64 100644 --- a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt +++ b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt @@ -14,4 +14,4 @@ Name = SLEEPPOWDER SetX = 0,384 SetY = 0,94 - Play = 0,Sand,80,100 + Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/SLUDGE.txt b/PBS/Animations/Converted/Move/SLUDGE.txt index b02674b5a..400978648 100644 --- a/PBS/Animations/Converted/Move/SLUDGE.txt +++ b/PBS/Animations/Converted/Move/SLUDGE.txt @@ -25,5 +25,5 @@ Name = SLUDGE SetY = 5,110 SetAngle = 5,0 - Play = 0,throw,80,100 - Play = 7,Poison,80,100 + Play = 0,throw,80 + Play = 7,Poison,80 diff --git a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt index ec62e26b5..41e8bb365 100644 --- a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt +++ b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt @@ -70,6 +70,6 @@ Name = SLUDGEBOMB SetX = 11,352 SetX = 12,358 - Play = 3,Poison,80,100 - Play = 5,Poison,80,100 - Play = 7,Poison,80,100 + Play = 3,Poison,80 + Play = 5,Poison,80 + Play = 7,Poison,80 diff --git a/PBS/Animations/Converted/Move/SMOG.txt b/PBS/Animations/Converted/Move/SMOG.txt index 8ac55505a..b25b5df8d 100644 --- a/PBS/Animations/Converted/Move/SMOG.txt +++ b/PBS/Animations/Converted/Move/SMOG.txt @@ -14,4 +14,4 @@ Name = SMOG SetX = 0,392 SetY = 0,94 - Play = 0,Wind8,80,100 + Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/SMOKESCREEN.txt b/PBS/Animations/Converted/Move/SMOKESCREEN.txt index ecd17d68c..a0844f2df 100644 --- a/PBS/Animations/Converted/Move/SMOKESCREEN.txt +++ b/PBS/Animations/Converted/Move/SMOKESCREEN.txt @@ -93,4 +93,4 @@ Name = SMOKESCREEN SetZoomX = 9,100 SetZoomY = 9,100 - Play = 0,Wind8,80,100 + Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/SPIDERWEB.txt b/PBS/Animations/Converted/Move/SPIDERWEB.txt index 262951082..3dc30beeb 100644 --- a/PBS/Animations/Converted/Move/SPIDERWEB.txt +++ b/PBS/Animations/Converted/Move/SPIDERWEB.txt @@ -64,4 +64,4 @@ Name = SPIDERWEB SetOpacity = 8,150 SetOpacity = 9,50 - Play = 0,throw,80,100 + Play = 0,throw,80 diff --git a/PBS/Animations/Converted/Move/SPIKECANNON.txt b/PBS/Animations/Converted/Move/SPIKECANNON.txt index 50f4c129b..169ff8179 100644 --- a/PBS/Animations/Converted/Move/SPIKECANNON.txt +++ b/PBS/Animations/Converted/Move/SPIKECANNON.txt @@ -66,9 +66,9 @@ Name = SPIKECANNON SetY = 3,98 SetOpacity = 3,50 - Play = 0,Slash10,80,100 - Play = 2,Slash10,80,100 - Play = 4,Slash10,80,100 + Play = 0,Slash10,80 + Play = 2,Slash10,80 + Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,1] Name = Spike Cannon hit 2 @@ -136,9 +136,9 @@ Name = Spike Cannon hit 2 SetX = 5,332 SetY = 5,91 - Play = 0,Slash10,80,100 - Play = 2,Slash10,80,100 - Play = 4,Slash10,80,100 + Play = 0,Slash10,80 + Play = 2,Slash10,80 + Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,2] Name = Spike Cannon hit 3 @@ -206,9 +206,9 @@ Name = Spike Cannon hit 3 SetY = 5,110 SetOpacity = 5,50 - Play = 0,Slash10,80,100 - Play = 2,Slash10,80,100 - Play = 4,Slash10,80,100 + Play = 0,Slash10,80 + Play = 2,Slash10,80 + Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,3] Name = Spike Cannon hit 4 @@ -276,9 +276,9 @@ Name = Spike Cannon hit 4 SetX = 5,320 SetY = 5,104 - Play = 0,Slash10,80,100 - Play = 2,Slash10,80,100 - Play = 4,Slash10,80,100 + Play = 0,Slash10,80 + Play = 2,Slash10,80 + Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,4] Name = Spike Cannon hit 5 @@ -346,6 +346,6 @@ Name = Spike Cannon hit 5 SetX = 5,364 SetY = 5,123 - Play = 0,Slash10,80,100 - Play = 2,Slash10,80,100 - Play = 4,Slash10,80,100 + Play = 0,Slash10,80 + Play = 2,Slash10,80 + Play = 4,Slash10,80 diff --git a/PBS/Animations/Converted/Move/SPIKES.txt b/PBS/Animations/Converted/Move/SPIKES.txt index de954ffac..08296e8c6 100644 --- a/PBS/Animations/Converted/Move/SPIKES.txt +++ b/PBS/Animations/Converted/Move/SPIKES.txt @@ -75,7 +75,7 @@ Name = SPIKES SetX = 13,358 SetY = 13,110 - Play = 1,throw,80,100 - Play = 5,Sword1,80,100 - Play = 8,Sword1,80,100 - Play = 10,Sword1,80,100 + Play = 1,throw,80 + Play = 5,Sword1,80 + Play = 8,Sword1,80 + Play = 10,Sword1,80 diff --git a/PBS/Animations/Converted/Move/SPORE.txt b/PBS/Animations/Converted/Move/SPORE.txt index d6bb54d59..80ee659de 100644 --- a/PBS/Animations/Converted/Move/SPORE.txt +++ b/PBS/Animations/Converted/Move/SPORE.txt @@ -14,4 +14,4 @@ Name = SPORE SetX = 0,384 SetY = 0,94 - Play = 0,Sand,80,100 + Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/STEALTHROCK.txt b/PBS/Animations/Converted/Move/STEALTHROCK.txt index 650a8a3ed..47ec8d938 100644 --- a/PBS/Animations/Converted/Move/STEALTHROCK.txt +++ b/PBS/Animations/Converted/Move/STEALTHROCK.txt @@ -229,7 +229,7 @@ Name = STEALTHROCK SetOpacity = 15,128 SetOpacity = 16,192 - Play = 0,Slam,80,100 + Play = 0,Slam,80 #------------------------------- [OppMove,STEALTHROCK] Name = STEALTHROCK @@ -460,4 +460,4 @@ Name = STEALTHROCK SetOpacity = 15,128 SetOpacity = 16,192 - Play = 0,Slam,80,100 + Play = 0,Slam,80 diff --git a/PBS/Animations/Converted/Move/STOMP.txt b/PBS/Animations/Converted/Move/STOMP.txt index 2542cb549..33f89b95a 100644 --- a/PBS/Animations/Converted/Move/STOMP.txt +++ b/PBS/Animations/Converted/Move/STOMP.txt @@ -18,4 +18,4 @@ Name = STOMP SetY = 3,70 SetY = 4,78 - Play = 2,Blow6,80,100 + Play = 2,Blow6,80 diff --git a/PBS/Animations/Converted/Move/STRINGSHOT.txt b/PBS/Animations/Converted/Move/STRINGSHOT.txt index b5b27c0ef..04d51c8bd 100644 --- a/PBS/Animations/Converted/Move/STRINGSHOT.txt +++ b/PBS/Animations/Converted/Move/STRINGSHOT.txt @@ -114,5 +114,5 @@ Name = STRINGSHOT SetZoomY = 14,100 SetOpacity = 15,100 - Play = 0,throw,80,100 - Play = 0,Battle1,80,100 + Play = 0,throw,80 + Play = 0,Battle1,80 diff --git a/PBS/Animations/Converted/Move/STUNSPORE.txt b/PBS/Animations/Converted/Move/STUNSPORE.txt index 70d8276b4..553eafd01 100644 --- a/PBS/Animations/Converted/Move/STUNSPORE.txt +++ b/PBS/Animations/Converted/Move/STUNSPORE.txt @@ -14,4 +14,4 @@ Name = STUNSPORE SetX = 0,384 SetY = 0,94 - Play = 0,Sand,80,100 + Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/SUPERSONIC.txt b/PBS/Animations/Converted/Move/SUPERSONIC.txt index 0063125f6..fe43debf8 100644 --- a/PBS/Animations/Converted/Move/SUPERSONIC.txt +++ b/PBS/Animations/Converted/Move/SUPERSONIC.txt @@ -97,4 +97,4 @@ Name = SUPERSONIC SetAngle = 12,0 SetOpacity = 12,100 - Play = 0,Twine,80,100 + Play = 0,Twine,80 diff --git a/PBS/Animations/Converted/Move/SWAGGER.txt b/PBS/Animations/Converted/Move/SWAGGER.txt index 0b48a742f..5a2c22d8d 100644 --- a/PBS/Animations/Converted/Move/SWAGGER.txt +++ b/PBS/Animations/Converted/Move/SWAGGER.txt @@ -39,4 +39,4 @@ Name = SWAGGER SetX = 17,411 SetY = 17,61 - Play = 0,Swagger,100,100 + Play = 0,Swagger diff --git a/PBS/Animations/Converted/Move/SWEETKISS.txt b/PBS/Animations/Converted/Move/SWEETKISS.txt index 7debed7ea..2a31daba9 100644 --- a/PBS/Animations/Converted/Move/SWEETKISS.txt +++ b/PBS/Animations/Converted/Move/SWEETKISS.txt @@ -70,4 +70,4 @@ Name = SWEETKISS SetZoomX = 18,75 SetZoomY = 18,75 - Play = 4,Saint1,80,100 + Play = 4,Saint1,80 diff --git a/PBS/Animations/Converted/Move/SWIFT.txt b/PBS/Animations/Converted/Move/SWIFT.txt index fb3177a33..fe5cb491e 100644 --- a/PBS/Animations/Converted/Move/SWIFT.txt +++ b/PBS/Animations/Converted/Move/SWIFT.txt @@ -105,7 +105,7 @@ Name = SWIFT SetX = 4,128 SetY = 4,242 - Play = 0,Saint3,80,100 - Play = 2,Saint3,80,100 - Play = 5,Saint3,80,100 - Play = 8,Saint3,80,100 + Play = 0,Saint3,80 + Play = 2,Saint3,80 + Play = 5,Saint3,80 + Play = 8,Saint3,80 diff --git a/PBS/Animations/Converted/Move/SWORDSDANCE.txt b/PBS/Animations/Converted/Move/SWORDSDANCE.txt index df2970c55..32733332e 100644 --- a/PBS/Animations/Converted/Move/SWORDSDANCE.txt +++ b/PBS/Animations/Converted/Move/SWORDSDANCE.txt @@ -94,4 +94,4 @@ Name = SWORDSDANCE SetY = 10,53 SetX = 11,465 - Play = 0,Swords Dance,90,100 + Play = 0,Swords Dance,90 diff --git a/PBS/Animations/Converted/Move/TACKLE.txt b/PBS/Animations/Converted/Move/TACKLE.txt index d935521c5..9feb546dd 100644 --- a/PBS/Animations/Converted/Move/TACKLE.txt +++ b/PBS/Animations/Converted/Move/TACKLE.txt @@ -18,4 +18,4 @@ Name = TACKLE SetOpacity = 8,150 SetOpacity = 9,100 - Play = 0,Blow1,80,100 + Play = 0,Blow1,80 diff --git a/PBS/Animations/Converted/Move/TAILGLOW.txt b/PBS/Animations/Converted/Move/TAILGLOW.txt index c7cf74678..9fe70645b 100644 --- a/PBS/Animations/Converted/Move/TAILGLOW.txt +++ b/PBS/Animations/Converted/Move/TAILGLOW.txt @@ -35,4 +35,4 @@ Name = TAILGLOW SetZoomY = 15,110 SetOpacity = 15,100 - Play = 0,Saint4,80,100 + Play = 0,Saint4,80 diff --git a/PBS/Animations/Converted/Move/TELEPORT.txt b/PBS/Animations/Converted/Move/TELEPORT.txt index 337d8698c..1bde72f9b 100644 --- a/PBS/Animations/Converted/Move/TELEPORT.txt +++ b/PBS/Animations/Converted/Move/TELEPORT.txt @@ -57,4 +57,4 @@ Name = TELEPORT SetX = 6,104 SetY = 6,153 - Play = 0,Trump Card,80,100 + Play = 0,Trump Card,80 diff --git a/PBS/Animations/Converted/Move/THUNDER.txt b/PBS/Animations/Converted/Move/THUNDER.txt index 8f0dfc251..cddadc4ef 100644 --- a/PBS/Animations/Converted/Move/THUNDER.txt +++ b/PBS/Animations/Converted/Move/THUNDER.txt @@ -60,4 +60,4 @@ Name = THUNDER SetZoomY = 11,150 SetOpacity = 11,20 - Play = 0,Thunder1,80,100 + Play = 0,Thunder1,80 diff --git a/PBS/Animations/Converted/Move/THUNDERBOLT.txt b/PBS/Animations/Converted/Move/THUNDERBOLT.txt index 507fe5e36..3a52332b5 100644 --- a/PBS/Animations/Converted/Move/THUNDERBOLT.txt +++ b/PBS/Animations/Converted/Move/THUNDERBOLT.txt @@ -35,4 +35,4 @@ Name = THUNDERBOLT SetFlip = 11,true SetOpacity = 11,20 - Play = 0,Thunder9,80,100 + Play = 0,Thunder9,80 diff --git a/PBS/Animations/Converted/Move/THUNDERFANG.txt b/PBS/Animations/Converted/Move/THUNDERFANG.txt index 676935647..5d3052c02 100644 --- a/PBS/Animations/Converted/Move/THUNDERFANG.txt +++ b/PBS/Animations/Converted/Move/THUNDERFANG.txt @@ -62,5 +62,5 @@ Name = THUNDERFANG SetX = 12,384 SetY = 12,97 - Play = 6,Super Fang,100,100 + Play = 6,Super Fang Play = 7,Uproar,83,137 diff --git a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt index b80f65e2a..4c5ba83c2 100644 --- a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt +++ b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt @@ -16,4 +16,4 @@ Name = THUNDERSHOCK SetFlip = 9,true SetOpacity = 12,100 - Play = 0,Thunder1,80,100 + Play = 0,Thunder1,80 diff --git a/PBS/Animations/Converted/Move/THUNDERWAVE.txt b/PBS/Animations/Converted/Move/THUNDERWAVE.txt index 18112c1f9..28e33ba5c 100644 --- a/PBS/Animations/Converted/Move/THUNDERWAVE.txt +++ b/PBS/Animations/Converted/Move/THUNDERWAVE.txt @@ -41,4 +41,4 @@ Name = THUNDERWAVE SetX = 13,432 SetX = 14,424 - Play = 2,Paralyze1,80,100 + Play = 2,Paralyze1,80 diff --git a/PBS/Animations/Converted/Move/TOXIC.txt b/PBS/Animations/Converted/Move/TOXIC.txt index f900b6b5b..a7b96b385 100644 --- a/PBS/Animations/Converted/Move/TOXIC.txt +++ b/PBS/Animations/Converted/Move/TOXIC.txt @@ -52,6 +52,6 @@ Name = TOXIC SetX = 17,352 SetY = 17,102 - Play = 0,Poison,80,100 - Play = 4,Poison,80,100 - Play = 8,Poison,80,100 + Play = 0,Poison,80 + Play = 4,Poison,80 + Play = 8,Poison,80 diff --git a/PBS/Animations/Converted/Move/TWINEEDLE.txt b/PBS/Animations/Converted/Move/TWINEEDLE.txt index a90b6b91e..ccb1fb261 100644 --- a/PBS/Animations/Converted/Move/TWINEEDLE.txt +++ b/PBS/Animations/Converted/Move/TWINEEDLE.txt @@ -53,10 +53,10 @@ Name = TWINEEDLE SetZoomY = 5,125 SetOpacity = 5,50 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 4,Slash10,80,100 - Play = 6,Slash10,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 4,Slash10,80 + Play = 6,Slash10,80 #------------------------------- [Move,TWINEEDLE,1] Name = Twineedle hit 2 @@ -111,7 +111,7 @@ Name = Twineedle hit 2 SetZoomY = 6,125 SetOpacity = 6,50 - Play = 0,throw,80,100 - Play = 2,throw,80,100 - Play = 4,Slash10,80,100 - Play = 6,Slash10,80,100 + Play = 0,throw,80 + Play = 2,throw,80 + Play = 4,Slash10,80 + Play = 6,Slash10,80 diff --git a/PBS/Animations/Converted/Move/TWISTER.txt b/PBS/Animations/Converted/Move/TWISTER.txt index 395f59e90..0499c6e10 100644 --- a/PBS/Animations/Converted/Move/TWISTER.txt +++ b/PBS/Animations/Converted/Move/TWISTER.txt @@ -15,8 +15,8 @@ Name = TWISTER SetY = 0,78 SetFlip = 11,true - Play = 0,Water3,80,100 - Play = 0,Twine,80,100 - Play = 2,Water1,80,100 - Play = 5,Water2,80,100 - Play = 9,Water1,80,100 + Play = 0,Water3,80 + Play = 0,Twine,80 + Play = 2,Water1,80 + Play = 5,Water2,80 + Play = 9,Water1,80 diff --git a/PBS/Animations/Converted/Move/VINEWHIP.txt b/PBS/Animations/Converted/Move/VINEWHIP.txt index c40565c68..3623b56bd 100644 --- a/PBS/Animations/Converted/Move/VINEWHIP.txt +++ b/PBS/Animations/Converted/Move/VINEWHIP.txt @@ -29,4 +29,4 @@ Name = VINEWHIP SetY = 2,94 SetY = 3,118 - Play = 2,Slash1,80,100 + Play = 2,Slash1,80 diff --git a/PBS/Animations/Converted/Move/WATERGUN.txt b/PBS/Animations/Converted/Move/WATERGUN.txt index 4bbea5b73..297b1a5cc 100644 --- a/PBS/Animations/Converted/Move/WATERGUN.txt +++ b/PBS/Animations/Converted/Move/WATERGUN.txt @@ -103,7 +103,7 @@ Name = WATERGUN SetZoomX = 8,70 SetOpacity = 8,224 - Play = 0,Yawn,88,100 + Play = 0,Yawn,88 #------------------------------- [OppMove,WATERGUN] Name = WATERGUN @@ -189,4 +189,4 @@ Name = WATERGUN SetY = 8,220 SetOpacity = 8,240 - Play = 0,Yawn,88,100 + Play = 0,Yawn,88 diff --git a/PBS/Animations/Converted/Move/WHIRLWIND.txt b/PBS/Animations/Converted/Move/WHIRLWIND.txt index 8b9446104..4d8efe7ca 100644 --- a/PBS/Animations/Converted/Move/WHIRLWIND.txt +++ b/PBS/Animations/Converted/Move/WHIRLWIND.txt @@ -14,4 +14,4 @@ Name = WHIRLWIND SetX = 0,392 SetY = 0,94 - Play = 0,Wind1,80,100 + Play = 0,Wind1,80 diff --git a/PBS/Animations/Converted/Move/WILLOWISP.txt b/PBS/Animations/Converted/Move/WILLOWISP.txt index b2859f9ae..6f84606fc 100644 --- a/PBS/Animations/Converted/Move/WILLOWISP.txt +++ b/PBS/Animations/Converted/Move/WILLOWISP.txt @@ -63,4 +63,4 @@ Name = WILLOWISP SetX = 6,358 SetAngle = 6,0 - Play = 0,Fire2,80,100 + Play = 0,Fire2,80 diff --git a/PBS/Animations/Converted/Move/WINGATTACK.txt b/PBS/Animations/Converted/Move/WINGATTACK.txt index b669899ba..a87a5b6ef 100644 --- a/PBS/Animations/Converted/Move/WINGATTACK.txt +++ b/PBS/Animations/Converted/Move/WINGATTACK.txt @@ -14,5 +14,5 @@ Name = WINGATTACK SetX = 0,392 SetY = 0,94 - Play = 0,Wind1,80,100 - Play = 2,Wind5,80,100 + Play = 0,Wind1,80 + Play = 2,Wind5,80 diff --git a/PBS/Animations/Converted/Move/WRAP.txt b/PBS/Animations/Converted/Move/WRAP.txt index 2078ef39c..ddb835963 100644 --- a/PBS/Animations/Converted/Move/WRAP.txt +++ b/PBS/Animations/Converted/Move/WRAP.txt @@ -40,6 +40,6 @@ Name = WRAP SetX = 6,216 SetX = 7,264 - Play = 0,Slash10,80,100 - Play = 3,Slash10,80,100 - Play = 6,Slash10,80,100 + Play = 0,Slash10,80 + Play = 3,Slash10,80 + Play = 6,Slash10,80 diff --git a/PBS/Animations/Converted/Move/WRINGOUT.txt b/PBS/Animations/Converted/Move/WRINGOUT.txt index 81a65f211..492aea149 100644 --- a/PBS/Animations/Converted/Move/WRINGOUT.txt +++ b/PBS/Animations/Converted/Move/WRINGOUT.txt @@ -52,4 +52,4 @@ Name = WRINGOUT SetX = 19,430 SetY = 19,161 - Play = 0,Wring Out,100,100 + Play = 0,Wring Out diff --git a/PBS/Animations/Converted/Move/XSCISSOR.txt b/PBS/Animations/Converted/Move/XSCISSOR.txt index d0b01b057..317206c5c 100644 --- a/PBS/Animations/Converted/Move/XSCISSOR.txt +++ b/PBS/Animations/Converted/Move/XSCISSOR.txt @@ -35,4 +35,4 @@ Name = XSCISSOR SetX = 4,307 SetY = 4,164 - Play = 0,Slash,80,100 + Play = 0,Slash,80 diff --git a/PBS/Animations/Converted/Move/ZAPCANNON.txt b/PBS/Animations/Converted/Move/ZAPCANNON.txt index c374be347..c3d4becd2 100644 --- a/PBS/Animations/Converted/Move/ZAPCANNON.txt +++ b/PBS/Animations/Converted/Move/ZAPCANNON.txt @@ -18,4 +18,4 @@ Name = ZAPCANNON SetOpacity = 7,100 SetAngle = 8,18 - Play = 0,Thunder9,80,100 + Play = 0,Thunder9,80 From 6bd35d44c42fc64004aab1783f45b675f6447185 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 1 Jan 2024 18:12:53 +0000 Subject: [PATCH 16/49] Added TextBoxDropdownList UI control --- .../801_UI controls/002_ControlsContainer.rb | 9 + .../Control elements/008_List.rb | 10 +- .../Control elements/009_DropdownList.rb | 2 +- .../010_TextBoxDropdownList.rb | 210 ++++++++++++++++++ .../904_Anim Editor/001_AnimationEditor.rb | 82 ++++--- .../002_AnimationEditor_popups.rb | 119 +++++----- 6 files changed, 334 insertions(+), 98 deletions(-) create mode 100644 Data/Scripts/801_UI controls/Control elements/010_TextBoxDropdownList.rb diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index e8c0c76e4..1978ef8fb 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -147,6 +147,15 @@ class UIControls::ControlsContainer add_dropdown_list(id, options, value, true) end + def add_text_box_dropdown_list(id, options, value, has_label = false) + add_control(id, UIControls::TextBoxDropdownList.new(*control_size(has_label), @viewport, options, value), has_label) + end + + def add_labelled_text_box_dropdown_list(id, label, options, value) + add_label(id, label) + add_text_box_dropdown_list(id, options, value, true) + end + #----------------------------------------------------------------------------- def repaint diff --git a/Data/Scripts/801_UI controls/Control elements/008_List.rb b/Data/Scripts/801_UI controls/Control elements/008_List.rb index 972f8497d..0c2288d1c 100644 --- a/Data/Scripts/801_UI controls/Control elements/008_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_List.rb @@ -91,7 +91,9 @@ class UIControls::List < UIControls::BaseControl end def mouse_in_control? - return true if super + mouse_x, mouse_y = mouse_pos + return false if !mouse_x || !mouse_y + return true if Rect.new(0, 0, width, height).contains?(mouse_x, mouse_y) return true if @scrollbar.mouse_in_control? return false end @@ -219,10 +221,12 @@ class UIControls::List < UIControls::BaseControl @selected = @hover_area if @hover_area.is_a?(Integer) elsif @hover_area wheel_v = Input.scroll_v + scroll_dist = UIControls::Scrollbar::SCROLL_DISTANCE + scroll_dist /= 2 if @values.length / @rows_count > 20 # Arbitrary 20 if wheel_v > 0 # Scroll up - @scrollbar.slider_top -= UIControls::Scrollbar::SCROLL_DISTANCE + @scrollbar.slider_top -= scroll_dist elsif wheel_v < 0 # Scroll down - @scrollbar.slider_top += UIControls::Scrollbar::SCROLL_DISTANCE + @scrollbar.slider_top += scroll_dist end if wheel_v != 0 self.top_row = (@scrollbar.position.to_f / ROW_HEIGHT).round diff --git a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb index c98589ee9..44dc35ffe 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb @@ -34,7 +34,7 @@ class UIControls::DropdownList < UIControls::BaseControl def set_interactive_rects @button_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, - [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) + [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) @interactions = { :button => @button_rect } diff --git a/Data/Scripts/801_UI controls/Control elements/010_TextBoxDropdownList.rb b/Data/Scripts/801_UI controls/Control elements/010_TextBoxDropdownList.rb new file mode 100644 index 000000000..b240662d2 --- /dev/null +++ b/Data/Scripts/801_UI controls/Control elements/010_TextBoxDropdownList.rb @@ -0,0 +1,210 @@ +#=============================================================================== +# Also known as a Combo Box. +# NOTE: This control lets you type in whatever text you want. The dropdown list +# only offers autocomplete-like suggestions, but you don't need to match +# any of them. +#=============================================================================== +class UIControls::TextBoxDropdownList < UIControls::TextBox + attr_accessor :max_rows + + TEXT_BOX_WIDTH = 200 - TEXT_BOX_HEIGHT + BUTTON_X = TEXT_BOX_X + TEXT_BOX_WIDTH + BUTTON_WIDTH = TEXT_BOX_HEIGHT + BUTTON_HEIGHT = TEXT_BOX_HEIGHT + MAX_LIST_ROWS = 8 + + def initialize(width, height, viewport, options, value = "") + super(width, height, viewport, value) + @box_width = TEXT_BOX_WIDTH + @options = options + @toggling_dropdown_list = false + @max_rows = MAX_LIST_ROWS + end + + def dispose + remove_dropdown_menu + super + end + + def values=(new_vals) + @options = new_vals + @dropdown_menu.values = @options if @dropdown_menu + end + + def set_interactive_rects + @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, + [@box_width, width - (TEXT_BOX_X * 2) - BUTTON_WIDTH].min, TEXT_BOX_HEIGHT) + @button_rect = Rect.new(BUTTON_X, @text_box_rect.y, BUTTON_WIDTH, BUTTON_HEIGHT) + @interactions = { + :text_box => @text_box_rect, + :button => @button_rect + } + end + + #----------------------------------------------------------------------------- + + def busy? + return true if @dropdown_menu || @toggling_dropdown_list + return super + end + + #----------------------------------------------------------------------------- + + def make_dropdown_menu + menu_height = UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min + # Draw menu's background + @dropdown_menu_bg = BitmapSprite.new(@text_box_rect.width + @button_rect.width, menu_height + 4, self.viewport) + @dropdown_menu_bg.x = self.x + @text_box_rect.x + @dropdown_menu_bg.y = self.y + @text_box_rect.y + @text_box_rect.height + @dropdown_menu_bg.z = self.z + 1 + @dropdown_menu_bg.bitmap.outline_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.black) + @dropdown_menu_bg.bitmap.fill_rect(1, 1, @dropdown_menu_bg.width - 2, @dropdown_menu_bg.height - 2, Color.white) + # Create menu + @dropdown_menu = UIControls::List.new(@text_box_rect.width + @button_rect.width - 4, menu_height, self.viewport, @options) + @dropdown_menu.x = @dropdown_menu_bg.x + 2 + @dropdown_menu.y = @dropdown_menu_bg.y + 2 + @dropdown_menu.z = self.z + 2 + @dropdown_menu.set_interactive_rects + @dropdown_menu.repaint + end + + def remove_dropdown_menu + @dropdown_menu_bg&.dispose + @dropdown_menu_bg = nil + @dropdown_menu&.dispose + @dropdown_menu = nil + @captured_area = nil + @applied_filter = false + end + + #----------------------------------------------------------------------------- + + def draw_area_highlight + highlight_color = nil + if @captured_area == :text_box && !@hover_area && Input.press?(Input::MOUSELEFT) + highlight_color = CAPTURE_COLOR + elsif !@captured_area && [:text_box, :button].include?(@hover_area) + # Draw mouse hover over area highlight + highlight_color = HOVER_COLOR + end + return if !highlight_color + [:text_box, :button].each do |area| + rect = @interactions[area] + self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, highlight_color) if rect + end + end + + def refresh + @dropdown_menu&.refresh + super + # Draw disabled colour in button + if disabled? + self.bitmap.fill_rect(@button_rect.x, @button_rect.y, + @button_rect.width, @button_rect.height, + DISABLED_COLOR) + end + # Draw button outline + self.bitmap.outline_rect(@button_rect.x, @button_rect.y, + @button_rect.width, @button_rect.height, + self.bitmap.font.color) + # Draw down arrow + arrow_area_x = @button_rect.x + @button_rect.width - @button_rect.height + 1 + arrow_area_width = @button_rect.height - 2 + # self.bitmap.fill_rect(arrow_area_x, @button_rect.y + 1, arrow_area_width, arrow_area_width, + # (@hover_area && @captured_area != :button) ? HOVER_COLOR : Color.white) + 6.times do |i| + self.bitmap.fill_rect(arrow_area_x + (arrow_area_width / 2) - 5 + i, + @button_rect.y + (arrow_area_width / 2) - 1 + i, + 11 - (2 * i), 1, (disabled?) ? DISABLED_COLOR_DARK : self.bitmap.font.color) + end + end + + #----------------------------------------------------------------------------- + + def on_mouse_press + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + if @dropdown_menu + if @text_box_rect.contains?(mouse_x, mouse_y) + # Clicked into the text box; put the text cursor in there + @captured_area = :text_box + @cursor_pos = get_cursor_index_from_mouse_position + @cursor_timer = System.uptime + invalidate + elsif !@dropdown_menu.mouse_in_control? + @value.strip! if @value.respond_to?("strip!") + @value = @initial_value.dup if disabled? + set_changed if @initial_value && @value != @initial_value + reset_interaction + remove_dropdown_menu + @toggling_dropdown_list = true + end + else + @captured_area = nil + super + if @captured_area + make_dropdown_menu + @toggling_dropdown_list = true + end + end + end + + def on_mouse_release + return if !@captured_area && !@dropdown_menu && !@toggling_dropdown_list + if @toggling_dropdown_list + @toggling_dropdown_list = false + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y && @interactions[:text_box].contains?(mouse_x, mouse_y) + @initial_value = @value.dup + Input.text_input = true + invalidate + end + return + end + if @dropdown_menu + if @dropdown_menu.changed? + new_val = @dropdown_menu.value + new_val = @options[new_val] if new_val.is_a?(Integer) + if new_val && new_val != @value + self.value = new_val + set_changed + end + @value.strip! if @value.respond_to?("strip!") + reset_interaction + remove_dropdown_menu + @captured_area = nil + elsif @captured_area + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y && @interactions[:text_box].contains?(mouse_x, mouse_y) + @captured_area = :text_box + @initial_value = @value.dup + Input.text_input = true + end + elsif !mouse_in_control? && !@dropdown_menu.mouse_in_control? + @value.strip! if @value.respond_to?("strip!") + self.value = @initial_value if disabled? + set_changed if @initial_value && @value != @initial_value + reset_interaction + remove_dropdown_menu + @captured_area = nil + end + else + super + end + invalidate + end + + def update + @dropdown_menu&.update + @dropdown_menu&.repaint + super + # Filter the dropdown menu options based on @value if it changes + if @dropdown_menu && @initial_value && (@applied_filter || @value != @initial_value) + filtered_options = @options.select do |key, val| + key.downcase.include?(@value.downcase) || val.downcase.include?(@value.downcase) + end + @dropdown_menu.values = filtered_options + @applied_filter = true + end + end +end diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 30c1273f4..56dd57c05 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -32,18 +32,18 @@ class AnimationEditor PARTICLE_LIST_HEIGHT = WINDOW_HEIGHT - PARTICLE_LIST_Y - BORDER_THICKNESS # Pop-up windows - ANIM_PROPERTIES_LABEL_WIDTH = UIControls::ControlsContainer::OFFSET_FROM_LABEL_X + 80 - ANIM_PROPERTIES_WIDTH = SIDE_PANE_WIDTH + 80 + 8 - ANIM_PROPERTIES_HEIGHT = WINDOW_HEIGHT * 3 / 4 - ANIM_PROPERTIES_X = (WINDOW_WIDTH - ANIM_PROPERTIES_WIDTH) / 2 - ANIM_PROPERTIES_Y = (WINDOW_HEIGHT - ANIM_PROPERTIES_HEIGHT) / 2 - MESSAGE_BOX_WIDTH = WINDOW_WIDTH * 3 / 4 MESSAGE_BOX_HEIGHT = 160 MESSAGE_BOX_BUTTON_WIDTH = 150 MESSAGE_BOX_BUTTON_HEIGHT = 32 MESSAGE_BOX_SPACING = 16 + ANIM_PROPERTIES_LABEL_WIDTH = UIControls::ControlsContainer::OFFSET_FROM_LABEL_X + 80 + ANIM_PROPERTIES_WIDTH = SIDE_PANE_WIDTH + 80 + ANIM_PROPERTIES_HEIGHT = WINDOW_HEIGHT * 3 / 4 + ANIM_PROPERTIES_X = (WINDOW_WIDTH - ANIM_PROPERTIES_WIDTH) / 2 + ANIM_PROPERTIES_Y = (WINDOW_HEIGHT - ANIM_PROPERTIES_HEIGHT) / 2 + CHOOSER_BUTTON_WIDTH = 150 CHOOSER_BUTTON_HEIGHT = MESSAGE_BOX_BUTTON_HEIGHT CHOOSER_FILE_LIST_X = 8 @@ -52,18 +52,37 @@ class AnimationEditor CHOOSER_FILE_LIST_HEIGHT = UIControls::List::ROW_HEIGHT * 15 GRAPHIC_CHOOSER_PREVIEW_SIZE = 320 # Square - GRAPHIC_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 10 + GRAPHIC_CHOOSER_PREVIEW_SIZE + 8 + (BORDER_THICKNESS * 2) - GRAPHIC_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 + (BORDER_THICKNESS * 2) + GRAPHIC_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 10 + GRAPHIC_CHOOSER_PREVIEW_SIZE + 8 + GRAPHIC_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 GRAPHIC_CHOOSER_X = ((WINDOW_WIDTH - GRAPHIC_CHOOSER_WINDOW_WIDTH) / 2) GRAPHIC_CHOOSER_Y = ((WINDOW_HEIGHT - GRAPHIC_CHOOSER_WINDOW_HEIGHT) / 2) AUDIO_CHOOSER_LABEL_WIDTH = UIControls::ControlsContainer::OFFSET_FROM_LABEL_X AUDIO_CHOOSER_SLIDER_WIDTH = (CHOOSER_BUTTON_WIDTH * 2) - AUDIO_CHOOSER_LABEL_WIDTH - AUDIO_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 8 + (CHOOSER_BUTTON_WIDTH * 2) + 4 + (BORDER_THICKNESS * 2) - AUDIO_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 + (BORDER_THICKNESS * 2) + AUDIO_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 8 + (CHOOSER_BUTTON_WIDTH * 2) + 4 + AUDIO_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 AUDIO_CHOOSER_X = ((WINDOW_WIDTH - AUDIO_CHOOSER_WINDOW_WIDTH) / 2) AUDIO_CHOOSER_Y = ((WINDOW_HEIGHT - AUDIO_CHOOSER_WINDOW_HEIGHT) / 2) + # This list of animations was gathered manually by looking at all instances of + # pbCommonAnimation. + COMMON_ANIMATIONS = [ + "Attract", "BanefulBunker", "BeakBlast", "Bind", "Burn", + "Clamp", "Confusion", "CraftyShield", "EatBerry", "ElectricTerrain", + "FireSpin", "FocusPunch", "Frozen", "GrassyTerrain", "Hail", + "HarshSun", "HealingWish", "HealthDown", "HealthUp", "HeavyRain", + "Infestation", "KingsShield", "LeechSeed", "LevelUp", "LunarDance", + "MagmaStorm", "MegaEvolution", "MegaEvolution2", "MistyTerrain", "Obstruct", + "Octolock", "Paralysis", "ParentalBond", "Poison", "Powder", + "PrimalGroudon", "PrimalGroudon2", "PrimalKyogre", "PrimalKyogre2", "Protect", + "PsychicTerrain", "QuickGuard", "Rain", "Rainbow", "RainbowOpp", + "Sandstorm", "SandTomb", "SeaOfFire", "SeaOfFireOpp", "Shadow", + "ShadowSky", "ShellTrap", "Shiny", "Sleep", "SpikyShield", + "StatDown", "StatUp", "StrongWinds", "Sun", "SuperShiny", + "Swamp", "SwampOpp", "Toxic", "UseItem", "WideGuard", + "Wrap" + ] + def initialize(anim_id, anim) @anim_id = anim_id @anim = anim @@ -110,21 +129,18 @@ class AnimationEditor @components[:particle_list].set_interactive_rects # Animation properties pop-up window @components[:animation_properties] = UIControls::ControlsContainer.new( - ANIM_PROPERTIES_X + BORDER_THICKNESS + 4, ANIM_PROPERTIES_Y + BORDER_THICKNESS, - ANIM_PROPERTIES_WIDTH - ((BORDER_THICKNESS + 4) * 2), ANIM_PROPERTIES_HEIGHT - (BORDER_THICKNESS * 2) + ANIM_PROPERTIES_X + 4, ANIM_PROPERTIES_Y, ANIM_PROPERTIES_WIDTH - 8, ANIM_PROPERTIES_HEIGHT ) @components[:animation_properties].viewport.z = @pop_up_viewport.z + 1 @components[:animation_properties].label_offset_x = 170 # Graphic chooser pop-up window @components[:graphic_chooser] = UIControls::ControlsContainer.new( - GRAPHIC_CHOOSER_X + BORDER_THICKNESS, GRAPHIC_CHOOSER_Y + BORDER_THICKNESS, - GRAPHIC_CHOOSER_WINDOW_WIDTH - (BORDER_THICKNESS * 2), GRAPHIC_CHOOSER_WINDOW_HEIGHT - (BORDER_THICKNESS * 2) + GRAPHIC_CHOOSER_X, GRAPHIC_CHOOSER_Y, GRAPHIC_CHOOSER_WINDOW_WIDTH, GRAPHIC_CHOOSER_WINDOW_HEIGHT ) @components[:graphic_chooser].viewport.z = @pop_up_viewport.z + 1 # Audio chooser pop-up window @components[:audio_chooser] = UIControls::ControlsContainer.new( - AUDIO_CHOOSER_X + BORDER_THICKNESS, AUDIO_CHOOSER_Y + BORDER_THICKNESS, - AUDIO_CHOOSER_WINDOW_WIDTH - (BORDER_THICKNESS * 2), AUDIO_CHOOSER_WINDOW_HEIGHT - (BORDER_THICKNESS * 2) + AUDIO_CHOOSER_X, AUDIO_CHOOSER_Y, AUDIO_CHOOSER_WINDOW_WIDTH, AUDIO_CHOOSER_WINDOW_HEIGHT ) @components[:audio_chooser].viewport.z = @pop_up_viewport.z + 1 @captured = nil @@ -297,19 +313,9 @@ class AnimationEditor # Create "opp" variant anim_properties.add_labelled_checkbox(:opp_variant, _INTL("User is opposing?"), false) # Create move control - # TODO: Instead of having the :common_anim TextBox control, make this a - # TextBoxDropdownList control instead. Make it allow custom text - # as well as any option in the list. Its options will be changed - # depending on the animation's type. Also have a list of existing - # Common animation names for it. - move_list = [] - GameData::Move.each { |m| move_list.push([m.id.to_s, m.name]) } - move_list.sort! { |a, b| a[1] <=> b[1] } - anim_properties.add_labelled_dropdown_list(:move, _INTL("Move"), move_list.to_h, move_list[0][0]) + anim_properties.add_labelled_text_box_dropdown_list(:move, "", [], "") move_ctrl = anim_properties.get_control(:move) move_ctrl.max_rows = 16 - common_text = UIControls::TextBox.new(move_ctrl.width, move_ctrl.height, move_ctrl.viewport, "") - anim_properties.add_control_at(:common_anim, common_text, move_ctrl.x, move_ctrl.y) # Create version control anim_properties.add_labelled_number_text_box(:version, _INTL("Version"), 0, 99, 0) # Create animation name control @@ -444,6 +450,20 @@ class AnimationEditor end end + def refresh_move_property_options + ctrl = @components[:animation_properties].get_control(:move) + case @anim[:type] + when :move, :opp_move + move_list = [] + GameData::Move.each { |m| move_list.push([m.id.to_s, m.name]) } + move_list.push(["STRUGGLE", _INTL("Struggle")]) if move_list.none? { |val| val[0] == "STRUGGLE" } + move_list.sort! { |a, b| a[1] <=> b[1] } + ctrl.values = move_list.to_h + when :common, :opp_common + ctrl.values = COMMON_ANIMATIONS + end + end + def refresh_component_values(component_sym) component = @components[component_sym] case component_sym @@ -515,17 +535,13 @@ class AnimationEditor # TODO: Set the possible focus options depending on whether the animation # has a target/user. when :animation_properties + refresh_move_property_options case @anim[:type] when :move, :opp_move component.get_control(:move_label).text = _INTL("Move") - component.get_control(:move).visible = true component.get_control(:move).value = @anim[:move] - component.get_control(:common_anim).visible = false when :common, :opp_common component.get_control(:move_label).text = _INTL("Common animation") - component.get_control(:move).visible = false - component.get_control(:common_anim).visible = true - component.get_control(:common_anim).value = @anim[:move] end # TODO: Maybe other things as well? end @@ -653,8 +669,6 @@ class AnimationEditor @anim[:type] = (opp) ? :opp_common : :common end refresh_component(:animation_properties) - when :common_anim - @anim[:move] = value when :pbs_path txt = value.gsub!(/\.txt$/, "") @anim[property] = txt diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 88323098f..8612e5e70 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -3,21 +3,18 @@ #=============================================================================== class AnimationEditor def create_pop_up_window(width, height) - ret = BitmapSprite.new(width, height, @pop_up_viewport) - ret.x = (WINDOW_WIDTH - width) / 2 - ret.y = (WINDOW_HEIGHT - height) / 2 + ret = BitmapSprite.new(width + (BORDER_THICKNESS * 2), + height + (BORDER_THICKNESS * 2), @pop_up_viewport) + ret.x = (WINDOW_WIDTH - ret.width) / 2 + ret.y = (WINDOW_HEIGHT - ret.height) / 2 ret.z = -1 ret.bitmap.font.color = Color.black ret.bitmap.font.size = 18 - # Draw message box border - ret.bitmap.border_rect(BORDER_THICKNESS, BORDER_THICKNESS, - ret.width - (BORDER_THICKNESS * 2), ret.height - (BORDER_THICKNESS * 2), + # Draw pop-up box border + ret.bitmap.border_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, BORDER_THICKNESS, Color.white, Color.black) - # Fill message box with white - ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, - ret.width - (BORDER_THICKNESS * 2), - ret.height - (BORDER_THICKNESS * 2), - Color.white) + # Fill pop-up box with white + ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, Color.white) return ret end @@ -79,6 +76,55 @@ class AnimationEditor #----------------------------------------------------------------------------- + def edit_animation_properties + # Show pop-up window + @pop_up_bg_bitmap.visible = true + bg_bitmap = create_pop_up_window(ANIM_PROPERTIES_WIDTH, ANIM_PROPERTIES_HEIGHT) + # TODO: Draw box around list control(s), i.e. flags. Note that an extra +4 + # should be added to its x coordinate because of padding created when + # defining @components[:animation_properties]. + anim_properties = @components[:animation_properties] + anim_properties.visible = true + # Set control values + case @anim[:type] + when :move, :opp_move + anim_properties.get_control(:type).value = :move + when :common, :opp_common + anim_properties.get_control(:type).value = :common + end + anim_properties.get_control(:opp_variant).value = ([:opp_move, :opp_common].include?(@anim[:type])) + anim_properties.get_control(:version).value = @anim[:version] || 0 + anim_properties.get_control(:name).value = @anim[:name] || "" + anim_properties.get_control(:pbs_path).value = (@anim[:pbs_path] || "unsorted") + ".txt" + anim_properties.get_control(:has_target).value = !@anim[:no_target] + anim_properties.get_control(:usable).value = !(@anim[:ignore] || false) + # TODO: Populate flags. + refresh_component(:animation_properties) # This sets the :move control's value + # Interaction loop + ret = nil + loop do + Graphics.update + Input.update + anim_properties.update + if anim_properties.changed? + break if anim_properties.values.keys.include?(:close) + anim_properties.values.each_pair do |property, value| + apply_changed_value(:animation_properties, property, value) + end + anim_properties.clear_changed + end + break if !anim_properties.busy? && Input.trigger?(Input::BACK) + anim_properties.repaint + end + # Dispose and return + bg_bitmap.dispose + @pop_up_bg_bitmap.visible = false + anim_properties.clear_changed + anim_properties.visible = false + end + + #----------------------------------------------------------------------------- + # Generates a list of all files in the given folder which have a file # extension that matches one in exts. Removes any files from the list whose # filename is the same as one in prepends (case insensitive), and then adds @@ -106,7 +152,7 @@ class AnimationEditor graphic_chooser.visible = true # Draw box around list control list = graphic_chooser.get_control(:list) - bg_bitmap.bitmap.outline_rect(list.x + BORDER_THICKNESS - 2, list.y + BORDER_THICKNESS - 2, + bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x - 2, BORDER_THICKNESS + list.y - 2, list.width + 4, list.height + 4, Color.black) # Get a list of files files = get_all_files_in_folder_and_prepend( @@ -210,7 +256,7 @@ class AnimationEditor audio_chooser.visible = true # Draw box around list control list = audio_chooser.get_control(:list) - bg_bitmap.bitmap.outline_rect(list.x + BORDER_THICKNESS - 2, list.y + BORDER_THICKNESS - 2, + bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x - 2, BORDER_THICKNESS + list.y - 2, list.width + 4, list.height + 4, Color.black) # Get a list of files files = get_all_files_in_folder_and_prepend( @@ -274,51 +320,4 @@ class AnimationEditor return [ret, vol, ptch] end - #----------------------------------------------------------------------------- - - def edit_animation_properties - # Show pop-up window - @pop_up_bg_bitmap.visible = true - bg_bitmap = create_pop_up_window(ANIM_PROPERTIES_WIDTH, ANIM_PROPERTIES_HEIGHT) - # TODO: Draw box around list control(s), i.e. flags. - anim_properties = @components[:animation_properties] - anim_properties.visible = true - # Set control values - case @anim[:type] - when :move, :opp_move - anim_properties.get_control(:type).value = :move - when :common, :opp_common - anim_properties.get_control(:type).value = :common - end - anim_properties.get_control(:opp_variant).value = ([:opp_move, :opp_common].include?(@anim[:type])) - anim_properties.get_control(:version).value = @anim[:version] || 0 - anim_properties.get_control(:name).value = @anim[:name] || "" - anim_properties.get_control(:pbs_path).value = (@anim[:pbs_path] || "unsorted") + ".txt" - anim_properties.get_control(:has_target).value = !@anim[:no_target] - anim_properties.get_control(:usable).value = !(@anim[:ignore] || false) - # TODO: Populate flags. - refresh_component(:animation_properties) # This sets the :move control's value - # Interaction loop - ret = nil - loop do - Graphics.update - Input.update - anim_properties.update - if anim_properties.changed? - break if anim_properties.values.keys.include?(:close) - anim_properties.values.each_pair do |property, value| - apply_changed_value(:animation_properties, property, value) - end - anim_properties.clear_changed - end - break if !anim_properties.busy? && Input.trigger?(Input::BACK) - anim_properties.repaint - end - # Dispose and return - bg_bitmap.dispose - @pop_up_bg_bitmap.visible = false - anim_properties.clear_changed - anim_properties.visible = false - end - end From 94f0a9c8d065811aa78695d0694cf57a9a2067a7 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 2 Jan 2024 23:34:59 +0000 Subject: [PATCH 17/49] Made New/Copy/Delete buttons in animation selector screen work, split animations compiler into its own compiler --- .../902_Anim GameData/001_Animation.rb | 21 ++++ .../903_Anim Compiler/001_Anim compiler.rb | 78 +++++++++--- .../904_Anim Editor/010_AnimationSelector.rb | 118 ++++++++++++++++-- 3 files changed, 193 insertions(+), 24 deletions(-) diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 4bee10e5b..77bb17568 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -159,6 +159,25 @@ module GameData DATA[(id_num >= 0) ? id_num : DATA.keys.length] = self.new(hash) end + def self.new_hash(anim_type = 0, move = nil) + ret = {} + ret[:type] = (anim_type == 0) ? :move : :common + ret[:move] = (anim_type == 0) ? "STRUGGLE" : "Shiny" + ret[:move] = move if !move.nil? + ret[:version] = 0 + ret[:name] = _INTL("New animation") + ret[:no_target] = false + ret[:ignore] = false + ret[:particles] = [ + {:name => "User", :focus => :user, :graphic => "USER"}, + {:name => "Target", :focus => :target, :graphic => "TARGET"}, + {:name => "SE"} + ] + ret[:flags] = [] + ret[:pbs_path] = "New animation" + return ret + end + def initialize(hash) # NOTE: hash has an :id entry, but it's unused here. @type = hash[:type] @@ -180,6 +199,8 @@ module GameData ret[:move] = @move ret[:version] = @version ret[:name] = @name + ret[:no_target] = @no_target + ret[:ignore] = @ignore ret[:particles] = [] # Clone the @particles array, which is nested hashes and arrays @particles.each do |particle| new_p = {} diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index a80afbc7c..a5fe92709 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -202,6 +202,7 @@ end #=============================================================================== # Hook into the regular Compiler to also compile animation PBS files. +# This is a separate Compiler that runs after the regular one. #=============================================================================== module Compiler module_function @@ -215,24 +216,69 @@ module Compiler end class << self - if !method_defined?(:__new_anims__get_all_pbs_files_to_compile) - alias_method :__new_anims__get_all_pbs_files_to_compile, :get_all_pbs_files_to_compile - end - if !method_defined?(:__new_anims__compile_pbs_files) - alias_method :__new_anims__compile_pbs_files, :compile_pbs_files + if !method_defined?(:__new_anims_main) + alias_method :__new_anims_main, :main end end - def get_all_pbs_files_to_compile - ret = __new_anims__get_all_pbs_files_to_compile - extra = get_animation_pbs_files_to_compile - ret[:Animation] = [nil, extra] - return ret - end - - def compile_pbs_files - __new_anims__compile_pbs_files - text_files = get_animation_pbs_files_to_compile - compile_battle_animations(*text_files) + def main + __new_anims_main + return if !$DEBUG + begin + Console.echo_h1(_INTL("Checking new animations data")) + must_compile = false + data_file = "animations.dat" + text_files = get_animation_pbs_files_to_compile + latest_data_time = 0 + latest_text_time = 0 + # Check data file for its latest modify time + if FileTest.exist?("Data/" + data_file) + begin + File.open("Data/#{data_file}") do |file| + latest_data_time = [latest_data_time, file.mtime.to_i].max + end + rescue SystemCallError + must_compile = true + end + else + must_compile = true if text_files.length > 0 + end + # Check PBS files for their latest modify time + text_files.each do |filepath| + begin + File.open(filepath) do |file| + latest_text_time = [latest_text_time, file.mtime.to_i].max + end + rescue SystemCallError + end + end + # Decide to compile if a PBS file was edited more recently than the .dat file + must_compile |= (latest_text_time >= latest_data_time) + # Should recompile if holding Ctrl + Input.update + must_compile = true if $full_compile || Input.press?(Input::CTRL) + # Delete old data file in preparation for recompiling + if must_compile + begin + File.delete("Data/#{data_file}") if FileTest.exist?("Data/#{data_file}") + rescue SystemCallError + end + # Recompile all data + compile_battle_animations(*text_files) + else + Console.echoln_li(_INTL("New animations data were not compiled")) + end + echoln "" + rescue Exception + e = $! + raise e if e.class.to_s == "Reset" || e.is_a?(Reset) || e.is_a?(SystemExit) + pbPrintException(e) + begin + File.delete("Data/#{data_file}") if FileTest.exist?("Data/#{data_file}") + rescue SystemCallError + end + raise Reset.new if e.is_a?(Hangup) + raise "Unknown exception when compiling animations." + end end end diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 5431e666c..cae1b1a6d 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -2,6 +2,8 @@ # #=============================================================================== class AnimationEditor::AnimationSelector + BORDER_THICKNESS = 4 + QUIT_BUTTON_WIDTH = 80 QUIT_BUTTON_HEIGHT = 30 @@ -25,11 +27,23 @@ class AnimationEditor::AnimationSelector ACTION_BUTTON_X = ANIMATIONS_LIST_X + ANIMATIONS_LIST_WIDTH + 4 ACTION_BUTTON_Y = TYPE_BUTTONS_Y + ((ANIMATIONS_LIST_HEIGHT - (ACTION_BUTTON_HEIGHT * 3)) / 2) + 4 + # Pop-up window + MESSAGE_BOX_WIDTH = AnimationEditor::WINDOW_WIDTH * 3 / 4 + MESSAGE_BOX_HEIGHT = 160 + MESSAGE_BOX_BUTTON_WIDTH = 150 + MESSAGE_BOX_BUTTON_HEIGHT = 32 + MESSAGE_BOX_SPACING = 16 + def initialize generate_lists @viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) @viewport.z = 99999 + @pop_up_viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) + @pop_up_viewport.z = @viewport.z + 50 @screen_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @viewport) + @pop_up_bg_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @pop_up_viewport) + @pop_up_bg_bitmap.z = -100 + @pop_up_bg_bitmap.visible = false draw_editor_background @animation_type = 0 # 0=move, 1=common @quit = false @@ -39,8 +53,10 @@ class AnimationEditor::AnimationSelector def dispose @screen_bitmap.dispose + @pop_up_bg_bitmap.dispose @components.dispose @viewport.dispose + @pop_up_viewport.dispose end LABEL_OFFSET_X = -4 @@ -108,6 +124,80 @@ class AnimationEditor::AnimationSelector #----------------------------------------------------------------------------- + def create_pop_up_window(width, height) + ret = BitmapSprite.new(width + (BORDER_THICKNESS * 2), + height + (BORDER_THICKNESS * 2), @pop_up_viewport) + ret.x = (AnimationEditor::WINDOW_WIDTH - ret.width) / 2 + ret.y = (AnimationEditor::WINDOW_HEIGHT - ret.height) / 2 + ret.z = -1 + ret.bitmap.font.color = Color.black + ret.bitmap.font.size = 18 + # Draw pop-up box border + ret.bitmap.border_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, + BORDER_THICKNESS, Color.white, Color.black) + # Fill pop-up box with white + ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, Color.white) + return ret + end + + #----------------------------------------------------------------------------- + + def message(text, *options) + @pop_up_bg_bitmap.visible = true + msg_bitmap = create_pop_up_window(MESSAGE_BOX_WIDTH, MESSAGE_BOX_HEIGHT) + # Draw text + text_size = msg_bitmap.bitmap.text_size(text) + msg_bitmap.bitmap.draw_text(0, (msg_bitmap.height / 2) - MESSAGE_BOX_BUTTON_HEIGHT, + msg_bitmap.width, text_size.height, text, 1) + # Create buttons + buttons = [] + options.each_with_index do |option, i| + btn = UIControls::Button.new(MESSAGE_BOX_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, @pop_up_viewport, option[1]) + btn.x = msg_bitmap.x + (msg_bitmap.width - (MESSAGE_BOX_BUTTON_WIDTH * options.length)) / 2 + btn.x += MESSAGE_BOX_BUTTON_WIDTH * i + btn.y = msg_bitmap.y + msg_bitmap.height - MESSAGE_BOX_BUTTON_HEIGHT - MESSAGE_BOX_SPACING + btn.set_fixed_size + btn.set_interactive_rects + buttons.push([option[0], btn]) + end + # Interaction loop + ret = nil + captured = nil + loop do + Graphics.update + Input.update + if captured + captured.update + captured = nil if !captured.busy? + else + buttons.each do |btn| + btn[1].update + captured = btn[1] if btn[1].busy? + end + end + buttons.each do |btn| + next if !btn[1].changed? + ret = btn[0] + break + end + ret = :cancel if Input.trigger?(Input::BACK) + break if ret + buttons.each { |btn| btn[1].repaint } + end + # Dispose and return + buttons.each { |btn| btn[1].dispose } + buttons.clear + msg_bitmap.dispose + @pop_up_bg_bitmap.visible = false + return ret + end + + def confirm_message(text) + return message(text, [:yes, _INTL("Yes")], [:no, _INTL("No")]) == :yes + end + + #----------------------------------------------------------------------------- + def generate_lists @move_list = [] @common_list = [] @@ -190,11 +280,11 @@ class AnimationEditor::AnimationSelector @quit = true return # Don't need to refresh the screen when :new - # TODO: New animation. Create a new animation hash with some default - # contents, go into the edit screen and immediately open the - # animation properties pop-up window. Use the first available ID - # number from GameData::Animation for it. Don't register the - # animation hash here, though. + new_anim = GameData::Animation.new_hash(@animation_type, @components.get_control(:moves_list).value) + new_id = GameData::Animation.keys.max + 1 + screen = AnimationEditor.new(new_id, new_anim) + screen.run + generate_lists when :moves @animation_type = 0 @components.get_control(:moves_list).selected = -1 @@ -213,12 +303,24 @@ class AnimationEditor::AnimationSelector when :copy anim_id = selected_animation_id if anim_id - # TODO: Copy animation. Append "(copy)" to its name. + new_anim = GameData::Animation.get(anim_id).clone_as_hash + new_anim[:name] += " " + _INTL("(copy)") if !nil_or_empty?(new_anim[:name]) + new_id = GameData::Animation.keys.max + 1 + screen = AnimationEditor.new(new_id, new_anim) + screen.run + generate_lists end when :delete anim_id = selected_animation_id - if anim_id - # TODO: Delete animation. Ask the user if they're sure. + if anim_id && confirm_message(_INTL("Are you sure you want to delete this animation?")) + pbs_path = GameData::Animation.get(anim_id).pbs_path + GameData::Animation::DATA.delete(anim_id) + if GameData::Animation::DATA.any? { |_key, anim| anim.pbs_path == pbs_path } + Compiler.write_battle_animation_file(pbs_path) + elsif FileTest.exist?("PBS/Animations/" + pbs_path + ".txt") + File.delete("PBS/Animations/" + pbs_path + ".txt") + end + generate_lists end end refresh From 4455c093b89644c25169d83cec308d93729aed72 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 25 Jan 2024 21:07:16 +0000 Subject: [PATCH 18/49] Added canvas to new animation editor (isn't interactive yet), improved example animations --- .../Control elements/009_DropdownList.rb | 7 +- .../902_Anim GameData/001_Animation.rb | 32 +- .../903_Anim Compiler/001_Anim compiler.rb | 6 +- .../100_convert old anims to new.rb | 234 +- .../904_Anim Editor/001_AnimationEditor.rb | 142 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 7 +- .../Anim Editor elements/001_Canvas.rb | 425 +++- .../Anim Editor elements/003_ParticleList.rb | 14 +- PBS/Animations/Converted/Common/Attract.txt | 180 +- PBS/Animations/Converted/Common/Bind.txt | 61 +- PBS/Animations/Converted/Common/Burn.txt | 22 +- PBS/Animations/Converted/Common/Confusion.txt | 87 +- PBS/Animations/Converted/Common/FireSpin.txt | 148 +- PBS/Animations/Converted/Common/Frozen.txt | 107 +- PBS/Animations/Converted/Common/Hail.txt | 226 +- .../Converted/Common/HealthDown.txt | 257 ++- PBS/Animations/Converted/Common/HealthUp.txt | 54 +- PBS/Animations/Converted/Common/LeechSeed.txt | 267 ++- PBS/Animations/Converted/Common/Paralysis.txt | 93 +- .../Converted/Common/ParentalBond.txt | 13 +- PBS/Animations/Converted/Common/Poison.txt | 26 +- PBS/Animations/Converted/Common/Rain.txt | 116 +- PBS/Animations/Converted/Common/Sandstorm.txt | 203 +- PBS/Animations/Converted/Common/Shadow.txt | 111 +- PBS/Animations/Converted/Common/ShadowSky.txt | 12 +- PBS/Animations/Converted/Common/Shiny.txt | 111 +- PBS/Animations/Converted/Common/Sleep.txt | 112 +- PBS/Animations/Converted/Common/StatDown.txt | 224 +- PBS/Animations/Converted/Common/StatUp.txt | 134 +- PBS/Animations/Converted/Common/Sun.txt | 13 +- .../Converted/Common/SuperShiny.txt | 129 +- PBS/Animations/Converted/Common/Toxic.txt | 26 +- PBS/Animations/Converted/Common/Wrap.txt | 61 +- PBS/Animations/Converted/Move/ABSORB.txt | 345 +-- PBS/Animations/Converted/Move/ACID.txt | 86 +- PBS/Animations/Converted/Move/ACIDARMOR.txt | 34 +- PBS/Animations/Converted/Move/ACIDSPRAY.txt | 177 +- PBS/Animations/Converted/Move/ACROBATICS.txt | 24 +- PBS/Animations/Converted/Move/ACUPRESSURE.txt | 136 +- PBS/Animations/Converted/Move/AERIALACE.txt | 629 +++--- PBS/Animations/Converted/Move/AGILITY.txt | 119 +- PBS/Animations/Converted/Move/ALLYSWITCH.txt | 44 +- PBS/Animations/Converted/Move/AMNESIA.txt | 15 +- .../Converted/Move/ANCIENTPOWER.txt | 636 +++--- PBS/Animations/Converted/Move/AQUARING.txt | 83 +- .../Converted/Move/AROMATHERAPY.txt | 78 +- PBS/Animations/Converted/Move/AURORABEAM.txt | 429 ++-- PBS/Animations/Converted/Move/BARRIER.txt | 90 +- PBS/Animations/Converted/Move/BEATUP.txt | 150 +- PBS/Animations/Converted/Move/BIND.txt | 61 +- PBS/Animations/Converted/Move/BITE.txt | 27 +- PBS/Animations/Converted/Move/BLASTBURN.txt | 402 ++-- PBS/Animations/Converted/Move/BLOCK.txt | 14 +- PBS/Animations/Converted/Move/BLUEFLARE.txt | 65 +- PBS/Animations/Converted/Move/BODYSLAM.txt | 17 +- PBS/Animations/Converted/Move/BRICKBREAK.txt | 40 +- PBS/Animations/Converted/Move/BUBBLE.txt | 392 ++-- PBS/Animations/Converted/Move/BUBBLEBEAM.txt | 742 +++--- PBS/Animations/Converted/Move/BULKUP.txt | 124 +- PBS/Animations/Converted/Move/BULLETPUNCH.txt | 223 +- PBS/Animations/Converted/Move/BULLETSEED.txt | 755 ++++--- PBS/Animations/Converted/Move/CHARGE.txt | 187 +- PBS/Animations/Converted/Move/CHARM.txt | 91 +- PBS/Animations/Converted/Move/CLEARSMOG.txt | 30 +- PBS/Animations/Converted/Move/CLOSECOMBAT.txt | 436 ++-- PBS/Animations/Converted/Move/COMETPUNCH.txt | 235 +- PBS/Animations/Converted/Move/CONFUSERAY.txt | 95 +- PBS/Animations/Converted/Move/COTTONGUARD.txt | 128 +- PBS/Animations/Converted/Move/COTTONSPORE.txt | 27 +- PBS/Animations/Converted/Move/COUNTER.txt | 159 +- PBS/Animations/Converted/Move/CRUNCH.txt | 151 +- PBS/Animations/Converted/Move/CRUSHCLAW.txt | 44 +- PBS/Animations/Converted/Move/CURSE.txt | 25 +- PBS/Animations/Converted/Move/CUT.txt | 21 +- PBS/Animations/Converted/Move/DEFENSECURL.txt | 32 +- PBS/Animations/Converted/Move/DETECT.txt | 37 +- PBS/Animations/Converted/Move/DISABLE.txt | 41 +- PBS/Animations/Converted/Move/DIZZYPUNCH.txt | 410 ++-- PBS/Animations/Converted/Move/DOUBLEEDGE.txt | 74 +- PBS/Animations/Converted/Move/DOUBLEKICK.txt | 50 +- PBS/Animations/Converted/Move/DOUBLESLAP.txt | 260 ++- .../Converted/Move/DRAGONBREATH.txt | 124 +- PBS/Animations/Converted/Move/DRAGONCLAW.txt | 21 +- PBS/Animations/Converted/Move/DRAGONDANCE.txt | 43 +- PBS/Animations/Converted/Move/DRAGONRAGE.txt | 82 +- .../Converted/Move/DYNAMICPUNCH.txt | 60 +- PBS/Animations/Converted/Move/EMBER.txt | 71 +- PBS/Animations/Converted/Move/ENCORE.txt | 114 +- PBS/Animations/Converted/Move/ENERGYBALL.txt | 14 +- PBS/Animations/Converted/Move/ERUPTION.txt | 104 +- PBS/Animations/Converted/Move/EXPLOSION.txt | 113 +- PBS/Animations/Converted/Move/FAKEOUT.txt | 58 +- PBS/Animations/Converted/Move/FAKETEARS.txt | 138 +- PBS/Animations/Converted/Move/FIERYDANCE.txt | 220 +- PBS/Animations/Converted/Move/FINALGAMBIT.txt | 108 +- PBS/Animations/Converted/Move/FIREBLAST.txt | 46 +- PBS/Animations/Converted/Move/FIREFANG.txt | 151 +- PBS/Animations/Converted/Move/FIREPLEDGE.txt | 40 +- PBS/Animations/Converted/Move/FIREPUNCH.txt | 156 +- PBS/Animations/Converted/Move/FIRESPIN.txt | 29 +- PBS/Animations/Converted/Move/FLAIL.txt | 107 +- PBS/Animations/Converted/Move/FLAMEBURST.txt | 362 +-- PBS/Animations/Converted/Move/FLAMECHARGE.txt | 73 +- .../Converted/Move/FLAMETHROWER.txt | 490 ++-- PBS/Animations/Converted/Move/FLAMEWHEEL.txt | 356 ++- PBS/Animations/Converted/Move/FLASH.txt | 27 +- PBS/Animations/Converted/Move/FLY.txt | 87 +- PBS/Animations/Converted/Move/FOCUSENERGY.txt | 31 +- PBS/Animations/Converted/Move/FOLLOWME.txt | 122 +- PBS/Animations/Converted/Move/FORESIGHT.txt | 56 +- PBS/Animations/Converted/Move/FRENZYPLANT.txt | 53 +- PBS/Animations/Converted/Move/FURYATTACK.txt | 568 +++-- PBS/Animations/Converted/Move/FURYCUTTER.txt | 19 +- PBS/Animations/Converted/Move/FURYSWIPES.txt | 1240 ++++++---- PBS/Animations/Converted/Move/FUTURESIGHT.txt | 68 +- PBS/Animations/Converted/Move/GASTROACID.txt | 195 +- PBS/Animations/Converted/Move/GIGADRAIN.txt | 271 ++- PBS/Animations/Converted/Move/GLARE.txt | 60 +- .../Converted/Move/GRASSWHISTLE.txt | 347 +-- PBS/Animations/Converted/Move/GROWL.txt | 190 +- PBS/Animations/Converted/Move/GRUDGE.txt | 327 +-- PBS/Animations/Converted/Move/GUST.txt | 180 +- PBS/Animations/Converted/Move/HAIL.txt | 226 +- PBS/Animations/Converted/Move/HARDEN.txt | 14 +- PBS/Animations/Converted/Move/HEADBUTT.txt | 15 +- PBS/Animations/Converted/Move/HEATWAVE.txt | 34 +- .../Converted/Move/HIGHJUMPKICK.txt | 42 +- PBS/Animations/Converted/Move/HORNATTACK.txt | 38 +- PBS/Animations/Converted/Move/HYDROPUMP.txt | 78 +- PBS/Animations/Converted/Move/HYPERFANG.txt | 25 +- PBS/Animations/Converted/Move/ICEBALL.txt | 43 +- PBS/Animations/Converted/Move/ICEFANG.txt | 146 +- PBS/Animations/Converted/Move/ICEPUNCH.txt | 272 ++- PBS/Animations/Converted/Move/ICICLESPEAR.txt | 180 +- PBS/Animations/Converted/Move/ICYWIND.txt | 79 +- PBS/Animations/Converted/Move/INFERNO.txt | 496 ++-- PBS/Animations/Converted/Move/IRONHEAD.txt | 76 +- PBS/Animations/Converted/Move/JUMPKICK.txt | 42 +- PBS/Animations/Converted/Move/KARATECHOP.txt | 38 +- PBS/Animations/Converted/Move/KINESIS.txt | 42 +- PBS/Animations/Converted/Move/LEAFBLADE.txt | 36 +- PBS/Animations/Converted/Move/LEECHLIFE.txt | 196 +- PBS/Animations/Converted/Move/LEECHSEED.txt | 276 ++- PBS/Animations/Converted/Move/LEER.txt | 62 +- PBS/Animations/Converted/Move/LICK.txt | 26 +- PBS/Animations/Converted/Move/LIGHTSCREEN.txt | 124 +- PBS/Animations/Converted/Move/LOCKON.txt | 154 +- PBS/Animations/Converted/Move/LOVELYKISS.txt | 165 +- PBS/Animations/Converted/Move/LOWKICK.txt | 26 +- PBS/Animations/Converted/Move/LUCKYCHANT.txt | 414 ++-- PBS/Animations/Converted/Move/MACHPUNCH.txt | 64 +- PBS/Animations/Converted/Move/MAGICCOAT.txt | 220 +- PBS/Animations/Converted/Move/MEANLOOK.txt | 32 +- PBS/Animations/Converted/Move/MEGADRAIN.txt | 525 +++-- PBS/Animations/Converted/Move/MEGAHORN.txt | 189 +- PBS/Animations/Converted/Move/MEGAKICK.txt | 29 +- PBS/Animations/Converted/Move/MEGAPUNCH.txt | 69 +- PBS/Animations/Converted/Move/METALCLAW.txt | 44 +- PBS/Animations/Converted/Move/METEORMASH.txt | 221 +- PBS/Animations/Converted/Move/METRONOME.txt | 135 +- PBS/Animations/Converted/Move/MIST.txt | 72 +- PBS/Animations/Converted/Move/MISTBALL.txt | 73 +- PBS/Animations/Converted/Move/MOONLIGHT.txt | 28 +- PBS/Animations/Converted/Move/MORNINGSUN.txt | 34 +- PBS/Animations/Converted/Move/NIGHTMARE.txt | 142 +- PBS/Animations/Converted/Move/OUTRAGE.txt | 215 +- PBS/Animations/Converted/Move/OVERHEAT.txt | 177 +- PBS/Animations/Converted/Move/PAYDAY.txt | 91 +- PBS/Animations/Converted/Move/PETALDANCE.txt | 155 +- PBS/Animations/Converted/Move/PINMISSILE.txt | 515 +++-- PBS/Animations/Converted/Move/POISONFANG.txt | 90 +- PBS/Animations/Converted/Move/POISONGAS.txt | 230 +- .../Converted/Move/POISONPOWDER.txt | 27 +- PBS/Animations/Converted/Move/POISONSTING.txt | 96 +- PBS/Animations/Converted/Move/POISONTAIL.txt | 26 +- PBS/Animations/Converted/Move/POUND.txt | 22 +- PBS/Animations/Converted/Move/PSYCHIC.txt | 68 +- PBS/Animations/Converted/Move/PSYCHOCUT.txt | 289 ++- PBS/Animations/Converted/Move/QUICKATTACK.txt | 94 +- PBS/Animations/Converted/Move/RAINDANCE.txt | 116 +- PBS/Animations/Converted/Move/RAZORLEAF.txt | 227 +- PBS/Animations/Converted/Move/REFLECT.txt | 116 +- PBS/Animations/Converted/Move/REST.txt | 51 +- PBS/Animations/Converted/Move/ROAR.txt | 132 +- PBS/Animations/Converted/Move/ROCKSMASH.txt | 17 +- PBS/Animations/Converted/Move/ROCKTHROW.txt | 38 +- PBS/Animations/Converted/Move/ROLLINGKICK.txt | 57 +- PBS/Animations/Converted/Move/SANDATTACK.txt | 987 ++++---- PBS/Animations/Converted/Move/SANDSTORM.txt | 203 +- PBS/Animations/Converted/Move/SCARYFACE.txt | 14 +- PBS/Animations/Converted/Move/SCRATCH.txt | 32 +- PBS/Animations/Converted/Move/SCREECH.txt | 75 +- .../Converted/Move/SELFDESTRUCT.txt | 178 +- PBS/Animations/Converted/Move/SHADOWBALL.txt | 70 +- PBS/Animations/Converted/Move/SIGNALBEAM.txt | 709 +++--- PBS/Animations/Converted/Move/SILVERWIND.txt | 361 +-- PBS/Animations/Converted/Move/SING.txt | 1985 ++++++++++------- PBS/Animations/Converted/Move/SKETCH.txt | 82 +- PBS/Animations/Converted/Move/SLAM.txt | 17 +- PBS/Animations/Converted/Move/SLASH.txt | 67 +- PBS/Animations/Converted/Move/SLEEPPOWDER.txt | 27 +- PBS/Animations/Converted/Move/SLUDGE.txt | 53 +- PBS/Animations/Converted/Move/SLUDGEBOMB.txt | 130 +- PBS/Animations/Converted/Move/SMOG.txt | 22 +- PBS/Animations/Converted/Move/SMOKESCREEN.txt | 144 +- PBS/Animations/Converted/Move/SPIDERWEB.txt | 53 +- PBS/Animations/Converted/Move/SPIKECANNON.txt | 475 ++-- PBS/Animations/Converted/Move/SPIKES.txt | 116 +- PBS/Animations/Converted/Move/SPLASH.txt | 113 +- PBS/Animations/Converted/Move/SPORE.txt | 27 +- PBS/Animations/Converted/Move/STEALTHROCK.txt | 344 ++- PBS/Animations/Converted/Move/STOMP.txt | 23 +- PBS/Animations/Converted/Move/STRINGSHOT.txt | 155 +- PBS/Animations/Converted/Move/STRUGGLE.txt | 83 +- PBS/Animations/Converted/Move/STUNSPORE.txt | 27 +- PBS/Animations/Converted/Move/SUNNYDAY.txt | 13 +- PBS/Animations/Converted/Move/SUPERSONIC.txt | 115 +- PBS/Animations/Converted/Move/SWAGGER.txt | 64 +- PBS/Animations/Converted/Move/SWEETKISS.txt | 95 +- PBS/Animations/Converted/Move/SWIFT.txt | 198 +- PBS/Animations/Converted/Move/SWORDSDANCE.txt | 204 +- PBS/Animations/Converted/Move/TACKLE.txt | 13 +- PBS/Animations/Converted/Move/TAILGLOW.txt | 19 +- PBS/Animations/Converted/Move/TAILWHIP.txt | 60 +- PBS/Animations/Converted/Move/TELEPORT.txt | 92 +- PBS/Animations/Converted/Move/THUNDER.txt | 101 +- PBS/Animations/Converted/Move/THUNDERBOLT.txt | 33 +- PBS/Animations/Converted/Move/THUNDERFANG.txt | 110 +- .../Converted/Move/THUNDERPUNCH.txt | 170 +- .../Converted/Move/THUNDERSHOCK.txt | 26 +- PBS/Animations/Converted/Move/THUNDERWAVE.txt | 75 +- PBS/Animations/Converted/Move/TOXIC.txt | 127 +- PBS/Animations/Converted/Move/TRICKROOM.txt | 39 +- PBS/Animations/Converted/Move/TWINEEDLE.txt | 146 +- PBS/Animations/Converted/Move/TWISTER.txt | 30 +- PBS/Animations/Converted/Move/VINEWHIP.txt | 45 +- PBS/Animations/Converted/Move/WATERGUN.txt | 209 +- PBS/Animations/Converted/Move/WATERPULSE.txt | 74 +- PBS/Animations/Converted/Move/WHIRLWIND.txt | 20 +- PBS/Animations/Converted/Move/WILLOWISP.txt | 87 +- PBS/Animations/Converted/Move/WINGATTACK.txt | 26 +- PBS/Animations/Converted/Move/WRAP.txt | 61 +- PBS/Animations/Converted/Move/WRINGOUT.txt | 90 +- PBS/Animations/Converted/Move/XSCISSOR.txt | 55 +- PBS/Animations/Converted/Move/ZAPCANNON.txt | 20 +- 245 files changed, 22085 insertions(+), 14046 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb index 44dc35ffe..bebc7f231 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb @@ -9,7 +9,7 @@ class UIControls::DropdownList < UIControls::BaseControl TEXT_BOX_WIDTH = 200 TEXT_BOX_HEIGHT = 24 TEXT_BOX_PADDING = 4 # Gap between sides of text box and text - MAX_LIST_ROWS = 8 + MAX_LIST_ROWS = 10 # NOTE: options is a hash: keys are symbols, values are display names. def initialize(width, height, viewport, options, value) @@ -32,6 +32,11 @@ class UIControls::DropdownList < UIControls::BaseControl invalidate end + def values=(new_vals) + @options = new_vals + @dropdown_menu.values = @options if @dropdown_menu + end + def set_interactive_rects @button_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 77bb17568..29972842b 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -14,6 +14,25 @@ module GameData DATA_FILENAME = "animations.dat" OPTIONAL = true + # TODO: All mentions of focus types can be found by searching for + # :user_and_target, plus there's :foreground in PARTICLE_DEFAULT_VALUES + # below. + # TODO: Add :user_ground, :target_ground? + FOCUS_TYPES = { + "Foreground" => :foreground, + "Midground" => :midground, + "Background" => :background, + "User" => :user, + "Target" => :target, + "UserAndTarget" => :user_and_target, + "UserSideForeground" => :user_side_foreground, + "UserSideBackground" => :user_side_background, + "TargetSide" => :target_side_foreground, + "TargetSideBackground" => :target_side_background, + } + FOCUS_TYPES_WITH_TARGET = [ + :target, :user_and_target, :target_side_foreground, :target_side_background + ] INTERPOLATION_TYPES = { "None" => :none, "Linear" => :linear, @@ -21,6 +40,7 @@ module GameData "EaseOut" => :ease_out, "EaseBoth" => :ease_both } + USER_AND_TARGET_SEPARATION = [200, -200, -200] # x, y, z (from user to target) # Properties that apply to the animation in general, not to individual # particles. They don't change during the animation. @@ -49,9 +69,7 @@ module GameData "Graphic" => [:graphic, "s"], # TODO: If more focus types are added, add ones that involve a target to # the Compiler's check relating to "NoTarget". - "Focus" => [:focus, "e", {"User" => :user, "Target" => :target, - "UserAndTarget" => :user_and_target, - "Screen" => :screen}], + "Focus" => [:focus, "e", FOCUS_TYPES], # TODO: FlipIfFoe, RotateIfFoe kinds of thing. # All properties below are "SetXYZ" or "MoveXYZ". "SetXYZ" has the @@ -66,6 +84,8 @@ module GameData "MoveX" => [:x, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], "SetY" => [:y, "^ui"], "MoveY" => [:y, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZ" => [:z, "^ui"], + "MoveZ" => [:z, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], "SetZoomX" => [:zoom_x, "^uu"], "MoveZoomX" => [:zoom_x, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], "SetZoomY" => [:zoom_y, "^uu"], @@ -91,9 +111,6 @@ module GameData "MoveToneBlue" => [:tone_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], "SetToneGray" => [:tone_gray, "^ui"], "MoveToneGray" => [:tone_gray, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - # TODO: SetPriority should be an enum (above all, above user, etc.). There - # should also be a property (set and move) for the sub-priority - # within that priority bracket. # TODO: Add "SetColor"/"SetTone" as shorthand for the above? They'd be # converted in the Compiler. # TODO: Bitmap masking. @@ -112,7 +129,7 @@ module GameData PARTICLE_DEFAULT_VALUES = { :name => "", :graphic => "", - :focus => :screen + :focus => :foreground } # NOTE: Particles are invisible until their first command, and automatically # become visible then. "User" and "Target" are visible from the start, @@ -123,6 +140,7 @@ module GameData :flip => false, :x => 0, :y => 0, + :z => 0, :zoom_x => 100, :zoom_y => 100, :angle => 0, diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index a5fe92709..aeb088893 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -135,7 +135,7 @@ module Compiler case particle[:name] when "User" then particle[:focus] = :user when "Target" then particle[:focus] = :target - else particle[:focus] = :screen + else particle[:focus] = GameData::Animation::PARTICLE_DEFAULT_VALUES[:focus] end end # Ensure user/target particles have a default graphic if not given @@ -145,9 +145,11 @@ module Compiler when "Target" then particle[:graphic] = "TARGET" end end + # TODO: Ensure that particles don't have a focus involving a user if the + # animation itself doesn't involve a user. # Ensure that particles don't have a focus involving a target if the # animation itself doesn't involve a target - if hash[:no_target] && [:target, :user_and_target].include?(particle[:focus]) + if hash[:no_target] && GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a target if property \"NoTarget\" is set to true.", particle[:name]) + "\n" + FileLineData.linereport end diff --git a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb index 17fe78c07..fffe1934a 100644 --- a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb +++ b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb @@ -1,3 +1,6 @@ +# TODO: OppMove animations have their user and target swapped, and will need +# them swapping back. + module AnimationConverter module_function @@ -50,6 +53,7 @@ module AnimationConverter } add_frames_to_new_anim_hash(anim, new_anim) + add_bg_fg_commands_to_new_anim_hash(anim, new_anim) add_se_commands_to_new_anim_hash(anim, new_anim) new_anim[:particles].compact! @@ -60,6 +64,9 @@ module AnimationConverter end def add_frames_to_new_anim_hash(anim, hash) + # Lookup array for particle index using cel index + index_lookup = [] + max_index = -1 # Set up previous frame's values default_frame = [] default_frame[AnimFrame::X] = -999 @@ -77,30 +84,70 @@ module AnimationConverter default_frame[AnimFrame::TONEGREEN] = 0 default_frame[AnimFrame::TONEBLUE] = 0 default_frame[AnimFrame::TONEGRAY] = 0 + default_frame[AnimFrame::PATTERN] = 0 + default_frame[AnimFrame::PRIORITY] = 0 # 0=back, 1=front, 2=behind focus, 3=before focus default_frame[AnimFrame::VISIBLE] = 1 # Boolean default_frame[AnimFrame::MIRROR] = 0 # Boolean default_frame[AnimFrame::FOCUS] = 4 # 1=target, 2=user, 3=user and target, 4=screen + default_frame[99] = anim.graphic + last_frame_values = [] # Go through each frame anim.length.times do |frame_num| frame = anim[frame_num] + had_particles = [] + changed_particles = [] frame.each_with_index do |cel, i| next if !cel + # If the particle from the previous frame for this cel had a different + # focus, start a new particle. + if i > 1 && frame_num > 0 && index_lookup[i] && index_lookup[i] >= 0 && + last_frame_values[index_lookup[i]] + this_graphic = (cel[AnimFrame::PATTERN] == -1) ? "USER" : (cel[AnimFrame::PATTERN] == -2) ? "TARGET" : anim.graphic + if last_frame_values[index_lookup[i]][AnimFrame::FOCUS] != cel[AnimFrame::FOCUS] || + last_frame_values[index_lookup[i]][99] != this_graphic # Graphic + index_lookup[i] = -1 + end + end + # Get the particle index for this cel + if !index_lookup[i] || index_lookup[i] < 0 + max_index += 1 + index_lookup[i] = max_index + end + idx = index_lookup[i] + had_particles.push(idx) # i=0 for "User", i=1 for "Target" - hash[:particles][i] ||= { - :name => "Particle #{i}" - } - particle = hash[:particles][i] - if i == 0 + hash[:particles][idx] ||= { :name => "Particle #{idx}" } + particle = hash[:particles][idx] + last_frame = last_frame_values[idx] || default_frame.clone + # User and target particles have specific names + if idx == 0 particle[:name] = "User" - elsif i == 1 + elsif idx == 1 particle[:name] = "Target" + else + # Set graphic + case cel[AnimFrame::PATTERN] + when -1 # User's sprite + particle[:graphic] = "USER" + last_frame[99] = "USER" + when -2 # Target's sprite + particle[:graphic] = "TARGET" + last_frame[99] = "TARGET" + else + particle[:graphic] = anim.graphic + last_frame[99] = anim.graphic + end + end + # Set focus for non-User/non-Target + if idx > 1 + particle[:focus] = [:foreground, :target, :user, :user_and_target, :foreground][cel[AnimFrame::FOCUS]] + last_frame[AnimFrame::FOCUS] = cel[AnimFrame::FOCUS] end - last_frame = last_frame_values[i] || default_frame.clone # Copy commands across [ [AnimFrame::X, :x], @@ -118,25 +165,182 @@ module AnimationConverter [AnimFrame::TONEGREEN, :tone_green], [AnimFrame::TONEBLUE, :tone_blue], [AnimFrame::TONEGRAY, :tone_gray], + [AnimFrame::PATTERN, :frame], + [AnimFrame::PRIORITY, :z], [AnimFrame::VISIBLE, :visible], # Boolean [AnimFrame::MIRROR, :flip], # Boolean ].each do |property| next if cel[property[0]] == last_frame[property[0]] particle[property[1]] ||= [] val = cel[property[0]].to_i - val = (val == 1) if [:visible, :flip].include?(property[1]) + case property[1] + when :x + # TODO: What if the animation is an OppMove one? I think this should + # be the other way around. + if particle[:focus] == :user_and_target + fraction = (val - Battle::Scene::FOCUSUSER_X).to_f / (Battle::Scene::FOCUSTARGET_X - Battle::Scene::FOCUSUSER_X) + val = (fraction * GameData::Animation::USER_AND_TARGET_SEPARATION[0]).to_i + end + when :y + # TODO: What if the animation is an OppMove one? I think this should + # be the other way around. + if particle[:focus] == :user_and_target + fraction = (val - Battle::Scene::FOCUSUSER_Y).to_f / (Battle::Scene::FOCUSTARGET_Y - Battle::Scene::FOCUSUSER_Y) + val = (fraction * GameData::Animation::USER_AND_TARGET_SEPARATION[1]).to_i + end + when :visible, :flip + val = (val == 1) # Boolean + when :z + next if idx <= 1 # User or target + case val + when 0 then val = -50 + i # Back + when 1 then val = 25 + i # Front + when 2 then val = -25 + i # Behind focus + when 3 then val = i # Before focus + end + when :frame + next if val < 0 # -1 is user, -2 is target + end + # TODO: Come up with a better way to set a particle's graphic being + # the user or target. Probably can't, due to overlapping cel + # numbers and user/target being the :graphic property which + # doesn't change. particle[property[1]].push([frame_num, 0, val]) last_frame[property[0]] = cel[property[0]] - end - # Set graphic - particle[:graphic] = anim.graphic - # Set focus for non-User/non-Target - if i > 1 - particle[:focus] = [:screen, :target, :user, :user_and_target, :screen][cel[AnimFrame::FOCUS]] + changed_particles.push(idx) if !changed_particles.include?(idx) end # Remember this cel's values at this frame - last_frame_values[i] = last_frame + last_frame_values[idx] = last_frame end + # End every particle lifetime that didn't have a corresponding cel this + # frame + hash[:particles].each_with_index do |particle, idx| + next if !particle || had_particles.include?(idx) + next if ["User", "Target"].include?(particle[:name]) + if last_frame_values[idx][AnimFrame::VISIBLE] == 1 + particle[:visible] ||= [] + particle[:visible].push([frame_num, 0, false]) + changed_particles.push(idx) if !changed_particles.include?(idx) + end + last_frame_values[idx][AnimFrame::VISIBLE] = 0 + next if !index_lookup.include?(idx) + lookup_idx = index_lookup.index(idx) + index_lookup[lookup_idx] = -1 + end + # Add a dummy command to the user particle in the last frame if that frame + # doesn't have any commands + if frame_num == anim.length - 1 && changed_particles.empty? + hash[:particles].each_with_index do |particle, idx| + next if !particle || idx <= 1 # User or target + # TODO: Making all non-user non-target particles invisible in the last + # frame isn't a perfect solution, but it's good enough to get + # example animation data. + next if last_frame_values[idx][AnimFrame::VISIBLE] == 0 + particle[:visible] ||= [] + particle[:visible].push([frame_num + 1, 0, false]) + end + end + end + + hash[:particles][0][:focus] = :user + hash[:particles][1][:focus] = :target + + # Adjust all x/y positions based on particle[:focus] + hash[:particles].each do |particle| + next if !particle + offset_x = 0 + offset_y = 0 + case particle[:focus] + when :user + offset_x = -Battle::Scene::FOCUSUSER_X + offset_y = -Battle::Scene::FOCUSUSER_Y + when :target + offset_x = -Battle::Scene::FOCUSTARGET_X + offset_y = -Battle::Scene::FOCUSTARGET_Y + when :user_and_target + # NOTE: No change, done above. + end + next if offset_x == 0 && offset_y == 0 + particle[:x].each { |cmd| cmd[2] += offset_x } + particle[:y].each { |cmd| cmd[2] += offset_y } + end + end + + # TODO: Haven't tested this as no Essentials animations use them. + def add_bg_fg_commands_to_new_anim_hash(anim, new_anim) + bg_particle = { :name => "Background", :focus => :background } + fg_particle = { :name => "Foreground", :focus => :foreground } + first_bg_frame = 999 + first_fg_frame = 999 + anim.timing.each do |cmd| + case cmd.timingType + when 1, 2, 3, 4 # BG graphic (set, move/recolour), FG graphic (set, move/recolour) + is_bg = (cmd.timingType <= 2) + particle = (is_bg) ? bg_particle : fg_particle + duration = (cmd.timingType == 2) ? cmd.duration : 0 + added = false + if cmd.name && cmd.name != "" + particle[:graphic] ||= [] + particle[:graphic].push([cmd.frame, duration, cmd.name]) + added = true + end + if cmd.colorRed + particle[:color_red] ||= [] + particle[:color_red].push([cmd.frame, duration, cmd.colorRed]) + added = true + end + if cmd.colorGreen + particle[:color_green] ||= [] + particle[:color_green].push([cmd.frame, duration, cmd.colorGreen]) + added = true + end + if cmd.colorBlue + particle[:color_blue] ||= [] + particle[:color_blue].push([cmd.frame, duration, cmd.colorBlue]) + added = true + end + if cmd.colorAlpha + particle[:color_alpha] ||= [] + particle[:color_alpha].push([cmd.frame, duration, cmd.colorAlpha]) + added = true + end + if cmd.opacity + particle[:opacity] ||= [] + particle[:opacity].push([cmd.frame, duration, cmd.opacity]) + added = true + end + if cmd.bgX + particle[:x] ||= [] + particle[:x].push([cmd.frame, duration, cmd.bgX]) + added = true + end + if cmd.bgY + particle[:y] ||= [] + particle[:y].push([cmd.frame, duration, cmd.bgY]) + added = true + end + if added + if is_bg + first_bg_frame = [first_bg_frame, cmd.frame].min + else + first_fg_frame = [first_fg_frame, cmd.frame].min + end + end + end + end + if bg_particle.keys.length > 2 + if !bg_particle[:graphic] + particle[:graphic] ||= [] + particle[:graphic].push([first_bg_frame, 0, "black_screen"]) + end + new_anim[:particles].push(bg_particle) + end + if fg_particle.keys.length > 2 + if !fg_particle[:graphic] + particle[:graphic] ||= [] + particle[:graphic].push([first_fg_frame, 0, "black_screen"]) + end + new_anim[:particles].push(fg_particle) end end diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 56dd57c05..7464fa212 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -84,6 +84,7 @@ class AnimationEditor ] def initialize(anim_id, anim) + load_settings @anim_id = anim_id @anim = anim @pbs_path = anim[:pbs_path] @@ -109,11 +110,7 @@ class AnimationEditor # Menu bar @components[:menu_bar] = AnimationEditor::MenuBar.new(0, 0, MENU_BAR_WIDTH, MENU_BAR_HEIGHT, @viewport) # Canvas - @components[:canvas] = AnimationEditor::Canvas.new(@canvas_viewport) - # Play controls - @components[:play_controls] = AnimationEditor::PlayControls.new( - PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, @viewport - ) + @components[:canvas] = AnimationEditor::Canvas.new(@canvas_viewport, @anim, @settings) # Side panes [:commands_pane, :se_pane, :particle_pane, :keyframe_pane].each do |pane| @components[pane] = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) @@ -127,6 +124,10 @@ class AnimationEditor PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport ) @components[:particle_list].set_interactive_rects + # Play controls + @components[:play_controls] = AnimationEditor::PlayControls.new( + PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, @viewport + ) # Animation properties pop-up window @components[:animation_properties] = UIControls::ControlsContainer.new( ANIM_PROPERTIES_X + 4, ANIM_PROPERTIES_Y, ANIM_PROPERTIES_WIDTH - 8, ANIM_PROPERTIES_HEIGHT @@ -200,22 +201,14 @@ class AnimationEditor end def set_canvas_contents - @components[:canvas].bg_name = "indoor1" - end - - def set_play_controls_contents - @components[:play_controls].duration = @components[:particle_list].duration end def set_commands_pane_contents commands_pane = @components[:commands_pane] commands_pane.add_header_label(:header, _INTL("Edit particle at keyframe")) - # :frame (related to graphic) - If the graphic is user's sprite/target's - # sprite, make this instead a choice of front/back/same as the main sprite/ - # opposite of the main sprite. Probably need two controls in the same space - # and refresh_component(:commands_pane) makes the appropriate one visible. - commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -(CANVAS_WIDTH + 128), CANVAS_WIDTH + 128, 0) - commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -(CANVAS_WIDTH + 128), CANVAS_HEIGHT + 128, 0) + commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -200, 200, 0) + commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -200, 200, 0) + commands_pane.add_labelled_number_slider(:z, _INTL("Priority"), -50, 50, 0) # TODO: If the graphic is user's sprite/target's sprite, make :frame instead # a choice of front/back/same as the main sprite/opposite of the main # sprite. Will need two controls in the same space. @@ -232,13 +225,6 @@ class AnimationEditor 2 => _INTL("Subtractive") }, 0) commands_pane.add_labelled_button(:color_tone, _INTL("Color/Tone"), _INTL("Edit")) - # commands_pane.add_labelled_dropdown_list(:priority, _INTL("Priority"), { # TODO: Include sub-priority. - # :behind_all => _INTL("Behind all"), - # :behind_user => _INTL("Behind user"), - # :above_user => _INTL("In front of user"), - # :above_all => _INTL("In front of everything") - # }, :above_user) - # :sub_priority # commands_pane.add_labelled_button(:masking, _INTL("Masking"), _INTL("Edit")) # TODO: Add buttons that shift all commands from the current keyframe and # later forwards/backwards in time? @@ -271,12 +257,7 @@ class AnimationEditor particle_pane.get_control(:name).set_blacklist("User", "Target", "SE") particle_pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") particle_pane.add_labelled_button(:graphic, "", _INTL("Change")) - particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), { - :user => _INTL("User"), - :target => _INTL("Target"), - :user_and_target => _INTL("User and target"), - :screen => _INTL("Screen") - }, :user) + particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :user) # FlipIfFoe # RotateIfFoe # Delete button (if not "User"/"Target"/"SE") @@ -302,6 +283,10 @@ class AnimationEditor @components[:particle_list].set_particles(@anim[:particles]) end + def set_play_controls_contents + @components[:play_controls].duration = @components[:particle_list].duration + end + def set_animation_properties_contents anim_properties = @components[:animation_properties] anim_properties.add_header_label(:header, _INTL("Animation properties")) @@ -386,9 +371,9 @@ class AnimationEditor def set_components_contents set_menu_bar_contents set_canvas_contents - set_play_controls_contents set_side_panes_contents set_particle_list_contents + set_play_controls_contents # Intentionally after set_particle_list_contents set_animation_properties_contents set_graphic_chooser_contents set_audio_chooser_contents @@ -396,6 +381,21 @@ class AnimationEditor #----------------------------------------------------------------------------- + def load_settings + # TODO: Load these from a saved file. + @settings = { + :side_sizes => [1, 1], + :user_index => 0, + :target_indices => [1], + :user_opposes => false, + # TODO: Ideally be able to independently choose base graphics, which will + # be a separate setting here. + :canvas_bg => "indoor1", + :user_sprite_name => "ARCANINE", + :target_sprite_name => "ABOMASNOW" + } + end + def save GameData::Animation.register(@anim, @anim_id) Compiler.write_battle_animation_file(@anim[:pbs_path]) @@ -454,6 +454,7 @@ class AnimationEditor ctrl = @components[:animation_properties].get_control(:move) case @anim[:type] when :move, :opp_move + # TODO: Cache this list? move_list = [] GameData::Move.each { |m| move_list.push([m.id.to_s, m.name]) } move_list.push(["STRUGGLE", _INTL("Struggle")]) if move_list.none? { |val| val[0] == "STRUGGLE" } @@ -467,6 +468,8 @@ class AnimationEditor def refresh_component_values(component_sym) component = @components[component_sym] case component_sym + when :canvas + component.keyframe = keyframe when :commands_pane new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) component.controls.each do |ctrl| @@ -475,8 +478,45 @@ class AnimationEditor # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, # which should be indicated somehow in ctrl[1]. end - # TODO: component.get_control(:frame).disable if the particle's graphic is - # not a spritesheet or is "USER"/"TARGET"/etc. (enable otherwise). + # Set an appropriate range for the X and Y properties depending on the + # particle's focus + case @anim[:particles][particle_index][:focus] + when :foreground, :midground, :background # Cover the whole screen + component.get_control(:x).min_value = -128 + component.get_control(:x).max_value = CANVAS_WIDTH + 128 + component.get_control(:y).min_value = -128 + component.get_control(:y).max_value = CANVAS_HEIGHT + 128 + when :user, :target, :user_side_foreground, :user_side_background, + :target_side_foreground, :target_side_background # Around the focus + component.get_control(:x).min_value = -CANVAS_WIDTH + component.get_control(:x).max_value = CANVAS_WIDTH + component.get_control(:y).min_value = -CANVAS_HEIGHT + component.get_control(:y).max_value = CANVAS_HEIGHT + when :user_and_target # Covers both foci + component.get_control(:x).min_value = -CANVAS_WIDTH + component.get_control(:x).max_value = GameData::Animation::USER_AND_TARGET_SEPARATION[0] + CANVAS_WIDTH + component.get_control(:y).min_value = GameData::Animation::USER_AND_TARGET_SEPARATION[1] - CANVAS_HEIGHT + component.get_control(:y).max_value = CANVAS_HEIGHT + end + # Set an appropriate range for the priority (z) property depending on the + # particle's focus + case @anim[:particles][particle_index][:focus] + when :user_and_target + component.get_control(:z).min_value = GameData::Animation::USER_AND_TARGET_SEPARATION[2] - 50 + component.get_control(:z).max_value = 50 + else + component.get_control(:z).min_value = -50 + component.get_control(:z).max_value = 50 + end + # Disable the "Frame" control if the particle's graphic is predefined to + # be the user's or target's sprite + # TODO: Also disable it if the particle's graphic isn't a spritesheet. + if ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(@anim[:particles][particle_index][:graphic]) + component.get_control(:frame).disable + else + component.get_control(:frame).enable + end when :se_pane se_particle = @anim[:particles].select { |p| p[:name] == "SE" }[0] kyfrm = keyframe @@ -532,8 +572,32 @@ class AnimationEditor component.get_control(:graphic).enable component.get_control(:focus).enable end - # TODO: Set the possible focus options depending on whether the animation - # has a target/user. + # Set the possible foci depending on whether the animation involves a + # target + # TODO: Also filter for user/no user if implemented. + if @anim[:no_target] + component.get_control(:focus).values = { + :foreground => _INTL("Foreground"), + :midground => _INTL("Midground"), + :background => _INTL("Background"), + :user => _INTL("User"), + :user_side_foreground => _INTL("In front of user's side"), + :user_side_background => _INTL("Behind user's side") + } + else + component.get_control(:focus).values = { + :foreground => _INTL("Foreground"), + :midground => _INTL("Midground"), + :background => _INTL("Background"), + :user => _INTL("User"), + :target => _INTL("Target"), + :user_and_target => _INTL("User and target"), + :user_side_foreground => _INTL("In front of user's side"), + :user_side_background => _INTL("Behind user's side"), + :target_side_foreground => _INTL("In front of target's side"), + :target_side_background => _INTL("Behind target's side") + } + end when :animation_properties refresh_move_property_options case @anim[:type] @@ -596,6 +660,7 @@ class AnimationEditor @components[:particle_list].change_particle_commands(particle_index) @components[:play_controls].duration = @components[:particle_list].duration refresh_component(:commands_pane) + refresh_component(:canvas) end when :se_pane case property @@ -651,6 +716,7 @@ class AnimationEditor new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) @components[:particle_list].change_particle(particle_index) refresh_component(:particle_pane) + refresh_component(:canvas) end when :keyframe_pane # TODO: Stuff here once I decide what controls to add. @@ -658,6 +724,8 @@ class AnimationEditor # refresh if keyframe != old_keyframe || particle_index != old_particle_index # TODO: Lots of stuff here when buttons are added to it. when :animation_properties + # TODO: Will changes here need to refresh any other components (e.g. side + # panes)? Probably. case property when :type, :opp_variant type = @components[:animation_properties].get_control(:type).value @@ -669,12 +737,15 @@ class AnimationEditor @anim[:type] = (opp) ? :opp_common : :common end refresh_component(:animation_properties) + refresh_component(:canvas) when :pbs_path txt = value.gsub!(/\.txt$/, "") @anim[property] = txt when :has_target @anim[:no_target] = !value - # TODO: Add/delete the "Target" particle accordingly. + # TODO: Add/delete the "Target" particle accordingly. Then refresh a lot + # of components. + refresh_component(:canvas) when :usable @anim[:ignore] = !value else @@ -704,6 +775,7 @@ class AnimationEditor end component.clear_changed end + # TODO: Call repaint only if component responds to it? Canvas won't. component.repaint if sym == :particle_list || sym == :menu_bar if @captured @captured = nil if !component.busy? diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 30be2bcee..3aa2bb22b 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -34,7 +34,12 @@ module AnimationEditor::ParticleDataHelper next end # In a "MoveXYZ" command; need to interpolate - ret[0] = lerp(ret[0], cmd[2], cmd[1], cmd[0], frame).to_i + case (cmd[3] || :linear) + when :linear + ret[0] = lerp(ret[0], cmd[2], cmd[1], cmd[0], frame).to_i + else + # TODO: Use an appropriate interpolation. + end ret[1] = true # Interpolating break end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index d4d70328a..78854821e 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -1,44 +1,124 @@ #=============================================================================== -# TODO +# NOTE: z values: +# -200 = backdrop. +# -199 = side bases +# -198 = battler shadows. +# 0 +/-50 = background focus, foe side background. +# 900, 800, 700... +/-50 = foe battlers. +# 1000 +/-50 = foe side foreground, player side background. +# 1100, 1200, 1300... +/-50 = player battlers. +# 2000 +/-50 = player side foreground, foreground focus. +# 9999+ = UI + +# TODO: Should the canvas be able to show boxes/faded sprites of particles from +# the previous keyframe? I suppose ideally, but don't worry about it. +# TODO: Battler/particle sprites should be their own class, which combine a +# sprite and a target-dependent coloured frame. Alternatively, have the +# frame be a separate sprite but only draw it around the currently +# selected particle(s). +# TODO: Ideally refresh the canvas while editing a particle's property in the +# :commands_pane component (e.g. moving a number slider but not finalising +# it). Refresh a single particle. I don't think any other side pane needs +# to refresh the canvas in the middle of changing a value. The new value +# of a control in the middle of being changed isn't part of the particle's +# data, so it'll need to be input manually somehow. #=============================================================================== class AnimationEditor::Canvas < Sprite - attr_reader :bg_name + def initialize(viewport, anim, settings) + super(viewport) + @anim = anim + @settings = settings + @keyframe = 0 + @user_coords = [] + @target_coords = [] + @playing = false # TODO: What should this affect? Is it needed? + initialize_background + initialize_battlers + initialize_particle_sprites + refresh + end - def initialize(viewport) - super - @bg_val = "" + def initialize_background + self.z = -200 + # NOTE: The background graphic is self.bitmap. + # TODO: Add second (flipped) background graphic, for screen shake commands. player_base_pos = Battle::Scene.pbBattlerPosition(0) @player_base = IconSprite.new(*player_base_pos, viewport) - @player_base.z = 1 + @player_base.z = -199 foe_base_pos = Battle::Scene.pbBattlerPosition(1) @foe_base = IconSprite.new(*foe_base_pos, viewport) - @foe_base.z = 1 + @foe_base.z = -199 @message_bar_sprite = Sprite.new(viewport) - @message_bar_sprite.z = 999 + @message_bar_sprite.z = 9999 + end + + def initialize_battlers + @battler_sprites = [] + end + + def initialize_particle_sprites + @particle_sprites = [] end def dispose - @message_bar_sprite.dispose + @user_bitmap_front&.dispose + @user_bitmap_back&.dispose + @target_bitmap_front&.dispose + @target_bitmap_back&.dispose @player_base.dispose @foe_base.dispose + @message_bar_sprite.dispose + @battler_sprites.each { |s| s.dispose if s && !s.disposed? } + @battler_sprites.clear + @particle_sprites.each do |s| + if s.is_a?(Array) + s.each { |s2| s2.dispose if s2 && !s2.disposed? } + else + s.dispose if s && !s.disposed? + end + end + @particle_sprites.clear super end - def bg_name=(val) - return if @bg_name == val - @bg_name = val - # TODO: Make the choice of background graphics match the in-battle one in - # def pbCreateBackdropSprites. Ideally make that method a class method - # so the canvas can use it rather than duplicate it. - self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_bg") - @player_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") - @player_base.ox = @player_base.bitmap.width / 2 - @player_base.oy = @player_base.bitmap.height - @foe_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base1") - @foe_base.ox = @foe_base.bitmap.width / 2 - @foe_base.oy = @foe_base.bitmap.height / 2 - @message_bar_sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_message") - @message_bar_sprite.y = Settings::SCREEN_HEIGHT - @message_bar_sprite.height + #----------------------------------------------------------------------------- + + # Returns whether the user is on the foe's (non-player's) side. + def sides_swapped? + return @settings[:user_opposes] || [:opp_move, :opp_common].include?(@anim[:type]) + end + + # index is a battler index (even for player's side, odd for foe's side) + def side_size(index) + side = index % 2 + side = (side + 1) % 2 if sides_swapped? + return @settings[:side_sizes][side] + end + + def user_index + ret = @settings[:user_index] + ret += 1 if sides_swapped? + return ret + end + + def target_indices + ret = @settings[:target_indices].clone + if sides_swapped? + ret.length.times do |i| + ret[i] += (ret[i].even?) ? 1 : -1 + end + end + return ret + end + + def position_empty?(index) + return user_index != index && !target_indices.include?(index) + end + + def keyframe=(val) + return if @keyframe == val || val < 0 + @keyframe = val + refresh end #----------------------------------------------------------------------------- @@ -53,9 +133,304 @@ class AnimationEditor::Canvas < Sprite #----------------------------------------------------------------------------- - def repaint + def prepare_to_play_animation + # TODO: Hide particle sprites, set battler sprites to starting positions so + # that the animation can play properly. Also need a way to end this + # override after the animation finishes playing. This method does not + # literally play the animation; the main editor screen or playback + # control does that. + @playing = true + end + + def end_playing_animation + @playing = false + refresh + end + + #----------------------------------------------------------------------------- + + def refresh_bg_graphics + return if @bg_name && @bg_name == @settings[:canvas_bg] + @bg_name = @settings[:canvas_bg] + # TODO: Make the choice of background graphics match the in-battle one in + # def pbCreateBackdropSprites. Ideally make that method a class method + # so the canvas can use it rather than duplicate it. + self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_bg") + @player_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") + @player_base.ox = @player_base.bitmap.width / 2 + @player_base.oy = @player_base.bitmap.height + @foe_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base1") + @foe_base.ox = @foe_base.bitmap.width / 2 + @foe_base.oy = @foe_base.bitmap.height / 2 + @message_bar_sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_message") + @message_bar_sprite.y = Settings::SCREEN_HEIGHT - @message_bar_sprite.height + end + + # TODO: def refresh_box_display which checks @settings for whether boxes + # should be drawn around sprites. + + # TODO: Create shadow sprites? + def ensure_battler_sprites + if !@side_size0 || @side_size0 != side_size(0) + @battler_sprites.each_with_index { |s, i| s.dispose if i.even? && s && !s.disposed? } + @side_size0 = side_size(0) + @side_size0.times do |i| + next if position_empty?(i * 2) + @battler_sprites[i * 2] = Sprite.new(self.viewport) + end + end + if !@side_size1 || @side_size1 != side_size(1) + @battler_sprites.each_with_index { |s, i| s.dispose if i.odd? && s && !s.disposed? } + @side_size1 = side_size(1) + @side_size1.times do |i| + next if position_empty?((i * 2) + 1) + @battler_sprites[(i * 2) + 1] = Sprite.new(self.viewport) + end + end + end + + def refresh_battler_graphics + if !@user_sprite_name || !@user_sprite_name || @user_sprite_name != @settings[:user_sprite_name] + @user_sprite_name = @settings[:user_sprite_name] + @user_bitmap_front&.dispose + @user_bitmap_back&.dispose + @user_bitmap_front = RPG::Cache.load_bitmap("Graphics/Pokemon/Front/", @user_sprite_name) + @user_bitmap_back = RPG::Cache.load_bitmap("Graphics/Pokemon/Back/", @user_sprite_name) + end + if !@target_bitmap_front || !@target_sprite_name || @target_sprite_name != @settings[:target_sprite_name] + @target_sprite_name = @settings[:target_sprite_name] + @target_bitmap_front&.dispose + @target_bitmap_back&.dispose + @target_bitmap_front = RPG::Cache.load_bitmap("Graphics/Pokemon/Front/", @target_sprite_name) + @target_bitmap_back = RPG::Cache.load_bitmap("Graphics/Pokemon/Back/", @target_sprite_name) + end + end + + def refresh_battler_positions + user_idx = user_index + @user_coords = recalculate_battler_position( + user_idx, side_size(user_idx), @user_sprite_name, + (user_idx.even?) ? @user_bitmap_back : @user_bitmap_front + ) + target_indices.each do |target_idx| + @target_coords[target_idx] = recalculate_battler_position( + target_idx, side_size(target_idx), @target_sprite_name, + (target_idx.even?) ? @target_bitmap_back : @target_bitmap_front + ) + end + end + + def recalculate_battler_position(index, size, sprite_name, btmp) + spr = Sprite.new(self.viewport) + spr.x, spr.y = Battle::Scene.pbBattlerPosition(index, size) + data = GameData::Species.get_species_form(sprite_name, 0) # Form 0 + data.apply_metrics_to_sprite(spr, index) if data + return [spr.x, spr.y - (btmp.height / 2)] + end + + def create_particle_sprite(index, target_idx = -1) + if target_idx >= 0 + if @particle_sprites[index].is_a?(Array) + return if @particle_sprites[index][target_idx] && !@particle_sprites[index][target_idx].disposed? + else + @particle_sprites[index].dispose if @particle_sprites[index] && !@particle_sprites[index].disposed? + @particle_sprites[index] = [] + end + @particle_sprites[index][target_idx] = Sprite.new(self.viewport) + else + if @particle_sprites[index].is_a?(Array) + @particle_sprites[index].each { |s| s.dispose if s && !s.disposed? } + @particle_sprites[index] = nil + else + return if @particle_sprites[index] && !@particle_sprites[index].disposed? + end + @particle_sprites[index] = Sprite.new(self.viewport) + end + end + + def refresh_sprite(index, target_idx = -1) + particle = @anim[:particles][index] + return if !particle + # Get sprite + case particle[:name] + when "SE" + return + when "User" + spr = @battler_sprites[user_index] + raise _INTL("Sprite for particle {1} not found somehow (battler index {2}).", + particle[:name], user_index) if !spr + when "Target" + spr = @battler_sprites[target_idx] + raise _INTL("Sprite for particle {1} not found somehow (battler index {2}).", + particle[:name], target_idx) if !spr + else + create_particle_sprite(index, target_idx) + if target_idx >= 0 + spr = @particle_sprites[index][target_idx] + else + spr = @particle_sprites[index] + end + end + # Calculate all values of particle at the current keyframe + values = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(particle, @keyframe) + values.each_pair do |property, val| + values[property] = val[0] + end + # Set visibility + spr.visible = values[:visible] + return if !spr.visible + # Set opacity + spr.opacity = values[:opacity] + # Set coordinates + spr.x = values[:x] + spr.y = values[:y] + case particle[:focus] + when :foreground, :midground, :background + when :user + spr.x += @user_coords[0] + spr.y += @user_coords[1] + when :target + spr.x += @target_coords[target_idx][0] + spr.y += @target_coords[target_idx][1] + when :user_and_target + user_pos = @user_coords + target_pos = @target_coords[target_idx] + distance = GameData::Animation::USER_AND_TARGET_SEPARATION + spr.x = user_pos[0] + ((values[:x].to_f / distance[0]) * (target_pos[0] - user_pos[0])).to_i + spr.y = user_pos[1] + ((values[:y].to_f / distance[1]) * (target_pos[1] - user_pos[1])).to_i + when :user_side_foreground, :user_side_background + base_coords = Battle::Scene.pbBattlerPosition(target_idx) + spr.x += base_coords[0] + spr.y += base_coords[1] + when :target_side_foreground, :target_side_background + base_coords = Battle::Scene.pbBattlerPosition(target_idx) + spr.x += base_coords[0] + spr.y += base_coords[1] + end + # Set graphic and ox/oy (may also alter y coordinate) + case particle[:graphic] + when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" + case particle[:graphic] + when "USER" + spr.bitmap = (user_index.even?) ? @user_bitmap_back : @user_bitmap_front + when "USER_OPP" + spr.bitmap = (user_index.even?) ? @user_bitmap_front : @user_bitmap_back + when "USER_FRONT" + spr.bitmap = @user_bitmap_front + when "USER_BACK" + spr.bitmap = @user_bitmap_back + when "TARGET" + if target_idx < 0 + raise _INTL("Particle {1} was given a graphic of \"TARGET\" but its focus doesn't include a target.", + particle[:name]) + end + spr.bitmap = (target_idx.even?) ? @target_bitmap_back : @target_bitmap_front + when "TARGET_OPP" + if target_idx < 0 + raise _INTL("Particle {1} was given a graphic of \"TARGET_OPP\" but its focus doesn't include a target.", + particle[:name]) + end + spr.bitmap = (target_idx.even?) ? @target_bitmap_front : @target_bitmap_back + when "TARGET_FRONT" + if target_idx < 0 + raise _INTL("Particle {1} was given a graphic of \"TARGET_FRONT\" but its focus doesn't include a target.", + particle[:name]) + end + spr.bitmap = @target_bitmap_front + when "TARGET_BACK" + if target_idx < 0 + raise _INTL("Particle {1} was given a graphic of \"TARGET_BACK\" but its focus doesn't include a target.", + particle[:name]) + end + spr.bitmap = @target_bitmap_back + end + spr.ox = spr.bitmap.width / 2 + spr.oy = spr.bitmap.height + spr.y += spr.bitmap.height / 2 + else + spr.bitmap = RPG::Cache.load_bitmap("Graphics/Battle animations/", particle[:graphic]) + # TODO: Set the oy to spr.bitmap.height if particle[:graphic] has + # something special in it (don't know what yet). + if spr.bitmap.width > spr.bitmap.height * 2 + spr.src_rect.set(values[:frame] * spr.bitmap.height, 0, spr.bitmap.height, spr.bitmap.height) + spr.ox = spr.bitmap.height / 2 + spr.oy = spr.bitmap.height / 2 + else + spr.src_rect.set(0, 0, spr.bitmap.width, spr.bitmap.height) + spr.ox = spr.bitmap.width / 2 + spr.oy = spr.bitmap.height / 2 + end + end + # Set z (priority) + spr.z = values[:z] + case particle[:focus] + when :foreground + spr.z += 2000 + when :midground + spr.z += 1000 + when :background + # NOTE: No change. + when :user + spr.z += 1000 + ((100 * ((user_index / 2) + 1)) * (user_index.even? ? 1 : -1)) + when :target + spr.z += 1000 + ((100 * ((target_idx / 2) + 1)) * (target_idx.even? ? 1 : -1)) + when :user_and_target + user_pos = 1000 + ((100 * ((user_index / 2) + 1)) * (user_index.even? ? 1 : -1)) + target_pos = 1000 + ((100 * ((target_idx / 2) + 1)) * (target_idx.even? ? 1 : -1)) + distance = GameData::Animation::USER_AND_TARGET_SEPARATION[2] + spr.z = user_pos + ((values[:z].to_f / distance) * (target_pos - user_pos)).to_i + when :user_side_foreground, :target_side_foreground + this_idx = (particle[:focus] == :user_side_foreground) ? user_index : target_idx + spr.z += 1000 + spr.z += 1000 if this_idx.even? # On player's side + when :user_side_background, :target_side_background + this_idx = (particle[:focus] == :user_side_background) ? user_index : target_idx + spr.z += 1000 if this_idx.even? # On player's side + end + # Set various other properties + spr.zoom_x = values[:zoom_x] / 100.0 + spr.zoom_y = values[:zoom_y] / 100.0 + spr.angle = values[:angle] + spr.mirror = values[:flip] + spr.blend_type = values[:blending] + # Set color and tone + spr.color.set(values[:color_red], values[:color_green], values[:color_blue], values[:color_alpha]) + spr.tone.set(values[:tone_red], values[:tone_green], values[:tone_blue], values[:tone_gray]) + end + + def refresh_particle(index) + target_indices.each { |target_idx| refresh_sprite(index, target_idx) } end def refresh + refresh_bg_graphics + ensure_battler_sprites + refresh_battler_graphics + refresh_battler_positions + @battler_sprites.each { |s| s.visible = false if s && !s.disposed? } + @particle_sprites.each do |s| + if s.is_a?(Array) + s.each { |s2| s2.visible = false if s2 && !s2.disposed? } + else + s.visible = false if s && !s.disposed? + end + end + @anim[:particles].each_with_index do |particle, i| + if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + refresh_particle(i) + else + refresh_sprite(i) if particle[:name] != "SE" + end + end + end + + #----------------------------------------------------------------------------- + + # TODO: def update_input. Includes def pbSpriteHitTest equivalent. + + def update + # TODO: Update input (mouse clicks, dragging particles). + # TODO: Keyboard shortcuts? end end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index b99123201..9377d4d58 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -19,10 +19,16 @@ class AnimationEditor::ParticleList < UIControls::BaseControl INTERP_LINE_Y = (ROW_HEIGHT / 2) - (INTERP_LINE_HEIGHT / 2) DURATION_BUFFER = 20 # Extra keyframes shown after the animation's end CONTROL_BG_COLORS = { - :user => Color.new(96, 248, 96), # Green - :target => Color.new(248, 96, 96), # Red - :user_and_target => Color.new(248, 248, 96), # Yellow - :screen => Color.new(128, 160, 248) # Blue + :foreground => Color.new(128, 160, 248), # Blue + :midground => Color.new(128, 160, 248), # Blue + :background => Color.new(128, 160, 248), # Blue + :user => Color.new(96, 248, 96), # Green + :target => Color.new(248, 96, 96), # Red + :user_and_target => Color.new(248, 248, 96), # Yellow + :user_side_foreground => Color.new(128, 248, 248), # Cyan + :user_side_background => Color.new(128, 248, 248), # Cyan + :target_side_foreground => Color.new(128, 248, 248), # Cyan + :target_side_background => Color.new(128, 248, 248) # Cyan } SE_CONTROL_BG = Color.gray diff --git a/PBS/Animations/Converted/Common/Attract.txt b/PBS/Animations/Converted/Common/Attract.txt index 9747de73e..bece8957a 100644 --- a/PBS/Animations/Converted/Common/Attract.txt +++ b/PBS/Animations/Converted/Common/Attract.txt @@ -3,110 +3,130 @@ [Common,Attract] Name = Attract - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poi.hear.mus Focus = Target - SetX = 7,355 - SetY = 7,50 - SetX = 8,341 - SetY = 8,65 - SetX = 9,350 - SetY = 9,67 - SetX = 10,376 - SetY = 10,85 - SetX = 11,361 - SetY = 11,90 - SetX = 12,377 - SetY = 12,74 - SetX = 13,390 - SetY = 13,54 - SetX = 14,404 - SetY = 14,27 - SetY = 15,19 + SetFrame = 7,2 + SetX = 7,-29 + SetY = 7,-46 + SetZ = 7,28 + SetFrame = 8,3 + SetX = 8,-43 + SetY = 8,-31 + SetFrame = 9,4 + SetX = 9,-34 + SetY = 9,-29 + SetX = 10,-8 + SetY = 10,-11 + SetFrame = 11,5 + SetX = 11,-23 + SetY = 11,-6 + SetX = 12,-7 + SetY = 12,-22 + SetX = 13,6 + SetY = 13,-42 + SetX = 14,20 + SetY = 14,-69 + SetY = 15,-77 SetOpacity = 15,192 - SetY = 16,11 + SetY = 16,-85 SetOpacity = 16,128 - SetY = 17,3 + SetY = 17,-93 SetOpacity = 17,64 Graphic = poi.hear.mus Focus = Target - SetX = 8,349 - SetY = 8,50 - SetX = 9,333 - SetY = 9,61 - SetX = 10,350 - SetY = 10,86 - SetX = 11,361 - SetY = 11,88 - SetX = 12,348 - SetY = 12,90 - SetX = 13,353 - SetY = 13,71 - SetX = 14,336 - SetY = 14,50 - SetY = 15,42 + SetFrame = 8,2 + SetX = 8,-35 + SetY = 8,-46 + SetZ = 8,29 + SetX = 9,-51 + SetY = 9,-35 + SetFrame = 10,3 + SetX = 10,-34 + SetY = 10,-10 + SetFrame = 11,4 + SetX = 11,-23 + SetY = 11,-8 + SetFrame = 12,5 + SetX = 12,-36 + SetY = 12,-6 + SetX = 13,-31 + SetY = 13,-25 + SetX = 14,-48 + SetY = 14,-46 + SetY = 15,-54 SetOpacity = 15,192 - SetY = 16,34 + SetY = 16,-62 SetOpacity = 16,128 - SetY = 17,26 + SetY = 17,-70 SetOpacity = 17,64 Graphic = poi.hear.mus Focus = Target - SetX = 12,397 - SetY = 12,93 - SetX = 13,411 - SetY = 13,72 - SetX = 14,412 - SetY = 14,44 - SetX = 15,414 - SetY = 15,40 + SetFrame = 12,2 + SetX = 12,13 + SetY = 12,-3 + SetZ = 12,30 + SetFrame = 13,3 + SetX = 13,27 + SetY = 13,-24 + SetFrame = 14,4 + SetX = 14,28 + SetY = 14,-52 + SetX = 15,30 + SetY = 15,-56 SetOpacity = 15,192 - SetY = 16,32 + SetY = 16,-64 SetOpacity = 16,128 - SetY = 17,24 + SetY = 17,-72 SetOpacity = 17,64 Graphic = poi.hear.mus Focus = Target - SetX = 0,374 - SetY = 0,67 - SetX = 1,407 - SetY = 1,65 - SetX = 2,432 - SetY = 2,60 - SetX = 3,436 - SetY = 3,49 - SetX = 4,415 - SetY = 4,32 - SetX = 5,348 - SetY = 5,36 - SetX = 6,325 - SetY = 6,42 - SetX = 7,308 - SetY = 7,68 - SetX = 8,343 - SetY = 8,79 - SetX = 9,369 - SetY = 9,85 - SetX = 10,376 - SetY = 10,73 - SetX = 11,375 - SetY = 11,64 - SetY = 12,47 - SetY = 13,31 - SetY = 14,7 - SetY = 15,-1 + SetFrame = 0,2 + SetX = 0,-10 + SetY = 0,-29 + SetZ = 0,27 + SetX = 1,23 + SetY = 1,-31 + SetFrame = 2,3 + SetX = 2,48 + SetY = 2,-36 + SetX = 3,52 + SetY = 3,-47 + SetFrame = 4,4 + SetX = 4,31 + SetY = 4,-64 + SetFrame = 5,5 + SetX = 5,-36 + SetY = 5,-60 + SetX = 6,-59 + SetY = 6,-54 + SetX = 7,-76 + SetY = 7,-28 + SetFrame = 8,6 + SetX = 8,-41 + SetY = 8,-17 + SetX = 9,-15 + SetY = 9,-11 + SetX = 10,-8 + SetY = 10,-23 + SetX = 11,-9 + SetY = 11,-32 + SetY = 12,-49 + SetY = 13,-65 + SetY = 14,-89 + SetY = 15,-97 SetOpacity = 15,192 - SetY = 16,-9 + SetY = 16,-105 SetOpacity = 16,128 - SetY = 17,-17 + SetY = 17,-113 SetOpacity = 17,64 Play = 0,infatuated diff --git a/PBS/Animations/Converted/Common/Bind.txt b/PBS/Animations/Converted/Common/Bind.txt index 437798e74..ae16518ad 100644 --- a/PBS/Animations/Converted/Common/Bind.txt +++ b/PBS/Animations/Converted/Common/Bind.txt @@ -3,42 +3,45 @@ [Common,Bind] Name = Bind - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Struggle Focus = Target - SetX = 0,440 - SetY = 0,102 - SetX = 1,480 - SetY = 1,94 - SetX = 2,488 - SetY = 2,102 - SetX = 3,464 - SetY = 3,94 - SetX = 4,432 - SetX = 5,464 - SetX = 6,496 - SetY = 6,102 - SetX = 7,480 + SetFrame = 0,1 + SetX = 0,56 + SetY = 0,6 + SetZ = 0,28 + SetX = 1,96 + SetY = 1,-2 + SetX = 2,104 + SetY = 2,6 + SetX = 3,80 + SetY = 3,-2 + SetX = 4,48 + SetX = 5,80 + SetX = 6,112 + SetY = 6,6 + SetX = 7,96 Graphic = Struggle Focus = Target - SetX = 0,320 - SetY = 0,102 - SetX = 1,288 - SetY = 1,94 - SetX = 2,240 - SetY = 2,102 - SetX = 3,264 - SetY = 3,94 - SetX = 4,296 - SetX = 5,256 - SetX = 6,216 - SetX = 7,264 + SetX = 0,-64 + SetY = 0,6 + SetZ = 0,27 + SetX = 1,-96 + SetY = 1,-2 + SetX = 2,-144 + SetY = 2,6 + SetX = 3,-120 + SetY = 3,-2 + SetX = 4,-88 + SetX = 5,-128 + SetX = 6,-168 + SetX = 7,-120 Play = 0,Slash10,80 Play = 3,Slash10,80 diff --git a/PBS/Animations/Converted/Common/Burn.txt b/PBS/Animations/Converted/Common/Burn.txt index b17827594..b87a2d198 100644 --- a/PBS/Animations/Converted/Common/Burn.txt +++ b/PBS/Animations/Converted/Common/Burn.txt @@ -3,17 +3,27 @@ [Common,Burn] Name = Burn - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Flames Focus = Target - SetX = 0,384 - SetY = 0,96 + SetFrame = 0,2 + SetX = 0,0 + SetY = 0,0 + SetZ = 0,27 SetZoomX = 0,200 SetZoomY = 0,200 + SetFrame = 2,1 + SetFrame = 4,0 + SetFrame = 6,1 + SetFrame = 8,0 + SetFrame = 10,1 + SetFrame = 11,0 + SetFrame = 12,1 + SetFrame = 13,2 Play = 0,Fire2,80 diff --git a/PBS/Animations/Converted/Common/Confusion.txt b/PBS/Animations/Converted/Common/Confusion.txt index 470397831..524811ff7 100644 --- a/PBS/Animations/Converted/Common/Confusion.txt +++ b/PBS/Animations/Converted/Common/Confusion.txt @@ -3,46 +3,63 @@ [Common,Confusion] Name = Confusion - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = confused Focus = Target - SetX = 0,384 - SetY = 0,63 - SetY = 1,64 - SetY = 2,57 - SetX = 3,385 - SetY = 3,63 - SetX = 4,384 - SetY = 4,64 - SetX = 5,388 - SetY = 5,59 - SetX = 6,389 - SetY = 6,57 - SetX = 7,391 - SetX = 8,384 - SetY = 8,55 - SetX = 9,382 - SetY = 9,59 - SetX = 10,396 - SetY = 10,56 - SetX = 11,386 - SetY = 11,53 - SetX = 12,383 - SetX = 13,386 - SetY = 13,52 - SetY = 14,45 - SetX = 15,391 - SetY = 15,42 - SetX = 16,392 - SetY = 16,41 + SetX = 0,0 + SetY = 0,-33 + SetZ = 0,27 + SetFrame = 1,1 + SetY = 1,-32 + SetFrame = 2,2 + SetY = 2,-39 + SetFrame = 3,3 + SetX = 3,1 + SetY = 3,-33 + SetFrame = 4,4 + SetX = 4,0 + SetY = 4,-32 + SetFrame = 5,5 + SetX = 5,4 + SetY = 5,-37 + SetFrame = 6,6 + SetX = 6,5 + SetY = 6,-39 + SetFrame = 7,7 + SetX = 7,7 + SetFrame = 8,8 + SetX = 8,0 + SetY = 8,-41 + SetFrame = 9,9 + SetX = 9,-2 + SetY = 9,-37 + SetFrame = 10,10 + SetX = 10,12 + SetY = 10,-40 + SetFrame = 11,11 + SetX = 11,2 + SetY = 11,-43 + SetFrame = 12,12 + SetX = 12,-1 + SetFrame = 13,13 + SetX = 13,2 + SetY = 13,-44 + SetFrame = 14,14 + SetY = 14,-51 + SetFrame = 15,15 + SetX = 15,7 + SetY = 15,-54 + SetX = 16,8 + SetY = 16,-55 SetOpacity = 16,233 - SetX = 17,394 - SetY = 17,39 + SetX = 17,10 + SetY = 17,-57 SetOpacity = 17,154 + SetVisible = 18,false Play = 0,throw,80 diff --git a/PBS/Animations/Converted/Common/FireSpin.txt b/PBS/Animations/Converted/Common/FireSpin.txt index af05394dc..5355c281d 100644 --- a/PBS/Animations/Converted/Common/FireSpin.txt +++ b/PBS/Animations/Converted/Common/FireSpin.txt @@ -3,110 +3,170 @@ [Common,FireSpin] Name = FireSpin - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,355 - SetY = 0,136 + SetFrame = 0,16 + SetX = 0,-29 + SetY = 0,40 + SetZ = 0,27 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 0,393 - SetY = 0,138 + SetFrame = 0,16 + SetX = 0,9 + SetY = 0,42 + SetZ = 0,28 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 0,428 - SetY = 0,137 + SetFrame = 0,16 + SetX = 0,44 + SetY = 0,41 + SetZ = 0,29 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 1,355 - SetY = 1,121 + SetFrame = 1,16 + SetX = 1,-29 + SetY = 1,25 + SetZ = 1,30 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 1,394 - SetY = 1,123 + SetFrame = 1,16 + SetX = 1,10 + SetY = 1,27 + SetZ = 1,31 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 1,431 - SetY = 1,122 + SetFrame = 1,16 + SetX = 1,47 + SetY = 1,26 + SetZ = 1,32 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 2,359 - SetY = 2,108 + SetFrame = 2,16 + SetX = 2,-25 + SetY = 2,12 + SetZ = 2,33 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 2,395 - SetY = 2,107 + SetFrame = 2,16 + SetX = 2,11 + SetY = 2,11 + SetZ = 2,34 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 2,433 - SetY = 2,105 + SetFrame = 2,16 + SetX = 2,49 + SetY = 2,9 + SetZ = 2,35 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 3,357 - SetY = 3,92 + SetFrame = 3,16 + SetX = 3,-27 + SetY = 3,-4 + SetZ = 3,36 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 3,396 - SetY = 3,91 + SetFrame = 3,16 + SetX = 3,12 + SetY = 3,-5 + SetZ = 3,37 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 3,431 - SetY = 3,89 + SetFrame = 3,16 + SetX = 3,47 + SetY = 3,-7 + SetZ = 3,38 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 4,356 - SetY = 4,77 + SetFrame = 4,16 + SetX = 4,-28 + SetY = 4,-19 + SetZ = 4,39 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 4,397 - SetY = 4,78 + SetFrame = 4,16 + SetX = 4,13 + SetY = 4,-18 + SetZ = 4,40 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 4,435 - SetY = 4,76 + SetFrame = 4,16 + SetX = 4,51 + SetY = 4,-20 + SetZ = 4,41 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 5,355 - SetY = 5,62 + SetFrame = 5,16 + SetX = 5,-29 + SetY = 5,-34 + SetZ = 5,42 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 5,397 - SetY = 5,63 + SetFrame = 5,16 + SetX = 5,13 + SetY = 5,-33 + SetZ = 5,43 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 5,434 - SetY = 5,61 + SetFrame = 5,16 + SetX = 5,50 + SetY = 5,-35 + SetZ = 5,44 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 5,374 - SetY = 5,137 + SetFrame = 5,16 + SetX = 5,-10 + SetY = 5,41 + SetZ = 5,45 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 5,415 - SetY = 5,138 + SetFrame = 5,16 + SetX = 5,31 + SetY = 5,42 + SetZ = 5,46 + SetVisible = 6,false Play = 0,throw,80 diff --git a/PBS/Animations/Converted/Common/Frozen.txt b/PBS/Animations/Converted/Common/Frozen.txt index 92b1bc1a9..81ceb6db3 100644 --- a/PBS/Animations/Converted/Common/Frozen.txt +++ b/PBS/Animations/Converted/Common/Frozen.txt @@ -3,59 +3,94 @@ [Common,Frozen] Name = Frozen - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 016-Ice01 Focus = Target - SetX = 0,328 - SetY = 0,14 - SetX = 1,360 - SetY = 1,30 - SetX = 8,384 - SetY = 8,38 - SetX = 9,440 - SetY = 9,102 - SetX = 10,456 - SetY = 10,134 - SetX = 11,432 - SetY = 11,14 - SetX = 12,456 - SetY = 12,46 - SetX = 13,464 - SetY = 13,94 + SetFrame = 0,6 + SetX = 0,-56 + SetY = 0,-82 + SetZ = 0,28 + SetX = 1,-24 + SetY = 1,-66 + SetFrame = 8,7 + SetX = 8,0 + SetY = 8,-58 + SetX = 9,56 + SetY = 9,6 + SetX = 10,72 + SetY = 10,38 + SetFrame = 11,8 + SetX = 11,48 + SetY = 11,-82 + SetX = 12,72 + SetY = 12,-50 + SetFrame = 13,6 + SetX = 13,80 + SetY = 13,-2 + SetVisible = 14,false Graphic = 016-Ice01 Focus = Target - SetX = 1,384 - SetY = 1,94 + SetFrame = 1,9 + SetX = 1,0 + SetY = 1,-2 + SetZ = 1,29 + SetVisible = 2,false + + Graphic = 016-Ice01 + Focus = Target + SetFrame = 6,11 + SetX = 6,0 + SetY = 6,-2 + SetZ = 6,29 SetOpacity = 6,192 SetOpacity = 7,255 - SetX = 9,432 - SetY = 9,14 - SetX = 10,408 - SetY = 10,54 - SetX = 11,344 - SetY = 11,78 - SetX = 12,328 - SetY = 12,110 - SetX = 13,352 - SetY = 13,142 + SetVisible = 8,false + + Graphic = 016-Ice01 + Focus = Target + SetFrame = 9,8 + SetX = 9,48 + SetY = 9,-82 + SetZ = 9,29 + SetFrame = 10,6 + SetX = 10,24 + SetY = 10,-42 + SetX = 11,-40 + SetY = 11,-18 + SetX = 12,-56 + SetY = 12,14 + SetFrame = 13,7 + SetX = 13,-32 + SetY = 13,46 + SetVisible = 14,false Graphic = 016-Ice01 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetFrame = 0,9 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,10 SetOpacity = 1,128 SetOpacity = 2,255 SetOpacity = 7,192 + SetFrame = 8,11 SetOpacity = 8,255 + SetFrame = 9,12 + SetFrame = 10,10 SetOpacity = 10,100 - SetX = 14,408 - SetY = 14,134 + SetFrame = 11,9 + SetFrame = 12,11 + SetFrame = 13,12 + SetFrame = 14,6 + SetX = 14,24 + SetY = 14,38 SetOpacity = 14,255 Play = 0,Ice5,80 diff --git a/PBS/Animations/Converted/Common/Hail.txt b/PBS/Animations/Converted/Common/Hail.txt index 87b8f9195..2799efa60 100644 --- a/PBS/Animations/Converted/Common/Hail.txt +++ b/PBS/Animations/Converted/Common/Hail.txt @@ -3,28 +3,36 @@ [Common,Hail] Name = Hail - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,7 SetX = 0,37 SetY = 0,26 + SetZ = 0,27 + SetFrame = 1,8 SetX = 1,207 SetY = 1,56 + SetFrame = 2,7 SetX = 2,84 SetY = 2,43 + SetFrame = 3,8 SetX = 3,171 SetY = 3,56 + SetFrame = 4,9 SetX = 4,118 SetY = 4,97 SetX = 5,357 SetY = 5,200 + SetFrame = 6,8 SetX = 6,10 SetY = 6,9 + SetFrame = 7,7 SetX = 7,109 SetY = 7,105 SetX = 8,136 @@ -33,82 +41,87 @@ Name = Hail SetY = 9,208 SetX = 10,136 SetY = 10,107 + SetVisible = 11,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,7 SetX = 0,164 SetY = 0,136 + SetZ = 0,28 SetX = 1,464 SetY = 1,117 - SetX = 3,441 - SetY = 3,241 - SetX = 5,225 - SetY = 5,69 - SetX = 8,180 - SetY = 8,199 - SetX = 9,163 - SetY = 9,99 - SetX = 11,176 - SetY = 11,119 + SetVisible = 2,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,8 SetX = 0,302 SetY = 0,79 + SetZ = 0,29 + SetFrame = 1,9 SetX = 1,201 SetY = 1,204 SetX = 2,228 SetY = 2,98 + SetFrame = 3,8 SetX = 3,278 SetY = 3,164 - SetX = 6,334 - SetY = 6,226 - SetX = 8,444 - SetY = 8,137 - SetX = 9,303 - SetY = 9,240 - SetX = 10,444 - SetY = 10,89 - SetX = 12,474 - SetY = 12,59 + SetVisible = 4,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,9 SetX = 0,440 SetY = 0,194 + SetZ = 0,30 SetX = 1,51 SetY = 1,161 + SetFrame = 2,8 SetX = 2,263 SetY = 2,253 + SetFrame = 3,7 SetX = 3,436 SetY = 3,52 + SetFrame = 4,9 SetX = 4,390 SetY = 4,210 - SetX = 6,465 - SetY = 6,116 - SetX = 7,454 - SetY = 7,82 - SetX = 8,276 - SetY = 8,136 - SetX = 9,465 - SetY = 9,160 - SetX = 10,285 - SetY = 10,105 - SetX = 11,419 - SetY = 11,272 - SetX = 12,230 - SetY = 12,142 + SetVisible = 5,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,9 SetX = 0,362 SetY = 0,252 + SetZ = 0,31 + SetVisible = 1,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,7 SetX = 2,78 SetY = 2,206 + SetZ = 2,31 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 3,9 + SetX = 3,441 + SetY = 3,241 + SetZ = 3,28 + SetVisible = 4,false + + Graphic = weather + Focus = Foreground + SetFrame = 4,9 SetX = 4,259 SetY = 4,87 + SetZ = 4,31 + SetFrame = 5,8 SetX = 5,181 SetY = 5,217 + SetFrame = 6,9 SetX = 6,298 SetY = 6,96 SetX = 7,191 @@ -119,41 +132,144 @@ Name = Hail SetY = 9,93 SetX = 10,82 SetY = 10,240 + SetFrame = 11,7 SetX = 11,489 SetY = 11,96 + SetFrame = 12,9 SetX = 12,198 SetY = 12,28 - + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 4,8 SetX = 4,72 SetY = 4,220 + SetZ = 4,32 + SetVisible = 5,false + + Graphic = weather + Focus = Foreground + SetFrame = 5,9 + SetX = 5,225 + SetY = 5,69 + SetZ = 5,28 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 6,8 + SetX = 6,334 + SetY = 6,226 + SetZ = 6,29 + SetVisible = 7,false + + Graphic = weather + Focus = Foreground + SetFrame = 6,9 + SetX = 6,465 + SetY = 6,116 + SetZ = 6,30 + SetFrame = 7,8 + SetX = 7,454 + SetY = 7,82 + SetX = 8,276 + SetY = 8,136 + SetX = 9,465 + SetY = 9,160 + SetFrame = 10,9 + SetX = 10,285 + SetY = 10,105 + SetFrame = 11,7 + SetX = 11,419 + SetY = 11,272 + SetFrame = 12,8 + SetX = 12,230 + SetY = 12,142 + + Graphic = weather + Focus = Foreground + SetFrame = 6,9 SetX = 6,161 SetY = 6,265 + SetZ = 6,32 SetX = 7,296 SetY = 7,172 - SetX = 11,281 - SetY = 11,268 - SetX = 12,41 - SetY = 12,229 - + SetVisible = 8,false + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 8,8 + SetX = 8,180 + SetY = 8,199 + SetZ = 8,28 + SetX = 9,163 + SetY = 9,99 + SetVisible = 10,false + + Graphic = weather + Focus = Foreground + SetFrame = 8,9 + SetX = 8,444 + SetY = 8,137 + SetZ = 8,29 + SetX = 9,303 + SetY = 9,240 + SetFrame = 10,8 + SetX = 10,444 + SetY = 10,89 + SetVisible = 11,false + + Graphic = weather + Focus = Foreground + SetFrame = 9,9 SetX = 9,28 SetY = 9,57 + SetZ = 9,33 + SetFrame = 10,8 SetX = 10,294 SetY = 10,234 + SetFrame = 11,9 SetX = 11,111 SetY = 11,246 SetX = 12,167 SetY = 12,237 - + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 11,8 + SetX = 11,176 + SetY = 11,119 + SetZ = 11,28 + SetVisible = 12,false + + Graphic = weather + Focus = Foreground + SetFrame = 11,7 + SetX = 11,281 + SetY = 11,268 + SetZ = 11,32 + SetFrame = 12,9 + SetX = 12,41 + SetY = 12,229 + + Graphic = weather + Focus = Foreground + SetFrame = 11,9 SetX = 11,299 SetY = 11,47 - + SetZ = 11,34 + SetVisible = 12,false + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 12,8 + SetX = 12,474 + SetY = 12,59 + SetZ = 12,29 + + Graphic = weather + Focus = Foreground + SetFrame = 12,9 SetX = 12,449 SetY = 12,237 + SetZ = 12,35 diff --git a/PBS/Animations/Converted/Common/HealthDown.txt b/PBS/Animations/Converted/Common/HealthDown.txt index 860bda06f..d4d03ad85 100644 --- a/PBS/Animations/Converted/Common/HealthDown.txt +++ b/PBS/Animations/Converted/Common/HealthDown.txt @@ -3,159 +3,196 @@ [Common,HealthDown] Name = HealthDown - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ! Focus = Target - SetX = 0,334 - SetY = 0,43 + SetFrame = 0,5 + SetX = 0,-50 + SetY = 0,-53 + SetZ = 0,27 SetOpacity = 0,126 SetToneRed = 0,255 SetToneGreen = 0,64 SetToneBlue = 0,-128 - SetY = 1,63 - SetY = 2,83 - SetY = 3,103 - SetY = 4,123 - SetY = 5,143 + SetY = 1,-33 + SetY = 2,-13 + SetY = 3,7 + SetY = 4,27 + SetY = 5,47 SetOpacity = 5,79 - SetY = 6,163 + SetY = 6,67 SetOpacity = 6,32 - SetX = 7,398 - SetY = 7,169 - SetX = 8,383 - SetY = 8,159 - SetX = 9,409 - SetY = 9,188 + SetX = 7,14 + SetY = 7,73 + SetX = 8,-1 + SetY = 8,63 + SetX = 9,25 + SetY = 9,92 + SetVisible = 10,false Graphic = ! Focus = Target - SetX = 1,419 - SetY = 1,64 - SetOpacity = 1,126 - SetToneRed = 1,255 - SetToneGreen = 1,64 - SetToneBlue = 1,-128 - SetY = 2,84 - SetY = 3,104 - SetY = 4,124 - SetY = 5,144 - SetOpacity = 5,79 - SetY = 6,164 - SetOpacity = 6,32 - SetX = 7,368 - SetY = 7,187 - SetX = 8,343 - SetY = 8,178 + SetFrame = 0,5 + SetX = 0,35 + SetY = 0,-52 + SetZ = 0,30 + SetOpacity = 0,126 + SetToneRed = 0,255 + SetToneGreen = 0,64 + SetToneBlue = 0,-128 + SetX = 1,14 + SetY = 1,-47 + SetY = 2,-27 + SetY = 3,-7 + SetY = 4,13 + SetY = 5,33 + SetY = 6,53 + SetOpacity = 6,79 + SetX = 7,-41 + SetY = 7,62 + SetVisible = 8,false Graphic = ! Focus = Target - SetX = 1,406 - SetY = 1,87 + SetFrame = 0,5 + SetX = 0,22 + SetY = 0,-29 + SetZ = 0,33 + SetOpacity = 0,126 + SetToneRed = 0,255 + SetToneGreen = 0,64 + SetToneBlue = 0,-128 + SetX = 1,-16 + SetVisible = 2,false + + Graphic = ! + Focus = Target + SetFrame = 1,5 + SetX = 1,35 + SetY = 1,-32 + SetZ = 1,28 SetOpacity = 1,126 SetToneRed = 1,255 SetToneGreen = 1,64 SetToneBlue = 1,-128 - SetY = 2,107 - SetY = 3,127 - SetY = 4,147 - SetY = 5,167 + SetY = 2,-12 + SetY = 3,8 + SetY = 4,28 + SetY = 5,48 SetOpacity = 5,79 - SetY = 6,187 + SetY = 6,68 SetOpacity = 6,32 - SetX = 7,383 - SetY = 7,139 - SetOpacity = 7,79 - SetX = 8,409 - SetY = 8,168 - - Graphic = ! - Focus = Target - SetX = 0,419 - SetY = 0,44 - SetOpacity = 0,126 - SetToneRed = 0,255 - SetToneGreen = 0,64 - SetToneBlue = 0,-128 - SetX = 1,398 - SetY = 1,49 - SetY = 2,69 - SetY = 3,89 - SetY = 4,109 - SetY = 5,129 - SetY = 6,149 - SetOpacity = 6,79 - SetX = 7,343 - SetY = 7,158 + SetX = 7,-16 + SetY = 7,91 + SetX = 8,-41 + SetY = 8,82 + SetVisible = 9,false Graphic = ! Focus = Target - SetX = 2,368 - SetY = 2,87 - SetOpacity = 2,126 - SetToneRed = 2,255 - SetToneGreen = 2,64 - SetToneBlue = 2,-128 - SetY = 3,107 - SetY = 4,127 - SetY = 5,147 - SetY = 6,167 - SetOpacity = 6,79 - SetX = 7,409 - SetY = 7,148 - SetOpacity = 7,126 + SetFrame = 1,5 + SetX = 1,22 + SetY = 1,-9 + SetZ = 1,29 + SetOpacity = 1,126 + SetToneRed = 1,255 + SetToneGreen = 1,64 + SetToneBlue = 1,-128 + SetY = 2,11 + SetY = 3,31 + SetY = 4,51 + SetY = 5,71 + SetOpacity = 5,79 + SetY = 6,91 + SetOpacity = 6,32 + SetX = 7,-1 + SetY = 7,43 + SetOpacity = 7,79 + SetX = 8,25 + SetY = 8,72 + SetVisible = 9,false Graphic = ! Focus = Target - SetX = 2,383 - SetY = 2,39 + SetFrame = 2,5 + SetX = 2,-16 + SetY = 2,-9 + SetZ = 2,31 SetOpacity = 2,126 SetToneRed = 2,255 SetToneGreen = 2,64 SetToneBlue = 2,-128 - SetY = 3,59 - SetY = 4,79 - SetY = 5,99 - SetY = 6,119 + SetY = 3,11 + SetY = 4,31 + SetY = 5,51 + SetY = 6,71 + SetOpacity = 6,79 + SetX = 7,25 + SetY = 7,52 + SetOpacity = 7,126 + SetVisible = 8,false Graphic = ! Focus = Target - SetX = 0,406 - SetY = 0,67 - SetOpacity = 0,126 - SetToneRed = 0,255 - SetToneGreen = 0,64 - SetToneBlue = 0,-128 - SetX = 1,368 - SetX = 3,343 - SetY = 3,78 - SetY = 4,98 - SetY = 5,118 - SetY = 6,138 + SetFrame = 2,5 + SetX = 2,-1 + SetY = 2,-57 + SetZ = 2,32 + SetOpacity = 2,126 + SetToneRed = 2,255 + SetToneGreen = 2,64 + SetToneBlue = 2,-128 + SetY = 3,-37 + SetY = 4,-17 + SetY = 5,3 + SetY = 6,23 + SetVisible = 7,false Graphic = ! Focus = Target - SetX = 3,409 - SetY = 3,68 + SetFrame = 2,5 + SetX = 2,-41 + SetY = 2,-38 + SetZ = 2,35 + SetOpacity = 2,126 + SetToneRed = 2,255 + SetToneGreen = 2,64 + SetToneBlue = 2,-128 + SetVisible = 3,false + + Graphic = ! + Focus = Target + SetFrame = 3,5 + SetX = 3,-41 + SetY = 3,-18 + SetZ = 3,33 SetOpacity = 3,126 SetToneRed = 3,255 SetToneGreen = 3,64 SetToneBlue = 3,-128 - SetY = 4,88 - SetY = 5,108 - SetY = 6,128 - + SetY = 4,2 + SetY = 5,22 + SetY = 6,42 + SetVisible = 7,false + Graphic = ! Focus = Target - SetX = 2,343 - SetY = 2,58 - SetOpacity = 2,126 - SetToneRed = 2,255 - SetToneGreen = 2,64 - SetToneBlue = 2,-128 + SetFrame = 3,5 + SetX = 3,25 + SetY = 3,-28 + SetZ = 3,34 + SetOpacity = 3,126 + SetToneRed = 3,255 + SetToneGreen = 3,64 + SetToneBlue = 3,-128 + SetY = 4,-8 + SetY = 5,12 + SetY = 6,32 + SetVisible = 7,false Play = 0,decrease,100,140 diff --git a/PBS/Animations/Converted/Common/HealthUp.txt b/PBS/Animations/Converted/Common/HealthUp.txt index 22a50a158..3cbcf564a 100644 --- a/PBS/Animations/Converted/Common/HealthUp.txt +++ b/PBS/Animations/Converted/Common/HealthUp.txt @@ -3,32 +3,54 @@ [Common,HealthUp] Name = HealthUp - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = Target - SetX = 1,432 - SetY = 1,54 - SetX = 10,344 - SetY = 10,70 + SetFrame = 1,10 + SetX = 1,48 + SetY = 1,-42 + SetZ = 1,28 + SetFrame = 3,8 + SetFrame = 5,7 + SetFrame = 7,6 + SetFrame = 9,5 + SetFrame = 10,6 + SetX = 10,-40 + SetY = 10,-26 + SetVisible = 11,false Graphic = leech-seed Focus = Target - SetX = 4,344 - SetY = 4,70 + SetFrame = 4,10 + SetX = 4,-40 + SetY = 4,-26 + SetZ = 4,29 + SetFrame = 6,8 + SetFrame = 8,7 + SetVisible = 10,false Graphic = leech-seed Focus = Target - SetX = 0,392 - SetY = 0,94 - SetX = 10,432 - SetY = 10,54 - SetX = 11,344 - SetY = 11,70 + SetFrame = 0,10 + SetX = 0,8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 2,8 + SetFrame = 4,7 + SetFrame = 6,6 + SetFrame = 8,5 + SetX = 10,48 + SetY = 10,-42 + SetFrame = 11,6 + SetX = 11,-40 + SetY = 11,-26 + SetFrame = 12,5 + SetVisible = 14,false Play = 0,Recovery,75 Play = 2,Recovery,80 diff --git a/PBS/Animations/Converted/Common/LeechSeed.txt b/PBS/Animations/Converted/Common/LeechSeed.txt index eb64a861e..2ea67cb3b 100644 --- a/PBS/Animations/Converted/Common/LeechSeed.txt +++ b/PBS/Animations/Converted/Common/LeechSeed.txt @@ -3,104 +3,177 @@ [Common,LeechSeed] Name = LeechSeed - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 1,339 - SetY = 1,98 - SetX = 2,345 - SetY = 2,154 - SetX = 3,294 - SetY = 3,192 - SetX = 4,236 - SetY = 4,217 - SetX = 5,179 - SetY = 5,230 - SetX = 10,108 - SetY = 10,192 - SetX = 16,147 - SetY = 16,173 - SetX = 17,96 - SetY = 17,230 - SetX = 18,160 - SetY = 18,211 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 2,384 - SetY = 2,98 - SetX = 3,313 - SetY = 3,123 - SetX = 4,256 - SetY = 4,148 - SetX = 5,192 - SetY = 5,179 - SetX = 6,121 - SetY = 6,224 - SetX = 7,134 - SetX = 11,147 - SetY = 11,173 - SetX = 16,96 - SetY = 16,230 - SetX = 17,160 - SetY = 17,211 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 3,371 - SetY = 3,98 - SetX = 4,345 - SetY = 4,148 - SetX = 5,294 - SetY = 5,192 - SetX = 6,243 - SetY = 6,211 - SetX = 7,185 - SetY = 7,224 - SetX = 8,134 - SetX = 12,96 - SetY = 12,230 - SetX = 16,160 - SetY = 16,211 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 4,313 - SetY = 4,104 - SetX = 5,249 - SetY = 5,116 - SetX = 6,179 - SetY = 6,148 - SetX = 13,160 - SetY = 13,211 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 0,384 - SetY = 0,98 - SetY = 1,110 - SetX = 2,275 - SetY = 2,98 - SetX = 3,204 - SetY = 3,123 - SetX = 4,147 - SetY = 4,167 - SetX = 5,134 - SetY = 5,224 - SetX = 7,128 - SetY = 7,186 - SetX = 9,134 - SetY = 9,224 - SetX = 16,108 - SetY = 16,192 - SetX = 17,147 - SetY = 17,173 - SetX = 18,96 - SetY = 18,230 - SetX = 19,160 - SetY = 19,211 + SetFrame = 0,11 + SetX = 0,200 + SetY = 0,-196 + SetZ = 0,27 + SetY = 1,-178 + SetFrame = 2,12 + SetX = 2,114 + SetY = 2,-196 + SetX = 3,59 + SetY = 3,-157 + SetX = 4,14 + SetY = 4,-89 + SetX = 5,4 + SetY = 5,0 + SetVisible = 6,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 1,11 + SetX = 1,164 + SetY = 1,-196 + SetZ = 1,28 + SetFrame = 2,12 + SetX = 2,169 + SetY = 2,-109 + SetX = 3,129 + SetY = 3,-50 + SetX = 4,84 + SetY = 4,-10 + SetX = 5,39 + SetY = 5,9 + SetVisible = 6,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 2,11 + SetX = 2,200 + SetY = 2,-196 + SetZ = 2,29 + SetFrame = 3,12 + SetX = 3,144 + SetY = 3,-157 + SetX = 4,100 + SetY = 4,-118 + SetX = 5,50 + SetY = 5,-70 + SetX = 6,-5 + SetY = 6,0 + SetX = 7,4 + SetVisible = 8,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 3,11 + SetX = 3,189 + SetY = 3,-196 + SetZ = 3,30 + SetFrame = 4,12 + SetX = 4,169 + SetY = 4,-118 + SetX = 5,129 + SetY = 5,-50 + SetX = 6,89 + SetY = 6,-20 + SetX = 7,44 + SetY = 7,0 + SetX = 8,4 + SetVisible = 9,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 4,12 + SetX = 4,144 + SetY = 4,-187 + SetZ = 4,31 + SetX = 5,94 + SetY = 5,-168 + SetX = 6,39 + SetY = 6,-118 + SetVisible = 7,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 7,12 + SetX = 7,0 + SetY = 7,-59 + SetZ = 7,27 + SetVisible = 8,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 9,10 + SetX = 9,4 + SetY = 9,0 + SetZ = 9,27 + SetFrame = 10,8 + SetFrame = 11,7 + SetFrame = 12,6 + SetFrame = 13,5 + SetFrame = 14,10 + SetX = 16,-15 + SetY = 16,-50 + SetX = 17,14 + SetY = 17,-79 + SetX = 18,-25 + SetY = 18,9 + SetX = 19,25 + SetY = 19,-20 + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 10,10 + SetX = 10,-15 + SetY = 10,-50 + SetZ = 10,28 + SetFrame = 11,8 + SetFrame = 12,7 + SetFrame = 13,6 + SetFrame = 14,5 + SetFrame = 15,10 + SetX = 16,14 + SetY = 16,-79 + SetX = 17,-25 + SetY = 17,9 + SetX = 18,25 + SetY = 18,-20 + SetVisible = 19,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 11,10 + SetX = 11,14 + SetY = 11,-79 + SetZ = 11,29 + SetFrame = 12,8 + SetFrame = 13,7 + SetFrame = 14,6 + SetFrame = 15,5 + SetX = 16,-25 + SetY = 16,9 + SetX = 17,25 + SetY = 17,-20 + SetVisible = 18,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 12,10 + SetX = 12,-25 + SetY = 12,9 + SetZ = 12,30 + SetFrame = 13,8 + SetFrame = 14,7 + SetFrame = 15,6 + SetX = 16,25 + SetY = 16,-20 + SetVisible = 17,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 13,10 + SetX = 13,25 + SetY = 13,-20 + SetZ = 13,31 + SetFrame = 14,8 + SetFrame = 15,7 + SetVisible = 16,false diff --git a/PBS/Animations/Converted/Common/Paralysis.txt b/PBS/Animations/Converted/Common/Paralysis.txt index a8d2838ff..e9ecffd08 100644 --- a/PBS/Animations/Converted/Common/Paralysis.txt +++ b/PBS/Animations/Converted/Common/Paralysis.txt @@ -3,51 +3,66 @@ [Common,Paralysis] Name = Paralysis - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Struggle Focus = Target - SetX = 1,424 - SetY = 1,102 - SetX = 2,456 - SetY = 2,86 - SetX = 3,440 - SetX = 4,336 - SetX = 5,408 - SetY = 5,110 - SetX = 6,280 - SetY = 6,102 - SetX = 7,424 - SetX = 8,456 - SetY = 8,86 - SetX = 9,440 - SetX = 10,336 - SetX = 11,408 - SetY = 11,110 + SetFrame = 1,1 + SetX = 1,40 + SetY = 1,6 + SetZ = 1,28 + SetX = 2,72 + SetY = 2,-10 + SetX = 3,56 + SetFrame = 4,0 + SetX = 4,-48 + SetFrame = 5,1 + SetX = 5,24 + SetY = 5,14 + SetFrame = 6,0 + SetX = 6,-104 + SetY = 6,6 + SetFrame = 7,1 + SetX = 7,40 + SetX = 8,72 + SetY = 8,-10 + SetX = 9,56 + SetFrame = 10,0 + SetX = 10,-48 + SetFrame = 11,1 + SetX = 11,24 + SetY = 11,14 Graphic = Struggle Focus = Target - SetX = 1,336 - SetY = 1,94 - SetX = 2,304 - SetY = 2,78 - SetX = 3,328 - SetY = 3,94 - SetX = 4,448 - SetX = 5,312 - SetX = 6,456 - SetY = 6,86 - SetX = 7,336 - SetY = 7,94 - SetX = 8,304 - SetY = 8,78 - SetX = 9,328 - SetY = 9,94 - SetX = 10,448 - SetX = 11,312 + SetX = 1,-48 + SetY = 1,-2 + SetZ = 1,27 + SetX = 2,-80 + SetY = 2,-18 + SetX = 3,-56 + SetY = 3,-2 + SetFrame = 4,1 + SetX = 4,64 + SetFrame = 5,0 + SetX = 5,-72 + SetFrame = 6,1 + SetX = 6,72 + SetY = 6,-10 + SetFrame = 7,0 + SetX = 7,-48 + SetY = 7,-2 + SetX = 8,-80 + SetY = 8,-18 + SetX = 9,-56 + SetY = 9,-2 + SetFrame = 10,1 + SetX = 10,64 + SetFrame = 11,0 + SetX = 11,-72 Play = 0,Paralyze3,80 diff --git a/PBS/Animations/Converted/Common/ParentalBond.txt b/PBS/Animations/Converted/Common/ParentalBond.txt index 09b0120f9..1cd8121fc 100644 --- a/PBS/Animations/Converted/Common/ParentalBond.txt +++ b/PBS/Animations/Converted/Common/ParentalBond.txt @@ -3,16 +3,17 @@ [Common,ParentalBond] Name = ParentalBond - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Tackle_B Focus = Target - SetX = 2,384 - SetY = 2,99 + SetX = 2,0 + SetY = 2,3 + SetZ = 2,27 SetOpacity = 2,150 SetOpacity = 3,255 SetOpacity = 8,150 diff --git a/PBS/Animations/Converted/Common/Poison.txt b/PBS/Animations/Converted/Common/Poison.txt index 4d9ec2ac2..169f19cf9 100644 --- a/PBS/Animations/Converted/Common/Poison.txt +++ b/PBS/Animations/Converted/Common/Poison.txt @@ -3,15 +3,29 @@ [Common,Poison] Name = Poison - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = State1 Focus = Target - SetX = 1,384 - SetY = 1,86 + SetX = 1,0 + SetY = 1,-10 + SetZ = 1,27 + SetFrame = 2,1 + SetFrame = 3,2 + SetFrame = 4,3 + SetFrame = 5,4 + SetFrame = 6,5 + SetFrame = 7,6 + SetFrame = 8,7 + SetFrame = 9,8 + SetFrame = 10,9 + SetFrame = 11,10 + SetFrame = 12,11 + SetFrame = 13,12 + SetFrame = 14,13 Play = 0,Poison,80 diff --git a/PBS/Animations/Converted/Common/Rain.txt b/PBS/Animations/Converted/Common/Rain.txt index b129b9457..ec19e6455 100644 --- a/PBS/Animations/Converted/Common/Rain.txt +++ b/PBS/Animations/Converted/Common/Rain.txt @@ -3,16 +3,18 @@ [Common,Rain] Name = Rain - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,197 SetY = 0,25 + SetZ = 0,27 SetX = 1,72 SetY = 1,49 SetX = 2,60 @@ -32,9 +34,11 @@ Name = Rain SetY = 9,55 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,275 SetY = 0,47 + SetZ = 0,28 SetX = 1,229 SetY = 1,216 SetX = 2,193 @@ -55,9 +59,11 @@ Name = Rain SetY = 9,148 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,355 SetY = 0,51 + SetZ = 0,29 SetX = 1,109 SetY = 1,217 SetX = 2,265 @@ -78,9 +84,11 @@ Name = Rain SetY = 9,274 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,450 SetY = 0,50 + SetZ = 0,30 SetX = 1,223 SetY = 1,110 SetX = 2,228 @@ -101,9 +109,11 @@ Name = Rain SetY = 9,243 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,83 SetY = 0,81 + SetZ = 0,31 SetX = 1,399 SetY = 1,120 SetX = 2,350 @@ -124,9 +134,11 @@ Name = Rain SetY = 9,238 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,231 SetY = 0,170 + SetZ = 0,32 SetX = 1,480 SetY = 1,83 SetX = 2,399 @@ -147,9 +159,11 @@ Name = Rain SetY = 9,245 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,352 SetY = 0,212 + SetZ = 0,33 SetX = 1,362 SetY = 1,63 SetX = 2,488 @@ -170,9 +184,11 @@ Name = Rain SetY = 9,205 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,467 SetY = 0,254 + SetZ = 0,34 SetX = 1,376 SetY = 1,192 SetX = 2,434 @@ -193,9 +209,11 @@ Name = Rain SetY = 9,25 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 1,2 SetX = 1,482 SetY = 1,244 + SetZ = 1,35 SetX = 2,121 SetY = 2,249 SetX = 3,382 @@ -204,36 +222,78 @@ Name = Rain SetY = 4,150 SetX = 5,422 SetY = 5,252 - SetX = 7,471 - SetY = 7,126 - SetX = 9,247 - SetY = 9,72 + SetVisible = 6,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 2,2 SetX = 2,27 SetY = 2,241 + SetZ = 2,36 SetX = 3,88 SetY = 3,177 SetX = 4,337 SetY = 4,243 SetX = 5,319 SetY = 5,241 - SetX = 7,363 - SetY = 7,237 - SetX = 9,365 - SetY = 9,42 + SetVisible = 6,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 4,2 SetX = 4,409 SetY = 4,203 - SetX = 7,443 - SetY = 7,194 - SetX = 9,479 - SetY = 9,180 + SetZ = 4,37 + SetVisible = 5,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 7,2 + SetX = 7,471 + SetY = 7,126 + SetZ = 7,35 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,2 + SetX = 7,363 + SetY = 7,237 + SetZ = 7,36 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,2 + SetX = 7,443 + SetY = 7,194 + SetZ = 7,37 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 + SetX = 9,247 + SetY = 9,72 + SetZ = 9,35 + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 + SetX = 9,365 + SetY = 9,42 + SetZ = 9,36 + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 + SetX = 9,479 + SetY = 9,180 + SetZ = 9,37 + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 SetX = 9,474 SetY = 9,41 + SetZ = 9,38 diff --git a/PBS/Animations/Converted/Common/Sandstorm.txt b/PBS/Animations/Converted/Common/Sandstorm.txt index 053a308aa..6c681a450 100644 --- a/PBS/Animations/Converted/Common/Sandstorm.txt +++ b/PBS/Animations/Converted/Common/Sandstorm.txt @@ -3,16 +3,18 @@ [Common,Sandstorm] Name = Sandstorm - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,-350 SetY = 0,-30 + SetZ = 0,27 SetX = 1,153 SetY = 1,62 SetX = 2,-350 @@ -33,9 +35,11 @@ Name = Sandstorm SetY = 9,252 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,31 SetY = 0,69 + SetZ = 0,28 SetX = 1,56 SetY = 1,85 SetX = 2,31 @@ -56,9 +60,11 @@ Name = Sandstorm SetY = 9,175 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,156 SetY = 0,106 + SetZ = 0,29 SetX = 1,74 SetY = 1,223 SetX = 2,156 @@ -79,9 +85,11 @@ Name = Sandstorm SetY = 9,267 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,165 SetY = 0,220 + SetZ = 0,30 SetX = 1,220 SetY = 1,207 SetX = 2,165 @@ -102,9 +110,11 @@ Name = Sandstorm SetY = 9,197 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,267 SetY = 0,178 + SetZ = 0,31 SetX = 1,352 SetY = 1,253 SetX = 2,267 @@ -125,9 +135,11 @@ Name = Sandstorm SetY = 9,82 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,309 SetY = 0,248 + SetZ = 0,32 SetX = 1,464 SetY = 1,227 SetX = 2,309 @@ -148,9 +160,11 @@ Name = Sandstorm SetY = 9,61 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,388 SetY = 0,142 + SetZ = 0,33 SetX = 1,484 SetY = 1,76 SetX = 2,388 @@ -171,9 +185,11 @@ Name = Sandstorm SetY = 9,158 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,448 SetY = 0,243 + SetZ = 0,34 SetX = 1,378 SetY = 1,130 SetX = 2,448 @@ -194,9 +210,11 @@ Name = Sandstorm SetY = 9,240 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,35 SetY = 0,216 + SetZ = 0,35 SetX = 1,285 SetY = 1,142 SetX = 2,35 @@ -217,9 +235,11 @@ Name = Sandstorm SetY = 9,206 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,276 SetY = 0,34 + SetZ = 0,36 SetX = 1,316 SetY = 1,22 SetX = 2,276 @@ -240,35 +260,154 @@ Name = Sandstorm SetY = 9,64 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,487 SetY = 0,32 - SetX = 4,358 - SetY = 4,16 - SetX = 5,487 - SetY = 5,32 - SetX = 9,311 - SetY = 9,55 + SetZ = 0,37 + SetVisible = 1,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,492 SetY = 0,135 - SetX = 4,267 - SetY = 4,63 - SetX = 5,492 - SetY = 5,135 - SetX = 9,328 - SetY = 9,146 + SetZ = 0,38 + SetVisible = 1,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,387 SetY = 0,18 - SetX = 9,251 - SetY = 9,305 + SetZ = 0,39 + SetVisible = 1,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,148 SetY = 0,9 + SetZ = 0,40 + SetVisible = 1,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,487 + SetY = 2,32 + SetZ = 2,37 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,492 + SetY = 2,135 + SetZ = 2,38 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,387 + SetY = 2,18 + SetZ = 2,39 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,148 + SetY = 2,9 + SetZ = 2,40 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 4,3 + SetX = 4,358 + SetY = 4,16 + SetZ = 4,37 + SetX = 5,487 + SetY = 5,32 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 4,3 + SetX = 4,267 + SetY = 4,63 + SetZ = 4,38 + SetX = 5,492 + SetY = 5,135 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 5,3 + SetX = 5,387 + SetY = 5,18 + SetZ = 5,39 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 5,3 + SetX = 5,148 + SetY = 5,9 + SetZ = 5,40 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,487 + SetY = 7,32 + SetZ = 7,37 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,492 + SetY = 7,135 + SetZ = 7,38 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,387 + SetY = 7,18 + SetZ = 7,39 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,148 + SetY = 7,9 + SetZ = 7,40 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 9,3 + SetX = 9,311 + SetY = 9,55 + SetZ = 9,37 + + Graphic = weather + Focus = Foreground + SetFrame = 9,3 + SetX = 9,328 + SetY = 9,146 + SetZ = 9,38 + + Graphic = weather + Focus = Foreground + SetFrame = 9,3 + SetX = 9,251 + SetY = 9,305 + SetZ = 9,39 diff --git a/PBS/Animations/Converted/Common/Shadow.txt b/PBS/Animations/Converted/Common/Shadow.txt index 5728bd3eb..26501b2e7 100644 --- a/PBS/Animations/Converted/Common/Shadow.txt +++ b/PBS/Animations/Converted/Common/Shadow.txt @@ -3,64 +3,83 @@ [Common,Shadow] Name = Shadow - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = Target - SetX = 2,440 - SetY = 2,126 - SetX = 4,296 - SetY = 4,86 - SetX = 6,360 - SetY = 6,110 - SetX = 7,416 - SetY = 7,54 - SetX = 8,368 - SetY = 8,22 - SetX = 9,416 - SetY = 9,118 + SetFrame = 2,5 + SetX = 2,56 + SetY = 2,30 + SetZ = 2,28 + SetFrame = 3,6 + SetX = 4,-88 + SetY = 4,-10 + SetFrame = 5,7 + SetX = 6,-24 + SetY = 6,14 + SetX = 7,32 + SetY = 7,-42 + SetX = 8,-16 + SetY = 8,-74 + SetX = 9,32 + SetY = 9,22 + SetVisible = 10,false Graphic = leech-seed Focus = Target - SetX = 3,296 - SetY = 3,86 - SetX = 4,360 - SetY = 4,110 - SetX = 6,416 - SetY = 6,54 - SetX = 7,368 - SetY = 7,22 - SetX = 8,416 - SetY = 8,118 + SetFrame = 3,5 + SetX = 3,-88 + SetY = 3,-10 + SetZ = 3,29 + SetX = 4,-24 + SetY = 4,14 + SetFrame = 5,6 + SetX = 6,32 + SetY = 6,-42 + SetX = 7,-16 + SetY = 7,-74 + SetX = 8,32 + SetY = 8,22 + SetVisible = 9,false Graphic = leech-seed Focus = Target - SetX = 5,416 - SetY = 5,54 - SetX = 6,368 - SetY = 6,22 - SetX = 7,416 - SetY = 7,118 + SetFrame = 5,5 + SetX = 5,32 + SetY = 5,-42 + SetZ = 5,30 + SetX = 6,-16 + SetY = 6,-74 + SetX = 7,32 + SetY = 7,22 + SetVisible = 8,false Graphic = leech-seed Focus = Target - SetX = 0,360 - SetY = 0,110 - SetX = 4,440 - SetY = 4,126 - SetX = 6,296 - SetY = 6,86 - SetX = 7,344 - SetY = 7,142 - SetX = 8,416 - SetY = 8,54 - SetX = 9,368 - SetY = 9,22 - SetX = 10,416 - SetY = 10,118 + SetFrame = 0,5 + SetX = 0,-24 + SetY = 0,14 + SetZ = 0,27 + SetFrame = 1,6 + SetFrame = 2,7 + SetFrame = 3,8 + SetFrame = 4,7 + SetX = 4,56 + SetY = 4,30 + SetFrame = 5,8 + SetX = 6,-88 + SetY = 6,-10 + SetX = 7,-40 + SetY = 7,46 + SetX = 8,32 + SetY = 8,-42 + SetX = 9,-16 + SetY = 9,-74 + SetX = 10,32 + SetY = 10,22 Play = 0,Saint6,75 diff --git a/PBS/Animations/Converted/Common/ShadowSky.txt b/PBS/Animations/Converted/Common/ShadowSky.txt index a42b68bb6..2905db533 100644 --- a/PBS/Animations/Converted/Common/ShadowSky.txt +++ b/PBS/Animations/Converted/Common/ShadowSky.txt @@ -3,16 +3,18 @@ [Common,ShadowSky] Name = ShadowSky - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,10 SetX = 0,258 SetY = 0,132 + SetZ = 0,27 SetZoomX = 0,327 SetZoomY = 0,242 SetOpacity = 0,128 diff --git a/PBS/Animations/Converted/Common/Shiny.txt b/PBS/Animations/Converted/Common/Shiny.txt index 62b3758ed..8f7b3a289 100644 --- a/PBS/Animations/Converted/Common/Shiny.txt +++ b/PBS/Animations/Converted/Common/Shiny.txt @@ -3,64 +3,83 @@ [Common,Shiny] Name = Shiny - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = Target - SetX = 2,440 - SetY = 2,126 - SetX = 4,327 - SetY = 4,78 - SetX = 6,366 - SetY = 6,129 - SetX = 7,416 - SetY = 7,54 - SetX = 8,368 - SetY = 8,67 - SetX = 9,416 - SetY = 9,118 + SetFrame = 2,5 + SetX = 2,56 + SetY = 2,30 + SetZ = 2,28 + SetFrame = 3,6 + SetX = 4,-57 + SetY = 4,-18 + SetFrame = 5,7 + SetX = 6,-18 + SetY = 6,33 + SetX = 7,32 + SetY = 7,-42 + SetX = 8,-16 + SetY = 8,-29 + SetX = 9,32 + SetY = 9,22 + SetVisible = 10,false Graphic = leech-seed Focus = Target - SetX = 3,327 - SetY = 3,78 - SetX = 4,366 - SetY = 4,129 - SetX = 6,416 - SetY = 6,54 - SetX = 7,368 - SetY = 7,67 - SetX = 8,416 - SetY = 8,118 + SetFrame = 3,5 + SetX = 3,-57 + SetY = 3,-18 + SetZ = 3,29 + SetX = 4,-18 + SetY = 4,33 + SetFrame = 5,6 + SetX = 6,32 + SetY = 6,-42 + SetX = 7,-16 + SetY = 7,-29 + SetX = 8,32 + SetY = 8,22 + SetVisible = 9,false Graphic = leech-seed Focus = Target - SetX = 5,416 - SetY = 5,54 - SetX = 6,368 - SetY = 6,67 - SetX = 7,416 - SetY = 7,118 + SetFrame = 5,5 + SetX = 5,32 + SetY = 5,-42 + SetZ = 5,30 + SetX = 6,-16 + SetY = 6,-29 + SetX = 7,32 + SetY = 7,22 + SetVisible = 8,false Graphic = leech-seed Focus = Target - SetX = 0,360 - SetY = 0,110 - SetX = 4,440 - SetY = 4,126 - SetX = 6,327 - SetY = 6,78 - SetX = 7,366 - SetY = 7,129 - SetX = 8,416 - SetY = 8,54 - SetX = 9,368 - SetY = 9,67 - SetX = 10,416 - SetY = 10,118 + SetFrame = 0,5 + SetX = 0,-24 + SetY = 0,14 + SetZ = 0,27 + SetFrame = 1,6 + SetFrame = 2,7 + SetFrame = 3,8 + SetFrame = 4,7 + SetX = 4,56 + SetY = 4,30 + SetFrame = 5,8 + SetX = 6,-57 + SetY = 6,-18 + SetX = 7,-18 + SetY = 7,33 + SetX = 8,32 + SetY = 8,-42 + SetX = 9,-16 + SetY = 9,-29 + SetX = 10,32 + SetY = 10,22 Play = 0,Shiny sparkle diff --git a/PBS/Animations/Converted/Common/Sleep.txt b/PBS/Animations/Converted/Common/Sleep.txt index 2b723ec04..fa28516c5 100644 --- a/PBS/Animations/Converted/Common/Sleep.txt +++ b/PBS/Animations/Converted/Common/Sleep.txt @@ -3,65 +3,89 @@ [Common,Sleep] Name = Sleep - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 028-State01 Focus = Target - SetX = 3,424 - SetY = 3,54 + SetFrame = 3,8 + SetX = 3,40 + SetY = 3,-42 + SetZ = 3,28 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,376 - SetY = 4,78 - SetX = 5,352 - SetY = 5,94 - SetX = 6,366 - SetY = 6,48 - SetX = 7,361 - SetY = 7,34 - SetX = 8,432 - SetY = 8,70 - SetX = 9,441 - SetY = 9,54 - SetX = 10,452 - SetY = 10,38 - SetX = 11,463 - SetY = 11,20 + SetX = 4,-8 + SetY = 4,-18 + SetX = 5,-32 + SetY = 5,-2 + SetX = 6,-18 + SetY = 6,-48 + SetX = 7,-23 + SetY = 7,-62 + SetX = 8,48 + SetY = 8,-26 + SetX = 9,57 + SetY = 9,-42 + SetX = 10,68 + SetY = 10,-58 + SetX = 11,79 + SetY = 11,-76 Graphic = 028-State01 Focus = Target - SetX = 5,370 - SetY = 5,64 + SetFrame = 4,8 + SetX = 4,47 + SetY = 4,-55 + SetZ = 4,27 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetX = 5,52 + SetY = 5,-67 + SetX = 6,-41 + SetY = 6,-17 + SetX = 7,-50 + SetY = 7,-30 + SetX = 8,-59 + SetY = 8,-43 + SetX = 9,-67 + SetY = 9,-57 + SetX = 10,-75 + SetY = 10,-71 + SetVisible = 11,false + + Graphic = 028-State01 + Focus = Target + SetFrame = 5,8 + SetX = 5,-14 + SetY = 5,-32 + SetZ = 5,29 SetZoomX = 5,50 SetZoomY = 5,50 - SetX = 7,424 - SetY = 7,86 + SetVisible = 6,false + + Graphic = 028-State01 + Focus = Target + SetFrame = 7,8 + SetX = 7,40 + SetY = 7,-10 + SetZ = 7,29 + SetZoomX = 7,50 + SetZoomY = 7,50 + SetVisible = 8,false Graphic = 028-State01 Focus = Target - SetX = 1,408 - SetY = 1,78 + SetFrame = 1,8 + SetX = 1,24 + SetY = 1,-18 + SetZ = 1,27 SetZoomX = 1,50 SetZoomY = 1,50 - SetX = 2,416 - SetY = 2,67 - SetX = 4,431 - SetY = 4,41 - SetX = 5,436 - SetY = 5,29 - SetX = 6,343 - SetY = 6,79 - SetX = 7,334 - SetY = 7,66 - SetX = 8,325 - SetY = 8,53 - SetX = 9,317 - SetY = 9,39 - SetX = 10,309 - SetY = 10,25 + SetX = 2,32 + SetY = 2,-29 + SetVisible = 3,false Play = 0,Sleep,80 diff --git a/PBS/Animations/Converted/Common/StatDown.txt b/PBS/Animations/Converted/Common/StatDown.txt index a48003d48..1911e8b2b 100644 --- a/PBS/Animations/Converted/Common/StatDown.txt +++ b/PBS/Animations/Converted/Common/StatDown.txt @@ -3,132 +3,166 @@ [Common,StatDown] Name = StatDown - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ! Focus = Target - SetX = 0,334 - SetY = 0,43 + SetFrame = 0,5 + SetX = 0,-50 + SetY = 0,-53 + SetZ = 0,27 SetOpacity = 0,126 - SetY = 1,63 - SetY = 2,83 - SetY = 3,103 - SetY = 4,123 - SetY = 5,143 + SetY = 1,-33 + SetY = 2,-13 + SetY = 3,7 + SetY = 4,27 + SetY = 5,47 SetOpacity = 5,79 - SetY = 6,163 + SetY = 6,67 SetOpacity = 6,32 - SetX = 7,398 - SetY = 7,169 - SetX = 8,383 - SetY = 8,159 - SetX = 9,409 - SetY = 9,188 + SetX = 7,14 + SetY = 7,73 + SetX = 8,-1 + SetY = 8,63 + SetX = 9,25 + SetY = 9,92 + SetVisible = 10,false Graphic = ! Focus = Target - SetX = 1,419 - SetY = 1,64 - SetOpacity = 1,126 - SetY = 2,84 - SetY = 3,104 - SetY = 4,124 - SetY = 5,144 - SetOpacity = 5,79 - SetY = 6,164 - SetOpacity = 6,32 - SetX = 7,368 - SetY = 7,187 - SetX = 8,343 - SetY = 8,178 + SetFrame = 0,5 + SetX = 0,35 + SetY = 0,-52 + SetZ = 0,30 + SetOpacity = 0,126 + SetX = 1,14 + SetY = 1,-47 + SetY = 2,-27 + SetY = 3,-7 + SetY = 4,13 + SetY = 5,33 + SetY = 6,53 + SetOpacity = 6,79 + SetX = 7,-41 + SetY = 7,62 + SetVisible = 8,false Graphic = ! Focus = Target - SetX = 1,406 - SetY = 1,87 - SetOpacity = 1,126 - SetY = 2,107 - SetY = 3,127 - SetY = 4,147 - SetY = 5,167 - SetOpacity = 5,79 - SetY = 6,187 - SetOpacity = 6,32 - SetX = 7,383 - SetY = 7,139 - SetOpacity = 7,79 - SetX = 8,409 - SetY = 8,168 + SetFrame = 0,5 + SetX = 0,22 + SetY = 0,-29 + SetZ = 0,33 + SetOpacity = 0,126 + SetX = 1,-16 + SetVisible = 2,false Graphic = ! Focus = Target - SetX = 0,419 - SetY = 0,44 - SetOpacity = 0,126 - SetX = 1,398 - SetY = 1,49 - SetY = 2,69 - SetY = 3,89 - SetY = 4,109 - SetY = 5,129 - SetY = 6,149 - SetOpacity = 6,79 - SetX = 7,343 - SetY = 7,158 + SetFrame = 1,5 + SetX = 1,35 + SetY = 1,-32 + SetZ = 1,28 + SetOpacity = 1,126 + SetY = 2,-12 + SetY = 3,8 + SetY = 4,28 + SetY = 5,48 + SetOpacity = 5,79 + SetY = 6,68 + SetOpacity = 6,32 + SetX = 7,-16 + SetY = 7,91 + SetX = 8,-41 + SetY = 8,82 + SetVisible = 9,false Graphic = ! Focus = Target - SetX = 2,368 - SetY = 2,87 - SetOpacity = 2,126 - SetY = 3,107 - SetY = 4,127 - SetY = 5,147 - SetY = 6,167 - SetOpacity = 6,79 - SetX = 7,409 - SetY = 7,148 - SetOpacity = 7,126 + SetFrame = 1,5 + SetX = 1,22 + SetY = 1,-9 + SetZ = 1,29 + SetOpacity = 1,126 + SetY = 2,11 + SetY = 3,31 + SetY = 4,51 + SetY = 5,71 + SetOpacity = 5,79 + SetY = 6,91 + SetOpacity = 6,32 + SetX = 7,-1 + SetY = 7,43 + SetOpacity = 7,79 + SetX = 8,25 + SetY = 8,72 + SetVisible = 9,false Graphic = ! Focus = Target - SetX = 2,383 - SetY = 2,39 + SetFrame = 2,5 + SetX = 2,-16 + SetY = 2,-9 + SetZ = 2,31 SetOpacity = 2,126 - SetY = 3,59 - SetY = 4,79 - SetY = 5,99 - SetY = 6,119 + SetY = 3,11 + SetY = 4,31 + SetY = 5,51 + SetY = 6,71 + SetOpacity = 6,79 + SetX = 7,25 + SetY = 7,52 + SetOpacity = 7,126 + SetVisible = 8,false Graphic = ! Focus = Target - SetX = 0,406 - SetY = 0,67 - SetOpacity = 0,126 - SetX = 1,368 - SetX = 3,343 - SetY = 3,78 - SetY = 4,98 - SetY = 5,118 - SetY = 6,138 + SetFrame = 2,5 + SetX = 2,-1 + SetY = 2,-57 + SetZ = 2,32 + SetOpacity = 2,126 + SetY = 3,-37 + SetY = 4,-17 + SetY = 5,3 + SetY = 6,23 + SetVisible = 7,false Graphic = ! Focus = Target - SetX = 3,409 - SetY = 3,68 - SetOpacity = 3,126 - SetY = 4,88 - SetY = 5,108 - SetY = 6,128 + SetFrame = 2,5 + SetX = 2,-41 + SetY = 2,-38 + SetZ = 2,35 + SetOpacity = 2,126 + SetVisible = 3,false Graphic = ! Focus = Target - SetX = 2,343 - SetY = 2,58 - SetOpacity = 2,126 + SetFrame = 3,5 + SetX = 3,-41 + SetY = 3,-18 + SetZ = 3,33 + SetOpacity = 3,126 + SetY = 4,2 + SetY = 5,22 + SetY = 6,42 + SetVisible = 7,false + + Graphic = ! + Focus = Target + SetFrame = 3,5 + SetX = 3,25 + SetY = 3,-28 + SetZ = 3,34 + SetOpacity = 3,126 + SetY = 4,-8 + SetY = 5,12 + SetY = 6,32 + SetVisible = 7,false Play = 0,decrease diff --git a/PBS/Animations/Converted/Common/StatUp.txt b/PBS/Animations/Converted/Common/StatUp.txt index d73dd54fe..ecc8d05b5 100644 --- a/PBS/Animations/Converted/Common/StatUp.txt +++ b/PBS/Animations/Converted/Common/StatUp.txt @@ -3,103 +3,115 @@ [Common,StatUp] Name = StatUp - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ! Focus = Target - SetX = 0,343 - SetY = 0,234 + SetFrame = 0,6 + SetX = 0,-41 + SetY = 0,138 + SetZ = 0,27 SetOpacity = 0,126 - SetY = 1,210 - SetY = 2,178 - SetY = 3,146 - SetY = 4,114 - SetY = 5,82 - SetY = 6,62 - SetY = 7,42 - SetY = 8,22 + SetY = 1,114 + SetY = 2,82 + SetY = 3,50 + SetY = 4,18 + SetY = 5,-14 + SetY = 6,-34 + SetY = 7,-54 + SetY = 8,-74 SetOpacity = 8,63 - SetY = 9,2 + SetY = 9,-94 SetOpacity = 9,0 Graphic = ! Focus = Target - SetX = 0,391 - SetY = 0,202 + SetFrame = 0,6 + SetX = 0,7 + SetY = 0,106 + SetZ = 0,28 SetOpacity = 0,126 - SetY = 1,170 - SetY = 2,138 - SetY = 3,98 - SetY = 4,66 - SetY = 5,34 - SetY = 6,14 - SetY = 7,-6 - SetY = 8,-26 + SetY = 1,74 + SetY = 2,42 + SetY = 3,2 + SetY = 4,-30 + SetY = 5,-62 + SetY = 6,-82 + SetY = 7,-102 + SetY = 8,-122 SetOpacity = 8,63 - SetY = 9,-46 + SetY = 9,-142 SetOpacity = 9,0 Graphic = ! Focus = Target - SetX = 0,439 - SetY = 0,234 + SetFrame = 0,6 + SetX = 0,55 + SetY = 0,138 + SetZ = 0,29 SetOpacity = 0,126 - SetY = 1,210 - SetX = 2,447 - SetY = 2,178 - SetX = 3,439 - SetY = 3,146 - SetY = 4,114 - SetY = 5,82 - SetY = 6,62 - SetY = 7,42 - SetY = 8,22 + SetY = 1,114 + SetX = 2,63 + SetY = 2,82 + SetX = 3,55 + SetY = 3,50 + SetY = 4,18 + SetY = 5,-14 + SetY = 6,-34 + SetY = 7,-54 + SetY = 8,-74 SetOpacity = 8,63 - SetY = 9,2 + SetY = 9,-94 SetOpacity = 9,0 Graphic = ! Focus = Target - SetX = 2,375 - SetY = 2,234 + SetFrame = 2,6 + SetX = 2,-9 + SetY = 2,138 + SetZ = 2,30 SetOpacity = 2,126 - SetY = 3,202 - SetY = 4,170 - SetY = 5,138 - SetY = 6,118 - SetY = 7,98 - SetY = 8,78 + SetY = 3,106 + SetY = 4,74 + SetY = 5,42 + SetY = 6,22 + SetY = 7,2 + SetY = 8,-18 SetOpacity = 8,63 - SetY = 9,58 + SetY = 9,-38 SetOpacity = 9,0 Graphic = ! Focus = Target - SetX = 3,423 - SetY = 3,234 + SetFrame = 3,6 + SetX = 3,39 + SetY = 3,138 + SetZ = 3,31 SetOpacity = 3,126 - SetY = 4,202 - SetY = 5,170 - SetY = 6,150 - SetY = 7,130 - SetY = 8,110 + SetY = 4,106 + SetY = 5,74 + SetY = 6,54 + SetY = 7,34 + SetY = 8,14 SetOpacity = 8,63 - SetY = 9,90 + SetY = 9,-6 SetOpacity = 9,0 Graphic = ! Focus = Target - SetX = 5,359 - SetY = 5,234 + SetFrame = 5,6 + SetX = 5,-25 + SetY = 5,138 + SetZ = 5,32 SetOpacity = 5,126 - SetY = 6,194 - SetY = 8,174 + SetY = 6,98 + SetY = 8,78 SetOpacity = 8,63 - SetY = 9,154 + SetY = 9,58 SetOpacity = 9,0 Play = 0,increase diff --git a/PBS/Animations/Converted/Common/Sun.txt b/PBS/Animations/Converted/Common/Sun.txt index e35de2664..75c826696 100644 --- a/PBS/Animations/Converted/Common/Sun.txt +++ b/PBS/Animations/Converted/Common/Sun.txt @@ -3,16 +3,17 @@ [Common,Sun] Name = Sun - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - + SetX = 0,0 + SetY = 0,0 + Graphic = weather - Focus = Screen + Focus = Foreground SetX = 0,64 SetY = 0,64 + SetZ = 0,28 SetOpacity = 0,64 SetX = 1,72 SetY = 1,72 diff --git a/PBS/Animations/Converted/Common/SuperShiny.txt b/PBS/Animations/Converted/Common/SuperShiny.txt index 3b12f329f..f605b7146 100644 --- a/PBS/Animations/Converted/Common/SuperShiny.txt +++ b/PBS/Animations/Converted/Common/SuperShiny.txt @@ -3,64 +3,83 @@ [Common,SuperShiny] Name = SuperShiny - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = leech-seed - Focus = Target - SetX = 3,327 - SetY = 3,78 - SetX = 4,366 - SetY = 4,129 - SetX = 6,416 - SetY = 6,54 - SetX = 7,368 - SetY = 7,67 - SetX = 8,416 - SetY = 8,118 - - Graphic = leech-seed - Focus = Target - SetX = 5,416 - SetY = 5,54 - SetX = 6,368 - SetY = 6,67 - SetX = 7,416 - SetY = 7,118 - - Graphic = leech-seed - Focus = Target - SetX = 0,360 - SetY = 0,110 - SetX = 4,440 - SetY = 4,126 - SetX = 6,327 - SetY = 6,78 - SetX = 7,366 - SetY = 7,129 - SetX = 8,416 - SetY = 8,54 - SetX = 9,368 - SetY = 9,67 - SetX = 10,416 - SetY = 10,118 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = Target - SetX = 2,440 - SetY = 2,126 - SetX = 4,327 - SetY = 4,78 - SetX = 6,366 - SetY = 6,129 - SetX = 7,416 - SetY = 7,54 - SetX = 8,368 - SetY = 8,67 - SetX = 9,416 - SetY = 9,118 + SetFrame = 2,5 + SetX = 2,56 + SetY = 2,30 + SetZ = 2,28 + SetFrame = 3,6 + SetX = 4,-57 + SetY = 4,-18 + SetFrame = 5,7 + SetX = 6,-18 + SetY = 6,33 + SetX = 7,32 + SetY = 7,-42 + SetX = 8,-16 + SetY = 8,-29 + SetX = 9,32 + SetY = 9,22 + SetVisible = 10,false + + Graphic = leech-seed + Focus = Target + SetFrame = 3,5 + SetX = 3,-57 + SetY = 3,-18 + SetZ = 3,29 + SetX = 4,-18 + SetY = 4,33 + SetFrame = 5,6 + SetX = 6,32 + SetY = 6,-42 + SetX = 7,-16 + SetY = 7,-29 + SetX = 8,32 + SetY = 8,22 + SetVisible = 9,false + + Graphic = leech-seed + Focus = Target + SetFrame = 5,5 + SetX = 5,32 + SetY = 5,-42 + SetZ = 5,30 + SetX = 6,-16 + SetY = 6,-29 + SetX = 7,32 + SetY = 7,22 + SetVisible = 8,false + + Graphic = leech-seed + Focus = Target + SetFrame = 0,5 + SetX = 0,-24 + SetY = 0,14 + SetZ = 0,27 + SetFrame = 1,6 + SetFrame = 2,7 + SetFrame = 3,8 + SetFrame = 4,7 + SetX = 4,56 + SetY = 4,30 + SetFrame = 5,8 + SetX = 6,-57 + SetY = 6,-18 + SetX = 7,-18 + SetY = 7,33 + SetX = 8,32 + SetY = 8,-42 + SetX = 9,-16 + SetY = 9,-29 + SetX = 10,32 + SetY = 10,22 Play = 0,Shiny sparkle diff --git a/PBS/Animations/Converted/Common/Toxic.txt b/PBS/Animations/Converted/Common/Toxic.txt index c9c13427d..1989ada67 100644 --- a/PBS/Animations/Converted/Common/Toxic.txt +++ b/PBS/Animations/Converted/Common/Toxic.txt @@ -3,15 +3,29 @@ [Common,Toxic] Name = Toxic - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = State1 Focus = Target - SetX = 1,384 - SetY = 1,86 + SetX = 1,0 + SetY = 1,-10 + SetZ = 1,27 + SetFrame = 2,1 + SetFrame = 3,2 + SetFrame = 4,3 + SetFrame = 5,4 + SetFrame = 6,5 + SetFrame = 7,6 + SetFrame = 8,7 + SetFrame = 9,8 + SetFrame = 10,9 + SetFrame = 11,10 + SetFrame = 12,11 + SetFrame = 13,12 + SetFrame = 14,13 Play = 0,Poison,80,80 diff --git a/PBS/Animations/Converted/Common/Wrap.txt b/PBS/Animations/Converted/Common/Wrap.txt index 261430354..10cbdeb6a 100644 --- a/PBS/Animations/Converted/Common/Wrap.txt +++ b/PBS/Animations/Converted/Common/Wrap.txt @@ -3,42 +3,45 @@ [Common,Wrap] Name = Wrap - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Struggle Focus = Target - SetX = 0,440 - SetY = 0,102 - SetX = 1,480 - SetY = 1,94 - SetX = 2,488 - SetY = 2,102 - SetX = 3,464 - SetY = 3,94 - SetX = 4,432 - SetX = 5,464 - SetX = 6,496 - SetY = 6,102 - SetX = 7,480 + SetFrame = 0,1 + SetX = 0,56 + SetY = 0,6 + SetZ = 0,28 + SetX = 1,96 + SetY = 1,-2 + SetX = 2,104 + SetY = 2,6 + SetX = 3,80 + SetY = 3,-2 + SetX = 4,48 + SetX = 5,80 + SetX = 6,112 + SetY = 6,6 + SetX = 7,96 Graphic = Struggle Focus = Target - SetX = 0,320 - SetY = 0,102 - SetX = 1,288 - SetY = 1,94 - SetX = 2,240 - SetY = 2,102 - SetX = 3,264 - SetY = 3,94 - SetX = 4,296 - SetX = 5,256 - SetX = 6,216 - SetX = 7,264 + SetX = 0,-64 + SetY = 0,6 + SetZ = 0,27 + SetX = 1,-96 + SetY = 1,-2 + SetX = 2,-144 + SetY = 2,6 + SetX = 3,-120 + SetY = 3,-2 + SetX = 4,-88 + SetX = 5,-128 + SetX = 6,-168 + SetX = 7,-120 Play = 0,Slash10,80 Play = 3,Slash10,80 diff --git a/PBS/Animations/Converted/Move/ABSORB.txt b/PBS/Animations/Converted/Move/ABSORB.txt index 2718ae812..36e86f959 100644 --- a/PBS/Animations/Converted/Move/ABSORB.txt +++ b/PBS/Animations/Converted/Move/ABSORB.txt @@ -3,175 +3,238 @@ [Move,ABSORB] Name = ABSORB - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 0,358 - SetY = 0,91 - SetX = 1,300 - SetY = 1,98 - SetX = 2,198 - SetY = 2,129 - SetX = 3,134 - SetY = 3,179 - SetX = 4,108 - SetY = 4,192 - SetX = 5,166 - SetY = 5,224 - SetX = 6,179 - SetY = 6,198 - SetX = 7,128 - SetY = 7,211 - SetX = 8,153 - SetY = 8,192 - SetX = 9,89 - SetY = 9,186 - SetX = 12,147 - SetY = 12,148 + SetFrame = 0,11 + SetX = 0,179 + SetY = 0,-207 + SetZ = 0,27 + SetX = 1,134 + SetY = 1,-196 + SetX = 2,54 + SetY = 2,-148 + SetX = 3,4 + SetY = 3,-70 + SetX = 4,-15 + SetY = 4,-50 + SetX = 5,29 + SetY = 5,0 + SetFrame = 6,13 + SetX = 6,39 + SetY = 6,-40 + SetX = 7,0 + SetY = 7,-20 + SetFrame = 8,11 + SetX = 8,19 + SetY = 8,-50 + SetFrame = 9,6 + SetX = 9,-30 + SetY = 9,-59 + SetFrame = 10,7 + SetFrame = 11,8 + SetX = 12,14 + SetY = 12,-118 SetFlip = 13,true - SetX = 13,115 - SetY = 13,230 + SetX = 13,-10 + SetY = 13,9 SetFlip = 14,false - SetX = 14,102 - SetY = 14,142 + SetX = 14,-20 + SetY = 14,-128 SetFlip = 15,true - SetX = 15,96 - SetY = 15,192 + SetX = 15,-25 + SetY = 15,-50 SetFlip = 16,false - SetX = 16,160 - SetY = 16,173 - SetX = 17,128 - SetY = 17,217 + SetX = 16,25 + SetY = 16,-79 + SetX = 17,0 + SetY = 17,-10 Graphic = leech-seed Focus = UserAndTarget - SetX = 1,396 - SetY = 1,104 - SetX = 2,364 - SetY = 2,148 - SetX = 3,281 - SetY = 3,192 - SetX = 4,217 - SetY = 4,211 - SetX = 5,140 - SetY = 5,198 - SetX = 6,108 - SetY = 6,186 - SetX = 7,172 - SetY = 7,224 - SetX = 8,89 - SetY = 8,186 - SetX = 9,160 - SetY = 9,211 - SetX = 11,147 - SetY = 11,148 - SetX = 12,160 - SetY = 12,211 - SetX = 13,102 - SetY = 13,142 + SetFrame = 1,11 + SetX = 1,209 + SetY = 1,-187 + SetZ = 1,28 + SetX = 2,184 + SetY = 2,-118 + SetX = 3,119 + SetY = 3,-50 + SetX = 4,69 + SetY = 4,-20 + SetFrame = 5,12 + SetX = 5,9 + SetY = 5,-40 + SetFrame = 6,11 + SetX = 6,-15 + SetY = 6,-59 + SetX = 7,34 + SetY = 7,0 + SetFrame = 8,5 + SetX = 8,-30 + SetY = 8,-59 + SetX = 9,25 + SetY = 9,-20 + SetFrame = 10,6 + SetFrame = 11,7 + SetX = 11,14 + SetY = 11,-118 + SetFrame = 12,8 + SetX = 12,25 + SetY = 12,-20 + SetFrame = 13,7 + SetX = 13,-20 + SetY = 13,-128 SetFlip = 14,true - SetX = 14,96 - SetY = 14,192 + SetX = 14,-25 + SetY = 14,-50 SetFlip = 15,false - SetX = 15,160 - SetY = 15,173 - SetX = 16,128 - SetY = 16,217 + SetX = 15,25 + SetY = 15,-79 + SetX = 16,0 + SetY = 16,-10 + SetVisible = 17,false Graphic = leech-seed Focus = UserAndTarget - SetX = 1,364 - SetY = 1,85 - SetX = 2,300 - SetY = 2,116 - SetX = 3,243 - SetY = 3,148 - SetX = 4,172 - SetY = 4,179 - SetX = 5,256 - SetY = 5,186 - SetX = 6,236 - SetY = 6,198 - SetX = 7,134 - SetY = 7,173 - SetX = 9,147 - SetY = 9,148 - SetX = 11,160 - SetY = 11,211 - SetFlip = 12,true - SetX = 12,121 - SetY = 12,230 - SetX = 13,96 - SetY = 13,192 - SetFlip = 14,false - SetX = 14,160 - SetY = 14,173 - SetX = 15,128 - SetY = 15,217 + SetFrame = 1,12 + SetX = 1,184 + SetY = 1,-217 + SetZ = 1,29 + SetX = 2,134 + SetY = 2,-168 + SetX = 3,89 + SetY = 3,-118 + SetX = 4,34 + SetY = 4,-70 + SetFrame = 5,13 + SetX = 5,100 + SetY = 5,-59 + SetFrame = 6,11 + SetX = 6,84 + SetY = 6,-40 + SetFrame = 7,12 + SetX = 7,4 + SetY = 7,-79 + SetVisible = 8,false Graphic = leech-seed Focus = UserAndTarget - SetX = 2,384 - SetY = 2,91 - SetX = 3,345 - SetY = 3,129 - SetX = 4,313 - SetY = 4,154 - SetX = 5,153 - SetY = 5,167 - SetX = 6,192 - SetY = 6,142 - SetX = 7,230 - SetY = 7,154 - SetFlip = 10,true - SetX = 10,121 - SetY = 10,230 - SetFlip = 12,false - SetX = 12,102 - SetY = 12,142 - SetX = 13,160 - SetY = 13,173 - SetX = 14,128 - SetY = 14,217 + SetFrame = 2,13 + SetX = 2,200 + SetY = 2,-207 + SetZ = 2,30 + SetX = 3,169 + SetY = 3,-148 + SetX = 4,144 + SetY = 4,-109 + SetFrame = 5,11 + SetX = 5,19 + SetY = 5,-89 + SetFrame = 6,12 + SetX = 6,50 + SetY = 6,-128 + SetFrame = 7,11 + SetX = 7,79 + SetY = 7,-109 + SetVisible = 8,false Graphic = leech-seed Focus = UserAndTarget - SetX = 2,345 - SetY = 2,85 - SetX = 3,307 - SetY = 3,98 - SetX = 4,230 - SetY = 4,116 - SetX = 5,332 - SetY = 5,161 - SetX = 6,307 - SetY = 6,129 - SetX = 11,102 - SetY = 11,142 - SetFlip = 12,true - SetX = 12,96 - SetY = 12,192 + SetFrame = 2,11 + SetX = 2,169 + SetY = 2,-217 + SetZ = 2,31 + SetX = 3,139 + SetY = 3,-196 + SetX = 4,79 + SetY = 4,-168 + SetX = 5,159 + SetY = 5,-98 + SetX = 6,139 + SetY = 6,-148 + SetVisible = 7,false Graphic = leech-seed Focus = UserAndTarget - SetX = 3,390 - SetY = 3,110 - SetX = 4,371 - SetY = 4,135 - SetX = 5,275 - SetY = 5,110 + SetFrame = 3,11 + SetX = 3,204 + SetY = 3,-178 + SetZ = 3,32 + SetX = 4,189 + SetY = 4,-139 + SetFrame = 5,12 + SetX = 5,114 + SetY = 5,-178 + SetVisible = 6,false Graphic = leech-seed Focus = UserAndTarget - SetX = 4,345 - SetY = 4,91 - SetX = 5,364 - SetY = 5,98 + SetFrame = 4,12 + SetX = 4,169 + SetY = 4,-207 + SetZ = 4,33 + SetFrame = 5,11 + SetX = 5,184 + SetY = 5,-196 + SetVisible = 6,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 9,5 + SetX = 9,14 + SetY = 9,-118 + SetZ = 9,29 + SetFrame = 10,6 + SetFrame = 11,7 + SetX = 11,25 + SetY = 11,-20 + SetFlip = 12,true + SetX = 12,-5 + SetY = 12,9 + SetFrame = 13,6 + SetX = 13,-25 + SetY = 13,-50 + SetFlip = 14,false + SetX = 14,25 + SetY = 14,-79 + SetX = 15,0 + SetY = 15,-10 + SetVisible = 16,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 10,5 + SetFlip = 10,true + SetX = 10,-5 + SetY = 10,9 + SetZ = 10,30 + SetFrame = 11,6 + SetFlip = 12,false + SetX = 12,-20 + SetY = 12,-128 + SetFrame = 13,5 + SetX = 13,25 + SetY = 13,-79 + SetX = 14,0 + SetY = 14,-10 + SetVisible = 15,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 11,5 + SetX = 11,-20 + SetY = 11,-128 + SetZ = 11,31 + SetFlip = 12,true + SetX = 12,-25 + SetY = 12,-50 + SetVisible = 13,false Play = 0,Absorb2,80 Play = 0,Absorb2,80 diff --git a/PBS/Animations/Converted/Move/ACID.txt b/PBS/Animations/Converted/Move/ACID.txt index 5b57aadbc..a4fad9d47 100644 --- a/PBS/Animations/Converted/Move/ACID.txt +++ b/PBS/Animations/Converted/Move/ACID.txt @@ -3,48 +3,72 @@ [Move,ACID] Name = ACID - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison2 Focus = UserAndTarget - SetX = 1,147 - SetY = 1,211 - SetX = 2,172 - SetY = 2,179 - SetX = 3,217 - SetY = 3,142 - SetX = 4,275 - SetY = 4,104 - SetX = 5,326 - SetY = 5,91 - SetY = 6,85 + SetFrame = 1,4 + SetX = 1,14 + SetY = 1,-20 + SetZ = 1,28 + SetFrame = 2,5 + SetX = 2,34 + SetY = 2,-70 + SetFrame = 3,6 + SetX = 3,69 + SetY = 3,-128 + SetX = 4,114 + SetY = 4,-187 + SetX = 5,154 + SetY = 5,-207 + SetY = 6,-217 + SetVisible = 7,false Graphic = poison2 Focus = UserAndTarget - SetX = 3,153 - SetY = 3,211 - SetX = 4,204 - SetY = 4,148 - SetX = 5,268 - SetY = 5,91 + SetFrame = 3,4 + SetX = 3,19 + SetY = 3,-20 + SetZ = 3,29 + SetFrame = 4,5 + SetX = 4,59 + SetY = 4,-118 + SetFrame = 5,6 + SetX = 5,109 + SetY = 5,-207 + SetVisible = 6,false Graphic = poison2 Focus = UserAndTarget - SetX = 0,147 - SetY = 0,211 - SetX = 1,179 - SetY = 1,161 - SetX = 2,217 - SetY = 2,129 - SetX = 3,300 - SetY = 3,104 - SetX = 4,358 - SetY = 4,110 + SetFrame = 0,3 + SetX = 0,14 + SetY = 0,-20 + SetZ = 0,27 + SetFrame = 1,4 + SetX = 1,39 + SetY = 1,-98 + SetFrame = 2,5 + SetX = 2,69 + SetY = 2,-148 + SetFrame = 3,6 + SetX = 3,134 + SetY = 3,-187 + SetFrame = 4,7 + SetX = 4,179 + SetY = 4,-178 + SetFrame = 5,8 + SetFrame = 6,9 + SetFrame = 7,10 + SetFrame = 8,11 + SetFrame = 9,12 + SetFrame = 10,13 + SetFrame = 11,14 SetOpacity = 12,100 + SetVisible = 13,false Play = 0,throw,80 Play = 3,Poison,80 diff --git a/PBS/Animations/Converted/Move/ACIDARMOR.txt b/PBS/Animations/Converted/Move/ACIDARMOR.txt index 68c6c1170..ed09f91a3 100644 --- a/PBS/Animations/Converted/Move/ACIDARMOR.txt +++ b/PBS/Animations/Converted/Move/ACIDARMOR.txt @@ -3,20 +3,34 @@ [Move,ACIDARMOR] Name = ACIDARMOR - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = Target - SetX = 0,392 - SetY = 0,94 - SetX = 4,400 - SetY = 4,86 - SetX = 5,392 - SetY = 6,78 + SetFrame = 0,1 + SetX = 0,8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,2 + SetFrame = 2,3 + SetFrame = 3,4 + SetFrame = 4,5 + SetX = 4,16 + SetY = 4,-10 + SetFrame = 5,6 + SetX = 5,8 + SetFrame = 6,7 + SetY = 6,-18 + SetFrame = 7,8 + SetFrame = 8,9 + SetFrame = 9,10 + SetFrame = 10,11 + SetFrame = 11,12 + SetFrame = 12,13 Play = 0,throw,80 Play = 0,Sound2,80 diff --git a/PBS/Animations/Converted/Move/ACIDSPRAY.txt b/PBS/Animations/Converted/Move/ACIDSPRAY.txt index 159e1f129..f5d777d7f 100644 --- a/PBS/Animations/Converted/Move/ACIDSPRAY.txt +++ b/PBS/Animations/Converted/Move/ACIDSPRAY.txt @@ -3,125 +3,150 @@ [Move,ACIDSPRAY] Name = ACIDSPRAY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,341 - SetY = 0,8 + SetX = 0,-43 + SetY = 0,-88 + SetZ = 0,27 SetZoomX = 0,85 SetZoomY = 0,85 - SetY = 1,17 - SetX = 3,335 - SetY = 3,48 - SetX = 4,340 - SetY = 4,76 - SetX = 5,339 - SetY = 5,93 - SetX = 6,365 - SetY = 6,104 + SetY = 1,-79 + SetX = 3,-49 + SetY = 3,-48 + SetX = 4,-44 + SetY = 4,-20 + SetX = 5,-45 + SetY = 5,-3 + SetFrame = 6,1 + SetX = 6,-19 + SetY = 6,8 SetAngle = 6,180 - SetX = 7,330 - SetY = 7,116 - SetX = 8,413 - SetY = 8,151 + SetX = 7,-54 + SetY = 7,20 + SetFrame = 8,3 + SetX = 8,29 + SetY = 8,55 SetZoomX = 8,79 SetZoomY = 8,79 Graphic = fly copy Focus = Target - SetX = 1,366 - SetY = 1,8 + SetX = 1,-18 + SetY = 1,-88 + SetZ = 1,28 SetZoomX = 1,85 SetZoomY = 1,85 - SetX = 3,354 - SetY = 3,30 - SetX = 4,355 - SetY = 4,55 - SetY = 5,81 - SetX = 6,338 - SetY = 6,92 + SetX = 3,-30 + SetY = 3,-66 + SetX = 4,-29 + SetY = 4,-41 + SetY = 5,-15 + SetFrame = 6,1 + SetX = 6,-46 + SetY = 6,-4 SetAngle = 6,180 - SetX = 7,357 - SetY = 7,125 - SetX = 8,390 - SetY = 8,128 + SetX = 7,-27 + SetY = 7,29 + SetFrame = 8,3 + SetX = 8,6 + SetY = 8,32 SetZoomX = 8,79 SetZoomY = 8,79 Graphic = fly copy Focus = Target - SetX = 1,394 - SetY = 1,17 + SetX = 1,10 + SetY = 1,-79 + SetZ = 1,29 SetZoomX = 1,85 SetZoomY = 1,85 - SetX = 3,384 - SetY = 3,40 - SetX = 4,376 - SetY = 4,63 - SetX = 6,382 - SetY = 6,91 - SetAngle = 6,180 - SetX = 7,420 - SetY = 7,129 - SetX = 8,364 - SetY = 8,134 - SetZoomX = 8,79 - SetZoomY = 8,79 + SetX = 3,0 + SetY = 3,-56 + SetX = 4,-8 + SetY = 4,-33 + SetVisible = 5,false Graphic = fly copy Focus = Target - SetX = 2,418 - SetY = 2,9 + SetX = 2,34 + SetY = 2,-87 + SetZ = 2,30 SetZoomX = 2,85 SetZoomY = 2,85 - SetX = 3,408 - SetY = 3,23 - SetX = 4,402 - SetY = 4,71 - SetX = 5,401 - SetY = 5,89 - SetX = 6,407 - SetY = 6,102 + SetX = 3,24 + SetY = 3,-73 + SetX = 4,18 + SetY = 4,-25 + SetX = 5,17 + SetY = 5,-7 + SetFrame = 6,1 + SetX = 6,23 + SetY = 6,6 SetAngle = 6,180 - SetX = 7,380 - SetY = 7,127 - SetX = 8,341 - SetY = 8,129 + SetX = 7,-4 + SetY = 7,31 + SetFrame = 8,3 + SetX = 8,-43 + SetY = 8,33 SetZoomX = 8,79 SetZoomY = 8,79 Graphic = fly copy Focus = Target - SetX = 2,441 - SetY = 2,12 + SetX = 2,57 + SetY = 2,-84 + SetZ = 2,31 SetZoomX = 2,85 SetZoomY = 2,85 - SetX = 3,438 - SetY = 3,37 - SetX = 4,431 - SetY = 4,65 - SetX = 5,430 - SetY = 5,83 - SetY = 6,101 + SetX = 3,54 + SetY = 3,-59 + SetX = 4,47 + SetY = 4,-31 + SetX = 5,46 + SetY = 5,-13 + SetFrame = 6,1 + SetY = 6,5 SetAngle = 6,180 - SetX = 7,399 - SetY = 7,116 - SetX = 8,306 - SetY = 8,125 + SetX = 7,15 + SetY = 7,20 + SetFrame = 8,3 + SetX = 8,-78 + SetY = 8,29 SetZoomX = 8,79 SetZoomY = 8,79 Graphic = fly copy Focus = Target - SetX = 5,361 - SetY = 5,86 + SetFrame = 5,1 + SetX = 5,-23 + SetY = 5,-10 + SetZ = 5,32 SetZoomX = 5,85 SetZoomY = 5,85 SetAngle = 5,180 + SetVisible = 6,false + + Graphic = fly copy + Focus = Target + SetFrame = 6,1 + SetX = 6,-2 + SetY = 6,-5 + SetZ = 6,29 + SetZoomX = 6,85 + SetZoomY = 6,85 + SetAngle = 6,180 + SetFrame = 7,3 + SetX = 7,36 + SetY = 7,33 + SetX = 8,-20 + SetY = 8,38 + SetZoomX = 8,79 + SetZoomY = 8,79 Play = 0,Substitute,80 diff --git a/PBS/Animations/Converted/Move/ACROBATICS.txt b/PBS/Animations/Converted/Move/ACROBATICS.txt index 7c8abd8c3..485c09332 100644 --- a/PBS/Animations/Converted/Move/ACROBATICS.txt +++ b/PBS/Animations/Converted/Move/ACROBATICS.txt @@ -3,31 +3,35 @@ [Move,ACROBATICS] Name = ACROBATICS - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 2,376 - SetY = 2,133 + SetFrame = 2,12 + SetX = 2,-8 + SetY = 2,37 + SetZ = 2,28 SetZoomX = 2,41 SetZoomY = 2,41 SetZoomX = 3,39 SetZoomY = 3,39 SetZoomX = 5,62 SetZoomY = 5,62 - SetX = 6,360 - SetY = 6,131 + SetX = 6,-24 + SetY = 6,35 SetZoomX = 6,84 SetZoomY = 6,84 Graphic = finger.spoon Focus = Target - SetX = 0,392 - SetY = 0,86 + SetFrame = 0,13 + SetX = 0,8 + SetY = 0,-10 + SetZ = 0,27 SetZoomX = 0,25 SetZoomY = 0,25 SetZoomX = 1,47 diff --git a/PBS/Animations/Converted/Move/ACUPRESSURE.txt b/PBS/Animations/Converted/Move/ACUPRESSURE.txt index 0a57e47f1..bc39fae0c 100644 --- a/PBS/Animations/Converted/Move/ACUPRESSURE.txt +++ b/PBS/Animations/Converted/Move/ACUPRESSURE.txt @@ -3,86 +3,116 @@ [Move,ACUPRESSURE] Name = ACUPRESSURE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = mixed status Focus = Target - SetX = 0,399 - SetY = 0,93 - SetX = 1,397 - SetY = 1,94 - SetX = 2,395 - SetX = 3,394 - SetY = 3,96 - SetY = 4,93 - SetX = 5,397 - SetY = 5,94 - SetX = 6,393 - SetY = 6,92 - SetX = 7,395 - SetY = 7,95 - SetX = 8,393 - SetY = 8,92 + SetFrame = 0,13 + SetX = 0,15 + SetY = 0,-3 + SetZ = 0,27 + SetX = 1,13 + SetY = 1,-2 + SetX = 2,11 + SetX = 3,10 + SetY = 3,0 + SetY = 4,-3 + SetX = 5,13 + SetY = 5,-2 + SetX = 6,9 + SetY = 6,-4 + SetX = 7,11 + SetY = 7,-1 + SetX = 8,9 + SetY = 8,-4 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 4,385 - SetY = 4,84 - SetX = 5,389 - SetY = 5,88 - SetX = 6,397 - SetY = 7,90 - SetX = 8,395 - SetY = 8,80 + SetFrame = 4,14 + SetX = 4,1 + SetY = 4,-12 + SetZ = 4,28 + SetX = 5,5 + SetY = 5,-8 + SetX = 6,13 + SetY = 7,-6 + SetX = 8,11 + SetY = 8,-16 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 5,367 - SetY = 5,127 - SetX = 6,369 - SetY = 6,124 - SetX = 7,367 - SetY = 7,125 - SetX = 8,446 - SetY = 8,116 + SetFrame = 5,15 + SetX = 5,-17 + SetY = 5,31 + SetZ = 5,29 + SetX = 6,-15 + SetY = 6,28 + SetX = 7,-17 + SetY = 7,29 + SetFrame = 8,14 + SetX = 8,62 + SetY = 8,20 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 6,427 - SetY = 6,92 - SetX = 7,449 - SetY = 7,119 - SetX = 8,366 - SetY = 8,121 + SetFrame = 6,15 + SetX = 6,43 + SetY = 6,-4 + SetZ = 6,30 + SetFrame = 7,14 + SetX = 7,65 + SetY = 7,23 + SetFrame = 8,15 + SetX = 8,-18 + SetY = 8,25 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 7,428 - SetY = 7,91 - SetY = 8,90 + SetFrame = 7,15 + SetX = 7,44 + SetY = 7,-5 + SetZ = 7,31 + SetY = 8,-6 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 8,430 - SetY = 8,92 + SetFrame = 8,15 + SetX = 8,46 + SetY = 8,-4 + SetZ = 8,32 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 8,445 - SetY = 8,115 + SetFrame = 8,14 + SetX = 8,61 + SetY = 8,19 + SetZ = 8,33 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 8,368 - SetY = 8,121 + SetFrame = 8,15 + SetX = 8,-16 + SetY = 8,25 + SetZ = 8,34 + SetVisible = 9,false Graphic = mixed status Focus = Target - SetX = 8,395 - SetY = 8,80 + SetFrame = 8,14 + SetX = 8,11 + SetY = 8,-16 + SetZ = 8,35 + SetVisible = 9,false Play = 0,Acupressure diff --git a/PBS/Animations/Converted/Move/AERIALACE.txt b/PBS/Animations/Converted/Move/AERIALACE.txt index 81643c31d..61e509071 100644 --- a/PBS/Animations/Converted/Move/AERIALACE.txt +++ b/PBS/Animations/Converted/Move/AERIALACE.txt @@ -3,219 +3,281 @@ [Move,AERIALACE] Name = AERIALACE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 SetOpacity = 1,170 SetOpacity = 2,85 SetOpacity = 3,0 SetOpacity = 6,255 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Aerial Ace Focus = Target - SetX = 0,468 - SetY = 0,46 + SetX = 0,84 + SetY = 0,-50 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,76 - SetY = 1,230 - SetOpacity = 1,255 + SetVisible = 1,false + + Graphic = USER + Focus = User + SetX = 1,-52 + SetY = 1,6 + SetZ = 1,27 SetOpacity = 2,170 SetOpacity = 3,85 - SetX = 4,331 - SetY = 4,173 - SetOpacity = 4,255 - SetToneRed = 4,214 - SetToneGreen = 4,100 - SetToneBlue = 4,100 - SetX = 5,351 - SetY = 5,151 - SetToneRed = 5,0 - SetToneGreen = 5,0 - SetToneBlue = 5,0 - SetX = 6,390 - SetY = 6,118 - SetX = 7,415 - SetY = 7,95 - SetX = 8,452 - SetY = 8,62 - SetX = 9,476 - SetY = 9,36 - SetOpacity = 9,128 - SetX = 10,287 - SetY = 10,32 - SetOpacity = 10,255 - SetX = 11,268 - SetY = 11,6 - SetOpacity = 11,128 - - Graphic = Aerial Ace - Focus = Target - SetX = 1,442 - SetY = 1,71 - SetToneRed = 1,-37 - SetToneGreen = 1,-37 - SetToneBlue = 1,-37 - SetX = 2,59 - SetY = 2,258 - SetToneRed = 2,0 - SetToneGreen = 2,0 - SetToneBlue = 2,0 - SetOpacity = 3,170 - SetOpacity = 4,85 - SetX = 6,381 - SetY = 6,118 - SetOpacity = 6,128 - SetX = 7,391 - SetY = 7,82 - SetOpacity = 7,255 - SetX = 8,327 - SetY = 8,92 - SetX = 9,292 - SetY = 9,66 - SetX = 10,309 - SetY = 10,3 - SetOpacity = 10,128 - SetX = 11,490 - SetY = 11,6 + SetVisible = 4,false Graphic = Aerial Ace Focus = Target - SetX = 2,411 - SetY = 2,98 - SetToneRed = 2,-74 - SetToneGreen = 2,-74 - SetToneBlue = 2,-74 - SetX = 3,100 - SetY = 3,272 - SetToneRed = 3,0 - SetToneGreen = 3,0 - SetToneBlue = 3,0 - SetX = 4,163 - SetY = 4,259 - SetX = 5,140 - SetY = 5,230 - SetX = 6,393 - SetY = 6,110 - SetOpacity = 6,128 - SetX = 7,368 - SetY = 7,98 - SetOpacity = 7,255 - SetX = 8,350 - SetY = 8,57 - SetX = 9,307 - SetY = 9,23 - SetX = 10,353 - SetY = 10,21 - SetX = 11,345 - SetY = 11,-3 - SetOpacity = 11,128 + SetX = 1,58 + SetY = 1,-25 + SetZ = 1,28 + SetToneRed = 1,-37 + SetToneGreen = 1,-37 + SetToneBlue = 1,-37 + SetVisible = 2,false - Graphic = Aerial Ace - Focus = Target - SetX = 3,371 - SetY = 3,137 - SetX = 4,100 - SetY = 4,272 - SetOpacity = 4,170 - SetX = 5,163 - SetY = 5,259 - SetX = 6,140 - SetY = 6,230 - SetX = 7,419 - SetY = 7,74 - SetOpacity = 7,255 - SetX = 8,392 - SetY = 8,57 - SetX = 9,356 - SetY = 9,38 - SetX = 10,477 - SetY = 10,24 - SetX = 11,411 - SetY = 11,7 - SetOpacity = 11,128 + Graphic = USER + Focus = User + SetX = 2,-69 + SetY = 2,34 + SetZ = 2,28 + SetOpacity = 3,170 + SetOpacity = 4,85 + SetVisible = 5,false Graphic = Aerial Ace Focus = Target - SetX = 5,100 - SetY = 5,272 - SetOpacity = 5,85 - SetX = 6,163 - SetY = 6,259 - SetX = 7,139 - SetY = 7,230 - SetX = 8,479 - SetY = 8,89 - SetOpacity = 8,255 - SetX = 9,507 - SetY = 9,97 - SetOpacity = 9,128 - SetX = 10,410 - SetY = 10,37 - SetOpacity = 10,255 + SetX = 2,27 + SetY = 2,2 + SetZ = 2,29 + SetToneRed = 2,-74 + SetToneGreen = 2,-74 + SetToneBlue = 2,-74 + SetVisible = 3,false - Graphic = Aerial Ace - Focus = Target - SetX = 6,410 - SetY = 6,109 - SetOpacity = 6,128 - SetX = 7,440 - SetY = 7,98 - SetOpacity = 7,255 - SetX = 8,479 - SetY = 8,145 - SetX = 9,502 - SetY = 9,158 - SetOpacity = 9,128 - SetX = 10,510 - SetY = 10,59 + Graphic = USER + Focus = User + SetX = 3,-28 + SetY = 3,48 + SetZ = 3,29 + SetX = 4,35 + SetY = 4,35 + SetX = 5,12 + SetY = 5,6 + SetVisible = 6,false Graphic = Aerial Ace Focus = Target - SetX = 6,408 - SetY = 6,125 - SetOpacity = 6,128 - SetX = 7,439 - SetY = 7,127 - SetOpacity = 7,255 - SetX = 8,443 - SetY = 8,57 - SetX = 9,453 - SetY = 9,38 + SetFrame = 3,1 + SetX = 3,-13 + SetY = 3,41 + SetZ = 3,30 + SetVisible = 4,false Graphic = Aerial Ace Focus = Target - SetX = 6,363 - SetY = 6,112 - SetOpacity = 6,128 - SetX = 7,405 - SetY = 7,77 - SetOpacity = 7,255 - SetX = 8,420 - SetY = 8,66 - SetX = 9,411 - SetY = 9,32 + SetFrame = 4,1 + SetX = 4,-53 + SetY = 4,77 + SetZ = 4,27 + SetToneRed = 4,214 + SetToneGreen = 4,100 + SetToneBlue = 4,100 + SetFrame = 5,3 + SetX = 5,-33 + SetY = 5,55 + SetToneRed = 5,0 + SetToneGreen = 5,0 + SetToneBlue = 5,0 + SetX = 6,6 + SetY = 6,22 + SetX = 7,31 + SetY = 7,-1 + SetFrame = 8,2 + SetX = 8,68 + SetY = 8,-34 + SetX = 9,92 + SetY = 9,-60 + SetOpacity = 9,128 + SetFrame = 10,6 + SetX = 10,-97 + SetY = 10,-64 + SetOpacity = 10,255 + SetX = 11,-116 + SetY = 11,-90 + SetOpacity = 11,128 + Graphic = USER + Focus = User + SetX = 4,-28 + SetY = 4,48 + SetZ = 4,30 + SetOpacity = 4,170 + SetX = 5,35 + SetY = 5,35 + SetX = 6,12 + SetY = 6,6 + SetVisible = 7,false + + Graphic = USER + Focus = User + SetX = 5,-28 + SetY = 5,48 + SetZ = 5,31 + SetOpacity = 5,85 + SetX = 6,35 + SetY = 6,35 + SetX = 7,11 + SetY = 7,6 + SetVisible = 8,false + Graphic = Aerial Ace Focus = Target - SetX = 7,432 - SetY = 7,86 - SetX = 8,455 - SetY = 8,78 - SetX = 9,487 + SetFrame = 6,6 + SetX = 6,-3 + SetY = 6,22 + SetZ = 6,28 + SetOpacity = 6,128 + SetX = 7,7 + SetY = 7,-14 + SetOpacity = 7,255 + SetX = 8,-57 + SetY = 8,-4 + SetX = 9,-92 + SetY = 9,-30 + SetX = 10,-75 + SetY = 10,-93 + SetOpacity = 10,128 + SetX = 11,106 + SetY = 11,-90 + + Graphic = Aerial Ace + Focus = Target + SetFrame = 6,6 + SetX = 6,9 + SetY = 6,14 + SetZ = 6,29 + SetOpacity = 6,128 + SetX = 7,-16 + SetY = 7,2 + SetOpacity = 7,255 + SetX = 8,-34 + SetY = 8,-39 + SetX = 9,-77 + SetY = 9,-73 + SetX = 10,-31 + SetY = 10,-75 + SetX = 11,-39 + SetY = 11,-99 + SetOpacity = 11,128 + + Graphic = Aerial Ace + Focus = Target + SetFrame = 6,6 + SetX = 6,26 + SetY = 6,13 + SetZ = 6,32 + SetOpacity = 6,128 + SetX = 7,56 + SetY = 7,2 + SetOpacity = 7,255 + SetX = 8,95 + SetY = 8,49 + SetX = 9,118 SetY = 9,62 + SetOpacity = 9,128 + SetX = 10,126 + SetY = 10,-37 + SetVisible = 11,false + + Graphic = Aerial Ace + Focus = Target + SetFrame = 6,6 + SetX = 6,24 + SetY = 6,29 + SetZ = 6,33 + SetOpacity = 6,128 + SetX = 7,55 + SetY = 7,31 + SetOpacity = 7,255 + SetX = 8,59 + SetY = 8,-39 + SetX = 9,69 + SetY = 9,-58 + SetVisible = 10,false + + Graphic = Aerial Ace + Focus = Target + SetFrame = 6,6 + SetX = 6,-21 + SetY = 6,16 + SetZ = 6,34 + SetOpacity = 6,128 + SetX = 7,21 + SetY = 7,-19 + SetOpacity = 7,255 + SetX = 8,36 + SetY = 8,-30 + SetX = 9,27 + SetY = 9,-64 + SetVisible = 10,false + + Graphic = Aerial Ace + Focus = Target + SetFrame = 7,6 + SetX = 7,35 + SetY = 7,-22 + SetZ = 7,30 + SetX = 8,8 + SetY = 8,-39 + SetX = 9,-28 + SetY = 9,-58 + SetX = 10,93 + SetY = 10,-72 + SetX = 11,27 + SetY = 11,-89 + SetOpacity = 11,128 + + Graphic = Aerial Ace + Focus = Target + SetFrame = 7,6 + SetX = 7,48 + SetY = 7,-10 + SetZ = 7,35 + SetX = 8,71 + SetY = 8,-18 + SetX = 9,103 + SetY = 9,-34 + SetVisible = 10,false + + Graphic = Aerial Ace + Focus = Target + SetFrame = 8,6 + SetX = 8,95 + SetY = 8,-7 + SetZ = 8,31 + SetX = 9,123 + SetY = 9,1 + SetOpacity = 9,128 + SetX = 10,26 + SetY = 10,-59 + SetOpacity = 10,255 + SetVisible = 11,false Play = 0,Ace,80 #------------------------------- [OppMove,AERIALACE] Name = AERIALACE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 SetOpacity = 1,170 SetOpacity = 2,85 SetOpacity = 3,0 @@ -223,133 +285,158 @@ Name = AERIALACE Graphic = Aerial Ace Focus = User - SetX = 0,229 - SetY = 0,168 + SetX = 0,101 + SetY = 0,-56 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,209 - SetY = 1,185 + SetX = 1,81 + SetY = 1,-39 SetOpacity = 1,255 - SetX = 2,176 - SetY = 2,216 - SetX = 3,144 - SetY = 3,248 + SetFrame = 2,1 + SetX = 2,48 + SetY = 2,-8 + SetX = 3,16 + SetY = 3,24 + SetVisible = 4,false - Graphic = Aerial Ace + Graphic = TARGET Focus = Target - SetX = 1,333 - SetY = 1,114 + SetX = 1,-51 + SetY = 1,18 + SetZ = 1,28 SetOpacity = 2,170 SetOpacity = 3,85 - SetX = 4,433 - SetY = 4,108 + SetX = 4,49 + SetY = 4,12 SetOpacity = 4,255 SetOpacity = 5,170 SetOpacity = 6,85 + SetVisible = 7,false - Graphic = Aerial Ace - Focus = User - SetX = 2,368 - SetY = 2,140 - SetX = 3,418 - SetY = 3,134 - SetOpacity = 4,170 - SetX = 5,182 - SetY = 5,251 - SetOpacity = 5,128 - SetX = 6,129 - SetY = 6,192 - SetOpacity = 6,255 - SetX = 7,112 - SetY = 7,172 - SetX = 8,87 - SetY = 8,169 - SetX = 9,68 - SetY = 9,160 - SetX = 10,53 - SetY = 10,151 - SetOpacity = 10,170 - SetX = 11,31 - SetY = 11,139 - SetOpacity = 11,85 - - Graphic = Aerial Ace + Graphic = TARGET Focus = Target - SetX = 3,368 - SetY = 3,140 + SetX = 2,-16 + SetY = 2,44 + SetZ = 2,29 + SetX = 3,34 + SetY = 3,38 + SetOpacity = 4,170 + SetVisible = 5,false + + Graphic = TARGET + Focus = Target + SetX = 3,-16 + SetY = 3,44 + SetZ = 3,30 SetOpacity = 3,170 SetOpacity = 4,85 - SetX = 5,418 - SetY = 5,134 + SetX = 5,34 + SetY = 5,38 + SetVisible = 6,false Graphic = Aerial Ace Focus = User - SetX = 5,158 - SetY = 5,237 + SetFrame = 5,7 + SetX = 5,54 + SetY = 5,27 + SetZ = 5,29 SetOpacity = 5,128 - SetX = 6,92 - SetY = 6,243 + SetX = 6,1 + SetY = 6,-32 SetOpacity = 6,255 - SetX = 7,79 - SetY = 7,240 - SetX = 8,64 - SetY = 8,252 - SetX = 9,35 - SetY = 9,256 - SetX = 10,17 - SetY = 10,260 + SetX = 7,-16 + SetY = 7,-52 + SetX = 8,-41 + SetY = 8,-55 + SetX = 9,-60 + SetY = 9,-64 + SetX = 10,-75 + SetY = 10,-73 SetOpacity = 10,170 + SetX = 11,-97 + SetY = 11,-85 + SetOpacity = 11,85 Graphic = Aerial Ace Focus = User - SetX = 5,125 - SetY = 5,227 + SetFrame = 5,7 + SetX = 5,30 + SetY = 5,13 + SetZ = 5,31 SetOpacity = 5,128 - SetX = 6,171 - SetY = 6,189 + SetX = 6,-36 + SetY = 6,19 SetOpacity = 6,255 - SetX = 7,195 - SetY = 7,167 - SetX = 8,204 - SetY = 8,153 - SetX = 9,228 - SetY = 9,129 - SetOpacity = 9,170 - SetX = 10,239 - SetY = 10,122 - SetOpacity = 10,85 + SetX = 7,-49 + SetY = 7,16 + SetX = 8,-64 + SetY = 8,28 + SetX = 9,-93 + SetY = 9,32 + SetX = 10,-111 + SetY = 10,36 + SetOpacity = 10,170 + SetVisible = 11,false Graphic = Aerial Ace Focus = User - SetX = 5,101 - SetY = 5,250 + SetFrame = 5,7 + SetX = 5,-3 + SetY = 5,3 + SetZ = 5,32 SetOpacity = 5,128 - SetX = 6,197 - SetY = 6,244 + SetX = 6,43 + SetY = 6,-35 SetOpacity = 6,255 - SetX = 7,196 - SetY = 7,239 - SetX = 8,228 - SetY = 8,232 - SetX = 9,264 - SetY = 9,242 - SetX = 10,283 - SetY = 10,244 - SetOpacity = 10,170 - SetX = 11,298 - SetY = 11,246 - SetOpacity = 11,85 + SetX = 7,67 + SetY = 7,-57 + SetX = 8,76 + SetY = 8,-71 + SetX = 9,100 + SetY = 9,-95 + SetOpacity = 9,170 + SetX = 10,111 + SetY = 10,-102 + SetOpacity = 10,85 + SetVisible = 11,false Graphic = Aerial Ace Focus = User - SetX = 5,147 - SetY = 5,274 + SetFrame = 5,7 + SetX = 5,-27 + SetY = 5,26 + SetZ = 5,33 SetOpacity = 5,128 - SetX = 6,173 - SetY = 6,277 + SetX = 6,69 + SetY = 6,20 SetOpacity = 6,255 - SetX = 7,189 - SetY = 7,274 - SetX = 8,211 - SetY = 8,284 + SetX = 7,68 + SetY = 7,15 + SetX = 8,100 + SetY = 8,8 + SetX = 9,136 + SetY = 9,18 + SetX = 10,155 + SetY = 10,20 + SetOpacity = 10,170 + SetX = 11,170 + SetY = 11,22 + SetOpacity = 11,85 + + Graphic = Aerial Ace + Focus = User + SetFrame = 5,7 + SetX = 5,19 + SetY = 5,50 + SetZ = 5,34 + SetOpacity = 5,128 + SetX = 6,45 + SetY = 6,53 + SetOpacity = 6,255 + SetX = 7,61 + SetY = 7,50 + SetX = 8,83 + SetY = 8,60 + SetVisible = 9,false Play = 0,Ace,80 diff --git a/PBS/Animations/Converted/Move/AGILITY.txt b/PBS/Animations/Converted/Move/AGILITY.txt index ee99355e8..631b98e03 100644 --- a/PBS/Animations/Converted/Move/AGILITY.txt +++ b/PBS/Animations/Converted/Move/AGILITY.txt @@ -3,80 +3,91 @@ [Move,AGILITY] Name = AGILITY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ! Focus = User - SetX = 0,30 - SetY = 0,188 + SetFrame = 0,5 + SetX = 0,-98 + SetY = 0,-36 + SetZ = 0,28 SetAngle = 0,90 - SetX = 1,55 - SetX = 2,80 - SetX = 3,110 - SetX = 4,135 - SetX = 5,160 - SetX = 6,185 - SetX = 7,210 - SetX = 8,235 - SetX = 9,260 + SetX = 1,-73 + SetX = 2,-48 + SetX = 3,-18 + SetX = 4,7 + SetX = 5,32 + SetX = 6,57 + SetX = 7,82 + SetX = 8,107 + SetX = 9,132 Graphic = ! Focus = User - SetX = 0,75 - SetY = 0,131 + SetFrame = 0,5 + SetX = 0,-53 + SetY = 0,-93 + SetZ = 0,29 SetAngle = 0,90 - SetX = 1,105 - SetX = 2,140 - SetX = 3,175 - SetX = 4,210 - SetX = 5,245 - SetX = 6,280 - SetX = 7,315 + SetX = 1,-23 + SetX = 2,12 + SetX = 3,47 + SetX = 4,82 + SetX = 5,117 + SetX = 6,152 + SetX = 7,187 + SetVisible = 8,false Graphic = ! Focus = User - SetX = 1,40 - SetY = 1,273 + SetFrame = 1,5 + SetX = 1,-88 + SetY = 1,49 + SetZ = 1,30 SetAngle = 1,90 - SetX = 2,65 - SetX = 3,90 - SetX = 4,115 - SetX = 5,140 - SetX = 6,165 - SetX = 7,190 - SetX = 8,215 - SetX = 9,240 + SetX = 2,-63 + SetX = 3,-38 + SetX = 4,-13 + SetX = 5,12 + SetX = 6,37 + SetX = 7,62 + SetX = 8,87 + SetX = 9,112 Graphic = ! Focus = User - SetX = 2,30 - SetY = 2,144 + SetFrame = 2,5 + SetX = 2,-98 + SetY = 2,-80 + SetZ = 2,31 SetAngle = 2,90 - SetX = 3,65 - SetX = 4,100 - SetX = 5,135 - SetX = 6,170 - SetX = 7,205 - SetX = 8,240 - SetX = 9,275 + SetX = 3,-63 + SetX = 4,-28 + SetX = 5,7 + SetX = 6,42 + SetX = 7,77 + SetX = 8,112 + SetX = 9,147 Graphic = ! Focus = User - SetX = 0,52 - SetY = 0,237 + SetFrame = 0,5 + SetX = 0,-76 + SetY = 0,13 + SetZ = 0,27 SetAngle = 0,90 - SetX = 1,82 - SetX = 2,112 - SetX = 3,142 - SetX = 4,172 - SetX = 5,202 - SetX = 6,232 - SetX = 7,262 - SetX = 8,292 - SetX = 9,322 + SetX = 1,-46 + SetX = 2,-16 + SetX = 3,14 + SetX = 4,44 + SetX = 5,74 + SetX = 6,104 + SetX = 7,134 + SetX = 8,164 + SetX = 9,194 Play = 0,Psych Up,100,82 diff --git a/PBS/Animations/Converted/Move/ALLYSWITCH.txt b/PBS/Animations/Converted/Move/ALLYSWITCH.txt index b3d4f3914..ae6dd00da 100644 --- a/PBS/Animations/Converted/Move/ALLYSWITCH.txt +++ b/PBS/Animations/Converted/Move/ALLYSWITCH.txt @@ -3,42 +3,46 @@ [Move,ALLYSWITCH] Name = ALLYSWITCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet Focus = User - SetX = 0,137 - SetY = 0,222 - SetX = 1,139 - SetY = 1,224 - SetX = 2,137 - SetY = 2,222 + SetFrame = 0,10 + SetX = 0,9 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,11 + SetX = 1,11 + SetY = 1,0 + SetFrame = 2,12 + SetX = 2,9 + SetY = 2,-2 SetZoomX = 3,110 SetZoomY = 3,110 - SetY = 4,220 + SetY = 4,-4 SetZoomX = 4,125 SetZoomY = 4,125 - SetX = 5,141 - SetY = 5,217 + SetX = 5,13 + SetY = 5,-7 SetZoomX = 5,165 SetZoomY = 5,165 - SetX = 6,142 - SetY = 6,216 + SetX = 6,14 + SetY = 6,-8 SetZoomX = 6,186 SetZoomY = 6,186 - SetX = 7,143 - SetY = 7,215 + SetX = 7,15 + SetY = 7,-9 SetZoomX = 7,202 SetZoomY = 7,202 - SetY = 8,213 + SetY = 8,-11 SetZoomX = 8,230 SetZoomY = 8,230 - SetX = 9,148 - SetY = 9,207 + SetX = 9,20 + SetY = 9,-17 SetZoomX = 9,300 SetZoomY = 9,300 SetOpacity = 14,212 diff --git a/PBS/Animations/Converted/Move/AMNESIA.txt b/PBS/Animations/Converted/Move/AMNESIA.txt index 0792d07e3..7d8f13d14 100644 --- a/PBS/Animations/Converted/Move/AMNESIA.txt +++ b/PBS/Animations/Converted/Move/AMNESIA.txt @@ -3,19 +3,22 @@ [Move,AMNESIA] Name = AMNESIA - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = mixed Focus = Target - SetX = 0,428 - SetY = 0,80 + SetFrame = 0,3 + SetX = 0,44 + SetY = 0,-16 + SetZ = 0,27 SetOpacity = 0,200 SetOpacity = 1,220 SetOpacity = 2,250 SetOpacity = 3,255 + SetVisible = 7,false Play = 0,Yawn diff --git a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt index 127ee5fa3..90eabf91c 100644 --- a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt +++ b/PBS/Animations/Converted/Move/ANCIENTPOWER.txt @@ -3,302 +3,382 @@ [Move,ANCIENTPOWER] Name = ANCIENTPOWER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Ancient-PowerFilesheet - Focus = UserAndTarget - SetX = 0,39 - SetY = 0,228 - SetX = 1,43 - SetY = 1,205 - SetX = 2,53 - SetY = 2,190 - SetX = 3,55 - SetY = 3,172 - SetX = 4,64 - SetY = 4,145 - SetX = 5,96 - SetY = 5,124 - SetY = 6,132 - SetY = 7,124 - SetY = 8,132 - SetX = 9,80 - SetY = 9,140 - SetX = 10,64 - SetY = 12,164 - SetY = 13,156 - SetY = 14,164 - SetY = 15,172 - SetY = 16,180 - SetY = 17,188 - SetX = 20,80 - SetY = 20,180 - SetX = 21,96 - SetY = 21,164 - SetX = 22,128 - SetY = 22,148 - SetX = 23,144 - SetY = 23,140 - SetY = 24,148 - SetX = 25,168 - SetY = 25,140 - SetX = 26,200 - SetY = 26,116 - SetX = 27,256 - SetY = 27,108 - SetX = 28,320 - SetY = 28,84 - SetX = 29,360 + Focus = User + SetFrame = 0,10 + SetX = 0,-89 + SetY = 0,4 + SetZ = 0,27 + SetX = 1,-85 + SetY = 1,-19 + SetX = 2,-75 + SetY = 2,-34 + SetX = 3,-73 + SetY = 3,-52 + SetX = 4,-64 + SetY = 4,-79 + SetX = 5,-32 + SetY = 5,-100 + SetY = 6,-92 + SetY = 7,-100 + SetY = 8,-92 + SetX = 9,-48 + SetY = 9,-84 + SetX = 10,-64 + SetVisible = 12,false Graphic = Ancient-PowerFilesheet - Focus = UserAndTarget - SetX = 0,305 - SetY = 0,244 - SetX = 1,304 - SetY = 1,212 - SetX = 2,300 - SetY = 2,193 - SetX = 3,291 - SetY = 3,173 - SetX = 4,272 - SetY = 4,157 - SetX = 5,253 - SetY = 5,128 - SetY = 6,136 - SetY = 7,128 - SetY = 8,136 - SetX = 9,256 - SetY = 9,144 - SetX = 10,272 - SetY = 10,136 - SetX = 12,288 - SetY = 12,152 - SetX = 13,296 - SetY = 13,144 - SetY = 14,152 - SetY = 15,160 - SetY = 16,168 - SetY = 17,176 - SetX = 20,312 - SetY = 20,160 - SetX = 21,336 - SetY = 21,144 - SetX = 22,360 - SetY = 22,128 - SetX = 23,392 - SetY = 23,104 + Focus = User + SetFrame = 0,11 + SetX = 0,177 + SetY = 0,20 + SetZ = 0,28 + SetX = 1,176 + SetY = 1,-12 + SetX = 2,172 + SetY = 2,-31 + SetX = 3,163 + SetY = 3,-51 + SetX = 4,144 + SetY = 4,-67 + SetX = 5,125 + SetY = 5,-96 + SetY = 6,-88 + SetY = 7,-96 + SetY = 8,-88 + SetX = 9,128 + SetY = 9,-80 + SetX = 10,144 + SetY = 10,-88 + SetVisible = 12,false Graphic = Ancient-PowerFilesheet - Focus = UserAndTarget - SetX = 0,140 - SetY = 0,275 - SetY = 1,251 - SetX = 2,139 - SetY = 2,236 - SetX = 3,140 - SetY = 3,207 - SetX = 4,139 - SetY = 4,180 - SetX = 5,140 - SetY = 5,152 - SetY = 6,160 - SetY = 7,152 - SetY = 8,160 - SetY = 9,176 - SetY = 10,200 - SetX = 11,168 - SetY = 11,216 - SetY = 12,224 - SetX = 13,176 - SetY = 13,232 - SetY = 14,240 - SetY = 15,248 - SetY = 16,256 - SetY = 17,264 - SetX = 20,192 - SetY = 20,240 - SetX = 21,208 - SetY = 21,224 - SetX = 22,232 - SetY = 22,200 - SetX = 23,240 - SetY = 23,192 - SetX = 24,272 - SetY = 24,176 - SetX = 25,296 - SetY = 25,160 - SetX = 26,328 - SetY = 26,136 + Focus = User + SetFrame = 0,9 + SetX = 0,12 + SetY = 0,51 + SetZ = 0,29 + SetY = 1,27 + SetX = 2,11 + SetY = 2,12 + SetX = 3,12 + SetY = 3,-17 + SetX = 4,11 + SetY = 4,-44 + SetX = 5,12 + SetY = 5,-72 + SetY = 6,-64 + SetY = 7,-72 + SetY = 8,-64 + SetY = 9,-48 + SetY = 10,-24 + SetX = 11,40 + SetY = 11,-8 + SetVisible = 12,false Graphic = Ancient-PowerFilesheet - Focus = UserAndTarget - SetX = 6,72 - SetY = 6,235 - SetY = 7,211 - SetX = 8,80 - SetY = 8,195 - SetX = 9,112 - SetY = 9,163 - SetX = 10,96 - SetY = 10,171 - SetX = 11,112 - SetY = 11,147 - SetX = 12,120 - SetY = 12,123 - SetY = 13,107 - SetY = 14,115 - SetY = 15,123 - SetY = 16,131 - SetY = 17,139 - SetX = 20,152 - SetY = 20,131 - SetX = 21,176 - SetY = 21,123 - SetX = 22,200 - SetY = 22,107 - SetX = 23,208 - SetY = 23,99 - SetX = 24,232 - SetY = 24,91 - SetX = 25,264 - SetY = 25,107 - SetX = 26,304 - SetY = 26,99 - SetX = 27,360 - SetY = 27,91 - SetX = 28,400 - SetY = 28,107 + Focus = User + SetFrame = 6,6 + SetX = 6,-56 + SetY = 6,11 + SetZ = 6,30 + SetY = 7,-13 + SetX = 8,-48 + SetY = 8,-29 + SetX = 9,-16 + SetY = 9,-61 + SetX = 10,-32 + SetY = 10,-53 + SetX = 11,-16 + SetY = 11,-77 + SetVisible = 12,false Graphic = Ancient-PowerFilesheet - Focus = UserAndTarget - SetX = 6,240 - SetY = 6,241 - SetY = 7,217 - SetY = 8,193 - SetX = 9,216 - SetY = 9,161 - SetX = 10,232 - SetY = 10,185 - SetY = 11,217 - SetX = 12,256 - SetY = 12,225 - SetX = 13,272 - SetY = 13,217 - SetY = 14,225 - SetY = 15,233 - SetY = 16,241 - SetY = 17,249 - SetX = 20,288 - SetY = 20,233 - SetX = 21,312 - SetY = 21,217 - SetX = 22,336 - SetY = 22,193 - SetX = 23,360 - SetY = 23,161 - SetX = 24,384 - SetY = 24,137 + Focus = User + SetFrame = 6,8 + SetX = 6,112 + SetY = 6,17 + SetZ = 6,31 + SetY = 7,-7 + SetY = 8,-31 + SetX = 9,88 + SetY = 9,-63 + SetX = 10,104 + SetY = 10,-39 + SetY = 11,-7 + SetVisible = 12,false Graphic = Ancient-PowerFilesheet - Focus = UserAndTarget - SetX = 6,160 - SetY = 6,265 - SetY = 7,241 - SetX = 10,112 - SetY = 10,245 - SetX = 11,104 - SetY = 11,221 - SetX = 12,96 - SetY = 12,213 - SetX = 13,88 - SetY = 14,221 - SetY = 15,229 - SetY = 16,237 - SetY = 17,245 - SetX = 20,112 - SetY = 20,237 - SetX = 21,136 - SetY = 21,229 - SetX = 22,160 - SetY = 22,213 - SetX = 23,168 - SetY = 24,221 - SetX = 25,192 - SetY = 25,197 - SetX = 26,240 - SetY = 26,173 - SetX = 27,288 - SetY = 27,165 - SetX = 28,328 - SetY = 28,141 - SetX = 29,368 - SetY = 29,133 - SetX = 30,409 - SetY = 30,112 + Focus = User + SetFrame = 6,13 + SetX = 6,32 + SetY = 6,41 + SetZ = 6,32 + SetY = 7,17 + SetVisible = 8,false Graphic = Ancient-PowerFilesheet - Focus = UserAndTarget - SetX = 8,184 - SetY = 8,221 - SetY = 9,197 - SetY = 10,141 - SetX = 11,216 - SetY = 11,133 - SetX = 12,232 - SetY = 12,125 - SetX = 13,240 - SetY = 13,109 - SetY = 14,117 - SetY = 15,125 - SetY = 16,133 - SetY = 17,141 - SetX = 20,256 - SetY = 20,133 - SetX = 21,280 - SetY = 21,125 - SetX = 22,304 - SetY = 22,109 - SetX = 23,312 - SetY = 23,100 - SetX = 24,344 - SetY = 24,92 - SetX = 25,392 - SetY = 25,84 + Focus = User + SetFrame = 8,5 + SetX = 8,56 + SetY = 8,-3 + SetZ = 8,33 + SetY = 9,-27 + SetY = 10,-83 + SetX = 11,88 + SetY = 11,-91 + SetVisible = 12,false + Graphic = Ancient-PowerFilesheet + Focus = User + SetFrame = 10,6 + SetX = 10,-16 + SetY = 10,21 + SetZ = 10,32 + SetX = 11,-24 + SetY = 11,-3 + SetVisible = 12,false + + Graphic = Ancient-PowerFilesheet + Focus = User + SetFrame = 10,10 + SetX = 10,56 + SetY = 10,56 + SetZ = 10,34 + SetY = 11,24 + SetVisible = 12,false + Graphic = Ancient-PowerFilesheet Focus = UserAndTarget - SetX = 10,184 - SetY = 10,280 - SetY = 11,248 - SetX = 12,152 - SetY = 12,240 - SetX = 13,160 - SetY = 13,232 - SetY = 14,240 - SetY = 15,248 - SetY = 16,256 - SetY = 17,264 - SetX = 20,176 - SetY = 20,240 - SetX = 21,200 - SetY = 21,224 - SetX = 22,224 - SetY = 22,208 - SetX = 23,240 - SetY = 23,216 - SetY = 24,224 - SetX = 25,304 - SetY = 25,200 - SetX = 26,328 - SetY = 26,176 - SetX = 27,368 - SetY = 27,160 - SetX = 28,432 - SetY = 28,136 + SetFrame = 12,10 + SetX = 12,-50 + SetY = 12,-93 + SetZ = 12,27 + SetY = 13,-106 + SetY = 14,-93 + SetY = 15,-81 + SetY = 16,-68 + SetY = 17,-56 + SetX = 20,-37 + SetY = 20,-68 + SetX = 21,-25 + SetY = 21,-93 + SetX = 22,0 + SetY = 22,-118 + SetX = 23,12 + SetY = 23,-131 + SetY = 24,-118 + SetX = 25,31 + SetY = 25,-131 + SetX = 26,56 + SetY = 26,-168 + SetX = 27,100 + SetY = 27,-181 + SetX = 28,150 + SetY = 28,-218 + SetX = 29,181 + SetVisible = 30,false + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetFrame = 12,11 + SetX = 12,125 + SetY = 12,-112 + SetZ = 12,28 + SetX = 13,131 + SetY = 13,-125 + SetY = 14,-112 + SetY = 15,-100 + SetY = 16,-87 + SetY = 17,-75 + SetX = 20,143 + SetY = 20,-100 + SetX = 21,162 + SetY = 21,-125 + SetX = 22,181 + SetY = 22,-150 + SetX = 23,206 + SetY = 23,-187 + SetVisible = 24,false + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetFrame = 12,9 + SetX = 12,31 + SetY = 12,0 + SetZ = 12,29 + SetX = 13,37 + SetY = 13,12 + SetY = 14,25 + SetY = 15,37 + SetY = 16,50 + SetY = 17,62 + SetX = 20,50 + SetY = 20,25 + SetX = 21,62 + SetY = 21,0 + SetX = 22,81 + SetY = 22,-37 + SetX = 23,87 + SetY = 23,-50 + SetX = 24,112 + SetY = 24,-75 + SetX = 25,131 + SetY = 25,-100 + SetX = 26,156 + SetY = 26,-137 + SetVisible = 27,false + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetFrame = 12,6 + SetX = 12,-6 + SetY = 12,-157 + SetZ = 12,30 + SetY = 13,-182 + SetY = 14,-170 + SetY = 15,-157 + SetY = 16,-145 + SetY = 17,-132 + SetX = 20,18 + SetY = 20,-145 + SetX = 21,37 + SetY = 21,-157 + SetX = 22,56 + SetY = 22,-182 + SetX = 23,62 + SetY = 23,-195 + SetX = 24,81 + SetY = 24,-207 + SetX = 25,106 + SetY = 25,-182 + SetX = 26,137 + SetY = 26,-195 + SetX = 27,181 + SetY = 27,-207 + SetX = 28,212 + SetY = 28,-182 + SetVisible = 29,false + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetFrame = 12,8 + SetX = 12,100 + SetY = 12,1 + SetZ = 12,31 + SetX = 13,112 + SetY = 13,-10 + SetY = 14,1 + SetY = 15,14 + SetY = 16,26 + SetY = 17,39 + SetX = 20,125 + SetY = 20,14 + SetX = 21,143 + SetY = 21,-10 + SetX = 22,162 + SetY = 22,-48 + SetX = 23,181 + SetY = 23,-98 + SetX = 24,200 + SetY = 24,-135 + SetVisible = 25,false + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetFrame = 12,6 + SetX = 12,-25 + SetY = 12,-17 + SetZ = 12,32 + SetX = 13,-31 + SetY = 14,-4 + SetY = 15,7 + SetY = 16,20 + SetY = 17,32 + SetX = 20,-12 + SetY = 20,20 + SetX = 21,6 + SetY = 21,7 + SetX = 22,25 + SetY = 22,-17 + SetX = 23,31 + SetY = 24,-4 + SetX = 25,50 + SetY = 25,-42 + SetX = 26,87 + SetY = 26,-79 + SetX = 27,125 + SetY = 27,-92 + SetX = 28,156 + SetY = 28,-129 + SetX = 29,187 + SetY = 29,-142 + SetX = 30,219 + SetY = 30,-175 + SetVisible = 31,false + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetFrame = 12,5 + SetX = 12,81 + SetY = 12,-154 + SetZ = 12,33 + SetX = 13,87 + SetY = 13,-179 + SetY = 14,-167 + SetY = 15,-154 + SetY = 16,-142 + SetY = 17,-129 + SetX = 20,100 + SetY = 20,-142 + SetX = 21,118 + SetY = 21,-154 + SetX = 22,137 + SetY = 22,-179 + SetX = 23,143 + SetY = 23,-193 + SetX = 24,168 + SetY = 24,-206 + SetX = 25,206 + SetY = 25,-218 + SetVisible = 26,false + + Graphic = Ancient-PowerFilesheet + Focus = UserAndTarget + SetFrame = 12,10 + SetX = 12,18 + SetY = 12,25 + SetZ = 12,34 + SetX = 13,25 + SetY = 13,12 + SetY = 14,25 + SetY = 15,37 + SetY = 16,50 + SetY = 17,62 + SetX = 20,37 + SetY = 20,25 + SetX = 21,56 + SetY = 21,0 + SetX = 22,75 + SetY = 22,-25 + SetX = 23,87 + SetY = 23,-12 + SetY = 24,0 + SetX = 25,137 + SetY = 25,-37 + SetX = 26,156 + SetY = 26,-75 + SetX = 27,187 + SetY = 27,-100 + SetX = 28,237 + SetY = 28,-137 + SetVisible = 29,false Play = 0,Earth4 Play = 24,Earth5 diff --git a/PBS/Animations/Converted/Move/AQUARING.txt b/PBS/Animations/Converted/Move/AQUARING.txt index 212f5ad12..df97bc137 100644 --- a/PBS/Animations/Converted/Move/AQUARING.txt +++ b/PBS/Animations/Converted/Move/AQUARING.txt @@ -3,59 +3,74 @@ [Move,AQUARING] Name = AQUARING - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = UserAndTarget - SetX = 2,389 - SetY = 2,108 - SetX = 3,387 - SetY = 3,100 - SetX = 4,368 - SetY = 4,96 - SetX = 5,381 - SetY = 5,93 + SetX = 2,203 + SetY = 2,-181 + SetZ = 2,28 + SetFrame = 3,9 + SetX = 3,202 + SetY = 3,-193 + SetFrame = 4,8 + SetX = 4,187 + SetY = 4,-200 + SetX = 5,197 + SetY = 5,-204 Graphic = fly copy Focus = UserAndTarget - SetX = 3,396 - SetY = 3,111 - SetX = 4,374 - SetY = 4,97 - SetX = 5,386 - SetY = 5,92 + SetX = 3,209 + SetY = 3,-176 + SetZ = 3,29 + SetFrame = 4,7 + SetX = 4,192 + SetY = 4,-198 + SetX = 5,201 + SetY = 5,-206 Graphic = fly copy Focus = UserAndTarget - SetX = 4,380 - SetY = 4,94 + SetFrame = 4,5 + SetX = 4,196 + SetY = 4,-203 + SetZ = 4,30 + SetVisible = 5,false Graphic = fly copy Focus = UserAndTarget - SetX = 4,386 - SetY = 4,104 + SetX = 4,201 + SetY = 4,-187 + SetZ = 4,31 + SetVisible = 5,false Graphic = fly copy Focus = UserAndTarget - SetX = 0,394 - SetY = 0,105 - SetX = 1,395 - SetY = 1,107 - SetX = 2,388 - SetY = 2,94 + SetX = 0,207 + SetY = 0,-185 + SetZ = 0,27 + SetX = 1,208 + SetY = 1,-182 + SetFrame = 2,5 + SetX = 2,203 + SetY = 2,-203 SetZoomX = 2,110 SetZoomY = 2,110 - SetX = 3,379 - SetY = 3,98 + SetFrame = 3,8 + SetX = 3,196 + SetY = 3,-196 SetZoomX = 3,100 SetZoomY = 3,100 - SetX = 4,382 - SetY = 4,100 - SetX = 5,394 - SetY = 5,104 + SetFrame = 4,9 + SetX = 4,198 + SetY = 4,-193 + SetFrame = 5,0 + SetX = 5,207 + SetY = 5,-187 Play = 0,Weatherball,80 diff --git a/PBS/Animations/Converted/Move/AROMATHERAPY.txt b/PBS/Animations/Converted/Move/AROMATHERAPY.txt index 308b072d4..471d3515e 100644 --- a/PBS/Animations/Converted/Move/AROMATHERAPY.txt +++ b/PBS/Animations/Converted/Move/AROMATHERAPY.txt @@ -3,16 +3,17 @@ [Move,AROMATHERAPY] Name = AROMATHERAPY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Anima (1) - Focus = Screen + Focus = Foreground SetX = 0,608 SetY = 0,-50 + SetZ = 0,27 SetX = 1,560 SetY = 1,-2 SetX = 2,496 @@ -25,122 +26,171 @@ Name = AROMATHERAPY SetY = 5,190 SetX = 6,120 SetY = 6,222 + SetFrame = 7,2 SetX = 7,104 SetY = 7,118 + SetFrame = 8,3 SetX = 8,224 SetY = 8,190 + SetFrame = 9,2 SetX = 9,248 SetY = 9,174 Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 1,1 SetX = 1,664 SetY = 1,22 + SetZ = 1,28 SetX = 2,608 SetY = 2,94 SetX = 3,520 SetY = 3,182 SetX = 4,480 SetY = 4,230 + SetFrame = 5,2 SetX = 5,304 SetY = 5,62 SetX = 6,200 SetY = 6,94 + SetFrame = 7,3 SetX = 7,296 SetY = 7,150 + SetFrame = 8,2 SetX = 8,336 SetY = 8,118 + SetFrame = 9,3 SetX = 9,112 SetY = 9,142 Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 2,2 SetX = 2,584 SetY = 2,-34 + SetZ = 2,29 SetX = 3,528 SetY = 3,-2 SetX = 4,424 SetY = 4,38 + SetFrame = 5,3 SetX = 5,312 SetY = 5,134 SetX = 6,256 SetY = 6,214 + SetFrame = 7,1 SetX = 7,88 SetY = 7,126 + SetFrame = 8,3 SetX = 8,184 SetY = 8,86 + SetVisible = 9,false Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 2,3 SetX = 2,464 SetY = 2,-42 + SetZ = 2,30 SetX = 3,408 SetY = 3,6 SetX = 4,376 SetY = 4,70 + SetFrame = 5,0 SetX = 5,448 SetY = 5,166 SetX = 6,376 SetY = 6,222 + SetFrame = 7,1 SetX = 7,512 SetY = 7,198 + SetVisible = 8,false Graphic = Anima (1) - Focus = Screen + Focus = Foreground SetX = 3,672 SetY = 3,46 + SetZ = 3,31 SetX = 4,544 SetY = 4,102 + SetFrame = 5,2 SetX = 5,560 SetY = 5,222 + SetFrame = 6,3 SetX = 6,392 SetY = 6,94 + SetFrame = 7,2 SetX = 7,416 SetY = 7,62 + SetVisible = 8,false Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 3,2 SetX = 3,664 SetY = 3,118 + SetZ = 3,32 SetX = 4,616 SetY = 4,166 + SetFrame = 5,3 SetX = 5,480 SetY = 5,54 + SetFrame = 6,1 SetX = 6,160 SetY = 6,70 + SetFrame = 7,3 SetX = 7,280 SetY = 7,30 + SetVisible = 8,false Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 3,3 SetX = 3,640 SetY = 3,-26 + SetZ = 3,33 SetX = 4,576 SetY = 4,14 + SetFrame = 5,1 SetX = 5,224 SetY = 5,22 + SetFrame = 6,0 SetX = 6,128 + SetVisible = 7,false Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 4,1 SetX = 4,336 SetY = 4,-26 + SetZ = 4,34 + SetFrame = 5,0 SetX = 5,184 SetY = 5,-34 + SetFrame = 6,1 SetX = 6,600 SetY = 6,118 + SetVisible = 7,false Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 5,1 SetX = 5,680 SetY = 5,30 + SetZ = 5,35 + SetFrame = 6,2 SetX = 6,504 SetY = 6,6 + SetVisible = 7,false Graphic = Anima (1) - Focus = Screen + Focus = Foreground + SetFrame = 5,2 SetX = 5,552 SetY = 5,-26 + SetZ = 5,36 + SetFrame = 6,3 SetX = 6,368 + SetVisible = 7,false Play = 0,Saint8,80 diff --git a/PBS/Animations/Converted/Move/AURORABEAM.txt b/PBS/Animations/Converted/Move/AURORABEAM.txt index bc6472931..dc264af82 100644 --- a/PBS/Animations/Converted/Move/AURORABEAM.txt +++ b/PBS/Animations/Converted/Move/AURORABEAM.txt @@ -3,216 +3,309 @@ [Move,AURORABEAM] Name = AURORABEAM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 023-Burst01 - Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,313 - SetY = 1,186 + Focus = User + SetFrame = 0,1 + SetX = 0,0 + SetY = 0,12 + SetZ = 0,27 + SetFrame = 1,2 + SetX = 1,185 + SetY = 1,-38 SetZoomX = 1,50 SetZoomY = 1,50 - SetX = 2,108 - SetY = 2,148 - SetX = 3,185 - SetY = 3,179 - SetX = 4,128 - SetY = 4,236 + SetFrame = 2,4 + SetX = 2,-20 + SetY = 2,-76 + SetFrame = 3,2 + SetX = 3,57 + SetY = 3,-45 + SetFrame = 4,1 + SetX = 4,0 + SetY = 4,12 SetZoomX = 4,100 SetZoomY = 4,100 - SetY = 6,230 - SetZoomX = 6,200 - SetZoomY = 6,200 - SetX = 7,166 - SetY = 7,205 - SetZoomX = 7,100 - SetZoomY = 7,100 - SetX = 8,243 - SetY = 8,154 - SetX = 9,326 - SetY = 9,129 - SetX = 10,358 - SetY = 10,110 - SetZoomX = 13,150 - SetZoomY = 13,150 - SetOpacity = 13,100 - SetY = 14,98 - SetZoomX = 14,200 - SetZoomY = 14,200 - SetY = 15,110 - SetZoomX = 15,100 - SetZoomY = 15,100 - SetOpacity = 15,50 + SetVisible = 6,false Graphic = 023-Burst01 - Focus = UserAndTarget - SetX = 1,102 - SetY = 1,72 + Focus = User + SetFrame = 1,3 + SetX = 1,-26 + SetY = 1,-152 + SetZ = 1,28 SetZoomX = 1,50 SetZoomY = 1,50 - SetX = 2,230 - SetY = 2,205 - SetX = 3,128 - SetY = 3,236 + SetX = 2,102 + SetY = 2,-19 + SetFrame = 3,1 + SetX = 3,0 + SetY = 3,12 SetZoomX = 3,100 SetZoomY = 3,100 - SetX = 4,121 - SetY = 4,230 + SetFrame = 4,2 + SetX = 4,-7 + SetY = 4,6 SetZoomX = 4,150 SetZoomY = 4,150 - SetX = 5,128 - SetY = 5,224 + SetX = 5,0 + SetY = 5,0 SetZoomX = 5,200 SetZoomY = 5,200 - SetY = 6,236 - SetZoomX = 6,100 - SetZoomY = 6,100 - SetX = 7,192 - SetY = 7,186 - SetX = 8,288 - SetY = 8,123 - SetX = 9,358 - SetY = 9,110 - SetX = 10,320 - SetY = 10,135 - SetX = 11,326 - SetY = 11,129 - SetX = 12,358 - SetY = 12,110 + SetVisible = 6,false Graphic = 023-Burst01 - Focus = UserAndTarget - SetX = 1,128 - SetY = 1,236 - SetX = 2,192 - SetY = 2,66 + Focus = User + SetFrame = 1,1 + SetX = 1,0 + SetY = 1,12 + SetZ = 1,29 + SetFrame = 2,5 + SetX = 2,64 + SetY = 2,-158 SetZoomX = 2,50 SetZoomY = 2,50 - SetX = 3,108 - SetY = 3,192 - SetX = 4,83 - SetY = 4,167 - SetX = 5,70 - SetY = 5,110 - SetX = 7,192 - SetY = 7,179 - SetZoomX = 7,150 - SetZoomY = 7,150 - SetX = 8,166 - SetY = 8,205 - SetZoomX = 8,100 - SetZoomY = 8,100 - SetX = 9,275 - SetY = 9,154 - SetY = 10,167 - SetX = 11,358 - SetY = 11,110 + SetFrame = 3,2 + SetX = 3,-20 + SetY = 3,-32 + SetFrame = 4,4 + SetX = 4,-45 + SetY = 4,-57 + SetFrame = 5,2 + SetX = 5,-58 + SetY = 5,-114 + SetVisible = 6,false - Graphic = 023-Burst01 - Focus = UserAndTarget - SetX = 2,128 - SetY = 2,236 - SetX = 3,179 - SetZoomX = 3,50 - SetZoomY = 3,50 - SetX = 4,192 - SetY = 4,192 - SetX = 5,172 - SetY = 5,104 - SetX = 8,198 - SetY = 8,186 - SetZoomX = 8,100 - SetZoomY = 8,100 - SetX = 9,236 - SetY = 9,173 - SetX = 10,358 - SetY = 10,110 - - Graphic = 023-Burst01 - Focus = UserAndTarget - SetX = 2,64 - SetY = 2,66 - SetZoomX = 2,50 - SetZoomY = 2,50 - SetX = 3,83 - SetY = 3,91 - SetX = 4,160 - SetY = 4,186 - SetX = 5,236 - SetY = 5,173 - SetX = 8,288 - SetY = 8,110 - SetZoomX = 8,120 - SetZoomY = 8,120 - SetX = 9,198 - SetY = 9,198 - SetZoomX = 9,100 - SetZoomY = 9,100 - - Graphic = 023-Burst01 - Focus = UserAndTarget - SetX = 2,345 - SetY = 2,236 - SetZoomX = 2,50 - SetZoomY = 2,50 - SetX = 3,236 - SetY = 3,242 - SetX = 4,204 - SetY = 4,249 - SetX = 5,256 - SetX = 9,364 - SetY = 9,104 - SetZoomX = 9,120 - SetZoomY = 9,120 - Graphic = 023-Burst01 Focus = User - SetX = 2,313 - SetY = 2,110 - SetZoomX = 2,50 - SetZoomY = 2,50 - SetX = 3,179 - SetY = 3,104 - SetX = 4,128 - SetY = 4,173 - - Graphic = 023-Burst01 - Focus = User - SetX = 3,115 - SetY = 3,148 + SetFrame = 2,1 + SetX = 2,0 + SetY = 2,12 + SetZ = 2,30 + SetFrame = 3,5 + SetX = 3,51 SetZoomX = 3,50 SetZoomY = 3,50 SetX = 4,64 - SetY = 4,53 + SetY = 4,-32 + SetFrame = 5,3 + SetX = 5,44 + SetY = 5,-120 + SetVisible = 6,false + + Graphic = 023-Burst01 + Focus = User + SetFrame = 2,3 + SetX = 2,-64 + SetY = 2,-158 + SetZ = 2,31 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetFrame = 3,6 + SetX = 3,-45 + SetY = 3,-133 + SetFrame = 4,4 + SetX = 4,32 + SetY = 4,-38 + SetFrame = 5,5 + SetX = 5,108 + SetY = 5,-51 + SetVisible = 6,false + + Graphic = 023-Burst01 + Focus = User + SetFrame = 2,5 + SetX = 2,217 + SetY = 2,12 + SetZ = 2,32 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetFrame = 3,7 + SetX = 3,108 + SetY = 3,18 + SetFrame = 4,6 + SetX = 4,76 + SetY = 4,25 + SetX = 5,128 + SetVisible = 6,false + + Graphic = 023-Burst01 + Focus = User + SetFrame = 2,3 + SetX = 2,185 + SetY = 2,-114 + SetZ = 2,33 + SetZoomX = 2,50 + SetZoomY = 2,50 + SetFrame = 3,5 + SetX = 3,51 + SetY = 3,-120 + SetX = 4,0 + SetY = 4,-51 + SetVisible = 5,false + + Graphic = 023-Burst01 + Focus = User + SetFrame = 3,2 + SetX = 3,-13 + SetY = 3,-76 + SetZ = 3,34 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetFrame = 4,4 + SetX = 4,-64 + SetY = 4,-171 + SetVisible = 5,false Graphic = 023-Burst01 Focus = User - SetX = 3,326 - SetY = 3,224 + SetFrame = 3,3 + SetX = 3,198 + SetY = 3,0 + SetZ = 3,35 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,198 - SetY = 4,53 + SetX = 4,70 + SetY = 4,-171 + SetVisible = 5,false Graphic = 023-Burst01 Focus = User - SetX = 3,262 - SetY = 3,148 + SetFrame = 3,4 + SetX = 3,134 + SetY = 3,-76 + SetZ = 3,36 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,300 + SetFrame = 4,2 + SetX = 4,172 + SetVisible = 5,false Graphic = 023-Burst01 Focus = User - SetX = 4,339 - SetY = 4,236 + SetFrame = 4,5 + SetX = 4,211 + SetY = 4,12 + SetZ = 4,37 SetZoomX = 4,50 SetZoomY = 4,50 + SetVisible = 5,false + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetFrame = 6,4 + SetX = 6,0 + SetY = 6,9 + SetZ = 6,27 + SetZoomX = 6,200 + SetZoomY = 6,200 + SetFrame = 7,1 + SetX = 7,29 + SetY = 7,-29 + SetZoomX = 7,100 + SetZoomY = 7,100 + SetX = 8,89 + SetY = 8,-109 + SetX = 9,154 + SetY = 9,-148 + SetX = 10,179 + SetY = 10,-178 + SetFrame = 12,3 + SetFrame = 13,1 + SetZoomX = 13,150 + SetZoomY = 13,150 + SetOpacity = 13,100 + SetY = 14,-196 + SetZoomX = 14,200 + SetZoomY = 14,200 + SetY = 15,-178 + SetZoomX = 15,100 + SetZoomY = 15,100 + SetOpacity = 15,50 + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetFrame = 6,1 + SetX = 6,0 + SetY = 6,18 + SetZ = 6,28 + SetX = 7,50 + SetY = 7,-59 + SetX = 8,125 + SetY = 8,-157 + SetX = 9,179 + SetY = 9,-178 + SetX = 10,150 + SetY = 10,-139 + SetX = 11,154 + SetY = 11,-148 + SetX = 12,179 + SetY = 12,-178 + SetVisible = 13,false + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetFrame = 7,2 + SetX = 7,50 + SetY = 7,-70 + SetZ = 7,29 + SetZoomX = 7,150 + SetZoomY = 7,150 + SetFrame = 8,1 + SetX = 8,29 + SetY = 8,-29 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetX = 9,114 + SetY = 9,-109 + SetY = 10,-89 + SetFrame = 11,3 + SetX = 11,179 + SetY = 11,-178 + SetVisible = 12,false + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetFrame = 8,1 + SetX = 8,54 + SetY = 8,-59 + SetZ = 8,30 + SetX = 9,84 + SetY = 9,-79 + SetFrame = 10,3 + SetX = 10,179 + SetY = 10,-178 + SetVisible = 11,false + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetFrame = 8,2 + SetX = 8,125 + SetY = 8,-178 + SetZ = 8,31 + SetZoomX = 8,120 + SetZoomY = 8,120 + SetFrame = 9,1 + SetX = 9,54 + SetY = 9,-40 + SetZoomX = 9,100 + SetZoomY = 9,100 + SetVisible = 10,false + + Graphic = 023-Burst01 + Focus = UserAndTarget + SetFrame = 9,3 + SetX = 9,184 + SetY = 9,-187 + SetZ = 9,32 + SetZoomX = 9,120 + SetZoomY = 9,120 + SetVisible = 10,false Play = 1,Twine,80 Play = 10,Fire3,80 diff --git a/PBS/Animations/Converted/Move/BARRIER.txt b/PBS/Animations/Converted/Move/BARRIER.txt index 2d8270a42..a7d679125 100644 --- a/PBS/Animations/Converted/Move/BARRIER.txt +++ b/PBS/Animations/Converted/Move/BARRIER.txt @@ -3,52 +3,64 @@ [Move,BARRIER] Name = BARRIER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet Focus = Target - SetX = 1,356 - SetY = 1,65 - SetX = 2,437 - SetX = 3,440 - SetY = 3,63 - SetX = 4,369 - SetY = 4,126 - SetX = 5,374 - SetY = 5,130 - SetX = 6,448 - SetY = 6,74 - SetX = 7,453 - SetY = 7,66 - SetX = 8,364 - SetY = 8,89 - SetX = 9,367 + SetFrame = 1,7 + SetX = 1,-28 + SetY = 1,-31 + SetZ = 1,28 + SetFrame = 2,8 + SetX = 2,53 + SetFrame = 3,7 + SetX = 3,56 + SetY = 3,-33 + SetFrame = 4,8 + SetX = 4,-15 + SetY = 4,30 + SetFrame = 5,7 + SetX = 5,-10 + SetY = 5,34 + SetFrame = 6,8 + SetX = 6,64 + SetY = 6,-22 + SetFrame = 7,7 + SetX = 7,69 + SetY = 7,-30 + SetFrame = 8,8 + SetX = 8,-20 + SetY = 8,-7 + SetFrame = 9,7 + SetX = 9,-17 Graphic = anim sheet Focus = Target - SetX = 0,392 - SetY = 0,95 + SetFrame = 0,15 + SetX = 0,8 + SetY = 0,-1 + SetZ = 0,27 SetOpacity = 0,154 - SetX = 1,393 - SetY = 1,90 - SetX = 2,392 - SetY = 2,95 - SetY = 3,91 - SetX = 4,395 - SetY = 4,92 - SetX = 5,397 - SetY = 5,88 - SetX = 6,398 - SetY = 6,92 - SetX = 7,394 - SetY = 7,90 - SetX = 8,395 - SetY = 8,97 - SetX = 9,379 - SetY = 9,85 + SetX = 1,9 + SetY = 1,-6 + SetX = 2,8 + SetY = 2,-1 + SetY = 3,-5 + SetX = 4,11 + SetY = 4,-4 + SetX = 5,13 + SetY = 5,-8 + SetX = 6,14 + SetY = 6,-4 + SetX = 7,10 + SetY = 7,-6 + SetX = 8,11 + SetY = 8,1 + SetX = 9,-5 + SetY = 9,-11 Play = 0,Flash2,80 diff --git a/PBS/Animations/Converted/Move/BEATUP.txt b/PBS/Animations/Converted/Move/BEATUP.txt index 597290d6a..f520ecfcd 100644 --- a/PBS/Animations/Converted/Move/BEATUP.txt +++ b/PBS/Animations/Converted/Move/BEATUP.txt @@ -3,16 +3,18 @@ [Move,BEATUP] Name = BEATUP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 0,384 - SetY = 0,86 + SetFrame = 0,17 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 SetOpacity = 0,150 @@ -25,11 +27,14 @@ Name = BEATUP Graphic = many Focus = Target - SetX = 1,392 - SetY = 1,86 + SetFrame = 1,20 + SetX = 1,8 + SetY = 1,-10 + SetZ = 1,28 SetOpacity = 1,100 - SetX = 2,384 - SetY = 2,94 + SetFrame = 2,19 + SetX = 2,0 + SetY = 2,-2 SetZoomX = 3,125 SetZoomY = 3,125 SetOpacity = 3,50 @@ -39,27 +44,32 @@ Name = BEATUP [Move,BEATUP,1] Name = Beat Up hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 1,392 - SetY = 1,86 + SetFrame = 1,20 + SetX = 1,8 + SetY = 1,-10 + SetZ = 1,28 SetOpacity = 1,100 - SetX = 2,384 - SetY = 2,94 + SetFrame = 2,19 + SetX = 2,0 + SetY = 2,-2 SetZoomX = 3,125 SetZoomY = 3,125 SetOpacity = 3,50 Graphic = many Focus = Target - SetX = 0,384 - SetY = 0,86 + SetFrame = 0,17 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 SetOpacity = 0,150 @@ -75,16 +85,18 @@ Name = Beat Up hit 2 [Move,BEATUP,2] Name = Beat Up hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 0,384 - SetY = 0,86 + SetFrame = 0,17 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 SetOpacity = 0,150 @@ -97,11 +109,14 @@ Name = Beat Up hit 3 Graphic = many Focus = Target - SetX = 1,392 - SetY = 1,86 + SetFrame = 1,20 + SetX = 1,8 + SetY = 1,-10 + SetZ = 1,28 SetOpacity = 1,100 - SetX = 2,384 - SetY = 2,94 + SetFrame = 2,19 + SetX = 2,0 + SetY = 2,-2 SetZoomX = 3,125 SetZoomY = 3,125 SetOpacity = 3,50 @@ -111,27 +126,32 @@ Name = Beat Up hit 3 [Move,BEATUP,3] Name = Beat Up hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 1,392 - SetY = 1,86 + SetFrame = 1,20 + SetX = 1,8 + SetY = 1,-10 + SetZ = 1,28 SetOpacity = 1,100 - SetX = 2,384 - SetY = 2,94 + SetFrame = 2,19 + SetX = 2,0 + SetY = 2,-2 SetZoomX = 3,125 SetZoomY = 3,125 SetOpacity = 3,50 Graphic = many Focus = Target - SetX = 0,384 - SetY = 0,86 + SetFrame = 0,17 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 SetOpacity = 0,150 @@ -147,16 +167,18 @@ Name = Beat Up hit 4 [Move,BEATUP,4] Name = Beat Up hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 0,384 - SetY = 0,86 + SetFrame = 0,17 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 SetOpacity = 0,150 @@ -169,11 +191,14 @@ Name = Beat Up hit 5 Graphic = many Focus = Target - SetX = 1,392 - SetY = 1,86 + SetFrame = 1,20 + SetX = 1,8 + SetY = 1,-10 + SetZ = 1,28 SetOpacity = 1,100 - SetX = 2,384 - SetY = 2,94 + SetFrame = 2,19 + SetX = 2,0 + SetY = 2,-2 SetZoomX = 3,125 SetZoomY = 3,125 SetOpacity = 3,50 @@ -183,27 +208,32 @@ Name = Beat Up hit 5 [Move,BEATUP,5] Name = Beat Up hit 6 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 1,392 - SetY = 1,86 + SetFrame = 1,20 + SetX = 1,8 + SetY = 1,-10 + SetZ = 1,28 SetOpacity = 1,100 - SetX = 2,384 - SetY = 2,94 + SetFrame = 2,19 + SetX = 2,0 + SetY = 2,-2 SetZoomX = 3,125 SetZoomY = 3,125 SetOpacity = 3,50 Graphic = many Focus = Target - SetX = 0,384 - SetY = 0,86 + SetFrame = 0,17 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 SetOpacity = 0,150 diff --git a/PBS/Animations/Converted/Move/BIND.txt b/PBS/Animations/Converted/Move/BIND.txt index 5cc15aef0..765db1bba 100644 --- a/PBS/Animations/Converted/Move/BIND.txt +++ b/PBS/Animations/Converted/Move/BIND.txt @@ -3,42 +3,45 @@ [Move,BIND] Name = BIND - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Struggle Focus = Target - SetX = 0,440 - SetY = 0,102 - SetX = 1,480 - SetY = 1,94 - SetX = 2,488 - SetY = 2,102 - SetX = 3,464 - SetY = 3,94 - SetX = 4,432 - SetX = 5,464 - SetX = 6,496 - SetY = 6,102 - SetX = 7,480 + SetFrame = 0,1 + SetX = 0,56 + SetY = 0,6 + SetZ = 0,28 + SetX = 1,96 + SetY = 1,-2 + SetX = 2,104 + SetY = 2,6 + SetX = 3,80 + SetY = 3,-2 + SetX = 4,48 + SetX = 5,80 + SetX = 6,112 + SetY = 6,6 + SetX = 7,96 Graphic = Struggle Focus = Target - SetX = 0,320 - SetY = 0,102 - SetX = 1,288 - SetY = 1,94 - SetX = 2,240 - SetY = 2,102 - SetX = 3,264 - SetY = 3,94 - SetX = 4,296 - SetX = 5,256 - SetX = 6,216 - SetX = 7,264 + SetX = 0,-64 + SetY = 0,6 + SetZ = 0,27 + SetX = 1,-96 + SetY = 1,-2 + SetX = 2,-144 + SetY = 2,6 + SetX = 3,-120 + SetY = 3,-2 + SetX = 4,-88 + SetX = 5,-128 + SetX = 6,-168 + SetX = 7,-120 Play = 0,Slash10,80 Play = 3,Slash10,80 diff --git a/PBS/Animations/Converted/Move/BITE.txt b/PBS/Animations/Converted/Move/BITE.txt index 92cf1ec84..dc7498b80 100644 --- a/PBS/Animations/Converted/Move/BITE.txt +++ b/PBS/Animations/Converted/Move/BITE.txt @@ -3,21 +3,32 @@ [Move,BITE] Name = BITE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Crunch Focus = Target - SetX = 0,386 - SetY = 0,96 + SetX = 0,2 + SetY = 0,0 + SetZ = 0,27 SetOpacity = 0,128 SetOpacity = 2,192 - SetX = 3,385 - SetY = 3,97 + SetFrame = 3,1 + SetX = 3,1 + SetY = 3,1 SetOpacity = 3,255 + SetFrame = 4,2 + SetFrame = 5,3 + SetFrame = 6,5 + SetFrame = 7,6 + SetFrame = 8,7 + SetFrame = 9,10 + SetFrame = 10,11 + SetFrame = 11,12 + SetFrame = 12,13 SetOpacity = 13,128 Play = 9,Sword2,80 diff --git a/PBS/Animations/Converted/Move/BLASTBURN.txt b/PBS/Animations/Converted/Move/BLASTBURN.txt index 635ecb00b..297578857 100644 --- a/PBS/Animations/Converted/Move/BLASTBURN.txt +++ b/PBS/Animations/Converted/Move/BLASTBURN.txt @@ -3,197 +3,287 @@ [Move,BLASTBURN] Name = BLASTBURN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Firebird - Focus = Target - SetX = 0,128 - SetY = 0,236 + Focus = UserAndTarget + SetFrame = 0,5 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,13 SetFlip = 1,true SetAngle = 1,20 - SetX = 2,160 - SetY = 2,161 + SetX = 2,25 + SetY = 2,-98 SetAngle = 2,0 - SetX = 3,217 - SetY = 3,129 + SetFrame = 3,10 + SetX = 3,69 + SetY = 3,-148 SetAngle = 3,20 - SetX = 4,256 - SetY = 4,110 + SetX = 4,100 + SetY = 4,-178 SetAngle = 4,0 + SetFrame = 5,16 SetFlip = 5,false - SetX = 5,377 - SetY = 5,123 + SetX = 5,194 + SetY = 5,-157 SetZoomX = 5,50 SetZoomY = 5,50 - SetX = 6,358 - SetY = 6,110 - SetZoomX = 6,100 - SetZoomY = 6,100 - SetX = 7,352 - SetY = 7,116 - SetX = 8,441 - SetY = 8,154 - SetX = 9,345 - SetY = 9,110 - SetX = 10,358 - SetY = 10,91 - SetAngle = 10,180 - SetX = 11,448 - SetY = 11,110 - SetAngle = 11,90 - SetX = 12,294 - SetY = 12,98 - SetAngle = 12,45 - SetX = 13,300 - SetY = 13,161 - SetAngle = 13,270 - SetX = 14,364 - SetY = 14,123 - SetAngle = 14,0 - SetX = 15,332 - SetY = 15,104 - SetX = 16,358 - SetOpacity = 16,100 + SetVisible = 6,false Graphic = Firebird - Focus = Target + Focus = UserAndTarget + SetFrame = 5,11 SetFlip = 5,true - SetX = 5,358 - SetY = 5,110 - SetFlip = 6,false - SetX = 6,345 - SetY = 6,123 - SetZoomX = 6,90 - SetZoomY = 6,90 - SetX = 7,371 - SetY = 7,154 - SetZoomX = 7,50 - SetZoomY = 7,50 - SetX = 8,345 - SetY = 8,161 - SetZoomX = 8,100 - SetZoomY = 8,100 - SetX = 9,435 - SetY = 9,154 - SetX = 10,396 - SetY = 10,186 - SetX = 11,294 - SetY = 11,98 - SetAngle = 11,270 - SetX = 12,339 - SetY = 12,85 - SetX = 13,352 - SetY = 13,167 - SetAngle = 13,0 - SetX = 14,422 - SetY = 14,161 - SetOpacity = 14,100 - SetX = 15,390 - SetY = 15,110 - SetOpacity = 15,255 - SetX = 16,332 - SetOpacity = 16,100 + SetX = 5,179 + SetY = 5,-178 + SetZ = 5,28 + SetVisible = 6,false Graphic = Firebird Focus = Target - SetX = 6,358 - SetY = 6,123 - SetX = 7,390 - SetY = 7,104 - SetX = 8,377 - SetY = 8,98 - SetY = 9,198 - SetX = 10,409 - SetY = 10,154 - SetAngle = 10,45 - SetX = 11,320 - SetY = 11,116 - SetAngle = 11,0 - SetX = 12,435 - SetY = 12,161 - SetX = 13,332 - SetY = 13,91 - SetX = 14,307 - SetY = 14,98 - SetOpacity = 14,100 - SetX = 15,358 - SetY = 15,104 - SetOpacity = 15,255 - SetX = 16,396 - SetY = 16,110 + SetFrame = 6,11 + SetX = 6,-26 + SetY = 6,14 + SetZ = 6,27 + SetFrame = 7,16 + SetX = 7,-32 + SetY = 7,20 + SetFrame = 8,18 + SetX = 8,57 + SetY = 8,58 + SetFrame = 9,16 + SetX = 9,-39 + SetY = 9,14 + SetFrame = 10,17 + SetX = 10,-26 + SetY = 10,-5 + SetAngle = 10,180 + SetX = 11,64 + SetY = 11,14 + SetAngle = 11,90 + SetFrame = 12,11 + SetX = 12,-90 + SetY = 12,2 + SetAngle = 12,45 + SetFrame = 13,12 + SetX = 13,-84 + SetY = 13,65 + SetAngle = 13,270 + SetFrame = 14,19 + SetX = 14,-20 + SetY = 14,27 + SetAngle = 14,0 + SetFrame = 15,14 + SetX = 15,-52 + SetY = 15,8 + SetFrame = 16,19 + SetX = 16,-26 SetOpacity = 16,100 Graphic = Firebird Focus = Target - SetX = 7,364 - SetY = 7,154 - SetX = 9,326 - SetY = 9,142 - SetX = 10,454 - SetY = 10,79 - SetAngle = 10,45 - SetX = 11,332 - SetY = 11,161 - SetAngle = 11,0 - SetX = 12,435 - SetY = 12,85 - SetX = 13,403 - SetY = 13,167 - SetX = 14,358 - SetY = 14,72 + SetFrame = 6,16 + SetX = 6,-39 + SetY = 6,27 + SetZ = 6,28 + SetZoomX = 6,90 + SetZoomY = 6,90 + SetFrame = 7,15 + SetX = 7,-13 + SetY = 7,58 + SetZoomX = 7,50 + SetZoomY = 7,50 + SetFrame = 8,14 + SetX = 8,-39 + SetY = 8,65 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetX = 9,51 + SetY = 9,58 + SetFrame = 10,17 + SetX = 10,12 + SetY = 10,90 + SetX = 11,-90 + SetY = 11,2 + SetAngle = 11,270 + SetFrame = 12,14 + SetX = 12,-45 + SetY = 12,-11 + SetX = 13,-32 + SetY = 13,71 + SetAngle = 13,0 + SetFrame = 14,18 + SetX = 14,38 + SetY = 14,65 SetOpacity = 14,100 + SetFrame = 15,15 + SetX = 15,6 + SetY = 15,14 + SetOpacity = 15,255 + SetFrame = 16,10 + SetX = 16,-52 + SetOpacity = 16,100 Graphic = Firebird Focus = Target - SetX = 9,384 - SetY = 9,91 - SetX = 10,345 - SetY = 10,98 - SetAngle = 10,135 - SetX = 11,422 - SetY = 11,161 + SetFrame = 6,12 + SetX = 6,-26 + SetY = 6,27 + SetZ = 6,29 + SetX = 7,6 + SetY = 7,8 + SetFrame = 8,16 + SetX = 8,-7 + SetY = 8,2 + SetFrame = 9,17 + SetY = 9,102 + SetFrame = 10,14 + SetX = 10,25 + SetY = 10,58 + SetAngle = 10,45 + SetFrame = 11,16 + SetX = 11,-64 + SetY = 11,20 SetAngle = 11,0 - SetX = 12,377 - SetY = 12,173 - SetX = 13,422 - SetY = 13,110 - SetX = 14,326 - SetY = 14,167 + SetFrame = 12,15 + SetX = 12,51 + SetY = 12,65 + SetFrame = 13,16 + SetX = 13,-52 + SetY = 13,-5 + SetX = 14,-77 + SetY = 14,2 SetOpacity = 14,100 + SetFrame = 15,19 + SetX = 15,-26 + SetY = 15,8 + SetOpacity = 15,255 + SetFrame = 16,12 + SetX = 16,12 + SetY = 16,14 + SetOpacity = 16,100 Graphic = Firebird Focus = Target - SetX = 9,441 - SetY = 9,167 - SetX = 10,339 - SetY = 10,123 - SetX = 11,377 - SetY = 11,85 - SetX = 13,396 - SetY = 13,123 - SetX = 14,441 - SetY = 14,79 - SetOpacity = 14,100 + SetFrame = 7,11 + SetX = 7,-20 + SetY = 7,58 + SetZ = 7,30 + SetVisible = 8,false Graphic = Firebird Focus = Target - SetX = 10,371 - SetY = 10,66 - SetX = 11,320 - SetX = 13,441 - SetY = 13,79 - SetOpacity = 13,100 - SetX = 14,396 - SetY = 14,104 - SetOpacity = 14,250 + SetFrame = 9,16 + SetX = 9,-58 + SetY = 9,46 + SetZ = 9,30 + SetFrame = 10,15 + SetX = 10,70 + SetY = 10,-17 + SetAngle = 10,45 + SetFrame = 11,14 + SetX = 11,-52 + SetY = 11,65 + SetAngle = 11,0 + SetFrame = 12,16 + SetX = 12,51 + SetY = 12,-11 + SetFrame = 13,14 + SetX = 13,19 + SetY = 13,71 + SetFrame = 14,16 + SetX = 14,-26 + SetY = 14,-24 + SetOpacity = 14,100 + SetVisible = 15,false Graphic = Firebird Focus = Target - SetX = 10,339 - SetY = 10,179 + SetFrame = 9,13 + SetX = 9,0 + SetY = 9,-5 + SetZ = 9,31 + SetFrame = 10,18 + SetX = 10,-39 + SetY = 10,2 + SetAngle = 10,135 + SetFrame = 11,15 + SetX = 11,38 + SetY = 11,65 + SetAngle = 11,0 + SetFrame = 12,18 + SetX = 12,-7 + SetY = 12,77 + SetFrame = 13,15 + SetX = 13,38 + SetY = 13,14 + SetFrame = 14,14 + SetX = 14,-58 + SetY = 14,71 + SetOpacity = 14,100 + SetVisible = 15,false + + Graphic = Firebird + Focus = Target + SetFrame = 9,13 + SetX = 9,57 + SetY = 9,71 + SetZ = 9,32 + SetFrame = 10,16 + SetX = 10,-45 + SetY = 10,27 + SetFrame = 11,12 + SetX = 11,-7 + SetY = 11,-11 + SetVisible = 12,false + + Graphic = Firebird + Focus = Target + SetFrame = 10,10 + SetX = 10,-13 + SetY = 10,-30 + SetZ = 10,33 + SetFrame = 11,11 + SetX = 11,-64 + SetVisible = 12,false + + Graphic = Firebird + Focus = Target + SetFrame = 10,14 + SetX = 10,-45 + SetY = 10,83 + SetZ = 10,34 + SetVisible = 11,false + + Graphic = Firebird + Focus = Target + SetFrame = 13,19 + SetX = 13,12 + SetY = 13,27 + SetZ = 13,32 + SetFrame = 14,12 + SetX = 14,57 + SetY = 14,-17 + SetOpacity = 14,100 + SetVisible = 15,false + + Graphic = Firebird + Focus = Target + SetFrame = 13,12 + SetX = 13,57 + SetY = 13,-17 + SetZ = 13,33 + SetOpacity = 13,100 + SetFrame = 14,14 + SetX = 14,12 + SetY = 14,8 + SetOpacity = 14,250 + SetVisible = 15,false Play = 3,Fire2,80 diff --git a/PBS/Animations/Converted/Move/BLOCK.txt b/PBS/Animations/Converted/Move/BLOCK.txt index d0424b99d..660656ddd 100644 --- a/PBS/Animations/Converted/Move/BLOCK.txt +++ b/PBS/Animations/Converted/Move/BLOCK.txt @@ -3,15 +3,17 @@ [Move,BLOCK] Name = BLOCK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = block Focus = Target - SetX = 0,385 - SetY = 0,96 + SetX = 0,1 + SetY = 0,0 + SetZ = 0,27 + SetVisible = 10,false Play = 0,buzzer,80 diff --git a/PBS/Animations/Converted/Move/BLUEFLARE.txt b/PBS/Animations/Converted/Move/BLUEFLARE.txt index 905b8c7c1..338edd8d1 100644 --- a/PBS/Animations/Converted/Move/BLUEFLARE.txt +++ b/PBS/Animations/Converted/Move/BLUEFLARE.txt @@ -3,31 +3,52 @@ [Move,BLUEFLARE] Name = BLUEFLARE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + + Graphic = anim sheet.2 + Focus = Target + SetFrame = 4,13 + SetX = 4,6 + SetY = 4,0 + SetZ = 4,27 + SetFrame = 5,14 + SetX = 5,1 + SetY = 5,-2 + SetFrame = 6,15 + SetX = 6,8 + SetVisible = 7,false + + Graphic = anim sheet.2 + Focus = Target + SetFrame = 8,16 + SetX = 8,0 + SetY = 8,-1 + SetZ = 8,27 + SetFrame = 9,17 + SetX = 9,-1 + SetFrame = 10,18 + SetX = 10,0 + SetY = 10,0 + SetFrame = 11,19 + SetX = 11,1 + SetY = 11,-4 Graphic = anim sheet.2 Focus = Target - SetX = 0,382 - SetY = 0,103 - SetX = 1,379 - SetY = 1,93 - SetX = 2,384 - SetY = 2,94 - SetX = 4,390 - SetY = 4,96 - SetX = 5,385 - SetY = 5,94 - SetX = 6,392 - SetX = 8,384 - SetY = 8,95 - SetX = 9,383 - SetX = 10,384 - SetY = 10,96 - SetX = 11,385 - SetY = 11,92 + SetFrame = 0,10 + SetX = 0,-2 + SetY = 0,7 + SetZ = 0,27 + SetFrame = 1,11 + SetX = 1,-5 + SetY = 1,-3 + SetFrame = 2,12 + SetX = 2,0 + SetY = 2,-2 + SetVisible = 3,false Play = 0,Slam,100,110 diff --git a/PBS/Animations/Converted/Move/BODYSLAM.txt b/PBS/Animations/Converted/Move/BODYSLAM.txt index d3876c207..6bc6a24e2 100644 --- a/PBS/Animations/Converted/Move/BODYSLAM.txt +++ b/PBS/Animations/Converted/Move/BODYSLAM.txt @@ -3,15 +3,20 @@ [Move,BODYSLAM] Name = BODYSLAM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 Play = 0,Damage1,80 diff --git a/PBS/Animations/Converted/Move/BRICKBREAK.txt b/PBS/Animations/Converted/Move/BRICKBREAK.txt index 8c03e9c35..7c362e3bb 100644 --- a/PBS/Animations/Converted/Move/BRICKBREAK.txt +++ b/PBS/Animations/Converted/Move/BRICKBREAK.txt @@ -3,33 +3,35 @@ [Move,BRICKBREAK] Name = BRICKBREAK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 0,296 - SetY = 0,38 - SetX = 1,320 + SetFrame = 0,13 + SetX = 0,-88 + SetY = 0,-58 + SetZ = 0,27 + SetX = 1,-64 SetAngle = 1,345 - SetX = 2,352 - SetY = 2,62 + SetX = 2,-32 + SetY = 2,-34 SetAngle = 2,330 - SetX = 3,384 - SetY = 3,86 + SetX = 3,0 + SetY = 3,-10 SetAngle = 3,315 - SetX = 4,400 - SetY = 4,118 + SetX = 4,16 + SetY = 4,22 SetAngle = 4,300 - SetX = 5,416 - SetY = 5,142 + SetX = 5,32 + SetY = 5,46 SetAngle = 5,285 - SetX = 6,432 - SetY = 6,158 - SetX = 7,440 - SetY = 7,166 + SetX = 6,48 + SetY = 6,62 + SetX = 7,56 + SetY = 7,70 Play = 4,Blow7,80 diff --git a/PBS/Animations/Converted/Move/BUBBLE.txt b/PBS/Animations/Converted/Move/BUBBLE.txt index 34266187f..ef912e45a 100644 --- a/PBS/Animations/Converted/Move/BUBBLE.txt +++ b/PBS/Animations/Converted/Move/BUBBLE.txt @@ -3,208 +3,280 @@ [Move,BUBBLE] Name = BUBBLE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,153 - SetY = 1,224 - SetX = 2,198 - SetY = 2,198 - SetX = 3,230 - SetY = 3,173 - SetX = 4,275 - SetY = 4,154 - SetX = 5,332 - SetY = 5,116 - SetX = 6,358 - SetY = 6,110 - SetX = 7,371 - SetX = 8,211 - SetY = 8,186 - SetX = 9,377 - SetY = 9,104 - SetX = 10,384 - SetY = 10,66 - SetY = 11,53 - SetX = 12,358 - SetY = 12,110 + SetFrame = 0,13 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,19 + SetY = 1,0 + SetX = 2,54 + SetY = 2,-40 + SetFrame = 3,12 + SetX = 3,79 + SetY = 3,-79 + SetX = 4,114 + SetY = 4,-109 + SetFrame = 5,11 + SetX = 5,159 + SetY = 5,-168 + SetX = 6,179 + SetY = 6,-178 + SetX = 7,189 + SetFrame = 8,13 + SetX = 8,64 + SetY = 8,-59 + SetFrame = 9,11 + SetX = 9,194 + SetY = 9,-187 + SetFrame = 10,13 + SetX = 10,200 + SetY = 10,-246 + SetFrame = 11,11 + SetY = 11,-267 + SetFrame = 12,15 + SetX = 12,179 + SetY = 12,-178 Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 1,134 - SetY = 1,217 - SetX = 2,153 - SetY = 2,205 - SetX = 3,179 - SetY = 3,186 - SetX = 4,211 - SetY = 4,154 - SetX = 5,256 - SetY = 5,142 - SetX = 6,294 - SetY = 6,123 - SetX = 7,128 - SetY = 7,236 - SetX = 8,339 - SetY = 8,85 - SetX = 9,345 - SetY = 9,66 - SetX = 10,422 - SetY = 10,72 - SetX = 11,416 - SetY = 11,91 + SetFrame = 1,13 + SetX = 1,4 + SetY = 1,-10 + SetZ = 1,28 + SetX = 2,19 + SetY = 2,-29 + SetFrame = 3,12 + SetX = 3,39 + SetY = 3,-59 + SetX = 4,64 + SetY = 4,-109 + SetFrame = 5,11 + SetX = 5,100 + SetY = 5,-128 + SetX = 6,129 + SetY = 6,-157 + SetFrame = 7,13 + SetX = 7,0 + SetY = 7,18 + SetX = 8,164 + SetY = 8,-217 + SetFrame = 9,12 + SetX = 9,169 + SetY = 9,-246 + SetFrame = 10,11 + SetX = 10,229 + SetY = 10,-237 + SetFrame = 11,12 + SetX = 11,225 + SetY = 11,-207 + SetVisible = 12,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 1,128 - SetY = 1,236 - SetX = 2,179 - SetY = 2,198 - SetX = 3,198 - SetY = 3,167 - SetX = 4,243 - SetY = 4,161 - SetX = 5,236 - SetY = 5,123 - SetX = 6,281 - SetY = 6,104 - SetX = 7,320 - SetY = 7,72 - SetX = 8,371 - SetY = 8,98 - SetX = 9,345 - SetX = 10,358 - SetY = 10,91 - SetX = 11,352 - SetY = 11,98 + SetFrame = 1,12 + SetX = 1,0 + SetY = 1,18 + SetZ = 1,29 + SetX = 2,39 + SetY = 2,-40 + SetX = 3,54 + SetY = 3,-89 + SetFrame = 4,11 + SetX = 4,89 + SetY = 4,-98 + SetFrame = 5,12 + SetX = 5,84 + SetY = 5,-157 + SetX = 6,119 + SetY = 6,-187 + SetX = 7,150 + SetY = 7,-237 + SetX = 8,189 + SetY = 8,-196 + SetFrame = 9,13 + SetX = 9,169 + SetFrame = 10,12 + SetX = 10,179 + SetY = 10,-207 + SetFrame = 11,13 + SetX = 11,175 + SetY = 11,-196 + SetVisible = 12,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 2,128 - SetY = 2,236 - SetX = 3,166 - SetY = 3,205 - SetX = 4,128 - SetY = 4,236 - SetX = 5,160 - SetY = 5,205 - SetX = 6,211 - SetY = 6,173 - SetX = 7,352 - SetY = 7,79 - SetX = 8,403 - SetY = 8,104 - SetX = 9,390 - SetY = 9,72 - SetX = 10,384 - SetY = 10,98 - SetX = 11,396 - SetY = 11,79 + SetFrame = 2,13 + SetX = 2,0 + SetY = 2,18 + SetZ = 2,30 + SetX = 3,29 + SetY = 3,-29 + SetX = 4,0 + SetY = 4,18 + SetX = 5,25 + SetY = 5,-29 + SetX = 6,64 + SetY = 6,-79 + SetFrame = 7,11 + SetX = 7,175 + SetY = 7,-226 + SetX = 8,214 + SetY = 8,-187 + SetFrame = 9,12 + SetX = 9,204 + SetY = 9,-237 + SetFrame = 10,13 + SetX = 10,200 + SetY = 10,-196 + SetFrame = 11,17 + SetX = 11,209 + SetY = 11,-226 SetOpacity = 11,100 + SetVisible = 12,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 3,140 - SetY = 3,211 - SetX = 4,211 - SetY = 4,186 - SetX = 5,300 - SetY = 5,148 - SetX = 6,275 - SetY = 6,129 - SetX = 7,281 - SetY = 7,123 - SetX = 8,358 - SetY = 8,60 - SetX = 9,377 - SetY = 9,47 - SetX = 10,339 - SetY = 10,60 + SetFrame = 3,13 + SetX = 3,9 + SetY = 3,-20 + SetZ = 3,31 + SetX = 4,64 + SetY = 4,-59 + SetX = 5,134 + SetY = 5,-118 + SetX = 6,114 + SetY = 6,-148 + SetX = 7,119 + SetY = 7,-157 + SetFrame = 8,12 + SetX = 8,179 + SetY = 8,-256 + SetFrame = 9,11 + SetX = 9,194 + SetY = 9,-276 + SetX = 10,164 + SetY = 10,-256 + SetVisible = 11,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 - SetX = 4,179 - SetY = 4,224 - SetX = 5,236 - SetY = 5,186 - SetX = 6,332 - SetY = 6,110 - SetY = 7,104 - SetX = 8,390 - SetY = 8,47 - SetX = 9,416 - SetY = 9,110 - SetX = 10,358 - SetY = 10,85 + SetFrame = 3,12 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,32 + SetX = 4,39 + SetY = 4,0 + SetX = 5,84 + SetY = 5,-59 + SetFrame = 6,13 + SetX = 6,159 + SetY = 6,-178 + SetY = 7,-187 + SetFrame = 8,11 + SetX = 8,204 + SetY = 8,-276 + SetFrame = 9,12 + SetX = 9,225 + SetY = 9,-178 + SetFrame = 10,17 + SetX = 10,179 + SetY = 10,-217 SetOpacity = 10,100 + SetVisible = 11,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 4,166 - SetY = 4,186 - SetX = 5,192 - SetY = 5,154 - SetX = 6,256 - SetY = 6,173 - SetX = 7,230 - SetY = 7,135 - SetX = 8,281 - SetY = 8,104 - SetX = 9,313 - SetY = 9,98 + SetFrame = 4,13 + SetX = 4,29 + SetY = 4,-59 + SetZ = 4,33 + SetX = 5,50 + SetY = 5,-109 + SetFrame = 6,12 + SetX = 6,100 + SetY = 6,-79 + SetFrame = 7,13 + SetX = 7,79 + SetY = 7,-139 + SetFrame = 8,12 + SetX = 8,119 + SetY = 8,-187 + SetFrame = 9,13 + SetX = 9,144 + SetY = 9,-196 + SetVisible = 10,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 5,128 - SetY = 5,236 - SetX = 6,230 - SetY = 6,142 - SetX = 7,313 - SetX = 8,326 - SetY = 8,116 - SetY = 9,129 + SetFrame = 5,12 + SetX = 5,0 + SetY = 5,18 + SetZ = 5,34 + SetFrame = 6,13 + SetX = 6,79 + SetY = 6,-128 + SetFrame = 7,12 + SetX = 7,144 + SetFrame = 8,13 + SetX = 8,154 + SetY = 8,-168 + SetFrame = 9,12 + SetY = 9,-148 + SetVisible = 10,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 6,160 - SetY = 6,236 - SetX = 7,217 - SetY = 7,179 - SetX = 8,275 - SetY = 8,148 - SetX = 9,288 - SetY = 9,129 + SetFrame = 6,13 + SetX = 6,25 + SetY = 6,18 + SetZ = 6,35 + SetFrame = 7,12 + SetX = 7,69 + SetY = 7,-70 + SetX = 8,114 + SetY = 8,-118 + SetFrame = 9,13 + SetX = 9,125 + SetY = 9,-148 + SetVisible = 10,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 6,352 - SetY = 6,85 + SetFrame = 6,17 + SetX = 6,175 + SetY = 6,-217 + SetZ = 6,36 SetOpacity = 6,100 SetFlip = 7,true - SetX = 7,377 - SetY = 7,104 + SetX = 7,194 + SetY = 7,-187 + SetFrame = 8,13 SetFlip = 8,false - SetX = 8,224 - SetY = 8,161 + SetX = 8,75 + SetY = 8,-98 SetOpacity = 8,255 + SetFrame = 9,17 SetFlip = 9,true - SetX = 9,384 - SetY = 9,98 + SetX = 9,200 + SetY = 9,-196 SetOpacity = 9,100 + SetVisible = 10,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 8,358 - SetY = 8,91 + SetFrame = 8,17 + SetX = 8,179 + SetY = 8,-207 + SetZ = 8,37 SetOpacity = 8,100 + SetVisible = 9,false Play = 0,Water5,80 diff --git a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt index 6c549d996..c945e1d82 100644 --- a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt +++ b/PBS/Animations/Converted/Move/BUBBLEBEAM.txt @@ -3,371 +3,505 @@ [Move,BUBBLEBEAM] Name = BUBBLEBEAM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 018-Water01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,179 - SetY = 1,205 - SetX = 2,243 - SetY = 2,179 - SetX = 3,160 - SetY = 3,192 - SetX = 4,326 - SetY = 4,123 - SetX = 5,275 - SetY = 5,129 - SetX = 6,166 - SetY = 6,211 - SetX = 7,224 - SetY = 7,192 - SetX = 8,236 - SetY = 8,135 - SetX = 9,249 - SetY = 9,179 - SetX = 10,384 - SetY = 10,66 - SetX = 11,185 - SetY = 11,205 - SetX = 12,281 - SetY = 12,154 - SetX = 13,358 - SetY = 13,91 - SetX = 14,390 - SetX = 15,358 - SetY = 15,110 + SetFrame = 0,13 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-29 + SetX = 2,89 + SetY = 2,-70 + SetFrame = 3,12 + SetX = 3,25 + SetY = 3,-50 + SetX = 4,154 + SetY = 4,-157 + SetX = 5,114 + SetY = 5,-148 + SetX = 6,29 + SetY = 6,-20 + SetX = 7,75 + SetY = 7,-50 + SetFrame = 8,13 + SetX = 8,84 + SetY = 8,-139 + SetFrame = 9,2 + SetX = 9,94 + SetY = 9,-70 + SetFrame = 10,13 + SetX = 10,200 + SetY = 10,-246 + SetFrame = 11,12 + SetX = 11,44 + SetY = 11,-29 + SetX = 12,119 + SetY = 12,-109 + SetX = 13,179 + SetY = 13,-207 + SetX = 14,204 + SetFrame = 15,0 + SetX = 15,179 + SetY = 15,-178 Graphic = 018-Water01 Focus = UserAndTarget - SetX = 1,140 - SetY = 1,186 - SetX = 2,192 - SetY = 2,173 - SetX = 3,224 - SetY = 3,167 - SetX = 4,300 - SetY = 4,85 - SetX = 5,358 - SetY = 5,110 - SetX = 6,371 - SetY = 6,79 - SetX = 7,384 - SetY = 7,110 - SetX = 8,339 - SetY = 8,85 - SetX = 9,364 - SetY = 9,53 - SetX = 10,217 - SetY = 10,154 - SetX = 11,416 - SetY = 11,91 - SetX = 12,390 - SetX = 13,371 - SetY = 13,72 - SetX = 14,358 - SetY = 14,98 + SetFrame = 1,13 + SetX = 1,9 + SetY = 1,-59 + SetZ = 1,28 + SetX = 2,50 + SetY = 2,-79 + SetFrame = 3,12 + SetX = 3,75 + SetY = 3,-89 + SetX = 4,134 + SetY = 4,-217 + SetX = 5,179 + SetY = 5,-178 + SetX = 6,189 + SetY = 6,-226 + SetFrame = 7,1 + SetX = 7,200 + SetY = 7,-178 + SetFrame = 8,13 + SetX = 8,164 + SetY = 8,-217 + SetFrame = 9,12 + SetX = 9,184 + SetY = 9,-267 + SetX = 10,69 + SetY = 10,-109 + SetX = 11,225 + SetY = 11,-207 + SetFrame = 12,2 + SetX = 12,204 + SetFrame = 13,12 + SetX = 13,189 + SetY = 13,-237 + SetFrame = 14,2 + SetX = 14,179 + SetY = 14,-196 + SetVisible = 15,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 1,192 - SetY = 1,179 - SetX = 2,204 - SetY = 2,148 - SetX = 3,217 - SetY = 3,129 - SetX = 4,134 - SetY = 4,230 - SetX = 5,307 - SetY = 5,98 - SetX = 6,281 - SetY = 6,104 - SetX = 7,332 - SetY = 7,72 - SetX = 8,339 - SetY = 8,116 - SetX = 9,345 - SetY = 9,98 - SetX = 10,358 - SetY = 10,91 - SetX = 11,352 - SetY = 11,98 - SetX = 12,339 + SetFrame = 1,12 + SetX = 1,50 + SetY = 1,-70 + SetZ = 1,29 + SetX = 2,59 + SetY = 2,-118 + SetX = 3,69 + SetY = 3,-148 + SetX = 4,4 + SetY = 4,9 + SetX = 5,139 + SetY = 5,-196 + SetX = 6,119 + SetY = 6,-187 + SetX = 7,159 + SetY = 7,-237 + SetFrame = 8,1 + SetX = 8,164 + SetY = 8,-168 + SetFrame = 9,13 + SetX = 9,169 + SetY = 9,-196 + SetFrame = 10,12 + SetX = 10,179 + SetY = 10,-207 + SetFrame = 11,13 + SetX = 11,175 + SetY = 11,-196 + SetFrame = 12,11 + SetX = 12,164 SetAngle = 12,90 - SetX = 13,377 - SetY = 13,85 + SetFrame = 13,4 + SetX = 13,194 + SetY = 13,-217 SetAngle = 13,0 + SetVisible = 14,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 2,128 - SetY = 2,236 - SetX = 3,262 - SetY = 3,116 - SetY = 4,161 - SetX = 5,313 - SetY = 5,154 - SetX = 6,211 - SetY = 6,173 - SetX = 7,281 - SetY = 7,79 - SetX = 8,332 - SetY = 8,53 - SetX = 9,364 - SetY = 9,85 - SetX = 10,384 - SetY = 10,98 - SetX = 11,396 - SetY = 11,79 + SetFrame = 2,13 + SetX = 2,0 + SetY = 2,18 + SetZ = 2,30 + SetX = 3,104 + SetY = 3,-168 + SetY = 4,-98 + SetX = 5,144 + SetY = 5,-109 + SetX = 6,64 + SetY = 6,-79 + SetFrame = 7,12 + SetX = 7,119 + SetY = 7,-226 + SetFrame = 8,2 + SetX = 8,159 + SetY = 8,-267 + SetFrame = 9,12 + SetX = 9,184 + SetY = 9,-217 + SetFrame = 10,13 + SetX = 10,200 + SetY = 10,-196 + SetFrame = 11,17 + SetX = 11,209 + SetY = 11,-226 SetOpacity = 11,100 - SetX = 12,371 - SetY = 12,135 + SetFrame = 12,3 + SetX = 12,189 + SetY = 12,-139 SetOpacity = 12,255 - SetX = 13,326 - SetY = 13,98 + SetFrame = 13,1 + SetX = 13,154 + SetY = 13,-196 + SetVisible = 14,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,211 - SetX = 3,198 - SetY = 3,179 - SetX = 4,275 - SetY = 4,123 - SetX = 5,371 - SetY = 5,91 - SetX = 6,326 - SetX = 7,281 - SetY = 7,123 - SetX = 8,217 - SetY = 8,161 - SetX = 9,224 - SetY = 9,167 - SetX = 10,256 - SetY = 10,186 - SetX = 11,377 - SetY = 11,72 - SetX = 12,307 - SetY = 12,161 - SetX = 13,364 - SetY = 13,98 + SetX = 2,19 + SetY = 2,-20 + SetZ = 2,31 + SetFrame = 3,12 + SetX = 3,54 + SetY = 3,-70 + SetFrame = 4,13 + SetX = 4,114 + SetY = 4,-157 + SetX = 5,189 + SetY = 5,-207 + SetX = 6,154 + SetX = 7,119 + SetY = 7,-157 + SetFrame = 8,2 + SetX = 8,69 + SetY = 8,-98 + SetFrame = 9,12 + SetX = 9,75 + SetY = 9,-89 + SetX = 10,100 + SetY = 10,-59 + SetFrame = 11,3 + SetX = 11,194 + SetY = 11,-237 + SetFrame = 12,1 + SetX = 12,139 + SetY = 12,-98 + SetFrame = 13,7 + SetX = 13,184 + SetY = 13,-196 SetOpacity = 13,50 + SetVisible = 14,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 3,275 - SetY = 3,154 - SetX = 4,313 - SetY = 4,148 - SetX = 5,256 - SetY = 5,104 - SetX = 6,204 - SetY = 6,148 - SetX = 7,339 - SetY = 7,110 - SetX = 8,211 - SetY = 8,142 - SetX = 9,140 - SetY = 9,211 - SetX = 10,294 - SetY = 10,85 - SetX = 11,192 - SetY = 11,173 + SetFrame = 3,12 + SetX = 3,114 + SetY = 3,-109 + SetZ = 3,32 + SetX = 4,144 + SetY = 4,-118 + SetX = 5,100 + SetY = 5,-187 + SetX = 6,59 + SetY = 6,-118 + SetFrame = 7,13 + SetX = 7,164 + SetY = 7,-178 + SetFrame = 8,12 + SetX = 8,64 + SetY = 8,-128 + SetFrame = 9,1 + SetX = 9,9 + SetY = 9,-20 + SetFrame = 10,12 + SetX = 10,129 + SetY = 10,-217 + SetFrame = 11,11 + SetX = 11,50 + SetY = 11,-79 SetAngle = 11,135 - SetX = 12,428 - SetY = 12,142 + SetFrame = 12,3 + SetX = 12,234 + SetY = 12,-128 SetAngle = 12,0 - SetX = 13,320 - SetY = 13,148 + SetX = 13,150 + SetY = 13,-118 + SetVisible = 14,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 3,211 - SetY = 3,161 - SetX = 4,198 - SetX = 5,307 - SetY = 5,60 - SetX = 6,371 - SetY = 6,129 - SetX = 7,147 - SetY = 7,211 - SetX = 8,281 - SetY = 8,104 - SetX = 9,339 - SetY = 9,53 - SetX = 10,275 - SetY = 10,116 - SetX = 11,224 - SetX = 12,371 - SetY = 12,41 + SetFrame = 3,1 + SetX = 3,64 + SetY = 3,-98 + SetZ = 3,33 + SetFrame = 4,12 + SetX = 4,54 + SetX = 5,139 + SetY = 5,-256 + SetX = 6,189 + SetY = 6,-148 + SetX = 7,14 + SetY = 7,-20 + SetX = 8,119 + SetY = 8,-187 + SetFrame = 9,3 + SetX = 9,164 + SetY = 9,-267 + SetFrame = 10,12 + SetX = 10,114 + SetY = 10,-168 + SetFrame = 11,1 + SetX = 11,75 + SetFrame = 12,3 + SetX = 12,189 + SetY = 12,-285 + SetVisible = 13,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 3,160 - SetY = 3,217 - SetX = 4,275 - SetY = 4,116 - SetX = 5,179 - SetY = 5,148 - SetX = 6,390 - SetY = 6,98 + SetX = 3,25 + SetY = 3,-10 + SetZ = 3,34 + SetFrame = 4,2 + SetX = 4,114 + SetY = 4,-168 + SetFrame = 5,12 + SetX = 5,39 + SetY = 5,-118 + SetFrame = 6,6 + SetX = 6,204 + SetY = 6,-196 SetOpacity = 6,100 - SetX = 7,307 - SetY = 7,173 + SetFrame = 7,2 + SetX = 7,139 + SetY = 7,-79 SetOpacity = 7,255 - SetX = 8,294 - SetY = 8,135 - SetX = 9,339 - SetY = 9,129 - SetX = 10,300 - SetY = 10,72 - SetX = 11,288 - SetY = 11,91 - SetX = 12,211 - SetY = 12,173 + SetFrame = 8,12 + SetX = 8,129 + SetY = 8,-139 + SetX = 9,164 + SetY = 9,-148 + SetFrame = 10,3 + SetX = 10,134 + SetY = 10,-237 + SetX = 11,125 + SetY = 11,-207 + SetFrame = 12,1 + SetX = 12,64 + SetY = 12,-79 + SetVisible = 13,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 4,185 - SetY = 4,186 - SetX = 5,230 - SetY = 5,167 - SetX = 6,313 - SetY = 6,135 - SetX = 7,262 - SetY = 7,129 - SetX = 8,396 - SetY = 8,135 - SetX = 9,288 - SetY = 9,129 - SetX = 10,371 - SetY = 10,104 - SetX = 11,294 - SetY = 11,47 - SetX = 12,403 - SetY = 12,85 + SetFrame = 4,2 + SetX = 4,44 + SetY = 4,-59 + SetZ = 4,35 + SetFrame = 5,12 + SetX = 5,79 + SetY = 5,-89 + SetFrame = 6,13 + SetX = 6,144 + SetY = 6,-139 + SetFrame = 7,12 + SetX = 7,104 + SetY = 7,-148 + SetFrame = 8,3 + SetX = 8,209 + SetY = 8,-139 + SetFrame = 9,13 + SetX = 9,125 + SetY = 9,-148 + SetFrame = 10,0 + SetX = 10,189 + SetY = 10,-187 + SetFrame = 11,3 + SetX = 11,129 + SetY = 11,-276 + SetFrame = 12,5 + SetX = 12,214 + SetY = 12,-217 + SetVisible = 13,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 4,172 - SetY = 4,224 - SetX = 5,313 - SetY = 5,79 - SetX = 6,249 - SetY = 6,167 - SetX = 7,198 - SetY = 7,135 - SetY = 8,110 - SetX = 9,249 - SetY = 9,142 - SetX = 10,230 - SetY = 10,186 - SetX = 11,416 - SetY = 11,154 + SetFrame = 4,12 + SetX = 4,34 + SetY = 4,0 + SetZ = 4,36 + SetFrame = 5,3 + SetX = 5,144 + SetY = 5,-226 + SetFrame = 6,1 + SetX = 6,94 + SetY = 6,-89 + SetFrame = 7,12 + SetX = 7,54 + SetY = 7,-139 + SetY = 8,-178 + SetX = 9,94 + SetY = 9,-128 + SetFrame = 10,2 + SetX = 10,79 + SetY = 10,-59 + SetFrame = 11,0 + SetX = 11,225 + SetY = 11,-109 + SetVisible = 12,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 4,288 - SetY = 4,211 - SetX = 5,281 - SetY = 5,135 - SetX = 6,377 - SetY = 6,91 - SetX = 7,384 + SetFrame = 4,12 + SetX = 4,125 + SetY = 4,-20 + SetZ = 4,37 + SetFrame = 5,3 + SetX = 5,119 + SetY = 5,-139 + SetFrame = 6,0 + SetX = 6,194 + SetY = 6,-207 + SetFrame = 7,7 + SetX = 7,200 SetOpacity = 7,100 - SetX = 9,192 - SetY = 9,148 - SetOpacity = 9,255 - SetX = 10,294 - SetY = 10,154 - SetX = 11,256 - SetY = 11,186 + SetVisible = 8,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 4,243 - SetY = 4,211 - SetX = 5,134 - SetY = 5,217 - SetX = 6,313 - SetY = 6,85 - SetY = 7,104 - SetX = 8,396 - SetY = 8,98 + SetFrame = 4,12 + SetX = 4,89 + SetY = 4,-20 + SetZ = 4,38 + SetFrame = 5,2 + SetX = 5,4 + SetY = 5,-10 + SetFrame = 6,3 + SetX = 6,144 + SetY = 6,-217 + SetFrame = 7,2 + SetY = 7,-187 + SetFrame = 8,8 + SetX = 8,209 + SetY = 8,-196 SetOpacity = 8,100 - SetY = 9,123 + SetFrame = 9,3 + SetY = 9,-157 SetOpacity = 9,255 - SetX = 10,377 - SetY = 10,154 - SetX = 11,345 - SetY = 11,135 + SetX = 10,194 + SetY = 10,-109 + SetX = 11,169 + SetY = 11,-139 + SetVisible = 12,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 4,217 - SetY = 4,129 - SetY = 5,211 - SetX = 6,396 - SetY = 6,135 - SetX = 7,147 - SetY = 7,217 - SetX = 8,377 - SetY = 8,79 - SetX = 9,320 - SetY = 9,161 - SetX = 10,243 - SetY = 10,135 - SetX = 11,147 - SetY = 11,224 + SetFrame = 4,12 + SetX = 4,69 + SetY = 4,-148 + SetZ = 4,39 + SetFrame = 5,3 + SetY = 5,-20 + SetX = 6,209 + SetY = 6,-139 + SetX = 7,14 + SetY = 7,-10 + SetX = 8,194 + SetY = 8,-226 + SetX = 9,150 + SetY = 9,-98 + SetFrame = 10,1 + SetX = 10,89 + SetY = 10,-139 + SetFrame = 11,3 + SetX = 11,14 + SetY = 11,0 + SetVisible = 12,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 4,288 - SetY = 4,179 - SetX = 5,371 - SetY = 5,135 - SetX = 6,185 - SetY = 6,179 - SetX = 7,236 - SetX = 8,166 - SetY = 8,186 - SetX = 9,198 - SetY = 9,179 - SetX = 10,275 - SetY = 10,198 - SetX = 11,409 - SetY = 11,79 + SetX = 4,125 + SetY = 4,-70 + SetZ = 4,40 + SetFrame = 5,3 + SetX = 5,189 + SetY = 5,-139 + SetX = 6,44 + SetY = 6,-70 + SetX = 7,84 + SetFrame = 8,0 + SetX = 8,29 + SetY = 8,-59 + SetFrame = 9,1 + SetX = 9,54 + SetY = 9,-70 + SetFrame = 10,2 + SetX = 10,114 + SetY = 10,-40 + SetFrame = 11,4 + SetX = 11,219 + SetY = 11,-226 + SetVisible = 12,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 6,185 - SetY = 6,236 - SetX = 7,249 - SetY = 7,123 - SetX = 8,300 - SetY = 8,161 - SetX = 9,249 - SetY = 9,116 - SetX = 10,160 - SetY = 10,186 + SetX = 6,44 + SetY = 6,18 + SetZ = 6,41 + SetFrame = 7,3 + SetX = 7,94 + SetY = 7,-157 + SetX = 8,134 + SetY = 8,-98 + SetFrame = 9,0 + SetX = 9,94 + SetY = 9,-168 + SetFrame = 10,3 + SetX = 10,25 + SetY = 10,-59 + SetVisible = 11,false Graphic = 018-Water01 Focus = UserAndTarget - SetX = 6,307 - SetY = 6,186 - SetX = 7,326 - SetY = 7,41 - SetX = 8,243 - SetY = 8,104 - SetX = 9,326 - SetY = 9,116 - SetX = 10,153 - SetY = 10,217 + SetFrame = 6,3 + SetX = 6,139 + SetY = 6,-59 + SetZ = 6,42 + SetX = 7,154 + SetY = 7,-285 + SetX = 8,89 + SetY = 8,-187 + SetX = 9,154 + SetY = 9,-168 + SetFrame = 10,2 + SetX = 10,19 + SetY = 10,-10 + SetVisible = 11,false + + Graphic = 018-Water01 + Focus = UserAndTarget + SetFrame = 9,12 + SetX = 9,50 + SetY = 9,-118 + SetZ = 9,37 + SetFrame = 10,3 + SetX = 10,129 + SetY = 10,-109 + SetFrame = 11,1 + SetX = 11,100 + SetY = 11,-59 + SetVisible = 12,false Play = 0,Water5,80 Play = 3,Blow1,80 diff --git a/PBS/Animations/Converted/Move/BULKUP.txt b/PBS/Animations/Converted/Move/BULKUP.txt index fd72ed3dc..ef3fca83a 100644 --- a/PBS/Animations/Converted/Move/BULKUP.txt +++ b/PBS/Animations/Converted/Move/BULKUP.txt @@ -3,67 +3,101 @@ [Move,BULKUP] Name = BULKUP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = animsheet - Focus = Target - SetX = 0,344 - SetY = 0,102 - SetOpacity = 0,200 - SetY = 1,94 - SetOpacity = 1,150 - SetY = 2,86 - SetOpacity = 2,100 - SetY = 3,78 - SetOpacity = 3,50 - SetY = 6,102 - SetOpacity = 6,200 - SetY = 7,94 - SetOpacity = 7,150 - SetY = 8,86 - SetOpacity = 8,100 - SetY = 9,78 - SetOpacity = 9,50 - SetY = 12,102 - SetOpacity = 12,200 - SetY = 13,94 - SetOpacity = 13,150 - SetY = 14,86 - SetOpacity = 14,100 - SetY = 15,78 - SetOpacity = 15,50 + SetX = 0,0 + SetY = 0,0 Graphic = animsheet Focus = Target - SetX = 0,464 - SetY = 0,102 + SetFrame = 0,15 + SetX = 0,80 + SetY = 0,6 + SetZ = 0,27 SetOpacity = 0,200 - SetY = 1,94 + SetY = 1,-2 SetOpacity = 1,150 - SetY = 2,86 + SetY = 2,-10 SetOpacity = 2,100 - SetY = 3,78 + SetY = 3,-18 SetOpacity = 3,50 - SetY = 6,102 + SetVisible = 4,false + + Graphic = animsheet + Focus = Target + SetFrame = 0,15 + SetX = 0,-40 + SetY = 0,6 + SetZ = 0,28 + SetOpacity = 0,200 + SetY = 1,-2 + SetOpacity = 1,150 + SetY = 2,-10 + SetOpacity = 2,100 + SetY = 3,-18 + SetOpacity = 3,50 + SetVisible = 4,false + + Graphic = animsheet + Focus = Target + SetFrame = 6,15 + SetX = 6,80 + SetY = 6,6 + SetZ = 6,27 SetOpacity = 6,200 - SetY = 7,94 + SetY = 7,-2 SetOpacity = 7,150 - SetY = 8,86 + SetY = 8,-10 SetOpacity = 8,100 - SetY = 9,78 + SetY = 9,-18 SetOpacity = 9,50 - SetY = 12,102 + SetVisible = 10,false + + Graphic = animsheet + Focus = Target + SetFrame = 6,15 + SetX = 6,-40 + SetY = 6,6 + SetZ = 6,28 + SetOpacity = 6,200 + SetY = 7,-2 + SetOpacity = 7,150 + SetY = 8,-10 + SetOpacity = 8,100 + SetY = 9,-18 + SetOpacity = 9,50 + SetVisible = 10,false + + Graphic = animsheet + Focus = Target + SetFrame = 12,15 + SetX = 12,80 + SetY = 12,6 + SetZ = 12,27 SetOpacity = 12,200 - SetY = 13,94 + SetY = 13,-2 SetOpacity = 13,150 - SetY = 14,86 + SetY = 14,-10 SetOpacity = 14,100 - SetY = 15,78 + SetY = 15,-18 SetOpacity = 15,50 + SetVisible = 16,false + + Graphic = animsheet + Focus = Target + SetFrame = 12,15 + SetX = 12,-40 + SetY = 12,6 + SetZ = 12,28 + SetOpacity = 12,200 + SetY = 13,-2 + SetOpacity = 13,150 + SetY = 14,-10 + SetOpacity = 14,100 + SetY = 15,-18 + SetOpacity = 15,50 + SetVisible = 16,false Play = 0,fog2,80,150 Play = 6,fog2,80,150 diff --git a/PBS/Animations/Converted/Move/BULLETPUNCH.txt b/PBS/Animations/Converted/Move/BULLETPUNCH.txt index cce126307..f27ad61d9 100644 --- a/PBS/Animations/Converted/Move/BULLETPUNCH.txt +++ b/PBS/Animations/Converted/Move/BULLETPUNCH.txt @@ -3,98 +3,161 @@ [Move,BULLETPUNCH] Name = BULLETPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = punches - Focus = Target - SetX = 0,386 - SetY = 0,99 - SetX = 1,391 - SetY = 1,95 - SetX = 2,403 - SetY = 2,98 - SetOpacity = 2,64 - SetX = 3,405 - SetY = 3,72 - SetOpacity = 3,255 - SetX = 4,423 - SetY = 4,73 - SetOpacity = 4,64 - SetX = 5,355 - SetY = 5,131 - SetOpacity = 5,255 - SetX = 6,364 - SetY = 6,128 - SetOpacity = 6,107 - SetX = 7,418 - SetY = 7,135 - SetOpacity = 7,255 - SetX = 8,425 - SetY = 8,131 - SetOpacity = 8,108 - SetX = 9,370 - SetY = 9,107 - SetOpacity = 9,255 - SetX = 10,415 - SetY = 10,88 - SetOpacity = 10,84 - - Graphic = punches - Focus = Target - SetX = 2,426 - SetY = 2,69 - SetX = 4,372 - SetY = 4,142 - SetX = 6,446 - SetY = 6,141 - SetX = 8,395 - SetY = 8,115 - - Graphic = punches - Focus = Target - SetX = 2,405 - SetY = 2,67 - SetX = 4,352 - SetY = 4,133 - SetX = 6,427 - SetY = 6,135 - SetX = 8,379 - SetY = 8,109 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 0,398 - SetY = 0,100 - SetX = 1,406 - SetY = 1,95 - SetX = 2,384 - SetY = 2,94 + SetFrame = 0,15 + SetX = 0,14 + SetY = 0,4 + SetZ = 0,27 + SetFrame = 1,14 + SetX = 1,22 + SetY = 1,-1 + SetFrame = 2,2 + SetX = 2,0 + SetY = 2,-2 SetOpacity = 2,84 - SetX = 3,420 - SetY = 3,67 + SetFrame = 3,14 + SetX = 3,36 + SetY = 3,-29 SetOpacity = 3,255 - SetX = 4,406 - SetY = 4,78 + SetFrame = 4,2 + SetX = 4,22 + SetY = 4,-18 SetOpacity = 4,44 - SetX = 5,368 - SetY = 5,135 + SetFrame = 5,14 + SetX = 5,-16 + SetY = 5,39 SetOpacity = 5,255 - SetX = 6,351 - SetY = 6,133 + SetFrame = 6,2 + SetX = 6,-33 + SetY = 6,37 SetOpacity = 6,64 - SetX = 7,432 + SetFrame = 7,14 + SetX = 7,48 SetOpacity = 7,255 - SetX = 8,435 + SetX = 8,51 SetOpacity = 8,36 - SetX = 9,387 - SetY = 9,103 + SetX = 9,3 + SetY = 9,7 SetOpacity = 9,255 - SetX = 10,396 - SetY = 10,88 + SetFrame = 10,2 + SetX = 10,12 + SetY = 10,-8 SetOpacity = 10,44 + SetVisible = 11,false + + Graphic = punches + Focus = Target + SetFrame = 0,2 + SetX = 0,2 + SetY = 0,3 + SetZ = 0,28 + SetX = 1,7 + SetY = 1,-1 + SetFrame = 2,14 + SetX = 2,19 + SetY = 2,2 + SetOpacity = 2,64 + SetFrame = 3,2 + SetX = 3,21 + SetY = 3,-24 + SetOpacity = 3,255 + SetFrame = 4,14 + SetX = 4,39 + SetY = 4,-23 + SetOpacity = 4,64 + SetFrame = 5,2 + SetX = 5,-29 + SetY = 5,35 + SetOpacity = 5,255 + SetFrame = 6,14 + SetX = 6,-20 + SetY = 6,32 + SetOpacity = 6,107 + SetFrame = 7,2 + SetX = 7,34 + SetY = 7,39 + SetOpacity = 7,255 + SetX = 8,41 + SetY = 8,35 + SetOpacity = 8,108 + SetX = 9,-14 + SetY = 9,11 + SetOpacity = 9,255 + SetFrame = 10,14 + SetX = 10,31 + SetY = 10,-8 + SetOpacity = 10,84 + SetVisible = 11,false + + Graphic = punches + Focus = Target + SetFrame = 2,15 + SetX = 2,42 + SetY = 2,-27 + SetZ = 2,29 + SetVisible = 3,false + + Graphic = punches + Focus = Target + SetFrame = 2,2 + SetX = 2,21 + SetY = 2,-29 + SetZ = 2,30 + SetVisible = 3,false + + Graphic = punches + Focus = Target + SetFrame = 4,15 + SetX = 4,-12 + SetY = 4,46 + SetZ = 4,29 + SetVisible = 5,false + + Graphic = punches + Focus = Target + SetFrame = 4,2 + SetX = 4,-32 + SetY = 4,37 + SetZ = 4,30 + SetVisible = 5,false + + Graphic = punches + Focus = Target + SetFrame = 6,15 + SetX = 6,62 + SetY = 6,45 + SetZ = 6,29 + SetVisible = 7,false + + Graphic = punches + Focus = Target + SetFrame = 6,2 + SetX = 6,43 + SetY = 6,39 + SetZ = 6,30 + SetVisible = 7,false + + Graphic = punches + Focus = Target + SetFrame = 8,15 + SetX = 8,11 + SetY = 8,19 + SetZ = 8,29 + SetVisible = 9,false + + Graphic = punches + Focus = Target + SetFrame = 8,2 + SetX = 8,-5 + SetY = 8,13 + SetZ = 8,30 + SetVisible = 9,false Play = 0,Comet Punch,100,59 diff --git a/PBS/Animations/Converted/Move/BULLETSEED.txt b/PBS/Animations/Converted/Move/BULLETSEED.txt index 0db676408..ad930cdd2 100644 --- a/PBS/Animations/Converted/Move/BULLETSEED.txt +++ b/PBS/Animations/Converted/Move/BULLETSEED.txt @@ -3,94 +3,103 @@ [Move,BULLETSEED] Name = BULLETSEED - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 0,160 - SetY = 0,198 - SetX = 1,211 - SetY = 1,173 - SetX = 2,249 - SetY = 2,148 - SetX = 3,300 - SetY = 3,129 - SetX = 4,358 - SetY = 4,104 - SetX = 5,352 - SetY = 5,85 - SetX = 6,332 - SetY = 6,66 + SetX = 0,25 + SetY = 0,-40 + SetZ = 0,27 + SetX = 1,64 + SetY = 1,-79 + SetX = 2,94 + SetY = 2,-118 + SetX = 3,134 + SetY = 3,-148 + SetX = 4,179 + SetY = 4,-187 + SetX = 5,175 + SetY = 5,-217 + SetX = 6,159 + SetY = 6,-246 SetOpacity = 6,100 - SetX = 7,422 - SetY = 7,60 - SetX = 8,326 - SetY = 8,47 - SetX = 9,428 - SetY = 9,98 - SetX = 10,352 - SetY = 10,47 + SetX = 7,229 + SetY = 7,-256 + SetX = 8,154 + SetY = 8,-276 + SetX = 9,234 + SetY = 9,-196 + SetX = 10,175 + SetY = 10,-276 Graphic = leech-seed Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,256 - SetY = 3,154 - SetX = 4,307 - SetY = 4,135 - SetX = 5,358 - SetY = 5,104 - SetX = 6,403 - SetY = 6,72 - SetX = 7,345 - SetY = 7,66 - SetX = 8,416 - SetY = 8,85 - SetX = 9,364 - SetY = 9,79 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,100 + SetY = 3,-109 + SetX = 4,139 + SetY = 4,-139 + SetX = 5,179 + SetY = 5,-187 + SetX = 6,214 + SetY = 6,-237 + SetX = 7,169 + SetY = 7,-246 + SetX = 8,225 + SetY = 8,-217 + SetX = 9,184 + SetY = 9,-226 + SetVisible = 10,false Graphic = leech-seed Focus = UserAndTarget - SetX = 2,172 - SetY = 2,198 - SetX = 3,211 - SetY = 3,179 - SetX = 4,262 - SetY = 4,167 - SetX = 5,307 - SetY = 5,135 - SetX = 6,358 - SetY = 6,98 - SetX = 7,364 - SetY = 8,110 + SetX = 2,34 + SetY = 2,-40 + SetZ = 2,29 + SetX = 3,64 + SetY = 3,-70 + SetX = 4,104 + SetY = 4,-89 + SetX = 5,139 + SetY = 5,-139 + SetX = 6,179 + SetY = 6,-196 + SetX = 7,184 + SetY = 8,-178 + SetVisible = 9,false Graphic = leech-seed Focus = UserAndTarget - SetX = 3,172 - SetY = 3,205 - SetX = 4,217 - SetY = 4,192 - SetX = 5,262 - SetY = 5,167 - SetX = 6,307 - SetY = 6,129 - SetX = 7,313 + SetX = 3,34 + SetY = 3,-29 + SetZ = 3,30 + SetX = 4,69 + SetY = 4,-50 + SetX = 5,104 + SetY = 5,-89 + SetX = 6,139 + SetY = 6,-148 + SetX = 7,144 + SetVisible = 8,false Graphic = leech-seed Focus = UserAndTarget - SetX = 4,179 - SetY = 4,217 - SetX = 5,217 - SetY = 5,192 - SetX = 6,256 - SetY = 6,161 + SetX = 4,39 + SetY = 4,-10 + SetZ = 4,31 + SetX = 5,69 + SetY = 5,-50 + SetX = 6,100 + SetY = 6,-98 + SetVisible = 7,false Play = 0,throw,80 Play = 2,throw,80 @@ -103,94 +112,103 @@ Name = BULLETSEED [Move,BULLETSEED,1] Name = Bullet Seed hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 4,179 - SetY = 4,217 - SetX = 5,217 - SetY = 5,192 - SetX = 6,256 - SetY = 6,161 + SetX = 4,39 + SetY = 4,-10 + SetZ = 4,31 + SetX = 5,69 + SetY = 5,-50 + SetX = 6,100 + SetY = 6,-98 + SetVisible = 7,false Graphic = leech-seed Focus = UserAndTarget - SetX = 0,160 - SetY = 0,198 - SetX = 1,211 - SetY = 1,173 - SetX = 2,249 - SetY = 2,148 - SetX = 3,300 - SetY = 3,129 - SetX = 4,358 - SetY = 4,104 - SetX = 5,352 - SetY = 5,85 - SetX = 6,332 - SetY = 6,66 + SetX = 0,25 + SetY = 0,-40 + SetZ = 0,27 + SetX = 1,64 + SetY = 1,-79 + SetX = 2,94 + SetY = 2,-118 + SetX = 3,134 + SetY = 3,-148 + SetX = 4,179 + SetY = 4,-187 + SetX = 5,175 + SetY = 5,-217 + SetX = 6,159 + SetY = 6,-246 SetOpacity = 6,100 - SetX = 7,422 - SetY = 7,60 - SetX = 8,326 - SetY = 8,47 - SetX = 9,428 - SetY = 9,98 - SetX = 10,352 - SetY = 10,47 + SetX = 7,229 + SetY = 7,-256 + SetX = 8,154 + SetY = 8,-276 + SetX = 9,234 + SetY = 9,-196 + SetX = 10,175 + SetY = 10,-276 Graphic = leech-seed Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,256 - SetY = 3,154 - SetX = 4,307 - SetY = 4,135 - SetX = 5,358 - SetY = 5,104 - SetX = 6,403 - SetY = 6,72 - SetX = 7,345 - SetY = 7,66 - SetX = 8,416 - SetY = 8,85 - SetX = 9,364 - SetY = 9,79 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,100 + SetY = 3,-109 + SetX = 4,139 + SetY = 4,-139 + SetX = 5,179 + SetY = 5,-187 + SetX = 6,214 + SetY = 6,-237 + SetX = 7,169 + SetY = 7,-246 + SetX = 8,225 + SetY = 8,-217 + SetX = 9,184 + SetY = 9,-226 + SetVisible = 10,false Graphic = leech-seed Focus = UserAndTarget - SetX = 2,172 - SetY = 2,198 - SetX = 3,211 - SetY = 3,179 - SetX = 4,262 - SetY = 4,167 - SetX = 5,307 - SetY = 5,135 - SetX = 6,358 - SetY = 6,98 - SetX = 7,364 - SetY = 8,110 + SetX = 2,34 + SetY = 2,-40 + SetZ = 2,29 + SetX = 3,64 + SetY = 3,-70 + SetX = 4,104 + SetY = 4,-89 + SetX = 5,139 + SetY = 5,-139 + SetX = 6,179 + SetY = 6,-196 + SetX = 7,184 + SetY = 8,-178 + SetVisible = 9,false Graphic = leech-seed Focus = UserAndTarget - SetX = 3,172 - SetY = 3,205 - SetX = 4,217 - SetY = 4,192 - SetX = 5,262 - SetY = 5,167 - SetX = 6,307 - SetY = 6,129 - SetX = 7,313 + SetX = 3,34 + SetY = 3,-29 + SetZ = 3,30 + SetX = 4,69 + SetY = 4,-50 + SetX = 5,104 + SetY = 5,-89 + SetX = 6,139 + SetY = 6,-148 + SetX = 7,144 + SetVisible = 8,false Play = 0,throw,80 Play = 2,throw,80 @@ -203,94 +221,103 @@ Name = Bullet Seed hit 2 [Move,BULLETSEED,2] Name = Bullet Seed hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 3,172 - SetY = 3,205 - SetX = 4,217 - SetY = 4,192 - SetX = 5,262 - SetY = 5,167 - SetX = 6,307 - SetY = 6,129 - SetX = 7,313 + SetX = 3,34 + SetY = 3,-29 + SetZ = 3,30 + SetX = 4,69 + SetY = 4,-50 + SetX = 5,104 + SetY = 5,-89 + SetX = 6,139 + SetY = 6,-148 + SetX = 7,144 + SetVisible = 8,false Graphic = leech-seed Focus = UserAndTarget - SetX = 4,179 - SetY = 4,217 - SetX = 5,217 - SetY = 5,192 - SetX = 6,256 - SetY = 6,161 + SetX = 4,39 + SetY = 4,-10 + SetZ = 4,31 + SetX = 5,69 + SetY = 5,-50 + SetX = 6,100 + SetY = 6,-98 + SetVisible = 7,false Graphic = leech-seed Focus = UserAndTarget - SetX = 0,160 - SetY = 0,198 - SetX = 1,211 - SetY = 1,173 - SetX = 2,249 - SetY = 2,148 - SetX = 3,300 - SetY = 3,129 - SetX = 4,358 - SetY = 4,104 - SetX = 5,352 - SetY = 5,85 - SetX = 6,332 - SetY = 6,66 + SetX = 0,25 + SetY = 0,-40 + SetZ = 0,27 + SetX = 1,64 + SetY = 1,-79 + SetX = 2,94 + SetY = 2,-118 + SetX = 3,134 + SetY = 3,-148 + SetX = 4,179 + SetY = 4,-187 + SetX = 5,175 + SetY = 5,-217 + SetX = 6,159 + SetY = 6,-246 SetOpacity = 6,100 - SetX = 7,422 - SetY = 7,60 - SetX = 8,326 - SetY = 8,47 - SetX = 9,428 - SetY = 9,98 - SetX = 10,352 - SetY = 10,47 + SetX = 7,229 + SetY = 7,-256 + SetX = 8,154 + SetY = 8,-276 + SetX = 9,234 + SetY = 9,-196 + SetX = 10,175 + SetY = 10,-276 Graphic = leech-seed Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,256 - SetY = 3,154 - SetX = 4,307 - SetY = 4,135 - SetX = 5,358 - SetY = 5,104 - SetX = 6,403 - SetY = 6,72 - SetX = 7,345 - SetY = 7,66 - SetX = 8,416 - SetY = 8,85 - SetX = 9,364 - SetY = 9,79 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,100 + SetY = 3,-109 + SetX = 4,139 + SetY = 4,-139 + SetX = 5,179 + SetY = 5,-187 + SetX = 6,214 + SetY = 6,-237 + SetX = 7,169 + SetY = 7,-246 + SetX = 8,225 + SetY = 8,-217 + SetX = 9,184 + SetY = 9,-226 + SetVisible = 10,false Graphic = leech-seed Focus = UserAndTarget - SetX = 2,172 - SetY = 2,198 - SetX = 3,211 - SetY = 3,179 - SetX = 4,262 - SetY = 4,167 - SetX = 5,307 - SetY = 5,135 - SetX = 6,358 - SetY = 6,98 - SetX = 7,364 - SetY = 8,110 + SetX = 2,34 + SetY = 2,-40 + SetZ = 2,29 + SetX = 3,64 + SetY = 3,-70 + SetX = 4,104 + SetY = 4,-89 + SetX = 5,139 + SetY = 5,-139 + SetX = 6,179 + SetY = 6,-196 + SetX = 7,184 + SetY = 8,-178 + SetVisible = 9,false Play = 0,throw,80 Play = 2,throw,80 @@ -303,94 +330,103 @@ Name = Bullet Seed hit 3 [Move,BULLETSEED,3] Name = Bullet Seed hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 2,172 - SetY = 2,198 - SetX = 3,211 - SetY = 3,179 - SetX = 4,262 - SetY = 4,167 - SetX = 5,307 - SetY = 5,135 - SetX = 6,358 - SetY = 6,98 - SetX = 7,364 - SetY = 8,110 + SetX = 2,34 + SetY = 2,-40 + SetZ = 2,29 + SetX = 3,64 + SetY = 3,-70 + SetX = 4,104 + SetY = 4,-89 + SetX = 5,139 + SetY = 5,-139 + SetX = 6,179 + SetY = 6,-196 + SetX = 7,184 + SetY = 8,-178 + SetVisible = 9,false Graphic = leech-seed Focus = UserAndTarget - SetX = 3,172 - SetY = 3,205 - SetX = 4,217 - SetY = 4,192 - SetX = 5,262 - SetY = 5,167 - SetX = 6,307 - SetY = 6,129 - SetX = 7,313 + SetX = 3,34 + SetY = 3,-29 + SetZ = 3,30 + SetX = 4,69 + SetY = 4,-50 + SetX = 5,104 + SetY = 5,-89 + SetX = 6,139 + SetY = 6,-148 + SetX = 7,144 + SetVisible = 8,false Graphic = leech-seed Focus = UserAndTarget - SetX = 4,179 - SetY = 4,217 - SetX = 5,217 - SetY = 5,192 - SetX = 6,256 - SetY = 6,161 + SetX = 4,39 + SetY = 4,-10 + SetZ = 4,31 + SetX = 5,69 + SetY = 5,-50 + SetX = 6,100 + SetY = 6,-98 + SetVisible = 7,false Graphic = leech-seed Focus = UserAndTarget - SetX = 0,160 - SetY = 0,198 - SetX = 1,211 - SetY = 1,173 - SetX = 2,249 - SetY = 2,148 - SetX = 3,300 - SetY = 3,129 - SetX = 4,358 - SetY = 4,104 - SetX = 5,352 - SetY = 5,85 - SetX = 6,332 - SetY = 6,66 + SetX = 0,25 + SetY = 0,-40 + SetZ = 0,27 + SetX = 1,64 + SetY = 1,-79 + SetX = 2,94 + SetY = 2,-118 + SetX = 3,134 + SetY = 3,-148 + SetX = 4,179 + SetY = 4,-187 + SetX = 5,175 + SetY = 5,-217 + SetX = 6,159 + SetY = 6,-246 SetOpacity = 6,100 - SetX = 7,422 - SetY = 7,60 - SetX = 8,326 - SetY = 8,47 - SetX = 9,428 - SetY = 9,98 - SetX = 10,352 - SetY = 10,47 + SetX = 7,229 + SetY = 7,-256 + SetX = 8,154 + SetY = 8,-276 + SetX = 9,234 + SetY = 9,-196 + SetX = 10,175 + SetY = 10,-276 Graphic = leech-seed Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,256 - SetY = 3,154 - SetX = 4,307 - SetY = 4,135 - SetX = 5,358 - SetY = 5,104 - SetX = 6,403 - SetY = 6,72 - SetX = 7,345 - SetY = 7,66 - SetX = 8,416 - SetY = 8,85 - SetX = 9,364 - SetY = 9,79 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,100 + SetY = 3,-109 + SetX = 4,139 + SetY = 4,-139 + SetX = 5,179 + SetY = 5,-187 + SetX = 6,214 + SetY = 6,-237 + SetX = 7,169 + SetY = 7,-246 + SetX = 8,225 + SetY = 8,-217 + SetX = 9,184 + SetY = 9,-226 + SetVisible = 10,false Play = 0,throw,80 Play = 2,throw,80 @@ -403,94 +439,103 @@ Name = Bullet Seed hit 4 [Move,BULLETSEED,4] Name = Bullet Seed hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,256 - SetY = 3,154 - SetX = 4,307 - SetY = 4,135 - SetX = 5,358 - SetY = 5,104 - SetX = 6,403 - SetY = 6,72 - SetX = 7,345 - SetY = 7,66 - SetX = 8,416 - SetY = 8,85 - SetX = 9,364 - SetY = 9,79 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,100 + SetY = 3,-109 + SetX = 4,139 + SetY = 4,-139 + SetX = 5,179 + SetY = 5,-187 + SetX = 6,214 + SetY = 6,-237 + SetX = 7,169 + SetY = 7,-246 + SetX = 8,225 + SetY = 8,-217 + SetX = 9,184 + SetY = 9,-226 + SetVisible = 10,false Graphic = leech-seed Focus = UserAndTarget - SetX = 2,172 - SetY = 2,198 - SetX = 3,211 - SetY = 3,179 - SetX = 4,262 - SetY = 4,167 - SetX = 5,307 - SetY = 5,135 - SetX = 6,358 - SetY = 6,98 - SetX = 7,364 - SetY = 8,110 + SetX = 2,34 + SetY = 2,-40 + SetZ = 2,29 + SetX = 3,64 + SetY = 3,-70 + SetX = 4,104 + SetY = 4,-89 + SetX = 5,139 + SetY = 5,-139 + SetX = 6,179 + SetY = 6,-196 + SetX = 7,184 + SetY = 8,-178 + SetVisible = 9,false Graphic = leech-seed Focus = UserAndTarget - SetX = 3,172 - SetY = 3,205 - SetX = 4,217 - SetY = 4,192 - SetX = 5,262 - SetY = 5,167 - SetX = 6,307 - SetY = 6,129 - SetX = 7,313 + SetX = 3,34 + SetY = 3,-29 + SetZ = 3,30 + SetX = 4,69 + SetY = 4,-50 + SetX = 5,104 + SetY = 5,-89 + SetX = 6,139 + SetY = 6,-148 + SetX = 7,144 + SetVisible = 8,false Graphic = leech-seed Focus = UserAndTarget - SetX = 4,179 - SetY = 4,217 - SetX = 5,217 - SetY = 5,192 - SetX = 6,256 - SetY = 6,161 + SetX = 4,39 + SetY = 4,-10 + SetZ = 4,31 + SetX = 5,69 + SetY = 5,-50 + SetX = 6,100 + SetY = 6,-98 + SetVisible = 7,false Graphic = leech-seed Focus = UserAndTarget - SetX = 0,160 - SetY = 0,198 - SetX = 1,211 - SetY = 1,173 - SetX = 2,249 - SetY = 2,148 - SetX = 3,300 - SetY = 3,129 - SetX = 4,358 - SetY = 4,104 - SetX = 5,352 - SetY = 5,85 - SetX = 6,332 - SetY = 6,66 + SetX = 0,25 + SetY = 0,-40 + SetZ = 0,27 + SetX = 1,64 + SetY = 1,-79 + SetX = 2,94 + SetY = 2,-118 + SetX = 3,134 + SetY = 3,-148 + SetX = 4,179 + SetY = 4,-187 + SetX = 5,175 + SetY = 5,-217 + SetX = 6,159 + SetY = 6,-246 SetOpacity = 6,100 - SetX = 7,422 - SetY = 7,60 - SetX = 8,326 - SetY = 8,47 - SetX = 9,428 - SetY = 9,98 - SetX = 10,352 - SetY = 10,47 + SetX = 7,229 + SetY = 7,-256 + SetX = 8,154 + SetY = 8,-276 + SetX = 9,234 + SetY = 9,-196 + SetX = 10,175 + SetY = 10,-276 Play = 0,throw,80 Play = 2,throw,80 diff --git a/PBS/Animations/Converted/Move/CHARGE.txt b/PBS/Animations/Converted/Move/CHARGE.txt index ac2b3b9c9..d994488ae 100644 --- a/PBS/Animations/Converted/Move/CHARGE.txt +++ b/PBS/Animations/Converted/Move/CHARGE.txt @@ -3,94 +3,147 @@ [Move,CHARGE] Name = CHARGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = electric2 Focus = User - SetX = 0,328 - SetY = 0,238 - SetX = 1,296 - SetX = 2,216 - SetY = 2,230 - SetX = 3,184 - SetX = 4,176 - SetX = 6,72 - SetY = 6,262 - SetX = 7,168 - SetY = 7,190 - SetX = 8,24 - SetX = 9,192 - SetY = 9,174 - SetX = 10,64 - SetY = 10,294 + SetX = 0,200 + SetY = 0,14 + SetZ = 0,27 + SetFrame = 1,7 + SetX = 1,168 + SetFrame = 2,0 + SetX = 2,88 + SetY = 2,6 + SetFrame = 3,7 + SetX = 3,56 + SetFrame = 4,1 + SetX = 4,48 + SetFrame = 5,2 + SetFrame = 6,6 + SetX = 6,-56 + SetY = 6,38 + SetFrame = 7,5 + SetX = 7,40 + SetY = 7,-34 + SetFrame = 8,1 + SetX = 8,-104 + SetFrame = 9,6 + SetX = 9,64 + SetY = 9,-50 + SetFrame = 10,5 + SetX = 10,-64 + SetY = 10,70 + SetFrame = 11,6 SetOpacity = 11,100 Graphic = electric2 Focus = User - SetX = 1,-32 - SetY = 1,230 - SetX = 2,0 - SetX = 3,40 - SetX = 4,64 - SetX = 5,72 - SetY = 5,254 - SetX = 6,168 - SetY = 6,190 - SetX = 7,24 - SetX = 8,48 - SetY = 8,302 - SetX = 9,16 - SetY = 9,198 + SetFrame = 1,3 + SetX = 1,-160 + SetY = 1,6 + SetZ = 1,28 + SetFrame = 2,4 + SetX = 2,-128 + SetFrame = 3,3 + SetX = 3,-88 + SetFrame = 4,4 + SetX = 4,-64 + SetFrame = 5,5 + SetX = 5,-56 + SetY = 5,30 + SetFrame = 6,6 + SetX = 6,40 + SetY = 6,-34 + SetFrame = 7,2 + SetX = 7,-104 + SetFrame = 8,6 + SetX = 8,-80 + SetY = 8,78 + SetFrame = 9,2 + SetX = 9,-112 + SetY = 9,-26 + SetFrame = 10,1 SetOpacity = 10,100 - SetX = 11,232 - SetY = 11,222 + SetFrame = 11,3 + SetX = 11,104 + SetY = 11,-2 Graphic = electric2 Focus = User - SetX = 3,328 - SetY = 3,238 - SetX = 4,280 - SetX = 5,216 - SetY = 5,230 - SetX = 6,72 - SetY = 6,238 - SetX = 7,48 - SetY = 7,302 - SetX = 8,176 - SetY = 8,222 - SetX = 10,208 - SetX = 11,200 - SetY = 11,310 + SetFrame = 3,4 + SetX = 3,200 + SetY = 3,14 + SetZ = 3,29 + SetFrame = 4,3 + SetX = 4,152 + SetFrame = 5,4 + SetX = 5,88 + SetY = 5,6 + SetFrame = 6,0 + SetX = 6,-56 + SetY = 6,14 + SetFrame = 7,5 + SetX = 7,-80 + SetY = 7,78 + SetFrame = 8,7 + SetX = 8,48 + SetY = 8,-2 + SetVisible = 9,false Graphic = electric2 Focus = User - SetX = 4,-72 - SetY = 4,238 - SetX = 5,-24 - SetX = 6,56 - SetY = 6,190 - SetY = 7,238 - SetX = 8,192 - SetY = 8,174 + SetX = 4,-200 + SetY = 4,14 + SetZ = 4,30 + SetFrame = 5,7 + SetX = 5,-152 + SetFrame = 6,1 + SetX = 6,-72 + SetY = 6,-34 + SetFrame = 7,3 + SetY = 7,14 + SetFrame = 8,5 + SetX = 8,64 + SetY = 8,-50 + SetVisible = 9,false Graphic = electric2 Focus = User - SetX = 5,344 - SetY = 5,246 - SetX = 6,304 - SetX = 7,216 - SetY = 7,238 - SetX = 8,176 - SetY = 8,278 + SetX = 5,216 + SetY = 5,22 + SetZ = 5,31 + SetFrame = 6,3 + SetX = 6,176 + SetFrame = 7,4 + SetX = 7,88 + SetY = 7,14 + SetFrame = 8,2 + SetX = 8,48 + SetY = 8,54 + SetVisible = 9,false Graphic = electric2 Focus = User - SetX = 7,176 - SetY = 7,286 + SetFrame = 7,1 + SetX = 7,48 + SetY = 7,62 + SetZ = 7,32 + SetVisible = 8,false + + Graphic = electric2 + Focus = User + SetFrame = 10,4 + SetX = 10,80 + SetY = 10,-2 + SetZ = 10,29 + SetFrame = 11,2 + SetX = 11,72 + SetY = 11,86 Play = 0,Thunder3,80 Play = 2,Thunder3,80 diff --git a/PBS/Animations/Converted/Move/CHARM.txt b/PBS/Animations/Converted/Move/CHARM.txt index 30fb19aa7..cbcb3cd75 100644 --- a/PBS/Animations/Converted/Move/CHARM.txt +++ b/PBS/Animations/Converted/Move/CHARM.txt @@ -3,54 +3,73 @@ [Move,CHARM] Name = CHARM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = electric2 Focus = Target - SetX = 2,440 - SetY = 2,142 - SetX = 3,432 - SetY = 3,134 - SetX = 4,424 - SetY = 4,126 - SetY = 5,118 - SetX = 6,352 - SetY = 6,78 - SetY = 7,70 + SetFrame = 2,9 + SetX = 2,56 + SetY = 2,46 + SetZ = 2,28 + SetFrame = 3,10 + SetX = 3,48 + SetY = 3,38 + SetFrame = 4,11 + SetX = 4,40 + SetY = 4,30 + SetFrame = 5,12 + SetY = 5,22 + SetFrame = 6,10 + SetX = 6,-32 + SetY = 6,-18 + SetFrame = 7,11 + SetY = 7,-26 + SetVisible = 8,false Graphic = electric2 Focus = Target - SetX = 5,376 - SetY = 5,102 + SetFrame = 5,9 + SetX = 5,-8 + SetY = 5,6 + SetZ = 5,29 + SetVisible = 6,false Graphic = electric2 Focus = Target - SetX = 0,336 - SetY = 0,126 - SetX = 1,344 - SetY = 1,118 - SetX = 2,352 - SetY = 2,110 - SetY = 3,102 - SetY = 4,94 - SetX = 5,344 - SetY = 5,86 + SetFrame = 0,9 + SetX = 0,-48 + SetY = 0,30 + SetZ = 0,27 + SetFrame = 1,10 + SetX = 1,-40 + SetY = 1,22 + SetFrame = 2,11 + SetX = 2,-32 + SetY = 2,14 + SetFrame = 3,12 + SetY = 3,6 + SetFrame = 4,13 + SetY = 4,-2 + SetX = 5,-40 + SetY = 5,-10 SetOpacity = 5,100 - SetX = 6,424 - SetY = 6,110 + SetX = 6,40 + SetY = 6,14 SetOpacity = 6,255 - SetX = 7,432 - SetY = 7,102 + SetX = 7,48 + SetY = 7,6 SetOpacity = 7,100 - SetX = 8,352 - SetY = 8,62 + SetFrame = 8,12 + SetX = 8,-32 + SetY = 8,-34 SetOpacity = 8,255 - SetX = 9,344 - SetY = 9,54 - SetX = 10,336 - SetY = 10,46 + SetFrame = 9,13 + SetX = 9,-40 + SetY = 9,-42 + SetX = 10,-48 + SetY = 10,-50 SetOpacity = 10,100 diff --git a/PBS/Animations/Converted/Move/CLEARSMOG.txt b/PBS/Animations/Converted/Move/CLEARSMOG.txt index 9b63da76c..06460ee9c 100644 --- a/PBS/Animations/Converted/Move/CLEARSMOG.txt +++ b/PBS/Animations/Converted/Move/CLEARSMOG.txt @@ -3,23 +3,25 @@ [Move,CLEARSMOG] Name = CLEARSMOG - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = UserAndTarget - SetX = 0,384 - SetY = 0,98 - SetX = 2,385 - SetY = 2,95 - SetY = 3,98 - SetX = 4,382 - SetY = 4,97 - SetX = 5,383 - SetY = 5,101 - SetX = 6,382 + SetFrame = 0,6 + SetX = 0,200 + SetY = 0,-196 + SetZ = 0,27 + SetX = 2,200 + SetY = 2,-201 + SetY = 3,-196 + SetX = 4,198 + SetY = 4,-198 + SetX = 5,199 + SetY = 5,-192 + SetX = 6,198 Play = 0,Snore,86 diff --git a/PBS/Animations/Converted/Move/CLOSECOMBAT.txt b/PBS/Animations/Converted/Move/CLOSECOMBAT.txt index 6a107c3a0..ee2895bfc 100644 --- a/PBS/Animations/Converted/Move/CLOSECOMBAT.txt +++ b/PBS/Animations/Converted/Move/CLOSECOMBAT.txt @@ -3,217 +3,303 @@ [Move,CLOSECOMBAT] Name = CLOSECOMBAT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 4,383 - SetY = 4,57 - SetOpacity = 4,47 - SetX = 5,401 - SetY = 5,118 - SetOpacity = 5,20 - SetX = 6,339 - SetY = 6,91 - SetOpacity = 6,72 - SetX = 8,385 - SetY = 8,99 - SetOpacity = 8,154 - SetX = 9,428 - SetY = 9,121 + SetFrame = 1,7 + SetX = 1,-23 + SetY = 1,29 + SetZ = 1,28 + SetFrame = 2,8 + SetX = 2,-40 + SetY = 2,58 + SetOpacity = 2,144 + SetX = 3,-43 + SetY = 3,52 + SetOpacity = 3,43 + SetFrame = 4,10 + SetX = 4,38 + SetY = 4,-21 + SetOpacity = 4,55 + SetFrame = 5,8 + SetX = 5,47 + SetY = 5,46 + SetOpacity = 5,54 + SetX = 6,-12 + SetY = 6,-18 + SetOpacity = 6,44 + SetFrame = 8,10 + SetX = 8,38 + SetY = 8,-10 + SetOpacity = 8,170 + SetFrame = 9,7 + SetX = 9,11 + SetY = 9,46 SetOpacity = 9,255 - SetX = 10,396 - SetY = 10,138 - SetX = 11,389 - SetY = 11,139 - SetOpacity = 11,154 - SetX = 12,378 - SetY = 12,100 + SetFrame = 10,10 + SetX = 10,50 + SetY = 10,23 + SetX = 11,41 + SetY = 11,27 + SetOpacity = 11,114 + SetX = 12,26 + SetY = 12,-5 SetOpacity = 12,255 - SetX = 13,372 - SetY = 13,116 + SetX = 13,18 + SetY = 13,1 Graphic = finger.spoon Focus = Target - SetX = 1,361 - SetY = 1,125 - SetX = 2,344 - SetY = 2,154 - SetOpacity = 2,144 - SetX = 3,341 - SetY = 3,148 - SetOpacity = 3,43 - SetX = 4,422 - SetY = 4,75 - SetOpacity = 4,55 - SetX = 5,431 - SetY = 5,142 - SetOpacity = 5,54 - SetX = 6,372 - SetY = 6,78 - SetOpacity = 6,44 - SetX = 8,422 - SetY = 8,86 - SetOpacity = 8,170 - SetX = 9,395 - SetY = 9,142 + SetFrame = 1,9 + SetX = 1,-52 + SetY = 1,51 + SetZ = 1,29 + SetFrame = 2,10 + SetX = 2,-14 + SetY = 2,37 + SetOpacity = 2,172 + SetX = 3,-23 + SetY = 3,40 + SetOpacity = 3,81 + SetFrame = 4,11 + SetX = 4,20 + SetY = 4,-29 + SetOpacity = 4,63 + SetX = 5,33 + SetY = 5,28 + SetOpacity = 5,89 + SetX = 6,-19 + SetY = 6,-19 + SetOpacity = 6,74 + SetX = 8,23 + SetY = 8,-11 + SetOpacity = 8,178 + SetX = 9,33 + SetY = 9,35 SetOpacity = 9,255 - SetX = 10,434 - SetY = 10,119 - SetX = 11,425 - SetY = 11,123 - SetOpacity = 11,114 - SetX = 12,410 - SetY = 12,91 + SetY = 10,29 + SetX = 11,27 + SetOpacity = 11,164 + SetX = 12,9 + SetY = 12,-5 SetOpacity = 12,255 - SetX = 13,402 - SetY = 13,97 + SetX = 13,4 + SetY = 13,7 Graphic = finger.spoon Focus = Target - SetX = 1,332 - SetY = 1,147 - SetX = 2,370 - SetY = 2,133 - SetOpacity = 2,172 - SetX = 3,361 - SetY = 3,136 - SetOpacity = 3,81 - SetX = 4,404 - SetY = 4,67 - SetOpacity = 4,63 - SetX = 5,417 - SetY = 5,124 - SetOpacity = 5,89 - SetX = 6,365 - SetY = 6,77 - SetOpacity = 6,74 - SetX = 8,407 - SetY = 8,85 - SetOpacity = 8,178 - SetX = 9,417 - SetY = 9,131 - SetOpacity = 9,255 - SetY = 10,125 - SetX = 11,411 - SetOpacity = 11,164 - SetX = 12,393 - SetY = 12,91 - SetOpacity = 12,255 - SetX = 13,388 - SetY = 13,103 + SetFrame = 1,11 + SetX = 1,-31 + SetY = 1,41 + SetZ = 1,30 + SetX = 2,-23 + SetY = 2,38 + SetOpacity = 2,144 + SetY = 3,35 + SetOpacity = 3,36 + SetFrame = 4,8 + SetX = 4,11 + SetY = 4,13 + SetOpacity = 4,115 + SetX = 5,-44 + SetY = 5,-3 + SetOpacity = 5,154 + SetFrame = 6,7 + SetX = 6,-6 + SetY = 6,3 + SetOpacity = 6,255 + SetFrame = 7,8 + SetX = 7,-1 + SetY = 7,11 + SetFrame = 8,11 + SetX = 8,40 + SetY = 8,27 + SetVisible = 9,false Graphic = finger.spoon Focus = Target - SetX = 1,353 - SetY = 1,137 - SetX = 2,361 - SetY = 2,134 - SetOpacity = 2,144 - SetY = 3,131 - SetOpacity = 3,36 - SetX = 4,395 - SetY = 4,109 - SetOpacity = 4,115 - SetX = 5,340 - SetY = 5,93 - SetOpacity = 5,154 - SetX = 6,378 - SetY = 6,99 + SetFrame = 2,9 + SetX = 2,33 + SetY = 2,8 + SetZ = 2,31 + SetFrame = 3,10 + SetX = 3,-10 + SetY = 3,-11 + SetOpacity = 3,164 + SetFrame = 4,8 + SetX = 4,47 + SetY = 4,37 + SetOpacity = 4,154 + SetFrame = 5,10 + SetX = 5,-15 + SetY = 5,-14 + SetOpacity = 5,143 + SetFrame = 6,9 + SetX = 6,24 + SetY = 6,-10 SetOpacity = 6,255 - SetX = 7,383 - SetY = 7,107 - SetX = 8,424 - SetY = 8,123 - SetX = 11,373 - SetY = 11,108 - SetX = 13,354 - SetY = 13,69 + SetFrame = 7,10 + SetX = 7,34 + SetY = 7,-9 + SetVisible = 8,false Graphic = finger.spoon Focus = Target - SetX = 2,417 - SetY = 2,104 - SetX = 3,374 - SetY = 3,85 - SetOpacity = 3,164 - SetX = 4,431 - SetY = 4,133 - SetOpacity = 4,154 - SetX = 5,369 - SetY = 5,82 - SetOpacity = 5,143 - SetX = 6,408 - SetY = 6,86 + SetFrame = 2,9 + SetX = 2,-5 + SetY = 2,-13 + SetZ = 2,32 + SetFrame = 3,10 + SetX = 3,37 + SetY = 3,11 + SetOpacity = 3,144 + SetFrame = 4,11 + SetX = 4,30 + SetY = 4,23 + SetOpacity = 4,174 + SetX = 5,-27 + SetY = 5,-7 + SetOpacity = 5,144 + SetX = 6,17 + SetY = 6,0 SetOpacity = 6,255 - SetX = 7,418 - SetY = 7,87 - SetX = 11,402 - SetY = 11,103 - SetX = 13,384 - SetY = 13,63 + SetX = 7,16 + SetY = 7,-2 + SetVisible = 8,false Graphic = finger.spoon Focus = Target - SetX = 2,379 - SetY = 2,83 - SetX = 3,421 - SetY = 3,107 - SetOpacity = 3,144 - SetX = 4,414 - SetY = 4,119 - SetOpacity = 4,174 - SetX = 5,357 - SetY = 5,89 - SetOpacity = 5,144 - SetX = 6,401 - SetY = 6,96 - SetOpacity = 6,255 - SetX = 7,400 - SetY = 7,94 - SetX = 11,393 - SetY = 11,104 - SetX = 13,374 - SetY = 13,71 + SetFrame = 2,11 + SetX = 2,16 + SetY = 2,-2 + SetZ = 2,33 + SetX = 3,13 + SetY = 3,-6 + SetOpacity = 3,154 + SetFrame = 4,9 + SetX = 4,-46 + SetY = 4,-7 + SetOpacity = 4,255 + SetFrame = 5,7 + SetX = 5,-9 + SetY = 5,14 + SetVisible = 6,false Graphic = finger.spoon Focus = Target - SetX = 2,400 - SetY = 2,94 - SetX = 3,397 - SetY = 3,90 - SetOpacity = 3,154 - SetX = 4,338 - SetY = 4,89 - SetOpacity = 4,255 - SetX = 5,375 - SetY = 5,110 + SetFrame = 3,7 + SetX = 3,29 + SetY = 3,42 + SetZ = 3,34 + SetX = 4,-15 + SetY = 4,-24 + SetFrame = 5,9 + SetX = 5,22 + SetY = 5,-1 + SetVisible = 6,false Graphic = finger.spoon Focus = Target - SetX = 3,413 - SetY = 3,138 - SetX = 4,369 - SetY = 4,72 - SetX = 5,406 - SetY = 5,95 + SetFrame = 3,7 + SetX = 3,-7 + SetY = 3,30 + SetZ = 3,35 + SetFrame = 4,11 + SetX = 4,-25 + SetY = 4,-14 + SetX = 5,14 + SetY = 5,7 + SetVisible = 6,false Graphic = finger.spoon Focus = Target - SetX = 3,377 - SetY = 3,126 - SetX = 4,359 - SetY = 4,82 - SetX = 5,398 - SetY = 5,103 + SetFrame = 3,11 + SetX = 3,15 + SetY = 3,31 + SetZ = 3,36 + SetVisible = 4,false Graphic = finger.spoon Focus = Target - SetX = 3,399 - SetY = 3,127 + SetFrame = 4,10 + SetX = 4,-1 + SetY = 4,-39 + SetZ = 4,27 + SetOpacity = 4,47 + SetFrame = 5,8 + SetX = 5,17 + SetY = 5,22 + SetOpacity = 5,20 + SetX = 6,-45 + SetY = 6,-5 + SetOpacity = 6,72 + SetX = 8,1 + SetY = 8,3 + SetOpacity = 8,154 + SetFrame = 9,9 + SetX = 9,44 + SetY = 9,25 + SetOpacity = 9,255 + SetFrame = 10,8 + SetX = 10,12 + SetY = 10,42 + SetX = 11,5 + SetY = 11,43 + SetOpacity = 11,154 + SetX = 12,-6 + SetY = 12,4 + SetOpacity = 12,255 + SetX = 13,-12 + SetY = 13,20 + + Graphic = finger.spoon + Focus = Target + SetFrame = 11,7 + SetX = 11,-11 + SetY = 11,12 + SetZ = 11,30 + SetVisible = 12,false + + Graphic = finger.spoon + Focus = Target + SetFrame = 11,9 + SetX = 11,18 + SetY = 11,7 + SetZ = 11,31 + SetVisible = 12,false + + Graphic = finger.spoon + Focus = Target + SetFrame = 11,11 + SetX = 11,9 + SetY = 11,8 + SetZ = 11,32 + SetVisible = 12,false + + Graphic = finger.spoon + Focus = Target + SetFrame = 13,9 + SetX = 13,-30 + SetY = 13,-27 + SetZ = 13,30 + + Graphic = finger.spoon + Focus = Target + SetFrame = 13,7 + SetX = 13,0 + SetY = 13,-33 + SetZ = 13,31 + + Graphic = finger.spoon + Focus = Target + SetFrame = 13,11 + SetX = 13,-10 + SetY = 13,-25 + SetZ = 13,32 Play = 0,Comet Punch,100,105 diff --git a/PBS/Animations/Converted/Move/COMETPUNCH.txt b/PBS/Animations/Converted/Move/COMETPUNCH.txt index ce0c751cd..59c3d9f5b 100644 --- a/PBS/Animations/Converted/Move/COMETPUNCH.txt +++ b/PBS/Animations/Converted/Move/COMETPUNCH.txt @@ -3,31 +3,42 @@ [Move,COMETPUNCH] Name = COMETPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 2,432 - SetY = 2,78 - SetX = 3,368 - SetY = 3,30 - SetX = 5,432 - SetY = 5,110 + SetX = 2,48 + SetY = 2,-18 + SetZ = 2,28 + SetX = 3,-16 + SetY = 3,-66 + SetFrame = 4,1 + SetFrame = 5,0 + SetX = 5,48 + SetY = 5,14 + SetVisible = 6,false Graphic = 003-Attack01 Focus = Target - SetX = 0,352 - SetY = 0,102 - SetX = 3,432 - SetY = 3,78 - SetX = 5,368 - SetY = 5,30 - SetX = 6,432 - SetY = 6,110 + SetX = 0,-32 + SetY = 0,6 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,1 + SetX = 3,48 + SetY = 3,-18 + SetFrame = 4,2 + SetX = 5,-16 + SetY = 5,-66 + SetFrame = 6,1 + SetX = 6,48 + SetY = 6,14 + SetFrame = 7,2 Play = 0,Blow1,80 Play = 2,Blow1,80 @@ -36,31 +47,42 @@ Name = COMETPUNCH [Move,COMETPUNCH,1] Name = Comet Punch hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 0,352 - SetY = 0,102 - SetX = 3,432 - SetY = 3,78 - SetX = 5,368 - SetY = 5,30 - SetX = 6,432 - SetY = 6,110 + SetX = 0,-32 + SetY = 0,6 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,1 + SetX = 3,48 + SetY = 3,-18 + SetFrame = 4,2 + SetX = 5,-16 + SetY = 5,-66 + SetFrame = 6,1 + SetX = 6,48 + SetY = 6,14 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = Target - SetX = 2,432 - SetY = 2,78 - SetX = 3,368 - SetY = 3,30 - SetX = 5,432 - SetY = 5,110 + SetX = 2,48 + SetY = 2,-18 + SetZ = 2,28 + SetX = 3,-16 + SetY = 3,-66 + SetFrame = 4,1 + SetFrame = 5,0 + SetX = 5,48 + SetY = 5,14 + SetVisible = 6,false Play = 0,Blow1,80 Play = 2,Blow1,80 @@ -69,31 +91,42 @@ Name = Comet Punch hit 2 [Move,COMETPUNCH,2] Name = Comet Punch hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 2,432 - SetY = 2,78 - SetX = 3,368 - SetY = 3,30 - SetX = 5,432 - SetY = 5,110 + SetX = 2,48 + SetY = 2,-18 + SetZ = 2,28 + SetX = 3,-16 + SetY = 3,-66 + SetFrame = 4,1 + SetFrame = 5,0 + SetX = 5,48 + SetY = 5,14 + SetVisible = 6,false Graphic = 003-Attack01 Focus = Target - SetX = 0,352 - SetY = 0,102 - SetX = 3,432 - SetY = 3,78 - SetX = 5,368 - SetY = 5,30 - SetX = 6,432 - SetY = 6,110 + SetX = 0,-32 + SetY = 0,6 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,1 + SetX = 3,48 + SetY = 3,-18 + SetFrame = 4,2 + SetX = 5,-16 + SetY = 5,-66 + SetFrame = 6,1 + SetX = 6,48 + SetY = 6,14 + SetFrame = 7,2 Play = 0,Blow1,80 Play = 2,Blow1,80 @@ -102,31 +135,42 @@ Name = Comet Punch hit 3 [Move,COMETPUNCH,3] Name = Comet Punch hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 0,352 - SetY = 0,102 - SetX = 3,432 - SetY = 3,78 - SetX = 5,368 - SetY = 5,30 - SetX = 6,432 - SetY = 6,110 + SetX = 0,-32 + SetY = 0,6 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,1 + SetX = 3,48 + SetY = 3,-18 + SetFrame = 4,2 + SetX = 5,-16 + SetY = 5,-66 + SetFrame = 6,1 + SetX = 6,48 + SetY = 6,14 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = Target - SetX = 2,432 - SetY = 2,78 - SetX = 3,368 - SetY = 3,30 - SetX = 5,432 - SetY = 5,110 + SetX = 2,48 + SetY = 2,-18 + SetZ = 2,28 + SetX = 3,-16 + SetY = 3,-66 + SetFrame = 4,1 + SetFrame = 5,0 + SetX = 5,48 + SetY = 5,14 + SetVisible = 6,false Play = 0,Blow1,80 Play = 2,Blow1,80 @@ -135,31 +179,42 @@ Name = Comet Punch hit 4 [Move,COMETPUNCH,4] Name = Comet Punch hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 2,432 - SetY = 2,78 - SetX = 3,368 - SetY = 3,30 - SetX = 5,432 - SetY = 5,110 + SetX = 2,48 + SetY = 2,-18 + SetZ = 2,28 + SetX = 3,-16 + SetY = 3,-66 + SetFrame = 4,1 + SetFrame = 5,0 + SetX = 5,48 + SetY = 5,14 + SetVisible = 6,false Graphic = 003-Attack01 Focus = Target - SetX = 0,352 - SetY = 0,102 - SetX = 3,432 - SetY = 3,78 - SetX = 5,368 - SetY = 5,30 - SetX = 6,432 - SetY = 6,110 + SetX = 0,-32 + SetY = 0,6 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,1 + SetX = 3,48 + SetY = 3,-18 + SetFrame = 4,2 + SetX = 5,-16 + SetY = 5,-66 + SetFrame = 6,1 + SetX = 6,48 + SetY = 6,14 + SetFrame = 7,2 Play = 0,Blow1,80 Play = 2,Blow1,80 diff --git a/PBS/Animations/Converted/Move/CONFUSERAY.txt b/PBS/Animations/Converted/Move/CONFUSERAY.txt index 69f1bc358..0b626df22 100644 --- a/PBS/Animations/Converted/Move/CONFUSERAY.txt +++ b/PBS/Animations/Converted/Move/CONFUSERAY.txt @@ -3,48 +3,67 @@ [Move,CONFUSERAY] Name = CONFUSERAY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = estranho Focus = UserAndTarget - SetX = 0,153 - SetY = 0,211 - SetX = 1,166 - SetY = 1,205 - SetX = 2,172 - SetY = 2,198 - SetX = 3,185 - SetY = 3,192 - SetX = 4,198 - SetY = 4,186 - SetX = 5,211 - SetY = 5,179 - SetX = 6,224 - SetY = 6,173 - SetX = 7,236 - SetY = 7,167 - SetX = 8,249 - SetY = 8,161 - SetX = 9,262 - SetY = 9,154 - SetX = 10,275 - SetY = 10,148 - SetX = 11,288 - SetY = 11,142 - SetX = 12,300 - SetY = 12,135 - SetX = 13,313 - SetY = 13,129 - SetX = 14,326 - SetY = 14,123 - SetX = 15,339 - SetY = 15,116 - SetX = 16,358 - SetY = 16,110 + SetFrame = 0,1 + SetX = 0,19 + SetY = 0,-20 + SetZ = 0,27 + SetFrame = 1,2 + SetX = 1,29 + SetY = 1,-29 + SetFrame = 2,3 + SetX = 2,34 + SetY = 2,-40 + SetFrame = 3,4 + SetX = 3,44 + SetY = 3,-50 + SetFrame = 4,5 + SetX = 4,54 + SetY = 4,-59 + SetFrame = 5,6 + SetX = 5,64 + SetY = 5,-70 + SetFrame = 6,7 + SetX = 6,75 + SetY = 6,-79 + SetFrame = 7,8 + SetX = 7,84 + SetY = 7,-89 + SetFrame = 8,9 + SetX = 8,94 + SetY = 8,-98 + SetFrame = 9,10 + SetX = 9,104 + SetY = 9,-109 + SetFrame = 10,11 + SetX = 10,114 + SetY = 10,-118 + SetFrame = 11,12 + SetX = 11,125 + SetY = 11,-128 + SetFrame = 12,13 + SetX = 12,134 + SetY = 12,-139 + SetFrame = 13,14 + SetX = 13,144 + SetY = 13,-148 + SetFrame = 14,11 + SetX = 14,154 + SetY = 14,-157 + SetFrame = 15,12 + SetX = 15,164 + SetY = 15,-168 + SetFrame = 16,13 + SetX = 16,179 + SetY = 16,-178 + SetFrame = 17,14 SetOpacity = 17,100 Play = 1,Twine,80 diff --git a/PBS/Animations/Converted/Move/COTTONGUARD.txt b/PBS/Animations/Converted/Move/COTTONGUARD.txt index 91064fe16..fce74b8d8 100644 --- a/PBS/Animations/Converted/Move/COTTONGUARD.txt +++ b/PBS/Animations/Converted/Move/COTTONGUARD.txt @@ -3,79 +3,97 @@ [Move,COTTONGUARD] Name = COTTONGUARD - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = animsheet Focus = User - SetX = 0,113 - SetY = 0,263 - SetX = 1,123 - SetY = 1,272 - SetX = 2,135 - SetY = 2,268 - SetY = 3,223 - SetX = 4,149 - SetY = 4,210 - SetX = 5,135 - SetY = 5,267 - SetX = 6,184 - SetY = 6,233 + SetFrame = 0,15 + SetX = 0,-15 + SetY = 0,39 + SetZ = 0,27 + SetX = 1,-5 + SetY = 1,48 + SetX = 2,7 + SetY = 2,44 + SetY = 3,-1 + SetX = 4,21 + SetY = 4,-14 + SetX = 5,7 + SetY = 5,43 + SetX = 6,56 + SetY = 6,9 + SetVisible = 7,false Graphic = animsheet Focus = User - SetX = 1,156 - SetY = 1,258 - SetX = 2,166 - SetY = 2,247 - SetX = 3,167 - SetY = 3,243 - SetX = 4,154 - SetY = 4,234 - SetX = 5,165 - SetY = 5,256 - SetX = 6,154 - SetY = 6,217 + SetFrame = 1,15 + SetX = 1,28 + SetY = 1,34 + SetZ = 1,28 + SetX = 2,38 + SetY = 2,23 + SetX = 3,39 + SetY = 3,19 + SetX = 4,26 + SetY = 4,10 + SetX = 5,37 + SetY = 5,32 + SetX = 6,26 + SetY = 6,-7 + SetVisible = 7,false Graphic = animsheet Focus = User - SetX = 3,133 - SetY = 3,263 - SetX = 4,170 - SetY = 4,259 - SetX = 5,146 - SetY = 5,237 - SetX = 6,141 - SetY = 6,252 + SetFrame = 3,15 + SetX = 3,5 + SetY = 3,39 + SetZ = 3,29 + SetX = 4,42 + SetY = 4,35 + SetX = 5,18 + SetY = 5,13 + SetX = 6,13 + SetY = 6,28 + SetVisible = 7,false Graphic = animsheet Focus = User - SetX = 3,167 - SetY = 3,266 - SetX = 4,138 - SetY = 4,269 - SetX = 5,163 - SetY = 5,214 - SetX = 6,178 - SetY = 6,265 + SetFrame = 3,15 + SetX = 3,39 + SetY = 3,42 + SetZ = 3,30 + SetX = 4,10 + SetY = 4,45 + SetX = 5,35 + SetY = 5,-10 + SetX = 6,50 + SetY = 6,41 + SetVisible = 7,false Graphic = animsheet Focus = User - SetX = 3,176 - SetY = 3,220 - SetX = 4,190 - SetY = 4,236 - SetX = 5,180 - SetY = 5,232 - SetX = 6,138 - SetY = 6,269 + SetFrame = 3,15 + SetX = 3,48 + SetY = 3,-4 + SetZ = 3,31 + SetX = 4,62 + SetY = 4,12 + SetX = 5,52 + SetY = 5,8 + SetX = 6,10 + SetY = 6,45 + SetVisible = 7,false Graphic = animsheet Focus = User - SetX = 4,129 - SetY = 4,237 + SetFrame = 4,15 + SetX = 4,1 + SetY = 4,13 + SetZ = 4,32 + SetVisible = 5,false Play = 0,Substitute,80 diff --git a/PBS/Animations/Converted/Move/COTTONSPORE.txt b/PBS/Animations/Converted/Move/COTTONSPORE.txt index 31003665d..3e097ad24 100644 --- a/PBS/Animations/Converted/Move/COTTONSPORE.txt +++ b/PBS/Animations/Converted/Move/COTTONSPORE.txt @@ -3,15 +3,30 @@ [Move,COTTONSPORE] Name = COTTONSPORE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Special5 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetVisible = 14,false Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/COUNTER.txt b/PBS/Animations/Converted/Move/COUNTER.txt index 96166a74f..141dce508 100644 --- a/PBS/Animations/Converted/Move/COUNTER.txt +++ b/PBS/Animations/Converted/Move/COUNTER.txt @@ -3,122 +3,153 @@ [Move,COUNTER] Name = COUNTER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = UserAndTarget - SetX = 0,384 - SetY = 0,98 - SetX = 1,408 - SetY = 1,80 + SetX = 0,200 + SetY = 0,-196 + SetZ = 0,27 + SetFrame = 1,15 + SetX = 1,218 + SetY = 1,-225 SetZoomX = 1,50 SetZoomY = 1,50 - SetX = 2,384 - SetY = 2,99 + SetFrame = 2,0 + SetX = 2,200 + SetY = 2,-195 SetZoomX = 2,100 SetZoomY = 2,100 - SetX = 3,392 - SetY = 3,111 + SetFrame = 3,15 + SetX = 3,206 + SetY = 3,-176 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,352 - SetY = 4,24 - SetX = 5,416 - SetY = 5,104 + SetX = 4,175 + SetY = 4,-312 + SetX = 5,225 + SetY = 5,-187 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 1,387 - SetY = 1,99 - SetX = 2,408 - SetY = 2,70 + SetX = 1,202 + SetY = 1,-195 + SetZ = 1,28 + SetFrame = 2,15 + SetX = 2,218 + SetY = 2,-240 SetZoomX = 2,50 SetZoomY = 2,50 - SetX = 3,360 - SetY = 3,115 - SetX = 4,339 - SetY = 4,22 - SetX = 5,400 - SetY = 5,92 + SetX = 3,181 + SetY = 3,-170 + SetX = 4,164 + SetY = 4,-315 + SetX = 5,212 + SetY = 5,-206 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 1,352 - SetY = 1,99 + SetFrame = 1,15 + SetX = 1,175 + SetY = 1,-195 + SetZ = 1,29 SetZoomX = 1,50 SetZoomY = 1,50 - SetX = 2,360 - SetY = 2,78 - SetX = 3,368 - SetY = 3,97 - SetX = 4,376 - SetY = 4,8 - SetX = 5,416 - SetY = 5,53 + SetX = 2,181 + SetY = 2,-228 + SetX = 3,187 + SetY = 3,-198 + SetX = 4,193 + SetY = 4,-337 + SetX = 5,225 + SetY = 5,-267 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 2,400 - SetY = 2,101 + SetFrame = 2,15 + SetX = 2,212 + SetY = 2,-192 + SetZ = 2,30 SetZoomX = 2,50 SetZoomY = 2,50 - SetX = 3,352 - SetY = 3,63 - SetY = 4,121 - SetX = 5,377 - SetY = 5,112 + SetX = 3,175 + SetY = 3,-251 + SetY = 4,-160 + SetX = 5,194 + SetY = 5,-175 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 3,408 - SetY = 3,85 + SetFrame = 3,15 + SetX = 3,218 + SetY = 3,-217 + SetZ = 3,31 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,392 - SetY = 4,61 - SetX = 5,368 - SetY = 5,54 + SetX = 4,206 + SetY = 4,-254 + SetX = 5,187 + SetY = 5,-265 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 3,386 - SetY = 3,98 - SetX = 4,384 + SetX = 3,201 + SetY = 3,-196 + SetZ = 3,32 + SetFrame = 4,15 + SetX = 4,200 SetZoomX = 4,50 SetZoomY = 4,50 - SetX = 5,336 - SetY = 5,10 + SetX = 5,162 + SetY = 5,-334 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 4,384 - SetY = 4,96 - SetX = 5,400 - SetY = 5,39 + SetX = 4,200 + SetY = 4,-200 + SetZ = 4,33 + SetFrame = 5,15 + SetX = 5,212 + SetY = 5,-289 SetZoomX = 5,50 SetZoomY = 5,50 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 5,352 - SetY = 5,131 + SetFrame = 5,15 + SetX = 5,175 + SetY = 5,-145 + SetZ = 5,34 SetZoomX = 5,50 SetZoomY = 5,50 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 5,376 - SetY = 5,26 + SetFrame = 5,15 + SetX = 5,193 + SetY = 5,-309 + SetZ = 5,35 SetZoomX = 5,50 SetZoomY = 5,50 + SetVisible = 6,false Graphic = punches Focus = UserAndTarget - SetX = 5,399 - SetY = 5,92 + SetX = 5,211 + SetY = 5,-206 + SetZ = 5,36 + SetVisible = 6,false Play = 0,MiningCollapse,80 diff --git a/PBS/Animations/Converted/Move/CRUNCH.txt b/PBS/Animations/Converted/Move/CRUNCH.txt index 88bb19b1b..ee2a77c63 100644 --- a/PBS/Animations/Converted/Move/CRUNCH.txt +++ b/PBS/Animations/Converted/Move/CRUNCH.txt @@ -3,82 +3,117 @@ [Move,CRUNCH] Name = CRUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = teeth Focus = Target - SetX = 0,396 - SetY = 0,97 - SetX = 1,391 - SetY = 1,98 - SetX = 2,387 - SetY = 2,99 - SetY = 3,97 - SetX = 4,381 - SetY = 4,92 - SetX = 5,389 - SetX = 6,388 - SetY = 6,96 - SetX = 7,389 - SetY = 7,99 - SetX = 8,388 - SetY = 8,93 - SetX = 9,384 - SetY = 9,94 - SetX = 10,395 - SetY = 10,98 - SetX = 11,391 - SetY = 11,93 - SetX = 12,384 - SetY = 12,97 + SetX = 0,12 + SetY = 0,1 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,7 + SetY = 1,2 + SetFrame = 2,2 + SetX = 2,3 + SetY = 2,3 + SetFrame = 3,3 + SetY = 3,1 + SetFrame = 4,4 + SetX = 4,-3 + SetY = 4,-4 + SetFrame = 5,5 + SetX = 5,5 + SetFrame = 6,6 + SetX = 6,4 + SetY = 6,0 + SetFrame = 7,7 + SetX = 7,5 + SetY = 7,3 + SetFrame = 8,8 + SetX = 8,4 + SetY = 8,-3 + SetFrame = 9,9 + SetX = 9,0 + SetY = 9,-2 + SetFrame = 10,10 + SetX = 10,11 + SetY = 10,2 + SetFrame = 11,11 + SetX = 11,7 + SetY = 11,-3 + SetFrame = 12,12 + SetX = 12,0 + SetY = 12,1 + SetVisible = 13,false Graphic = teeth Focus = Target - SetX = 7,444 - SetY = 7,115 - SetX = 8,418 - SetY = 8,95 - SetX = 9,379 - SetY = 9,112 - SetX = 10,331 - SetY = 10,128 + SetFrame = 7,13 + SetX = 7,60 + SetY = 7,19 + SetZ = 7,28 + SetFrame = 8,14 + SetX = 8,34 + SetY = 8,-1 + SetX = 9,-5 + SetY = 9,16 + SetX = 10,-53 + SetY = 10,32 + SetVisible = 11,false Graphic = teeth Focus = Target - SetX = 7,343 - SetY = 7,94 - SetX = 8,329 - SetY = 8,104 - SetX = 9,425 - SetY = 9,119 - SetX = 10,437 - SetY = 10,116 + SetFrame = 7,13 + SetX = 7,-41 + SetY = 7,-2 + SetZ = 7,29 + SetFrame = 8,14 + SetX = 8,-55 + SetY = 8,8 + SetX = 9,41 + SetY = 9,23 + SetFrame = 10,13 + SetX = 10,53 + SetY = 10,20 + SetVisible = 11,false Graphic = teeth Focus = Target - SetX = 8,343 - SetY = 8,95 - SetX = 9,327 - SetY = 9,115 - SetX = 10,387 - SetY = 10,141 + SetFrame = 8,13 + SetX = 8,-41 + SetY = 8,-1 + SetZ = 8,30 + SetFrame = 9,14 + SetX = 9,-57 + SetY = 9,19 + SetFrame = 10,13 + SetX = 10,3 + SetY = 10,45 + SetVisible = 11,false Graphic = teeth Focus = Target - SetX = 8,442 - SetY = 8,99 - SetX = 9,391 - SetY = 9,152 - SetX = 10,404 - SetY = 10,114 + SetFrame = 8,13 + SetX = 8,58 + SetY = 8,3 + SetZ = 8,31 + SetX = 9,7 + SetY = 9,56 + SetFrame = 10,14 + SetX = 10,20 + SetY = 10,18 + SetVisible = 11,false Graphic = teeth Focus = Target - SetX = 10,325 - SetY = 10,96 + SetFrame = 10,14 + SetX = 10,-59 + SetY = 10,0 + SetZ = 10,32 + SetVisible = 11,false Play = 7,Super Fang,100,111 diff --git a/PBS/Animations/Converted/Move/CRUSHCLAW.txt b/PBS/Animations/Converted/Move/CRUSHCLAW.txt index a956ca693..b386c9935 100644 --- a/PBS/Animations/Converted/Move/CRUSHCLAW.txt +++ b/PBS/Animations/Converted/Move/CRUSHCLAW.txt @@ -3,27 +3,37 @@ [Move,CRUSHCLAW] Name = CRUSHCLAW - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = dragon claw Focus = Target - SetX = 0,387 - SetY = 0,84 - SetX = 1,392 - SetY = 1,87 - SetX = 2,402 - SetY = 2,93 - SetX = 3,400 - SetY = 3,112 - SetX = 4,397 - SetY = 4,105 - SetY = 5,110 - SetX = 6,392 - SetX = 7,384 + SetFrame = 0,1 + SetX = 0,3 + SetY = 0,-12 + SetZ = 0,27 + SetFrame = 1,2 + SetX = 1,8 + SetY = 1,-9 + SetFrame = 2,3 + SetX = 2,18 + SetY = 2,-3 + SetFrame = 3,4 + SetX = 3,16 + SetY = 3,16 + SetFrame = 4,5 + SetX = 4,13 + SetY = 4,9 + SetFrame = 5,6 + SetY = 5,14 + SetFrame = 6,7 + SetX = 6,8 + SetFrame = 7,8 + SetX = 7,0 + SetVisible = 8,false Play = 0,Slash,100,135 Play = 4,Slash,100,135 diff --git a/PBS/Animations/Converted/Move/CURSE.txt b/PBS/Animations/Converted/Move/CURSE.txt index c4ffd25bc..2d5f1a19d 100644 --- a/PBS/Animations/Converted/Move/CURSE.txt +++ b/PBS/Animations/Converted/Move/CURSE.txt @@ -3,20 +3,25 @@ [Move,CURSE] Name = CURSE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ghost1 Focus = Target - SetX = 0,392 - SetY = 0,14 + SetFrame = 0,8 + SetX = 0,8 + SetY = 0,-82 + SetZ = 0,27 SetAngle = 0,90 - SetY = 1,54 - SetY = 2,70 - SetY = 3,78 - SetX = 4,384 + SetY = 1,-42 + SetFrame = 2,9 + SetY = 2,-26 + SetY = 3,-18 + SetFrame = 4,10 + SetX = 4,0 + SetVisible = 8,false Play = 2,Darkness6,80 diff --git a/PBS/Animations/Converted/Move/CUT.txt b/PBS/Animations/Converted/Move/CUT.txt index 74dbda42a..40903b7a5 100644 --- a/PBS/Animations/Converted/Move/CUT.txt +++ b/PBS/Animations/Converted/Move/CUT.txt @@ -3,16 +3,25 @@ [Move,CUT] Name = CUT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 004-Attack02 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 Play = 0,Slash10,80 Play = 3,Slash2,80 diff --git a/PBS/Animations/Converted/Move/DEFENSECURL.txt b/PBS/Animations/Converted/Move/DEFENSECURL.txt index 419c2ccad..321a33cfd 100644 --- a/PBS/Animations/Converted/Move/DEFENSECURL.txt +++ b/PBS/Animations/Converted/Move/DEFENSECURL.txt @@ -3,31 +3,33 @@ [Move,DEFENSECURL] Name = DEFENSECURL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = User - SetX = 0,133 - SetY = 0,224 + SetFrame = 0,5 + SetX = 0,5 + SetY = 0,0 + SetZ = 0,27 SetOpacity = 0,100 - SetX = 1,131 - SetY = 1,223 + SetX = 1,3 + SetY = 1,-1 SetOpacity = 1,110 - SetX = 2,134 - SetY = 2,221 + SetX = 2,6 + SetY = 2,-3 SetOpacity = 2,140 - SetX = 3,131 + SetX = 3,3 SetOpacity = 3,170 - SetY = 4,222 + SetY = 4,-2 SetOpacity = 4,230 - SetX = 5,127 - SetY = 5,219 + SetX = 5,-1 + SetY = 5,-5 SetOpacity = 5,255 - SetX = 6,132 + SetX = 6,4 SetOpacity = 6,233 Play = 0,Defense Curl diff --git a/PBS/Animations/Converted/Move/DETECT.txt b/PBS/Animations/Converted/Move/DETECT.txt index 1356f7b1e..bc3fbae2b 100644 --- a/PBS/Animations/Converted/Move/DETECT.txt +++ b/PBS/Animations/Converted/Move/DETECT.txt @@ -3,25 +3,30 @@ [Move,DETECT] Name = DETECT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet Focus = UserAndTarget - SetX = 0,422 - SetY = 0,66 - SetX = 1,423 - SetY = 1,68 - SetX = 2,416 - SetY = 2,73 - SetX = 3,420 - SetY = 3,72 - SetX = 4,408 - SetY = 4,74 - SetX = 5,409 - SetY = 5,78 + SetFrame = 0,8 + SetX = 0,229 + SetY = 0,-246 + SetZ = 0,27 + SetX = 1,230 + SetY = 1,-243 + SetFrame = 2,7 + SetX = 2,225 + SetY = 2,-235 + SetX = 3,228 + SetY = 3,-237 + SetFrame = 4,6 + SetX = 4,218 + SetY = 4,-234 + SetX = 5,219 + SetY = 5,-228 + SetVisible = 6,false Play = 0,Flash2,80,85 diff --git a/PBS/Animations/Converted/Move/DISABLE.txt b/PBS/Animations/Converted/Move/DISABLE.txt index a8b2bfb59..9cbf71799 100644 --- a/PBS/Animations/Converted/Move/DISABLE.txt +++ b/PBS/Animations/Converted/Move/DISABLE.txt @@ -3,33 +3,40 @@ [Move,DISABLE] Name = DISABLE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 4,385 - SetY = 4,96 + SetFrame = 4,8 + SetX = 4,200 + SetY = 4,-200 + SetZ = 4,28 SetAngle = 4,45 Graphic = leech-seed Focus = UserAndTarget - SetX = 6,388 - SetY = 6,96 + SetFrame = 6,7 + SetX = 6,203 + SetY = 6,-200 + SetZ = 6,29 Graphic = leech-seed Focus = UserAndTarget - SetX = 0,385 - SetY = 0,101 - SetX = 1,384 - SetY = 1,98 - SetY = 2,99 - SetX = 3,385 - SetY = 3,96 - SetX = 4,387 - SetY = 4,98 + SetFrame = 0,10 + SetX = 0,200 + SetY = 0,-192 + SetZ = 0,27 + SetX = 1,200 + SetY = 1,-196 + SetFrame = 2,8 + SetY = 2,-195 + SetX = 3,200 + SetY = 3,-200 + SetX = 4,202 + SetY = 4,-196 Play = 0,Sword2,80,121 diff --git a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt index cfec9938f..b816e88f8 100644 --- a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt +++ b/PBS/Animations/Converted/Move/DIZZYPUNCH.txt @@ -3,182 +3,294 @@ [Move,DIZZYPUNCH] Name = DIZZYPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 0,384 - SetY = 0,97 - SetY = 1,96 - SetY = 2,91 - SetX = 4,387 - SetY = 4,96 - SetX = 6,383 - SetY = 6,97 - SetX = 7,388 - SetY = 7,91 - SetX = 8,384 - SetY = 8,96 - SetY = 9,97 - SetY = 10,96 - SetY = 11,91 - SetX = 13,387 - SetY = 13,96 - SetX = 15,383 - SetY = 15,97 - SetX = 16,388 - SetY = 16,91 - SetX = 17,384 - SetY = 17,96 + SetFrame = 0,1 + SetX = 0,0 + SetY = 0,1 + SetZ = 0,27 + SetFrame = 1,7 + SetY = 1,0 + SetY = 2,-5 + SetFrame = 4,1 + SetX = 4,3 + SetY = 4,0 + SetX = 6,-1 + SetY = 6,1 + SetX = 7,4 + SetY = 7,-5 + SetX = 8,0 + SetY = 8,0 + SetY = 9,1 + SetFrame = 10,7 + SetY = 10,0 + SetY = 11,-5 + SetFrame = 13,1 + SetX = 13,3 + SetY = 13,0 + SetX = 15,-1 + SetY = 15,1 + SetX = 16,4 + SetY = 16,-5 + SetX = 17,0 + SetY = 17,0 Graphic = punches Focus = Target - SetX = 1,388 - SetY = 1,102 - SetX = 2,390 - SetY = 2,98 - SetX = 4,445 - SetY = 4,88 - SetX = 5,415 - SetY = 5,124 - SetX = 6,378 - SetY = 6,128 - SetY = 7,118 - SetX = 8,407 - SetY = 8,111 - SetX = 10,388 - SetY = 10,102 - SetX = 11,390 - SetY = 11,98 - SetX = 13,445 - SetY = 13,88 - SetX = 14,415 - SetY = 14,124 - SetX = 15,378 - SetY = 15,128 - SetY = 16,118 - SetX = 17,407 - SetY = 17,111 + SetFrame = 1,1 + SetX = 1,4 + SetY = 1,6 + SetZ = 1,28 + SetX = 2,6 + SetY = 2,2 + SetFrame = 4,11 + SetX = 4,61 + SetY = 4,-8 + SetX = 5,31 + SetY = 5,28 + SetX = 6,-6 + SetY = 6,32 + SetY = 7,22 + SetX = 8,23 + SetY = 8,15 + SetVisible = 9,false Graphic = punches Focus = Target - SetX = 2,447 - SetY = 2,80 - SetX = 4,469 - SetY = 4,105 - SetX = 5,428 - SetY = 5,142 - SetX = 6,356 - SetY = 6,156 - SetX = 7,364 - SetY = 7,146 - SetX = 8,422 - SetY = 8,139 - SetX = 11,447 - SetY = 11,80 - SetX = 13,469 - SetY = 13,105 - SetX = 14,428 - SetY = 14,142 - SetX = 15,356 - SetY = 15,156 - SetX = 16,364 - SetY = 16,146 - SetX = 17,422 - SetY = 17,139 + SetFrame = 2,11 + SetX = 2,63 + SetY = 2,-16 + SetZ = 2,29 + SetX = 4,85 + SetY = 4,9 + SetX = 5,44 + SetY = 5,46 + SetX = 6,-28 + SetY = 6,60 + SetX = 7,-20 + SetY = 7,50 + SetX = 8,38 + SetY = 8,43 + SetVisible = 9,false Graphic = punches Focus = Target - SetX = 2,471 - SetY = 2,88 - SetX = 4,356 - SetY = 4,68 - SetX = 5,351 - SetY = 5,38 - SetX = 6,411 - SetY = 6,54 - SetX = 7,422 - SetY = 7,50 - SetX = 8,357 - SetY = 8,112 - SetX = 11,471 - SetY = 11,88 - SetX = 13,356 - SetY = 13,68 - SetX = 14,351 - SetY = 14,38 - SetX = 15,411 - SetY = 15,54 - SetX = 16,422 - SetY = 16,50 - SetX = 17,357 - SetY = 17,112 + SetFrame = 2,11 + SetX = 2,87 + SetY = 2,-8 + SetZ = 2,30 + SetX = 4,-28 + SetY = 4,-28 + SetX = 5,-33 + SetY = 5,-58 + SetX = 6,27 + SetY = 6,-42 + SetX = 7,38 + SetY = 7,-46 + SetX = 8,-27 + SetY = 8,16 + SetVisible = 9,false Graphic = punches Focus = Target - SetX = 3,346 - SetY = 3,82 - SetX = 4,329 - SetY = 4,60 - SetX = 6,432 - SetY = 6,30 - SetX = 7,442 - SetY = 7,28 - SetX = 8,336 - SetY = 8,129 - SetX = 12,346 - SetY = 12,82 - SetX = 13,329 - SetY = 13,60 - SetX = 15,432 - SetY = 15,30 - SetX = 16,442 - SetY = 16,28 - SetX = 17,336 - SetY = 17,129 + SetFrame = 3,11 + SetX = 3,-38 + SetY = 3,-14 + SetZ = 3,31 + SetX = 4,-55 + SetY = 4,-36 + SetVisible = 5,false Graphic = punches Focus = Target - SetX = 3,316 - SetY = 3,91 - SetX = 5,377 - SetY = 5,58 - SetX = 7,356 - SetY = 7,67 - SetX = 8,377 - SetY = 8,58 - SetX = 12,316 - SetY = 12,91 - SetX = 14,377 - SetY = 14,58 - SetX = 16,356 - SetY = 16,67 - SetX = 17,377 - SetY = 17,58 + SetFrame = 3,11 + SetX = 3,-68 + SetY = 3,-5 + SetZ = 3,32 + SetVisible = 4,false Graphic = punches Focus = Target - SetX = 7,426 - SetY = 7,103 - SetX = 8,361 - SetY = 8,36 - SetX = 16,426 - SetY = 16,103 - SetX = 17,361 - SetY = 17,36 + SetFrame = 5,11 + SetX = 5,-7 + SetY = 5,-38 + SetZ = 5,32 + SetVisible = 6,false Graphic = punches Focus = Target - SetX = 8,427 - SetY = 8,74 + SetFrame = 6,11 + SetX = 6,48 + SetY = 6,-66 + SetZ = 6,31 + SetX = 7,58 + SetY = 7,-68 + SetX = 8,-48 + SetY = 8,33 + SetVisible = 9,false Graphic = punches Focus = Target - SetX = 8,447 - SetY = 8,64 + SetFrame = 7,11 + SetX = 7,-28 + SetY = 7,-29 + SetZ = 7,32 + SetX = 8,-7 + SetY = 8,-38 + SetVisible = 9,false + + Graphic = punches + Focus = Target + SetFrame = 7,11 + SetX = 7,42 + SetY = 7,7 + SetZ = 7,33 + SetX = 8,-23 + SetY = 8,-60 + SetVisible = 9,false + + Graphic = punches + Focus = Target + SetFrame = 8,11 + SetX = 8,43 + SetY = 8,-22 + SetZ = 8,34 + SetVisible = 9,false + + Graphic = punches + Focus = Target + SetFrame = 8,11 + SetX = 8,63 + SetY = 8,-32 + SetZ = 8,35 + SetVisible = 9,false + + Graphic = punches + Focus = Target + SetFrame = 10,1 + SetX = 10,4 + SetY = 10,6 + SetZ = 10,28 + SetX = 11,6 + SetY = 11,2 + SetFrame = 13,11 + SetX = 13,61 + SetY = 13,-8 + SetX = 14,31 + SetY = 14,28 + SetX = 15,-6 + SetY = 15,32 + SetY = 16,22 + SetX = 17,23 + SetY = 17,15 + + Graphic = punches + Focus = Target + SetFrame = 11,11 + SetX = 11,63 + SetY = 11,-16 + SetZ = 11,29 + SetX = 13,85 + SetY = 13,9 + SetX = 14,44 + SetY = 14,46 + SetX = 15,-28 + SetY = 15,60 + SetX = 16,-20 + SetY = 16,50 + SetX = 17,38 + SetY = 17,43 + + Graphic = punches + Focus = Target + SetFrame = 11,11 + SetX = 11,87 + SetY = 11,-8 + SetZ = 11,30 + SetX = 13,-28 + SetY = 13,-28 + SetX = 14,-33 + SetY = 14,-58 + SetX = 15,27 + SetY = 15,-42 + SetX = 16,38 + SetY = 16,-46 + SetX = 17,-27 + SetY = 17,16 + + Graphic = punches + Focus = Target + SetFrame = 12,11 + SetX = 12,-38 + SetY = 12,-14 + SetZ = 12,31 + SetX = 13,-55 + SetY = 13,-36 + SetVisible = 14,false + + Graphic = punches + Focus = Target + SetFrame = 12,11 + SetX = 12,-68 + SetY = 12,-5 + SetZ = 12,32 + SetVisible = 13,false + + Graphic = punches + Focus = Target + SetFrame = 14,11 + SetX = 14,-7 + SetY = 14,-38 + SetZ = 14,32 + SetVisible = 15,false + + Graphic = punches + Focus = Target + SetFrame = 15,11 + SetX = 15,48 + SetY = 15,-66 + SetZ = 15,31 + SetX = 16,58 + SetY = 16,-68 + SetX = 17,-48 + SetY = 17,33 + + Graphic = punches + Focus = Target + SetFrame = 16,11 + SetX = 16,-28 + SetY = 16,-29 + SetZ = 16,32 + SetX = 17,-7 + SetY = 17,-38 + + Graphic = punches + Focus = Target + SetFrame = 16,11 + SetX = 16,42 + SetY = 16,7 + SetZ = 16,33 + SetX = 17,-23 + SetY = 17,-60 + + Graphic = punches + Focus = Target + SetFrame = 17,11 + SetX = 17,43 + SetY = 17,-22 + SetZ = 17,34 + + Graphic = punches + Focus = Target + SetFrame = 17,11 + SetX = 17,63 + SetY = 17,-32 + SetZ = 17,35 Play = 0,Dizzy Punch diff --git a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt index ef3ca320f..a0d191049 100644 --- a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt +++ b/PBS/Animations/Converted/Move/DOUBLEEDGE.txt @@ -3,43 +3,65 @@ [Move,DOUBLEEDGE] Name = DOUBLEEDGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Divine_Smash - Focus = Target - SetX = 1,198 - SetY = 1,236 - SetY = 2,179 - SetX = 3,96 - SetY = 3,167 - SetX = 8,358 - SetY = 8,110 + Focus = User + SetFrame = 1,11 + SetX = 1,70 + SetY = 1,12 + SetZ = 1,28 + SetY = 2,-45 + SetX = 3,-32 + SetY = 3,-57 + SetVisible = 4,false Graphic = Divine_Smash Focus = User - SetX = 2,96 - SetY = 2,230 - + SetFrame = 2,11 + SetX = 2,-32 + SetY = 2,6 + SetZ = 2,29 + SetVisible = 3,false + Graphic = Divine_Smash Focus = Target - SetX = 0,128 - SetY = 0,236 - SetY = 1,192 - SetY = 2,129 - SetX = 3,198 - SetY = 3,116 - SetX = 4,96 - SetY = 4,129 - SetX = 5,358 - SetY = 5,110 + SetFrame = 5,14 + SetX = 5,-26 + SetY = 5,14 + SetZ = 5,27 SetOpacity = 5,50 + SetFrame = 7,3 SetOpacity = 7,255 - SetX = 10,352 + SetFrame = 9,4 + SetX = 10,-32 SetAngle = 10,90 + + Graphic = Divine_Smash + Focus = Target + SetFrame = 8,4 + SetX = 8,-26 + SetY = 8,14 + SetZ = 8,28 + SetVisible = 9,false + + Graphic = Divine_Smash + Focus = User + SetFrame = 0,11 + SetX = 0,0 + SetY = 0,12 + SetZ = 0,27 + SetY = 1,-32 + SetY = 2,-95 + SetX = 3,70 + SetY = 3,-108 + SetX = 4,-32 + SetY = 4,-95 + SetVisible = 5,false Play = 0,throw,80 Play = 6,Damage1,80 diff --git a/PBS/Animations/Converted/Move/DOUBLEKICK.txt b/PBS/Animations/Converted/Move/DOUBLEKICK.txt index 2bd7a926e..77d6fa51b 100644 --- a/PBS/Animations/Converted/Move/DOUBLEKICK.txt +++ b/PBS/Animations/Converted/Move/DOUBLEKICK.txt @@ -3,33 +3,38 @@ [Move,DOUBLEKICK] Name = DOUBLEKICK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 0,336 - SetY = 0,94 + SetFrame = 0,7 + SetX = 0,-48 + SetY = 0,-2 + SetZ = 0,27 SetZoomX = 0,110 SetZoomY = 0,110 SetOpacity = 0,100 SetZoomX = 1,100 SetZoomY = 1,100 SetOpacity = 1,255 - SetX = 3,440 - SetY = 3,78 + SetX = 3,56 + SetY = 3,-18 SetOpacity = 5,100 Graphic = normal1 Focus = Target - SetX = 2,440 - SetY = 2,78 + SetFrame = 2,7 + SetX = 2,56 + SetY = 2,-18 + SetZ = 2,28 SetZoomX = 2,110 SetZoomY = 2,110 SetOpacity = 2,100 + SetVisible = 3,false Play = 1,Blow3,80 Play = 3,Blow3,80 @@ -37,32 +42,37 @@ Name = DOUBLEKICK [Move,DOUBLEKICK,1] Name = Double Kick hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 2,440 - SetY = 2,78 + SetFrame = 2,7 + SetX = 2,56 + SetY = 2,-18 + SetZ = 2,28 SetZoomX = 2,110 SetZoomY = 2,110 SetOpacity = 2,100 + SetVisible = 3,false Graphic = normal1 Focus = Target - SetX = 0,336 - SetY = 0,94 + SetFrame = 0,7 + SetX = 0,-48 + SetY = 0,-2 + SetZ = 0,27 SetZoomX = 0,110 SetZoomY = 0,110 SetOpacity = 0,100 SetZoomX = 1,100 SetZoomY = 1,100 SetOpacity = 1,255 - SetX = 3,440 - SetY = 3,78 + SetX = 3,56 + SetY = 3,-18 SetOpacity = 5,100 Play = 1,Blow3,80 diff --git a/PBS/Animations/Converted/Move/DOUBLESLAP.txt b/PBS/Animations/Converted/Move/DOUBLESLAP.txt index db9801337..c526fa808 100644 --- a/PBS/Animations/Converted/Move/DOUBLESLAP.txt +++ b/PBS/Animations/Converted/Move/DOUBLESLAP.txt @@ -3,32 +3,46 @@ [Move,DOUBLESLAP] Name = DOUBLESLAP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - + SetX = 0,0 + SetY = 0,0 + Graphic = many Focus = Target - SetX = 3,392 - SetY = 3,94 - SetOpacity = 3,100 - SetX = 7,384 - SetOpacity = 7,255 + SetFrame = 7,20 + SetX = 7,0 + SetY = 7,-2 + SetZ = 7,28 + SetVisible = 8,false Graphic = many Focus = Target - SetX = 0,520 - SetY = 0,94 - SetX = 1,480 - SetX = 2,424 - SetX = 3,392 - SetX = 4,224 - SetX = 5,296 - SetX = 6,344 - SetX = 7,384 + SetFrame = 0,15 + SetX = 0,136 + SetY = 0,-2 + SetZ = 0,27 + SetX = 1,96 + SetX = 2,40 + SetX = 3,8 + SetFrame = 4,16 + SetX = 4,-160 + SetX = 5,-88 + SetX = 6,-40 + SetX = 7,0 + SetFrame = 8,19 SetOpacity = 8,100 + + Graphic = many + Focus = Target + SetFrame = 3,20 + SetX = 3,8 + SetY = 3,-2 + SetZ = 3,28 + SetOpacity = 3,100 + SetFrame = 4,19 + SetVisible = 5,false Play = 3,Blow5,80 Play = 7,Blow5,80 @@ -36,32 +50,46 @@ Name = DOUBLESLAP [Move,DOUBLESLAP,1] Name = DoubleSlap hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = many - Focus = Target - SetX = 0,520 - SetY = 0,94 - SetX = 1,480 - SetX = 2,424 - SetX = 3,392 - SetX = 4,224 - SetX = 5,296 - SetX = 6,344 - SetX = 7,384 - SetOpacity = 8,100 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 3,392 - SetY = 3,94 + SetFrame = 3,20 + SetX = 3,8 + SetY = 3,-2 + SetZ = 3,28 SetOpacity = 3,100 - SetX = 7,384 - SetOpacity = 7,255 + SetFrame = 4,19 + SetVisible = 5,false + + Graphic = many + Focus = Target + SetFrame = 7,20 + SetX = 7,0 + SetY = 7,-2 + SetZ = 7,28 + SetVisible = 8,false + + Graphic = many + Focus = Target + SetFrame = 0,15 + SetX = 0,136 + SetY = 0,-2 + SetZ = 0,27 + SetX = 1,96 + SetX = 2,40 + SetX = 3,8 + SetFrame = 4,16 + SetX = 4,-160 + SetX = 5,-88 + SetX = 6,-40 + SetX = 7,0 + SetFrame = 8,19 + SetOpacity = 8,100 Play = 3,Blow5,80 Play = 7,Blow5,80 @@ -69,32 +97,46 @@ Name = DoubleSlap hit 2 [Move,DOUBLESLAP,2] Name = DoubleSlap hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = many - Focus = Target - SetX = 3,392 - SetY = 3,94 - SetOpacity = 3,100 - SetX = 7,384 - SetOpacity = 7,255 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 0,520 - SetY = 0,94 - SetX = 1,480 - SetX = 2,424 - SetX = 3,392 - SetX = 4,224 - SetX = 5,296 - SetX = 6,344 - SetX = 7,384 + SetFrame = 0,15 + SetX = 0,136 + SetY = 0,-2 + SetZ = 0,27 + SetX = 1,96 + SetX = 2,40 + SetX = 3,8 + SetFrame = 4,16 + SetX = 4,-160 + SetX = 5,-88 + SetX = 6,-40 + SetX = 7,0 + SetFrame = 8,19 SetOpacity = 8,100 + + Graphic = many + Focus = Target + SetFrame = 3,20 + SetX = 3,8 + SetY = 3,-2 + SetZ = 3,28 + SetOpacity = 3,100 + SetFrame = 4,19 + SetVisible = 5,false + + Graphic = many + Focus = Target + SetFrame = 7,20 + SetX = 7,0 + SetY = 7,-2 + SetZ = 7,28 + SetVisible = 8,false Play = 3,Blow5,80 Play = 7,Blow5,80 @@ -102,32 +144,46 @@ Name = DoubleSlap hit 3 [Move,DOUBLESLAP,3] Name = DoubleSlap hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + + Graphic = many + Focus = Target + SetFrame = 7,20 + SetX = 7,0 + SetY = 7,-2 + SetZ = 7,28 + SetVisible = 8,false Graphic = many Focus = Target - SetX = 0,520 - SetY = 0,94 - SetX = 1,480 - SetX = 2,424 - SetX = 3,392 - SetX = 4,224 - SetX = 5,296 - SetX = 6,344 - SetX = 7,384 + SetFrame = 0,15 + SetX = 0,136 + SetY = 0,-2 + SetZ = 0,27 + SetX = 1,96 + SetX = 2,40 + SetX = 3,8 + SetFrame = 4,16 + SetX = 4,-160 + SetX = 5,-88 + SetX = 6,-40 + SetX = 7,0 + SetFrame = 8,19 SetOpacity = 8,100 Graphic = many Focus = Target - SetX = 3,392 - SetY = 3,94 + SetFrame = 3,20 + SetX = 3,8 + SetY = 3,-2 + SetZ = 3,28 SetOpacity = 3,100 - SetX = 7,384 - SetOpacity = 7,255 + SetFrame = 4,19 + SetVisible = 5,false Play = 3,Blow5,80 Play = 7,Blow5,80 @@ -135,31 +191,45 @@ Name = DoubleSlap hit 4 [Move,DOUBLESLAP,4] Name = DoubleSlap hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 3,392 - SetY = 3,94 + SetFrame = 3,20 + SetX = 3,8 + SetY = 3,-2 + SetZ = 3,28 SetOpacity = 3,100 - SetX = 7,384 - SetOpacity = 7,255 + SetFrame = 4,19 + SetVisible = 5,false + + Graphic = many + Focus = Target + SetFrame = 7,20 + SetX = 7,0 + SetY = 7,-2 + SetZ = 7,28 + SetVisible = 8,false Graphic = many Focus = Target - SetX = 0,520 - SetY = 0,94 - SetX = 1,480 - SetX = 2,424 - SetX = 3,392 - SetX = 4,224 - SetX = 5,296 - SetX = 6,344 - SetX = 7,384 + SetFrame = 0,15 + SetX = 0,136 + SetY = 0,-2 + SetZ = 0,27 + SetX = 1,96 + SetX = 2,40 + SetX = 3,8 + SetFrame = 4,16 + SetX = 4,-160 + SetX = 5,-88 + SetX = 6,-40 + SetX = 7,0 + SetFrame = 8,19 SetOpacity = 8,100 Play = 3,Blow5,80 diff --git a/PBS/Animations/Converted/Move/DRAGONBREATH.txt b/PBS/Animations/Converted/Move/DRAGONBREATH.txt index aeb4df723..21506cce8 100644 --- a/PBS/Animations/Converted/Move/DRAGONBREATH.txt +++ b/PBS/Animations/Converted/Move/DRAGONBREATH.txt @@ -3,102 +3,128 @@ [Move,DRAGONBREATH] Name = DRAGONBREATH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fire5 Focus = UserAndTarget - SetX = 0,153 - SetY = 0,205 - SetX = 1,204 - SetY = 1,186 - SetX = 2,256 - SetY = 2,167 - SetX = 3,307 - SetY = 3,142 - SetX = 4,339 - SetY = 4,123 - SetX = 5,358 - SetY = 5,110 + SetX = 0,19 + SetY = 0,-29 + SetZ = 0,27 + SetX = 1,59 + SetY = 1,-59 + SetFrame = 2,1 + SetX = 2,100 + SetY = 2,-89 + SetFrame = 3,2 + SetX = 3,139 + SetY = 3,-128 + SetFrame = 4,3 + SetX = 4,164 + SetY = 4,-157 + SetFrame = 5,4 + SetX = 5,179 + SetY = 5,-178 + SetFrame = 6,5 + SetFrame = 7,6 + SetFrame = 8,7 Graphic = fire5 Focus = UserAndTarget - SetX = 1,179 - SetY = 1,198 - SetX = 2,217 - SetX = 3,288 - SetY = 3,179 - SetX = 4,300 - SetY = 4,173 + SetX = 1,39 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,69 + SetX = 3,125 + SetY = 3,-70 + SetFrame = 4,1 + SetX = 4,134 + SetY = 4,-79 SetZoomX = 4,75 SetZoomY = 4,75 - SetX = 5,326 - SetY = 5,167 + SetFrame = 5,0 + SetX = 5,154 + SetY = 5,-89 SetZoomX = 5,100 SetZoomY = 5,100 + SetVisible = 6,false Graphic = fire5 Focus = UserAndTarget SetFlip = 2,true - SetX = 2,217 - SetY = 2,186 + SetX = 2,69 + SetY = 2,-59 + SetZ = 2,29 SetFlip = 3,false - SetX = 3,268 - SetY = 3,192 - SetX = 4,281 - SetY = 4,186 - SetX = 5,307 - SetY = 5,179 + SetX = 3,109 + SetY = 3,-50 + SetX = 4,119 + SetY = 4,-59 + SetX = 5,139 + SetY = 5,-70 SetZoomX = 5,75 SetZoomY = 5,75 + SetVisible = 6,false Graphic = fire5 Focus = UserAndTarget SetFlip = 2,true - SetX = 2,179 - SetY = 2,205 - SetX = 3,230 - SetY = 3,198 - SetX = 4,249 - SetY = 4,192 + SetX = 2,39 + SetY = 2,-29 + SetZ = 2,30 + SetX = 3,79 + SetY = 3,-40 + SetX = 4,94 + SetY = 4,-50 SetZoomX = 4,75 SetZoomY = 4,75 + SetVisible = 5,false Graphic = fire5 Focus = UserAndTarget - SetX = 2,236 - SetY = 2,154 + SetX = 2,84 + SetY = 2,-109 + SetZ = 2,31 SetZoomX = 2,50 SetZoomY = 2,50 - SetX = 3,230 - SetY = 3,205 + SetX = 3,79 + SetY = 3,-29 SetZoomX = 3,100 SetZoomY = 3,100 + SetVisible = 4,false Graphic = fire5 Focus = UserAndTarget + SetFrame = 3,1 SetFlip = 3,true - SetX = 3,345 - SetY = 3,154 + SetX = 3,169 + SetY = 3,-109 + SetZ = 3,32 SetZoomX = 3,50 SetZoomY = 3,50 + SetVisible = 4,false Graphic = fire5 Focus = UserAndTarget + SetFrame = 3,1 SetFlip = 3,true - SetX = 3,294 - SetY = 3,142 + SetX = 3,129 + SetY = 3,-128 + SetZ = 3,33 SetZoomX = 3,40 SetZoomY = 3,40 + SetVisible = 4,false Graphic = fire5 Focus = UserAndTarget - SetX = 3,211 - SetY = 3,211 + SetX = 3,64 + SetY = 3,-20 + SetZ = 3,34 SetZoomX = 3,75 SetZoomY = 3,75 + SetVisible = 4,false Play = 0,Fire4,80 diff --git a/PBS/Animations/Converted/Move/DRAGONCLAW.txt b/PBS/Animations/Converted/Move/DRAGONCLAW.txt index e3e2f3f6b..b792232f0 100644 --- a/PBS/Animations/Converted/Move/DRAGONCLAW.txt +++ b/PBS/Animations/Converted/Move/DRAGONCLAW.txt @@ -3,20 +3,25 @@ [Move,DRAGONCLAW] Name = DRAGONCLAW - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison Focus = Target - SetX = 0,384 - SetY = 0,94 - SetX = 1,360 + SetFrame = 0,9 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetX = 1,-24 SetAngle = 1,25 - SetY = 2,102 + SetFrame = 2,10 + SetY = 2,6 SetAngle = 2,0 + SetFrame = 3,11 + SetFrame = 4,12 Play = 0,Slash9,80 Play = 0,Thunder4,80 diff --git a/PBS/Animations/Converted/Move/DRAGONDANCE.txt b/PBS/Animations/Converted/Move/DRAGONDANCE.txt index cf5f2a0f3..964e04dfc 100644 --- a/PBS/Animations/Converted/Move/DRAGONDANCE.txt +++ b/PBS/Animations/Converted/Move/DRAGONDANCE.txt @@ -3,24 +3,45 @@ [Move,DRAGONDANCE] Name = DRAGONDANCE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = electric1 Focus = Target - SetX = 3,392 - SetY = 3,46 - SetY = 7,94 + SetFrame = 3,9 + SetX = 3,8 + SetY = 3,-50 + SetZ = 3,28 + SetFrame = 4,10 + SetFrame = 5,11 + SetFrame = 6,12 + SetFrame = 7,9 + SetY = 7,-2 + SetFrame = 8,10 + SetVisible = 9,false Graphic = electric1 Focus = Target - SetX = 1,392 - SetY = 1,94 - SetY = 7,46 - SetY = 9,94 + SetFrame = 1,9 + SetX = 1,8 + SetY = 1,-2 + SetZ = 1,27 + SetFrame = 2,10 + SetFrame = 3,11 + SetFrame = 4,12 + SetFrame = 5,13 + SetFrame = 6,14 + SetFrame = 7,13 + SetY = 7,-50 + SetFrame = 8,14 + SetFrame = 9,11 + SetY = 9,-2 + SetFrame = 10,12 + SetFrame = 11,13 + SetFrame = 12,14 SetOpacity = 12,100 Play = 0,Twine,80 diff --git a/PBS/Animations/Converted/Move/DRAGONRAGE.txt b/PBS/Animations/Converted/Move/DRAGONRAGE.txt index f2d086b7a..3384984e9 100644 --- a/PBS/Animations/Converted/Move/DRAGONRAGE.txt +++ b/PBS/Animations/Converted/Move/DRAGONRAGE.txt @@ -3,58 +3,74 @@ [Move,DRAGONRAGE] Name = DRAGONRAGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fire5 Focus = UserAndTarget - SetX = 1,179 - SetY = 1,198 - SetX = 2,217 - SetX = 3,288 - SetY = 3,179 - SetX = 4,300 - SetY = 4,173 + SetX = 1,39 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,69 + SetX = 3,125 + SetY = 3,-70 + SetFrame = 4,1 + SetX = 4,134 + SetY = 4,-79 SetZoomX = 4,75 SetZoomY = 4,75 - SetX = 5,326 - SetY = 5,167 + SetFrame = 5,0 + SetX = 5,154 + SetY = 5,-89 SetZoomX = 5,100 SetZoomY = 5,100 + SetVisible = 6,false Graphic = fire5 Focus = UserAndTarget SetFlip = 2,true - SetX = 2,217 - SetY = 2,186 + SetX = 2,69 + SetY = 2,-59 + SetZ = 2,29 SetFlip = 3,false - SetX = 3,268 - SetY = 3,192 - SetX = 4,281 - SetY = 4,186 + SetX = 3,109 + SetY = 3,-50 + SetX = 4,119 + SetY = 4,-59 + SetVisible = 5,false Graphic = fire5 Focus = UserAndTarget SetFlip = 3,true - SetX = 3,230 - SetY = 3,198 + SetX = 3,79 + SetY = 3,-40 + SetZ = 3,30 + SetVisible = 4,false Graphic = fire5 Focus = UserAndTarget - SetX = 0,153 - SetY = 0,205 - SetX = 1,204 - SetY = 1,186 - SetX = 2,256 - SetY = 2,167 - SetX = 3,307 - SetY = 3,142 - SetX = 4,339 - SetY = 4,123 - SetX = 5,358 - SetY = 5,110 + SetX = 0,19 + SetY = 0,-29 + SetZ = 0,27 + SetX = 1,59 + SetY = 1,-59 + SetFrame = 2,1 + SetX = 2,100 + SetY = 2,-89 + SetFrame = 3,2 + SetX = 3,139 + SetY = 3,-128 + SetFrame = 4,3 + SetX = 4,164 + SetY = 4,-157 + SetFrame = 5,4 + SetX = 5,179 + SetY = 5,-178 + SetFrame = 6,5 + SetFrame = 7,6 + SetFrame = 8,7 Play = 0,Fire6,80 diff --git a/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt b/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt index 69a9ec67c..eb6b8dfde 100644 --- a/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt +++ b/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt @@ -3,49 +3,55 @@ [Move,DYNAMICPUNCH] Name = DYNAMICPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 1,389 - SetY = 1,99 - SetX = 2,386 - SetX = 3,383 - SetY = 3,107 - SetX = 4,386 - SetY = 4,99 - SetX = 5,384 - SetY = 5,108 + SetX = 1,5 + SetY = 1,3 + SetZ = 1,28 + SetX = 2,2 + SetX = 3,-1 + SetY = 3,11 + SetX = 4,2 + SetY = 4,3 + SetX = 5,0 + SetY = 5,12 + SetVisible = 7,false Graphic = punches Focus = Target - SetX = 0,389 - SetY = 0,98 - SetX = 1,386 - SetY = 1,96 - SetX = 2,389 - SetY = 2,94 - SetX = 3,384 - SetY = 3,99 + SetX = 0,5 + SetY = 0,2 + SetZ = 0,27 + SetFrame = 1,15 + SetX = 1,2 + SetY = 1,0 + SetFrame = 2,14 + SetX = 2,5 + SetY = 2,-2 + SetX = 3,0 + SetY = 3,3 SetZoomX = 3,150 SetZoomY = 3,150 SetOpacity = 3,250 - SetX = 4,386 - SetY = 4,90 + SetX = 4,2 + SetY = 4,-6 SetZoomX = 4,180 SetZoomY = 4,180 SetOpacity = 4,194 - SetX = 5,388 - SetY = 5,96 + SetX = 5,4 + SetY = 5,0 SetZoomX = 5,250 SetZoomY = 5,250 SetOpacity = 5,120 - SetX = 7,390 - SetY = 7,99 + SetFrame = 7,0 + SetX = 7,6 + SetY = 7,3 SetZoomX = 7,150 SetZoomY = 7,150 SetOpacity = 7,255 diff --git a/PBS/Animations/Converted/Move/EMBER.txt b/PBS/Animations/Converted/Move/EMBER.txt index 54ac80025..2c49ea8a8 100644 --- a/PBS/Animations/Converted/Move/EMBER.txt +++ b/PBS/Animations/Converted/Move/EMBER.txt @@ -3,44 +3,51 @@ [Move,EMBER] Name = EMBER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Flames Focus = UserAndTarget - SetX = 1,144 - SetY = 1,204 - SetFlip = 2,true - SetX = 2,164 - SetY = 2,196 - SetFlip = 3,false - SetX = 3,185 - SetY = 3,180 - SetFlip = 4,true - SetX = 4,206 - SetY = 4,172 - SetFlip = 5,false - SetX = 5,227 - SetY = 5,164 - SetFlip = 6,true - SetX = 6,248 - SetY = 6,156 - SetFlip = 7,false - SetX = 7,268 - SetY = 7,148 - SetX = 8,289 - SetY = 8,132 + SetX = 9,142 + SetY = 9,-153 + SetZ = 9,27 + SetFlip = 10,true + SetX = 10,158 + SetY = 10,-168 + SetFrame = 11,1 + SetFlip = 11,false + SetFrame = 12,2 Graphic = Flames Focus = UserAndTarget - SetX = 9,310 - SetY = 9,126 - SetFlip = 10,true - SetX = 10,331 - SetY = 10,116 - SetFlip = 11,false + SetFrame = 1,2 + SetX = 1,12 + SetY = 1,-31 + SetZ = 1,28 + SetFlip = 2,true + SetX = 2,28 + SetY = 2,-43 + SetFlip = 3,false + SetX = 3,44 + SetY = 3,-68 + SetFlip = 4,true + SetX = 4,60 + SetY = 4,-81 + SetFlip = 5,false + SetX = 5,77 + SetY = 5,-93 + SetFlip = 6,true + SetX = 6,93 + SetY = 6,-106 + SetFlip = 7,false + SetX = 7,109 + SetY = 7,-118 + SetFrame = 8,1 + SetX = 8,125 + SetY = 8,-143 + SetVisible = 9,false Play = 1,Fire2,80 diff --git a/PBS/Animations/Converted/Move/ENCORE.txt b/PBS/Animations/Converted/Move/ENCORE.txt index fac07a3c7..e284648f4 100644 --- a/PBS/Animations/Converted/Move/ENCORE.txt +++ b/PBS/Animations/Converted/Move/ENCORE.txt @@ -3,56 +3,82 @@ [Move,ENCORE] Name = ENCORE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = BABACOMETRO Focus = UserAndTarget - SetX = 0,96 - SetY = 0,186 - SetX = 1,108 - SetX = 2,121 - SetX = 3,160 - SetX = 4,96 - SetX = 5,108 - SetX = 6,140 - SetX = 7,108 - SetX = 8,166 - SetX = 9,108 - SetX = 10,121 - SetX = 11,160 - SetX = 12,96 - SetX = 13,108 - SetX = 14,140 - SetX = 15,108 - SetX = 16,89 - SetX = 17,115 - SetX = 18,147 + SetFrame = 0,16 + SetX = 0,-25 + SetY = 0,-59 + SetZ = 0,28 + SetX = 1,-15 + SetX = 2,-5 + SetFrame = 3,15 + SetX = 3,25 + SetFrame = 4,16 + SetX = 4,-25 + SetX = 5,-15 + SetFrame = 6,15 + SetX = 6,9 + SetFrame = 7,16 + SetX = 7,-15 + SetFrame = 8,15 + SetX = 8,29 + SetFrame = 9,16 + SetX = 9,-15 + SetX = 10,-5 + SetFrame = 11,15 + SetX = 11,25 + SetFrame = 12,16 + SetX = 12,-25 + SetX = 13,-15 + SetFrame = 14,15 + SetX = 14,9 + SetFrame = 15,16 + SetX = 15,-15 + SetX = 16,-30 + SetX = 17,-10 + SetFrame = 18,15 + SetX = 18,14 Graphic = BABACOMETRO Focus = UserAndTarget - SetX = 0,172 - SetY = 0,186 - SetX = 1,160 - SetX = 2,140 - SetX = 3,108 - SetX = 4,172 - SetX = 5,160 - SetX = 6,121 - SetX = 7,160 - SetX = 8,96 - SetX = 9,153 - SetX = 10,140 - SetX = 11,108 - SetX = 12,172 - SetX = 13,160 - SetX = 14,121 - SetX = 15,160 - SetX = 16,179 - SetX = 17,160 - SetX = 18,128 + SetFrame = 0,15 + SetX = 0,34 + SetY = 0,-59 + SetZ = 0,27 + SetX = 1,25 + SetX = 2,9 + SetFrame = 3,16 + SetX = 3,-15 + SetFrame = 4,15 + SetX = 4,34 + SetX = 5,25 + SetFrame = 6,16 + SetX = 6,-5 + SetFrame = 7,15 + SetX = 7,25 + SetFrame = 8,16 + SetX = 8,-25 + SetFrame = 9,15 + SetX = 9,19 + SetX = 10,9 + SetFrame = 11,16 + SetX = 11,-15 + SetFrame = 12,15 + SetX = 12,34 + SetX = 13,25 + SetFrame = 14,16 + SetX = 14,-5 + SetFrame = 15,15 + SetX = 15,25 + SetX = 16,39 + SetX = 17,25 + SetFrame = 18,16 + SetX = 18,0 Play = 0,Applause,80 diff --git a/PBS/Animations/Converted/Move/ENERGYBALL.txt b/PBS/Animations/Converted/Move/ENERGYBALL.txt index f83878026..c6e4f7a4f 100644 --- a/PBS/Animations/Converted/Move/ENERGYBALL.txt +++ b/PBS/Animations/Converted/Move/ENERGYBALL.txt @@ -3,16 +3,17 @@ [Move,ENERGYBALL] Name = ENERGYBALL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,393 - SetY = 0,117 + SetX = 0,9 + SetY = 0,21 + SetZ = 0,27 SetZoomX = 0,80 SetZoomY = 0,80 SetZoomX = 1,90 @@ -33,5 +34,6 @@ Name = ENERGYBALL SetZoomY = 8,160 SetZoomX = 9,170 SetZoomY = 9,170 + SetVisible = 10,false Play = 0,Uproar,100,85 diff --git a/PBS/Animations/Converted/Move/ERUPTION.txt b/PBS/Animations/Converted/Move/ERUPTION.txt index 28a4d395b..bb5bc80b3 100644 --- a/PBS/Animations/Converted/Move/ERUPTION.txt +++ b/PBS/Animations/Converted/Move/ERUPTION.txt @@ -3,68 +3,90 @@ [Move,ERUPTION] Name = ERUPTION - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fire5 Focus = UserAndTarget - SetX = 2,211 - SetY = 2,167 + SetFrame = 2,8 + SetX = 2,64 + SetY = 2,-89 + SetZ = 2,28 SetAngle = 2,30 - SetX = 3,268 - SetY = 3,142 + SetX = 3,109 + SetY = 3,-128 SetAngle = 3,15 - SetX = 4,294 - SetY = 4,123 - SetX = 5,332 - SetY = 5,110 + SetFrame = 4,9 + SetX = 4,129 + SetY = 4,-157 + SetFrame = 5,10 + SetX = 5,159 + SetY = 5,-178 SetAngle = 5,10 - SetX = 6,364 + SetFrame = 6,11 + SetX = 6,184 SetAngle = 6,0 - SetX = 7,262 - SetY = 7,91 + SetFrame = 7,10 + SetX = 7,104 + SetY = 7,-207 SetAngle = 7,10 + SetVisible = 8,false Graphic = fire5 Focus = UserAndTarget - SetX = 4,147 - SetY = 4,161 + SetFrame = 4,8 + SetX = 4,14 + SetY = 4,-98 + SetZ = 4,29 SetAngle = 4,30 - SetX = 5,179 - SetY = 5,142 + SetX = 5,39 + SetY = 5,-128 SetAngle = 5,15 - SetX = 6,204 - SetY = 6,110 + SetFrame = 6,9 + SetX = 6,59 + SetY = 6,-178 + SetVisible = 7,false Graphic = fire5 Focus = UserAndTarget - SetX = 0,160 - SetY = 0,167 + SetFrame = 0,8 + SetX = 0,25 + SetY = 0,-89 + SetZ = 0,27 SetAngle = 0,30 - SetX = 1,198 - SetY = 1,148 + SetX = 1,54 + SetY = 1,-118 SetAngle = 1,15 - SetX = 2,236 - SetY = 2,116 - SetX = 3,268 - SetY = 3,98 + SetFrame = 2,9 + SetX = 2,84 + SetY = 2,-168 + SetFrame = 3,10 + SetX = 3,109 + SetY = 3,-196 SetAngle = 3,10 - SetX = 4,313 + SetFrame = 4,11 + SetX = 4,144 SetAngle = 4,0 - SetX = 5,358 - SetY = 5,110 - SetX = 6,364 - SetX = 7,377 - SetY = 7,116 - SetX = 8,326 - SetY = 8,91 - SetX = 9,358 - SetY = 9,104 - SetX = 10,371 - SetY = 10,123 + SetFrame = 5,12 + SetX = 5,179 + SetY = 5,-178 + SetFrame = 6,13 + SetX = 6,184 + SetFrame = 7,12 + SetX = 7,194 + SetY = 7,-168 + SetFrame = 8,11 + SetX = 8,154 + SetY = 8,-207 + SetFrame = 9,12 + SetX = 9,179 + SetY = 9,-187 + SetFrame = 10,13 + SetX = 10,189 + SetY = 10,-157 Play = 0,Fire5,80 Play = 0,Fire2,80 diff --git a/PBS/Animations/Converted/Move/EXPLOSION.txt b/PBS/Animations/Converted/Move/EXPLOSION.txt index 94b10c561..233c3c1dd 100644 --- a/PBS/Animations/Converted/Move/EXPLOSION.txt +++ b/PBS/Animations/Converted/Move/EXPLOSION.txt @@ -3,57 +3,118 @@ [Move,EXPLOSION] Name = EXPLOSION - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Fire3 Focus = Target - SetX = 0,424 - SetY = 0,46 + SetFrame = 0,5 + SetX = 0,40 + SetY = 0,-50 + SetZ = 0,28 SetOpacity = 0,50 - SetX = 2,400 - SetY = 2,142 + SetFrame = 1,9 + SetFrame = 2,11 + SetX = 2,16 + SetY = 2,46 SetOpacity = 2,255 - SetX = 13,392 - SetY = 13,78 - SetX = 15,424 - SetY = 15,46 + SetFrame = 3,12 + SetFrame = 4,13 + SetFrame = 5,14 + SetFrame = 6,15 + SetFrame = 7,16 + SetFrame = 8,17 + SetFrame = 9,18 + SetFrame = 10,19 + SetFrame = 11,20 + SetFrame = 12,21 + SetFrame = 13,12 + SetX = 13,8 + SetY = 13,-18 + SetFrame = 14,13 + SetFrame = 15,23 + SetX = 15,40 + SetY = 15,-50 SetOpacity = 15,150 + SetVisible = 16,false Graphic = Fire3 Focus = Target - SetX = 2,424 - SetY = 2,46 + SetFrame = 2,10 + SetX = 2,40 + SetY = 2,-50 + SetZ = 2,29 SetOpacity = 2,100 + SetFrame = 3,11 SetOpacity = 3,255 - SetX = 6,392 - SetY = 6,78 + SetFrame = 4,12 + SetFrame = 5,13 + SetFrame = 6,5 + SetX = 6,8 + SetY = 6,-18 SetOpacity = 6,100 + SetFrame = 7,6 SetOpacity = 7,255 - SetX = 13,424 - SetY = 13,46 + SetFrame = 8,7 + SetFrame = 9,8 + SetFrame = 10,9 + SetFrame = 11,10 + SetFrame = 12,11 + SetFrame = 13,21 + SetX = 13,40 + SetY = 13,-50 + SetFrame = 14,22 + SetVisible = 15,false Graphic = Fire3 Focus = Target - SetX = 6,424 - SetY = 6,46 + SetFrame = 6,14 + SetX = 6,40 + SetY = 6,-50 + SetZ = 6,30 + SetFrame = 7,15 + SetFrame = 8,16 + SetFrame = 9,17 + SetFrame = 10,18 + SetFrame = 11,19 + SetFrame = 12,20 + SetVisible = 13,false Graphic = Fire3 Focus = Target - SetX = 0,296 - SetY = 0,94 + SetFrame = 0,11 + SetX = 0,-88 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,12 + SetFrame = 2,13 + SetFrame = 3,14 + SetFrame = 4,15 + SetFrame = 5,16 + SetFrame = 6,17 + SetFrame = 7,18 + SetFrame = 8,19 + SetFrame = 9,20 + SetFrame = 10,21 + SetFrame = 11,22 + SetFrame = 12,23 SetOpacity = 12,150 - SetX = 13,400 - SetY = 13,142 + SetFrame = 13,22 + SetX = 13,16 + SetY = 13,46 SetOpacity = 13,255 + SetFrame = 14,23 SetOpacity = 14,150 - SetX = 15,392 - SetY = 15,78 + SetFrame = 15,15 + SetX = 15,8 + SetY = 15,-18 SetOpacity = 15,255 + SetFrame = 16,17 SetOpacity = 16,200 + SetFrame = 17,19 SetOpacity = 17,150 Play = 0,Explosion3,80 diff --git a/PBS/Animations/Converted/Move/FAKEOUT.txt b/PBS/Animations/Converted/Move/FAKEOUT.txt index bebf82263..5aeb00eba 100644 --- a/PBS/Animations/Converted/Move/FAKEOUT.txt +++ b/PBS/Animations/Converted/Move/FAKEOUT.txt @@ -3,37 +3,47 @@ [Move,FAKEOUT] Name = FAKEOUT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Fakeout Focus = Target + SetFrame = 0,5 SetFlip = 0,true - SetX = 0,480 - SetY = 0,102 - SetX = 6,464 - SetX = 7,448 - SetX = 8,400 - SetX = 9,384 - SetX = 12,400 - SetX = 13,448 - SetX = 14,464 - SetX = 15,480 + SetX = 0,96 + SetY = 0,6 + SetZ = 0,28 + SetX = 6,80 + SetX = 7,64 + SetFrame = 8,6 + SetX = 8,16 + SetX = 9,0 + SetX = 12,16 + SetFrame = 13,5 + SetX = 13,64 + SetX = 14,80 + SetX = 15,96 + SetVisible = 20,false Graphic = Fakeout Focus = Target - SetX = 0,288 - SetY = 0,102 - SetX = 6,304 - SetX = 7,320 - SetX = 8,368 - SetX = 9,384 - SetX = 12,368 - SetX = 13,320 - SetX = 14,304 - SetX = 15,288 + SetFrame = 0,5 + SetX = 0,-96 + SetY = 0,6 + SetZ = 0,27 + SetX = 6,-80 + SetX = 7,-64 + SetFrame = 8,6 + SetX = 8,-16 + SetX = 9,0 + SetX = 12,-16 + SetFrame = 13,5 + SetX = 13,-64 + SetX = 14,-80 + SetX = 15,-96 + SetVisible = 20,false Play = 9,punch5,80,150 diff --git a/PBS/Animations/Converted/Move/FAKETEARS.txt b/PBS/Animations/Converted/Move/FAKETEARS.txt index 1a9858b3f..8b7224413 100644 --- a/PBS/Animations/Converted/Move/FAKETEARS.txt +++ b/PBS/Animations/Converted/Move/FAKETEARS.txt @@ -3,77 +3,101 @@ [Move,FAKETEARS] Name = FAKETEARS - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + + Graphic = poison2 + Focus = User + SetX = 0,56 + SetY = 0,14 + SetZ = 0,27 + SetX = 1,64 + SetY = 1,6 + SetFlip = 2,true + SetX = 2,-80 + SetY = 2,-2 + SetFrame = 3,1 + SetFlip = 3,false + SetX = 3,83 + SetY = 3,-6 + SetFrame = 4,2 + SetX = 4,96 + SetY = 4,6 + SetX = 5,104 + SetY = 5,14 + SetFlip = 6,true + SetX = 6,-124 + SetY = 6,9 + SetFlip = 7,false + SetX = 7,120 + SetY = 7,2 + SetX = 8,130 + SetY = 8,10 + SetX = 9,142 + SetY = 9,24 Graphic = poison2 Focus = User SetFlip = 1,true - SetX = 1,56 - SetY = 1,230 - SetX = 3,40 - SetY = 3,214 - SetX = 4,29 - SetY = 4,209 - SetX = 5,15 - SetY = 5,225 - SetFlip = 6,false - SetX = 6,240 - SetY = 6,222 - SetX = 7,7 - SetY = 7,208 - SetX = 8,-7 - SetY = 8,214 - SetX = 9,-16 - SetY = 9,227 + SetX = 1,-72 + SetY = 1,6 + SetZ = 1,28 + SetVisible = 2,false Graphic = poison2 Focus = User - SetX = 2,200 - SetY = 2,222 - SetX = 4,221 - SetY = 4,217 - SetX = 5,234 - SetY = 5,216 - SetFlip = 6,true - SetX = 6,-3 - SetY = 6,203 + SetFrame = 2,1 + SetX = 2,72 + SetY = 2,-2 + SetZ = 2,29 + SetVisible = 3,false Graphic = poison2 Focus = User - SetFlip = 5,true - SetX = 5,10 - SetY = 5,204 - + SetFrame = 3,1 + SetFlip = 3,true + SetX = 3,-88 + SetY = 3,-10 + SetZ = 3,28 + SetX = 4,-99 + SetY = 4,-15 + SetFrame = 5,2 + SetX = 5,-113 + SetY = 5,1 + SetFlip = 6,false + SetX = 6,112 + SetY = 6,-2 + SetX = 7,-121 + SetY = 7,-16 + SetX = 8,-135 + SetY = 8,-10 + SetX = 9,-144 + SetY = 9,3 + Graphic = poison2 Focus = User - SetX = 0,184 - SetY = 0,238 - SetX = 1,192 - SetY = 1,230 - SetFlip = 2,true - SetX = 2,48 - SetY = 2,222 - SetFlip = 3,false - SetX = 3,211 - SetY = 3,218 - SetX = 4,224 - SetY = 4,230 - SetX = 5,232 - SetY = 5,238 + SetFrame = 4,1 + SetX = 4,93 + SetY = 4,-7 + SetZ = 4,29 + SetX = 5,106 + SetY = 5,-8 SetFlip = 6,true - SetX = 6,4 - SetY = 6,233 - SetFlip = 7,false - SetX = 7,248 - SetY = 7,226 - SetX = 8,258 - SetY = 8,234 - SetX = 9,270 - SetY = 9,248 + SetX = 6,-131 + SetY = 6,-21 + SetVisible = 7,false + + Graphic = poison2 + Focus = User + SetFrame = 5,1 + SetFlip = 5,true + SetX = 5,-118 + SetY = 5,-20 + SetZ = 5,30 + SetVisible = 6,false Play = 0,Water1,40,70 Play = 2,Water1,40,70 diff --git a/PBS/Animations/Converted/Move/FIERYDANCE.txt b/PBS/Animations/Converted/Move/FIERYDANCE.txt index b9bbccf60..8e41b1194 100644 --- a/PBS/Animations/Converted/Move/FIERYDANCE.txt +++ b/PBS/Animations/Converted/Move/FIERYDANCE.txt @@ -3,110 +3,158 @@ [Move,FIERYDANCE] Name = FIERYDANCE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,419 - SetY = 0,80 - SetX = 1,424 - SetY = 1,86 - SetX = 2,425 - SetY = 2,92 - SetX = 3,416 - SetY = 3,84 - SetX = 4,358 - SetY = 4,102 - SetX = 5,354 - SetY = 5,108 - SetX = 6,339 - SetY = 6,79 - SetX = 7,386 - SetY = 7,100 - SetX = 8,367 - SetY = 8,127 - SetX = 9,374 - SetY = 9,108 - SetX = 10,373 - SetY = 10,101 - SetX = 11,388 - SetY = 11,97 - SetX = 12,385 - SetY = 12,92 + SetFrame = 0,16 + SetX = 0,35 + SetY = 0,-16 + SetZ = 0,27 + SetX = 1,40 + SetY = 1,-10 + SetFrame = 2,17 + SetX = 2,41 + SetY = 2,-4 + SetX = 3,32 + SetY = 3,-12 + SetFrame = 4,16 + SetX = 4,-26 + SetY = 4,6 + SetFrame = 5,15 + SetX = 5,-30 + SetY = 5,12 + SetX = 6,-45 + SetY = 6,-17 + SetFrame = 7,16 + SetX = 7,2 + SetY = 7,4 + SetX = 8,-17 + SetY = 8,31 + SetFrame = 9,15 + SetX = 9,-10 + SetY = 9,12 + SetX = 10,-11 + SetY = 10,5 + SetX = 11,4 + SetY = 11,1 + SetFrame = 12,18 + SetX = 12,1 + SetY = 12,-4 Graphic = fly copy Focus = Target - SetX = 1,364 - SetY = 1,85 - SetX = 2,359 - SetY = 2,82 - SetX = 3,356 - SetY = 3,84 - SetX = 4,413 - SetY = 4,104 - SetX = 5,398 - SetY = 5,90 - SetX = 6,382 - SetY = 6,39 - SetX = 7,421 - SetY = 7,82 - SetX = 8,418 - SetY = 8,110 - SetX = 9,422 - SetY = 9,100 - SetX = 10,407 - SetY = 10,57 + SetFrame = 1,16 + SetX = 1,-20 + SetY = 1,-11 + SetZ = 1,28 + SetX = 2,-25 + SetY = 2,-14 + SetFrame = 3,17 + SetX = 3,-28 + SetY = 3,-12 + SetFrame = 4,16 + SetX = 4,29 + SetY = 4,8 + SetFrame = 5,15 + SetX = 5,14 + SetY = 5,-6 + SetX = 6,-2 + SetY = 6,-57 + SetFrame = 7,16 + SetX = 7,37 + SetY = 7,-14 + SetX = 8,34 + SetY = 8,14 + SetFrame = 9,17 + SetX = 9,38 + SetY = 9,4 + SetX = 10,23 + SetY = 10,-39 + SetVisible = 11,false Graphic = fly copy Focus = Target - SetX = 1,411 - SetY = 1,49 - SetX = 2,407 - SetY = 2,50 - SetX = 3,403 - SetY = 3,40 - SetX = 4,404 - SetY = 4,50 - SetX = 5,438 - SetY = 5,41 - SetX = 6,419 - SetY = 6,84 - SetX = 7,399 - SetY = 7,54 - SetX = 8,388 - SetY = 8,75 - SetX = 9,399 - SetY = 9,50 + SetFrame = 1,16 + SetX = 1,27 + SetY = 1,-47 + SetZ = 1,29 + SetX = 2,23 + SetY = 2,-46 + SetFrame = 3,17 + SetX = 3,19 + SetY = 3,-56 + SetFrame = 4,18 + SetX = 4,20 + SetY = 4,-46 + SetFrame = 5,15 + SetX = 5,54 + SetY = 5,-55 + SetX = 6,35 + SetY = 6,-12 + SetFrame = 7,16 + SetX = 7,15 + SetY = 7,-42 + SetFrame = 8,17 + SetX = 8,4 + SetY = 8,-21 + SetX = 9,15 + SetY = 9,-46 + SetVisible = 10,false Graphic = fly copy Focus = Target - SetX = 3,338 - SetY = 3,51 - SetX = 4,321 - SetY = 4,48 - SetX = 5,435 - SetY = 5,118 - SetX = 7,410 - SetY = 7,115 - SetX = 8,424 - SetY = 8,52 + SetFrame = 3,18 + SetX = 3,-46 + SetY = 3,-45 + SetZ = 3,30 + SetX = 4,-63 + SetY = 4,-48 + SetFrame = 5,15 + SetX = 5,51 + SetY = 5,22 + SetVisible = 6,false Graphic = fly copy Focus = Target - SetX = 4,373 - SetY = 4,55 - SetX = 7,359 - SetY = 7,63 - SetX = 8,342 - SetY = 8,49 + SetFrame = 4,15 + SetX = 4,-11 + SetY = 4,-41 + SetZ = 4,31 + SetVisible = 5,false Graphic = fly copy Focus = Target - SetX = 7,351 - SetY = 7,107 + SetFrame = 7,16 + SetX = 7,26 + SetY = 7,19 + SetZ = 7,30 + SetFrame = 8,17 + SetX = 8,40 + SetY = 8,-44 + SetVisible = 9,false + + Graphic = fly copy + Focus = Target + SetFrame = 7,16 + SetX = 7,-25 + SetY = 7,-33 + SetZ = 7,31 + SetFrame = 8,17 + SetX = 8,-42 + SetY = 8,-47 + SetVisible = 9,false + + Graphic = fly copy + Focus = Target + SetFrame = 7,16 + SetX = 7,-33 + SetY = 7,11 + SetZ = 7,32 + SetVisible = 8,false Play = 0,Wring Out,80 diff --git a/PBS/Animations/Converted/Move/FINALGAMBIT.txt b/PBS/Animations/Converted/Move/FINALGAMBIT.txt index e716d6058..752865176 100644 --- a/PBS/Animations/Converted/Move/FINALGAMBIT.txt +++ b/PBS/Animations/Converted/Move/FINALGAMBIT.txt @@ -3,54 +3,72 @@ [Move,FINALGAMBIT] Name = FINALGAMBIT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 0,364 - SetY = 0,126 - SetX = 1,362 - SetY = 1,122 - SetX = 2,391 - SetY = 2,127 - SetX = 3,396 - SetY = 3,122 - SetX = 4,367 - SetY = 4,100 - SetX = 5,388 - SetY = 5,97 - SetX = 6,387 - SetY = 6,108 - SetX = 7,356 - SetY = 7,76 - SetX = 8,405 - SetY = 8,107 - SetX = 9,404 - SetY = 9,108 - SetX = 10,377 - SetY = 10,84 - SetX = 11,386 - SetY = 11,107 - SetX = 12,411 - SetY = 12,67 - SetX = 13,414 - SetY = 13,74 - SetX = 14,400 - SetY = 14,113 - SetX = 15,387 - SetY = 15,114 - SetY = 16,137 - SetX = 17,384 - SetY = 17,136 - SetX = 18,375 - SetY = 18,76 - SetX = 19,416 - SetY = 19,89 - SetX = 20,407 - SetY = 20,108 + SetFrame = 0,7 + SetX = 0,-20 + SetY = 0,30 + SetZ = 0,27 + SetX = 1,-22 + SetY = 1,26 + SetX = 2,7 + SetY = 2,31 + SetFrame = 3,8 + SetX = 3,12 + SetY = 3,26 + SetFrame = 4,9 + SetX = 4,-17 + SetY = 4,4 + SetX = 5,4 + SetY = 5,1 + SetFrame = 6,10 + SetX = 6,3 + SetY = 6,12 + SetX = 7,-28 + SetY = 7,-20 + SetFrame = 8,7 + SetX = 8,21 + SetY = 8,11 + SetFrame = 9,8 + SetX = 9,20 + SetY = 9,12 + SetFrame = 10,9 + SetX = 10,-7 + SetY = 10,-12 + SetFrame = 11,10 + SetX = 11,2 + SetY = 11,11 + SetFrame = 12,7 + SetX = 12,27 + SetY = 12,-29 + SetFrame = 13,8 + SetX = 13,30 + SetY = 13,-22 + SetFrame = 14,7 + SetX = 14,16 + SetY = 14,17 + SetFrame = 15,10 + SetX = 15,3 + SetY = 15,18 + SetFrame = 16,7 + SetY = 16,41 + SetFrame = 17,10 + SetX = 17,0 + SetY = 17,40 + SetFrame = 18,7 + SetX = 18,-9 + SetY = 18,-20 + SetFrame = 19,9 + SetX = 19,32 + SetY = 19,-7 + SetFrame = 20,8 + SetX = 20,23 + SetY = 20,12 Play = 0,MiningCollapse diff --git a/PBS/Animations/Converted/Move/FIREBLAST.txt b/PBS/Animations/Converted/Move/FIREBLAST.txt index 37cb404fd..f1f2210a7 100644 --- a/PBS/Animations/Converted/Move/FIREBLAST.txt +++ b/PBS/Animations/Converted/Move/FIREBLAST.txt @@ -3,27 +3,37 @@ [Move,FIREBLAST] Name = FIREBLAST - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fire blast Focus = Target - SetX = 0,384 - SetY = 0,94 - SetY = 2,95 - SetY = 3,92 - SetX = 4,383 - SetY = 4,91 - SetX = 5,384 - SetY = 5,98 - SetY = 6,94 - SetY = 7,96 - SetX = 8,382 - SetY = 8,92 - SetX = 9,385 - SetY = 9,89 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetY = 2,-1 + SetFrame = 3,3 + SetY = 3,-4 + SetFrame = 4,4 + SetX = 4,-1 + SetY = 4,-5 + SetFrame = 5,5 + SetX = 5,0 + SetY = 5,2 + SetFrame = 6,6 + SetY = 6,-2 + SetFrame = 7,7 + SetY = 7,0 + SetFrame = 8,8 + SetX = 8,-2 + SetY = 8,-4 + SetFrame = 9,9 + SetX = 9,1 + SetY = 9,-7 Play = 0,Voltorb Flip Explosion,95,101 diff --git a/PBS/Animations/Converted/Move/FIREFANG.txt b/PBS/Animations/Converted/Move/FIREFANG.txt index 1967501cd..13958e69f 100644 --- a/PBS/Animations/Converted/Move/FIREFANG.txt +++ b/PBS/Animations/Converted/Move/FIREFANG.txt @@ -3,90 +3,127 @@ [Move,FIREFANG] Name = FIREFANG - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = element fangs Focus = Target - SetX = 0,391 - SetY = 0,94 - SetX = 1,394 - SetY = 1,96 - SetX = 2,386 - SetY = 2,93 - SetX = 3,392 - SetY = 3,99 - SetX = 4,381 - SetY = 4,98 - SetX = 5,384 - SetY = 5,94 - SetX = 6,386 - SetY = 6,96 - SetX = 8,391 - SetY = 8,95 - SetX = 9,382 - SetY = 9,87 - SetX = 10,395 - SetY = 10,96 - SetX = 11,393 - SetY = 11,98 - SetY = 12,93 + SetX = 0,7 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,10 + SetY = 1,0 + SetFrame = 2,2 + SetX = 2,2 + SetY = 2,-3 + SetFrame = 3,3 + SetX = 3,8 + SetY = 3,3 + SetFrame = 4,4 + SetX = 4,-3 + SetY = 4,2 + SetFrame = 5,5 + SetX = 5,0 + SetY = 5,-2 + SetFrame = 6,6 + SetX = 6,2 + SetY = 6,0 + SetFrame = 7,7 + SetFrame = 8,8 + SetX = 8,7 + SetY = 8,-1 + SetFrame = 9,9 + SetX = 9,-2 + SetY = 9,-9 + SetFrame = 10,10 + SetX = 10,11 + SetY = 10,0 + SetFrame = 11,11 + SetX = 11,9 + SetY = 11,2 + SetFrame = 12,12 + SetY = 12,-3 Graphic = element fangs Focus = Target - SetX = 7,411 - SetY = 7,88 - SetY = 8,89 - SetY = 9,82 - SetX = 10,415 - SetY = 10,89 + SetFrame = 7,15 + SetX = 7,27 + SetY = 7,-8 + SetZ = 7,28 + SetY = 8,-7 + SetY = 9,-14 + SetX = 10,31 + SetY = 10,-7 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 8,418 - SetY = 8,70 - SetX = 9,414 - SetY = 9,61 - SetX = 10,420 - SetY = 10,69 + SetFrame = 8,15 + SetX = 8,34 + SetY = 8,-26 + SetZ = 8,29 + SetX = 9,30 + SetY = 9,-35 + SetX = 10,36 + SetY = 10,-27 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 8,353 - SetY = 8,73 - SetX = 9,349 - SetY = 9,40 - SetX = 10,405 - SetY = 10,53 + SetFrame = 8,15 + SetX = 8,-31 + SetY = 8,-23 + SetZ = 8,30 + SetX = 9,-35 + SetY = 9,-56 + SetX = 10,21 + SetY = 10,-43 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 9,359 - SetY = 9,33 - SetX = 10,348 - SetY = 10,48 + SetFrame = 9,15 + SetX = 9,-25 + SetY = 9,-63 + SetZ = 9,31 + SetX = 10,-36 + SetY = 10,-48 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 10,358 - SetY = 10,44 + SetFrame = 10,15 + SetX = 10,-26 + SetY = 10,-52 + SetZ = 10,32 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 10,375 - SetY = 10,40 + SetFrame = 10,15 + SetX = 10,-9 + SetY = 10,-56 + SetZ = 10,33 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 10,356 - SetY = 10,104 + SetFrame = 10,15 + SetX = 10,-28 + SetY = 10,8 + SetZ = 10,34 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 10,365 - SetY = 10,32 + SetFrame = 10,15 + SetX = 10,-19 + SetY = 10,-64 + SetZ = 10,35 + SetVisible = 11,false Play = 6,Vice Grip,100,114 diff --git a/PBS/Animations/Converted/Move/FIREPLEDGE.txt b/PBS/Animations/Converted/Move/FIREPLEDGE.txt index 5da6e1901..b15f26a7d 100644 --- a/PBS/Animations/Converted/Move/FIREPLEDGE.txt +++ b/PBS/Animations/Converted/Move/FIREPLEDGE.txt @@ -3,33 +3,37 @@ [Move,FIREPLEDGE] Name = FIREPLEDGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet.2 Focus = Target - SetX = 0,388 - SetY = 0,135 + SetFrame = 0,10 + SetX = 0,4 + SetY = 0,39 + SetZ = 0,27 SetZoomY = 0,30 - SetX = 1,387 - SetY = 1,123 + SetX = 1,3 + SetY = 1,27 SetZoomY = 1,50 - SetY = 2,111 + SetY = 2,15 SetZoomY = 2,75 - SetX = 3,386 - SetY = 3,100 + SetX = 3,2 + SetY = 3,4 SetZoomY = 3,100 - SetX = 4,387 - SetY = 4,111 + SetX = 4,3 + SetY = 4,15 SetZoomY = 4,75 - SetX = 5,386 - SetY = 5,100 + SetX = 5,2 + SetY = 5,4 SetZoomY = 5,100 - SetX = 6,384 - SetY = 6,98 - SetY = 7,95 + SetFrame = 6,12 + SetX = 6,0 + SetY = 6,2 + SetFrame = 7,11 + SetY = 7,-1 Play = 0,Mega Punch diff --git a/PBS/Animations/Converted/Move/FIREPUNCH.txt b/PBS/Animations/Converted/Move/FIREPUNCH.txt index 7688dd2f1..fa51d9704 100644 --- a/PBS/Animations/Converted/Move/FIREPUNCH.txt +++ b/PBS/Animations/Converted/Move/FIREPUNCH.txt @@ -3,100 +3,136 @@ [Move,FIREPUNCH] Name = FIREPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 0,387 - SetY = 0,97 - SetX = 1,402 - SetY = 1,88 - SetX = 2,403 - SetY = 2,96 - SetX = 3,404 - SetY = 3,104 - SetX = 4,406 - SetY = 4,107 - SetX = 5,410 - SetY = 5,101 - SetX = 6,395 - SetY = 6,74 + SetX = 0,3 + SetY = 0,1 + SetZ = 0,27 + SetFrame = 1,10 + SetX = 1,18 + SetY = 1,-8 + SetFrame = 2,9 + SetX = 2,19 + SetY = 2,0 + SetX = 3,20 + SetY = 3,8 + SetX = 4,22 + SetY = 4,11 + SetX = 5,26 + SetY = 5,5 + SetX = 6,11 + SetY = 6,-22 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 1,390 - SetY = 1,95 - SetX = 2,384 - SetY = 2,98 - SetX = 3,366 - SetY = 3,72 - SetX = 4,363 - SetY = 4,90 - SetX = 5,395 - SetY = 5,76 - SetX = 6,413 - SetY = 6,96 + SetX = 1,6 + SetY = 1,-1 + SetZ = 1,28 + SetX = 2,0 + SetY = 2,2 + SetFrame = 3,10 + SetX = 3,-18 + SetY = 3,-24 + SetFrame = 4,9 + SetX = 4,-21 + SetY = 4,-6 + SetX = 5,11 + SetY = 5,-20 + SetX = 6,29 + SetY = 6,0 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 3,385 - SetY = 3,101 - SetX = 4,395 - SetY = 4,69 - SetX = 5,364 - SetY = 5,91 - SetX = 6,393 - SetY = 6,113 + SetX = 3,1 + SetY = 3,5 + SetZ = 3,29 + SetFrame = 4,10 + SetX = 4,11 + SetY = 4,-27 + SetFrame = 5,9 + SetX = 5,-20 + SetY = 5,-5 + SetX = 6,9 + SetY = 6,17 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 4,384 - SetY = 4,103 - SetX = 5,381 - SetY = 5,109 - SetX = 6,370 - SetY = 6,98 + SetX = 4,0 + SetY = 4,7 + SetZ = 4,30 + SetFrame = 5,10 + SetX = 5,-3 + SetY = 5,13 + SetFrame = 6,9 + SetX = 6,-14 + SetY = 6,2 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 5,387 - SetY = 5,104 - SetX = 6,392 - SetY = 6,106 + SetX = 5,3 + SetY = 5,8 + SetZ = 5,31 + SetX = 6,8 + SetY = 6,10 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 7,403 - SetY = 7,82 + SetFrame = 7,9 + SetX = 7,19 + SetY = 7,-14 + SetZ = 7,32 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 8,374 - SetY = 8,81 + SetFrame = 8,9 + SetX = 8,-10 + SetY = 8,-15 + SetZ = 8,33 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 9,398 - SetY = 9,64 + SetFrame = 9,9 + SetX = 9,14 + SetY = 9,-32 + SetZ = 9,34 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 10,388 - SetY = 10,102 + SetFrame = 10,9 + SetX = 10,4 + SetY = 10,6 + SetZ = 10,35 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 11,403 - SetY = 11,110 + SetFrame = 11,9 + SetX = 11,19 + SetY = 11,14 + SetZ = 11,36 + SetVisible = 12,false Graphic = punches Focus = Target - SetX = 11,377 - SetY = 11,115 + SetFrame = 11,9 + SetX = 11,-7 + SetY = 11,19 + SetZ = 11,37 + SetVisible = 12,false Play = 0,Slam,100,115 Play = 1,Explosion diff --git a/PBS/Animations/Converted/Move/FIRESPIN.txt b/PBS/Animations/Converted/Move/FIRESPIN.txt index acbdaf814..11408f8ad 100644 --- a/PBS/Animations/Converted/Move/FIRESPIN.txt +++ b/PBS/Animations/Converted/Move/FIRESPIN.txt @@ -3,33 +3,46 @@ [Move,FIRESPIN] Name = FIRESPIN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = grass2 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetFrame = 0,9 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 SetZoomX = 0,25 SetZoomY = 0,25 SetOpacity = 0,100 + SetFrame = 1,10 SetZoomX = 1,50 SetZoomY = 1,50 SetOpacity = 1,150 - SetY = 2,86 + SetFrame = 2,11 + SetY = 2,-10 SetZoomX = 2,75 SetZoomY = 2,75 SetOpacity = 2,200 - SetY = 3,78 + SetFrame = 3,12 + SetY = 3,-18 SetZoomX = 3,100 SetZoomY = 3,100 SetOpacity = 3,255 + SetFrame = 4,9 + SetFrame = 5,10 + SetFrame = 6,11 + SetFrame = 7,12 + SetFrame = 8,9 + SetFrame = 9,10 + SetFrame = 10,11 SetZoomX = 10,75 SetZoomY = 10,75 SetOpacity = 10,150 + SetFrame = 11,12 SetZoomX = 11,50 SetZoomY = 11,50 SetOpacity = 11,100 diff --git a/PBS/Animations/Converted/Move/FLAIL.txt b/PBS/Animations/Converted/Move/FLAIL.txt index 94c44f213..6207d8ec2 100644 --- a/PBS/Animations/Converted/Move/FLAIL.txt +++ b/PBS/Animations/Converted/Move/FLAIL.txt @@ -3,60 +3,65 @@ [Move,FLAIL] Name = FLAIL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = UserAndTarget - SetX = 0,354 - SetY = 0,117 - SetX = 1,374 - SetY = 1,111 - SetX = 2,415 - SetY = 2,116 - SetX = 3,396 - SetY = 3,106 - SetX = 4,398 - SetY = 4,104 - SetX = 5,417 - SetY = 5,123 - SetX = 6,355 - SetY = 6,127 - SetX = 7,377 - SetY = 7,105 - SetX = 8,381 - SetY = 8,119 - SetX = 9,354 - SetY = 9,138 - SetX = 10,410 - SetY = 10,124 - SetX = 11,387 - SetY = 11,108 - SetX = 12,409 - SetY = 12,121 - SetX = 13,374 - SetY = 13,122 - SetX = 14,421 - SetY = 14,113 - SetX = 15,388 - SetY = 15,91 - SetX = 16,414 - SetY = 16,133 - SetX = 17,412 - SetY = 17,122 - SetX = 18,413 - SetX = 19,371 - SetY = 19,119 - SetX = 20,379 - SetY = 20,117 - SetX = 21,406 - SetY = 21,104 - SetX = 22,403 - SetY = 22,96 - SetX = 23,405 - SetY = 23,95 + SetFrame = 0,7 + SetX = 0,176 + SetY = 0,-167 + SetZ = 0,27 + SetX = 1,192 + SetY = 1,-176 + SetX = 2,224 + SetY = 2,-168 + SetX = 3,209 + SetY = 3,-184 + SetFrame = 4,8 + SetX = 4,210 + SetY = 4,-187 + SetX = 5,225 + SetY = 5,-157 + SetX = 6,177 + SetY = 6,-151 + SetX = 7,194 + SetY = 7,-185 + SetX = 8,197 + SetY = 8,-164 + SetFrame = 9,7 + SetX = 9,176 + SetY = 9,-134 + SetX = 10,220 + SetY = 10,-156 + SetX = 11,202 + SetY = 11,-181 + SetX = 12,219 + SetY = 12,-160 + SetFrame = 13,8 + SetX = 13,192 + SetY = 13,-159 + SetX = 14,228 + SetY = 14,-173 + SetX = 15,203 + SetY = 15,-207 + SetX = 16,223 + SetY = 16,-142 + SetX = 17,221 + SetY = 17,-159 + SetX = 18,222 + SetX = 19,189 + SetY = 19,-164 + SetX = 20,196 + SetY = 20,-167 + SetX = 21,217 + SetY = 21,-187 + SetX = 22,214 + SetY = 22,-200 + SetX = 23,216 + SetY = 23,-201 Play = 0,Flail diff --git a/PBS/Animations/Converted/Move/FLAMEBURST.txt b/PBS/Animations/Converted/Move/FLAMEBURST.txt index 37b142961..d3ae74f1d 100644 --- a/PBS/Animations/Converted/Move/FLAMEBURST.txt +++ b/PBS/Animations/Converted/Move/FLAMEBURST.txt @@ -3,230 +3,248 @@ [Move,FLAMEBURST] Name = FLAMEBURST - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Flames Focus = Target - SetX = 0,385 - SetY = 0,101 - SetY = 1,98 - SetX = 2,375 - SetY = 2,109 - SetX = 3,374 - SetY = 3,116 - SetX = 4,377 - SetY = 4,126 - SetX = 5,357 - SetY = 5,121 - SetX = 6,346 - SetY = 6,132 - SetX = 7,354 - SetY = 7,131 - SetX = 8,359 - SetY = 8,124 + SetX = 0,1 + SetY = 0,5 + SetZ = 0,27 + SetY = 1,2 + SetX = 2,-9 + SetY = 2,13 + SetX = 3,-10 + SetY = 3,20 + SetX = 4,-7 + SetY = 4,30 + SetX = 5,-27 + SetY = 5,25 + SetX = 6,-38 + SetY = 6,36 + SetX = 7,-30 + SetY = 7,35 + SetX = 8,-25 + SetY = 8,28 Graphic = Flames Focus = Target - SetX = 1,400 - SetY = 1,114 - SetX = 2,365 - SetY = 2,90 - SetX = 3,396 - SetY = 3,122 - SetX = 4,368 - SetY = 4,104 - SetX = 5,356 - SetX = 6,347 - SetY = 6,115 - SetX = 7,344 - SetY = 7,111 - SetX = 8,354 - SetY = 8,106 + SetX = 1,16 + SetY = 1,18 + SetZ = 1,28 + SetX = 2,-19 + SetY = 2,-6 + SetX = 3,12 + SetY = 3,26 + SetX = 4,-16 + SetY = 4,8 + SetX = 5,-28 + SetX = 6,-37 + SetY = 6,19 + SetX = 7,-40 + SetY = 7,15 + SetX = 8,-30 + SetY = 8,10 Graphic = Flames Focus = Target - SetX = 1,371 - SetY = 1,110 - SetX = 2,397 - SetY = 2,111 - SetX = 3,391 - SetY = 3,104 - SetX = 4,384 - SetY = 4,108 - SetX = 5,377 - SetY = 5,130 - SetX = 6,343 - SetY = 6,95 - SetX = 7,356 - SetY = 7,93 - SetX = 8,380 - SetY = 8,130 + SetX = 1,-13 + SetY = 1,14 + SetZ = 1,29 + SetX = 2,13 + SetY = 2,15 + SetX = 3,7 + SetY = 3,8 + SetX = 4,0 + SetY = 4,12 + SetX = 5,-7 + SetY = 5,34 + SetX = 6,-41 + SetY = 6,-1 + SetX = 7,-28 + SetY = 7,-3 + SetX = 8,-4 + SetY = 8,34 Graphic = Flames Focus = Target - SetX = 2,389 - SetY = 2,94 - SetX = 3,367 - SetX = 4,399 - SetY = 4,119 - SetX = 5,379 - SetY = 5,114 - SetX = 6,352 - SetY = 6,76 - SetX = 7,372 - SetY = 7,111 - SetX = 8,383 - SetY = 8,108 + SetX = 2,5 + SetY = 2,-2 + SetZ = 2,30 + SetX = 3,-17 + SetX = 4,15 + SetY = 4,23 + SetX = 5,-5 + SetY = 5,18 + SetX = 6,-32 + SetY = 6,-20 + SetX = 7,-12 + SetY = 7,15 + SetX = 8,-1 + SetY = 8,12 Graphic = Flames Focus = Target - SetX = 3,399 - SetY = 3,83 - SetX = 4,382 - SetY = 4,89 - SetX = 5,375 - SetY = 5,95 - SetX = 6,367 - SetY = 6,91 - SetX = 7,377 - SetY = 7,95 - SetX = 8,373 - SetY = 8,99 + SetX = 3,15 + SetY = 3,-13 + SetZ = 3,31 + SetX = 4,-2 + SetY = 4,-7 + SetX = 5,-9 + SetY = 5,-1 + SetX = 6,-17 + SetY = 6,-5 + SetX = 7,-7 + SetY = 7,-1 + SetX = 8,-11 + SetY = 8,3 Graphic = Flames Focus = Target - SetX = 3,410 - SetY = 3,111 - SetX = 4,400 - SetY = 4,92 - SetX = 5,356 - SetY = 5,84 - SetX = 6,367 - SetY = 6,114 - SetX = 7,382 - SetY = 7,130 - SetX = 8,353 - SetY = 8,87 + SetX = 3,26 + SetY = 3,15 + SetZ = 3,32 + SetX = 4,16 + SetY = 4,-4 + SetX = 5,-28 + SetY = 5,-12 + SetX = 6,-17 + SetY = 6,18 + SetX = 7,-2 + SetY = 7,34 + SetX = 8,-31 + SetY = 8,-9 Graphic = Flames Focus = Target - SetX = 3,380 - SetY = 3,78 - SetX = 4,358 - SetY = 4,90 - SetX = 5,386 - SetY = 5,81 - SetX = 6,371 - SetY = 6,136 - SetX = 7,396 - SetY = 7,109 - SetX = 8,369 - SetY = 8,82 + SetX = 3,-4 + SetY = 3,-18 + SetZ = 3,33 + SetX = 4,-26 + SetY = 4,-6 + SetX = 5,2 + SetY = 5,-15 + SetX = 6,-13 + SetY = 6,40 + SetX = 7,12 + SetY = 7,13 + SetX = 8,-15 + SetY = 8,-14 Graphic = Flames Focus = Target - SetX = 4,369 - SetY = 4,77 - SetX = 5,372 - SetY = 5,73 - SetX = 6,392 - SetY = 6,137 - SetX = 7,399 - SetY = 7,84 - SetX = 8,388 - SetY = 8,87 + SetX = 4,-15 + SetY = 4,-19 + SetZ = 4,34 + SetX = 5,-12 + SetY = 5,-23 + SetX = 6,8 + SetY = 6,41 + SetX = 7,15 + SetY = 7,-12 + SetX = 8,4 + SetY = 8,-9 Graphic = Flames Focus = Target - SetX = 4,394 - SetY = 4,77 - SetX = 5,400 - SetY = 5,99 - SetX = 6,397 - SetY = 6,123 - SetX = 7,384 - SetY = 7,74 - SetX = 8,402 - SetY = 8,107 + SetX = 4,10 + SetY = 4,-19 + SetZ = 4,35 + SetX = 5,16 + SetY = 5,3 + SetX = 6,13 + SetY = 6,27 + SetX = 7,0 + SetY = 7,-22 + SetX = 8,18 + SetY = 8,11 Graphic = Flames Focus = Target - SetX = 4,413 - SetY = 4,107 - SetX = 5,400 - SetY = 5,125 - SetX = 6,394 - SetY = 6,100 - SetX = 7,363 - SetY = 7,73 - SetX = 8,412 - SetY = 8,133 + SetX = 4,29 + SetY = 4,11 + SetZ = 4,36 + SetX = 5,16 + SetY = 5,29 + SetX = 6,10 + SetY = 6,4 + SetX = 7,-21 + SetY = 7,-23 + SetX = 8,28 + SetY = 8,37 Graphic = Flames Focus = Target - SetX = 5,414 - SetY = 5,114 - SetX = 6,413 - SetY = 6,108 - SetX = 7,406 - SetY = 7,136 - SetX = 8,420 - SetY = 8,93 + SetX = 5,30 + SetY = 5,18 + SetZ = 5,37 + SetX = 6,29 + SetY = 6,12 + SetX = 7,22 + SetY = 7,40 + SetX = 8,36 + SetY = 8,-3 Graphic = Flames Focus = Target - SetX = 5,420 - SetY = 5,92 - SetX = 6,388 - SetY = 6,77 - SetX = 7,382 - SetY = 7,146 - SetX = 8,409 - SetY = 8,87 + SetX = 5,36 + SetY = 5,-4 + SetZ = 5,38 + SetX = 6,4 + SetY = 6,-19 + SetX = 7,-2 + SetY = 7,50 + SetX = 8,25 + SetY = 8,-9 Graphic = Flames Focus = Target - SetX = 5,405 - SetY = 5,82 - SetX = 6,367 - SetY = 6,76 - SetX = 7,343 - SetY = 7,79 - SetX = 8,396 - SetY = 8,66 + SetX = 5,21 + SetY = 5,-14 + SetZ = 5,39 + SetX = 6,-17 + SetY = 6,-20 + SetX = 7,-41 + SetY = 7,-17 + SetX = 8,12 + SetY = 8,-30 Graphic = Flames Focus = Target - SetX = 6,422 - SetY = 6,130 - SetX = 7,377 - SetY = 7,60 - SetX = 8,373 + SetX = 6,38 + SetY = 6,34 + SetZ = 6,40 + SetX = 7,-7 + SetY = 7,-36 + SetX = 8,-11 Graphic = Flames Focus = Target - SetX = 6,344 - SetY = 6,76 - SetX = 7,354 - SetY = 7,66 - SetX = 8,352 - SetY = 8,74 + SetX = 6,-40 + SetY = 6,-20 + SetZ = 6,41 + SetX = 7,-30 + SetY = 7,-30 + SetX = 8,-32 + SetY = 8,-22 Graphic = Flames Focus = Target - SetX = 7,405 - SetY = 7,61 - SetX = 8,431 - SetY = 8,116 + SetX = 7,21 + SetY = 7,-35 + SetZ = 7,42 + SetX = 8,47 + SetY = 8,20 Graphic = Flames Focus = Target - SetX = 7,391 - SetY = 7,49 + SetX = 7,7 + SetY = 7,-47 + SetZ = 7,43 + SetVisible = 8,false Play = 0,Voltorb Flip Explosion,100,110 Play = 4,Voltorb Flip Explosion,100,110 diff --git a/PBS/Animations/Converted/Move/FLAMECHARGE.txt b/PBS/Animations/Converted/Move/FLAMECHARGE.txt index 902c575d5..a3f62420c 100644 --- a/PBS/Animations/Converted/Move/FLAMECHARGE.txt +++ b/PBS/Animations/Converted/Move/FLAMECHARGE.txt @@ -3,62 +3,83 @@ [Move,FLAMECHARGE] Name = FLAMECHARGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Flames Focus = Target - SetX = 0,356 - SetY = 0,113 + SetFrame = 0,2 + SetX = 0,-28 + SetY = 0,17 + SetZ = 0,27 Graphic = Flames Focus = Target - SetX = 0,371 - SetY = 0,121 + SetFrame = 0,2 + SetX = 0,-13 + SetY = 0,25 + SetZ = 0,28 Graphic = Flames Focus = Target - SetX = 1,390 - SetY = 1,124 + SetFrame = 1,2 + SetX = 1,6 + SetY = 1,28 + SetZ = 1,29 Graphic = Flames Focus = Target - SetX = 2,408 - SetY = 2,112 + SetFrame = 2,2 + SetX = 2,24 + SetY = 2,16 + SetZ = 2,30 Graphic = Flames Focus = Target - SetX = 3,405 - SetY = 3,90 + SetFrame = 3,2 + SetX = 3,21 + SetY = 3,-6 + SetZ = 3,31 Graphic = Flames Focus = Target - SetX = 4,393 - SetY = 4,76 + SetFrame = 4,2 + SetX = 4,9 + SetY = 4,-20 + SetZ = 4,32 Graphic = Flames Focus = Target - SetX = 5,378 - SetY = 5,73 + SetFrame = 5,2 + SetX = 5,-6 + SetY = 5,-23 + SetZ = 5,33 Graphic = Flames Focus = Target - SetX = 6,360 - SetY = 6,76 + SetFrame = 6,2 + SetX = 6,-24 + SetY = 6,-20 + SetZ = 6,34 Graphic = Flames Focus = Target - SetX = 7,357 - SetY = 7,95 + SetFrame = 7,2 + SetX = 7,-27 + SetY = 7,-1 + SetZ = 7,35 Graphic = Flames Focus = Target - SetX = 8,382 - SetY = 8,104 - SetX = 9,381 - SetY = 9,99 + SetFrame = 8,1 + SetX = 8,-2 + SetY = 8,8 + SetZ = 8,36 + SetFrame = 9,0 + SetX = 9,-3 + SetY = 9,3 Play = 0,Work Up,100,116 diff --git a/PBS/Animations/Converted/Move/FLAMETHROWER.txt b/PBS/Animations/Converted/Move/FLAMETHROWER.txt index 01fd1b833..77a55ffcc 100644 --- a/PBS/Animations/Converted/Move/FLAMETHROWER.txt +++ b/PBS/Animations/Converted/Move/FLAMETHROWER.txt @@ -3,284 +3,346 @@ [Move,FLAMETHROWER] Name = FLAMETHROWER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Flames Focus = Target - SetX = 0,165 - SetY = 0,215 + SetFrame = 0,2 + SetX = 0,-219 + SetY = 0,119 + SetZ = 0,27 + SetVisible = 9,false Graphic = Flames Focus = Target - SetX = 1,183 - SetY = 1,207 + SetFrame = 1,1 + SetX = 1,-201 + SetY = 1,111 + SetZ = 1,28 + SetVisible = 10,false Graphic = Flames Focus = Target - SetX = 2,197 - SetY = 2,193 + SetFrame = 2,1 + SetX = 2,-187 + SetY = 2,97 + SetZ = 2,29 + SetVisible = 11,false Graphic = Flames Focus = Target - SetX = 3,223 - SetY = 3,175 + SetFrame = 3,1 + SetX = 3,-161 + SetY = 3,79 + SetZ = 3,30 + SetVisible = 12,false Graphic = Flames Focus = Target - SetX = 4,255 - SetY = 4,153 + SetFrame = 4,1 + SetX = 4,-129 + SetY = 4,57 + SetZ = 4,31 + SetVisible = 13,false Graphic = Flames Focus = Target - SetX = 5,285 - SetY = 5,126 + SetFrame = 5,1 + SetX = 5,-99 + SetY = 5,30 + SetZ = 5,32 + SetVisible = 14,false Graphic = Flames Focus = Target - SetX = 6,315 - SetY = 6,104 + SetX = 6,-69 + SetY = 6,8 + SetZ = 6,33 + SetVisible = 15,false Graphic = Flames Focus = Target - SetX = 7,352 - SetY = 7,84 + SetX = 7,-32 + SetY = 7,-12 + SetZ = 7,34 Graphic = Flames Focus = Target - SetX = 8,379 - SetY = 8,72 + SetX = 8,-5 + SetY = 8,-24 + SetZ = 8,35 Play = 0,Whirlwind,100,121 #------------------------------- [OppMove,FLAMETHROWER] Name = FLAMETHROWER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Flames Focus = Target - SetX = 0,381 - SetY = 0,98 - SetX = 1,384 - SetX = 2,383 - SetY = 2,95 - SetX = 3,386 - SetY = 3,94 - SetX = 4,385 - SetY = 4,99 - SetX = 5,387 - SetY = 5,101 - SetX = 6,385 - SetY = 6,99 - SetX = 7,386 - SetY = 7,103 - SetX = 8,388 - SetY = 8,100 - SetX = 9,386 - SetY = 9,94 - SetX = 10,384 - SetY = 10,87 - SetX = 11,148 - SetY = 11,218 - SetX = 12,135 - SetY = 12,214 - SetX = 13,139 - SetY = 13,216 - SetX = 14,134 - SetY = 14,220 - SetX = 15,131 - SetY = 15,215 - SetX = 16,138 - SetY = 16,216 - SetX = 17,129 - SetY = 17,215 - SetX = 18,131 - SetY = 18,218 + SetFrame = 0,2 + SetX = 0,-3 + SetY = 0,2 + SetZ = 0,27 + SetX = 1,0 + SetX = 2,-1 + SetY = 2,-1 + SetX = 3,2 + SetY = 3,-2 + SetX = 4,1 + SetY = 4,3 + SetX = 5,3 + SetY = 5,5 + SetX = 6,1 + SetY = 6,3 + SetX = 7,2 + SetY = 7,7 + SetX = 8,4 + SetY = 8,4 + SetX = 9,2 + SetY = 9,-2 + SetX = 10,0 + SetY = 10,-9 + SetFrame = 11,0 + SetX = 11,-236 + SetY = 11,122 + SetX = 12,-249 + SetY = 12,118 + SetX = 13,-245 + SetY = 13,120 + SetX = 14,-250 + SetY = 14,124 + SetX = 15,-253 + SetY = 15,119 + SetX = 16,-246 + SetY = 16,120 + SetX = 17,-255 + SetY = 17,119 + SetX = 18,-253 + SetY = 18,122 + SetVisible = 19,false Graphic = Flames Focus = Target - SetX = 1,361 - SetY = 1,105 - SetX = 2,362 - SetY = 2,103 - SetY = 3,102 - SetX = 4,367 - SetY = 4,107 - SetY = 5,110 - SetX = 6,366 - SetY = 6,106 - SetX = 7,363 - SetX = 8,368 - SetY = 8,108 - SetX = 9,362 - SetY = 9,109 - SetX = 10,358 - SetY = 10,98 - SetX = 11,176 - SetY = 11,190 - SetX = 12,162 - SetY = 12,192 - SetX = 13,173 - SetX = 14,167 - SetY = 14,193 - SetX = 15,158 - SetY = 15,195 - SetX = 16,193 - SetY = 16,188 - SetX = 17,174 - SetY = 17,183 + SetFrame = 1,2 + SetX = 1,-23 + SetY = 1,9 + SetZ = 1,28 + SetX = 2,-22 + SetY = 2,7 + SetY = 3,6 + SetX = 4,-17 + SetY = 4,11 + SetY = 5,14 + SetX = 6,-18 + SetY = 6,10 + SetX = 7,-21 + SetX = 8,-16 + SetY = 8,12 + SetX = 9,-22 + SetY = 9,13 + SetX = 10,-26 + SetY = 10,2 + SetFrame = 11,0 + SetX = 11,-208 + SetY = 11,94 + SetX = 12,-222 + SetY = 12,96 + SetX = 13,-211 + SetX = 14,-217 + SetY = 14,97 + SetX = 15,-226 + SetY = 15,99 + SetX = 16,-191 + SetY = 16,92 + SetX = 17,-210 + SetY = 17,87 + SetVisible = 18,false Graphic = Flames Focus = Target - SetX = 2,342 - SetY = 2,112 - SetX = 3,339 - SetX = 4,347 - SetY = 4,111 - SetX = 5,348 - SetY = 5,114 - SetX = 6,343 - SetY = 6,109 - SetX = 7,337 - SetY = 7,114 - SetX = 8,350 - SetY = 8,108 - SetX = 9,335 - SetY = 9,111 - SetX = 10,331 - SetY = 10,108 - SetX = 11,205 - SetY = 11,170 - SetX = 12,196 - SetY = 12,169 - SetX = 13,207 - SetY = 13,160 - SetX = 14,199 - SetY = 14,166 - SetX = 15,189 - SetY = 15,178 - SetX = 16,234 - SetY = 16,158 + SetFrame = 2,2 + SetX = 2,-42 + SetY = 2,16 + SetZ = 2,29 + SetX = 3,-45 + SetX = 4,-37 + SetY = 4,15 + SetX = 5,-36 + SetY = 5,18 + SetX = 6,-41 + SetY = 6,13 + SetX = 7,-47 + SetY = 7,18 + SetX = 8,-34 + SetY = 8,12 + SetX = 9,-49 + SetY = 9,15 + SetX = 10,-53 + SetY = 10,12 + SetFrame = 11,1 + SetX = 11,-179 + SetY = 11,74 + SetFrame = 12,0 + SetX = 12,-188 + SetY = 12,73 + SetX = 13,-177 + SetY = 13,64 + SetX = 14,-185 + SetY = 14,70 + SetFrame = 15,1 + SetX = 15,-195 + SetY = 15,82 + SetX = 16,-150 + SetY = 16,62 + SetVisible = 17,false Graphic = Flames Focus = Target - SetX = 3,313 - SetY = 3,120 - SetX = 4,323 - SetY = 4,128 - SetX = 5,325 - SetY = 5,119 - SetX = 6,320 - SetY = 6,123 - SetX = 7,311 - SetY = 7,122 - SetX = 8,324 - SetX = 9,299 - SetY = 9,118 - SetX = 10,306 - SetY = 10,116 - SetX = 11,237 - SetY = 11,143 - SetX = 12,238 - SetY = 12,147 - SetX = 13,242 - SetY = 13,143 - SetX = 14,238 - SetY = 14,141 - SetX = 15,229 - SetY = 15,155 + SetFrame = 3,1 + SetX = 3,-71 + SetY = 3,24 + SetZ = 3,30 + SetX = 4,-61 + SetY = 4,32 + SetX = 5,-59 + SetY = 5,23 + SetFrame = 6,2 + SetX = 6,-64 + SetY = 6,27 + SetFrame = 7,1 + SetX = 7,-73 + SetY = 7,26 + SetX = 8,-60 + SetX = 9,-85 + SetY = 9,22 + SetFrame = 10,2 + SetX = 10,-78 + SetY = 10,20 + SetFrame = 11,1 + SetX = 11,-147 + SetY = 11,47 + SetX = 12,-146 + SetY = 12,51 + SetX = 13,-142 + SetY = 13,47 + SetX = 14,-146 + SetY = 14,45 + SetX = 15,-155 + SetY = 15,59 + SetVisible = 16,false Graphic = Flames Focus = Target - SetX = 4,299 - SetY = 4,137 - SetX = 5,296 - SetY = 5,127 - SetY = 6,133 - SetX = 7,278 - SetY = 7,132 - SetX = 8,289 - SetY = 8,128 - SetX = 9,266 - SetY = 9,125 - SetX = 10,272 - SetY = 10,130 - SetX = 11,269 - SetY = 11,122 - SetX = 12,275 - SetY = 12,128 - SetX = 13,274 - SetY = 13,127 - SetX = 14,278 - SetY = 14,124 + SetFrame = 4,1 + SetX = 4,-85 + SetY = 4,41 + SetZ = 4,31 + SetX = 5,-88 + SetY = 5,31 + SetY = 6,37 + SetX = 7,-106 + SetY = 7,36 + SetX = 8,-95 + SetY = 8,32 + SetX = 9,-118 + SetY = 9,29 + SetX = 10,-112 + SetY = 10,34 + SetX = 11,-115 + SetY = 11,26 + SetX = 12,-109 + SetY = 12,32 + SetX = 13,-110 + SetY = 13,31 + SetX = 14,-106 + SetY = 14,28 + SetVisible = 15,false Graphic = Flames Focus = Target - SetX = 5,267 - SetY = 5,134 - SetY = 6,143 - SetX = 7,247 - SetY = 7,139 - SetX = 8,255 - SetY = 8,137 - SetX = 9,230 - SetY = 9,134 - SetX = 10,237 - SetY = 10,149 - SetX = 11,304 - SetY = 11,110 - SetX = 12,311 - SetX = 13,310 - SetY = 13,115 + SetFrame = 5,1 + SetX = 5,-117 + SetY = 5,38 + SetZ = 5,32 + SetY = 6,47 + SetX = 7,-137 + SetY = 7,43 + SetX = 8,-129 + SetY = 8,41 + SetX = 9,-154 + SetY = 9,38 + SetX = 10,-147 + SetY = 10,53 + SetX = 11,-80 + SetY = 11,14 + SetX = 12,-73 + SetX = 13,-74 + SetY = 13,19 + SetVisible = 14,false Graphic = Flames Focus = Target - SetX = 6,238 - SetY = 6,152 - SetX = 7,215 - SetY = 7,147 - SetX = 8,220 - SetY = 8,146 - SetX = 9,196 - SetY = 9,150 - SetX = 10,209 - SetY = 10,174 - SetX = 11,332 - SetY = 11,94 - SetX = 12,349 - SetY = 12,92 + SetFrame = 6,1 + SetX = 6,-146 + SetY = 6,56 + SetZ = 6,33 + SetX = 7,-169 + SetY = 7,51 + SetX = 8,-164 + SetY = 8,50 + SetX = 9,-188 + SetY = 9,54 + SetX = 10,-175 + SetY = 10,78 + SetFrame = 11,2 + SetX = 11,-52 + SetY = 11,-2 + SetFrame = 12,1 + SetX = 12,-35 + SetY = 12,-4 + SetVisible = 13,false Graphic = Flames Focus = Target - SetX = 8,189 - SetY = 8,164 - SetX = 9,165 - SetY = 9,163 - SetX = 10,173 - SetY = 10,190 - SetX = 11,360 - SetY = 11,87 - SetX = 12,381 - SetY = 12,81 + SetFrame = 8,1 + SetX = 8,-195 + SetY = 8,68 + SetZ = 8,34 + SetX = 9,-219 + SetY = 9,67 + SetX = 10,-211 + SetY = 10,94 + SetFrame = 11,2 + SetX = 11,-24 + SetY = 11,-9 + SetX = 12,-3 + SetY = 12,-15 + SetVisible = 13,false Graphic = Flames Focus = Target - SetX = 9,136 - SetY = 9,194 - SetX = 10,143 - SetY = 10,205 + SetX = 9,-248 + SetY = 9,98 + SetZ = 9,35 + SetX = 10,-241 + SetY = 10,109 + SetVisible = 11,false Graphic = Flames Focus = Target - SetX = 10,122 - SetY = 10,227 + SetX = 10,-262 + SetY = 10,131 + SetZ = 10,36 + SetVisible = 11,false Play = 0,Whirlwind,100,121 diff --git a/PBS/Animations/Converted/Move/FLAMEWHEEL.txt b/PBS/Animations/Converted/Move/FLAMEWHEEL.txt index 58f2da32b..1d461c1f0 100644 --- a/PBS/Animations/Converted/Move/FLAMEWHEEL.txt +++ b/PBS/Animations/Converted/Move/FLAMEWHEEL.txt @@ -3,218 +3,356 @@ [Move,FLAMEWHEEL] Name = FLAMEWHEEL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = UserAndTarget - SetX = 0,156 - SetY = 0,171 - SetX = 8,398 - SetY = 8,100 - SetX = 9,396 - SetY = 9,91 - SetX = 10,397 - SetY = 10,99 + SetFrame = 0,9 + SetX = 0,21 + SetY = 0,-82 + SetZ = 0,27 + SetFrame = 8,15 + SetX = 8,210 + SetY = 8,-193 + SetFrame = 9,14 + SetX = 9,209 + SetY = 9,-207 + SetX = 10,210 + SetY = 10,-195 Graphic = punches Focus = UserAndTarget - SetX = 0,186 - SetY = 0,191 - SetX = 10,423 - SetY = 10,124 + SetFrame = 0,9 + SetX = 0,45 + SetY = 0,-51 + SetZ = 0,28 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 1,193 - SetY = 1,230 - SetX = 7,191 - SetY = 7,222 - SetX = 10,364 - SetY = 10,76 + SetFrame = 1,9 + SetX = 1,50 + SetY = 1,9 + SetZ = 1,29 + SetX = 7,49 + SetY = 7,-3 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 2,162 - SetY = 2,256 - SetX = 11,378 - SetY = 11,128 + SetFrame = 2,9 + SetX = 2,26 + SetY = 2,50 + SetZ = 2,30 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 3,128 - SetY = 3,254 - SetX = 11,423 - SetY = 11,51 + SetFrame = 3,9 + SetX = 3,0 + SetY = 3,46 + SetZ = 3,31 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 4,113 - SetY = 4,228 + SetFrame = 4,9 + SetX = 4,-11 + SetY = 4,6 + SetZ = 4,32 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 5,116 - SetY = 5,191 + SetFrame = 5,9 + SetX = 5,-9 + SetY = 5,-51 + SetZ = 5,33 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 6,130 - SetY = 6,172 + SetFrame = 6,9 + SetX = 6,1 + SetY = 6,-81 + SetZ = 6,34 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,159 - SetY = 7,165 + SetFrame = 7,10 + SetX = 7,24 + SetY = 7,-92 + SetZ = 7,35 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,187 - SetY = 7,185 + SetFrame = 7,10 + SetX = 7,46 + SetY = 7,-60 + SetZ = 7,36 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,188 - SetY = 7,222 + SetFrame = 7,10 + SetX = 7,46 + SetY = 7,-3 + SetZ = 7,37 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,168 - SetY = 7,246 + SetFrame = 7,10 + SetX = 7,31 + SetY = 7,34 + SetZ = 7,38 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,143 - SetY = 7,250 + SetFrame = 7,10 + SetX = 7,11 + SetY = 7,40 + SetZ = 7,39 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,121 - SetY = 7,241 + SetFrame = 7,10 + SetX = 7,-5 + SetY = 7,26 + SetZ = 7,40 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,109 - SetY = 7,217 + SetFrame = 7,10 + SetX = 7,-14 + SetY = 7,-10 + SetZ = 7,41 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,112 - SetY = 7,192 + SetFrame = 7,10 + SetX = 7,-12 + SetY = 7,-50 + SetZ = 7,42 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,125 - SetY = 7,172 + SetFrame = 7,10 + SetX = 7,-2 + SetY = 7,-81 + SetZ = 7,43 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,174 - SetY = 7,172 + SetFrame = 7,10 + SetX = 7,35 + SetY = 7,-81 + SetZ = 7,44 + SetVisible = 8,false + + Graphic = punches + Focus = UserAndTarget + SetFrame = 10,10 + SetX = 10,230 + SetY = 10,-156 + SetZ = 10,28 + + Graphic = punches + Focus = UserAndTarget + SetFrame = 10,10 + SetX = 10,184 + SetY = 10,-231 + SetZ = 10,29 + + Graphic = punches + Focus = UserAndTarget + SetFrame = 11,10 + SetX = 11,195 + SetY = 11,-150 + SetZ = 11,30 + + Graphic = punches + Focus = UserAndTarget + SetFrame = 11,10 + SetX = 11,230 + SetY = 11,-270 + SetZ = 11,31 Play = 0,Trump Card,100,110 #------------------------------- [OppMove,FLAMEWHEEL] Name = FLAMEWHEEL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = UserAndTarget - SetX = 0,397 - SetY = 0,63 - SetX = 8,139 - SetY = 8,227 - SetX = 9,133 - SetY = 9,216 - SetX = 10,141 - SetY = 10,217 - SetX = 11,138 - SetY = 11,223 + SetFrame = 0,9 + SetX = 0,210 + SetY = 0,-251 + SetZ = 0,27 + SetFrame = 8,15 + SetX = 8,8 + SetY = 8,4 + SetFrame = 9,14 + SetX = 9,3 + SetY = 9,-12 + SetX = 10,10 + SetY = 10,-10 + SetX = 11,7 + SetY = 11,-1 Graphic = punches Focus = UserAndTarget - SetX = 0,417 - SetY = 0,75 - SetX = 10,176 - SetY = 10,187 - SetX = 11,163 + SetFrame = 0,9 + SetX = 0,225 + SetY = 0,-232 + SetZ = 0,28 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 1,422 - SetY = 1,102 - SetX = 10,119 - SetY = 10,234 - SetX = 11,117 - SetY = 11,244 + SetFrame = 1,9 + SetX = 1,229 + SetY = 1,-190 + SetZ = 1,29 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 2,407 - SetY = 2,120 - SetX = 11,110 - SetY = 11,200 + SetFrame = 2,9 + SetX = 2,217 + SetY = 2,-162 + SetZ = 2,30 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 3,380 - SetY = 3,110 - SetX = 4,377 - SetY = 4,112 - SetX = 11,172 - SetY = 11,239 + SetFrame = 3,9 + SetX = 3,196 + SetY = 3,-178 + SetZ = 3,31 + SetX = 4,194 + SetY = 4,-175 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 4,366 - SetY = 4,92 + SetFrame = 4,9 + SetX = 4,185 + SetY = 4,-206 + SetZ = 4,32 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 5,376 - SetY = 5,71 + SetFrame = 5,9 + SetX = 5,193 + SetY = 5,-239 + SetZ = 5,33 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 6,388 - SetY = 6,62 + SetFrame = 6,10 + SetX = 6,203 + SetY = 6,-253 + SetZ = 6,34 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 6,408 - SetY = 6,71 + SetFrame = 6,10 + SetX = 6,218 + SetY = 6,-239 + SetZ = 6,35 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 6,422 - SetY = 6,95 + SetFrame = 6,10 + SetX = 6,229 + SetY = 6,-201 + SetZ = 6,36 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 6,406 - SetY = 6,113 + SetFrame = 6,10 + SetX = 6,217 + SetY = 6,-173 + SetZ = 6,37 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,384 - SetY = 7,108 + SetFrame = 7,10 + SetX = 7,200 + SetY = 7,-181 + SetZ = 7,38 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,374 - SetY = 7,86 + SetFrame = 7,10 + SetX = 7,192 + SetY = 7,-215 + SetZ = 7,39 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 7,379 - SetY = 7,70 + SetFrame = 7,10 + SetX = 7,196 + SetY = 7,-240 + SetZ = 7,40 + SetVisible = 8,false + + Graphic = punches + Focus = UserAndTarget + SetFrame = 10,10 + SetX = 10,37 + SetY = 10,-57 + SetZ = 10,28 + SetX = 11,27 + + Graphic = punches + Focus = UserAndTarget + SetFrame = 10,10 + SetX = 10,-7 + SetY = 10,15 + SetZ = 10,29 + SetX = 11,-8 + SetY = 11,31 + + Graphic = punches + Focus = UserAndTarget + SetFrame = 11,10 + SetX = 11,-14 + SetY = 11,-37 + SetZ = 11,30 + + Graphic = punches + Focus = UserAndTarget + SetFrame = 11,10 + SetX = 11,34 + SetY = 11,23 + SetZ = 11,31 Play = 0,Trump Card,100,110 diff --git a/PBS/Animations/Converted/Move/FLASH.txt b/PBS/Animations/Converted/Move/FLASH.txt index 95dab807f..641f25817 100644 --- a/PBS/Animations/Converted/Move/FLASH.txt +++ b/PBS/Animations/Converted/Move/FLASH.txt @@ -3,15 +3,30 @@ [Move,FLASH] Name = FLASH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Light1 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetFrame = 14,14 Play = 0,Saint7,80 diff --git a/PBS/Animations/Converted/Move/FLY.txt b/PBS/Animations/Converted/Move/FLY.txt index a0fb125aa..c03296b12 100644 --- a/PBS/Animations/Converted/Move/FLY.txt +++ b/PBS/Animations/Converted/Move/FLY.txt @@ -3,58 +3,69 @@ [Move,FLY] Name = FLY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,281 - SetY = 0,-22 + SetFrame = 0,3 + SetX = 0,-103 + SetY = 0,-118 + SetZ = 0,27 SetAngle = 0,207 - SetX = 1,312 - SetY = 1,26 - SetX = 2,335 - SetY = 2,61 - SetX = 3,356 - SetY = 3,87 - SetX = 4,379 - SetY = 4,118 - SetX = 5,424 - SetY = 5,184 - SetX = 6,401 - SetY = 6,154 + SetX = 1,-72 + SetY = 1,-70 + SetX = 2,-49 + SetY = 2,-35 + SetX = 3,-28 + SetY = 3,-9 + SetX = 4,-5 + SetY = 4,22 + SetX = 5,40 + SetY = 5,88 + SetX = 6,17 + SetY = 6,58 + SetVisible = 7,false Play = 0,Take Down,80,110 #------------------------------- [Move,FLY,1] Name = Fly charging - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = User - SetX = 0,134 - SetY = 0,260 - SetX = 1,138 - SetY = 1,247 - SetX = 2,136 - SetY = 2,258 - SetX = 3,132 - SetY = 3,238 - SetX = 4,131 - SetY = 4,233 - SetX = 5,142 - SetY = 5,225 - SetX = 6,136 - SetY = 6,194 - SetX = 7,134 - SetY = 7,166 + SetFrame = 0,5 + SetX = 0,6 + SetY = 0,36 + SetZ = 0,27 + SetX = 1,10 + SetY = 1,23 + SetFrame = 2,0 + SetX = 2,8 + SetY = 2,34 + SetFrame = 3,1 + SetX = 3,4 + SetY = 3,14 + SetFrame = 4,2 + SetX = 4,3 + SetY = 4,9 + SetFrame = 5,3 + SetX = 5,14 + SetY = 5,1 + SetFrame = 6,4 + SetX = 6,8 + SetY = 6,-30 + SetX = 7,6 + SetY = 7,-58 + SetVisible = 8,false Play = 0,Trump Card diff --git a/PBS/Animations/Converted/Move/FOCUSENERGY.txt b/PBS/Animations/Converted/Move/FOCUSENERGY.txt index 917c998e8..d417b0038 100644 --- a/PBS/Animations/Converted/Move/FOCUSENERGY.txt +++ b/PBS/Animations/Converted/Move/FOCUSENERGY.txt @@ -3,21 +3,36 @@ [Move,FOCUSENERGY] Name = FOCUSENERGY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Fire3 Focus = User - SetX = 4,144 - SetY = 4,222 + SetFrame = 4,29 + SetX = 4,16 + SetY = 4,-2 + SetZ = 4,28 + SetFrame = 5,28 + SetVisible = 6,false Graphic = Fire3 Focus = User - SetX = 0,144 - SetY = 0,222 + SetFrame = 0,29 + SetX = 0,16 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,28 + SetFrame = 2,27 + SetFrame = 3,26 + SetFrame = 4,25 + SetFrame = 5,24 + SetFrame = 6,27 + SetFrame = 7,26 + SetFrame = 8,25 + SetFrame = 9,24 Play = 0,Up,80 Play = 3,Up,80 diff --git a/PBS/Animations/Converted/Move/FOLLOWME.txt b/PBS/Animations/Converted/Move/FOLLOWME.txt index 03ab116a8..fb6f1e0a5 100644 --- a/PBS/Animations/Converted/Move/FOLLOWME.txt +++ b/PBS/Animations/Converted/Move/FOLLOWME.txt @@ -3,84 +3,96 @@ [Move,FOLLOWME] Name = FOLLOWME - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 0,386 - SetY = 0,97 - SetX = 1,377 - SetY = 1,112 - SetX = 2,359 - SetY = 2,137 - SetX = 3,336 - SetY = 3,169 - SetX = 4,299 - SetY = 4,190 - SetX = 5,274 - SetY = 5,218 - SetX = 6,279 - SetY = 6,214 + SetX = 0,2 + SetY = 0,1 + SetZ = 0,27 + SetX = 1,-7 + SetY = 1,16 + SetX = 2,-25 + SetY = 2,41 + SetX = 3,-48 + SetY = 3,73 + SetX = 4,-85 + SetY = 4,94 + SetX = 5,-110 + SetY = 5,122 + SetX = 6,-105 + SetY = 6,118 SetOpacity = 6,53 - SetX = 7,244 - SetY = 7,238 + SetFrame = 7,1 + SetX = 7,-140 + SetY = 7,142 SetOpacity = 7,255 - SetX = 8,219 - SetX = 9,179 - SetY = 9,235 + SetX = 8,-165 + SetX = 9,-205 + SetY = 9,139 + SetVisible = 10,false Graphic = finger.spoon Focus = Target - SetX = 6,267 - SetY = 6,216 + SetFrame = 6,1 + SetX = 6,-117 + SetY = 6,120 + SetZ = 6,28 + SetVisible = 7,false Play = 0,Follow Me,85,102 #------------------------------- [OppMove,FOLLOWME] Name = FOLLOWME - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 5,282 - SetY = 5,206 + SetX = 5,-102 + SetY = 5,110 + SetZ = 5,28 + SetVisible = 6,false Graphic = finger.spoon Focus = Target - SetX = 0,191 - SetY = 0,221 - SetX = 1,212 - SetY = 1,218 - SetX = 2,230 - SetY = 2,212 - SetX = 3,249 - SetY = 3,214 - SetX = 4,261 - SetY = 4,213 - SetX = 5,270 - SetY = 5,204 + SetFrame = 0,1 + SetX = 0,-193 + SetY = 0,125 + SetZ = 0,27 + SetX = 1,-172 + SetY = 1,122 + SetX = 2,-154 + SetY = 2,116 + SetX = 3,-135 + SetY = 3,118 + SetX = 4,-123 + SetY = 4,117 + SetX = 5,-114 + SetY = 5,108 SetOpacity = 5,78 - SetX = 6,301 - SetY = 6,196 + SetFrame = 6,0 + SetX = 6,-83 + SetY = 6,100 SetOpacity = 6,255 - SetX = 7,311 - SetY = 7,181 - SetX = 8,331 - SetY = 8,154 - SetX = 9,349 - SetY = 9,142 - SetX = 10,372 - SetY = 10,125 - SetX = 11,388 - SetY = 11,111 + SetX = 7,-73 + SetY = 7,85 + SetX = 8,-53 + SetY = 8,58 + SetX = 9,-35 + SetY = 9,46 + SetX = 10,-12 + SetY = 10,29 + SetX = 11,4 + SetY = 11,15 + SetVisible = 12,false Play = 0,Follow Me,80 diff --git a/PBS/Animations/Converted/Move/FORESIGHT.txt b/PBS/Animations/Converted/Move/FORESIGHT.txt index 8570a3516..01e99c84f 100644 --- a/PBS/Animations/Converted/Move/FORESIGHT.txt +++ b/PBS/Animations/Converted/Move/FORESIGHT.txt @@ -3,38 +3,40 @@ [Move,FORESIGHT] Name = FORESIGHT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 0,272 - SetY = 0,22 + SetFrame = 0,8 + SetX = 0,-112 + SetY = 0,-74 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 SetOpacity = 0,150 - SetX = 1,304 - SetY = 1,54 + SetX = 1,-80 + SetY = 1,-42 SetOpacity = 1,255 - SetX = 2,344 - SetY = 2,94 - SetX = 3,384 - SetY = 3,134 - SetX = 4,424 - SetY = 4,118 - SetX = 5,456 - SetY = 5,86 - SetX = 6,464 - SetY = 6,46 - SetX = 7,440 - SetY = 7,30 - SetX = 8,392 - SetY = 8,14 - SetX = 9,336 - SetY = 9,6 - SetX = 10,320 - SetY = 10,46 - SetY = 11,86 + SetX = 2,-40 + SetY = 2,-2 + SetX = 3,0 + SetY = 3,38 + SetX = 4,40 + SetY = 4,22 + SetX = 5,72 + SetY = 5,-10 + SetX = 6,80 + SetY = 6,-50 + SetX = 7,56 + SetY = 7,-66 + SetX = 8,8 + SetY = 8,-82 + SetX = 9,-48 + SetY = 9,-90 + SetX = 10,-64 + SetY = 10,-50 + SetY = 11,-10 diff --git a/PBS/Animations/Converted/Move/FRENZYPLANT.txt b/PBS/Animations/Converted/Move/FRENZYPLANT.txt index 2b585b8a1..69a06b6de 100644 --- a/PBS/Animations/Converted/Move/FRENZYPLANT.txt +++ b/PBS/Animations/Converted/Move/FRENZYPLANT.txt @@ -3,32 +3,41 @@ [Move,FRENZYPLANT] Name = FRENZYPLANT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = grass2 Focus = UserAndTarget - SetX = 0,172 - SetY = 0,192 - SetX = 1,192 - SetY = 1,186 - SetX = 2,217 - SetY = 2,173 - SetX = 3,256 - SetY = 3,161 - SetX = 4,281 - SetY = 4,142 - SetX = 5,313 - SetY = 5,123 - SetX = 6,332 - SetY = 6,116 - SetX = 7,384 - SetY = 11,110 - SetY = 12,104 - SetY = 13,98 + SetX = 0,34 + SetY = 0,-50 + SetZ = 0,27 + SetX = 1,50 + SetY = 1,-59 + SetX = 2,69 + SetY = 2,-79 + SetX = 3,100 + SetY = 3,-98 + SetX = 4,119 + SetY = 4,-128 + SetX = 5,144 + SetY = 5,-157 + SetX = 6,159 + SetY = 6,-168 + SetX = 7,200 + SetFrame = 8,1 + SetFrame = 9,2 + SetFrame = 10,3 + SetFrame = 11,4 + SetY = 11,-178 + SetFrame = 12,5 + SetY = 12,-187 + SetFrame = 13,6 + SetY = 13,-196 + SetFrame = 14,7 + SetFrame = 15,8 SetOpacity = 16,100 Play = 0,Earth4,80 diff --git a/PBS/Animations/Converted/Move/FURYATTACK.txt b/PBS/Animations/Converted/Move/FURYATTACK.txt index b9c9c73ec..8cd4f9e09 100644 --- a/PBS/Animations/Converted/Move/FURYATTACK.txt +++ b/PBS/Animations/Converted/Move/FURYATTACK.txt @@ -3,31 +3,45 @@ [Move,FURYATTACK] Name = FURYATTACK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,129 - SetX = 3,358 - SetY = 3,110 + SetFrame = 0,5 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,6 + SetX = 1,69 + SetY = 1,-70 + SetFrame = 2,7 + SetX = 2,129 + SetY = 2,-148 + SetFrame = 3,0 + SetX = 3,179 + SetY = 3,-178 + SetFrame = 4,1 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 - SetX = 4,199 - SetY = 4,200 - SetX = 5,264 - SetY = 5,146 + SetFrame = 3,5 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,28 + SetFrame = 4,6 + SetX = 4,55 + SetY = 4,-37 + SetFrame = 5,7 + SetX = 5,106 + SetY = 5,-121 + SetVisible = 6,false Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -35,31 +49,45 @@ Name = FURYATTACK [Move,FURYATTACK,1] Name = Fury Attack hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 - SetX = 4,199 - SetY = 4,200 - SetX = 5,264 - SetY = 5,146 + SetFrame = 3,5 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,28 + SetFrame = 4,6 + SetX = 4,55 + SetY = 4,-37 + SetFrame = 5,7 + SetX = 5,106 + SetY = 5,-121 + SetVisible = 6,false Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,129 - SetX = 3,358 - SetY = 3,110 + SetFrame = 0,5 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,6 + SetX = 1,69 + SetY = 1,-70 + SetFrame = 2,7 + SetX = 2,129 + SetY = 2,-148 + SetFrame = 3,0 + SetX = 3,179 + SetY = 3,-178 + SetFrame = 4,1 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -67,31 +95,45 @@ Name = Fury Attack hit 2 [Move,FURYATTACK,2] Name = Fury Attack hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,129 - SetX = 3,358 - SetY = 3,110 + SetFrame = 0,5 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,6 + SetX = 1,69 + SetY = 1,-70 + SetFrame = 2,7 + SetX = 2,129 + SetY = 2,-148 + SetFrame = 3,0 + SetX = 3,179 + SetY = 3,-178 + SetFrame = 4,1 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 - SetX = 4,199 - SetY = 4,200 - SetX = 5,264 - SetY = 5,146 + SetFrame = 3,5 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,28 + SetFrame = 4,6 + SetX = 4,55 + SetY = 4,-37 + SetFrame = 5,7 + SetX = 5,106 + SetY = 5,-121 + SetVisible = 6,false Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -99,31 +141,45 @@ Name = Fury Attack hit 3 [Move,FURYATTACK,3] Name = Fury Attack hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 - SetX = 4,199 - SetY = 4,200 - SetX = 5,264 - SetY = 5,146 + SetFrame = 3,5 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,28 + SetFrame = 4,6 + SetX = 4,55 + SetY = 4,-37 + SetFrame = 5,7 + SetX = 5,106 + SetY = 5,-121 + SetVisible = 6,false Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,129 - SetX = 3,358 - SetY = 3,110 + SetFrame = 0,5 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,6 + SetX = 1,69 + SetY = 1,-70 + SetFrame = 2,7 + SetX = 2,129 + SetY = 2,-148 + SetFrame = 3,0 + SetX = 3,179 + SetY = 3,-178 + SetFrame = 4,1 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -131,31 +187,45 @@ Name = Fury Attack hit 4 [Move,FURYATTACK,4] Name = Fury Attack hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,129 - SetX = 3,358 - SetY = 3,110 + SetFrame = 0,5 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,6 + SetX = 1,69 + SetY = 1,-70 + SetFrame = 2,7 + SetX = 2,129 + SetY = 2,-148 + SetFrame = 3,0 + SetX = 3,179 + SetY = 3,-178 + SetFrame = 4,1 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 - SetX = 4,199 - SetY = 4,200 - SetX = 5,264 - SetY = 5,146 + SetFrame = 3,5 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,28 + SetFrame = 4,6 + SetX = 4,55 + SetY = 4,-37 + SetFrame = 5,7 + SetX = 5,106 + SetY = 5,-121 + SetVisible = 6,false Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -163,34 +233,58 @@ Name = Fury Attack hit 5 [OppMove,FURYATTACK] Name = FURYATTACK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + Graphic = 003-Attack01 + Focus = User + SetX = 3,1 + SetY = 3,18 + SetZ = 3,27 + SetVisible = 4,false + Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,332 - SetY = 3,127 + SetFrame = 3,5 + SetX = 3,159 + SetY = 3,-151 + SetZ = 3,28 SetAngle = 3,180 - SetX = 4,283 - SetY = 4,158 - SetX = 5,220 - SetY = 5,197 + SetFrame = 4,6 + SetX = 4,121 + SetY = 4,-103 + SetFrame = 5,7 + SetX = 5,71 + SetY = 5,-42 + SetVisible = 6,false + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetFrame = 4,1 + SetX = 4,0 + SetY = 4,28 + SetZ = 4,27 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,338 - SetY = 0,128 + SetFrame = 0,5 + SetX = 0,164 + SetY = 0,-150 + SetZ = 0,27 SetAngle = 0,180 - SetX = 1,288 - SetY = 1,155 - SetX = 2,213 - SetY = 2,203 - SetX = 3,129 - SetY = 3,242 - SetAngle = 3,0 + SetFrame = 1,6 + SetX = 1,125 + SetY = 1,-107 + SetFrame = 2,7 + SetX = 2,66 + SetY = 2,-32 + SetVisible = 3,false Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -198,34 +292,58 @@ Name = FURYATTACK [OppMove,FURYATTACK,1] Name = Fury Attack hit 2 opp - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,338 - SetY = 0,128 + SetFrame = 0,5 + SetX = 0,164 + SetY = 0,-150 + SetZ = 0,27 SetAngle = 0,180 - SetX = 1,288 - SetY = 1,155 - SetX = 2,213 - SetY = 2,203 - SetX = 3,129 - SetY = 3,242 - SetAngle = 3,0 + SetFrame = 1,6 + SetX = 1,125 + SetY = 1,-107 + SetFrame = 2,7 + SetX = 2,66 + SetY = 2,-32 + SetVisible = 3,false + Graphic = 003-Attack01 + Focus = User + SetX = 3,1 + SetY = 3,18 + SetZ = 3,27 + SetVisible = 4,false + Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,332 - SetY = 3,127 + SetFrame = 3,5 + SetX = 3,159 + SetY = 3,-151 + SetZ = 3,28 SetAngle = 3,180 - SetX = 4,283 - SetY = 4,158 - SetX = 5,220 - SetY = 5,197 + SetFrame = 4,6 + SetX = 4,121 + SetY = 4,-103 + SetFrame = 5,7 + SetX = 5,71 + SetY = 5,-42 + SetVisible = 6,false + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetFrame = 4,1 + SetX = 4,0 + SetY = 4,28 + SetZ = 4,27 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -233,34 +351,58 @@ Name = Fury Attack hit 2 opp [OppMove,FURYATTACK,2] Name = Fury Attack hit 3 opp - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - + SetX = 0,0 + SetY = 0,0 + Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,332 - SetY = 3,127 - SetAngle = 3,180 - SetX = 4,283 - SetY = 4,158 - SetX = 5,220 - SetY = 5,197 + SetFrame = 4,1 + SetX = 4,0 + SetY = 4,28 + SetZ = 4,27 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,338 - SetY = 0,128 + SetFrame = 0,5 + SetX = 0,164 + SetY = 0,-150 + SetZ = 0,27 SetAngle = 0,180 - SetX = 1,288 - SetY = 1,155 - SetX = 2,213 - SetY = 2,203 - SetX = 3,129 - SetY = 3,242 - SetAngle = 3,0 + SetFrame = 1,6 + SetX = 1,125 + SetY = 1,-107 + SetFrame = 2,7 + SetX = 2,66 + SetY = 2,-32 + SetVisible = 3,false + + Graphic = 003-Attack01 + Focus = User + SetX = 3,1 + SetY = 3,18 + SetZ = 3,27 + SetVisible = 4,false + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetFrame = 3,5 + SetX = 3,159 + SetY = 3,-151 + SetZ = 3,28 + SetAngle = 3,180 + SetFrame = 4,6 + SetX = 4,121 + SetY = 4,-103 + SetFrame = 5,7 + SetX = 5,71 + SetY = 5,-42 + SetVisible = 6,false Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -268,34 +410,58 @@ Name = Fury Attack hit 3 opp [OppMove,FURYATTACK,3] Name = Fury Attack hit 4 opp - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetFrame = 3,5 + SetX = 3,159 + SetY = 3,-151 + SetZ = 3,28 + SetAngle = 3,180 + SetFrame = 4,6 + SetX = 4,121 + SetY = 4,-103 + SetFrame = 5,7 + SetX = 5,71 + SetY = 5,-42 + SetVisible = 6,false + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetFrame = 4,1 + SetX = 4,0 + SetY = 4,28 + SetZ = 4,27 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,338 - SetY = 0,128 + SetFrame = 0,5 + SetX = 0,164 + SetY = 0,-150 + SetZ = 0,27 SetAngle = 0,180 - SetX = 1,288 - SetY = 1,155 - SetX = 2,213 - SetY = 2,203 - SetX = 3,129 - SetY = 3,242 - SetAngle = 3,0 + SetFrame = 1,6 + SetX = 1,125 + SetY = 1,-107 + SetFrame = 2,7 + SetX = 2,66 + SetY = 2,-32 + SetVisible = 3,false Graphic = 003-Attack01 - Focus = UserAndTarget - SetX = 3,332 - SetY = 3,127 - SetAngle = 3,180 - SetX = 4,283 - SetY = 4,158 - SetX = 5,220 - SetY = 5,197 + Focus = User + SetX = 3,1 + SetY = 3,18 + SetZ = 3,27 + SetVisible = 4,false Play = 3,normaldamage,80 Play = 5,normaldamage,80 @@ -303,34 +469,58 @@ Name = Fury Attack hit 4 opp [OppMove,FURYATTACK,4] Name = Fury Attack hit 5 opp - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + Graphic = 003-Attack01 + Focus = User + SetX = 3,1 + SetY = 3,18 + SetZ = 3,27 + SetVisible = 4,false + Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 3,332 - SetY = 3,127 + SetFrame = 3,5 + SetX = 3,159 + SetY = 3,-151 + SetZ = 3,28 SetAngle = 3,180 - SetX = 4,283 - SetY = 4,158 - SetX = 5,220 - SetY = 5,197 + SetFrame = 4,6 + SetX = 4,121 + SetY = 4,-103 + SetFrame = 5,7 + SetX = 5,71 + SetY = 5,-42 + SetVisible = 6,false + + Graphic = 003-Attack01 + Focus = UserAndTarget + SetFrame = 4,1 + SetX = 4,0 + SetY = 4,28 + SetZ = 4,27 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,2 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,338 - SetY = 0,128 + SetFrame = 0,5 + SetX = 0,164 + SetY = 0,-150 + SetZ = 0,27 SetAngle = 0,180 - SetX = 1,288 - SetY = 1,155 - SetX = 2,213 - SetY = 2,203 - SetX = 3,129 - SetY = 3,242 - SetAngle = 3,0 + SetFrame = 1,6 + SetX = 1,125 + SetY = 1,-107 + SetFrame = 2,7 + SetX = 2,66 + SetY = 2,-32 + SetVisible = 3,false Play = 3,normaldamage,80 Play = 5,normaldamage,80 diff --git a/PBS/Animations/Converted/Move/FURYCUTTER.txt b/PBS/Animations/Converted/Move/FURYCUTTER.txt index 1c3ee1748..7aa7464f7 100644 --- a/PBS/Animations/Converted/Move/FURYCUTTER.txt +++ b/PBS/Animations/Converted/Move/FURYCUTTER.txt @@ -3,15 +3,22 @@ [Move,FURYCUTTER] Name = FURYCUTTER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Sword6 Focus = Target - SetX = 0,384 - SetY = 0,86 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 Play = 0,Slash10,80 diff --git a/PBS/Animations/Converted/Move/FURYSWIPES.txt b/PBS/Animations/Converted/Move/FURYSWIPES.txt index 2f899ba6f..91fc09487 100644 --- a/PBS/Animations/Converted/Move/FURYSWIPES.txt +++ b/PBS/Animations/Converted/Move/FURYSWIPES.txt @@ -3,664 +3,1074 @@ [Move,FURYSWIPES] Name = FURYSWIPES - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Scratch + Shadow Claw Focus = Target - SetX = 0,437 - SetY = 0,65 + SetFrame = 0,6 + SetX = 0,53 + SetY = 0,-31 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,424 - SetY = 1,81 + SetX = 1,40 + SetY = 1,-15 SetOpacity = 1,255 - SetX = 2,416 - SetY = 2,97 - SetX = 3,408 - SetY = 3,113 + SetX = 2,32 + SetY = 2,1 + SetX = 3,24 + SetY = 3,17 SetToneRed = 4,-128 SetToneGreen = 4,-128 SetToneBlue = 4,-128 - SetX = 5,409 + SetX = 5,25 SetOpacity = 5,128 - SetX = 8,362 - SetY = 8,138 - SetOpacity = 8,255 - SetToneRed = 8,0 - SetToneGreen = 8,0 - SetToneBlue = 8,0 - SetX = 9,308 - SetY = 9,144 - SetX = 10,275 - SetY = 10,178 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 2,397 - SetY = 2,125 - SetX = 3,371 - SetY = 3,137 - SetX = 4,432 - SetY = 4,158 + SetFrame = 2,7 + SetX = 2,13 + SetY = 2,29 + SetZ = 2,28 + SetFrame = 3,8 + SetX = 3,-13 + SetY = 3,41 + SetFrame = 4,10 + SetX = 4,48 + SetY = 4,62 + SetFrame = 5,6 SetFlip = 5,true - SetX = 5,320 - SetY = 5,72 + SetX = 5,-64 + SetY = 5,-24 SetOpacity = 5,128 - SetX = 6,336 - SetY = 6,88 + SetX = 6,-48 + SetY = 6,-8 SetOpacity = 6,255 - SetX = 7,352 - SetY = 7,104 - SetX = 8,360 - SetY = 8,112 + SetX = 7,-32 + SetY = 7,8 + SetX = 8,-24 + SetY = 8,16 SetToneRed = 9,-128 SetToneGreen = 9,-128 SetToneBlue = 9,-128 SetOpacity = 10,128 + SetVisible = 11,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 3,403 - SetY = 3,138 - SetX = 4,366 - SetY = 4,157 - SetX = 5,362 - SetY = 5,227 - SetX = 7,370 - SetY = 7,128 - SetX = 8,393 - SetY = 8,133 - SetX = 9,367 - SetY = 9,184 - SetX = 10,374 - SetY = 10,215 + SetFrame = 3,8 + SetX = 3,19 + SetY = 3,42 + SetZ = 3,29 + SetFrame = 4,10 + SetX = 4,-18 + SetY = 4,61 + SetFrame = 5,5 + SetX = 5,-22 + SetY = 5,131 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,332 - SetY = 4,127 - SetX = 5,474 - SetY = 5,228 - SetX = 9,421 - SetY = 9,184 - SetX = 10,292 - SetY = 10,215 + SetFrame = 4,10 + SetX = 4,-52 + SetY = 4,31 + SetZ = 4,30 + SetFrame = 5,5 + SetX = 5,90 + SetY = 5,132 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,439 - SetY = 4,134 - SetX = 5,507 - SetY = 5,96 - SetX = 9,445 - SetY = 9,109 - SetX = 10,430 - SetY = 10,206 + SetFrame = 4,10 + SetX = 4,55 + SetY = 4,38 + SetZ = 4,31 + SetFrame = 5,5 + SetX = 5,123 + SetY = 5,0 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,267 - SetY = 5,180 - SetX = 10,459 - SetY = 10,164 + SetFrame = 5,5 + SetX = 5,-117 + SetY = 5,84 + SetZ = 5,32 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,337 - SetY = 5,191 - SetX = 10,480 - SetY = 10,89 + SetFrame = 5,5 + SetX = 5,-47 + SetY = 5,95 + SetZ = 5,33 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,399 - SetY = 5,177 - SetX = 10,331 - SetY = 10,188 + SetFrame = 5,5 + SetX = 5,15 + SetY = 5,81 + SetZ = 5,34 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,457 - SetY = 5,180 + SetFrame = 5,5 + SetX = 5,73 + SetY = 5,84 + SetZ = 5,35 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,483 - SetY = 5,143 + SetFrame = 5,5 + SetX = 5,99 + SetY = 5,47 + SetZ = 5,36 + SetVisible = 6,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 7,7 + SetX = 7,-14 + SetY = 7,32 + SetZ = 7,29 + SetFrame = 8,8 + SetX = 8,9 + SetY = 8,37 + SetFrame = 9,10 + SetX = 9,-17 + SetY = 9,88 + SetFrame = 10,11 + SetX = 10,-10 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 8,7 + SetX = 8,-22 + SetY = 8,42 + SetZ = 8,27 + SetFrame = 9,10 + SetX = 9,-76 + SetY = 9,48 + SetFrame = 10,11 + SetX = 10,-109 + SetY = 10,82 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,37 + SetY = 9,88 + SetZ = 9,30 + SetFrame = 10,11 + SetX = 10,-92 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,61 + SetY = 9,13 + SetZ = 9,31 + SetFrame = 10,11 + SetX = 10,46 + SetY = 10,110 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,75 + SetY = 10,68 + SetZ = 10,32 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,96 + SetY = 10,-7 + SetZ = 10,33 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,-53 + SetY = 10,92 + SetZ = 10,34 + SetVisible = 11,false Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,1] Name = Fury Swipes hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Scratch + Shadow Claw Focus = Target - SetX = 0,437 - SetY = 0,65 + SetFrame = 0,6 + SetX = 0,53 + SetY = 0,-31 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,424 - SetY = 1,81 + SetX = 1,40 + SetY = 1,-15 SetOpacity = 1,255 - SetX = 2,416 - SetY = 2,97 - SetX = 3,408 - SetY = 3,113 + SetX = 2,32 + SetY = 2,1 + SetX = 3,24 + SetY = 3,17 SetToneRed = 4,-128 SetToneGreen = 4,-128 SetToneBlue = 4,-128 - SetX = 5,409 + SetX = 5,25 SetOpacity = 5,128 - SetX = 8,362 - SetY = 8,138 - SetOpacity = 8,255 - SetToneRed = 8,0 - SetToneGreen = 8,0 - SetToneBlue = 8,0 - SetX = 9,308 - SetY = 9,144 - SetX = 10,275 - SetY = 10,178 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 2,397 - SetY = 2,125 - SetX = 3,371 - SetY = 3,137 - SetX = 4,432 - SetY = 4,158 + SetFrame = 2,7 + SetX = 2,13 + SetY = 2,29 + SetZ = 2,28 + SetFrame = 3,8 + SetX = 3,-13 + SetY = 3,41 + SetFrame = 4,10 + SetX = 4,48 + SetY = 4,62 + SetFrame = 5,6 SetFlip = 5,true - SetX = 5,320 - SetY = 5,72 + SetX = 5,-64 + SetY = 5,-24 SetOpacity = 5,128 - SetX = 6,336 - SetY = 6,88 + SetX = 6,-48 + SetY = 6,-8 SetOpacity = 6,255 - SetX = 7,352 - SetY = 7,104 - SetX = 8,360 - SetY = 8,112 + SetX = 7,-32 + SetY = 7,8 + SetX = 8,-24 + SetY = 8,16 SetToneRed = 9,-128 SetToneGreen = 9,-128 SetToneBlue = 9,-128 SetOpacity = 10,128 + SetVisible = 11,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 3,403 - SetY = 3,138 - SetX = 4,366 - SetY = 4,157 - SetX = 5,362 - SetY = 5,227 - SetX = 7,370 - SetY = 7,128 - SetX = 8,393 - SetY = 8,133 - SetX = 9,367 - SetY = 9,184 - SetX = 10,374 - SetY = 10,215 + SetFrame = 3,8 + SetX = 3,19 + SetY = 3,42 + SetZ = 3,29 + SetFrame = 4,10 + SetX = 4,-18 + SetY = 4,61 + SetFrame = 5,5 + SetX = 5,-22 + SetY = 5,131 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,332 - SetY = 4,127 - SetX = 5,474 - SetY = 5,228 - SetX = 9,421 - SetY = 9,184 - SetX = 10,292 - SetY = 10,215 + SetFrame = 4,10 + SetX = 4,-52 + SetY = 4,31 + SetZ = 4,30 + SetFrame = 5,5 + SetX = 5,90 + SetY = 5,132 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,439 - SetY = 4,134 - SetX = 5,507 - SetY = 5,96 - SetX = 9,445 - SetY = 9,109 - SetX = 10,430 - SetY = 10,206 + SetFrame = 4,10 + SetX = 4,55 + SetY = 4,38 + SetZ = 4,31 + SetFrame = 5,5 + SetX = 5,123 + SetY = 5,0 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,267 - SetY = 5,180 - SetX = 10,459 - SetY = 10,164 + SetFrame = 5,5 + SetX = 5,-117 + SetY = 5,84 + SetZ = 5,32 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,337 - SetY = 5,191 - SetX = 10,480 - SetY = 10,89 + SetFrame = 5,5 + SetX = 5,-47 + SetY = 5,95 + SetZ = 5,33 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,399 - SetY = 5,177 - SetX = 10,331 - SetY = 10,188 + SetFrame = 5,5 + SetX = 5,15 + SetY = 5,81 + SetZ = 5,34 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,457 - SetY = 5,180 + SetFrame = 5,5 + SetX = 5,73 + SetY = 5,84 + SetZ = 5,35 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,483 - SetY = 5,143 + SetFrame = 5,5 + SetX = 5,99 + SetY = 5,47 + SetZ = 5,36 + SetVisible = 6,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 7,7 + SetX = 7,-14 + SetY = 7,32 + SetZ = 7,29 + SetFrame = 8,8 + SetX = 8,9 + SetY = 8,37 + SetFrame = 9,10 + SetX = 9,-17 + SetY = 9,88 + SetFrame = 10,11 + SetX = 10,-10 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 8,7 + SetX = 8,-22 + SetY = 8,42 + SetZ = 8,27 + SetFrame = 9,10 + SetX = 9,-76 + SetY = 9,48 + SetFrame = 10,11 + SetX = 10,-109 + SetY = 10,82 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,37 + SetY = 9,88 + SetZ = 9,30 + SetFrame = 10,11 + SetX = 10,-92 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,61 + SetY = 9,13 + SetZ = 9,31 + SetFrame = 10,11 + SetX = 10,46 + SetY = 10,110 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,75 + SetY = 10,68 + SetZ = 10,32 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,96 + SetY = 10,-7 + SetZ = 10,33 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,-53 + SetY = 10,92 + SetZ = 10,34 + SetVisible = 11,false Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,2] Name = Fury Swipes hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Scratch + Shadow Claw Focus = Target - SetX = 0,437 - SetY = 0,65 + SetFrame = 0,6 + SetX = 0,53 + SetY = 0,-31 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,424 - SetY = 1,81 + SetX = 1,40 + SetY = 1,-15 SetOpacity = 1,255 - SetX = 2,416 - SetY = 2,97 - SetX = 3,408 - SetY = 3,113 + SetX = 2,32 + SetY = 2,1 + SetX = 3,24 + SetY = 3,17 SetToneRed = 4,-128 SetToneGreen = 4,-128 SetToneBlue = 4,-128 - SetX = 5,409 + SetX = 5,25 SetOpacity = 5,128 - SetX = 8,362 - SetY = 8,138 - SetOpacity = 8,255 - SetToneRed = 8,0 - SetToneGreen = 8,0 - SetToneBlue = 8,0 - SetX = 9,308 - SetY = 9,144 - SetX = 10,275 - SetY = 10,178 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 2,397 - SetY = 2,125 - SetX = 3,371 - SetY = 3,137 - SetX = 4,432 - SetY = 4,158 + SetFrame = 2,7 + SetX = 2,13 + SetY = 2,29 + SetZ = 2,28 + SetFrame = 3,8 + SetX = 3,-13 + SetY = 3,41 + SetFrame = 4,10 + SetX = 4,48 + SetY = 4,62 + SetFrame = 5,6 SetFlip = 5,true - SetX = 5,320 - SetY = 5,72 + SetX = 5,-64 + SetY = 5,-24 SetOpacity = 5,128 - SetX = 6,336 - SetY = 6,88 + SetX = 6,-48 + SetY = 6,-8 SetOpacity = 6,255 - SetX = 7,352 - SetY = 7,104 - SetX = 8,360 - SetY = 8,112 + SetX = 7,-32 + SetY = 7,8 + SetX = 8,-24 + SetY = 8,16 SetToneRed = 9,-128 SetToneGreen = 9,-128 SetToneBlue = 9,-128 SetOpacity = 10,128 + SetVisible = 11,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 3,403 - SetY = 3,138 - SetX = 4,366 - SetY = 4,157 - SetX = 5,362 - SetY = 5,227 - SetX = 7,370 - SetY = 7,128 - SetX = 8,393 - SetY = 8,133 - SetX = 9,367 - SetY = 9,184 - SetX = 10,374 - SetY = 10,215 + SetFrame = 3,8 + SetX = 3,19 + SetY = 3,42 + SetZ = 3,29 + SetFrame = 4,10 + SetX = 4,-18 + SetY = 4,61 + SetFrame = 5,5 + SetX = 5,-22 + SetY = 5,131 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,332 - SetY = 4,127 - SetX = 5,474 - SetY = 5,228 - SetX = 9,421 - SetY = 9,184 - SetX = 10,292 - SetY = 10,215 + SetFrame = 4,10 + SetX = 4,-52 + SetY = 4,31 + SetZ = 4,30 + SetFrame = 5,5 + SetX = 5,90 + SetY = 5,132 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,439 - SetY = 4,134 - SetX = 5,507 - SetY = 5,96 - SetX = 9,445 - SetY = 9,109 - SetX = 10,430 - SetY = 10,206 + SetFrame = 4,10 + SetX = 4,55 + SetY = 4,38 + SetZ = 4,31 + SetFrame = 5,5 + SetX = 5,123 + SetY = 5,0 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,267 - SetY = 5,180 - SetX = 10,459 - SetY = 10,164 + SetFrame = 5,5 + SetX = 5,-117 + SetY = 5,84 + SetZ = 5,32 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,337 - SetY = 5,191 - SetX = 10,480 - SetY = 10,89 + SetFrame = 5,5 + SetX = 5,-47 + SetY = 5,95 + SetZ = 5,33 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,399 - SetY = 5,177 - SetX = 10,331 - SetY = 10,188 + SetFrame = 5,5 + SetX = 5,15 + SetY = 5,81 + SetZ = 5,34 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,457 - SetY = 5,180 + SetFrame = 5,5 + SetX = 5,73 + SetY = 5,84 + SetZ = 5,35 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,483 - SetY = 5,143 + SetFrame = 5,5 + SetX = 5,99 + SetY = 5,47 + SetZ = 5,36 + SetVisible = 6,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 7,7 + SetX = 7,-14 + SetY = 7,32 + SetZ = 7,29 + SetFrame = 8,8 + SetX = 8,9 + SetY = 8,37 + SetFrame = 9,10 + SetX = 9,-17 + SetY = 9,88 + SetFrame = 10,11 + SetX = 10,-10 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 8,7 + SetX = 8,-22 + SetY = 8,42 + SetZ = 8,27 + SetFrame = 9,10 + SetX = 9,-76 + SetY = 9,48 + SetFrame = 10,11 + SetX = 10,-109 + SetY = 10,82 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,37 + SetY = 9,88 + SetZ = 9,30 + SetFrame = 10,11 + SetX = 10,-92 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,61 + SetY = 9,13 + SetZ = 9,31 + SetFrame = 10,11 + SetX = 10,46 + SetY = 10,110 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,75 + SetY = 10,68 + SetZ = 10,32 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,96 + SetY = 10,-7 + SetZ = 10,33 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,-53 + SetY = 10,92 + SetZ = 10,34 + SetVisible = 11,false Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,3] Name = Fury Swipes hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Scratch + Shadow Claw Focus = Target - SetX = 0,437 - SetY = 0,65 + SetFrame = 0,6 + SetX = 0,53 + SetY = 0,-31 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,424 - SetY = 1,81 + SetX = 1,40 + SetY = 1,-15 SetOpacity = 1,255 - SetX = 2,416 - SetY = 2,97 - SetX = 3,408 - SetY = 3,113 + SetX = 2,32 + SetY = 2,1 + SetX = 3,24 + SetY = 3,17 SetToneRed = 4,-128 SetToneGreen = 4,-128 SetToneBlue = 4,-128 - SetX = 5,409 + SetX = 5,25 SetOpacity = 5,128 - SetX = 8,362 - SetY = 8,138 - SetOpacity = 8,255 - SetToneRed = 8,0 - SetToneGreen = 8,0 - SetToneBlue = 8,0 - SetX = 9,308 - SetY = 9,144 - SetX = 10,275 - SetY = 10,178 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 2,397 - SetY = 2,125 - SetX = 3,371 - SetY = 3,137 - SetX = 4,432 - SetY = 4,158 + SetFrame = 2,7 + SetX = 2,13 + SetY = 2,29 + SetZ = 2,28 + SetFrame = 3,8 + SetX = 3,-13 + SetY = 3,41 + SetFrame = 4,10 + SetX = 4,48 + SetY = 4,62 + SetFrame = 5,6 SetFlip = 5,true - SetX = 5,320 - SetY = 5,72 + SetX = 5,-64 + SetY = 5,-24 SetOpacity = 5,128 - SetX = 6,336 - SetY = 6,88 + SetX = 6,-48 + SetY = 6,-8 SetOpacity = 6,255 - SetX = 7,352 - SetY = 7,104 - SetX = 8,360 - SetY = 8,112 + SetX = 7,-32 + SetY = 7,8 + SetX = 8,-24 + SetY = 8,16 SetToneRed = 9,-128 SetToneGreen = 9,-128 SetToneBlue = 9,-128 SetOpacity = 10,128 + SetVisible = 11,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 3,403 - SetY = 3,138 - SetX = 4,366 - SetY = 4,157 - SetX = 5,362 - SetY = 5,227 - SetX = 7,370 - SetY = 7,128 - SetX = 8,393 - SetY = 8,133 - SetX = 9,367 - SetY = 9,184 - SetX = 10,374 - SetY = 10,215 + SetFrame = 3,8 + SetX = 3,19 + SetY = 3,42 + SetZ = 3,29 + SetFrame = 4,10 + SetX = 4,-18 + SetY = 4,61 + SetFrame = 5,5 + SetX = 5,-22 + SetY = 5,131 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,332 - SetY = 4,127 - SetX = 5,474 - SetY = 5,228 - SetX = 9,421 - SetY = 9,184 - SetX = 10,292 - SetY = 10,215 + SetFrame = 4,10 + SetX = 4,-52 + SetY = 4,31 + SetZ = 4,30 + SetFrame = 5,5 + SetX = 5,90 + SetY = 5,132 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,439 - SetY = 4,134 - SetX = 5,507 - SetY = 5,96 - SetX = 9,445 - SetY = 9,109 - SetX = 10,430 - SetY = 10,206 + SetFrame = 4,10 + SetX = 4,55 + SetY = 4,38 + SetZ = 4,31 + SetFrame = 5,5 + SetX = 5,123 + SetY = 5,0 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,267 - SetY = 5,180 - SetX = 10,459 - SetY = 10,164 + SetFrame = 5,5 + SetX = 5,-117 + SetY = 5,84 + SetZ = 5,32 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,337 - SetY = 5,191 - SetX = 10,480 - SetY = 10,89 + SetFrame = 5,5 + SetX = 5,-47 + SetY = 5,95 + SetZ = 5,33 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,399 - SetY = 5,177 - SetX = 10,331 - SetY = 10,188 + SetFrame = 5,5 + SetX = 5,15 + SetY = 5,81 + SetZ = 5,34 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,457 - SetY = 5,180 + SetFrame = 5,5 + SetX = 5,73 + SetY = 5,84 + SetZ = 5,35 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,483 - SetY = 5,143 + SetFrame = 5,5 + SetX = 5,99 + SetY = 5,47 + SetZ = 5,36 + SetVisible = 6,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 7,7 + SetX = 7,-14 + SetY = 7,32 + SetZ = 7,29 + SetFrame = 8,8 + SetX = 8,9 + SetY = 8,37 + SetFrame = 9,10 + SetX = 9,-17 + SetY = 9,88 + SetFrame = 10,11 + SetX = 10,-10 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 8,7 + SetX = 8,-22 + SetY = 8,42 + SetZ = 8,27 + SetFrame = 9,10 + SetX = 9,-76 + SetY = 9,48 + SetFrame = 10,11 + SetX = 10,-109 + SetY = 10,82 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,37 + SetY = 9,88 + SetZ = 9,30 + SetFrame = 10,11 + SetX = 10,-92 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,61 + SetY = 9,13 + SetZ = 9,31 + SetFrame = 10,11 + SetX = 10,46 + SetY = 10,110 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,75 + SetY = 10,68 + SetZ = 10,32 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,96 + SetY = 10,-7 + SetZ = 10,33 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,-53 + SetY = 10,92 + SetZ = 10,34 + SetVisible = 11,false Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,4] Name = Fury Swipes hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Scratch + Shadow Claw Focus = Target - SetX = 0,437 - SetY = 0,65 + SetFrame = 0,6 + SetX = 0,53 + SetY = 0,-31 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,424 - SetY = 1,81 + SetX = 1,40 + SetY = 1,-15 SetOpacity = 1,255 - SetX = 2,416 - SetY = 2,97 - SetX = 3,408 - SetY = 3,113 + SetX = 2,32 + SetY = 2,1 + SetX = 3,24 + SetY = 3,17 SetToneRed = 4,-128 SetToneGreen = 4,-128 SetToneBlue = 4,-128 - SetX = 5,409 + SetX = 5,25 SetOpacity = 5,128 - SetX = 8,362 - SetY = 8,138 - SetOpacity = 8,255 - SetToneRed = 8,0 - SetToneGreen = 8,0 - SetToneBlue = 8,0 - SetX = 9,308 - SetY = 9,144 - SetX = 10,275 - SetY = 10,178 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 2,397 - SetY = 2,125 - SetX = 3,371 - SetY = 3,137 - SetX = 4,432 - SetY = 4,158 + SetFrame = 2,7 + SetX = 2,13 + SetY = 2,29 + SetZ = 2,28 + SetFrame = 3,8 + SetX = 3,-13 + SetY = 3,41 + SetFrame = 4,10 + SetX = 4,48 + SetY = 4,62 + SetFrame = 5,6 SetFlip = 5,true - SetX = 5,320 - SetY = 5,72 + SetX = 5,-64 + SetY = 5,-24 SetOpacity = 5,128 - SetX = 6,336 - SetY = 6,88 + SetX = 6,-48 + SetY = 6,-8 SetOpacity = 6,255 - SetX = 7,352 - SetY = 7,104 - SetX = 8,360 - SetY = 8,112 + SetX = 7,-32 + SetY = 7,8 + SetX = 8,-24 + SetY = 8,16 SetToneRed = 9,-128 SetToneGreen = 9,-128 SetToneBlue = 9,-128 SetOpacity = 10,128 + SetVisible = 11,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 3,403 - SetY = 3,138 - SetX = 4,366 - SetY = 4,157 - SetX = 5,362 - SetY = 5,227 - SetX = 7,370 - SetY = 7,128 - SetX = 8,393 - SetY = 8,133 - SetX = 9,367 - SetY = 9,184 - SetX = 10,374 - SetY = 10,215 + SetFrame = 3,8 + SetX = 3,19 + SetY = 3,42 + SetZ = 3,29 + SetFrame = 4,10 + SetX = 4,-18 + SetY = 4,61 + SetFrame = 5,5 + SetX = 5,-22 + SetY = 5,131 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,332 - SetY = 4,127 - SetX = 5,474 - SetY = 5,228 - SetX = 9,421 - SetY = 9,184 - SetX = 10,292 - SetY = 10,215 + SetFrame = 4,10 + SetX = 4,-52 + SetY = 4,31 + SetZ = 4,30 + SetFrame = 5,5 + SetX = 5,90 + SetY = 5,132 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 4,439 - SetY = 4,134 - SetX = 5,507 - SetY = 5,96 - SetX = 9,445 - SetY = 9,109 - SetX = 10,430 - SetY = 10,206 + SetFrame = 4,10 + SetX = 4,55 + SetY = 4,38 + SetZ = 4,31 + SetFrame = 5,5 + SetX = 5,123 + SetY = 5,0 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,267 - SetY = 5,180 - SetX = 10,459 - SetY = 10,164 + SetFrame = 5,5 + SetX = 5,-117 + SetY = 5,84 + SetZ = 5,32 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,337 - SetY = 5,191 - SetX = 10,480 - SetY = 10,89 + SetFrame = 5,5 + SetX = 5,-47 + SetY = 5,95 + SetZ = 5,33 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,399 - SetY = 5,177 - SetX = 10,331 - SetY = 10,188 + SetFrame = 5,5 + SetX = 5,15 + SetY = 5,81 + SetZ = 5,34 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,457 - SetY = 5,180 + SetFrame = 5,5 + SetX = 5,73 + SetY = 5,84 + SetZ = 5,35 + SetVisible = 6,false Graphic = Scratch + Shadow Claw Focus = Target - SetX = 5,483 - SetY = 5,143 + SetFrame = 5,5 + SetX = 5,99 + SetY = 5,47 + SetZ = 5,36 + SetVisible = 6,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 7,7 + SetX = 7,-14 + SetY = 7,32 + SetZ = 7,29 + SetFrame = 8,8 + SetX = 8,9 + SetY = 8,37 + SetFrame = 9,10 + SetX = 9,-17 + SetY = 9,88 + SetFrame = 10,11 + SetX = 10,-10 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 8,7 + SetX = 8,-22 + SetY = 8,42 + SetZ = 8,27 + SetFrame = 9,10 + SetX = 9,-76 + SetY = 9,48 + SetFrame = 10,11 + SetX = 10,-109 + SetY = 10,82 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,37 + SetY = 9,88 + SetZ = 9,30 + SetFrame = 10,11 + SetX = 10,-92 + SetY = 10,119 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 9,10 + SetX = 9,61 + SetY = 9,13 + SetZ = 9,31 + SetFrame = 10,11 + SetX = 10,46 + SetY = 10,110 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,75 + SetY = 10,68 + SetZ = 10,32 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,96 + SetY = 10,-7 + SetZ = 10,33 + SetVisible = 11,false + + Graphic = Scratch + Shadow Claw + Focus = Target + SetFrame = 10,11 + SetX = 10,-53 + SetY = 10,92 + SetZ = 10,34 + SetVisible = 11,false Play = 0,Fury Swipes diff --git a/PBS/Animations/Converted/Move/FUTURESIGHT.txt b/PBS/Animations/Converted/Move/FUTURESIGHT.txt index 02912f9e6..b66512a36 100644 --- a/PBS/Animations/Converted/Move/FUTURESIGHT.txt +++ b/PBS/Animations/Converted/Move/FUTURESIGHT.txt @@ -3,24 +3,30 @@ [Move,FUTURESIGHT] Name = FUTURESIGHT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = face and eye Focus = User - SetX = 0,145 - SetY = 0,224 - SetX = 2,141 - SetY = 2,222 - SetX = 3,131 - SetY = 3,221 - SetX = 4,143 - SetY = 4,219 - SetX = 5,131 - SetY = 5,220 + SetFrame = 0,10 + SetX = 0,17 + SetY = 0,0 + SetZ = 0,27 + SetFrame = 2,11 + SetX = 2,13 + SetY = 2,-2 + SetFrame = 3,12 + SetX = 3,3 + SetY = 3,-3 + SetFrame = 4,13 + SetX = 4,15 + SetY = 4,-5 + SetFrame = 5,14 + SetX = 5,3 + SetY = 5,-4 SetOpacity = 8,192 SetOpacity = 9,96 @@ -29,24 +35,30 @@ Name = FUTURESIGHT [Move,FUTURESIGHT,1] Name = Future Sight hit - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = face and eye Focus = Target - SetX = 0,401 - SetY = 0,96 - SetX = 2,397 - SetY = 2,94 - SetX = 3,387 - SetY = 3,93 - SetX = 4,399 - SetY = 4,91 - SetX = 5,387 - SetY = 5,92 + SetFrame = 0,10 + SetX = 0,17 + SetY = 0,0 + SetZ = 0,27 + SetFrame = 2,11 + SetX = 2,13 + SetY = 2,-2 + SetFrame = 3,12 + SetX = 3,3 + SetY = 3,-3 + SetFrame = 4,13 + SetX = 4,15 + SetY = 4,-5 + SetFrame = 5,14 + SetX = 5,3 + SetY = 5,-4 SetOpacity = 8,192 SetOpacity = 9,96 diff --git a/PBS/Animations/Converted/Move/GASTROACID.txt b/PBS/Animations/Converted/Move/GASTROACID.txt index 49669c6fd..535831da2 100644 --- a/PBS/Animations/Converted/Move/GASTROACID.txt +++ b/PBS/Animations/Converted/Move/GASTROACID.txt @@ -3,97 +3,122 @@ [Move,GASTROACID] Name = GASTROACID - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = fly copy - Focus = Target - SetX = 1,393 - SetY = 1,120 - SetZoomX = 1,85 - SetZoomY = 1,85 - SetOpacity = 1,200 - SetX = 2,369 - SetY = 2,60 - SetX = 3,359 - SetY = 3,108 - SetX = 4,394 - SetY = 4,93 - SetX = 5,316 - SetY = 5,72 - SetX = 6,336 - SetY = 6,80 - SetX = 7,375 - SetY = 7,96 - SetX = 8,330 - SetY = 8,64 - SetX = 9,376 - SetY = 9,91 - - Graphic = fly copy - Focus = Target - SetX = 2,363 - SetY = 2,114 - SetZoomX = 2,85 - SetZoomY = 2,85 - SetOpacity = 2,200 - SetX = 3,315 - SetY = 3,86 - SetX = 4,337 - SetY = 4,123 - SetX = 6,343 - SetY = 6,27 - SetX = 7,301 - SetY = 7,36 - SetX = 9,348 - SetY = 9,24 - - Graphic = fly copy - Focus = Target - SetX = 3,402 - SetY = 3,119 - SetZoomX = 3,85 - SetZoomY = 3,85 - SetOpacity = 3,200 - SetX = 4,302 - SetY = 4,69 - - Graphic = fly copy - Focus = Target - SetX = 4,344 - SetY = 4,23 - SetZoomX = 4,85 - SetZoomY = 4,85 - SetOpacity = 4,200 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,353 - SetY = 0,110 + SetX = 0,-31 + SetY = 0,14 + SetZ = 0,27 SetZoomX = 0,85 SetZoomY = 0,85 SetOpacity = 0,200 - SetX = 1,352 - SetY = 1,85 - SetX = 2,315 - SetY = 2,58 - SetX = 3,342 - SetY = 3,38 - SetX = 4,358 - SetY = 4,77 - SetX = 5,364 - SetY = 5,72 - SetX = 6,380 - SetY = 6,75 - SetX = 7,381 - SetY = 7,45 - SetX = 8,390 - SetY = 8,79 - SetX = 9,310 - SetY = 9,83 - SetX = 10,365 + SetX = 1,-32 + SetY = 1,-11 + SetX = 2,-69 + SetY = 2,-38 + SetX = 3,-42 + SetY = 3,-58 + SetX = 4,-26 + SetY = 4,-19 + SetX = 5,-20 + SetY = 5,-24 + SetX = 6,-4 + SetY = 6,-21 + SetX = 7,-3 + SetY = 7,-51 + SetX = 8,6 + SetY = 8,-17 + SetX = 9,-74 + SetY = 9,-13 + SetX = 10,-19 + + Graphic = fly copy + Focus = Target + SetX = 1,9 + SetY = 1,24 + SetZ = 1,28 + SetZoomX = 1,85 + SetZoomY = 1,85 + SetOpacity = 1,200 + SetX = 2,-15 + SetY = 2,-36 + SetX = 3,-25 + SetY = 3,12 + SetX = 4,10 + SetY = 4,-3 + SetX = 5,-68 + SetY = 5,-24 + SetX = 6,-48 + SetY = 6,-16 + SetX = 7,-9 + SetY = 7,0 + SetX = 8,-54 + SetY = 8,-32 + SetX = 9,-8 + SetY = 9,-5 + SetVisible = 10,false + + Graphic = fly copy + Focus = Target + SetX = 2,-21 + SetY = 2,18 + SetZ = 2,29 + SetZoomX = 2,85 + SetZoomY = 2,85 + SetOpacity = 2,200 + SetX = 3,-69 + SetY = 3,-10 + SetX = 4,-47 + SetY = 4,27 + SetVisible = 5,false + + Graphic = fly copy + Focus = Target + SetX = 3,18 + SetY = 3,23 + SetZ = 3,30 + SetZoomX = 3,85 + SetZoomY = 3,85 + SetOpacity = 3,200 + SetX = 4,-82 + SetY = 4,-27 + SetVisible = 5,false + + Graphic = fly copy + Focus = Target + SetX = 4,-40 + SetY = 4,-73 + SetZ = 4,31 + SetZoomX = 4,85 + SetZoomY = 4,85 + SetOpacity = 4,200 + SetVisible = 5,false + + Graphic = fly copy + Focus = Target + SetX = 6,-41 + SetY = 6,-69 + SetZ = 6,29 + SetZoomX = 6,85 + SetZoomY = 6,85 + SetOpacity = 6,200 + SetX = 7,-83 + SetY = 7,-60 + SetVisible = 8,false + + Graphic = fly copy + Focus = Target + SetX = 9,-36 + SetY = 9,-72 + SetZ = 9,29 + SetZoomX = 9,85 + SetZoomY = 9,85 + SetOpacity = 9,200 + SetVisible = 10,false Play = 0,Sweet Scent diff --git a/PBS/Animations/Converted/Move/GIGADRAIN.txt b/PBS/Animations/Converted/Move/GIGADRAIN.txt index 8b1e1698a..0da555b0e 100644 --- a/PBS/Animations/Converted/Move/GIGADRAIN.txt +++ b/PBS/Animations/Converted/Move/GIGADRAIN.txt @@ -3,152 +3,193 @@ [Move,GIGADRAIN] Name = GIGADRAIN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget - SetX = 0,345 - SetY = 0,91 - SetX = 1,294 - SetY = 1,98 - SetX = 2,211 - SetY = 2,123 - SetX = 3,160 - SetY = 3,161 - SetX = 4,128 - SetY = 4,205 - SetX = 5,134 + SetFrame = 0,8 + SetX = 0,169 + SetY = 0,-207 + SetZ = 0,27 + SetX = 1,129 + SetY = 1,-196 + SetX = 2,64 + SetY = 2,-157 + SetX = 3,25 + SetY = 3,-98 + SetX = 4,0 + SetY = 4,-29 + SetFrame = 5,9 + SetX = 5,4 + SetFrame = 6,10 + SetFrame = 7,11 + SetFrame = 8,12 + SetFrame = 9,13 Graphic = rockice Focus = UserAndTarget - SetX = 0,371 - SetY = 0,110 - SetX = 1,396 - SetY = 1,116 - SetX = 2,358 - SetY = 2,148 - SetX = 3,307 - SetY = 3,186 - SetX = 4,217 - SetY = 4,217 - SetX = 5,147 - SetY = 5,186 - SetX = 6,172 - SetY = 6,173 - SetX = 7,160 - SetY = 7,198 - SetX = 9,166 - SetY = 9,211 + SetFrame = 0,9 + SetX = 0,189 + SetY = 0,-178 + SetZ = 0,28 + SetFrame = 1,8 + SetX = 1,209 + SetY = 1,-168 + SetX = 2,179 + SetY = 2,-118 + SetX = 3,139 + SetY = 3,-59 + SetX = 4,69 + SetY = 4,-10 + SetX = 5,14 + SetY = 5,-59 + SetX = 6,34 + SetY = 6,-79 + SetX = 7,25 + SetY = 7,-40 + SetX = 9,29 + SetY = 9,-20 Graphic = rockice Focus = UserAndTarget - SetX = 1,345 - SetY = 1,142 - SetX = 2,339 - SetY = 2,104 - SetX = 3,262 - SetY = 3,135 - SetX = 4,185 - SetY = 4,167 - SetX = 5,204 - SetY = 5,192 - SetX = 6,275 - SetY = 6,173 - SetX = 7,198 - SetY = 7,192 - SetX = 8,128 - SetY = 8,173 - SetX = 9,153 - SetY = 9,198 + SetFrame = 1,9 + SetX = 1,169 + SetY = 1,-128 + SetZ = 1,29 + SetFrame = 2,8 + SetX = 2,164 + SetY = 2,-187 + SetX = 3,104 + SetY = 3,-139 + SetX = 4,44 + SetY = 4,-89 + SetX = 5,59 + SetY = 5,-50 + SetX = 6,114 + SetY = 6,-79 + SetX = 7,54 + SetY = 7,-50 + SetX = 8,0 + SetY = 8,-79 + SetFrame = 9,9 + SetX = 9,19 + SetY = 9,-40 Graphic = rockice Focus = UserAndTarget - SetX = 1,339 - SetY = 1,85 - SetX = 2,268 - SetY = 2,192 - SetX = 3,371 - SetY = 3,123 - SetX = 4,320 - SetY = 4,154 - SetX = 5,256 - SetY = 5,135 - SetY = 6,98 - SetX = 7,172 - SetY = 7,135 - SetX = 8,230 - SetY = 8,192 + SetFrame = 1,9 + SetX = 1,164 + SetY = 1,-217 + SetZ = 1,30 + SetX = 2,109 + SetY = 2,-50 + SetFrame = 3,8 + SetX = 3,189 + SetY = 3,-157 + SetX = 4,150 + SetY = 4,-109 + SetX = 5,100 + SetY = 5,-139 + SetY = 6,-196 + SetX = 7,34 + SetY = 7,-139 + SetX = 8,79 + SetY = 8,-50 + SetVisible = 9,false Graphic = rockice Focus = UserAndTarget - SetX = 2,288 - SetY = 2,91 - SetX = 3,371 - SetX = 4,307 - SetY = 4,110 - SetX = 5,339 - SetY = 5,135 - SetX = 6,371 - SetY = 6,91 - SetX = 7,326 - SetY = 7,135 - SetX = 8,185 - SetY = 8,198 + SetFrame = 2,9 + SetX = 2,125 + SetY = 2,-207 + SetZ = 2,31 + SetFrame = 3,8 + SetX = 3,189 + SetX = 4,139 + SetY = 4,-178 + SetX = 5,164 + SetY = 5,-139 + SetX = 6,189 + SetY = 6,-207 + SetX = 7,154 + SetY = 7,-139 + SetFrame = 8,9 + SetX = 8,44 + SetY = 8,-40 + SetVisible = 9,false Graphic = rockice Focus = UserAndTarget - SetX = 2,377 - SetY = 2,104 - SetX = 3,166 - SetY = 3,230 - SetX = 4,377 - SetY = 4,104 - SetX = 5,352 - SetY = 5,85 - SetX = 6,256 - SetY = 6,154 - SetX = 7,185 - SetY = 7,173 + SetFrame = 2,9 + SetX = 2,194 + SetY = 2,-187 + SetZ = 2,32 + SetX = 3,29 + SetY = 3,9 + SetFrame = 4,8 + SetX = 4,194 + SetY = 4,-187 + SetX = 5,175 + SetY = 5,-217 + SetX = 6,100 + SetY = 6,-109 + SetX = 7,44 + SetY = 7,-79 + SetVisible = 8,false Graphic = rockice Focus = UserAndTarget - SetX = 3,236 - SetY = 3,116 - SetX = 4,371 - SetY = 4,85 - SetX = 5,313 - SetY = 5,116 - SetX = 6,320 - SetY = 6,167 - SetX = 7,249 - SetY = 7,186 + SetFrame = 3,9 + SetX = 3,84 + SetY = 3,-168 + SetZ = 3,33 + SetFrame = 4,8 + SetX = 4,189 + SetY = 4,-217 + SetX = 5,144 + SetY = 5,-168 + SetFrame = 6,9 + SetX = 6,150 + SetY = 6,-89 + SetX = 7,94 + SetY = 7,-59 + SetVisible = 8,false Graphic = rockice Focus = UserAndTarget - SetX = 3,326 - SetY = 3,142 - SetX = 4,166 - SetY = 4,161 - SetX = 5,140 - SetY = 5,173 + SetFrame = 3,9 + SetX = 3,154 + SetY = 3,-128 + SetZ = 3,34 + SetX = 4,29 + SetY = 4,-98 + SetX = 5,9 + SetY = 5,-79 + SetVisible = 6,false Graphic = rockice Focus = UserAndTarget - SetX = 4,275 - SetY = 4,167 - SetX = 5,179 - SetY = 5,192 + SetFrame = 4,9 + SetX = 4,114 + SetY = 4,-89 + SetZ = 4,35 + SetX = 5,39 + SetY = 5,-50 + SetVisible = 6,false Graphic = rockice Focus = UserAndTarget - SetX = 4,396 - SetY = 4,104 - SetX = 5,371 - SetY = 5,135 + SetFrame = 4,9 + SetX = 4,209 + SetY = 4,-187 + SetZ = 4,36 + SetX = 5,189 + SetY = 5,-139 + SetVisible = 6,false Play = 0,Absorb2,80 Play = 2,Absorb2,80 diff --git a/PBS/Animations/Converted/Move/GLARE.txt b/PBS/Animations/Converted/Move/GLARE.txt index c8acab0e8..5c6ee51cb 100644 --- a/PBS/Animations/Converted/Move/GLARE.txt +++ b/PBS/Animations/Converted/Move/GLARE.txt @@ -3,35 +3,49 @@ [Move,GLARE] Name = GLARE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = face and eye Focus = UserAndTarget - SetX = 0,437 - SetY = 0,88 - SetX = 1,421 - SetY = 1,86 - SetX = 2,415 - SetY = 2,81 - SetX = 3,429 - SetY = 3,90 - SetX = 4,345 - SetY = 4,89 + SetFrame = 0,10 + SetX = 0,241 + SetY = 0,-212 + SetZ = 0,28 + SetFrame = 1,11 + SetX = 1,228 + SetY = 1,-215 + SetFrame = 2,12 + SetX = 2,224 + SetY = 2,-223 + SetFrame = 3,13 + SetX = 3,235 + SetY = 3,-209 + SetFrame = 4,14 + SetX = 4,169 + SetY = 4,-210 + SetVisible = 6,false Graphic = face and eye Focus = UserAndTarget - SetX = 0,355 - SetY = 0,85 - SetX = 1,346 - SetY = 1,84 - SetX = 2,333 - SetY = 2,83 - SetX = 3,355 - SetY = 3,90 - SetX = 4,420 + SetFrame = 0,10 + SetX = 0,177 + SetY = 0,-217 + SetZ = 0,27 + SetFrame = 1,11 + SetX = 1,170 + SetY = 1,-218 + SetFrame = 2,12 + SetX = 2,160 + SetY = 2,-220 + SetFrame = 3,13 + SetX = 3,177 + SetY = 3,-209 + SetFrame = 4,14 + SetX = 4,228 + SetVisible = 6,false Play = 0,Scary Face,80 diff --git a/PBS/Animations/Converted/Move/GRASSWHISTLE.txt b/PBS/Animations/Converted/Move/GRASSWHISTLE.txt index e803d0e41..5b78752a0 100644 --- a/PBS/Animations/Converted/Move/GRASSWHISTLE.txt +++ b/PBS/Animations/Converted/Move/GRASSWHISTLE.txt @@ -3,151 +3,246 @@ [Move,GRASSWHISTLE] Name = GRASSWHISTLE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = UserAndTarget - SetX = 0,147 - SetY = 0,205 - SetX = 1,172 - SetY = 1,179 - SetX = 2,204 - SetY = 2,161 - SetX = 3,249 - SetY = 3,154 - SetX = 4,288 - SetY = 4,161 - SetX = 5,352 - SetY = 5,148 - SetX = 6,396 - SetY = 6,129 - SetX = 7,371 - SetY = 7,135 - SetX = 8,384 - SetY = 8,110 - SetY = 9,116 - SetX = 10,358 - SetY = 10,142 - SetX = 11,403 - SetY = 11,110 - SetX = 12,384 - SetY = 12,123 - SetX = 13,364 - SetY = 13,148 - SetX = 14,403 - SetY = 14,110 - SetY = 15,123 + SetX = 0,14 + SetY = 0,-29 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,34 + SetY = 1,-70 + SetFrame = 2,2 + SetX = 2,59 + SetY = 2,-98 + SetFrame = 3,1 + SetX = 3,94 + SetY = 3,-109 + SetFrame = 4,0 + SetX = 4,125 + SetY = 4,-98 + SetFrame = 5,1 + SetX = 5,175 + SetY = 5,-118 + SetFrame = 6,0 + SetX = 6,209 + SetY = 6,-148 + SetFrame = 7,4 + SetX = 7,189 + SetY = 7,-139 + SetFrame = 8,3 + SetX = 8,200 + SetY = 8,-178 + SetFrame = 9,1 + SetY = 9,-168 + SetFrame = 10,2 + SetX = 10,179 + SetY = 10,-128 + SetFrame = 11,1 + SetX = 11,214 + SetY = 11,-178 + SetFrame = 12,4 + SetX = 12,200 + SetY = 12,-157 + SetX = 13,184 + SetY = 13,-118 + SetFrame = 14,5 + SetX = 14,214 + SetY = 14,-178 + SetFrame = 15,2 + SetY = 15,-157 Graphic = normal1 Focus = UserAndTarget - SetX = 2,140 - SetY = 2,192 - SetX = 3,179 - SetY = 3,167 - SetX = 4,217 - SetY = 4,142 - SetX = 5,262 - SetY = 5,161 - SetX = 6,313 - SetY = 6,167 - SetX = 7,281 - SetY = 7,173 - SetX = 8,332 - SetY = 8,167 - SetX = 9,307 - SetY = 9,179 - SetX = 10,281 - SetY = 10,167 - SetX = 11,345 - SetY = 11,142 - SetX = 12,320 - SetY = 12,186 - SetX = 13,300 - SetY = 13,192 - SetX = 14,352 - SetY = 14,186 + SetFrame = 2,3 + SetX = 2,9 + SetY = 2,-50 + SetZ = 2,28 + SetFrame = 3,4 + SetX = 3,39 + SetY = 3,-89 + SetFrame = 4,5 + SetX = 4,69 + SetY = 4,-128 + SetFrame = 5,4 + SetX = 5,104 + SetY = 5,-98 + SetFrame = 6,3 + SetX = 6,144 + SetY = 6,-89 + SetFrame = 7,1 + SetX = 7,119 + SetY = 7,-79 + SetFrame = 8,2 + SetX = 8,159 + SetY = 8,-89 + SetFrame = 9,1 + SetX = 9,139 + SetY = 9,-70 + SetFrame = 10,4 + SetX = 10,119 + SetY = 10,-89 + SetFrame = 11,5 + SetX = 11,169 + SetY = 11,-128 + SetFrame = 12,3 + SetX = 12,150 + SetY = 12,-59 + SetFrame = 13,0 + SetX = 13,134 + SetY = 13,-50 + SetFrame = 14,1 + SetX = 14,175 + SetY = 14,-59 + SetVisible = 15,false Graphic = normal1 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,142 - SetX = 3,192 - SetY = 3,123 - SetX = 4,153 - SetY = 4,179 - SetX = 5,185 - SetY = 5,161 - SetX = 6,230 - SetY = 6,154 - SetX = 7,204 - SetX = 8,256 - SetY = 8,173 - SetX = 9,224 - SetY = 9,154 - SetX = 10,217 - SetY = 10,167 - SetX = 11,256 - SetY = 11,179 - SetX = 12,243 - SetY = 12,167 - SetX = 13,320 - SetY = 13,135 - SetX = 14,371 - SetY = 14,91 + SetFrame = 2,9 + SetX = 2,19 + SetY = 2,-128 + SetZ = 2,29 + SetFrame = 3,10 + SetX = 3,50 + SetY = 3,-157 + SetFrame = 4,2 + SetX = 4,19 + SetY = 4,-70 + SetFrame = 5,1 + SetX = 5,44 + SetY = 5,-98 + SetFrame = 6,0 + SetX = 6,79 + SetY = 6,-109 + SetFrame = 7,1 + SetX = 7,59 + SetFrame = 8,0 + SetX = 8,100 + SetY = 8,-79 + SetFrame = 9,3 + SetX = 9,75 + SetY = 9,-109 + SetFrame = 10,5 + SetX = 10,69 + SetY = 10,-89 + SetFrame = 11,4 + SetX = 11,100 + SetY = 11,-70 + SetFrame = 12,2 + SetX = 12,89 + SetY = 12,-89 + SetFrame = 13,11 + SetX = 13,150 + SetY = 13,-139 + SetFrame = 14,12 + SetX = 14,189 + SetY = 14,-207 + SetVisible = 15,false Graphic = normal1 Focus = UserAndTarget - SetX = 4,236 - SetY = 4,110 - SetX = 5,307 - SetY = 5,98 - SetX = 6,160 - SetY = 6,167 - SetX = 7,358 - SetY = 7,135 - SetX = 8,172 - SetY = 8,167 - SetX = 9,390 - SetY = 9,79 - SetX = 10,339 - SetY = 10,123 - SetX = 11,198 - SetY = 11,173 - SetX = 12,236 - SetY = 12,135 + SetFrame = 4,11 + SetX = 4,84 + SetY = 4,-178 + SetZ = 4,30 + SetFrame = 5,12 + SetX = 5,139 + SetY = 5,-196 + SetFrame = 6,2 + SetX = 6,25 + SetY = 6,-89 + SetFrame = 7,12 + SetX = 7,179 + SetY = 7,-139 + SetFrame = 8,4 + SetX = 8,34 + SetY = 8,-89 + SetFrame = 9,12 + SetX = 9,204 + SetY = 9,-226 + SetFrame = 10,11 + SetX = 10,164 + SetY = 10,-157 + SetFrame = 11,1 + SetX = 11,54 + SetY = 11,-79 + SetFrame = 12,10 + SetX = 12,84 + SetY = 12,-139 + SetVisible = 13,false Graphic = normal1 Focus = UserAndTarget - SetX = 4,185 - SetY = 4,179 - SetX = 5,249 - SetY = 5,167 - SetX = 6,358 - SetY = 6,104 - SetX = 7,262 - SetY = 7,129 - SetX = 8,403 - SetY = 8,110 - SetX = 9,275 - SetY = 9,161 - SetX = 11,416 - SetY = 11,79 + SetFrame = 4,9 + SetX = 4,44 + SetY = 4,-70 + SetZ = 4,31 + SetFrame = 5,10 + SetX = 5,94 + SetY = 5,-89 + SetFrame = 6,9 + SetX = 6,179 + SetY = 6,-187 + SetFrame = 7,10 + SetX = 7,104 + SetY = 7,-148 + SetFrame = 8,9 + SetX = 8,214 + SetY = 8,-178 + SetFrame = 9,10 + SetX = 9,114 + SetY = 9,-98 + SetVisible = 10,false Graphic = normal1 Focus = UserAndTarget - SetX = 6,300 - SetY = 6,167 - SetX = 8,320 - SetY = 8,116 - SetX = 11,172 - SetY = 11,154 + SetFrame = 6,11 + SetX = 6,134 + SetY = 6,-89 + SetZ = 6,32 + SetVisible = 7,false Graphic = normal1 Focus = UserAndTarget - SetX = 6,172 - SetY = 6,135 - SetY = 8,186 + SetFrame = 6,9 + SetX = 6,34 + SetY = 6,-139 + SetZ = 6,33 + SetVisible = 7,false + + Graphic = normal1 + Focus = UserAndTarget + SetFrame = 8,11 + SetX = 8,150 + SetY = 8,-168 + SetZ = 8,32 + SetVisible = 9,false + + Graphic = normal1 + Focus = UserAndTarget + SetFrame = 8,9 + SetX = 8,34 + SetY = 8,-59 + SetZ = 8,33 + SetVisible = 9,false + + Graphic = normal1 + Focus = UserAndTarget + SetFrame = 11,12 + SetX = 11,225 + SetY = 11,-226 + SetZ = 11,31 + SetVisible = 12,false + + Graphic = normal1 + Focus = UserAndTarget + SetFrame = 11,9 + SetX = 11,34 + SetY = 11,-109 + SetZ = 11,32 + SetVisible = 12,false diff --git a/PBS/Animations/Converted/Move/GROWL.txt b/PBS/Animations/Converted/Move/GROWL.txt index bca8cd074..475c861ae 100644 --- a/PBS/Animations/Converted/Move/GROWL.txt +++ b/PBS/Animations/Converted/Move/GROWL.txt @@ -3,124 +3,134 @@ [Move,GROWL] Name = GROWL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Growl Focus = User + SetFrame = 0,1 SetFlip = 0,true - SetX = 0,185 - SetY = 0,230 - SetX = 1,200 - SetY = 1,240 - SetX = 2,216 - SetY = 2,250 - SetX = 3,230 - SetY = 3,261 - SetX = 4,185 - SetY = 4,230 - SetX = 5,200 - SetY = 5,240 - SetX = 6,216 - SetY = 6,250 - SetX = 7,230 - SetY = 7,261 + SetX = 0,57 + SetY = 0,6 + SetZ = 0,29 + SetX = 1,72 + SetY = 1,16 + SetX = 2,88 + SetY = 2,26 + SetX = 3,102 + SetY = 3,37 + SetX = 4,57 + SetY = 4,6 + SetX = 5,72 + SetY = 5,16 + SetX = 6,88 + SetY = 6,26 + SetX = 7,102 + SetY = 7,37 Graphic = Growl Focus = User - SetX = 0,192 - SetY = 0,211 - SetX = 1,209 - SetX = 2,226 - SetX = 3,243 - SetX = 4,192 - SetX = 5,209 - SetX = 6,226 - SetX = 7,243 + SetX = 0,64 + SetY = 0,-13 + SetZ = 0,27 + SetX = 1,81 + SetX = 2,98 + SetX = 3,115 + SetX = 4,64 + SetX = 5,81 + SetX = 6,98 + SetX = 7,115 Graphic = Growl Focus = User - SetX = 0,185 - SetY = 0,205 - SetX = 1,200 - SetY = 1,192 - SetX = 2,216 - SetY = 2,179 - SetX = 3,230 - SetY = 3,167 - SetX = 4,185 - SetY = 4,205 - SetX = 5,200 - SetY = 5,192 - SetX = 6,216 - SetY = 6,179 - SetX = 7,230 - SetY = 7,167 + SetFrame = 0,1 + SetX = 0,57 + SetY = 0,-19 + SetZ = 0,28 + SetX = 1,72 + SetY = 1,-32 + SetX = 2,88 + SetY = 2,-45 + SetX = 3,102 + SetY = 3,-57 + SetX = 4,57 + SetY = 4,-19 + SetX = 5,72 + SetY = 5,-32 + SetX = 6,88 + SetY = 6,-45 + SetX = 7,102 + SetY = 7,-57 PlayUserCry = 0 #------------------------------- [OppMove,GROWL] Name = GROWL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Growl Focus = Target + SetFrame = 0,1 SetFlip = 0,true - SetX = 0,326 - SetY = 0,98 - SetX = 1,313 - SetY = 1,85 - SetX = 2,300 - SetY = 2,72 - SetX = 3,288 - SetY = 3,60 - SetX = 4,326 - SetY = 4,98 - SetX = 5,313 - SetY = 5,85 - SetX = 6,300 - SetY = 6,72 - SetX = 7,288 - SetY = 7,60 + SetX = 0,-58 + SetY = 0,2 + SetZ = 0,28 + SetX = 1,-71 + SetY = 1,-11 + SetX = 2,-84 + SetY = 2,-24 + SetX = 3,-96 + SetY = 3,-36 + SetX = 4,-58 + SetY = 4,2 + SetX = 5,-71 + SetY = 5,-11 + SetX = 6,-84 + SetY = 6,-24 + SetX = 7,-96 + SetY = 7,-36 Graphic = Growl Focus = Target - SetX = 0,326 - SetY = 0,135 - SetX = 1,313 - SetY = 1,148 - SetX = 2,300 - SetY = 2,161 - SetX = 3,288 - SetY = 3,173 - SetX = 4,326 - SetY = 4,135 - SetX = 5,313 - SetY = 5,148 - SetX = 6,300 - SetY = 6,161 - SetX = 7,288 - SetY = 7,173 + SetFrame = 0,1 + SetX = 0,-58 + SetY = 0,39 + SetZ = 0,29 + SetX = 1,-71 + SetY = 1,52 + SetX = 2,-84 + SetY = 2,65 + SetX = 3,-96 + SetY = 3,77 + SetX = 4,-58 + SetY = 4,39 + SetX = 5,-71 + SetY = 5,52 + SetX = 6,-84 + SetY = 6,65 + SetX = 7,-96 + SetY = 7,77 Graphic = Growl Focus = Target SetFlip = 0,true - SetX = 0,326 - SetY = 0,110 - SetX = 1,311 - SetX = 2,296 - SetX = 3,281 - SetX = 4,326 - SetX = 5,311 - SetX = 6,296 - SetX = 7,281 + SetX = 0,-58 + SetY = 0,14 + SetZ = 0,27 + SetX = 1,-73 + SetX = 2,-88 + SetX = 3,-103 + SetX = 4,-58 + SetX = 5,-73 + SetX = 6,-88 + SetX = 7,-103 PlayUserCry = 0 diff --git a/PBS/Animations/Converted/Move/GRUDGE.txt b/PBS/Animations/Converted/Move/GRUDGE.txt index 9088b202b..4a529499f 100644 --- a/PBS/Animations/Converted/Move/GRUDGE.txt +++ b/PBS/Animations/Converted/Move/GRUDGE.txt @@ -3,160 +3,233 @@ [Move,GRUDGE] Name = GRUDGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ghost1 Focus = Target - SetX = 0,512 - SetY = 0,102 - SetX = 1,456 - SetY = 1,118 - SetX = 2,416 - SetX = 3,344 - SetY = 3,102 - SetX = 4,296 - SetX = 5,272 - SetY = 5,86 - SetX = 6,320 - SetY = 6,62 - SetX = 7,368 - SetY = 7,54 - SetX = 8,424 - SetY = 8,70 - SetX = 9,496 - SetY = 9,86 - SetX = 10,480 - SetY = 10,102 - SetX = 11,464 - SetY = 11,118 + SetX = 0,128 + SetY = 0,6 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,72 + SetY = 1,22 + SetFrame = 2,2 + SetX = 2,32 + SetFrame = 3,3 + SetX = 3,-40 + SetY = 3,6 + SetFrame = 4,4 + SetX = 4,-88 + SetFrame = 5,5 + SetX = 5,-112 + SetY = 5,-10 + SetFrame = 6,6 + SetX = 6,-64 + SetY = 6,-34 + SetFrame = 7,7 + SetX = 7,-16 + SetY = 7,-42 + SetFrame = 8,0 + SetX = 8,40 + SetY = 8,-26 + SetFrame = 9,1 + SetX = 9,112 + SetY = 9,-10 + SetFrame = 10,2 + SetX = 10,96 + SetY = 10,6 + SetFrame = 11,3 + SetX = 11,80 + SetY = 11,22 Graphic = ghost1 Focus = Target - SetX = 1,512 - SetY = 1,102 - SetX = 2,456 - SetY = 2,118 - SetX = 3,416 - SetX = 4,344 - SetY = 4,102 - SetX = 5,312 - SetX = 6,288 - SetX = 7,312 - SetY = 7,70 - SetX = 8,368 - SetY = 8,62 - SetX = 9,424 - SetY = 9,70 - SetX = 10,488 - SetX = 11,496 - SetY = 11,110 + SetFrame = 1,3 + SetX = 1,128 + SetY = 1,6 + SetZ = 1,28 + SetFrame = 2,5 + SetX = 2,72 + SetY = 2,22 + SetFrame = 3,6 + SetX = 3,32 + SetFrame = 4,7 + SetX = 4,-40 + SetY = 4,6 + SetFrame = 5,0 + SetX = 5,-72 + SetFrame = 6,1 + SetX = 6,-96 + SetFrame = 7,2 + SetX = 7,-72 + SetY = 7,-26 + SetFrame = 8,3 + SetX = 8,-16 + SetY = 8,-34 + SetFrame = 9,4 + SetX = 9,40 + SetY = 9,-26 + SetFrame = 10,6 + SetX = 10,104 + SetFrame = 11,0 + SetX = 11,112 + SetY = 11,14 Graphic = ghost1 Focus = Target - SetX = 2,512 - SetY = 2,102 - SetX = 3,456 - SetY = 3,118 - SetX = 4,416 - SetX = 5,344 - SetY = 5,102 - SetX = 6,328 - SetY = 6,118 - SetX = 7,272 - SetY = 7,94 - SetX = 8,312 - SetX = 9,368 - SetY = 9,78 - SetX = 10,432 - SetY = 10,62 - SetX = 11,464 + SetFrame = 2,2 + SetX = 2,128 + SetY = 2,6 + SetZ = 2,29 + SetFrame = 3,3 + SetX = 3,72 + SetY = 3,22 + SetFrame = 4,4 + SetX = 4,32 + SetFrame = 5,5 + SetX = 5,-40 + SetY = 5,6 + SetFrame = 6,6 + SetX = 6,-56 + SetY = 6,22 + SetFrame = 7,7 + SetX = 7,-112 + SetY = 7,-2 + SetFrame = 8,0 + SetX = 8,-72 + SetFrame = 9,1 + SetX = 9,-16 + SetY = 9,-18 + SetFrame = 10,2 + SetX = 10,48 + SetY = 10,-34 + SetFrame = 11,3 + SetX = 11,80 Graphic = ghost1 Focus = Target - SetX = 3,512 - SetY = 3,102 - SetX = 4,472 - SetY = 4,110 - SetX = 5,392 - SetY = 5,118 - SetX = 6,376 - SetY = 6,142 - SetX = 7,320 - SetY = 7,134 - SetX = 8,272 - SetY = 8,110 - SetX = 9,304 - SetY = 9,78 - SetX = 10,376 - SetY = 10,54 - SetX = 11,424 - SetY = 11,46 + SetX = 3,128 + SetY = 3,6 + SetZ = 3,30 + SetFrame = 4,1 + SetX = 4,88 + SetY = 4,14 + SetFrame = 5,2 + SetX = 5,8 + SetY = 5,22 + SetFrame = 6,3 + SetX = 6,-8 + SetY = 6,46 + SetFrame = 7,4 + SetX = 7,-64 + SetY = 7,38 + SetFrame = 8,6 + SetX = 8,-112 + SetY = 8,14 + SetFrame = 9,7 + SetX = 9,-80 + SetY = 9,-18 + SetFrame = 10,0 + SetX = 10,-8 + SetY = 10,-42 + SetFrame = 11,1 + SetX = 11,40 + SetY = 11,-50 Graphic = ghost1 Focus = Target - SetX = 4,512 - SetY = 4,78 - SetX = 5,448 - SetY = 5,102 - SetY = 6,118 - SetX = 7,400 - SetY = 7,126 - SetX = 8,312 - SetY = 8,134 - SetX = 9,272 - SetY = 9,110 - SetX = 10,312 - SetY = 10,62 - SetX = 11,360 - SetY = 11,46 + SetFrame = 4,3 + SetX = 4,128 + SetY = 4,-18 + SetZ = 4,31 + SetFrame = 5,4 + SetX = 5,64 + SetY = 5,6 + SetFrame = 6,5 + SetY = 6,22 + SetFrame = 7,6 + SetX = 7,16 + SetY = 7,30 + SetFrame = 8,7 + SetX = 8,-72 + SetY = 8,38 + SetFrame = 9,0 + SetX = 9,-112 + SetY = 9,14 + SetFrame = 10,1 + SetX = 10,-72 + SetY = 10,-34 + SetFrame = 11,2 + SetX = 11,-24 + SetY = 11,-50 Graphic = ghost1 Focus = Target - SetX = 6,504 - SetY = 6,102 - SetX = 7,464 - SetY = 7,126 - SetX = 8,376 - SetY = 8,166 - SetX = 9,312 - SetY = 9,134 - SetX = 10,264 - SetY = 10,94 - SetX = 11,312 - SetY = 11,54 + SetX = 6,120 + SetY = 6,6 + SetZ = 6,32 + SetFrame = 7,1 + SetX = 7,80 + SetY = 7,30 + SetFrame = 8,2 + SetX = 8,-8 + SetY = 8,70 + SetFrame = 9,3 + SetX = 9,-72 + SetY = 9,38 + SetFrame = 10,4 + SetX = 10,-120 + SetY = 10,-2 + SetFrame = 11,5 + SetX = 11,-72 + SetY = 11,-42 Graphic = ghost1 Focus = Target - SetX = 7,504 - SetY = 7,86 - SetX = 8,456 - SetY = 8,126 - SetX = 9,376 - SetY = 9,142 - SetX = 10,320 - SetY = 10,134 - SetX = 11,272 - SetY = 11,94 + SetFrame = 7,5 + SetX = 7,120 + SetY = 7,-10 + SetZ = 7,33 + SetFrame = 8,6 + SetX = 8,72 + SetY = 8,30 + SetFrame = 9,7 + SetX = 9,-8 + SetY = 9,46 + SetFrame = 10,0 + SetX = 10,-64 + SetY = 10,38 + SetFrame = 11,1 + SetX = 11,-112 + SetY = 11,-2 Graphic = ghost1 Focus = Target - SetX = 8,496 - SetY = 8,102 - SetX = 9,448 - SetY = 9,142 - SetX = 10,376 - SetX = 11,328 - SetY = 11,118 + SetFrame = 8,2 + SetX = 8,112 + SetY = 8,6 + SetZ = 8,34 + SetFrame = 9,3 + SetX = 9,64 + SetY = 9,46 + SetFrame = 10,4 + SetX = 10,-8 + SetFrame = 11,5 + SetX = 11,-56 + SetY = 11,22 Graphic = ghost1 Focus = Target - SetX = 10,432 - SetY = 10,126 - SetX = 11,392 - SetY = 11,134 + SetFrame = 10,7 + SetX = 10,48 + SetY = 10,30 + SetZ = 10,35 + SetFrame = 11,0 + SetX = 11,8 + SetY = 11,38 Play = 0,Fire1,80 diff --git a/PBS/Animations/Converted/Move/GUST.txt b/PBS/Animations/Converted/Move/GUST.txt index 31c760eed..a67458869 100644 --- a/PBS/Animations/Converted/Move/GUST.txt +++ b/PBS/Animations/Converted/Move/GUST.txt @@ -3,58 +3,60 @@ [Move,GUST] Name = GUST - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Gust Focus = Target - SetX = 0,384 - SetY = 0,101 - SetX = 1,400 - SetX = 2,416 - SetY = 2,99 - SetX = 3,432 - SetX = 4,440 - SetY = 4,91 + SetX = 0,0 + SetY = 0,5 + SetZ = 0,27 + SetX = 1,16 + SetX = 2,32 + SetY = 2,3 + SetX = 3,48 + SetX = 4,56 + SetY = 4,-5 SetFlip = 5,true - SetX = 5,445 - SetY = 5,87 - SetX = 6,440 - SetY = 6,79 - SetX = 7,428 - SetY = 7,71 - SetX = 8,420 - SetY = 8,67 - SetX = 9,400 - SetY = 9,65 + SetX = 5,61 + SetY = 5,-9 + SetX = 6,56 + SetY = 6,-17 + SetX = 7,44 + SetY = 7,-25 + SetX = 8,36 + SetY = 8,-29 + SetX = 9,16 + SetY = 9,-31 SetFlip = 10,false - SetX = 10,385 - SetX = 11,374 - SetY = 11,67 - SetX = 12,360 - SetY = 12,69 - SetX = 13,352 - SetY = 13,71 - SetX = 14,332 - SetY = 14,75 + SetX = 10,1 + SetX = 11,-10 + SetY = 11,-29 + SetX = 12,-24 + SetY = 12,-27 + SetX = 13,-32 + SetY = 13,-25 + SetX = 14,-52 + SetY = 14,-21 SetFlip = 15,true - SetX = 15,320 - SetY = 15,83 - SetX = 16,328 - SetY = 16,91 - SetX = 17,334 - SetY = 17,95 - SetX = 18,344 - SetY = 18,99 - SetX = 19,358 + SetX = 15,-64 + SetY = 15,-13 + SetX = 16,-56 + SetY = 16,-5 + SetX = 17,-50 + SetY = 17,-1 + SetX = 18,-40 + SetY = 18,3 + SetX = 19,-26 SetFlip = 20,false - SetX = 20,385 - SetY = 20,98 - SetX = 21,384 - SetY = 21,94 + SetX = 20,1 + SetY = 20,2 + SetFrame = 21,1 + SetX = 21,0 + SetY = 21,-2 SetOpacity = 21,150 SetOpacity = 22,255 SetOpacity = 25,150 @@ -65,60 +67,62 @@ Name = GUST [OppMove,GUST] Name = GUST - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Gust Focus = Target - SetX = 0,128 - SetY = 0,229 + SetX = 0,-256 + SetY = 0,133 + SetZ = 0,27 SetZoomX = 0,200 SetZoomY = 0,200 - SetX = 1,144 - SetX = 2,160 - SetY = 2,227 - SetX = 3,176 - SetX = 4,184 - SetY = 4,219 + SetX = 1,-240 + SetX = 2,-224 + SetY = 2,131 + SetX = 3,-208 + SetX = 4,-200 + SetY = 4,123 SetFlip = 5,true - SetX = 5,189 - SetY = 5,215 - SetX = 6,184 - SetY = 6,207 - SetX = 7,172 - SetY = 7,199 - SetX = 8,164 - SetY = 8,195 - SetX = 9,144 - SetY = 9,193 + SetX = 5,-195 + SetY = 5,119 + SetX = 6,-200 + SetY = 6,111 + SetX = 7,-212 + SetY = 7,103 + SetX = 8,-220 + SetY = 8,99 + SetX = 9,-240 + SetY = 9,97 SetFlip = 10,false - SetX = 10,129 - SetX = 11,118 - SetY = 11,195 - SetX = 12,104 - SetY = 12,197 - SetX = 13,96 - SetY = 13,199 - SetX = 14,76 - SetY = 14,203 + SetX = 10,-255 + SetX = 11,-266 + SetY = 11,99 + SetX = 12,-280 + SetY = 12,101 + SetX = 13,-288 + SetY = 13,103 + SetX = 14,-308 + SetY = 14,107 SetFlip = 15,true - SetX = 15,64 - SetY = 15,211 - SetX = 16,72 - SetY = 16,219 - SetX = 17,78 - SetY = 17,223 - SetX = 18,88 - SetY = 18,227 - SetX = 19,102 + SetX = 15,-320 + SetY = 15,115 + SetX = 16,-312 + SetY = 16,123 + SetX = 17,-306 + SetY = 17,127 + SetX = 18,-296 + SetY = 18,131 + SetX = 19,-282 SetFlip = 20,false - SetX = 20,129 - SetY = 20,226 - SetX = 21,128 - SetY = 21,222 + SetX = 20,-255 + SetY = 20,130 + SetFrame = 21,1 + SetX = 21,-256 + SetY = 21,126 SetOpacity = 21,150 SetOpacity = 22,255 SetOpacity = 25,150 diff --git a/PBS/Animations/Converted/Move/HAIL.txt b/PBS/Animations/Converted/Move/HAIL.txt index 01709140e..f9cf9ca5e 100644 --- a/PBS/Animations/Converted/Move/HAIL.txt +++ b/PBS/Animations/Converted/Move/HAIL.txt @@ -3,28 +3,36 @@ [Move,HAIL] Name = HAIL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,7 SetX = 0,37 SetY = 0,26 + SetZ = 0,27 + SetFrame = 1,8 SetX = 1,207 SetY = 1,56 + SetFrame = 2,7 SetX = 2,84 SetY = 2,43 + SetFrame = 3,8 SetX = 3,171 SetY = 3,56 + SetFrame = 4,9 SetX = 4,118 SetY = 4,97 SetX = 5,357 SetY = 5,200 + SetFrame = 6,8 SetX = 6,10 SetY = 6,9 + SetFrame = 7,7 SetX = 7,109 SetY = 7,105 SetX = 8,136 @@ -33,82 +41,87 @@ Name = HAIL SetY = 9,208 SetX = 10,136 SetY = 10,107 + SetVisible = 11,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,7 SetX = 0,164 SetY = 0,136 + SetZ = 0,28 SetX = 1,464 SetY = 1,117 - SetX = 3,441 - SetY = 3,241 - SetX = 5,225 - SetY = 5,69 - SetX = 8,180 - SetY = 8,199 - SetX = 9,163 - SetY = 9,99 - SetX = 11,176 - SetY = 11,119 + SetVisible = 2,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,8 SetX = 0,302 SetY = 0,79 + SetZ = 0,29 + SetFrame = 1,9 SetX = 1,201 SetY = 1,204 SetX = 2,228 SetY = 2,98 + SetFrame = 3,8 SetX = 3,278 SetY = 3,164 - SetX = 6,334 - SetY = 6,226 - SetX = 8,444 - SetY = 8,137 - SetX = 9,303 - SetY = 9,240 - SetX = 10,444 - SetY = 10,89 - SetX = 12,474 - SetY = 12,59 + SetVisible = 4,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,9 SetX = 0,440 SetY = 0,194 + SetZ = 0,30 SetX = 1,51 SetY = 1,161 + SetFrame = 2,8 SetX = 2,263 SetY = 2,253 + SetFrame = 3,7 SetX = 3,436 SetY = 3,52 + SetFrame = 4,9 SetX = 4,390 SetY = 4,210 - SetX = 6,465 - SetY = 6,116 - SetX = 7,454 - SetY = 7,82 - SetX = 8,276 - SetY = 8,136 - SetX = 9,465 - SetY = 9,160 - SetX = 10,285 - SetY = 10,105 - SetX = 11,419 - SetY = 11,272 - SetX = 12,230 - SetY = 12,142 + SetVisible = 5,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,9 SetX = 0,362 SetY = 0,252 + SetZ = 0,31 + SetVisible = 1,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,7 SetX = 2,78 SetY = 2,206 + SetZ = 2,31 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 3,9 + SetX = 3,441 + SetY = 3,241 + SetZ = 3,28 + SetVisible = 4,false + + Graphic = weather + Focus = Foreground + SetFrame = 4,9 SetX = 4,259 SetY = 4,87 + SetZ = 4,31 + SetFrame = 5,8 SetX = 5,181 SetY = 5,217 + SetFrame = 6,9 SetX = 6,298 SetY = 6,96 SetX = 7,191 @@ -119,43 +132,146 @@ Name = HAIL SetY = 9,93 SetX = 10,82 SetY = 10,240 + SetFrame = 11,7 SetX = 11,489 SetY = 11,96 + SetFrame = 12,9 SetX = 12,198 SetY = 12,28 - + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 4,8 SetX = 4,72 SetY = 4,220 + SetZ = 4,32 + SetVisible = 5,false + + Graphic = weather + Focus = Foreground + SetFrame = 5,9 + SetX = 5,225 + SetY = 5,69 + SetZ = 5,28 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 6,8 + SetX = 6,334 + SetY = 6,226 + SetZ = 6,29 + SetVisible = 7,false + + Graphic = weather + Focus = Foreground + SetFrame = 6,9 + SetX = 6,465 + SetY = 6,116 + SetZ = 6,30 + SetFrame = 7,8 + SetX = 7,454 + SetY = 7,82 + SetX = 8,276 + SetY = 8,136 + SetX = 9,465 + SetY = 9,160 + SetFrame = 10,9 + SetX = 10,285 + SetY = 10,105 + SetFrame = 11,7 + SetX = 11,419 + SetY = 11,272 + SetFrame = 12,8 + SetX = 12,230 + SetY = 12,142 + + Graphic = weather + Focus = Foreground + SetFrame = 6,9 SetX = 6,161 SetY = 6,265 + SetZ = 6,32 SetX = 7,296 SetY = 7,172 - SetX = 11,281 - SetY = 11,268 - SetX = 12,41 - SetY = 12,229 - + SetVisible = 8,false + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 8,8 + SetX = 8,180 + SetY = 8,199 + SetZ = 8,28 + SetX = 9,163 + SetY = 9,99 + SetVisible = 10,false + + Graphic = weather + Focus = Foreground + SetFrame = 8,9 + SetX = 8,444 + SetY = 8,137 + SetZ = 8,29 + SetX = 9,303 + SetY = 9,240 + SetFrame = 10,8 + SetX = 10,444 + SetY = 10,89 + SetVisible = 11,false + + Graphic = weather + Focus = Foreground + SetFrame = 9,9 SetX = 9,28 SetY = 9,57 + SetZ = 9,33 + SetFrame = 10,8 SetX = 10,294 SetY = 10,234 + SetFrame = 11,9 SetX = 11,111 SetY = 11,246 SetX = 12,167 SetY = 12,237 - + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 11,8 + SetX = 11,176 + SetY = 11,119 + SetZ = 11,28 + SetVisible = 12,false + + Graphic = weather + Focus = Foreground + SetFrame = 11,7 + SetX = 11,281 + SetY = 11,268 + SetZ = 11,32 + SetFrame = 12,9 + SetX = 12,41 + SetY = 12,229 + + Graphic = weather + Focus = Foreground + SetFrame = 11,9 SetX = 11,299 SetY = 11,47 - + SetZ = 11,34 + SetVisible = 12,false + Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 12,8 + SetX = 12,474 + SetY = 12,59 + SetZ = 12,29 + + Graphic = weather + Focus = Foreground + SetFrame = 12,9 SetX = 12,449 SetY = 12,237 + SetZ = 12,35 Play = 0,Natural Gift,100,147 diff --git a/PBS/Animations/Converted/Move/HARDEN.txt b/PBS/Animations/Converted/Move/HARDEN.txt index 271aa3545..a4da43206 100644 --- a/PBS/Animations/Converted/Move/HARDEN.txt +++ b/PBS/Animations/Converted/Move/HARDEN.txt @@ -3,16 +3,18 @@ [Move,HARDEN] Name = HARDEN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet Focus = User - SetX = 0,133 - SetY = 0,221 + SetFrame = 0,15 + SetX = 0,5 + SetY = 0,-3 + SetZ = 0,27 SetOpacity = 0,70 SetOpacity = 1,105 SetOpacity = 2,140 diff --git a/PBS/Animations/Converted/Move/HEADBUTT.txt b/PBS/Animations/Converted/Move/HEADBUTT.txt index 027a8253d..c6cc1a2d6 100644 --- a/PBS/Animations/Converted/Move/HEADBUTT.txt +++ b/PBS/Animations/Converted/Move/HEADBUTT.txt @@ -3,17 +3,20 @@ [Move,HEADBUTT] Name = HEADBUTT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 SetAngle = 2,90 + SetFrame = 3,2 SetAngle = 3,0 SetZoomX = 4,120 SetZoomY = 4,120 diff --git a/PBS/Animations/Converted/Move/HEATWAVE.txt b/PBS/Animations/Converted/Move/HEATWAVE.txt index b21c67a22..3d5798d32 100644 --- a/PBS/Animations/Converted/Move/HEATWAVE.txt +++ b/PBS/Animations/Converted/Move/HEATWAVE.txt @@ -3,26 +3,32 @@ [Move,HEATWAVE] Name = HEATWAVE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 011-Weapon06 Focus = UserAndTarget - SetX = 0,256 - SetY = 0,167 + SetFrame = 0,8 + SetX = 0,100 + SetY = 0,-89 + SetZ = 0,27 + SetFrame = 1,9 SetZoomX = 1,110 SetZoomY = 1,110 SetOpacity = 1,240 + SetFrame = 2,10 SetZoomX = 2,120 SetZoomY = 2,120 SetOpacity = 2,220 + SetFrame = 3,9 SetFlip = 3,true SetZoomX = 3,130 SetZoomY = 3,130 SetOpacity = 3,200 + SetFrame = 4,8 SetZoomX = 4,140 SetZoomY = 4,140 SetOpacity = 4,190 @@ -30,52 +36,68 @@ Name = HEATWAVE SetZoomX = 5,150 SetZoomY = 5,150 SetOpacity = 5,175 + SetFrame = 6,9 SetZoomX = 6,160 SetZoomY = 6,160 SetOpacity = 6,155 + SetFrame = 7,10 SetZoomX = 7,170 SetZoomY = 7,170 SetOpacity = 7,130 + SetFrame = 8,9 SetZoomX = 8,180 SetZoomY = 8,180 SetOpacity = 8,110 + SetFrame = 9,8 SetZoomX = 9,190 SetZoomY = 9,190 SetOpacity = 9,95 + SetFrame = 10,9 SetFlip = 10,true SetZoomX = 10,200 SetZoomY = 10,200 SetOpacity = 10,80 + SetFrame = 11,10 SetFlip = 11,false SetZoomX = 11,220 SetZoomY = 11,220 SetOpacity = 11,75 + SetFrame = 12,9 SetZoomX = 12,250 SetZoomY = 12,250 SetOpacity = 12,70 + SetFrame = 13,8 SetZoomX = 13,300 SetZoomY = 13,300 SetOpacity = 13,65 + SetFrame = 14,9 SetZoomX = 14,350 SetZoomY = 14,350 SetOpacity = 14,60 + SetFrame = 15,10 SetZoomX = 15,400 SetZoomY = 15,400 SetOpacity = 15,55 + SetFrame = 16,9 SetZoomX = 16,450 SetZoomY = 16,450 SetOpacity = 16,50 + SetFrame = 17,8 SetZoomX = 17,500 SetZoomY = 17,500 SetOpacity = 17,45 + SetFrame = 18,9 SetZoomX = 18,550 SetZoomY = 18,550 SetOpacity = 18,40 + SetFrame = 19,10 SetZoomX = 19,600 SetZoomY = 19,600 + SetFrame = 20,9 SetZoomX = 20,500 SetZoomY = 20,500 SetOpacity = 20,35 + SetFrame = 21,8 SetZoomX = 21,400 SetZoomY = 21,400 SetOpacity = 21,30 diff --git a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt index 01b79db9d..85da1a054 100644 --- a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt +++ b/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt @@ -3,32 +3,34 @@ [Move,HIGHJUMPKICK] Name = HIGHJUMPKICK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 0,504 - SetY = 0,142 + SetFrame = 0,7 + SetX = 0,120 + SetY = 0,46 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 - SetX = 1,488 - SetY = 1,110 - SetX = 2,456 - SetY = 2,78 - SetX = 3,392 - SetY = 3,54 - SetX = 4,328 - SetY = 4,62 - SetX = 5,288 - SetY = 5,86 - SetX = 6,248 - SetY = 6,118 - SetX = 7,240 - SetY = 7,134 + SetX = 1,104 + SetY = 1,14 + SetX = 2,72 + SetY = 2,-18 + SetX = 3,8 + SetY = 3,-42 + SetX = 4,-56 + SetY = 4,-34 + SetX = 5,-96 + SetY = 5,-10 + SetX = 6,-136 + SetY = 6,22 + SetX = 7,-144 + SetY = 7,38 SetOpacity = 7,100 Play = 0,throw,80 diff --git a/PBS/Animations/Converted/Move/HORNATTACK.txt b/PBS/Animations/Converted/Move/HORNATTACK.txt index b8f2fdbfb..8bbcab4ac 100644 --- a/PBS/Animations/Converted/Move/HORNATTACK.txt +++ b/PBS/Animations/Converted/Move/HORNATTACK.txt @@ -3,32 +3,38 @@ [Move,HORNATTACK] Name = HORNATTACK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Cosmo-01 Focus = UserAndTarget - SetX = 4,390 - SetY = 4,85 + SetFrame = 4,9 + SetX = 4,204 + SetY = 4,-217 + SetZ = 4,28 SetZoomX = 4,50 SetZoomY = 4,50 SetOpacity = 4,100 + SetVisible = 5,false Graphic = Cosmo-01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,179 - SetY = 1,192 - SetX = 2,236 - SetY = 2,154 - SetX = 3,294 - SetY = 3,135 - SetX = 4,358 - SetY = 4,110 + SetFrame = 0,7 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-50 + SetX = 2,84 + SetY = 2,-109 + SetX = 3,129 + SetY = 3,-139 + SetX = 4,179 + SetY = 4,-178 + SetFrame = 5,9 SetOpacity = 5,25 Play = 3,normaldamage,80 diff --git a/PBS/Animations/Converted/Move/HYDROPUMP.txt b/PBS/Animations/Converted/Move/HYDROPUMP.txt index 12a81ad3a..e69499614 100644 --- a/PBS/Animations/Converted/Move/HYDROPUMP.txt +++ b/PBS/Animations/Converted/Move/HYDROPUMP.txt @@ -3,37 +3,77 @@ [Move,HYDROPUMP] Name = HYDROPUMP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = icewater Focus = Target - SetX = 2,480 - SetY = 2,94 + SetFrame = 2,14 + SetX = 2,96 + SetY = 2,-2 + SetZ = 2,28 + SetFrame = 3,13 + SetFrame = 4,12 + SetFrame = 5,11 + SetFrame = 6,10 + SetFrame = 7,9 + SetFrame = 8,8 + SetFrame = 9,7 + SetFrame = 11,8 + SetFrame = 12,10 + SetFrame = 13,12 + SetVisible = 14,false Graphic = icewater Focus = Target - SetX = 5,296 - SetY = 5,94 + SetFrame = 5,14 + SetX = 5,-88 + SetY = 5,-2 + SetZ = 5,29 + SetFrame = 6,13 + SetFrame = 7,12 + SetFrame = 8,11 + SetFrame = 9,10 + SetFrame = 10,9 + SetFrame = 11,8 + SetFrame = 12,7 + SetFrame = 13,8 + SetVisible = 14,false Graphic = icewater Focus = Target - SetX = 0,384 - SetY = 0,118 - SetX = 3,392 - SetX = 4,400 - SetX = 5,376 - SetX = 6,384 + SetFrame = 0,14 + SetX = 0,0 + SetY = 0,22 + SetZ = 0,27 + SetFrame = 1,13 + SetFrame = 2,12 + SetFrame = 3,11 + SetX = 3,8 + SetFrame = 4,10 + SetX = 4,16 + SetFrame = 5,9 + SetX = 5,-8 + SetFrame = 6,8 + SetX = 6,0 + SetFrame = 7,7 SetFlip = 9,true - SetX = 9,376 + SetX = 9,-8 + SetFrame = 10,8 SetFlip = 10,false - SetX = 11,368 - SetX = 12,376 - SetX = 14,296 - SetY = 14,94 + SetFrame = 11,9 + SetX = 11,-16 + SetFrame = 12,11 + SetX = 12,-8 + SetFrame = 13,13 + SetFrame = 14,10 + SetX = 14,-88 + SetY = 14,-2 + SetFrame = 15,12 + SetFrame = 16,14 Play = 1,Water1,80 Play = 5,Water1,80 diff --git a/PBS/Animations/Converted/Move/HYPERFANG.txt b/PBS/Animations/Converted/Move/HYPERFANG.txt index f514afd11..b3543ccf9 100644 --- a/PBS/Animations/Converted/Move/HYPERFANG.txt +++ b/PBS/Animations/Converted/Move/HYPERFANG.txt @@ -3,20 +3,25 @@ [Move,HYPERFANG] Name = HYPERFANG - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal2 Focus = Target - SetX = 0,376 - SetY = 0,94 - SetX = 2,384 - SetY = 2,102 - SetX = 4,376 - SetY = 4,110 + SetX = 0,-8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetX = 2,0 + SetY = 2,6 + SetFrame = 3,3 + SetFrame = 4,4 + SetX = 4,-8 + SetY = 4,14 SetOpacity = 6,150 SetOpacity = 7,100 diff --git a/PBS/Animations/Converted/Move/ICEBALL.txt b/PBS/Animations/Converted/Move/ICEBALL.txt index 8cdd1e7dd..ff325770e 100644 --- a/PBS/Animations/Converted/Move/ICEBALL.txt +++ b/PBS/Animations/Converted/Move/ICEBALL.txt @@ -3,28 +3,35 @@ [Move,ICEBALL] Name = ICEBALL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = icewater Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,140 - SetY = 1,198 - SetX = 2,172 - SetY = 2,173 - SetX = 3,204 - SetY = 3,154 - SetX = 4,262 - SetY = 4,129 - SetX = 5,307 - SetY = 5,116 - SetX = 6,358 - SetY = 6,110 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,9 + SetY = 1,-40 + SetX = 2,34 + SetY = 2,-79 + SetX = 3,59 + SetY = 3,-109 + SetX = 4,104 + SetY = 4,-148 + SetX = 5,139 + SetY = 5,-168 + SetX = 6,179 + SetY = 6,-178 + SetFrame = 7,1 + SetFrame = 8,2 + SetFrame = 9,3 + SetFrame = 10,4 + SetFrame = 11,5 + SetFrame = 12,6 Play = 0,throw,80 Play = 7,Earth3,80 diff --git a/PBS/Animations/Converted/Move/ICEFANG.txt b/PBS/Animations/Converted/Move/ICEFANG.txt index 731baee18..d49d00389 100644 --- a/PBS/Animations/Converted/Move/ICEFANG.txt +++ b/PBS/Animations/Converted/Move/ICEFANG.txt @@ -3,98 +3,126 @@ [Move,ICEFANG] Name = ICEFANG - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = element fangs Focus = Target - SetX = 0,395 - SetY = 0,94 - SetX = 1,390 - SetY = 1,92 - SetX = 2,389 - SetY = 2,97 - SetX = 3,388 - SetY = 3,94 - SetX = 4,389 - SetY = 4,88 - SetX = 5,392 - SetY = 5,101 - SetX = 6,386 - SetY = 6,94 - SetX = 7,390 - SetY = 7,95 - SetX = 8,389 - SetY = 8,90 - SetX = 9,382 - SetY = 9,92 - SetX = 10,397 - SetY = 10,99 - SetX = 11,388 - SetY = 11,94 - SetX = 12,391 - SetY = 12,95 + SetX = 0,11 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,6 + SetY = 1,-4 + SetFrame = 2,2 + SetX = 2,5 + SetY = 2,1 + SetFrame = 3,3 + SetX = 3,4 + SetY = 3,-2 + SetFrame = 4,4 + SetX = 4,5 + SetY = 4,-8 + SetFrame = 5,5 + SetX = 5,8 + SetY = 5,5 + SetFrame = 6,6 + SetX = 6,2 + SetY = 6,-2 + SetFrame = 7,7 + SetX = 7,6 + SetY = 7,-1 + SetFrame = 8,8 + SetX = 8,5 + SetY = 8,-6 + SetFrame = 9,9 + SetX = 9,-2 + SetY = 9,-4 + SetFrame = 10,10 + SetX = 10,13 + SetY = 10,3 + SetFrame = 11,11 + SetX = 11,4 + SetY = 11,-2 + SetFrame = 12,12 + SetX = 12,7 + SetY = 12,-1 Graphic = element fangs Focus = Target - SetX = 7,330 - SetY = 7,111 + SetFrame = 7,16 + SetX = 7,-54 + SetY = 7,15 + SetZ = 7,28 SetOpacity = 7,208 - SetX = 8,328 - SetY = 8,47 + SetX = 8,-56 + SetY = 8,-49 SetOpacity = 8,164 - SetX = 9,353 - SetY = 9,43 + SetX = 9,-31 + SetY = 9,-53 SetOpacity = 9,154 - SetX = 10,354 - SetY = 10,146 + SetX = 10,-30 + SetY = 10,50 SetOpacity = 10,255 - SetX = 11,443 - SetY = 11,167 + SetX = 11,59 + SetY = 11,71 SetOpacity = 11,204 + SetVisible = 12,false Graphic = element fangs Focus = Target - SetX = 8,332 - SetY = 8,111 + SetFrame = 8,16 + SetX = 8,-52 + SetY = 8,15 + SetZ = 8,29 SetOpacity = 8,133 - SetX = 9,342 - SetY = 9,137 + SetX = 9,-42 + SetY = 9,41 SetOpacity = 9,159 - SetX = 10,462 - SetY = 10,48 + SetX = 10,78 + SetY = 10,-48 SetOpacity = 10,234 - SetX = 11,478 - SetY = 11,106 + SetX = 11,94 + SetY = 11,10 SetOpacity = 11,224 + SetVisible = 12,false Graphic = element fangs Focus = Target - SetX = 8,473 - SetY = 8,65 + SetFrame = 8,16 + SetX = 8,89 + SetY = 8,-31 + SetZ = 8,30 SetOpacity = 8,213 - SetX = 9,410 - SetY = 9,166 + SetX = 9,26 + SetY = 9,70 SetOpacity = 9,212 - SetX = 10,402 - SetY = 10,174 + SetX = 10,18 + SetY = 10,78 SetOpacity = 10,174 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 9,399 - SetY = 9,30 + SetFrame = 9,16 + SetX = 9,15 + SetY = 9,-66 + SetZ = 9,31 SetOpacity = 9,144 - SetX = 10,320 + SetX = 10,-64 SetOpacity = 10,224 + SetVisible = 11,false Graphic = element fangs Focus = Target - SetX = 10,450 - SetY = 10,90 + SetFrame = 10,16 + SetX = 10,66 + SetY = 10,-6 + SetZ = 10,32 SetOpacity = 10,154 + SetVisible = 11,false Play = 6,Super Fang,80 diff --git a/PBS/Animations/Converted/Move/ICEPUNCH.txt b/PBS/Animations/Converted/Move/ICEPUNCH.txt index 72c370442..3eaa15105 100644 --- a/PBS/Animations/Converted/Move/ICEPUNCH.txt +++ b/PBS/Animations/Converted/Move/ICEPUNCH.txt @@ -3,158 +3,198 @@ [Move,ICEPUNCH] Name = ICEPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 0,384 - SetY = 0,93 - SetY = 1,91 - SetX = 2,409 - SetY = 2,116 - SetX = 3,385 - SetY = 3,93 - SetX = 4,392 - SetY = 4,74 - SetX = 5,373 - SetY = 5,79 - SetX = 6,412 - SetY = 6,145 - SetX = 8,349 - SetY = 8,135 - SetX = 9,387 - SetY = 9,136 - SetX = 10,361 - SetY = 10,9 + SetFrame = 0,6 + SetX = 0,0 + SetY = 0,-3 + SetZ = 0,27 + SetFrame = 1,7 + SetY = 1,-5 + SetFrame = 2,8 + SetX = 2,25 + SetY = 2,20 + SetFrame = 3,6 + SetX = 3,1 + SetY = 3,-3 + SetFrame = 4,8 + SetX = 4,8 + SetY = 4,-22 + SetX = 5,-11 + SetY = 5,-17 + SetX = 6,28 + SetY = 6,49 + SetX = 8,-35 + SetY = 8,39 + SetX = 9,3 + SetY = 9,40 + SetX = 10,-23 + SetY = 10,-87 Graphic = punches Focus = Target - SetX = 1,387 - SetY = 1,96 - SetX = 2,385 - SetX = 3,431 - SetY = 3,135 - SetX = 4,327 - SetY = 4,154 - SetX = 5,420 - SetY = 5,54 - SetX = 6,325 - SetY = 6,81 - SetX = 8,409 - SetY = 8,148 - SetX = 9,313 - SetY = 9,175 - SetX = 10,400 - SetY = 10,42 + SetFrame = 1,6 + SetX = 1,3 + SetY = 1,0 + SetZ = 1,28 + SetX = 2,1 + SetFrame = 3,8 + SetX = 3,47 + SetY = 3,39 + SetX = 4,-57 + SetY = 4,58 + SetX = 5,36 + SetY = 5,-42 + SetX = 6,-59 + SetY = 6,-15 + SetX = 8,25 + SetY = 8,52 + SetX = 9,-71 + SetY = 9,79 + SetX = 10,16 + SetY = 10,-54 Graphic = punches Focus = Target - SetX = 2,348 - SetY = 2,107 - SetX = 3,334 - SetY = 3,124 - SetX = 4,449 - SetY = 4,159 - SetX = 5,438 - SetY = 5,120 - SetX = 6,382 - SetY = 6,5 - SetX = 8,380 - SetY = 8,77 - SetX = 9,330 - SetY = 9,54 - SetX = 10,468 - SetY = 10,177 + SetFrame = 2,8 + SetX = 2,-36 + SetY = 2,11 + SetZ = 2,29 + SetX = 3,-50 + SetY = 3,28 + SetX = 4,65 + SetY = 4,63 + SetX = 5,54 + SetY = 5,24 + SetX = 6,-2 + SetY = 6,-91 + SetX = 8,-4 + SetY = 8,-19 + SetX = 9,-54 + SetY = 9,-42 + SetX = 10,84 + SetY = 10,81 Graphic = punches Focus = Target - SetX = 3,383 - SetY = 3,63 - SetX = 4,393 - SetY = 4,164 - SetX = 5,347 - SetY = 5,135 - SetX = 6,317 - SetY = 6,48 - SetX = 8,338 - SetY = 8,90 - SetX = 9,435 - SetY = 9,47 + SetFrame = 3,8 + SetX = 3,-1 + SetY = 3,-33 + SetZ = 3,30 + SetX = 4,9 + SetY = 4,68 + SetX = 5,-37 + SetY = 5,39 + SetX = 6,-67 + SetY = 6,-48 + SetX = 8,-46 + SetY = 8,-6 + SetX = 9,51 + SetY = 9,-49 + SetVisible = 10,false Graphic = punches Focus = Target - SetX = 3,392 - SetY = 3,118 - SetX = 4,375 - SetY = 4,103 - SetX = 5,341 - SetY = 5,88 - SetX = 6,298 - SetY = 6,131 - SetX = 8,414 - SetY = 8,111 - SetX = 9,445 - SetY = 9,117 + SetFrame = 3,8 + SetX = 3,8 + SetY = 3,22 + SetZ = 3,31 + SetX = 4,-9 + SetY = 4,7 + SetX = 5,-43 + SetY = 5,-8 + SetX = 6,-86 + SetY = 6,35 + SetX = 8,30 + SetY = 8,15 + SetX = 9,61 + SetY = 9,21 + SetVisible = 10,false Graphic = punches Focus = Target - SetX = 4,408 - SetY = 4,127 - SetX = 5,391 - SetY = 5,140 - SetX = 6,432 - SetY = 6,110 - SetX = 8,393 - SetY = 8,28 - SetX = 9,384 - SetY = 9,95 + SetFrame = 4,8 + SetX = 4,24 + SetY = 4,31 + SetZ = 4,32 + SetX = 5,7 + SetY = 5,44 + SetX = 6,48 + SetY = 6,14 + SetX = 8,9 + SetY = 8,-68 + SetFrame = 9,6 + SetX = 9,0 + SetY = 9,-1 + SetVisible = 10,false Graphic = punches Focus = Target - SetX = 4,378 - SetY = 4,99 - SetX = 5,399 - SetY = 5,103 - SetX = 6,427 - SetY = 6,77 - SetX = 8,387 - SetY = 8,117 + SetFrame = 4,6 + SetX = 4,-6 + SetY = 4,3 + SetZ = 4,33 + SetFrame = 5,8 + SetX = 5,15 + SetY = 5,7 + SetX = 6,43 + SetY = 6,-19 + SetX = 8,3 + SetY = 8,21 + SetVisible = 9,false Graphic = punches Focus = Target - SetX = 5,332 - SetY = 5,33 - SetX = 6,380 - SetY = 6,109 - SetX = 8,459 - SetY = 8,80 + SetFrame = 5,8 + SetX = 5,-52 + SetY = 5,-63 + SetZ = 5,34 + SetX = 6,-4 + SetY = 6,13 + SetX = 8,75 + SetY = 8,-16 + SetVisible = 9,false Graphic = punches Focus = Target - SetX = 5,381 - SetY = 5,93 - SetX = 6,383 - SetY = 6,101 - SetX = 8,382 - SetY = 8,92 + SetFrame = 5,6 + SetX = 5,-3 + SetY = 5,-3 + SetZ = 5,35 + SetX = 6,-1 + SetY = 6,5 + SetX = 8,-2 + SetY = 8,-4 + SetVisible = 9,false Graphic = punches Focus = Target - SetX = 7,392 - SetY = 7,104 + SetFrame = 7,8 + SetX = 7,8 + SetY = 7,8 + SetZ = 7,36 + SetVisible = 8,false Graphic = punches Focus = Target - SetX = 7,363 - SetY = 7,85 + SetFrame = 7,8 + SetX = 7,-21 + SetY = 7,-11 + SetZ = 7,37 + SetVisible = 8,false Graphic = punches Focus = Target - SetX = 7,393 - SetY = 7,83 + SetFrame = 7,8 + SetX = 7,9 + SetY = 7,-13 + SetZ = 7,38 + SetVisible = 8,false Play = 0,Shell Smash,100,131 diff --git a/PBS/Animations/Converted/Move/ICICLESPEAR.txt b/PBS/Animations/Converted/Move/ICICLESPEAR.txt index a7a6ea5de..c0622e9ec 100644 --- a/PBS/Animations/Converted/Move/ICICLESPEAR.txt +++ b/PBS/Animations/Converted/Move/ICICLESPEAR.txt @@ -3,28 +3,32 @@ [Move,ICICLESPEAR] Name = ICICLESPEAR - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget + SetFrame = 0,5 SetFlip = 0,true - SetX = 0,192 - SetY = 0,192 + SetX = 0,50 + SetY = 0,-50 + SetZ = 0,27 SetAngle = 0,135 - SetX = 1,256 - SetY = 1,173 - SetX = 2,294 - SetY = 2,142 - SetX = 3,332 - SetY = 3,135 - SetX = 4,345 - SetY = 4,129 - SetX = 5,352 - SetY = 5,123 + SetX = 1,100 + SetY = 1,-79 + SetX = 2,129 + SetY = 2,-128 + SetX = 3,159 + SetY = 3,-139 + SetFrame = 4,6 + SetX = 4,169 + SetY = 4,-148 + SetFrame = 5,7 + SetX = 5,175 + SetY = 5,-157 Play = 0,throw,80 Play = 2,Crash,50,115 @@ -33,28 +37,32 @@ Name = ICICLESPEAR [Move,ICICLESPEAR,1] Name = Icicle Spear hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget + SetFrame = 0,5 SetFlip = 0,true - SetX = 0,192 - SetY = 0,192 + SetX = 0,50 + SetY = 0,-50 + SetZ = 0,27 SetAngle = 0,135 - SetX = 1,256 - SetY = 1,173 - SetX = 2,294 - SetY = 2,142 - SetX = 3,332 - SetY = 3,135 - SetX = 4,345 - SetY = 4,129 - SetX = 5,352 - SetY = 5,123 + SetX = 1,100 + SetY = 1,-79 + SetX = 2,129 + SetY = 2,-128 + SetX = 3,159 + SetY = 3,-139 + SetFrame = 4,6 + SetX = 4,169 + SetY = 4,-148 + SetFrame = 5,7 + SetX = 5,175 + SetY = 5,-157 Play = 0,throw,80 Play = 2,Crash,50,115 @@ -63,28 +71,32 @@ Name = Icicle Spear hit 2 [Move,ICICLESPEAR,2] Name = Icicle Spear hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget + SetFrame = 0,5 SetFlip = 0,true - SetX = 0,192 - SetY = 0,192 + SetX = 0,50 + SetY = 0,-50 + SetZ = 0,27 SetAngle = 0,135 - SetX = 1,256 - SetY = 1,173 - SetX = 2,294 - SetY = 2,142 - SetX = 3,332 - SetY = 3,135 - SetX = 4,345 - SetY = 4,129 - SetX = 5,352 - SetY = 5,123 + SetX = 1,100 + SetY = 1,-79 + SetX = 2,129 + SetY = 2,-128 + SetX = 3,159 + SetY = 3,-139 + SetFrame = 4,6 + SetX = 4,169 + SetY = 4,-148 + SetFrame = 5,7 + SetX = 5,175 + SetY = 5,-157 Play = 0,throw,80 Play = 2,Crash,50,115 @@ -93,28 +105,32 @@ Name = Icicle Spear hit 3 [Move,ICICLESPEAR,3] Name = Icicle Spear hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget + SetFrame = 0,5 SetFlip = 0,true - SetX = 0,192 - SetY = 0,192 + SetX = 0,50 + SetY = 0,-50 + SetZ = 0,27 SetAngle = 0,135 - SetX = 1,256 - SetY = 1,173 - SetX = 2,294 - SetY = 2,142 - SetX = 3,332 - SetY = 3,135 - SetX = 4,345 - SetY = 4,129 - SetX = 5,352 - SetY = 5,123 + SetX = 1,100 + SetY = 1,-79 + SetX = 2,129 + SetY = 2,-128 + SetX = 3,159 + SetY = 3,-139 + SetFrame = 4,6 + SetX = 4,169 + SetY = 4,-148 + SetFrame = 5,7 + SetX = 5,175 + SetY = 5,-157 Play = 0,throw,80 Play = 2,Crash,50,115 @@ -123,28 +139,32 @@ Name = Icicle Spear hit 4 [Move,ICICLESPEAR,4] Name = Icicle Spear hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget + SetFrame = 0,5 SetFlip = 0,true - SetX = 0,192 - SetY = 0,192 + SetX = 0,50 + SetY = 0,-50 + SetZ = 0,27 SetAngle = 0,135 - SetX = 1,256 - SetY = 1,173 - SetX = 2,294 - SetY = 2,142 - SetX = 3,332 - SetY = 3,135 - SetX = 4,345 - SetY = 4,129 - SetX = 5,352 - SetY = 5,123 + SetX = 1,100 + SetY = 1,-79 + SetX = 2,129 + SetY = 2,-128 + SetX = 3,159 + SetY = 3,-139 + SetFrame = 4,6 + SetX = 4,169 + SetY = 4,-148 + SetFrame = 5,7 + SetX = 5,175 + SetY = 5,-157 Play = 0,throw,80 Play = 2,Crash,50,115 diff --git a/PBS/Animations/Converted/Move/ICYWIND.txt b/PBS/Animations/Converted/Move/ICYWIND.txt index c89501de4..cbf63df2e 100644 --- a/PBS/Animations/Converted/Move/ICYWIND.txt +++ b/PBS/Animations/Converted/Move/ICYWIND.txt @@ -3,52 +3,69 @@ [Move,ICYWIND] Name = ICYWIND - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Ice1 Focus = UserAndTarget - SetX = 1,134 - SetY = 1,192 - SetX = 2,179 - SetY = 2,179 - SetX = 3,217 - SetY = 3,167 - SetX = 4,249 - SetY = 4,148 + SetX = 1,4 + SetY = 1,-50 + SetZ = 1,28 + SetFrame = 2,1 + SetX = 2,39 + SetY = 2,-70 + SetFrame = 3,2 + SetX = 3,69 + SetY = 3,-89 + SetFrame = 4,3 + SetX = 4,94 + SetY = 4,-118 SetFlip = 5,true - SetX = 5,300 - SetY = 5,135 + SetX = 5,134 + SetY = 5,-139 + SetVisible = 6,false Graphic = Ice1 Focus = UserAndTarget - SetX = 3,172 - SetY = 3,179 - SetX = 4,204 - SetY = 4,167 + SetX = 3,34 + SetY = 3,-70 + SetZ = 3,29 + SetFrame = 4,1 + SetX = 4,59 + SetY = 4,-89 SetZoomX = 4,75 SetZoomY = 4,75 + SetVisible = 5,false Graphic = Ice1 Focus = UserAndTarget - SetX = 0,140 - SetY = 0,192 - SetX = 1,166 - SetY = 1,186 - SetX = 2,236 - SetY = 2,154 - SetX = 3,275 - SetY = 3,135 - SetX = 4,313 - SetY = 4,123 + SetX = 0,9 + SetY = 0,-50 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,29 + SetY = 1,-59 + SetFrame = 2,2 + SetX = 2,84 + SetY = 2,-109 + SetFrame = 3,3 + SetX = 3,114 + SetY = 3,-139 + SetFrame = 4,4 + SetX = 4,144 + SetY = 4,-157 SetFlip = 5,true - SetX = 5,358 - SetY = 5,116 + SetX = 5,179 + SetY = 5,-168 SetFlip = 6,false - SetY = 6,110 + SetY = 6,-178 + SetFrame = 7,3 + SetFrame = 8,2 + SetFrame = 9,1 + SetFrame = 10,0 SetOpacity = 10,100 Play = 0,throw,80 diff --git a/PBS/Animations/Converted/Move/INFERNO.txt b/PBS/Animations/Converted/Move/INFERNO.txt index b04444834..6c3e71710 100644 --- a/PBS/Animations/Converted/Move/INFERNO.txt +++ b/PBS/Animations/Converted/Move/INFERNO.txt @@ -3,277 +3,345 @@ [Move,INFERNO] Name = INFERNO - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Flames Focus = Target - SetX = 0,368 - SetY = 0,128 - SetX = 1,361 - SetY = 1,122 - SetX = 2,360 - SetY = 2,121 - SetX = 3,353 - SetY = 3,129 - SetX = 4,347 - SetY = 4,134 - SetX = 5,359 - SetY = 5,129 - SetX = 6,364 - SetY = 6,128 - SetX = 7,354 - SetX = 8,360 - SetY = 8,130 - SetX = 9,376 - SetY = 9,129 + SetX = 0,-16 + SetY = 0,32 + SetZ = 0,27 + SetX = 1,-23 + SetY = 1,26 + SetX = 2,-24 + SetY = 2,25 + SetX = 3,-31 + SetY = 3,33 + SetX = 4,-37 + SetY = 4,38 + SetX = 5,-25 + SetY = 5,33 + SetX = 6,-20 + SetY = 6,32 + SetX = 7,-30 + SetX = 8,-24 + SetY = 8,34 + SetX = 9,-8 + SetY = 9,33 Graphic = Flames Focus = Target - SetX = 0,405 - SetY = 0,123 - SetX = 1,410 - SetY = 1,121 - SetX = 2,383 - SetY = 2,130 - SetX = 3,376 - SetY = 3,132 - SetX = 4,372 - SetY = 4,136 - SetX = 5,383 - SetY = 5,133 - SetY = 6,126 - SetX = 7,379 - SetY = 7,127 - SetX = 8,386 - SetY = 8,134 - SetX = 9,351 - SetY = 9,129 + SetX = 0,21 + SetY = 0,27 + SetZ = 0,28 + SetX = 1,26 + SetY = 1,25 + SetX = 2,-1 + SetY = 2,34 + SetX = 3,-8 + SetY = 3,36 + SetX = 4,-12 + SetY = 4,40 + SetX = 5,-1 + SetY = 5,37 + SetY = 6,30 + SetX = 7,-5 + SetY = 7,31 + SetX = 8,2 + SetY = 8,38 + SetX = 9,-33 + SetY = 9,33 Graphic = Flames Focus = Target - SetX = 1,387 - SetY = 1,119 - SetX = 2,407 - SetY = 2,123 - SetX = 3,369 - SetY = 3,114 - SetX = 4,393 - SetY = 4,135 - SetX = 5,378 - SetY = 5,115 - SetX = 6,381 - SetY = 6,110 - SetX = 7,368 - SetY = 7,107 - SetX = 8,377 - SetY = 8,117 - SetX = 9,371 - SetY = 9,108 + SetX = 1,3 + SetY = 1,23 + SetZ = 1,29 + SetX = 2,23 + SetY = 2,27 + SetX = 3,-15 + SetY = 3,18 + SetX = 4,9 + SetY = 4,39 + SetX = 5,-6 + SetY = 5,19 + SetX = 6,-3 + SetY = 6,14 + SetX = 7,-16 + SetY = 7,11 + SetX = 8,-7 + SetY = 8,21 + SetX = 9,-13 + SetY = 9,12 Graphic = Flames Focus = Target - SetX = 1,377 - SetY = 1,105 - SetX = 2,380 - SetY = 2,109 - SetX = 3,400 - SetY = 3,134 - SetX = 4,362 - SetY = 4,118 - SetX = 5,383 - SetY = 5,95 - SetX = 6,356 - SetY = 6,102 - SetX = 7,344 - SetY = 7,108 - SetX = 8,403 - SetY = 8,123 - SetX = 9,352 - SetY = 9,100 + SetX = 1,-7 + SetY = 1,9 + SetZ = 1,30 + SetX = 2,-4 + SetY = 2,13 + SetX = 3,16 + SetY = 3,38 + SetX = 4,-22 + SetY = 4,22 + SetX = 5,-1 + SetY = 5,-1 + SetX = 6,-28 + SetY = 6,6 + SetX = 7,-40 + SetY = 7,12 + SetX = 8,19 + SetY = 8,27 + SetX = 9,-32 + SetY = 9,4 Graphic = Flames Focus = Target - SetX = 1,402 - SetY = 1,107 - SetX = 2,397 - SetY = 2,110 - SetX = 3,389 - SetY = 3,117 - SetX = 4,387 - SetY = 4,121 - SetX = 5,402 - SetY = 5,107 - SetX = 6,408 - SetY = 6,118 - SetX = 7,355 - SetY = 7,92 - SetX = 8,406 - SetY = 8,101 - SetX = 9,349 - SetY = 9,78 + SetX = 1,18 + SetY = 1,11 + SetZ = 1,31 + SetX = 2,13 + SetY = 2,14 + SetX = 3,5 + SetY = 3,21 + SetX = 4,3 + SetY = 4,25 + SetX = 5,18 + SetY = 5,11 + SetX = 6,24 + SetY = 6,22 + SetX = 7,-29 + SetY = 7,-4 + SetX = 8,22 + SetY = 8,5 + SetX = 9,-35 + SetY = 9,-18 Graphic = Flames Focus = Target - SetX = 2,364 - SetY = 2,103 - SetX = 3,409 - SetY = 3,115 - SetX = 4,346 - SetY = 4,109 - SetX = 5,404 - SetY = 5,131 - SetX = 6,386 - SetY = 6,95 - SetX = 7,383 - SetY = 7,90 - SetX = 8,382 - SetY = 8,93 - SetX = 9,370 - SetY = 9,88 + SetX = 2,-20 + SetY = 2,7 + SetZ = 2,32 + SetX = 3,25 + SetY = 3,19 + SetX = 4,-38 + SetY = 4,13 + SetX = 5,20 + SetY = 5,35 + SetX = 6,2 + SetY = 6,-1 + SetX = 7,-1 + SetY = 7,-6 + SetX = 8,-2 + SetY = 8,-3 + SetX = 9,-14 + SetY = 9,-8 Graphic = Flames Focus = Target - SetX = 2,386 - SetY = 2,95 - SetX = 3,349 - SetY = 3,105 - SetX = 4,378 - SetY = 4,104 - SetX = 5,400 - SetY = 5,83 - SetX = 6,402 - SetY = 6,100 - SetX = 7,368 - SetY = 7,76 - SetX = 8,359 - SetY = 8,106 - SetX = 9,391 - SetY = 9,105 + SetX = 2,2 + SetY = 2,-1 + SetZ = 2,33 + SetX = 3,-35 + SetY = 3,9 + SetX = 4,-6 + SetY = 4,8 + SetX = 5,16 + SetY = 5,-13 + SetX = 6,18 + SetY = 6,4 + SetX = 7,-16 + SetY = 7,-20 + SetX = 8,-25 + SetY = 8,10 + SetX = 9,7 + SetY = 9,9 Graphic = Flames Focus = Target - SetX = 2,349 - SetY = 2,92 - SetX = 3,373 - SetY = 3,98 - SetX = 4,404 - SetY = 4,132 - SetX = 5,357 - SetY = 5,101 - SetX = 6,368 - SetY = 6,76 - SetX = 7,404 - SetY = 7,125 - SetX = 8,351 - SetY = 8,87 - SetX = 9,406 - SetY = 9,128 + SetX = 2,-35 + SetY = 2,-4 + SetZ = 2,34 + SetX = 3,-11 + SetY = 3,2 + SetX = 4,20 + SetY = 4,36 + SetX = 5,-27 + SetY = 5,5 + SetX = 6,-16 + SetY = 6,-20 + SetX = 7,20 + SetY = 7,29 + SetX = 8,-33 + SetY = 8,-9 + SetX = 9,22 + SetY = 9,32 Graphic = Flames Focus = Target - SetX = 3,393 - SetY = 3,99 - SetX = 4,402 - SetY = 4,113 - SetX = 5,343 - SetY = 5,117 - SetX = 7,395 - SetY = 7,108 - SetX = 8,373 - SetY = 8,75 - SetX = 9,417 - SetY = 9,107 + SetX = 3,9 + SetY = 3,3 + SetZ = 3,35 + SetX = 4,18 + SetY = 4,17 + SetX = 5,-41 + SetY = 5,21 + SetVisible = 6,false Graphic = Flames Focus = Target - SetX = 3,357 - SetY = 3,89 - SetX = 4,395 - SetY = 4,94 - SetX = 5,363 - SetY = 5,79 - SetX = 7,400 - SetY = 7,81 - SetX = 8,384 - SetY = 8,78 - SetX = 9,397 - SetY = 9,88 + SetX = 3,-27 + SetY = 3,-7 + SetZ = 3,36 + SetX = 4,11 + SetY = 4,-2 + SetX = 5,-21 + SetY = 5,-17 + SetVisible = 6,false Graphic = Flames Focus = Target - SetX = 3,412 - SetY = 3,95 - SetX = 4,357 - SetY = 4,93 - SetX = 7,387 - SetY = 7,71 - SetX = 8,414 - SetY = 8,83 + SetX = 3,28 + SetY = 3,-1 + SetZ = 3,37 + SetX = 4,-27 + SetY = 4,-3 + SetVisible = 5,false Graphic = Flames Focus = Target - SetX = 3,380 - SetY = 3,81 - SetX = 4,385 - SetY = 4,84 - SetX = 7,341 - SetY = 7,79 - SetX = 8,347 - SetY = 8,70 + SetX = 3,-4 + SetY = 3,-15 + SetZ = 3,38 + SetX = 4,1 + SetY = 4,-12 + SetVisible = 5,false Graphic = Flames Focus = Target - SetX = 4,367 - SetY = 4,74 - SetX = 7,355 - SetY = 7,61 - SetX = 8,368 - SetY = 8,59 + SetX = 4,-17 + SetY = 4,-22 + SetZ = 4,39 + SetVisible = 5,false Graphic = Flames Focus = Target - SetX = 4,343 - SetY = 4,79 - SetX = 7,383 - SetY = 7,52 - SetX = 8,392 - SetY = 8,57 + SetX = 4,-41 + SetY = 4,-17 + SetZ = 4,40 + SetVisible = 5,false Graphic = Flames Focus = Target - SetX = 4,402 - SetY = 4,76 - SetX = 7,419 - SetY = 7,77 - SetX = 8,416 - SetY = 8,62 + SetX = 4,18 + SetY = 4,-20 + SetZ = 4,41 + SetVisible = 5,false Graphic = Flames Focus = Target - SetX = 4,382 - SetY = 4,58 - SetX = 7,422 - SetY = 7,103 - SetX = 8,342 - SetY = 8,48 + SetX = 4,-2 + SetY = 4,-38 + SetZ = 4,42 + SetVisible = 5,false Graphic = Flames Focus = Target - SetX = 8,423 - SetY = 8,116 + SetX = 7,11 + SetY = 7,12 + SetZ = 7,35 + SetX = 8,-11 + SetY = 8,-21 + SetX = 9,33 + SetY = 9,11 Graphic = Flames Focus = Target - SetX = 8,414 - SetY = 8,138 + SetX = 7,16 + SetY = 7,-15 + SetZ = 7,36 + SetX = 8,0 + SetY = 8,-18 + SetX = 9,13 + SetY = 9,-8 Graphic = Flames Focus = Target - SetX = 8,396 - SetY = 8,33 + SetX = 7,3 + SetY = 7,-25 + SetZ = 7,37 + SetX = 8,30 + SetY = 8,-13 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 7,-43 + SetY = 7,-17 + SetZ = 7,38 + SetX = 8,-37 + SetY = 8,-26 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 7,-29 + SetY = 7,-35 + SetZ = 7,39 + SetX = 8,-16 + SetY = 8,-37 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 7,-1 + SetY = 7,-44 + SetZ = 7,40 + SetX = 8,8 + SetY = 8,-39 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 7,35 + SetY = 7,-19 + SetZ = 7,41 + SetX = 8,32 + SetY = 8,-34 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 7,38 + SetY = 7,7 + SetZ = 7,42 + SetX = 8,-42 + SetY = 8,-48 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 8,39 + SetY = 8,20 + SetZ = 8,43 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 8,30 + SetY = 8,42 + SetZ = 8,44 + SetVisible = 9,false + + Graphic = Flames + Focus = Target + SetX = 8,12 + SetY = 8,-63 + SetZ = 8,45 + SetVisible = 9,false Play = 0,Wring Out,100,150 diff --git a/PBS/Animations/Converted/Move/IRONHEAD.txt b/PBS/Animations/Converted/Move/IRONHEAD.txt index b6099636f..16a2dfb7f 100644 --- a/PBS/Animations/Converted/Move/IRONHEAD.txt +++ b/PBS/Animations/Converted/Move/IRONHEAD.txt @@ -3,55 +3,75 @@ [Move,IRONHEAD] Name = IRONHEAD - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Iron Head Focus = Target - SetX = 1,384 - SetY = 1,97 + SetFrame = 1,2 + SetX = 1,0 + SetY = 1,1 + SetZ = 1,27 + SetFrame = 2,1 + SetFrame = 5,3 + SetFrame = 6,0 SetOpacity = 7,128 Graphic = Iron Head Focus = Target - SetX = 2,331 - SetY = 2,114 - SetX = 3,278 - SetY = 3,128 - SetX = 4,284 - SetY = 4,178 + SetFrame = 2,5 + SetX = 2,-53 + SetY = 2,18 + SetZ = 2,28 + SetX = 3,-106 + SetY = 3,32 + SetX = 4,-100 + SetY = 4,82 SetOpacity = 4,128 + SetVisible = 5,false Graphic = Iron Head Focus = Target - SetX = 2,437 - SetY = 2,118 - SetX = 3,485 - SetY = 3,132 - SetX = 4,507 - SetY = 4,182 + SetFrame = 2,6 + SetX = 2,53 + SetY = 2,22 + SetZ = 2,29 + SetX = 3,101 + SetY = 3,36 + SetX = 4,123 + SetY = 4,86 SetOpacity = 4,128 + SetVisible = 5,false Graphic = Iron Head Focus = Target - SetX = 3,279 - SetY = 3,82 - SetX = 4,266 - SetY = 4,27 + SetFrame = 3,7 + SetX = 3,-105 + SetY = 3,-14 + SetZ = 3,30 + SetX = 4,-118 + SetY = 4,-69 + SetVisible = 5,false Graphic = Iron Head Focus = Target - SetX = 3,461 - SetY = 3,69 - SetX = 4,513 - SetY = 4,54 + SetFrame = 3,8 + SetX = 3,77 + SetY = 3,-27 + SetZ = 3,31 + SetX = 4,129 + SetY = 4,-42 + SetVisible = 5,false Graphic = Iron Head Focus = Target - SetX = 3,275 - SetY = 3,33 + SetFrame = 3,8 + SetX = 3,-109 + SetY = 3,-63 + SetZ = 3,32 + SetVisible = 4,false Play = 0,Damage1 diff --git a/PBS/Animations/Converted/Move/JUMPKICK.txt b/PBS/Animations/Converted/Move/JUMPKICK.txt index d0a65c63e..29bad7914 100644 --- a/PBS/Animations/Converted/Move/JUMPKICK.txt +++ b/PBS/Animations/Converted/Move/JUMPKICK.txt @@ -3,32 +3,34 @@ [Move,JUMPKICK] Name = JUMPKICK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 0,504 - SetY = 0,142 + SetFrame = 0,7 + SetX = 0,120 + SetY = 0,46 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 - SetX = 1,488 - SetY = 1,110 - SetX = 2,456 - SetY = 2,78 - SetX = 3,392 - SetY = 3,54 - SetX = 4,328 - SetY = 4,62 - SetX = 5,288 - SetY = 5,86 - SetX = 6,248 - SetY = 6,118 - SetX = 7,240 - SetY = 7,134 + SetX = 1,104 + SetY = 1,14 + SetX = 2,72 + SetY = 2,-18 + SetX = 3,8 + SetY = 3,-42 + SetX = 4,-56 + SetY = 4,-34 + SetX = 5,-96 + SetY = 5,-10 + SetX = 6,-136 + SetY = 6,22 + SetX = 7,-144 + SetY = 7,38 SetOpacity = 7,100 Play = 3,Blow3,80 diff --git a/PBS/Animations/Converted/Move/KARATECHOP.txt b/PBS/Animations/Converted/Move/KARATECHOP.txt index 5ac41111b..92704fb78 100644 --- a/PBS/Animations/Converted/Move/KARATECHOP.txt +++ b/PBS/Animations/Converted/Move/KARATECHOP.txt @@ -3,32 +3,36 @@ [Move,KARATECHOP] Name = KARATECHOP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 0,232 - SetY = 0,30 - SetX = 1,272 - SetY = 1,38 + SetFrame = 0,13 + SetX = 0,-152 + SetY = 0,-66 + SetZ = 0,27 + SetX = 1,-112 + SetY = 1,-58 SetAngle = 1,350 - SetX = 2,312 + SetX = 2,-72 SetAngle = 2,340 - SetX = 3,336 - SetY = 3,54 + SetX = 3,-48 + SetY = 3,-42 SetAngle = 3,330 - SetX = 4,360 - SetY = 4,70 + SetX = 4,-24 + SetY = 4,-26 SetAngle = 4,320 - SetX = 5,376 - SetY = 5,86 - SetX = 6,384 - SetY = 6,94 + SetX = 5,-8 + SetY = 5,-10 + SetFrame = 6,8 + SetX = 6,0 + SetY = 6,-2 SetAngle = 6,0 + SetFrame = 7,9 Play = 0,Wind1,80 Play = 7,Blow3,80 diff --git a/PBS/Animations/Converted/Move/KINESIS.txt b/PBS/Animations/Converted/Move/KINESIS.txt index 5a693e1fc..fd2efecab 100644 --- a/PBS/Animations/Converted/Move/KINESIS.txt +++ b/PBS/Animations/Converted/Move/KINESIS.txt @@ -3,27 +3,33 @@ [Move,KINESIS] Name = KINESIS - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 0,383 - SetY = 0,94 - SetX = 1,385 - SetX = 2,384 - SetY = 2,95 - SetY = 3,90 - SetX = 4,386 - SetY = 4,93 - SetY = 5,94 - SetY = 6,93 - SetX = 7,384 - SetY = 7,94 - SetX = 8,385 - SetY = 8,93 + SetFrame = 0,2 + SetX = 0,-1 + SetY = 0,-2 + SetZ = 0,27 + SetX = 1,1 + SetX = 2,0 + SetY = 2,-1 + SetFrame = 3,4 + SetY = 3,-6 + SetFrame = 4,3 + SetX = 4,2 + SetY = 4,-3 + SetFrame = 5,4 + SetY = 5,-2 + SetY = 6,-3 + SetFrame = 7,5 + SetX = 7,0 + SetY = 7,-2 + SetX = 8,1 + SetY = 8,-3 Play = 0,Trump Card,86 diff --git a/PBS/Animations/Converted/Move/LEAFBLADE.txt b/PBS/Animations/Converted/Move/LEAFBLADE.txt index 653de87e9..3b557d97d 100644 --- a/PBS/Animations/Converted/Move/LEAFBLADE.txt +++ b/PBS/Animations/Converted/Move/LEAFBLADE.txt @@ -3,16 +3,40 @@ [Move,LEAFBLADE] Name = LEAFBLADE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Sword5 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetFrame = 14,14 + SetFrame = 15,15 + SetFrame = 16,16 + SetFrame = 17,17 + SetFrame = 18,18 + SetFrame = 19,19 + SetFrame = 20,20 + SetFrame = 21,21 + SetFrame = 22,22 + SetFrame = 23,23 Play = 0,Sword1,80 Play = 3,Slash3,80 diff --git a/PBS/Animations/Converted/Move/LEECHLIFE.txt b/PBS/Animations/Converted/Move/LEECHLIFE.txt index d7e84f41b..666ac4c05 100644 --- a/PBS/Animations/Converted/Move/LEECHLIFE.txt +++ b/PBS/Animations/Converted/Move/LEECHLIFE.txt @@ -3,112 +3,158 @@ [Move,LEECHLIFE] Name = LEECHLIFE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget - SetX = 0,166 - SetY = 0,224 - SetX = 1,224 - SetY = 1,179 - SetX = 2,294 - SetY = 2,142 - SetX = 3,358 - SetY = 3,110 + SetFrame = 0,14 + SetX = 0,29 + SetY = 0,0 + SetZ = 0,27 + SetX = 1,75 + SetY = 1,-70 + SetX = 2,129 + SetY = 2,-128 + SetX = 3,179 + SetY = 3,-178 SetZoomX = 4,110 SetZoomY = 4,110 SetOpacity = 4,100 - SetX = 5,281 - SetY = 5,104 + SetFrame = 5,9 + SetX = 5,119 + SetY = 5,-187 SetZoomX = 5,100 SetZoomY = 5,100 SetOpacity = 5,255 - SetX = 6,211 - SetY = 6,123 - SetX = 7,140 - SetY = 7,161 - SetX = 8,121 - SetY = 8,192 - SetX = 9,179 - SetY = 9,224 - SetX = 10,102 - SetY = 10,217 - SetX = 11,147 - SetY = 11,230 + SetFrame = 6,10 + SetX = 6,64 + SetY = 6,-157 + SetFrame = 7,11 + SetX = 7,9 + SetY = 7,-98 + SetFrame = 8,12 + SetX = 8,-5 + SetY = 8,-50 + SetX = 9,39 + SetY = 9,0 + SetFrame = 10,13 + SetX = 10,-20 + SetY = 10,-10 + SetFrame = 11,12 + SetX = 11,14 + SetY = 11,9 Graphic = rockice Focus = UserAndTarget - SetX = 4,339 - SetY = 4,98 - SetX = 5,332 - SetY = 5,192 - SetX = 6,281 - SetY = 6,230 - SetX = 7,179 - SetX = 8,153 - SetY = 8,198 - SetX = 9,108 - SetY = 9,154 - SetX = 10,243 - SetY = 10,230 - SetX = 11,96 - SetY = 11,211 + SetFrame = 4,8 + SetX = 4,164 + SetY = 4,-196 + SetZ = 4,28 + SetFrame = 5,10 + SetX = 5,159 + SetY = 5,-50 + SetFrame = 6,12 + SetX = 6,119 + SetY = 6,9 + SetFrame = 7,13 + SetX = 7,39 + SetFrame = 8,11 + SetX = 8,19 + SetY = 8,-40 + SetFrame = 9,12 + SetX = 9,-15 + SetY = 9,-109 + SetFrame = 10,11 + SetX = 10,89 + SetY = 10,9 + SetFrame = 11,12 + SetX = 11,-25 + SetY = 11,-20 Graphic = rockice Focus = UserAndTarget - SetX = 4,384 - SetY = 4,154 - SetX = 5,345 - SetY = 5,91 - SetX = 6,281 - SetY = 6,123 - SetX = 7,230 - SetY = 7,154 - SetX = 8,268 - SetY = 8,192 - SetX = 9,320 - SetY = 9,205 - SetX = 10,134 - SetY = 10,167 + SetFrame = 4,9 + SetX = 4,200 + SetY = 4,-109 + SetZ = 4,29 + SetFrame = 5,8 + SetX = 5,169 + SetY = 5,-207 + SetFrame = 6,9 + SetX = 6,119 + SetY = 6,-157 + SetFrame = 7,10 + SetX = 7,79 + SetY = 7,-109 + SetFrame = 8,11 + SetX = 8,109 + SetY = 8,-50 + SetFrame = 9,10 + SetX = 9,150 + SetY = 9,-29 + SetFrame = 10,11 + SetX = 10,4 + SetY = 10,-89 + SetVisible = 11,false Graphic = rockice Focus = UserAndTarget - SetX = 6,384 - SetY = 6,116 - SetX = 7,326 - SetY = 7,154 - SetX = 8,166 - SetY = 8,98 - SetX = 9,217 - SetY = 9,129 + SetFrame = 6,9 + SetX = 6,200 + SetY = 6,-168 + SetZ = 6,30 + SetFrame = 7,10 + SetX = 7,154 + SetY = 7,-109 + SetFrame = 8,11 + SetX = 8,29 + SetY = 8,-196 + SetFrame = 9,10 + SetX = 9,69 + SetY = 9,-148 + SetVisible = 10,false Graphic = rockice Focus = UserAndTarget - SetX = 6,339 - SetY = 6,79 - SetX = 7,256 - SetX = 8,384 - SetY = 8,148 + SetFrame = 6,8 + SetX = 6,164 + SetY = 6,-226 + SetZ = 6,31 + SetFrame = 7,9 + SetX = 7,100 + SetX = 8,200 + SetY = 8,-118 + SetVisible = 9,false Graphic = rockice Focus = UserAndTarget - SetX = 7,377 - SetY = 7,85 - SetX = 8,268 + SetFrame = 7,8 + SetX = 7,194 + SetY = 7,-217 + SetZ = 7,32 + SetFrame = 8,9 + SetX = 8,109 + SetVisible = 9,false Graphic = rockice Focus = UserAndTarget - SetX = 7,320 - SetY = 7,79 + SetFrame = 7,8 + SetX = 7,150 + SetY = 7,-226 + SetZ = 7,33 + SetVisible = 8,false Graphic = rockice Focus = UserAndTarget - SetX = 7,396 - SetY = 7,129 + SetFrame = 7,8 + SetX = 7,209 + SetY = 7,-148 + SetZ = 7,34 + SetVisible = 8,false Play = 0,throw,80 Play = 2,Twine,80 diff --git a/PBS/Animations/Converted/Move/LEECHSEED.txt b/PBS/Animations/Converted/Move/LEECHSEED.txt index 817fcbfb5..742974432 100644 --- a/PBS/Animations/Converted/Move/LEECHSEED.txt +++ b/PBS/Animations/Converted/Move/LEECHSEED.txt @@ -3,126 +3,204 @@ [Move,LEECHSEED] Name = LEECHSEED - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 4,147 - SetY = 4,205 - SetX = 5,179 - SetY = 5,148 - SetX = 6,217 - SetY = 6,116 - SetX = 8,352 - SetY = 8,91 - SetX = 10,422 - SetY = 10,129 + SetX = 4,14 + SetY = 4,-29 + SetZ = 4,29 + SetX = 5,39 + SetY = 5,-118 + SetX = 6,69 + SetY = 6,-168 + SetVisible = 7,false + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 8,175 + SetY = 8,-207 + SetZ = 8,29 + SetVisible = 9,false + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 10,229 + SetY = 10,-148 + SetZ = 10,29 + SetVisible = 11,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 12,3 + SetX = 12,229 + SetY = 12,-148 + SetZ = 12,29 + SetFrame = 14,1 + SetFrame = 16,2 + SetFrame = 18,1 + SetFrame = 20,2 + SetVisible = 24,false Graphic = leech-seed Focus = UserAndTarget - SetX = 0,147 - SetY = 0,205 - SetX = 1,198 - SetY = 1,142 - SetX = 2,249 - SetY = 2,104 - SetX = 3,300 - SetY = 3,85 - SetX = 4,339 - SetX = 5,371 - SetY = 5,104 - SetX = 6,384 - SetY = 6,129 - SetX = 7,281 - SetY = 7,91 - SetX = 8,384 - SetY = 8,129 + SetX = 0,14 + SetY = 0,-29 + SetZ = 0,27 + SetX = 1,54 + SetY = 1,-128 + SetX = 2,94 + SetY = 2,-187 + SetX = 3,134 + SetY = 3,-217 + SetX = 4,164 + SetX = 5,189 + SetY = 5,-187 + SetX = 6,200 + SetY = 6,-148 + SetX = 7,119 + SetY = 7,-207 + SetFrame = 8,3 + SetX = 8,200 + SetY = 8,-148 + SetFrame = 10,1 + SetFrame = 12,2 + SetFrame = 14,1 + SetFrame = 16,2 + SetFrame = 20,1 + SetVisible = 24,false Graphic = leech-seed Focus = UserAndTarget - SetX = 2,147 - SetY = 2,205 - SetX = 3,185 - SetY = 3,135 - SetX = 4,230 - SetY = 4,85 - SetX = 5,268 - SetY = 5,72 - SetX = 6,300 - SetY = 6,79 - SetX = 7,332 - SetY = 7,110 - SetX = 8,345 - SetY = 8,129 - SetX = 9,390 - SetY = 9,104 - SetX = 10,345 - SetY = 10,129 + SetX = 2,14 + SetY = 2,-29 + SetZ = 2,28 + SetX = 3,44 + SetY = 3,-139 + SetX = 4,79 + SetY = 4,-217 + SetX = 5,109 + SetY = 5,-237 + SetX = 6,134 + SetY = 6,-226 + SetX = 7,159 + SetY = 7,-178 + SetX = 8,169 + SetY = 8,-148 + SetX = 9,204 + SetY = 9,-187 + SetFrame = 10,3 + SetX = 10,169 + SetY = 10,-148 + SetFrame = 12,1 + SetFrame = 14,2 + SetFrame = 16,1 + SetFrame = 18,2 + SetFrame = 20,1 + SetVisible = 24,false #------------------------------- [OppMove,LEECHSEED] Name = LEECHSEED - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 2,384 - SetY = 2,98 - SetX = 3,352 - SetY = 3,72 - SetX = 4,307 - SetY = 4,60 - SetX = 5,256 - SetY = 5,72 - SetX = 6,185 - SetY = 6,110 - SetX = 7,121 - SetY = 7,173 - SetX = 8,128 - SetY = 8,249 + SetX = 2,200 + SetY = 2,-196 + SetZ = 2,28 + SetX = 3,175 + SetY = 3,-237 + SetX = 4,139 + SetY = 4,-256 + SetX = 5,100 + SetY = 5,-237 + SetX = 6,44 + SetY = 6,-178 + SetX = 7,-5 + SetY = 7,-79 + SetFrame = 8,3 + SetX = 8,0 + SetY = 8,39 + SetFrame = 10,1 + SetFrame = 12,2 + SetFrame = 14,1 + SetFrame = 16,2 + SetVisible = 24,false Graphic = leech-seed Focus = UserAndTarget - SetX = 4,384 - SetY = 4,98 - SetX = 5,352 - SetY = 5,79 - SetX = 6,307 - SetY = 6,72 - SetX = 8,211 - SetY = 8,142 - SetX = 10,160 - SetY = 10,249 + SetX = 4,200 + SetY = 4,-196 + SetZ = 4,29 + SetX = 5,175 + SetY = 5,-226 + SetX = 6,139 + SetY = 6,-237 + SetVisible = 7,false + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 8,64 + SetY = 8,-128 + SetZ = 8,29 + SetVisible = 9,false + + Graphic = leech-seed + Focus = UserAndTarget + SetX = 10,25 + SetY = 10,39 + SetZ = 10,29 + SetVisible = 11,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 12,3 + SetX = 12,25 + SetY = 12,39 + SetZ = 12,29 + SetFrame = 14,1 + SetFrame = 16,2 + SetFrame = 18,1 + SetFrame = 20,2 + SetVisible = 24,false Graphic = leech-seed Focus = UserAndTarget - SetX = 0,384 - SetY = 0,98 - SetX = 1,352 - SetY = 1,79 - SetX = 2,313 - SetY = 2,72 - SetX = 3,256 - SetY = 3,85 - SetX = 4,211 - SetY = 4,123 - SetX = 5,160 - SetY = 5,186 - SetX = 6,128 - SetY = 6,249 - SetX = 7,249 - SetY = 7,91 - SetX = 8,89 - SetY = 8,249 - SetX = 9,179 - SetY = 9,198 - SetX = 10,96 - SetY = 10,249 + SetX = 0,200 + SetY = 0,-196 + SetZ = 0,27 + SetX = 1,175 + SetY = 1,-226 + SetX = 2,144 + SetY = 2,-237 + SetX = 3,100 + SetY = 3,-217 + SetX = 4,64 + SetY = 4,-157 + SetX = 5,25 + SetY = 5,-59 + SetX = 6,0 + SetY = 6,39 + SetX = 7,94 + SetY = 7,-207 + SetX = 8,-30 + SetY = 8,39 + SetX = 9,39 + SetY = 9,-40 + SetFrame = 10,3 + SetX = 10,-25 + SetY = 10,39 + SetFrame = 12,1 + SetFrame = 14,2 + SetFrame = 16,1 + SetFrame = 18,2 + SetVisible = 24,false diff --git a/PBS/Animations/Converted/Move/LEER.txt b/PBS/Animations/Converted/Move/LEER.txt index f2d93dc8c..4b179069f 100644 --- a/PBS/Animations/Converted/Move/LEER.txt +++ b/PBS/Animations/Converted/Move/LEER.txt @@ -3,45 +3,55 @@ [Move,LEER] Name = LEER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leer Focus = UserAndTarget - SetX = 0,147 - SetY = 0,205 - SetY = 1,203 - SetX = 2,148 - SetY = 2,201 - SetX = 3,144 - SetY = 3,203 - SetX = 4,153 - SetY = 4,201 + SetX = 0,14 + SetY = 0,-29 + SetZ = 0,27 + SetFrame = 1,1 + SetY = 1,-32 + SetFrame = 2,2 + SetX = 2,15 + SetY = 2,-35 + SetFrame = 3,3 + SetX = 3,12 + SetY = 3,-32 + SetFrame = 4,4 + SetX = 4,19 + SetY = 4,-35 Play = 0,Saint9 #------------------------------- [OppMove,LEER] Name = LEER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = leer Focus = UserAndTarget - SetX = 0,350 - SetY = 0,79 - SetY = 1,77 - SetX = 2,352 - SetY = 2,75 - SetX = 3,347 - SetY = 3,77 - SetX = 4,356 - SetY = 4,75 + SetX = 0,173 + SetY = 0,-226 + SetZ = 0,27 + SetFrame = 1,1 + SetY = 1,-229 + SetFrame = 2,2 + SetX = 2,175 + SetY = 2,-232 + SetFrame = 3,3 + SetX = 3,171 + SetY = 3,-229 + SetFrame = 4,4 + SetX = 4,178 + SetY = 4,-232 Play = 0,Saint9 diff --git a/PBS/Animations/Converted/Move/LICK.txt b/PBS/Animations/Converted/Move/LICK.txt index 3b4abbf58..c4b659479 100644 --- a/PBS/Animations/Converted/Move/LICK.txt +++ b/PBS/Animations/Converted/Move/LICK.txt @@ -3,19 +3,23 @@ [Move,LICK] Name = LICK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ghost1 Focus = Target - SetX = 0,400 - SetY = 0,142 - SetY = 1,118 - SetY = 2,94 - SetY = 3,70 - SetY = 4,54 - SetY = 5,46 + SetFrame = 0,11 + SetX = 0,16 + SetY = 0,46 + SetZ = 0,27 + SetY = 1,22 + SetFrame = 2,12 + SetY = 2,-2 + SetY = 3,-26 + SetFrame = 4,13 + SetY = 4,-42 + SetY = 5,-50 SetOpacity = 6,100 diff --git a/PBS/Animations/Converted/Move/LIGHTSCREEN.txt b/PBS/Animations/Converted/Move/LIGHTSCREEN.txt index 3b4b76603..64e296ef1 100644 --- a/PBS/Animations/Converted/Move/LIGHTSCREEN.txt +++ b/PBS/Animations/Converted/Move/LIGHTSCREEN.txt @@ -3,76 +3,94 @@ [Move,LIGHTSCREEN] Name = LIGHTSCREEN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet Focus = Target - SetX = 1,442 - SetY = 1,57 - SetX = 2,446 - SetY = 2,55 - SetX = 3,434 - SetY = 3,63 - SetY = 4,62 - SetX = 5,368 - SetY = 5,111 - SetX = 6,428 - SetY = 6,61 - SetX = 7,349 - SetY = 7,131 - SetX = 8,347 - SetY = 8,145 - SetX = 9,391 - SetY = 9,46 - SetX = 10,430 - SetY = 10,57 + SetFrame = 1,10 + SetX = 1,58 + SetY = 1,-39 + SetZ = 1,28 + SetFrame = 2,11 + SetX = 2,62 + SetY = 2,-41 + SetFrame = 3,6 + SetX = 3,50 + SetY = 3,-33 + SetY = 4,-34 + SetFrame = 5,11 + SetX = 5,-16 + SetY = 5,15 + SetFrame = 6,6 + SetX = 6,44 + SetY = 6,-35 + SetX = 7,-35 + SetY = 7,35 + SetX = 8,-37 + SetY = 8,49 + SetFrame = 9,11 + SetX = 9,7 + SetY = 9,-50 + SetFrame = 10,6 + SetX = 10,46 + SetY = 10,-39 Graphic = anim sheet Focus = Target - SetX = 4,368 - SetY = 4,111 - SetX = 5,412 - SetY = 5,72 - SetX = 6,357 - SetY = 6,125 - SetX = 7,430 - SetY = 7,66 - SetX = 8,450 - SetY = 8,160 - SetX = 9,339 - SetY = 9,144 - SetX = 10,377 - SetY = 10,58 + SetFrame = 4,10 + SetX = 4,-16 + SetY = 4,15 + SetZ = 4,29 + SetFrame = 5,6 + SetX = 5,28 + SetY = 5,-24 + SetX = 6,-27 + SetY = 6,29 + SetX = 7,46 + SetY = 7,-30 + SetX = 8,66 + SetY = 8,64 + SetX = 9,-45 + SetY = 9,48 + SetX = 10,-7 + SetY = 10,-38 Graphic = anim sheet Focus = Target - SetX = 7,440 - SetY = 7,160 - SetX = 8,421 - SetY = 8,72 - SetX = 9,445 - SetY = 9,162 - SetX = 10,347 - SetY = 10,135 + SetFrame = 7,6 + SetX = 7,56 + SetY = 7,64 + SetZ = 7,30 + SetX = 8,37 + SetY = 8,-24 + SetX = 9,61 + SetY = 9,66 + SetX = 10,-37 + SetY = 10,39 Graphic = anim sheet Focus = Target - SetX = 8,384 - SetY = 8,42 - SetX = 9,421 - SetY = 9,65 - SetX = 10,448 - SetY = 10,162 + SetFrame = 8,10 + SetX = 8,0 + SetY = 8,-54 + SetZ = 8,31 + SetFrame = 9,6 + SetX = 9,37 + SetY = 9,-31 + SetX = 10,64 + SetY = 10,66 Graphic = anim sheet Focus = Target + SetFrame = 1,15 SetBlending = 1,1 - SetX = 1,390 - SetY = 1,95 + SetX = 1,6 + SetY = 1,-1 + SetZ = 1,27 SetOpacity = 1,154 Play = 3,Flash2,100,170 diff --git a/PBS/Animations/Converted/Move/LOCKON.txt b/PBS/Animations/Converted/Move/LOCKON.txt index 0b53a7468..c12ff39d7 100644 --- a/PBS/Animations/Converted/Move/LOCKON.txt +++ b/PBS/Animations/Converted/Move/LOCKON.txt @@ -3,77 +3,109 @@ [Move,LOCKON] Name = LOCKON - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = mixed Focus = Target - SetX = 2,395 - SetY = 2,95 + SetFrame = 2,4 + SetX = 2,11 + SetY = 2,-1 + SetZ = 2,28 SetZoomX = 2,200 SetZoomY = 2,200 - SetX = 3,394 - SetY = 3,97 - SetX = 7,396 - SetY = 7,89 + SetX = 3,10 + SetY = 3,1 + SetVisible = 4,false + + Graphic = mixed + Focus = Target + SetFrame = 4,5 + SetX = 4,20 + SetY = 4,-8 + SetZ = 4,27 + SetZoomX = 4,200 + SetZoomY = 4,200 + SetX = 5,22 + SetY = 5,-4 + SetY = 6,-9 + SetVisible = 7,false + + Graphic = mixed + Focus = Target + SetFrame = 7,6 + SetX = 7,12 + SetY = 7,-7 + SetZ = 7,28 + SetZoomX = 7,200 + SetZoomY = 7,200 + SetVisible = 8,false + + Graphic = mixed + Focus = Target + SetFrame = 8,6 + SetX = 8,11 + SetY = 8,-7 + SetZ = 8,27 + SetZoomX = 8,200 + SetZoomY = 8,200 + SetX = 9,10 + SetY = 9,-8 + SetX = 10,9 + SetY = 10,-7 + SetY = 11,-5 + SetFrame = 12,7 + SetX = 12,10 + SetY = 12,-6 + SetX = 14,9 + SetY = 14,-8 + SetX = 15,13 + SetX = 16,9 + SetY = 16,-5 + SetFrame = 17,8 + SetX = 17,13 + SetY = 17,-8 + SetX = 18,11 + SetY = 18,-6 + SetX = 19,15 + SetY = 19,-4 + SetX = 20,11 + SetY = 20,-8 + SetFrame = 21,9 + SetX = 21,10 + SetY = 21,-10 + SetX = 22,8 + SetY = 22,-8 + SetX = 23,7 + SetY = 23,-6 + SetX = 24,11 + SetY = 24,-7 + SetX = 25,13 + SetX = 26,10 + SetY = 26,-8 + SetX = 27,11 + SetY = 27,-4 + SetOpacity = 27,236 + SetX = 28,9 + SetY = 28,-6 + SetOpacity = 28,239 + SetX = 29,12 + SetY = 29,-3 + SetOpacity = 29,168 Graphic = mixed Focus = Target - SetX = 0,395 - SetY = 0,99 + SetFrame = 0,4 + SetX = 0,11 + SetY = 0,3 + SetZ = 0,27 SetZoomX = 0,200 SetZoomY = 0,200 - SetX = 1,397 - SetY = 1,94 - SetX = 4,404 - SetY = 4,88 - SetX = 5,406 - SetY = 5,92 - SetY = 6,87 - SetX = 8,395 - SetY = 8,89 - SetX = 9,394 - SetY = 9,88 - SetX = 10,393 - SetY = 10,89 - SetY = 11,91 - SetX = 12,394 - SetY = 12,90 - SetX = 14,393 - SetY = 14,88 - SetX = 15,397 - SetX = 16,393 - SetY = 16,91 - SetX = 17,397 - SetY = 17,88 - SetX = 18,395 - SetY = 18,90 - SetX = 19,399 - SetY = 19,92 - SetX = 20,395 - SetY = 20,88 - SetX = 21,394 - SetY = 21,86 - SetX = 22,392 - SetY = 22,88 - SetX = 23,391 - SetY = 23,90 - SetX = 24,395 - SetY = 24,89 - SetX = 25,397 - SetX = 26,394 - SetY = 26,88 - SetX = 27,395 - SetY = 27,92 - SetOpacity = 27,236 - SetX = 28,393 - SetY = 28,90 - SetOpacity = 28,239 - SetX = 29,396 - SetY = 29,93 - SetOpacity = 29,168 + SetX = 1,13 + SetY = 1,-2 + SetVisible = 2,false Play = 0,Lock On,88 diff --git a/PBS/Animations/Converted/Move/LOVELYKISS.txt b/PBS/Animations/Converted/Move/LOVELYKISS.txt index ec51567b1..eda2e43e9 100644 --- a/PBS/Animations/Converted/Move/LOVELYKISS.txt +++ b/PBS/Animations/Converted/Move/LOVELYKISS.txt @@ -3,97 +3,116 @@ [Move,LOVELYKISS] Name = LOVELYKISS - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poi.hear.mus Focus = UserAndTarget - SetX = 0,395 - SetY = 0,130 - SetX = 1,383 - SetY = 1,102 - SetX = 2,382 - SetY = 2,112 - SetX = 3,351 - SetY = 3,103 - SetX = 4,349 - SetY = 4,106 - SetX = 5,359 - SetY = 5,131 - SetX = 6,368 - SetX = 7,360 - SetY = 7,134 - SetX = 8,353 - SetY = 8,108 - SetX = 9,357 - SetY = 9,106 + SetFrame = 0,4 + SetX = 0,208 + SetY = 0,-146 + SetZ = 0,27 + SetX = 1,199 + SetY = 1,-190 + SetX = 2,198 + SetY = 2,-175 + SetFrame = 3,5 + SetX = 3,174 + SetY = 3,-189 + SetX = 4,172 + SetY = 4,-184 + SetX = 5,180 + SetY = 5,-145 + SetX = 6,187 + SetX = 7,181 + SetY = 7,-140 + SetX = 8,175 + SetY = 8,-181 + SetX = 9,178 + SetY = 9,-184 Graphic = poi.hear.mus Focus = UserAndTarget - SetX = 1,376 - SetY = 1,94 - SetX = 2,405 - SetY = 2,120 - SetX = 3,368 - SetY = 3,116 - SetY = 4,131 - SetX = 5,377 - SetY = 5,108 - SetX = 6,340 - SetY = 6,114 - SetX = 7,332 - SetY = 7,115 - SetX = 8,372 - SetY = 8,98 - SetX = 9,366 - SetY = 9,56 + SetFrame = 1,5 + SetX = 1,193 + SetY = 1,-203 + SetZ = 1,28 + SetFrame = 2,4 + SetX = 2,216 + SetY = 2,-162 + SetFrame = 3,5 + SetX = 3,187 + SetY = 3,-168 + SetY = 4,-145 + SetX = 5,194 + SetY = 5,-181 + SetX = 6,165 + SetY = 6,-171 + SetX = 7,159 + SetY = 7,-170 + SetX = 8,190 + SetY = 8,-196 + SetFrame = 9,6 + SetX = 9,185 + SetY = 9,-262 Graphic = poi.hear.mus Focus = UserAndTarget - SetX = 1,407 - SetY = 1,139 - SetX = 2,372 - SetY = 2,90 - SetX = 3,361 - SetY = 3,85 - SetX = 4,363 - SetY = 4,76 - SetX = 5,349 - SetY = 5,90 - SetX = 6,364 - SetY = 6,93 - SetX = 7,367 - SetY = 7,97 - SetX = 8,356 - SetY = 8,79 - SetX = 9,370 - SetY = 9,86 + SetFrame = 1,3 + SetX = 1,217 + SetY = 1,-132 + SetZ = 1,29 + SetFrame = 2,5 + SetX = 2,190 + SetY = 2,-209 + SetX = 3,182 + SetY = 3,-217 + SetX = 4,183 + SetY = 4,-231 + SetX = 5,172 + SetY = 5,-209 + SetX = 6,184 + SetY = 6,-204 + SetX = 7,186 + SetY = 7,-198 + SetX = 8,178 + SetY = 8,-226 + SetX = 9,189 + SetY = 9,-215 Graphic = poi.hear.mus Focus = UserAndTarget - SetX = 5,370 - SetY = 5,70 - SetX = 6,337 - SetY = 6,80 - SetX = 7,332 - SetX = 8,330 - SetY = 8,73 - SetX = 9,368 - SetY = 9,72 + SetFrame = 5,5 + SetX = 5,189 + SetY = 5,-240 + SetZ = 5,30 + SetX = 6,163 + SetY = 6,-225 + SetX = 7,159 + SetX = 8,157 + SetY = 8,-235 + SetX = 9,187 + SetY = 9,-237 Graphic = poi.hear.mus Focus = UserAndTarget - SetX = 6,359 - SetY = 6,56 - SetX = 7,355 - SetY = 7,60 + SetFrame = 6,5 + SetX = 6,180 + SetY = 6,-262 + SetZ = 6,31 + SetX = 7,177 + SetY = 7,-256 + SetVisible = 8,false Graphic = poi.hear.mus Focus = UserAndTarget - SetX = 7,331 - SetY = 7,59 + SetFrame = 7,5 + SetX = 7,158 + SetY = 7,-257 + SetZ = 7,32 + SetVisible = 8,false Play = 0,Lovely Kiss,85 diff --git a/PBS/Animations/Converted/Move/LOWKICK.txt b/PBS/Animations/Converted/Move/LOWKICK.txt index a6c1797bb..6565bb021 100644 --- a/PBS/Animations/Converted/Move/LOWKICK.txt +++ b/PBS/Animations/Converted/Move/LOWKICK.txt @@ -3,26 +3,28 @@ [Move,LOWKICK] Name = LOWKICK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 0,480 - SetY = 0,158 + SetFrame = 0,7 + SetX = 0,96 + SetY = 0,62 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 SetOpacity = 0,100 - SetX = 1,424 - SetY = 1,134 + SetX = 1,40 + SetY = 1,38 SetOpacity = 1,255 - SetX = 2,400 - SetY = 2,118 - SetX = 3,392 - SetY = 3,110 + SetX = 2,16 + SetY = 2,22 + SetX = 3,8 + SetY = 3,14 SetZoomX = 4,100 SetZoomY = 4,100 SetOpacity = 5,100 diff --git a/PBS/Animations/Converted/Move/LUCKYCHANT.txt b/PBS/Animations/Converted/Move/LUCKYCHANT.txt index aac41d278..06826ba52 100644 --- a/PBS/Animations/Converted/Move/LUCKYCHANT.txt +++ b/PBS/Animations/Converted/Move/LUCKYCHANT.txt @@ -3,273 +3,321 @@ [Move,LUCKYCHANT] Name = LUCKYCHANT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet Focus = UserAndTarget - SetX = 0,375 - SetY = 0,100 + SetFrame = 0,14 + SetX = 0,192 + SetY = 0,-193 + SetZ = 0,27 SetOpacity = 0,220 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 0,336 - SetY = 0,87 - SetX = 1,426 - SetY = 1,151 - SetX = 2,352 - SetY = 2,147 - SetX = 3,362 - SetY = 3,135 - SetX = 4,351 - SetY = 4,133 - SetX = 5,345 - SetY = 5,120 - SetX = 6,355 - SetY = 6,85 - SetX = 7,358 - SetY = 7,82 + SetFrame = 0,8 + SetX = 0,162 + SetY = 0,-214 + SetZ = 0,28 + SetX = 1,232 + SetY = 1,-114 + SetX = 2,175 + SetY = 2,-120 + SetX = 3,182 + SetY = 3,-139 + SetX = 4,174 + SetY = 4,-142 + SetX = 5,169 + SetY = 5,-162 + SetX = 6,177 + SetY = 6,-217 + SetX = 7,179 + SetY = 7,-221 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 0,336 - SetY = 0,104 - SetX = 1,341 - SetY = 1,130 - SetX = 2,346 - SetY = 2,134 - SetX = 3,372 - SetY = 3,144 - SetX = 4,365 - SetY = 4,134 - SetX = 5,356 - SetY = 5,127 - SetX = 6,366 - SetY = 6,75 - SetX = 7,370 - SetY = 7,68 + SetFrame = 0,8 + SetX = 0,162 + SetY = 0,-187 + SetZ = 0,29 + SetX = 1,166 + SetY = 1,-146 + SetX = 2,170 + SetY = 2,-140 + SetX = 3,190 + SetY = 3,-125 + SetX = 4,185 + SetY = 4,-140 + SetX = 5,178 + SetY = 5,-151 + SetX = 6,185 + SetY = 6,-232 + SetX = 7,189 + SetY = 7,-243 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 1,343 - SetY = 1,143 - SetX = 2,358 - SetY = 2,129 - SetX = 3,355 - SetY = 3,144 - SetX = 4,356 - SetY = 4,122 - SetX = 5,362 - SetY = 5,140 - SetX = 6,347 - SetY = 6,98 - SetX = 7,383 - SetY = 7,64 + SetFrame = 1,8 + SetX = 1,167 + SetY = 1,-126 + SetZ = 1,30 + SetX = 2,179 + SetY = 2,-148 + SetX = 3,177 + SetY = 3,-125 + SetX = 4,178 + SetY = 4,-159 + SetX = 5,182 + SetY = 5,-131 + SetX = 6,171 + SetY = 6,-196 + SetX = 7,199 + SetY = 7,-250 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 1,361 - SetY = 1,150 - SetX = 2,417 - SetY = 2,135 - SetX = 3,346 - SetY = 3,127 - SetX = 4,377 - SetY = 4,146 - SetX = 5,352 - SetY = 5,108 - SetY = 6,120 - SetX = 7,394 - SetY = 7,64 + SetFrame = 1,8 + SetX = 1,182 + SetY = 1,-115 + SetZ = 1,31 + SetX = 2,225 + SetY = 2,-139 + SetX = 3,170 + SetY = 3,-151 + SetX = 4,194 + SetY = 4,-121 + SetX = 5,175 + SetY = 5,-181 + SetY = 6,-162 + SetX = 7,207 + SetY = 7,-250 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 2,432 - SetY = 2,129 - SetX = 3,351 - SetY = 3,113 - SetX = 4,392 - SetY = 4,152 - SetX = 5,344 - SetY = 5,99 - SetX = 6,366 - SetY = 6,133 - SetX = 7,372 - SetY = 7,53 + SetFrame = 2,8 + SetX = 2,237 + SetY = 2,-148 + SetZ = 2,32 + SetX = 3,174 + SetY = 3,-173 + SetX = 4,206 + SetY = 4,-112 + SetX = 5,168 + SetY = 5,-195 + SetX = 6,185 + SetY = 6,-142 + SetX = 7,190 + SetY = 7,-267 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 2,423 - SetY = 2,144 - SetX = 3,339 - SetY = 3,98 - SetX = 4,397 - SetY = 4,146 - SetX = 5,374 - SetY = 5,136 - SetX = 6,379 - SetY = 6,145 - SetX = 7,343 - SetY = 7,95 + SetFrame = 2,8 + SetX = 2,230 + SetY = 2,-125 + SetZ = 2,33 + SetX = 3,164 + SetY = 3,-196 + SetX = 4,210 + SetY = 4,-121 + SetX = 5,192 + SetY = 5,-137 + SetX = 6,196 + SetY = 6,-123 + SetX = 7,167 + SetY = 7,-201 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 2,406 - SetY = 2,145 - SetX = 3,425 - SetY = 3,133 - SetX = 4,412 - SetY = 4,143 - SetX = 5,380 - SetY = 5,150 - SetX = 6,393 - SetY = 6,154 - SetX = 7,354 - SetY = 7,104 + SetFrame = 2,8 + SetX = 2,217 + SetY = 2,-123 + SetZ = 2,34 + SetX = 3,232 + SetY = 3,-142 + SetX = 4,221 + SetY = 4,-126 + SetX = 5,196 + SetY = 5,-115 + SetX = 6,207 + SetY = 6,-109 + SetX = 7,176 + SetY = 7,-187 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 2,427 - SetY = 2,111 - SetX = 3,435 - SetY = 3,130 - SetX = 4,423 - SetY = 4,143 - SetX = 5,391 - SetY = 5,145 - SetX = 6,411 - SetY = 6,149 - SetX = 7,346 - SetY = 7,125 + SetFrame = 2,8 + SetX = 2,233 + SetY = 2,-176 + SetZ = 2,35 + SetX = 3,239 + SetY = 3,-146 + SetX = 4,230 + SetY = 4,-126 + SetX = 5,205 + SetY = 5,-123 + SetX = 6,221 + SetY = 6,-117 + SetX = 7,170 + SetY = 7,-154 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 2,358 - SetY = 2,109 - SetX = 3,432 - SetY = 3,116 - SetX = 4,429 - SetY = 4,129 - SetX = 5,407 - SetY = 5,150 - SetX = 6,428 - SetY = 6,138 - SetX = 7,365 - SetY = 7,127 + SetFrame = 2,8 + SetX = 2,179 + SetY = 2,-179 + SetZ = 2,36 + SetX = 3,237 + SetY = 3,-168 + SetX = 4,235 + SetY = 4,-148 + SetX = 5,217 + SetY = 5,-115 + SetX = 6,234 + SetY = 6,-134 + SetX = 7,185 + SetY = 7,-151 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 3,439 - SetY = 3,105 - SetY = 4,126 - SetX = 5,415 - SetY = 5,139 - SetX = 6,441 - SetY = 6,119 - SetX = 7,366 - SetY = 7,145 + SetFrame = 3,8 + SetX = 3,242 + SetY = 3,-185 + SetZ = 3,37 + SetY = 4,-153 + SetX = 5,224 + SetY = 5,-132 + SetX = 6,244 + SetY = 6,-164 + SetX = 7,185 + SetY = 7,-123 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 3,353 - SetY = 3,96 - SetX = 4,435 - SetY = 4,113 - SetX = 5,428 - SetY = 5,134 - SetX = 6,443 - SetY = 6,101 - SetX = 7,385 - SetY = 7,139 + SetFrame = 3,8 + SetX = 3,175 + SetY = 3,-200 + SetZ = 3,38 + SetX = 4,239 + SetY = 4,-173 + SetX = 5,234 + SetY = 5,-140 + SetX = 6,246 + SetY = 6,-192 + SetX = 7,200 + SetY = 7,-132 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 3,429 - SetY = 3,94 - SetX = 4,444 - SetY = 4,102 - SetX = 5,439 - SetY = 5,122 - SetX = 6,331 - SetY = 6,110 - SetX = 7,401 - SetY = 7,155 + SetFrame = 3,8 + SetX = 3,235 + SetY = 3,-203 + SetZ = 3,39 + SetX = 4,246 + SetY = 4,-190 + SetX = 5,242 + SetY = 5,-159 + SetX = 6,158 + SetY = 6,-178 + SetX = 7,213 + SetY = 7,-107 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 4,427 - SetY = 4,91 - SetX = 5,434 - SetY = 5,102 - SetX = 6,324 - SetY = 6,125 - SetX = 7,417 - SetY = 7,137 + SetFrame = 4,8 + SetX = 4,233 + SetY = 4,-207 + SetZ = 4,40 + SetX = 5,239 + SetY = 5,-190 + SetX = 6,153 + SetY = 6,-154 + SetX = 7,225 + SetY = 7,-135 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 4,345 - SetY = 4,106 - SetX = 6,326 - SetY = 6,93 - SetX = 7,433 - SetY = 7,118 - SetOpacity = 9,128 + SetFrame = 4,8 + SetX = 4,169 + SetY = 4,-184 + SetZ = 4,41 + SetVisible = 5,false Graphic = anim sheet Focus = UserAndTarget - SetX = 6,340 - SetY = 6,76 - SetX = 7,446 - SetY = 7,105 + SetFrame = 6,8 + SetX = 6,154 + SetY = 6,-204 + SetZ = 6,41 + SetX = 7,238 + SetY = 7,-165 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 7,431 - SetY = 7,94 + SetFrame = 6,8 + SetX = 6,165 + SetY = 6,-231 + SetZ = 6,42 + SetX = 7,248 + SetY = 7,-185 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 7,442 - SetY = 7,82 + SetFrame = 7,8 + SetX = 7,236 + SetY = 7,-203 + SetZ = 7,43 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 7,420 - SetY = 7,64 + SetFrame = 7,8 + SetX = 7,245 + SetY = 7,-221 + SetZ = 7,44 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 7,407 - SetY = 7,55 + SetFrame = 7,8 + SetX = 7,228 + SetY = 7,-250 + SetZ = 7,45 SetOpacity = 9,128 Graphic = anim sheet Focus = UserAndTarget - SetX = 7,413 - SetY = 7,68 + SetFrame = 7,8 + SetX = 7,217 + SetY = 7,-264 + SetZ = 7,46 + SetOpacity = 9,128 + + Graphic = anim sheet + Focus = UserAndTarget + SetFrame = 7,8 + SetX = 7,222 + SetY = 7,-243 + SetZ = 7,47 SetOpacity = 9,128 Play = 0,Lucky Chant diff --git a/PBS/Animations/Converted/Move/MACHPUNCH.txt b/PBS/Animations/Converted/Move/MACHPUNCH.txt index 6d82c624b..f6da2b24d 100644 --- a/PBS/Animations/Converted/Move/MACHPUNCH.txt +++ b/PBS/Animations/Converted/Move/MACHPUNCH.txt @@ -3,70 +3,78 @@ [Move,MACHPUNCH] Name = MACHPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 2,399 - SetY = 2,95 + SetFrame = 2,5 + SetX = 2,15 + SetY = 2,-1 + SetZ = 2,28 + SetVisible = 3,false Graphic = punches Focus = Target - SetX = 0,403 - SetY = 0,97 + SetFrame = 0,5 + SetX = 0,19 + SetY = 0,1 + SetZ = 0,27 SetZoomX = 0,80 SetZoomY = 0,80 - SetX = 1,400 - SetY = 1,96 + SetX = 1,16 + SetY = 1,0 SetZoomX = 1,90 SetZoomY = 1,90 - SetX = 2,388 - SetY = 2,90 + SetFrame = 2,7 + SetX = 2,4 + SetY = 2,-6 SetZoomX = 2,100 SetZoomY = 2,100 - SetX = 3,403 - SetY = 3,95 + SetFrame = 3,5 + SetX = 3,19 + SetY = 3,-1 SetZoomX = 3,110 SetZoomY = 3,110 - SetY = 4,92 + SetY = 4,-4 SetZoomX = 4,120 SetZoomY = 4,120 - SetX = 5,402 + SetX = 5,18 SetZoomX = 5,130 SetZoomY = 5,130 - SetX = 6,404 - SetY = 6,90 + SetX = 6,20 + SetY = 6,-6 SetZoomX = 6,140 SetZoomY = 6,140 - SetX = 7,401 - SetY = 7,88 + SetX = 7,17 + SetY = 7,-8 SetZoomX = 7,160 SetZoomY = 7,160 - SetX = 8,399 + SetX = 8,15 SetZoomX = 8,170 SetZoomY = 8,170 - SetX = 9,401 - SetY = 9,85 + SetX = 9,17 + SetY = 9,-11 SetZoomX = 9,180 SetZoomY = 9,180 SetOpacity = 9,220 - SetY = 10,89 + SetY = 10,-7 SetZoomX = 10,190 SetZoomY = 10,190 SetOpacity = 10,200 - SetX = 11,406 - SetY = 11,90 + SetX = 11,22 + SetY = 11,-6 SetZoomX = 11,220 SetZoomY = 11,220 SetOpacity = 11,130 - SetX = 12,415 - SetY = 12,96 + SetX = 12,31 + SetY = 12,0 SetZoomX = 12,250 SetZoomY = 12,250 SetOpacity = 12,100 + SetVisible = 13,false Play = 0,Mega Punch,100,94 diff --git a/PBS/Animations/Converted/Move/MAGICCOAT.txt b/PBS/Animations/Converted/Move/MAGICCOAT.txt index d7b138103..db99696f9 100644 --- a/PBS/Animations/Converted/Move/MAGICCOAT.txt +++ b/PBS/Animations/Converted/Move/MAGICCOAT.txt @@ -3,16 +3,18 @@ [Move,MAGICCOAT] Name = MAGICCOAT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = anim sheet Focus = Target - SetX = 0,385 - SetY = 0,98 + SetFrame = 0,15 + SetX = 0,1 + SetY = 0,2 + SetZ = 0,27 SetOpacity = 0,37 SetOpacity = 1,74 SetOpacity = 9,72 @@ -20,100 +22,148 @@ Name = MAGICCOAT Graphic = anim sheet Focus = Target - SetX = 2,388 - SetY = 2,27 - SetX = 3,372 - SetY = 3,161 - SetX = 4,446 - SetY = 4,149 - SetX = 5,335 - SetY = 5,98 - SetX = 6,351 - SetY = 6,148 - SetX = 7,385 - SetY = 7,147 - SetX = 8,392 - SetY = 8,151 - SetX = 9,352 - SetY = 9,89 - SetX = 10,390 - SetY = 10,146 + SetFrame = 2,7 + SetX = 2,4 + SetY = 2,-69 + SetZ = 2,28 + SetX = 3,-12 + SetY = 3,65 + SetX = 4,62 + SetY = 4,53 + SetX = 5,-49 + SetY = 5,2 + SetX = 6,-33 + SetY = 6,52 + SetFrame = 7,8 + SetX = 7,1 + SetY = 7,51 + SetX = 8,8 + SetY = 8,55 + SetX = 9,-32 + SetY = 9,-7 + SetX = 10,6 + SetY = 10,50 Graphic = anim sheet Focus = Target - SetX = 2,403 - SetY = 2,46 - SetX = 3,353 - SetY = 3,99 - SetX = 4,453 - SetY = 4,137 - SetX = 5,346 - SetY = 5,105 - SetX = 6,359 - SetY = 6,143 - SetX = 7,402 - SetY = 7,151 - SetX = 8,379 - SetY = 8,154 - SetX = 9,344 - SetY = 9,100 - SetX = 10,447 - SetY = 10,55 + SetFrame = 2,7 + SetX = 2,19 + SetY = 2,-50 + SetZ = 2,29 + SetX = 3,-31 + SetY = 3,3 + SetX = 4,69 + SetY = 4,41 + SetX = 5,-38 + SetY = 5,9 + SetX = 6,-25 + SetY = 6,47 + SetFrame = 7,8 + SetX = 7,18 + SetY = 7,55 + SetX = 8,-5 + SetY = 8,58 + SetX = 9,-40 + SetY = 9,4 + SetFrame = 10,7 + SetX = 10,63 + SetY = 10,-41 Graphic = anim sheet Focus = Target - SetX = 2,428 - SetY = 2,159 - SetX = 3,340 - SetY = 3,95 - SetY = 4,169 - SetX = 5,443 - SetY = 5,88 - SetX = 6,396 - SetY = 6,52 - SetX = 7,397 - SetY = 7,69 - SetX = 8,434 - SetY = 8,64 - SetX = 9,445 - SetY = 9,110 + SetFrame = 2,7 + SetX = 2,44 + SetY = 2,63 + SetZ = 2,30 + SetX = 3,-44 + SetY = 3,-1 + SetY = 4,73 + SetX = 5,59 + SetY = 5,-8 + SetX = 6,12 + SetY = 6,-44 + SetFrame = 7,8 + SetX = 7,13 + SetY = 7,-27 + SetFrame = 8,7 + SetX = 8,50 + SetY = 8,-32 + SetFrame = 9,8 + SetX = 9,61 + SetY = 9,14 + SetVisible = 10,false Graphic = anim sheet Focus = Target - SetX = 2,405 - SetY = 2,164 - SetX = 3,417 - SetY = 3,54 - SetX = 4,329 - SetY = 4,162 - SetX = 5,443 - SetY = 5,104 - SetX = 6,409 - SetY = 6,59 - SetX = 7,386 - SetY = 7,58 - SetX = 8,436 - SetY = 8,79 + SetFrame = 2,7 + SetX = 2,21 + SetY = 2,68 + SetZ = 2,31 + SetX = 3,33 + SetY = 3,-42 + SetX = 4,-55 + SetY = 4,66 + SetX = 5,59 + SetY = 5,8 + SetX = 6,25 + SetY = 6,-37 + SetFrame = 7,8 + SetX = 7,2 + SetY = 7,-38 + SetFrame = 8,7 + SetX = 8,52 + SetY = 8,-17 + SetVisible = 9,false Graphic = anim sheet Focus = Target - SetX = 2,337 - SetY = 2,147 - SetX = 3,430 - SetY = 3,71 - SetX = 6,441 - SetY = 6,151 - SetX = 8,357 - SetY = 8,77 + SetFrame = 2,7 + SetX = 2,-47 + SetY = 2,51 + SetZ = 2,32 + SetX = 3,46 + SetY = 3,-25 + SetVisible = 4,false Graphic = anim sheet Focus = Target - SetX = 2,337 - SetY = 2,120 - SetX = 6,453 - SetY = 6,160 - SetX = 8,369 - SetY = 8,89 + SetFrame = 2,7 + SetX = 2,-47 + SetY = 2,24 + SetZ = 2,33 + SetVisible = 3,false + + Graphic = anim sheet + Focus = Target + SetFrame = 6,7 + SetX = 6,57 + SetY = 6,55 + SetZ = 6,32 + SetVisible = 7,false + + Graphic = anim sheet + Focus = Target + SetFrame = 6,7 + SetX = 6,69 + SetY = 6,64 + SetZ = 6,33 + SetVisible = 7,false + + Graphic = anim sheet + Focus = Target + SetFrame = 8,7 + SetX = 8,-27 + SetY = 8,-19 + SetZ = 8,32 + SetVisible = 9,false + + Graphic = anim sheet + Focus = Target + SetFrame = 8,7 + SetX = 8,-15 + SetY = 8,-7 + SetZ = 8,33 + SetVisible = 9,false Play = 0,Sword2,80 Play = 0,Sword2,80,101 diff --git a/PBS/Animations/Converted/Move/MEANLOOK.txt b/PBS/Animations/Converted/Move/MEANLOOK.txt index e46d20ec6..3023a1cc8 100644 --- a/PBS/Animations/Converted/Move/MEANLOOK.txt +++ b/PBS/Animations/Converted/Move/MEANLOOK.txt @@ -3,20 +3,26 @@ [Move,MEANLOOK] Name = MEANLOOK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = face and eye Focus = Target - SetX = 0,384 - SetY = 0,92 - SetY = 1,96 - SetY = 2,94 - SetX = 3,385 - SetY = 3,95 - SetX = 4,384 - SetY = 4,93 - SetY = 5,94 + SetFrame = 0,10 + SetX = 0,0 + SetY = 0,-4 + SetZ = 0,27 + SetFrame = 1,11 + SetY = 1,0 + SetFrame = 2,12 + SetY = 2,-2 + SetFrame = 3,13 + SetX = 3,1 + SetY = 3,-1 + SetFrame = 4,14 + SetX = 4,0 + SetY = 4,-3 + SetY = 5,-2 diff --git a/PBS/Animations/Converted/Move/MEGADRAIN.txt b/PBS/Animations/Converted/Move/MEGADRAIN.txt index edccbc759..c5adb854a 100644 --- a/PBS/Animations/Converted/Move/MEGADRAIN.txt +++ b/PBS/Animations/Converted/Move/MEGADRAIN.txt @@ -3,106 +3,130 @@ [Move,MEGADRAIN] Name = MEGADRAIN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = UserAndTarget - SetX = 0,345 - SetY = 0,91 - SetX = 1,294 - SetY = 1,98 - SetX = 2,211 - SetY = 2,123 - SetX = 3,160 - SetY = 3,161 - SetX = 4,128 - SetY = 4,205 - SetX = 5,134 + SetFrame = 0,8 + SetX = 0,169 + SetY = 0,-207 + SetZ = 0,27 + SetX = 1,129 + SetY = 1,-196 + SetX = 2,64 + SetY = 2,-157 + SetX = 3,25 + SetY = 3,-98 + SetX = 4,0 + SetY = 4,-29 + SetFrame = 5,9 + SetX = 5,4 + SetFrame = 6,10 + SetFrame = 7,11 + SetFrame = 8,12 + SetFrame = 9,13 Graphic = rockice Focus = UserAndTarget - SetX = 1,396 - SetY = 1,116 - SetX = 2,358 - SetY = 2,148 - SetX = 3,307 - SetY = 3,186 - SetX = 4,217 - SetY = 4,217 - SetX = 5,147 - SetY = 5,186 - SetX = 6,172 - SetY = 6,173 - SetX = 7,160 - SetY = 7,198 - SetX = 9,166 - SetY = 9,211 + SetFrame = 1,8 + SetX = 1,209 + SetY = 1,-168 + SetZ = 1,28 + SetX = 2,179 + SetY = 2,-118 + SetX = 3,139 + SetY = 3,-59 + SetX = 4,69 + SetY = 4,-10 + SetX = 5,14 + SetY = 5,-59 + SetX = 6,34 + SetY = 6,-79 + SetX = 7,25 + SetY = 7,-40 + SetX = 9,29 + SetY = 9,-20 Graphic = rockice Focus = UserAndTarget - SetX = 2,339 - SetY = 2,104 - SetX = 3,262 - SetY = 3,135 - SetX = 4,185 - SetY = 4,167 - SetX = 5,204 - SetY = 5,192 - SetX = 6,275 - SetY = 6,173 - SetX = 7,198 - SetY = 7,192 - SetX = 8,128 - SetY = 8,173 + SetFrame = 2,8 + SetX = 2,164 + SetY = 2,-187 + SetZ = 2,29 + SetX = 3,104 + SetY = 3,-139 + SetX = 4,44 + SetY = 4,-89 + SetX = 5,59 + SetY = 5,-50 + SetX = 6,114 + SetY = 6,-79 + SetX = 7,54 + SetY = 7,-50 + SetX = 8,0 + SetY = 8,-79 + SetVisible = 9,false Graphic = rockice Focus = UserAndTarget - SetX = 3,371 - SetY = 3,123 - SetX = 4,320 - SetY = 4,154 - SetX = 5,256 - SetY = 5,135 - SetY = 6,98 - SetX = 7,172 - SetY = 7,135 - SetX = 8,230 - SetY = 8,192 + SetFrame = 3,8 + SetX = 3,189 + SetY = 3,-157 + SetZ = 3,30 + SetX = 4,150 + SetY = 4,-109 + SetX = 5,100 + SetY = 5,-139 + SetY = 6,-196 + SetX = 7,34 + SetY = 7,-139 + SetX = 8,79 + SetY = 8,-50 + SetVisible = 9,false Graphic = rockice Focus = UserAndTarget - SetX = 3,371 - SetY = 3,91 - SetX = 4,307 - SetY = 4,110 - SetX = 5,339 - SetY = 5,135 - SetX = 6,371 - SetY = 6,91 - SetX = 7,326 - SetY = 7,135 + SetFrame = 3,8 + SetX = 3,189 + SetY = 3,-207 + SetZ = 3,31 + SetX = 4,139 + SetY = 4,-178 + SetX = 5,164 + SetY = 5,-139 + SetX = 6,189 + SetY = 6,-207 + SetX = 7,154 + SetY = 7,-139 + SetVisible = 8,false Graphic = rockice Focus = UserAndTarget - SetX = 4,377 - SetY = 4,104 - SetX = 5,352 - SetY = 5,85 - SetX = 6,256 - SetY = 6,154 - SetX = 7,185 - SetY = 7,173 + SetFrame = 4,8 + SetX = 4,194 + SetY = 4,-187 + SetZ = 4,32 + SetX = 5,175 + SetY = 5,-217 + SetX = 6,100 + SetY = 6,-109 + SetX = 7,44 + SetY = 7,-79 + SetVisible = 8,false Graphic = rockice Focus = UserAndTarget - SetX = 4,371 - SetY = 4,85 - SetX = 5,313 - SetY = 5,116 + SetFrame = 4,8 + SetX = 4,189 + SetY = 4,-217 + SetZ = 4,33 + SetX = 5,144 + SetY = 5,-168 + SetVisible = 6,false Play = 0,Absorb2,80 Play = 2,Absorb2,80 @@ -112,145 +136,218 @@ Name = MEGADRAIN [OppMove,MEGADRAIN] Name = MEGADRAIN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 1,129 - SetY = 1,237 - SetX = 2,191 - SetY = 2,195 - SetX = 3,294 - SetY = 3,192 - SetX = 4,236 - SetY = 4,217 - SetX = 5,395 - SetY = 5,99 - SetX = 10,369 - SetY = 10,79 - SetX = 11,351 - SetX = 12,346 - SetY = 12,62 - SetX = 13,344 - SetY = 13,58 - SetX = 14,351 - SetY = 14,60 - SetX = 15,348 - SetY = 15,76 - SetX = 16,387 - SetY = 16,55 - SetX = 17,356 - SetY = 17,107 - SetX = 18,419 - SetY = 18,76 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 2,129 - SetY = 2,218 - SetX = 3,211 - SetY = 3,199 - SetX = 4,256 - SetY = 4,148 - SetX = 5,344 - SetY = 5,142 - SetX = 6,394 - SetY = 6,98 - SetX = 7,393 - SetY = 7,97 - SetX = 11,399 - SetY = 11,72 - SetX = 12,398 - SetY = 12,56 - SetX = 13,401 - SetY = 13,55 - SetX = 14,414 - SetY = 14,56 - SetX = 15,379 - SetY = 15,81 - SetX = 16,363 - SetY = 16,107 - SetX = 17,416 - SetY = 17,79 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 3,132 - SetY = 3,224 - SetX = 4,349 - SetY = 4,180 - SetX = 5,294 - SetY = 5,192 - SetX = 6,383 - SetY = 6,171 - SetX = 7,390 - SetY = 7,143 - SetX = 8,399 - SetY = 8,99 - SetX = 12,365 - SetY = 12,127 - SetX = 13,354 - SetY = 13,133 - SetX = 14,366 - SetY = 14,123 - SetX = 15,356 - SetY = 15,113 - SetX = 16,415 - SetY = 16,78 - - Graphic = leech-seed - Focus = UserAndTarget - SetX = 4,307 - SetY = 4,97 - SetX = 5,249 - SetY = 5,116 - SetX = 6,324 - SetY = 6,113 - SetX = 13,399 - SetY = 13,87 - SetX = 14,401 - SetX = 15,406 - SetY = 15,71 + SetX = 0,0 + SetY = 0,0 Graphic = leech-seed Focus = UserAndTarget - SetX = 0,128 - SetY = 0,219 - SetX = 1,149 - SetY = 1,233 - SetX = 2,221 - SetY = 2,174 - SetX = 3,204 - SetY = 3,123 - SetX = 4,147 - SetY = 4,167 - SetX = 5,372 - SetY = 5,100 - SetX = 7,356 - SetY = 7,98 - SetX = 9,395 - SetY = 9,97 - SetX = 10,400 - SetY = 10,96 - SetX = 11,391 - SetX = 12,393 - SetY = 12,99 - SetX = 13,395 - SetX = 14,401 - SetY = 14,100 - SetX = 15,395 - SetY = 15,99 - SetX = 16,345 - SetY = 16,82 - SetX = 17,395 - SetY = 17,57 - SetX = 18,364 - SetY = 18,108 - SetX = 19,408 - SetY = 19,80 + SetFrame = 0,11 + SetX = 0,0 + SetY = 0,-7 + SetZ = 0,27 + SetX = 1,16 + SetY = 1,14 + SetFrame = 2,12 + SetX = 2,72 + SetY = 2,-78 + SetX = 3,59 + SetY = 3,-157 + SetX = 4,14 + SetY = 4,-89 + SetX = 5,190 + SetY = 5,-193 + SetVisible = 6,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 1,11 + SetX = 1,0 + SetY = 1,20 + SetZ = 1,28 + SetFrame = 2,12 + SetX = 2,49 + SetY = 2,-45 + SetX = 3,129 + SetY = 3,-50 + SetX = 4,84 + SetY = 4,-10 + SetX = 5,208 + SetY = 5,-195 + SetVisible = 6,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 2,11 + SetX = 2,0 + SetY = 2,-9 + SetZ = 2,29 + SetFrame = 3,12 + SetX = 3,64 + SetY = 3,-39 + SetX = 4,100 + SetY = 4,-118 + SetX = 5,168 + SetY = 5,-128 + SetX = 6,207 + SetY = 6,-196 + SetX = 7,207 + SetY = 7,-198 + SetVisible = 8,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 3,11 + SetX = 3,3 + SetY = 3,0 + SetZ = 3,30 + SetFrame = 4,12 + SetX = 4,172 + SetY = 4,-68 + SetX = 5,129 + SetY = 5,-50 + SetX = 6,199 + SetY = 6,-82 + SetX = 7,204 + SetY = 7,-126 + SetX = 8,211 + SetY = 8,-195 + SetVisible = 9,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 4,12 + SetX = 4,139 + SetY = 4,-198 + SetZ = 4,31 + SetX = 5,94 + SetY = 5,-168 + SetX = 6,153 + SetY = 6,-173 + SetVisible = 7,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 7,12 + SetX = 7,178 + SetY = 7,-196 + SetZ = 7,27 + SetVisible = 8,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 9,10 + SetX = 9,208 + SetY = 9,-198 + SetZ = 9,27 + SetFrame = 10,8 + SetX = 10,212 + SetY = 10,-200 + SetFrame = 11,7 + SetX = 11,205 + SetFrame = 12,6 + SetX = 12,207 + SetY = 12,-195 + SetFrame = 13,5 + SetX = 13,208 + SetFrame = 14,10 + SetX = 14,213 + SetY = 14,-193 + SetX = 15,208 + SetY = 15,-195 + SetX = 16,169 + SetY = 16,-221 + SetX = 17,208 + SetY = 17,-260 + SetX = 18,184 + SetY = 18,-181 + SetX = 19,218 + SetY = 19,-225 + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 10,10 + SetX = 10,188 + SetY = 10,-226 + SetZ = 10,28 + SetFrame = 11,8 + SetX = 11,174 + SetFrame = 12,7 + SetX = 12,170 + SetY = 12,-253 + SetFrame = 13,6 + SetX = 13,168 + SetY = 13,-259 + SetFrame = 14,5 + SetX = 14,174 + SetY = 14,-256 + SetFrame = 15,10 + SetX = 15,171 + SetY = 15,-231 + SetX = 16,202 + SetY = 16,-264 + SetX = 17,178 + SetY = 17,-182 + SetX = 18,227 + SetY = 18,-231 + SetVisible = 19,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 11,10 + SetX = 11,211 + SetY = 11,-237 + SetZ = 11,29 + SetFrame = 12,8 + SetX = 12,210 + SetY = 12,-262 + SetFrame = 13,7 + SetX = 13,213 + SetY = 13,-264 + SetFrame = 14,6 + SetX = 14,223 + SetY = 14,-262 + SetFrame = 15,5 + SetX = 15,196 + SetY = 15,-223 + SetX = 16,183 + SetY = 16,-182 + SetX = 17,225 + SetY = 17,-226 + SetVisible = 18,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 12,10 + SetX = 12,185 + SetY = 12,-151 + SetZ = 12,30 + SetFrame = 13,8 + SetX = 13,176 + SetY = 13,-142 + SetFrame = 14,7 + SetX = 14,185 + SetY = 14,-157 + SetFrame = 15,6 + SetX = 15,178 + SetY = 15,-173 + SetX = 16,224 + SetY = 16,-228 + SetVisible = 17,false + + Graphic = leech-seed + Focus = UserAndTarget + SetFrame = 13,10 + SetX = 13,211 + SetY = 13,-214 + SetZ = 13,31 + SetFrame = 14,8 + SetX = 14,213 + SetFrame = 15,7 + SetX = 15,217 + SetY = 15,-239 + SetVisible = 16,false Play = 0,Present - Heal diff --git a/PBS/Animations/Converted/Move/MEGAHORN.txt b/PBS/Animations/Converted/Move/MEGAHORN.txt index a6d50e2b7..73b09c95c 100644 --- a/PBS/Animations/Converted/Move/MEGAHORN.txt +++ b/PBS/Animations/Converted/Move/MEGAHORN.txt @@ -3,96 +3,125 @@ [Move,MEGAHORN] Name = MEGAHORN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + + Graphic = poison3 + Focus = UserAndTarget + SetX = 0,44 + SetY = 0,-59 + SetZ = 0,27 + SetZoomX = 0,150 + SetZoomY = 0,150 + SetFrame = 5,14 + SetX = 5,-10 + SetY = 5,-40 + SetZoomX = 5,25 + SetZoomY = 5,25 + SetFrame = 6,0 + SetX = 6,44 + SetY = 6,-59 + SetZoomX = 6,150 + SetZoomY = 6,150 + SetX = 7,94 + SetY = 7,-109 + SetX = 8,144 + SetY = 8,-148 + SetX = 9,164 + SetY = 9,-178 + SetVisible = 11,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,51 - SetY = 0,116 + SetFrame = 0,14 + SetX = 0,-60 + SetY = 0,-168 + SetZ = 0,28 SetZoomX = 0,25 SetZoomY = 0,25 - SetX = 1,89 - SetY = 1,154 - SetX = 2,140 - SetY = 2,192 - SetX = 3,153 - SetY = 3,167 - SetX = 4,211 - SetY = 4,154 - SetX = 5,192 - SetY = 5,236 - SetX = 9,345 - SetY = 9,98 - SetZoomX = 9,100 - SetZoomY = 9,100 + SetX = 1,-30 + SetY = 1,-109 + SetX = 2,9 + SetY = 2,-50 + SetX = 3,19 + SetY = 3,-89 + SetX = 4,64 + SetY = 4,-109 + SetX = 5,50 + SetY = 5,18 + SetVisible = 6,false + + Graphic = poison3 + Focus = UserAndTarget + SetFrame = 0,14 + SetX = 0,114 + SetY = 0,28 + SetZ = 0,29 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetX = 1,44 + SetY = 1,-118 + SetX = 2,39 + SetY = 2,-70 + SetX = 3,84 + SetY = 3,-168 + SetX = 4,-30 + SetY = 4,-79 + SetFrame = 5,0 + SetX = 5,44 + SetY = 5,-59 + SetZoomX = 5,150 + SetZoomY = 5,150 + SetVisible = 6,false + + Graphic = poison3 + Focus = UserAndTarget + SetFrame = 0,14 + SetX = 0,59 + SetY = 0,-187 + SetZ = 0,30 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetX = 1,75 + SetY = 1,0 + SetX = 2,44 + SetY = 2,-29 + SetVisible = 3,false + + Graphic = poison3 + Focus = UserAndTarget + SetFrame = 2,14 + SetX = 2,-5 + SetY = 2,-178 + SetZ = 2,31 + SetZoomX = 2,25 + SetZoomY = 2,25 + SetVisible = 3,false + + Graphic = poison3 + Focus = UserAndTarget + SetFrame = 4,14 + SetX = 4,64 + SetY = 4,39 + SetZ = 4,30 + SetZoomX = 4,25 + SetZoomY = 4,25 + SetVisible = 5,false + + Graphic = poison3 + Focus = UserAndTarget + SetFrame = 9,14 + SetX = 9,169 + SetY = 9,-196 + SetZ = 9,28 SetOpacity = 9,100 SetZoomX = 10,125 SetZoomY = 10,125 SetOpacity = 10,50 - - Graphic = poison3 - Focus = UserAndTarget - SetX = 0,275 - SetY = 0,242 - SetZoomX = 0,25 - SetZoomY = 0,25 - SetX = 1,185 - SetY = 1,148 - SetX = 2,179 - SetY = 2,179 - SetX = 3,236 - SetY = 3,116 - SetX = 4,89 - SetY = 4,173 - SetX = 5,185 - SetY = 5,186 - SetZoomX = 5,150 - SetZoomY = 5,150 - - Graphic = poison3 - Focus = UserAndTarget - SetX = 0,204 - SetY = 0,104 - SetZoomX = 0,25 - SetZoomY = 0,25 - SetX = 1,224 - SetY = 1,224 - SetX = 2,185 - SetY = 2,205 - SetX = 4,211 - SetY = 4,249 - - Graphic = poison3 - Focus = UserAndTarget - SetX = 2,121 - SetY = 2,110 - SetZoomX = 2,25 - SetZoomY = 2,25 - - Graphic = poison3 - Focus = UserAndTarget - SetX = 0,185 - SetY = 0,186 - SetZoomX = 0,150 - SetZoomY = 0,150 - SetX = 5,115 - SetY = 5,198 - SetZoomX = 5,25 - SetZoomY = 5,25 - SetX = 6,185 - SetY = 6,186 - SetZoomX = 6,150 - SetZoomY = 6,150 - SetX = 7,249 - SetY = 7,154 - SetX = 8,313 - SetY = 8,129 - SetX = 9,339 - SetY = 9,110 + SetVisible = 11,false Play = 0,Up,80 Play = 4,throw,80 diff --git a/PBS/Animations/Converted/Move/MEGAKICK.txt b/PBS/Animations/Converted/Move/MEGAKICK.txt index cf325419a..ee16a430e 100644 --- a/PBS/Animations/Converted/Move/MEGAKICK.txt +++ b/PBS/Animations/Converted/Move/MEGAKICK.txt @@ -3,29 +3,36 @@ [Move,MEGAKICK] Name = MEGAKICK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 3,384 - SetY = 3,110 + SetX = 3,0 + SetY = 3,14 + SetZ = 3,28 + SetVisible = 4,false Graphic = 003-Attack01 Focus = Target - SetX = 0,376 - SetY = 0,86 - SetY = 1,94 + SetFrame = 0,9 + SetX = 0,-8 + SetY = 0,-10 + SetZ = 0,27 + SetY = 1,-2 SetAngle = 1,45 - SetX = 2,384 - SetY = 2,110 + SetX = 2,0 + SetY = 2,14 SetAngle = 2,90 SetAngle = 3,0 SetOpacity = 3,100 + SetFrame = 4,0 SetOpacity = 4,255 + SetFrame = 5,1 + SetFrame = 7,2 SetZoomX = 8,120 SetZoomY = 8,120 SetOpacity = 9,100 diff --git a/PBS/Animations/Converted/Move/MEGAPUNCH.txt b/PBS/Animations/Converted/Move/MEGAPUNCH.txt index 0f872a763..db09ae984 100644 --- a/PBS/Animations/Converted/Move/MEGAPUNCH.txt +++ b/PBS/Animations/Converted/Move/MEGAPUNCH.txt @@ -3,59 +3,62 @@ [Move,MEGAPUNCH] Name = MEGAPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 2,396 - SetY = 2,104 - SetX = 3,397 - SetX = 4,395 - SetY = 4,101 - SetX = 6,400 - SetX = 7,397 - SetY = 7,106 - SetX = 8,395 - SetY = 8,107 - SetX = 9,399 - SetY = 9,101 + SetX = 2,12 + SetY = 2,8 + SetZ = 2,28 + SetX = 3,13 + SetX = 4,11 + SetY = 4,5 + SetX = 6,16 + SetX = 7,13 + SetY = 7,10 + SetX = 8,11 + SetY = 8,11 + SetX = 9,15 + SetY = 9,5 SetOpacity = 9,200 Graphic = punches Focus = Target - SetX = 0,384 - SetY = 0,95 - SetX = 1,385 - SetY = 1,93 - SetX = 2,384 - SetY = 2,97 + SetX = 0,0 + SetY = 0,-1 + SetZ = 0,27 + SetX = 1,1 + SetY = 1,-3 + SetFrame = 2,7 + SetX = 2,0 + SetY = 2,1 SetZoomX = 2,50 SetZoomY = 2,50 - SetX = 3,386 - SetY = 3,99 + SetX = 3,2 + SetY = 3,3 SetZoomX = 3,70 SetZoomY = 3,70 - SetX = 4,385 - SetY = 4,97 + SetX = 4,1 + SetY = 4,1 SetZoomX = 4,80 SetZoomY = 4,80 - SetX = 6,386 - SetY = 6,92 + SetX = 6,2 + SetY = 6,-4 SetZoomX = 6,100 SetZoomY = 6,100 - SetX = 7,385 - SetY = 7,94 + SetX = 7,1 + SetY = 7,-2 SetZoomX = 7,105 SetZoomY = 7,105 - SetX = 8,383 + SetX = 8,-1 SetZoomX = 8,120 SetZoomY = 8,120 - SetX = 9,385 - SetY = 9,91 + SetX = 9,1 + SetY = 9,-5 SetZoomX = 9,140 SetZoomY = 9,140 diff --git a/PBS/Animations/Converted/Move/METALCLAW.txt b/PBS/Animations/Converted/Move/METALCLAW.txt index f6c21e76b..07187a17d 100644 --- a/PBS/Animations/Converted/Move/METALCLAW.txt +++ b/PBS/Animations/Converted/Move/METALCLAW.txt @@ -3,27 +3,37 @@ [Move,METALCLAW] Name = METALCLAW - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = dragon claw Focus = UserAndTarget - SetX = 0,387 - SetY = 0,70 - SetX = 1,392 - SetY = 1,73 - SetX = 2,402 - SetY = 2,79 - SetX = 3,400 - SetY = 3,98 - SetX = 4,397 - SetY = 4,91 - SetY = 5,96 - SetX = 6,392 - SetX = 7,384 + SetFrame = 0,1 + SetX = 0,202 + SetY = 0,-240 + SetZ = 0,27 + SetFrame = 1,2 + SetX = 1,206 + SetY = 1,-235 + SetFrame = 2,3 + SetX = 2,214 + SetY = 2,-226 + SetFrame = 3,4 + SetX = 3,212 + SetY = 3,-196 + SetFrame = 4,5 + SetX = 4,210 + SetY = 4,-207 + SetFrame = 5,6 + SetY = 5,-200 + SetFrame = 6,7 + SetX = 6,206 + SetFrame = 7,8 + SetX = 7,200 + SetVisible = 8,false Play = 0,metal,100,110 Play = 4,metal diff --git a/PBS/Animations/Converted/Move/METEORMASH.txt b/PBS/Animations/Converted/Move/METEORMASH.txt index 2489ed649..644cc2240 100644 --- a/PBS/Animations/Converted/Move/METEORMASH.txt +++ b/PBS/Animations/Converted/Move/METEORMASH.txt @@ -3,115 +3,160 @@ [Move,METEORMASH] Name = METEORMASH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = UserAndTarget - SetX = 0,390 - SetY = 0,98 - SetX = 1,395 - SetY = 1,100 - SetX = 2,390 - SetY = 2,98 - SetX = 6,395 - SetY = 6,100 - SetX = 7,390 - SetY = 7,98 + SetFrame = 0,2 + SetX = 0,204 + SetY = 0,-196 + SetZ = 0,27 + SetX = 1,208 + SetY = 1,-193 + SetX = 2,204 + SetY = 2,-196 + SetX = 6,208 + SetY = 6,-193 + SetX = 7,204 + SetY = 7,-196 Graphic = punches Focus = UserAndTarget - SetX = 1,389 - SetY = 1,150 - SetX = 2,386 - SetY = 2,151 - SetX = 3,384 - SetY = 3,150 - SetX = 4,361 - SetY = 4,59 - SetX = 5,387 - SetY = 5,134 - SetX = 6,433 - SetY = 6,115 - SetX = 7,368 - SetY = 7,143 - SetX = 8,344 - SetY = 8,38 - SetX = 9,416 - SetY = 9,141 + SetFrame = 1,15 + SetX = 1,203 + SetY = 1,-115 + SetZ = 1,28 + SetFrame = 2,14 + SetX = 2,201 + SetY = 2,-114 + SetX = 3,200 + SetY = 3,-115 + SetX = 4,182 + SetY = 4,-257 + SetX = 5,202 + SetY = 5,-140 + SetFrame = 6,15 + SetX = 6,238 + SetY = 6,-170 + SetFrame = 7,14 + SetX = 7,187 + SetY = 7,-126 + SetX = 8,168 + SetY = 8,-290 + SetFrame = 9,15 + SetX = 9,225 + SetY = 9,-129 Graphic = punches Focus = UserAndTarget - SetX = 1,340 - SetY = 1,116 - SetX = 2,334 - SetY = 2,106 - SetY = 3,103 - SetX = 4,419 - SetY = 4,142 - SetX = 5,414 - SetY = 5,129 - SetX = 6,356 - SetY = 6,141 - SetX = 7,405 - SetY = 7,58 - SetX = 8,335 - SetY = 8,83 - SetX = 9,361 - SetY = 9,149 + SetFrame = 1,15 + SetX = 1,165 + SetY = 1,-168 + SetZ = 1,29 + SetFrame = 2,14 + SetX = 2,160 + SetY = 2,-184 + SetY = 3,-189 + SetFrame = 4,15 + SetX = 4,227 + SetY = 4,-128 + SetFrame = 5,14 + SetX = 5,223 + SetY = 5,-148 + SetFrame = 6,15 + SetX = 6,178 + SetY = 6,-129 + SetFrame = 7,14 + SetX = 7,216 + SetY = 7,-259 + SetX = 8,161 + SetY = 8,-220 + SetFrame = 9,15 + SetX = 9,182 + SetY = 9,-117 Graphic = punches Focus = UserAndTarget - SetX = 2,419 - SetY = 2,61 - SetX = 3,412 - SetY = 3,78 - SetX = 4,421 - SetY = 4,74 - SetX = 5,409 - SetY = 5,69 - SetX = 6,347 - SetY = 6,75 - SetX = 7,427 - SetY = 7,111 - SetX = 8,411 - SetY = 8,71 - SetX = 9,402 - SetY = 9,57 + SetFrame = 2,15 + SetX = 2,227 + SetY = 2,-254 + SetZ = 2,30 + SetFrame = 3,14 + SetX = 3,221 + SetY = 3,-228 + SetFrame = 4,15 + SetX = 4,228 + SetY = 4,-234 + SetFrame = 5,14 + SetX = 5,219 + SetY = 5,-242 + SetX = 6,171 + SetY = 6,-232 + SetX = 7,233 + SetY = 7,-176 + SetFrame = 8,15 + SetX = 8,221 + SetY = 8,-239 + SetFrame = 9,14 + SetX = 9,214 + SetY = 9,-260 Graphic = punches Focus = UserAndTarget - SetX = 2,429 - SetY = 2,131 - SetY = 3,136 - SetX = 4,386 - SetY = 4,139 - SetX = 5,440 - SetY = 5,102 - SetX = 6,356 - SetY = 6,103 - SetX = 7,346 - SetY = 7,52 + SetFrame = 2,15 + SetX = 2,235 + SetY = 2,-145 + SetZ = 2,31 + SetFrame = 3,14 + SetY = 3,-137 + SetFrame = 4,15 + SetX = 4,201 + SetY = 4,-132 + SetX = 5,243 + SetY = 5,-190 + SetFrame = 6,14 + SetX = 6,178 + SetY = 6,-189 + SetFrame = 7,15 + SetX = 7,170 + SetY = 7,-268 + SetVisible = 8,false Graphic = punches Focus = UserAndTarget - SetX = 3,369 - SetY = 3,68 - SetX = 5,341 - SetY = 5,105 - SetX = 6,426 - SetY = 6,96 - SetX = 7,335 - SetY = 7,85 + SetFrame = 3,15 + SetX = 3,188 + SetY = 3,-243 + SetZ = 3,32 + SetVisible = 4,false Graphic = punches Focus = UserAndTarget - SetX = 5,371 - SetY = 5,67 - SetX = 6,385 - SetY = 6,64 + SetFrame = 5,15 + SetX = 5,166 + SetY = 5,-185 + SetZ = 5,32 + SetFrame = 6,14 + SetX = 6,232 + SetY = 6,-200 + SetFrame = 7,15 + SetX = 7,161 + SetY = 7,-217 + SetVisible = 8,false + + Graphic = punches + Focus = UserAndTarget + SetFrame = 5,15 + SetX = 5,189 + SetY = 5,-245 + SetZ = 5,33 + SetFrame = 6,14 + SetX = 6,200 + SetY = 6,-250 + SetVisible = 7,false Play = 0,superdamage diff --git a/PBS/Animations/Converted/Move/METRONOME.txt b/PBS/Animations/Converted/Move/METRONOME.txt index 42bda3aed..5222557b8 100644 --- a/PBS/Animations/Converted/Move/METRONOME.txt +++ b/PBS/Animations/Converted/Move/METRONOME.txt @@ -3,89 +3,92 @@ [Move,METRONOME] Name = METRONOME - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 0,174 - SetY = 0,222 + SetX = 0,-210 + SetY = 0,126 + SetZ = 0,27 SetZoomX = 0,200 SetZoomY = 0,200 - SetX = 1,187 - SetY = 1,233 - SetX = 2,200 - SetX = 3,214 - SetY = 3,234 - SetX = 4,202 - SetY = 4,228 - SetX = 5,179 - SetX = 6,162 - SetY = 6,233 - SetX = 7,178 - SetY = 7,227 - SetX = 8,197 - SetY = 8,236 - SetX = 9,213 - SetY = 9,238 - SetX = 10,222 - SetY = 10,226 - SetX = 11,199 - SetY = 11,225 - SetX = 12,184 - SetY = 12,230 - SetX = 13,176 - SetY = 13,238 - SetX = 14,183 - SetY = 14,245 + SetX = 1,-197 + SetY = 1,137 + SetX = 2,-184 + SetX = 3,-170 + SetY = 3,138 + SetX = 4,-182 + SetY = 4,132 + SetX = 5,-205 + SetX = 6,-222 + SetY = 6,137 + SetX = 7,-206 + SetY = 7,131 + SetX = 8,-187 + SetY = 8,140 + SetX = 9,-171 + SetY = 9,142 + SetX = 10,-162 + SetY = 10,130 + SetX = 11,-185 + SetY = 11,129 + SetX = 12,-200 + SetY = 12,134 + SetX = 13,-208 + SetY = 13,142 + SetX = 14,-201 + SetY = 14,149 Play = 0,Metronome,94 #------------------------------- [OppMove,METRONOME] Name = METRONOME - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = finger.spoon Focus = Target - SetX = 0,382 - SetY = 0,100 + SetFrame = 0,1 + SetX = 0,-2 + SetY = 0,4 + SetZ = 0,27 SetZoomX = 0,200 SetZoomY = 0,200 - SetX = 1,375 - SetY = 1,101 - SetX = 2,366 - SetY = 2,100 - SetX = 3,360 - SetY = 3,104 - SetX = 4,373 - SetY = 4,107 - SetX = 5,391 - SetY = 5,110 - SetX = 6,406 - SetY = 6,106 - SetX = 7,399 - SetY = 7,107 - SetX = 8,377 - SetY = 8,108 - SetX = 9,368 - SetY = 9,110 - SetX = 10,382 - SetY = 10,112 - SetX = 11,398 - SetY = 11,115 - SetX = 12,409 - SetY = 12,111 - SetX = 13,403 - SetY = 13,114 - SetX = 14,392 - SetY = 14,113 + SetX = 1,-9 + SetY = 1,5 + SetX = 2,-18 + SetY = 2,4 + SetX = 3,-24 + SetY = 3,8 + SetX = 4,-11 + SetY = 4,11 + SetX = 5,7 + SetY = 5,14 + SetX = 6,22 + SetY = 6,10 + SetX = 7,15 + SetY = 7,11 + SetX = 8,-7 + SetY = 8,12 + SetX = 9,-16 + SetY = 9,14 + SetX = 10,-2 + SetY = 10,16 + SetX = 11,14 + SetY = 11,19 + SetX = 12,25 + SetY = 12,15 + SetX = 13,19 + SetY = 13,18 + SetX = 14,8 + SetY = 14,17 Play = 0,Metronome,80 diff --git a/PBS/Animations/Converted/Move/MIST.txt b/PBS/Animations/Converted/Move/MIST.txt index fbd02b29f..82fc2d939 100644 --- a/PBS/Animations/Converted/Move/MIST.txt +++ b/PBS/Animations/Converted/Move/MIST.txt @@ -3,52 +3,60 @@ [Move,MIST] Name = MIST - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 4,414 - SetY = 4,101 - SetX = 5,393 - SetY = 5,66 - SetX = 6,422 - SetY = 6,113 + SetFrame = 4,6 + SetX = 4,30 + SetY = 4,5 + SetZ = 4,28 + SetX = 5,9 + SetY = 5,-30 + SetX = 6,38 + SetY = 6,17 + SetVisible = 7,false Graphic = fly copy Focus = Target - SetX = 5,426 - SetY = 5,116 - SetX = 6,381 - SetY = 6,64 + SetFrame = 5,6 + SetX = 5,42 + SetY = 5,20 + SetZ = 5,29 + SetX = 6,-3 + SetY = 6,-32 + SetVisible = 7,false Graphic = fly copy Focus = Target - SetX = 0,385 - SetY = 0,99 + SetFrame = 0,6 + SetX = 0,1 + SetY = 0,3 + SetZ = 0,27 SetOpacity = 0,144 - SetX = 1,392 - SetY = 1,96 + SetX = 1,8 + SetY = 1,0 SetOpacity = 1,174 - SetX = 2,385 - SetY = 2,100 + SetX = 2,1 + SetY = 2,4 SetOpacity = 2,209 - SetX = 3,382 - SetY = 3,99 + SetX = 3,-2 + SetY = 3,3 SetOpacity = 3,255 - SetX = 4,362 - SetY = 4,100 - SetX = 5,359 - SetY = 5,103 - SetX = 6,351 - SetY = 6,119 - SetX = 7,388 - SetY = 7,96 - SetX = 8,392 - SetY = 8,93 + SetX = 4,-22 + SetY = 4,4 + SetX = 5,-25 + SetY = 5,7 + SetX = 6,-33 + SetY = 6,23 + SetX = 7,4 + SetY = 7,0 + SetX = 8,8 + SetY = 8,-3 SetOpacity = 8,200 Play = 0,Smokescreen,80 diff --git a/PBS/Animations/Converted/Move/MISTBALL.txt b/PBS/Animations/Converted/Move/MISTBALL.txt index 886f752d7..8ca910618 100644 --- a/PBS/Animations/Converted/Move/MISTBALL.txt +++ b/PBS/Animations/Converted/Move/MISTBALL.txt @@ -3,55 +3,62 @@ [Move,MISTBALL] Name = MISTBALL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = UserAndTarget - SetX = 3,386 - SetY = 3,108 + SetX = 3,201 + SetY = 3,-181 + SetZ = 3,28 SetOpacity = 3,200 - SetX = 4,388 - SetY = 4,110 - SetY = 5,109 + SetX = 4,203 + SetY = 4,-178 + SetY = 5,-179 SetOpacity = 5,143 - SetX = 6,391 - SetY = 6,110 + SetX = 6,205 + SetY = 6,-178 SetOpacity = 6,69 - SetX = 7,388 - SetY = 7,101 + SetFrame = 7,5 + SetX = 7,203 + SetY = 7,-192 SetOpacity = 7,144 + SetVisible = 8,false Graphic = fly copy Focus = UserAndTarget - SetX = 0,385 - SetY = 0,98 + SetX = 0,200 + SetY = 0,-196 + SetZ = 0,27 SetOpacity = 0,200 - SetX = 1,383 - SetY = 1,99 - SetX = 2,382 - SetY = 2,100 - SetX = 3,385 - SetY = 3,97 + SetX = 1,199 + SetY = 1,-195 + SetX = 2,198 + SetY = 2,-193 + SetFrame = 3,5 + SetX = 3,200 + SetY = 3,-198 SetOpacity = 3,255 - SetX = 4,386 - SetY = 4,96 + SetX = 4,201 + SetY = 4,-200 SetZoomX = 4,110 SetZoomY = 4,110 - SetX = 5,384 - SetY = 5,97 + SetX = 5,200 + SetY = 5,-198 SetZoomX = 5,100 SetZoomY = 5,100 - SetX = 6,387 - SetY = 6,99 - SetX = 7,385 - SetY = 7,98 - SetX = 8,378 - SetY = 8,92 - SetX = 9,377 - SetY = 9,101 + SetX = 6,202 + SetY = 6,-195 + SetFrame = 7,6 + SetX = 7,200 + SetY = 7,-196 + SetX = 8,195 + SetY = 8,-206 + SetX = 9,194 + SetY = 9,-192 + SetVisible = 12,false Play = 5,Wring Out,80 diff --git a/PBS/Animations/Converted/Move/MOONLIGHT.txt b/PBS/Animations/Converted/Move/MOONLIGHT.txt index 9c94249d0..bf0f7b930 100644 --- a/PBS/Animations/Converted/Move/MOONLIGHT.txt +++ b/PBS/Animations/Converted/Move/MOONLIGHT.txt @@ -3,25 +3,27 @@ [Move,MOONLIGHT] Name = MOONLIGHT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal2 Focus = Target - SetX = 0,384 - SetY = 0,206 + SetFrame = 0,12 + SetX = 0,0 + SetY = 0,110 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 - SetY = 1,190 - SetY = 2,158 - SetY = 3,110 - SetY = 4,70 - SetY = 5,38 - SetY = 6,14 - SetY = 7,-10 + SetY = 1,94 + SetY = 2,62 + SetY = 3,14 + SetY = 4,-26 + SetY = 5,-58 + SetY = 6,-82 + SetY = 7,-106 SetZoomX = 7,60 SetZoomY = 7,60 SetZoomX = 8,70 diff --git a/PBS/Animations/Converted/Move/MORNINGSUN.txt b/PBS/Animations/Converted/Move/MORNINGSUN.txt index 64c3a753c..96628bbbc 100644 --- a/PBS/Animations/Converted/Move/MORNINGSUN.txt +++ b/PBS/Animations/Converted/Move/MORNINGSUN.txt @@ -3,23 +3,41 @@ [Move,MORNINGSUN] Name = MORNINGSUN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Heal3 Focus = Target - SetX = 10,384 - SetY = 10,70 + SetFrame = 10,15 + SetX = 10,0 + SetY = 10,-26 + SetZ = 10,28 SetOpacity = 10,100 + SetVisible = 11,false Graphic = Heal3 Focus = Target - SetX = 0,384 - SetY = 0,70 + SetX = 0,0 + SetY = 0,-26 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,16 + SetFrame = 12,17 + SetFrame = 13,15 SetOpacity = 13,150 + SetFrame = 14,16 SetOpacity = 14,100 Play = 0,Saint7,80 diff --git a/PBS/Animations/Converted/Move/NIGHTMARE.txt b/PBS/Animations/Converted/Move/NIGHTMARE.txt index ece9c7e97..f2477d320 100644 --- a/PBS/Animations/Converted/Move/NIGHTMARE.txt +++ b/PBS/Animations/Converted/Move/NIGHTMARE.txt @@ -3,116 +3,164 @@ [Move,NIGHTMARE] Name = NIGHTMARE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 022-Darkness01 Focus = Target - SetX = 1,424 - SetY = 1,46 + SetFrame = 1,6 + SetX = 1,40 + SetY = 1,-50 + SetZ = 1,28 + SetFrame = 2,7 + SetFrame = 3,8 + SetFrame = 4,9 SetFlip = 5,true - SetX = 5,344 - SetY = 5,78 + SetX = 5,-40 + SetY = 5,-18 + SetFrame = 6,5 SetFlip = 6,false - SetX = 6,376 - SetY = 6,118 + SetX = 6,-8 + SetY = 6,22 SetOpacity = 6,120 - SetX = 7,424 - SetY = 7,86 + SetFrame = 7,9 + SetX = 7,40 + SetY = 7,-10 SetOpacity = 7,255 SetZoomX = 8,110 SetZoomY = 8,110 SetOpacity = 8,150 SetFlip = 9,true - SetX = 9,336 - SetY = 9,70 + SetX = 9,-48 + SetY = 9,-26 SetZoomX = 9,100 SetZoomY = 9,100 SetOpacity = 9,255 SetZoomX = 10,110 SetZoomY = 10,110 SetOpacity = 10,150 - SetX = 11,376 - SetY = 11,94 + SetFrame = 11,13 + SetX = 11,-8 + SetY = 11,-2 SetZoomX = 11,100 SetZoomY = 11,100 Graphic = 022-Darkness01 Focus = Target + SetFrame = 2,6 SetFlip = 2,true - SetX = 2,344 - SetY = 2,78 + SetX = 2,-40 + SetY = 2,-18 + SetZ = 2,29 + SetFrame = 3,7 + SetFrame = 4,8 + SetFrame = 5,4 SetFlip = 5,false - SetX = 5,376 - SetY = 5,118 + SetX = 5,-8 + SetY = 5,22 SetOpacity = 5,110 - SetX = 6,424 - SetY = 6,86 + SetFrame = 6,8 + SetX = 6,40 + SetY = 6,-10 SetOpacity = 6,255 + SetFrame = 7,7 SetFlip = 7,true - SetX = 7,336 - SetY = 7,70 - SetX = 9,376 - SetY = 9,94 + SetX = 7,-48 + SetY = 7,-26 + SetFrame = 8,8 + SetFrame = 9,11 + SetX = 9,-8 + SetY = 9,-2 SetOpacity = 9,200 + SetFrame = 10,12 SetOpacity = 10,255 + SetVisible = 11,false Graphic = 022-Darkness01 Focus = Target - SetX = 4,376 - SetY = 4,118 + SetFrame = 4,3 + SetX = 4,-8 + SetY = 4,22 + SetZ = 4,30 SetOpacity = 4,100 - SetX = 5,424 - SetY = 5,86 + SetFrame = 5,7 + SetX = 5,40 + SetY = 5,-10 SetOpacity = 5,255 + SetFrame = 6,6 SetFlip = 6,true - SetX = 6,336 - SetY = 6,30 + SetX = 6,-48 + SetY = 6,-66 + SetFrame = 7,12 SetFlip = 7,false - SetX = 7,392 - SetY = 7,94 + SetX = 7,8 + SetY = 7,-2 + SetFrame = 8,13 SetOpacity = 8,150 + SetVisible = 9,false Graphic = 022-Darkness01 Focus = Target - SetX = 4,424 - SetY = 4,86 - SetX = 5,392 - SetY = 5,94 + SetFrame = 4,6 + SetX = 4,40 + SetY = 4,-10 + SetZ = 4,31 + SetFrame = 5,10 + SetX = 5,8 + SetY = 5,-2 SetOpacity = 5,100 + SetFrame = 6,11 SetOpacity = 6,200 + SetVisible = 7,false + + Graphic = 022-Darkness01 + Focus = Target + SetFrame = 8,10 SetFlip = 8,true - SetX = 8,376 + SetX = 8,-8 + SetY = 8,-2 + SetZ = 8,31 SetOpacity = 8,100 + SetVisible = 9,false Graphic = 022-Darkness01 Focus = Target - SetX = 0,384 - SetY = 0,102 + SetX = 0,0 + SetY = 0,6 + SetZ = 0,27 SetOpacity = 0,100 + SetFrame = 1,1 SetOpacity = 1,150 + SetFrame = 2,2 SetOpacity = 2,200 + SetFrame = 3,1 SetFlip = 3,true SetOpacity = 3,255 + SetFrame = 4,0 SetOpacity = 4,150 + SetFrame = 5,9 SetFlip = 5,false - SetX = 5,424 - SetY = 5,46 + SetX = 5,40 + SetY = 5,-50 SetZoomX = 5,110 SetZoomY = 5,110 SetFlip = 6,true - SetX = 6,344 - SetY = 6,78 + SetX = 6,-40 + SetY = 6,-18 + SetFrame = 7,4 SetFlip = 7,false - SetX = 7,376 - SetY = 7,118 + SetX = 7,-8 + SetY = 7,22 SetZoomX = 7,100 SetZoomY = 7,100 SetOpacity = 7,100 + SetFrame = 8,3 SetOpacity = 8,90 + SetFrame = 9,4 SetOpacity = 9,80 + SetFrame = 10,5 SetOpacity = 10,70 SetOpacity = 11,50 diff --git a/PBS/Animations/Converted/Move/OUTRAGE.txt b/PBS/Animations/Converted/Move/OUTRAGE.txt index 948a974a2..5cdf4f566 100644 --- a/PBS/Animations/Converted/Move/OUTRAGE.txt +++ b/PBS/Animations/Converted/Move/OUTRAGE.txt @@ -3,162 +3,207 @@ [Move,OUTRAGE] Name = OUTRAGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Fogo - 01 Focus = UserAndTarget - SetX = 0,102 - SetY = 0,161 + SetFrame = 0,4 + SetX = 0,-20 + SetY = 0,-98 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 + SetFrame = 1,3 + SetFrame = 2,2 + SetFrame = 3,3 SetFlip = 3,true + SetFrame = 4,4 + SetFrame = 5,8 SetFlip = 5,false - SetX = 5,262 - SetY = 5,135 - SetX = 6,307 - SetY = 6,91 + SetX = 5,104 + SetY = 5,-139 + SetFrame = 6,9 + SetX = 6,139 + SetY = 6,-207 SetFlip = 7,true - SetX = 7,332 - SetY = 7,72 + SetX = 7,159 + SetY = 7,-237 SetOpacity = 7,100 SetFlip = 8,false - SetX = 8,396 - SetY = 8,104 - SetX = 9,320 - SetY = 9,72 + SetX = 8,209 + SetY = 8,-187 + SetX = 9,150 + SetY = 9,-237 + SetFrame = 10,8 SetFlip = 10,true - SetX = 10,275 - SetY = 10,91 + SetX = 10,114 + SetY = 10,-207 SetOpacity = 10,255 - SetX = 11,294 - SetY = 11,72 + SetFrame = 11,9 + SetX = 11,129 + SetY = 11,-237 SetOpacity = 11,100 SetFlip = 12,false - SetX = 12,371 - SetY = 12,98 + SetX = 12,189 + SetY = 12,-196 Graphic = Fogo - 01 Focus = UserAndTarget - SetX = 2,179 - SetY = 2,198 + SetFrame = 2,5 + SetX = 2,39 + SetY = 2,-40 + SetZ = 2,28 SetZoomX = 2,50 SetZoomY = 2,50 SetOpacity = 2,100 - SetX = 3,204 - SetY = 3,173 + SetFrame = 3,6 + SetX = 3,59 + SetY = 3,-79 SetOpacity = 3,255 - SetX = 4,230 - SetY = 4,154 + SetFrame = 4,7 + SetX = 4,79 + SetY = 4,-109 SetFlip = 5,true - SetX = 5,179 - SetY = 5,85 - SetX = 6,211 - SetY = 6,60 + SetX = 5,39 + SetY = 5,-217 + SetFrame = 6,8 + SetX = 6,64 + SetY = 6,-256 SetOpacity = 6,100 SetFlip = 7,false - SetX = 7,345 - SetY = 7,135 + SetX = 7,169 + SetY = 7,-139 SetOpacity = 7,255 - SetX = 8,428 - SetY = 8,179 + SetX = 8,234 + SetY = 8,-70 SetOpacity = 8,100 + SetFrame = 9,7 SetFlip = 9,true - SetX = 9,243 - SetY = 9,123 + SetX = 9,89 + SetY = 9,-157 SetOpacity = 9,255 + SetFrame = 10,8 SetFlip = 10,false - SetX = 10,230 - SetY = 10,66 - SetX = 11,339 - SetY = 11,129 + SetX = 10,79 + SetY = 10,-246 + SetX = 11,164 + SetY = 11,-148 + SetVisible = 12,false Graphic = Fogo - 01 Focus = UserAndTarget + SetFrame = 3,5 SetFlip = 3,true - SetX = 3,89 - SetY = 3,161 + SetX = 3,-30 + SetY = 3,-98 + SetZ = 3,29 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,140 - SetY = 4,116 + SetFrame = 4,6 + SetX = 4,9 + SetY = 4,-168 SetFlip = 5,false - SetX = 5,249 - SetY = 5,198 - SetX = 6,307 - SetY = 6,161 + SetX = 5,94 + SetY = 5,-40 + SetFrame = 6,7 + SetX = 6,139 + SetY = 6,-98 SetFlip = 7,true - SetX = 7,160 - SetY = 7,66 + SetX = 7,25 + SetY = 7,-246 SetOpacity = 7,100 + SetFrame = 8,8 SetFlip = 8,false - SetX = 8,288 - SetY = 8,104 + SetX = 8,125 + SetY = 8,-187 SetOpacity = 8,255 - SetX = 9,198 - SetY = 9,91 - SetX = 10,288 - SetY = 10,148 + SetFrame = 9,7 + SetX = 9,54 + SetY = 9,-207 + SetX = 10,125 + SetY = 10,-118 + SetVisible = 11,false Graphic = Fogo - 01 Focus = UserAndTarget - SetX = 4,185 - SetY = 4,224 + SetFrame = 4,5 + SetX = 4,44 + SetY = 4,0 + SetZ = 4,30 SetZoomX = 4,50 SetZoomY = 4,50 SetFlip = 5,true - SetX = 5,115 - SetY = 5,154 - SetX = 6,128 - SetY = 6,110 + SetX = 5,-10 + SetY = 5,-109 + SetFrame = 6,6 + SetX = 6,0 + SetY = 6,-178 + SetFrame = 7,7 SetFlip = 7,false - SetX = 7,371 - SetY = 7,198 + SetX = 7,189 + SetY = 7,-40 SetOpacity = 7,100 + SetFrame = 8,6 SetFlip = 8,true - SetX = 8,204 - SetY = 8,154 + SetX = 8,59 + SetY = 8,-109 SetOpacity = 8,255 SetFlip = 9,false - SetX = 9,224 - SetY = 9,186 + SetX = 9,75 + SetY = 9,-59 + SetVisible = 10,false Graphic = Fogo - 01 Focus = UserAndTarget - SetX = 5,224 - SetY = 5,217 + SetFrame = 5,5 + SetX = 5,75 + SetY = 5,-10 + SetZ = 5,31 SetZoomX = 5,50 SetZoomY = 5,50 SetOpacity = 5,100 - SetX = 6,294 + SetFrame = 6,6 + SetX = 6,129 SetOpacity = 6,255 - SetX = 7,249 - SetY = 7,135 - SetX = 8,166 + SetFrame = 7,7 + SetX = 7,94 + SetY = 7,-139 + SetFrame = 8,6 + SetX = 8,29 + SetVisible = 9,false Graphic = Fogo - 01 Focus = UserAndTarget - SetX = 5,166 - SetY = 5,198 + SetFrame = 5,5 + SetX = 5,29 + SetY = 5,-40 + SetZ = 5,32 SetZoomX = 5,50 SetZoomY = 5,50 - SetX = 6,204 - SetY = 6,173 + SetFrame = 6,6 + SetX = 6,59 + SetY = 6,-79 + SetFrame = 7,5 SetFlip = 7,true - SetX = 7,172 - SetY = 7,186 + SetX = 7,34 + SetY = 7,-59 SetFlip = 8,false - SetY = 8,217 + SetY = 8,-10 + SetVisible = 9,false Graphic = Fogo - 01 Focus = UserAndTarget - SetX = 7,128 - SetY = 7,186 + SetFrame = 7,5 + SetX = 7,0 + SetY = 7,-59 + SetZ = 7,33 SetZoomX = 7,50 SetZoomY = 7,50 + SetVisible = 8,false Play = 0,Fire2,80 Play = 0,Explosion6,80 diff --git a/PBS/Animations/Converted/Move/OVERHEAT.txt b/PBS/Animations/Converted/Move/OVERHEAT.txt index a62f45ed3..ced5a5d8c 100644 --- a/PBS/Animations/Converted/Move/OVERHEAT.txt +++ b/PBS/Animations/Converted/Move/OVERHEAT.txt @@ -3,103 +3,140 @@ [Move,OVERHEAT] Name = OVERHEAT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fire4 Focus = UserAndTarget - SetX = 0,134 - SetY = 0,179 - SetY = 1,173 - SetY = 2,167 - SetY = 3,161 - SetY = 4,154 - SetY = 5,148 - SetY = 6,142 - SetY = 7,135 - SetY = 8,129 - SetY = 9,123 - SetY = 10,116 - SetY = 11,110 + SetX = 0,4 + SetY = 0,-70 + SetZ = 0,27 + SetFrame = 1,1 + SetY = 1,-79 + SetFrame = 2,2 + SetY = 2,-89 + SetFrame = 3,3 + SetY = 3,-98 + SetFrame = 4,4 + SetY = 4,-109 + SetFrame = 5,5 + SetY = 5,-118 + SetFrame = 6,6 + SetY = 6,-128 + SetFrame = 7,7 + SetY = 7,-139 + SetFrame = 8,8 + SetY = 8,-148 + SetFrame = 9,9 + SetY = 9,-157 + SetFrame = 10,10 + SetY = 10,-168 + SetFrame = 11,11 + SetY = 11,-178 Graphic = fire4 Focus = UserAndTarget - SetX = 1,172 - SetY = 1,179 - SetX = 2,179 - SetY = 2,198 - SetX = 4,313 - SetY = 4,123 - SetX = 5,364 - SetY = 5,110 - SetX = 6,140 - SetY = 6,41 - SetFlip = 7,true - SetX = 7,467 - SetY = 7,211 - SetOpacity = 7,100 + SetX = 1,34 + SetY = 1,-70 + SetZ = 1,28 + SetX = 2,39 + SetY = 2,-40 + SetVisible = 3,false Graphic = fire4 Focus = UserAndTarget - SetX = 2,211 - SetY = 2,123 - SetX = 3,243 - SetY = 3,167 - SetX = 4,51 - SetY = 4,85 - SetX = 5,32 - SetY = 5,60 - SetX = 6,377 - SetY = 6,211 + SetX = 2,64 + SetY = 2,-157 + SetZ = 2,29 + SetX = 3,89 + SetY = 3,-89 + SetX = 4,-60 + SetY = 4,-217 + SetFrame = 5,1 + SetX = 5,-75 + SetY = 5,-256 + SetX = 6,194 + SetY = 6,-20 + SetVisible = 7,false Graphic = fire4 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,224 - SetX = 3,243 - SetY = 3,79 - SetX = 4,345 - SetY = 4,224 - SetX = 5,435 - SetY = 5,230 + SetX = 2,19 + SetY = 2,0 + SetZ = 2,30 + SetFrame = 3,1 + SetX = 3,89 + SetY = 3,-226 + SetX = 4,169 + SetY = 4,0 + SetFrame = 5,2 + SetX = 5,239 + SetY = 5,9 SetOpacity = 5,100 + SetFrame = 6,1 SetFlip = 6,true - SetX = 6,288 - SetY = 6,53 + SetX = 6,125 + SetY = 6,-267 SetOpacity = 6,255 + SetVisible = 7,false Graphic = fire4 Focus = UserAndTarget - SetX = 3,96 - SetY = 3,167 - SetX = 4,140 - SetY = 4,129 - SetY = 5,72 + SetX = 3,-25 + SetY = 3,-89 + SetZ = 3,31 + SetX = 4,9 + SetY = 4,-148 + SetY = 5,-237 + SetVisible = 6,false Graphic = fire4 Focus = UserAndTarget - SetX = 3,256 - SetY = 3,217 - SetX = 4,192 - SetY = 4,198 - SetX = 5,268 - SetY = 5,205 + SetX = 3,100 + SetY = 3,-10 + SetZ = 3,32 + SetX = 4,50 + SetY = 4,-40 + SetX = 5,109 + SetY = 5,-29 + SetVisible = 6,false Graphic = fire4 Focus = UserAndTarget - SetX = 4,83 - SetY = 4,186 - SetX = 5,32 - SetY = 5,192 + SetX = 4,144 + SetY = 4,-157 + SetZ = 4,28 + SetFrame = 5,1 + SetX = 5,184 + SetY = 5,-178 + SetX = 6,9 + SetY = 6,-285 + SetFrame = 7,2 + SetFlip = 7,true + SetX = 7,264 + SetY = 7,-20 + SetOpacity = 7,100 + SetVisible = 8,false Graphic = fire4 Focus = UserAndTarget - SetX = 4,179 - SetY = 4,135 - SetX = 5,236 - SetY = 5,79 + SetX = 4,-35 + SetY = 4,-59 + SetZ = 4,33 + SetX = 5,-75 + SetY = 5,-50 + SetVisible = 6,false + + Graphic = fire4 + Focus = UserAndTarget + SetX = 4,39 + SetY = 4,-139 + SetZ = 4,34 + SetX = 5,84 + SetY = 5,-226 + SetVisible = 6,false Play = 0,Fire3,80 diff --git a/PBS/Animations/Converted/Move/PAYDAY.txt b/PBS/Animations/Converted/Move/PAYDAY.txt index bdbf2c636..79b2070f7 100644 --- a/PBS/Animations/Converted/Move/PAYDAY.txt +++ b/PBS/Animations/Converted/Move/PAYDAY.txt @@ -3,59 +3,70 @@ [Move,PAYDAY] Name = PAYDAY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 2,128 - SetY = 2,236 - SetX = 3,172 - SetY = 3,148 - SetX = 4,204 - SetY = 4,79 - SetX = 5,300 - SetY = 5,53 - SetX = 6,198 - SetY = 6,60 - SetX = 7,224 - SetY = 7,53 - SetX = 8,313 - SetY = 8,79 + SetFrame = 2,12 + SetX = 2,0 + SetY = 2,18 + SetZ = 2,28 + SetX = 3,34 + SetY = 3,-118 + SetX = 4,59 + SetY = 4,-226 + SetX = 5,134 + SetY = 5,-267 + SetX = 6,54 + SetY = 6,-256 + SetX = 7,75 + SetY = 7,-267 + SetX = 8,144 + SetY = 8,-226 + SetVisible = 9,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 4,128 - SetY = 4,236 - SetX = 5,153 - SetY = 5,135 + SetFrame = 4,12 + SetX = 4,0 + SetY = 4,18 + SetZ = 4,29 + SetX = 5,19 + SetY = 5,-139 + SetVisible = 7,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 5,128 - SetY = 5,236 + SetFrame = 5,12 + SetX = 5,0 + SetY = 5,18 + SetZ = 5,30 + SetVisible = 6,false Graphic = 008-Weapon03 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,172 - SetY = 1,142 - SetX = 2,224 - SetY = 2,91 - SetX = 3,262 - SetY = 3,66 - SetX = 4,326 - SetY = 4,79 - SetX = 5,358 - SetY = 5,110 - SetX = 7,313 - SetY = 7,79 - SetX = 8,358 - SetY = 8,110 + SetFrame = 0,12 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,34 + SetY = 1,-128 + SetX = 2,75 + SetY = 2,-207 + SetX = 3,104 + SetY = 3,-246 + SetX = 4,154 + SetY = 4,-226 + SetX = 5,179 + SetY = 5,-178 + SetX = 7,144 + SetY = 7,-226 + SetX = 8,179 + SetY = 8,-178 Play = 0,Select,80 Play = 2,Select,80 diff --git a/PBS/Animations/Converted/Move/PETALDANCE.txt b/PBS/Animations/Converted/Move/PETALDANCE.txt index a620bc3d9..118da1da8 100644 --- a/PBS/Animations/Converted/Move/PETALDANCE.txt +++ b/PBS/Animations/Converted/Move/PETALDANCE.txt @@ -3,97 +3,122 @@ [Move,PETALDANCE] Name = PETALDANCE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Anima (1) Focus = Target - SetX = 2,576 - SetY = 2,-42 - SetX = 3,544 - SetY = 3,6 + SetX = 2,192 + SetY = 2,-138 + SetZ = 2,28 + SetX = 3,160 + SetY = 3,-90 + SetFrame = 4,1 SetFlip = 4,true - SetX = 4,504 - SetY = 4,62 - SetX = 5,448 - SetY = 5,126 - SetX = 6,408 - SetY = 6,166 - SetX = 7,392 - SetY = 7,222 + SetX = 4,120 + SetY = 4,-34 + SetX = 5,64 + SetY = 5,30 + SetFrame = 6,2 + SetX = 6,24 + SetY = 6,70 + SetX = 7,8 + SetY = 7,126 + SetFrame = 8,1 SetFlip = 8,false - SetX = 8,552 - SetY = 8,166 - SetX = 9,400 - SetY = 9,70 + SetX = 8,168 + SetY = 8,70 + SetFrame = 9,2 + SetX = 9,16 + SetY = 9,-26 SetZoomX = 9,120 SetZoomY = 9,120 + SetVisible = 10,false Graphic = Anima (1) Focus = Target - SetX = 3,344 - SetY = 3,-50 - SetX = 4,384 - SetY = 4,-2 - SetX = 5,416 - SetY = 5,38 - SetX = 6,464 - SetY = 6,86 - SetX = 7,512 - SetY = 7,142 + SetFrame = 3,2 + SetX = 3,-40 + SetY = 3,-146 + SetZ = 3,29 + SetX = 4,0 + SetY = 4,-98 + SetFrame = 5,3 + SetX = 5,32 + SetY = 5,-58 + SetX = 6,80 + SetY = 6,-10 + SetFrame = 7,1 + SetX = 7,128 + SetY = 7,46 + SetFrame = 8,2 SetFlip = 8,true - SetX = 8,96 - SetY = 8,62 + SetX = 8,-288 + SetY = 8,-34 + SetVisible = 9,false Graphic = Anima (1) Focus = Target - SetX = 5,320 - SetY = 5,-42 - SetX = 6,280 - SetY = 6,6 - SetX = 7,192 - SetY = 7,30 - SetX = 8,360 - SetY = 8,22 + SetX = 5,-64 + SetY = 5,-138 + SetZ = 5,30 + SetX = 6,-104 + SetY = 6,-90 + SetX = 7,-192 + SetY = 7,-66 + SetFrame = 8,1 + SetX = 8,-24 + SetY = 8,-74 + SetVisible = 9,false Graphic = Anima (1) Focus = Target - SetX = 7,320 - SetY = 7,-58 + SetFrame = 7,1 + SetX = 7,-64 + SetY = 7,-154 + SetZ = 7,31 + SetVisible = 8,false Graphic = Anima (1) Focus = Target - SetX = 0,224 - SetY = 0,-34 - SetX = 1,240 - SetY = 1,6 - SetX = 2,272 - SetY = 2,38 - SetX = 3,320 - SetY = 3,94 + SetFrame = 0,3 + SetX = 0,-160 + SetY = 0,-130 + SetZ = 0,27 + SetX = 1,-144 + SetY = 1,-90 + SetFrame = 2,2 + SetX = 2,-112 + SetY = 2,-58 + SetX = 3,-64 + SetY = 3,-2 SetFlip = 4,true - SetX = 4,376 - SetX = 5,360 - SetY = 5,102 - SetX = 6,320 - SetY = 6,126 - SetX = 7,264 - SetY = 7,174 - SetX = 8,200 - SetY = 8,222 - SetX = 9,72 - SetY = 9,86 + SetX = 4,-8 + SetX = 5,-24 + SetY = 5,6 + SetFrame = 6,3 + SetX = 6,-64 + SetY = 6,30 + SetX = 7,-120 + SetY = 7,78 + SetFrame = 8,1 + SetX = 8,-184 + SetY = 8,126 + SetFrame = 9,2 + SetX = 9,-312 + SetY = 9,-10 SetFlip = 10,false - SetX = 10,464 - SetY = 10,118 + SetX = 10,80 + SetY = 10,22 SetZoomX = 10,120 SetZoomY = 10,120 + SetFrame = 11,0 SetFlip = 11,true - SetX = 11,568 - SetY = 11,182 + SetX = 11,184 + SetY = 11,86 SetZoomX = 11,100 SetZoomY = 11,100 diff --git a/PBS/Animations/Converted/Move/PINMISSILE.txt b/PBS/Animations/Converted/Move/PINMISSILE.txt index 8705f1517..ad497d9db 100644 --- a/PBS/Animations/Converted/Move/PINMISSILE.txt +++ b/PBS/Animations/Converted/Move/PINMISSILE.txt @@ -3,85 +3,96 @@ [Move,PINMISSILE] Name = PINMISSILE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,173 - SetX = 3,185 - SetY = 3,135 - SetX = 4,230 - SetY = 4,104 + SetX = 2,19 + SetY = 2,-79 + SetZ = 2,28 + SetX = 3,44 + SetY = 3,-139 + SetX = 4,79 + SetY = 4,-187 SetAngle = 4,345 - SetX = 5,268 - SetY = 5,85 + SetX = 5,109 + SetY = 5,-217 SetAngle = 5,335 - SetX = 6,236 - SetY = 6,98 + SetX = 6,84 + SetY = 6,-196 SetAngle = 6,345 - SetX = 7,384 - SetY = 7,91 + SetX = 7,200 + SetY = 7,-207 SetAngle = 7,300 - SetX = 8,377 + SetFrame = 8,14 + SetX = 8,194 SetAngle = 8,0 SetOpacity = 8,50 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 4,166 - SetY = 4,161 - SetX = 5,198 - SetY = 5,129 - SetX = 6,364 - SetY = 6,85 + SetX = 4,29 + SetY = 4,-98 + SetZ = 4,29 + SetX = 5,54 + SetY = 5,-148 + SetFrame = 6,14 + SetX = 6,184 + SetY = 6,-217 SetZoomX = 6,125 SetZoomY = 6,125 SetOpacity = 6,50 - SetX = 7,403 - SetY = 7,91 + SetX = 7,214 + SetY = 7,-207 SetZoomX = 7,100 SetZoomY = 7,100 SetZoomX = 8,125 SetZoomY = 8,125 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 5,364 - SetY = 5,91 + SetFrame = 5,14 + SetX = 5,184 + SetY = 5,-207 + SetZ = 5,30 SetOpacity = 5,50 + SetVisible = 6,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,160 - SetY = 0,179 - SetX = 1,179 - SetY = 1,142 - SetX = 2,211 - SetY = 2,110 + SetX = 0,25 + SetY = 0,-70 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-128 + SetX = 2,64 + SetY = 2,-178 SetAngle = 2,345 - SetX = 3,243 - SetY = 3,104 + SetX = 3,89 + SetY = 3,-187 SetAngle = 3,335 - SetX = 4,294 - SetY = 4,85 + SetX = 4,129 + SetY = 4,-217 SetAngle = 4,325 - SetX = 5,345 - SetY = 5,91 + SetX = 5,169 + SetY = 5,-207 SetAngle = 5,300 - SetX = 6,313 - SetY = 6,79 + SetX = 6,144 + SetY = 6,-226 SetAngle = 6,325 - SetX = 7,288 - SetY = 7,72 - SetX = 8,358 - SetY = 8,91 + SetX = 7,125 + SetY = 7,-237 + SetX = 8,179 + SetY = 8,-207 SetAngle = 8,300 - SetX = 9,377 + SetFrame = 9,14 + SetX = 9,194 SetZoomX = 9,125 SetZoomY = 9,125 SetAngle = 9,0 @@ -97,39 +108,41 @@ Name = PINMISSILE [Move,PINMISSILE,1] Name = Pin Missile hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 0,160 - SetY = 0,179 - SetX = 1,179 - SetY = 1,142 - SetX = 2,211 - SetY = 2,110 + SetX = 0,25 + SetY = 0,-70 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-128 + SetX = 2,64 + SetY = 2,-178 SetAngle = 2,345 - SetX = 3,243 - SetY = 3,104 + SetX = 3,89 + SetY = 3,-187 SetAngle = 3,335 - SetX = 4,294 - SetY = 4,85 + SetX = 4,129 + SetY = 4,-217 SetAngle = 4,325 - SetX = 5,345 - SetY = 5,91 + SetX = 5,169 + SetY = 5,-207 SetAngle = 5,300 - SetX = 6,313 - SetY = 6,79 + SetX = 6,144 + SetY = 6,-226 SetAngle = 6,325 - SetX = 7,288 - SetY = 7,72 - SetX = 8,358 - SetY = 8,91 + SetX = 7,125 + SetY = 7,-237 + SetX = 8,179 + SetY = 8,-207 SetAngle = 8,300 - SetX = 9,377 + SetFrame = 9,14 + SetX = 9,194 SetZoomX = 9,125 SetZoomY = 9,125 SetAngle = 9,0 @@ -137,49 +150,58 @@ Name = Pin Missile hit 2 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,173 - SetX = 3,185 - SetY = 3,135 - SetX = 4,230 - SetY = 4,104 + SetX = 2,19 + SetY = 2,-79 + SetZ = 2,28 + SetX = 3,44 + SetY = 3,-139 + SetX = 4,79 + SetY = 4,-187 SetAngle = 4,345 - SetX = 5,268 - SetY = 5,85 + SetX = 5,109 + SetY = 5,-217 SetAngle = 5,335 - SetX = 6,236 - SetY = 6,98 + SetX = 6,84 + SetY = 6,-196 SetAngle = 6,345 - SetX = 7,384 - SetY = 7,91 + SetX = 7,200 + SetY = 7,-207 SetAngle = 7,300 - SetX = 8,377 + SetFrame = 8,14 + SetX = 8,194 SetAngle = 8,0 SetOpacity = 8,50 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 4,166 - SetY = 4,161 - SetX = 5,198 - SetY = 5,129 - SetX = 6,364 - SetY = 6,85 + SetX = 4,29 + SetY = 4,-98 + SetZ = 4,29 + SetX = 5,54 + SetY = 5,-148 + SetFrame = 6,14 + SetX = 6,184 + SetY = 6,-217 SetZoomX = 6,125 SetZoomY = 6,125 SetOpacity = 6,50 - SetX = 7,403 - SetY = 7,91 + SetX = 7,214 + SetY = 7,-207 SetZoomX = 7,100 SetZoomY = 7,100 SetZoomX = 8,125 SetZoomY = 8,125 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 5,364 - SetY = 5,91 + SetFrame = 5,14 + SetX = 5,184 + SetY = 5,-207 + SetZ = 5,30 SetOpacity = 5,50 + SetVisible = 6,false Play = 0,throw,80 Play = 2,throw,80 @@ -191,45 +213,50 @@ Name = Pin Missile hit 2 [Move,PINMISSILE,2] Name = Pin Missile hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 5,364 - SetY = 5,91 + SetFrame = 5,14 + SetX = 5,184 + SetY = 5,-207 + SetZ = 5,30 SetOpacity = 5,50 + SetVisible = 6,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,160 - SetY = 0,179 - SetX = 1,179 - SetY = 1,142 - SetX = 2,211 - SetY = 2,110 + SetX = 0,25 + SetY = 0,-70 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-128 + SetX = 2,64 + SetY = 2,-178 SetAngle = 2,345 - SetX = 3,243 - SetY = 3,104 + SetX = 3,89 + SetY = 3,-187 SetAngle = 3,335 - SetX = 4,294 - SetY = 4,85 + SetX = 4,129 + SetY = 4,-217 SetAngle = 4,325 - SetX = 5,345 - SetY = 5,91 + SetX = 5,169 + SetY = 5,-207 SetAngle = 5,300 - SetX = 6,313 - SetY = 6,79 + SetX = 6,144 + SetY = 6,-226 SetAngle = 6,325 - SetX = 7,288 - SetY = 7,72 - SetX = 8,358 - SetY = 8,91 + SetX = 7,125 + SetY = 7,-237 + SetX = 8,179 + SetY = 8,-207 SetAngle = 8,300 - SetX = 9,377 + SetFrame = 9,14 + SetX = 9,194 SetZoomX = 9,125 SetZoomY = 9,125 SetAngle = 9,0 @@ -237,43 +264,49 @@ Name = Pin Missile hit 3 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,173 - SetX = 3,185 - SetY = 3,135 - SetX = 4,230 - SetY = 4,104 + SetX = 2,19 + SetY = 2,-79 + SetZ = 2,28 + SetX = 3,44 + SetY = 3,-139 + SetX = 4,79 + SetY = 4,-187 SetAngle = 4,345 - SetX = 5,268 - SetY = 5,85 + SetX = 5,109 + SetY = 5,-217 SetAngle = 5,335 - SetX = 6,236 - SetY = 6,98 + SetX = 6,84 + SetY = 6,-196 SetAngle = 6,345 - SetX = 7,384 - SetY = 7,91 + SetX = 7,200 + SetY = 7,-207 SetAngle = 7,300 - SetX = 8,377 + SetFrame = 8,14 + SetX = 8,194 SetAngle = 8,0 SetOpacity = 8,50 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 4,166 - SetY = 4,161 - SetX = 5,198 - SetY = 5,129 - SetX = 6,364 - SetY = 6,85 + SetX = 4,29 + SetY = 4,-98 + SetZ = 4,29 + SetX = 5,54 + SetY = 5,-148 + SetFrame = 6,14 + SetX = 6,184 + SetY = 6,-217 SetZoomX = 6,125 SetZoomY = 6,125 SetOpacity = 6,50 - SetX = 7,403 - SetY = 7,91 + SetX = 7,214 + SetY = 7,-207 SetZoomX = 7,100 SetZoomY = 7,100 SetZoomX = 8,125 SetZoomY = 8,125 + SetVisible = 9,false Play = 0,throw,80 Play = 2,throw,80 @@ -285,63 +318,71 @@ Name = Pin Missile hit 3 [Move,PINMISSILE,3] Name = Pin Missile hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 4,166 - SetY = 4,161 - SetX = 5,198 - SetY = 5,129 - SetX = 6,364 - SetY = 6,85 + SetX = 4,29 + SetY = 4,-98 + SetZ = 4,29 + SetX = 5,54 + SetY = 5,-148 + SetFrame = 6,14 + SetX = 6,184 + SetY = 6,-217 SetZoomX = 6,125 SetZoomY = 6,125 SetOpacity = 6,50 - SetX = 7,403 - SetY = 7,91 + SetX = 7,214 + SetY = 7,-207 SetZoomX = 7,100 SetZoomY = 7,100 SetZoomX = 8,125 SetZoomY = 8,125 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 5,364 - SetY = 5,91 + SetFrame = 5,14 + SetX = 5,184 + SetY = 5,-207 + SetZ = 5,30 SetOpacity = 5,50 + SetVisible = 6,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,160 - SetY = 0,179 - SetX = 1,179 - SetY = 1,142 - SetX = 2,211 - SetY = 2,110 + SetX = 0,25 + SetY = 0,-70 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-128 + SetX = 2,64 + SetY = 2,-178 SetAngle = 2,345 - SetX = 3,243 - SetY = 3,104 + SetX = 3,89 + SetY = 3,-187 SetAngle = 3,335 - SetX = 4,294 - SetY = 4,85 + SetX = 4,129 + SetY = 4,-217 SetAngle = 4,325 - SetX = 5,345 - SetY = 5,91 + SetX = 5,169 + SetY = 5,-207 SetAngle = 5,300 - SetX = 6,313 - SetY = 6,79 + SetX = 6,144 + SetY = 6,-226 SetAngle = 6,325 - SetX = 7,288 - SetY = 7,72 - SetX = 8,358 - SetY = 8,91 + SetX = 7,125 + SetY = 7,-237 + SetX = 8,179 + SetY = 8,-207 SetAngle = 8,300 - SetX = 9,377 + SetFrame = 9,14 + SetX = 9,194 SetZoomX = 9,125 SetZoomY = 9,125 SetAngle = 9,0 @@ -349,25 +390,28 @@ Name = Pin Missile hit 4 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,173 - SetX = 3,185 - SetY = 3,135 - SetX = 4,230 - SetY = 4,104 + SetX = 2,19 + SetY = 2,-79 + SetZ = 2,28 + SetX = 3,44 + SetY = 3,-139 + SetX = 4,79 + SetY = 4,-187 SetAngle = 4,345 - SetX = 5,268 - SetY = 5,85 + SetX = 5,109 + SetY = 5,-217 SetAngle = 5,335 - SetX = 6,236 - SetY = 6,98 + SetX = 6,84 + SetY = 6,-196 SetAngle = 6,345 - SetX = 7,384 - SetY = 7,91 + SetX = 7,200 + SetY = 7,-207 SetAngle = 7,300 - SetX = 8,377 + SetFrame = 8,14 + SetX = 8,194 SetAngle = 8,0 SetOpacity = 8,50 + SetVisible = 9,false Play = 0,throw,80 Play = 2,throw,80 @@ -379,85 +423,96 @@ Name = Pin Missile hit 4 [Move,PINMISSILE,4] Name = Pin Missile hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,173 - SetX = 3,185 - SetY = 3,135 - SetX = 4,230 - SetY = 4,104 + SetX = 2,19 + SetY = 2,-79 + SetZ = 2,28 + SetX = 3,44 + SetY = 3,-139 + SetX = 4,79 + SetY = 4,-187 SetAngle = 4,345 - SetX = 5,268 - SetY = 5,85 + SetX = 5,109 + SetY = 5,-217 SetAngle = 5,335 - SetX = 6,236 - SetY = 6,98 + SetX = 6,84 + SetY = 6,-196 SetAngle = 6,345 - SetX = 7,384 - SetY = 7,91 + SetX = 7,200 + SetY = 7,-207 SetAngle = 7,300 - SetX = 8,377 + SetFrame = 8,14 + SetX = 8,194 SetAngle = 8,0 SetOpacity = 8,50 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 4,166 - SetY = 4,161 - SetX = 5,198 - SetY = 5,129 - SetX = 6,364 - SetY = 6,85 + SetX = 4,29 + SetY = 4,-98 + SetZ = 4,29 + SetX = 5,54 + SetY = 5,-148 + SetFrame = 6,14 + SetX = 6,184 + SetY = 6,-217 SetZoomX = 6,125 SetZoomY = 6,125 SetOpacity = 6,50 - SetX = 7,403 - SetY = 7,91 + SetX = 7,214 + SetY = 7,-207 SetZoomX = 7,100 SetZoomY = 7,100 SetZoomX = 8,125 SetZoomY = 8,125 + SetVisible = 9,false Graphic = poison3 Focus = UserAndTarget - SetX = 5,364 - SetY = 5,91 + SetFrame = 5,14 + SetX = 5,184 + SetY = 5,-207 + SetZ = 5,30 SetOpacity = 5,50 + SetVisible = 6,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,160 - SetY = 0,179 - SetX = 1,179 - SetY = 1,142 - SetX = 2,211 - SetY = 2,110 + SetX = 0,25 + SetY = 0,-70 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-128 + SetX = 2,64 + SetY = 2,-178 SetAngle = 2,345 - SetX = 3,243 - SetY = 3,104 + SetX = 3,89 + SetY = 3,-187 SetAngle = 3,335 - SetX = 4,294 - SetY = 4,85 + SetX = 4,129 + SetY = 4,-217 SetAngle = 4,325 - SetX = 5,345 - SetY = 5,91 + SetX = 5,169 + SetY = 5,-207 SetAngle = 5,300 - SetX = 6,313 - SetY = 6,79 + SetX = 6,144 + SetY = 6,-226 SetAngle = 6,325 - SetX = 7,288 - SetY = 7,72 - SetX = 8,358 - SetY = 8,91 + SetX = 7,125 + SetY = 7,-237 + SetX = 8,179 + SetY = 8,-207 SetAngle = 8,300 - SetX = 9,377 + SetFrame = 9,14 + SetX = 9,194 SetZoomX = 9,125 SetZoomY = 9,125 SetAngle = 9,0 diff --git a/PBS/Animations/Converted/Move/POISONFANG.txt b/PBS/Animations/Converted/Move/POISONFANG.txt index 7bd32d518..20800c185 100644 --- a/PBS/Animations/Converted/Move/POISONFANG.txt +++ b/PBS/Animations/Converted/Move/POISONFANG.txt @@ -3,50 +3,70 @@ [Move,POISONFANG] Name = POISONFANG - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = element fangs Focus = Target - SetX = 7,354 - SetY = 7,107 - SetX = 8,359 - SetY = 8,100 + SetFrame = 7,13 + SetX = 7,-30 + SetY = 7,11 + SetZ = 7,28 + SetX = 8,-25 + SetY = 8,4 + SetVisible = 9,false Graphic = element fangs Focus = Target - SetX = 7,450 - SetY = 7,106 - SetX = 8,444 - SetY = 8,101 + SetFrame = 7,13 + SetX = 7,66 + SetY = 7,10 + SetZ = 7,29 + SetX = 8,60 + SetY = 8,5 + SetVisible = 9,false Graphic = element fangs Focus = Target - SetX = 0,390 - SetY = 0,104 - SetY = 1,103 - SetX = 2,389 - SetY = 2,93 - SetX = 3,386 - SetY = 3,102 - SetX = 4,385 - SetY = 4,101 - SetX = 5,392 - SetY = 5,95 - SetX = 6,390 - SetY = 6,98 - SetX = 7,392 - SetY = 7,103 - SetY = 8,93 - SetX = 9,387 - SetY = 9,97 - SetX = 10,392 - SetX = 11,389 - SetY = 11,96 - SetX = 12,391 - SetY = 12,98 + SetX = 0,6 + SetY = 0,8 + SetZ = 0,27 + SetFrame = 1,1 + SetY = 1,7 + SetFrame = 2,2 + SetX = 2,5 + SetY = 2,-3 + SetFrame = 3,3 + SetX = 3,2 + SetY = 3,6 + SetFrame = 4,4 + SetX = 4,1 + SetY = 4,5 + SetFrame = 5,5 + SetX = 5,8 + SetY = 5,-1 + SetFrame = 6,6 + SetX = 6,6 + SetY = 6,2 + SetFrame = 7,7 + SetX = 7,8 + SetY = 7,7 + SetFrame = 8,8 + SetY = 8,-3 + SetFrame = 9,9 + SetX = 9,3 + SetY = 9,1 + SetFrame = 10,10 + SetX = 10,8 + SetFrame = 11,11 + SetX = 11,5 + SetY = 11,0 + SetFrame = 12,12 + SetX = 12,7 + SetY = 12,2 + SetVisible = 13,false Play = 6,Voltorb Flip Mark,100,161 diff --git a/PBS/Animations/Converted/Move/POISONGAS.txt b/PBS/Animations/Converted/Move/POISONGAS.txt index 5f2275ee5..f2e8742d9 100644 --- a/PBS/Animations/Converted/Move/POISONGAS.txt +++ b/PBS/Animations/Converted/Move/POISONGAS.txt @@ -3,131 +3,185 @@ [Move,POISONGAS] Name = POISONGAS - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,160 - SetY = 1,192 - SetX = 2,204 - SetY = 2,173 - SetX = 3,249 - SetY = 3,148 - SetX = 4,307 - SetY = 4,123 - SetX = 5,358 - SetY = 5,110 + SetFrame = 0,8 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,25 + SetY = 1,-50 + SetX = 2,59 + SetY = 2,-79 + SetX = 3,94 + SetY = 3,-118 + SetX = 4,139 + SetY = 4,-157 + SetX = 5,179 + SetY = 5,-178 + SetFrame = 6,7 + SetFrame = 7,6 + SetFrame = 8,5 + SetFrame = 9,4 + SetFrame = 10,3 + SetFrame = 11,2 + SetFrame = 12,1 SetOpacity = 12,200 + SetFrame = 13,0 SetOpacity = 13,100 Graphic = poison Focus = UserAndTarget - SetX = 1,128 - SetY = 1,236 - SetX = 2,160 - SetY = 2,192 - SetX = 3,204 - SetY = 3,173 - SetX = 4,249 - SetY = 4,148 + SetFrame = 1,7 + SetX = 1,0 + SetY = 1,18 + SetZ = 1,28 + SetFrame = 2,6 + SetX = 2,25 + SetY = 2,-50 + SetFrame = 3,5 + SetX = 3,59 + SetY = 3,-79 + SetFrame = 4,4 + SetX = 4,94 + SetY = 4,-118 + SetFrame = 5,5 SetFlip = 5,true - SetX = 5,307 - SetY = 5,123 + SetX = 5,139 + SetY = 5,-157 + SetFrame = 6,4 SetFlip = 6,false - SetX = 6,320 - SetY = 6,142 - SetX = 7,300 - SetY = 7,135 - SetX = 8,313 - SetY = 8,129 + SetX = 6,150 + SetY = 6,-128 + SetX = 7,134 + SetY = 7,-139 + SetX = 8,144 + SetY = 8,-148 + SetFrame = 9,2 SetFlip = 9,true - SetX = 9,320 - SetY = 9,148 + SetX = 9,150 + SetY = 9,-118 + SetFrame = 10,0 SetFlip = 10,false - SetX = 10,300 - SetY = 10,135 + SetX = 10,134 + SetY = 10,-139 + SetVisible = 11,false Graphic = poison Focus = UserAndTarget - SetX = 2,128 - SetY = 2,236 - SetX = 3,160 - SetY = 3,192 - SetX = 4,204 - SetY = 4,173 - SetX = 5,249 - SetY = 5,148 - SetX = 6,256 - SetY = 6,167 - SetX = 7,275 - SetX = 8,256 - SetY = 8,135 - SetX = 9,288 - SetX = 10,332 - SetY = 10,161 + SetFrame = 2,1 + SetX = 2,0 + SetY = 2,18 + SetZ = 2,29 + SetFrame = 3,2 + SetX = 3,25 + SetY = 3,-50 + SetFrame = 4,3 + SetX = 4,59 + SetY = 4,-79 + SetX = 5,94 + SetY = 5,-118 + SetFrame = 6,5 + SetX = 6,100 + SetY = 6,-89 + SetX = 7,114 + SetFrame = 8,7 + SetX = 8,100 + SetY = 8,-139 + SetFrame = 9,3 + SetX = 9,125 + SetFrame = 10,1 + SetX = 10,159 + SetY = 10,-98 + SetVisible = 11,false Graphic = poison Focus = UserAndTarget - SetX = 3,166 - SetY = 3,224 - SetX = 4,160 - SetY = 4,192 - SetX = 5,217 - SetY = 5,154 - SetX = 6,332 - SetY = 6,161 - SetX = 7,230 - SetY = 7,148 - SetX = 8,262 - SetY = 8,154 + SetFrame = 3,8 + SetX = 3,29 + SetY = 3,0 + SetZ = 3,30 + SetFrame = 4,1 + SetX = 4,25 + SetY = 4,-50 + SetFrame = 5,5 + SetX = 5,69 + SetY = 5,-109 + SetFrame = 6,1 + SetX = 6,159 + SetY = 6,-98 + SetX = 7,79 + SetY = 7,-118 + SetFrame = 8,2 + SetX = 8,104 + SetY = 8,-109 + SetVisible = 9,false Graphic = poison Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 - SetX = 4,198 - SetY = 4,205 - SetX = 5,192 - SetY = 5,179 - SetX = 6,256 - SetY = 6,129 + SetFrame = 3,5 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,31 + SetX = 4,54 + SetY = 4,-29 + SetFrame = 5,0 + SetX = 5,50 + SetY = 5,-70 + SetX = 6,100 + SetY = 6,-148 SetFlip = 7,true - SetX = 7,236 - SetY = 7,198 + SetX = 7,84 + SetY = 7,-40 + SetVisible = 8,false Graphic = poison Focus = UserAndTarget + SetFrame = 5,4 SetFlip = 5,true - SetX = 5,230 - SetY = 5,198 + SetX = 5,79 + SetY = 5,-40 + SetZ = 5,32 + SetFrame = 6,1 SetFlip = 6,false - SetX = 6,288 - SetY = 6,186 - SetX = 7,217 - SetY = 7,192 + SetX = 6,125 + SetY = 6,-59 + SetX = 7,69 + SetY = 7,-50 + SetVisible = 8,false Graphic = poison Focus = UserAndTarget - SetX = 6,230 - SetY = 6,192 - SetX = 7,320 - SetY = 7,186 + SetFrame = 6,5 + SetX = 6,79 + SetY = 6,-50 + SetZ = 6,33 + SetFrame = 7,7 + SetX = 7,150 + SetY = 7,-59 + SetVisible = 8,false Graphic = poison Focus = UserAndTarget - SetX = 6,243 - SetY = 6,148 + SetFrame = 6,6 + SetX = 6,89 + SetY = 6,-118 + SetZ = 6,34 + SetVisible = 7,false Graphic = poison Focus = UserAndTarget + SetFrame = 6,2 SetFlip = 6,true - SetX = 6,204 - SetY = 6,173 + SetX = 6,59 + SetY = 6,-79 + SetZ = 6,35 + SetVisible = 7,false Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/POISONPOWDER.txt b/PBS/Animations/Converted/Move/POISONPOWDER.txt index 80bdf66d8..a1e5c3914 100644 --- a/PBS/Animations/Converted/Move/POISONPOWDER.txt +++ b/PBS/Animations/Converted/Move/POISONPOWDER.txt @@ -3,15 +3,30 @@ [Move,POISONPOWDER] Name = POISONPOWDER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Special5 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetVisible = 14,false Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/POISONSTING.txt b/PBS/Animations/Converted/Move/POISONSTING.txt index add95654f..16e1e9289 100644 --- a/PBS/Animations/Converted/Move/POISONSTING.txt +++ b/PBS/Animations/Converted/Move/POISONSTING.txt @@ -3,29 +3,36 @@ [Move,POISONSTING] Name = POISONSTING - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,166 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,256 - SetY = 3,142 - SetX = 4,288 - SetY = 4,123 - SetX = 5,300 - SetY = 5,129 - SetX = 6,352 - SetY = 6,110 - SetX = 7,358 + SetFrame = 0,5 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,29 + SetY = 1,-40 + SetFrame = 2,6 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,100 + SetY = 3,-128 + SetX = 4,125 + SetY = 4,-157 + SetFrame = 5,7 + SetX = 5,134 + SetY = 5,-148 + SetX = 6,175 + SetY = 6,-178 + SetFrame = 7,9 + SetX = 7,179 + SetFrame = 8,3 + SetFrame = 9,4 Play = 0,throw,80 Play = 6,Slash10,80 @@ -33,34 +40,41 @@ Name = POISONSTING [OppMove,POISONSTING] Name = POISONSTING - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = UserAndTarget - SetX = 0,351 - SetY = 0,139 + SetFrame = 0,5 + SetX = 0,174 + SetY = 0,-132 + SetZ = 0,27 SetAngle = 0,180 - SetX = 1,319 - SetY = 1,154 - SetX = 2,287 - SetY = 2,168 - SetX = 3,255 - SetY = 3,183 - SetX = 4,223 - SetY = 4,197 - SetX = 5,191 - SetY = 5,211 - SetX = 6,159 - SetY = 6,226 - SetX = 7,122 - SetY = 7,221 + SetX = 1,149 + SetY = 1,-109 + SetFrame = 2,6 + SetX = 2,124 + SetY = 2,-87 + SetX = 3,99 + SetY = 3,-64 + SetX = 4,74 + SetY = 4,-42 + SetFrame = 5,7 + SetX = 5,49 + SetY = 5,-20 + SetX = 6,24 + SetY = 6,3 + SetFrame = 7,9 + SetX = 7,-4 + SetY = 7,-4 SetAngle = 7,0 - SetX = 8,128 - SetY = 8,236 + SetFrame = 8,3 + SetX = 8,0 + SetY = 8,18 + SetFrame = 9,4 Play = 0,throw,80 Play = 6,Slash10,80 diff --git a/PBS/Animations/Converted/Move/POISONTAIL.txt b/PBS/Animations/Converted/Move/POISONTAIL.txt index 2d1527eda..722cdae59 100644 --- a/PBS/Animations/Converted/Move/POISONTAIL.txt +++ b/PBS/Animations/Converted/Move/POISONTAIL.txt @@ -3,19 +3,27 @@ [Move,POISONTAIL] Name = POISONTAIL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = firepoison Focus = Target - SetX = 0,392 - SetY = 0,94 - SetX = 1,384 - SetY = 2,86 - SetX = 4,376 + SetFrame = 0,8 + SetX = 0,8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,9 + SetX = 1,0 + SetFrame = 2,10 + SetY = 2,-10 + SetFrame = 3,11 + SetFrame = 4,12 + SetX = 4,-8 + SetFrame = 5,13 + SetFrame = 6,14 SetZoomX = 7,110 SetZoomY = 7,110 SetOpacity = 7,100 diff --git a/PBS/Animations/Converted/Move/POUND.txt b/PBS/Animations/Converted/Move/POUND.txt index 73890318f..6a129fe41 100644 --- a/PBS/Animations/Converted/Move/POUND.txt +++ b/PBS/Animations/Converted/Move/POUND.txt @@ -3,22 +3,27 @@ [Move,POUND] Name = POUND - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = many Focus = Target - SetX = 3,392 - SetY = 3,94 + SetFrame = 3,20 + SetX = 3,8 + SetY = 3,-2 + SetZ = 3,28 SetOpacity = 4,100 + SetVisible = 5,false Graphic = many Focus = Target - SetX = 0,384 - SetY = 0,94 + SetFrame = 0,17 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 SetOpacity = 0,100 SetOpacity = 1,255 SetZoomX = 2,120 @@ -27,6 +32,7 @@ Name = POUND SetZoomY = 3,130 SetZoomX = 4,110 SetZoomY = 4,110 + SetFrame = 5,19 SetZoomX = 5,100 SetZoomY = 5,100 SetOpacity = 5,100 diff --git a/PBS/Animations/Converted/Move/PSYCHIC.txt b/PBS/Animations/Converted/Move/PSYCHIC.txt index cf7a56cfd..cef7d7a02 100644 --- a/PBS/Animations/Converted/Move/PSYCHIC.txt +++ b/PBS/Animations/Converted/Move/PSYCHIC.txt @@ -3,16 +3,27 @@ [Move,PSYCHIC] Name = PSYCHIC - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = efftest4 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,28 + SetFrame = 1,1 + SetFrame = 2,2 + SetVisible = 3,false + + Graphic = efftest4 + Focus = Target + SetFrame = 5,2 + SetX = 5,0 + SetY = 5,-2 + SetZ = 5,28 SetZoomX = 5,160 SetZoomY = 5,160 SetOpacity = 5,180 @@ -22,50 +33,75 @@ Name = PSYCHIC SetZoomY = 7,250 SetZoomX = 8,300 SetZoomY = 8,300 + SetFrame = 9,8 SetZoomX = 9,100 SetZoomY = 9,100 SetOpacity = 9,255 + SetFrame = 10,7 + SetFrame = 11,6 + SetFrame = 12,2 SetZoomX = 12,300 SetZoomY = 12,300 SetOpacity = 12,180 - SetX = 14,376 - SetY = 14,86 - SetY = 15,94 - SetX = 17,384 + SetX = 14,-8 + SetY = 14,-10 + SetY = 15,-2 + SetX = 17,0 SetZoomX = 17,100 SetZoomY = 17,100 SetOpacity = 17,75 - + Graphic = efftest4 Focus = Target - SetX = 9,384 - SetY = 9,94 + SetFrame = 9,2 + SetX = 9,0 + SetY = 9,-2 + SetZ = 9,29 SetZoomX = 9,300 SetZoomY = 9,300 SetOpacity = 9,180 + SetVisible = 12,false Graphic = efftest4 Focus = Target - SetX = 0,384 - SetY = 0,86 - SetY = 3,94 + SetFrame = 0,14 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 + SetFrame = 1,13 + SetFrame = 2,0 + SetFrame = 3,2 + SetY = 3,-2 SetZoomX = 3,120 SetZoomY = 3,120 SetZoomX = 4,140 SetZoomY = 4,140 SetOpacity = 4,220 + SetFrame = 5,3 SetZoomX = 5,100 SetZoomY = 5,100 SetOpacity = 5,150 + SetFrame = 6,4 + SetFrame = 7,3 SetOpacity = 7,100 + SetFrame = 8,4 + SetFrame = 9,3 SetOpacity = 9,50 + SetFrame = 10,4 + SetFrame = 11,3 + SetFrame = 12,5 SetOpacity = 12,255 + SetFrame = 13,11 SetOpacity = 13,150 + SetFrame = 14,12 SetOpacity = 14,255 + SetFrame = 15,11 SetZoomX = 15,80 SetZoomY = 15,80 + SetFrame = 16,12 SetZoomX = 16,70 SetZoomY = 16,70 SetOpacity = 16,150 + SetVisible = 17,false Play = 2,Darkness2,80 diff --git a/PBS/Animations/Converted/Move/PSYCHOCUT.txt b/PBS/Animations/Converted/Move/PSYCHOCUT.txt index ed53e6953..4cad4b33a 100644 --- a/PBS/Animations/Converted/Move/PSYCHOCUT.txt +++ b/PBS/Animations/Converted/Move/PSYCHOCUT.txt @@ -3,159 +3,229 @@ [Move,PSYCHOCUT] Name = PSYCHOCUT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Psycho Cut Focus = Target - SetX = 0,140 - SetY = 0,248 + SetFrame = 0,15 + SetX = 0,-244 + SetY = 0,152 + SetZ = 0,27 SetOpacity = 0,128 - SetX = 1,141 - SetY = 1,257 + SetX = 1,-243 + SetY = 1,161 SetOpacity = 1,236 - SetX = 2,138 - SetY = 2,261 + SetX = 2,-246 + SetY = 2,165 SetOpacity = 2,107 - SetX = 4,126 - SetY = 4,283 - SetOpacity = 4,255 - SetX = 6,144 - SetY = 6,296 - SetX = 8,163 - SetY = 8,267 - SetX = 9,196 - SetY = 9,233 - SetX = 11,237 - SetY = 11,209 - SetX = 12,264 - SetY = 12,200 - SetZoomX = 12,120 - SetZoomY = 12,120 - SetX = 13,278 - SetY = 13,190 - SetZoomX = 13,140 - SetZoomY = 13,140 - SetX = 14,294 - SetY = 14,184 - SetZoomX = 14,160 - SetZoomY = 14,160 - SetX = 15,326 - SetY = 15,165 - SetZoomX = 15,180 - SetZoomY = 15,180 - SetOpacity = 15,200 - SetX = 16,358 - SetY = 16,143 - SetOpacity = 16,139 - SetX = 17,383 - SetY = 17,123 - SetOpacity = 17,100 - SetX = 18,439 - SetY = 18,97 - SetOpacity = 18,60 + SetVisible = 3,false Graphic = Psycho Cut Focus = Target - SetX = 1,163 - SetY = 1,256 - SetX = 2,142 - SetY = 2,252 - SetX = 3,134 - SetY = 3,263 - SetX = 5,131 - SetY = 5,292 - SetX = 7,160 - SetY = 7,288 - SetX = 9,161 - SetY = 9,253 - SetX = 10,146 - SetY = 10,240 + SetFrame = 1,13 + SetX = 1,-221 + SetY = 1,160 + SetZ = 1,28 + SetFrame = 2,12 + SetX = 2,-242 + SetY = 2,156 + SetFrame = 3,11 + SetX = 3,-250 + SetY = 3,167 + SetVisible = 4,false + + Graphic = Psycho Cut + Focus = Target + SetFrame = 4,10 + SetX = 4,-258 + SetY = 4,187 + SetZ = 4,27 + SetVisible = 5,false + + Graphic = Psycho Cut + Focus = Target + SetFrame = 5,8 + SetX = 5,-253 + SetY = 5,196 + SetZ = 5,28 + SetVisible = 6,false + + Graphic = Psycho Cut + Focus = Target + SetFrame = 6,7 + SetX = 6,-240 + SetY = 6,200 + SetZ = 6,27 + SetVisible = 7,false + + Graphic = Psycho Cut + Focus = Target + SetFrame = 7,6 + SetX = 7,-224 + SetY = 7,192 + SetZ = 7,28 + SetVisible = 8,false + + Graphic = Psycho Cut + Focus = Target + SetFrame = 8,5 + SetX = 8,-221 + SetY = 8,171 + SetZ = 8,27 + SetFrame = 9,0 + SetX = 9,-188 + SetY = 9,137 + SetFrame = 11,1 + SetX = 11,-147 + SetY = 11,113 + SetX = 12,-120 + SetY = 12,104 + SetZoomX = 12,120 + SetZoomY = 12,120 + SetX = 13,-106 + SetY = 13,94 + SetZoomX = 13,140 + SetZoomY = 13,140 + SetX = 14,-90 + SetY = 14,88 + SetZoomX = 14,160 + SetZoomY = 14,160 + SetFrame = 15,2 + SetX = 15,-58 + SetY = 15,69 + SetZoomX = 15,180 + SetZoomY = 15,180 + SetOpacity = 15,200 + SetX = 16,-26 + SetY = 16,47 + SetOpacity = 16,139 + SetX = 17,-1 + SetY = 17,27 + SetOpacity = 17,100 + SetX = 18,55 + SetY = 18,1 + SetOpacity = 18,60 + SetVisible = 19,false + + Graphic = Psycho Cut + Focus = Target + SetFrame = 9,13 + SetX = 9,-223 + SetY = 9,157 + SetZ = 9,28 + SetFrame = 10,12 + SetX = 10,-238 + SetY = 10,144 SetOpacity = 10,200 - SetX = 11,127 - SetY = 11,255 + SetFrame = 11,11 + SetX = 11,-257 + SetY = 11,159 SetOpacity = 11,100 - SetX = 12,123 - SetY = 12,264 + SetFrame = 12,10 + SetX = 12,-261 + SetY = 12,168 SetOpacity = 12,50 + SetVisible = 13,false Play = 0,Psycho Cut #------------------------------- [OppMove,PSYCHOCUT] Name = PSYCHOCUT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Psycho Cut Focus = UserAndTarget - SetX = 0,396 - SetY = 0,111 + SetFrame = 0,12 + SetX = 0,209 + SetY = 0,-176 + SetZ = 0,28 SetOpacity = 0,128 - SetX = 1,375 - SetY = 1,125 + SetFrame = 1,11 + SetX = 1,192 + SetY = 1,-154 SetOpacity = 1,255 - SetX = 2,370 - SetY = 2,138 - SetX = 3,380 - SetY = 3,150 - SetX = 4,396 - SetY = 4,157 - SetX = 5,412 - SetY = 5,146 - SetX = 6,416 - SetY = 6,131 - SetX = 7,415 - SetY = 7,123 - SetX = 8,396 - SetY = 8,111 - SetX = 9,375 - SetY = 9,125 + SetFrame = 2,10 + SetX = 2,189 + SetY = 2,-134 + SetFrame = 3,8 + SetX = 3,196 + SetY = 3,-115 + SetFrame = 4,7 + SetX = 4,209 + SetY = 4,-104 + SetFrame = 5,6 + SetX = 5,221 + SetY = 5,-121 + SetFrame = 6,5 + SetX = 6,225 + SetY = 6,-145 + SetFrame = 7,13 + SetX = 7,224 + SetY = 7,-157 + SetFrame = 8,12 + SetX = 8,209 + SetY = 8,-176 + SetFrame = 9,11 + SetX = 9,192 + SetY = 9,-154 + SetFrame = 10,0 SetFlip = 10,true - SetX = 10,349 - SetY = 10,143 + SetX = 10,172 + SetY = 10,-126 SetOpacity = 10,128 - SetX = 11,319 - SetY = 11,164 + SetFrame = 11,2 + SetX = 11,149 + SetY = 11,-93 SetOpacity = 11,255 - SetX = 12,297 - SetY = 12,170 + SetFrame = 12,1 + SetX = 12,132 + SetY = 12,-84 SetZoomX = 12,125 SetZoomY = 12,125 - SetX = 13,283 - SetY = 13,183 + SetFrame = 13,2 + SetX = 13,121 + SetY = 13,-64 SetZoomX = 13,150 SetZoomY = 13,150 - SetX = 14,251 - SetY = 14,191 + SetFrame = 14,1 + SetX = 14,96 + SetY = 14,-51 SetZoomX = 14,160 SetZoomY = 14,160 - SetX = 15,223 - SetY = 15,208 + SetFrame = 15,2 + SetX = 15,74 + SetY = 15,-25 SetZoomX = 15,170 SetZoomY = 15,170 - SetX = 16,188 - SetY = 16,215 + SetFrame = 16,1 + SetX = 16,46 + SetY = 16,-14 SetZoomX = 16,180 SetZoomY = 16,180 SetOpacity = 16,192 - SetX = 17,150 - SetY = 17,241 + SetFrame = 17,2 + SetX = 17,17 + SetY = 17,26 SetOpacity = 17,128 - SetX = 18,114 - SetY = 18,264 + SetX = 18,-10 + SetY = 18,62 SetOpacity = 18,64 Graphic = Psycho Cut Focus = UserAndTarget - SetX = 0,389 - SetY = 0,126 + SetFrame = 0,15 + SetX = 0,203 + SetY = 0,-153 + SetZ = 0,27 SetOpacity = 0,128 SetAngle = 1,45 SetOpacity = 1,255 @@ -176,5 +246,6 @@ Name = PSYCHOCUT SetOpacity = 15,170 SetAngle = 16,0 SetOpacity = 16,85 + SetVisible = 17,false Play = 0,Psycho Cut diff --git a/PBS/Animations/Converted/Move/QUICKATTACK.txt b/PBS/Animations/Converted/Move/QUICKATTACK.txt index 519bbc8b4..08d883079 100644 --- a/PBS/Animations/Converted/Move/QUICKATTACK.txt +++ b/PBS/Animations/Converted/Move/QUICKATTACK.txt @@ -3,53 +3,71 @@ [Move,QUICKATTACK] Name = QUICKATTACK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 SetOpacity = 1,170 SetOpacity = 2,85 SetOpacity = 6,255 - SetX = 0,384 - SetY = 0,96 - - Graphic = Tackle_B - Focus = User - SetX = 2,59 - SetY = 2,258 - SetOpacity = 3,170 - SetOpacity = 4,85 - - Graphic = Tackle_B - Focus = User - SetX = 3,100 - SetY = 3,272 - SetOpacity = 4,170 - SetOpacity = 5,85 - - Graphic = Tackle_B - Focus = User - SetX = 4,163 - SetY = 4,259 - SetOpacity = 5,170 - SetOpacity = 6,85 - - Graphic = Tackle_B - Focus = User - SetX = 5,140 - SetY = 5,230 - SetOpacity = 6,170 - SetOpacity = 7,85 + SetX = 0,0 + SetY = 0,0 - Graphic = Tackle_B - Focus = Target - SetX = 1,76 - SetY = 1,230 + Graphic = USER + Focus = User + SetX = 1,-52 + SetY = 1,6 + SetZ = 1,27 SetOpacity = 2,170 SetOpacity = 3,85 - SetX = 7,384 - SetY = 7,96 + SetVisible = 4,false + + Graphic = USER + Focus = User + SetX = 2,-69 + SetY = 2,34 + SetZ = 2,28 + SetOpacity = 3,170 + SetOpacity = 4,85 + SetVisible = 5,false + + Graphic = USER + Focus = User + SetX = 3,-28 + SetY = 3,48 + SetZ = 3,29 + SetZ = 4,4 + SetOpacity = 4,170 + SetOpacity = 5,85 + SetVisible = 6,false + + Graphic = USER + Focus = User + SetX = 4,35 + SetY = 4,35 + SetZ = 4,30 + SetZ = 5,5 + SetOpacity = 5,170 + SetOpacity = 6,85 + SetVisible = 7,false + + Graphic = USER + Focus = User + SetX = 5,12 + SetY = 5,6 + SetZ = 5,31 + SetZ = 6,6 + SetOpacity = 6,170 + SetOpacity = 7,85 + SetVisible = 8,false + + Graphic = Tackle_B + Focus = Target + SetX = 7,0 + SetY = 7,0 + SetZ = 7,27 SetOpacity = 7,128 SetOpacity = 8,255 SetOpacity = 11,128 + SetVisible = 12,false Play = 7,Blow4 diff --git a/PBS/Animations/Converted/Move/RAINDANCE.txt b/PBS/Animations/Converted/Move/RAINDANCE.txt index 6f6354775..a213c37c6 100644 --- a/PBS/Animations/Converted/Move/RAINDANCE.txt +++ b/PBS/Animations/Converted/Move/RAINDANCE.txt @@ -3,16 +3,18 @@ [Move,RAINDANCE] Name = RAINDANCE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,197 SetY = 0,25 + SetZ = 0,27 SetX = 1,72 SetY = 1,49 SetX = 2,60 @@ -32,9 +34,11 @@ Name = RAINDANCE SetY = 9,55 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,275 SetY = 0,47 + SetZ = 0,28 SetX = 1,229 SetY = 1,216 SetX = 2,193 @@ -55,9 +59,11 @@ Name = RAINDANCE SetY = 9,148 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,355 SetY = 0,51 + SetZ = 0,29 SetX = 1,109 SetY = 1,217 SetX = 2,265 @@ -78,9 +84,11 @@ Name = RAINDANCE SetY = 9,274 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,450 SetY = 0,50 + SetZ = 0,30 SetX = 1,223 SetY = 1,110 SetX = 2,228 @@ -101,9 +109,11 @@ Name = RAINDANCE SetY = 9,243 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,83 SetY = 0,81 + SetZ = 0,31 SetX = 1,399 SetY = 1,120 SetX = 2,350 @@ -124,9 +134,11 @@ Name = RAINDANCE SetY = 9,238 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,231 SetY = 0,170 + SetZ = 0,32 SetX = 1,480 SetY = 1,83 SetX = 2,399 @@ -147,9 +159,11 @@ Name = RAINDANCE SetY = 9,245 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,352 SetY = 0,212 + SetZ = 0,33 SetX = 1,362 SetY = 1,63 SetX = 2,488 @@ -170,9 +184,11 @@ Name = RAINDANCE SetY = 9,205 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,2 SetX = 0,467 SetY = 0,254 + SetZ = 0,34 SetX = 1,376 SetY = 1,192 SetX = 2,434 @@ -193,9 +209,11 @@ Name = RAINDANCE SetY = 9,25 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 1,2 SetX = 1,482 SetY = 1,244 + SetZ = 1,35 SetX = 2,121 SetY = 2,249 SetX = 3,382 @@ -204,36 +222,78 @@ Name = RAINDANCE SetY = 4,150 SetX = 5,422 SetY = 5,252 - SetX = 7,471 - SetY = 7,126 - SetX = 9,247 - SetY = 9,72 + SetVisible = 6,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 2,2 SetX = 2,27 SetY = 2,241 + SetZ = 2,36 SetX = 3,88 SetY = 3,177 SetX = 4,337 SetY = 4,243 SetX = 5,319 SetY = 5,241 - SetX = 7,363 - SetY = 7,237 - SetX = 9,365 - SetY = 9,42 + SetVisible = 6,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 4,2 SetX = 4,409 SetY = 4,203 - SetX = 7,443 - SetY = 7,194 - SetX = 9,479 - SetY = 9,180 + SetZ = 4,37 + SetVisible = 5,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 7,2 + SetX = 7,471 + SetY = 7,126 + SetZ = 7,35 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,2 + SetX = 7,363 + SetY = 7,237 + SetZ = 7,36 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,2 + SetX = 7,443 + SetY = 7,194 + SetZ = 7,37 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 + SetX = 9,247 + SetY = 9,72 + SetZ = 9,35 + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 + SetX = 9,365 + SetY = 9,42 + SetZ = 9,36 + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 + SetX = 9,479 + SetY = 9,180 + SetZ = 9,37 + + Graphic = weather + Focus = Foreground + SetFrame = 9,2 SetX = 9,474 SetY = 9,41 + SetZ = 9,38 diff --git a/PBS/Animations/Converted/Move/RAZORLEAF.txt b/PBS/Animations/Converted/Move/RAZORLEAF.txt index c60b249e6..760cdc902 100644 --- a/PBS/Animations/Converted/Move/RAZORLEAF.txt +++ b/PBS/Animations/Converted/Move/RAZORLEAF.txt @@ -3,115 +3,174 @@ [Move,RAZORLEAF] Name = RAZORLEAF - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = grass Focus = UserAndTarget - SetX = 1,144 - SetY = 1,204 - SetX = 2,175 - SetY = 2,184 - SetX = 3,211 - SetY = 3,158 - SetX = 4,268 - SetY = 4,132 - SetX = 5,331 - SetY = 5,116 - SetX = 6,274 - SetY = 6,134 - SetX = 7,331 - SetY = 7,116 - SetX = 8,237 - SetY = 8,160 - SetX = 9,268 - SetY = 9,140 - SetX = 10,331 - SetY = 10,116 - SetX = 11,326 - SetY = 11,178 - SetX = 12,331 - SetY = 12,116 + SetFrame = 1,1 + SetX = 1,12 + SetY = 1,-31 + SetZ = 1,27 + SetFrame = 2,5 + SetX = 2,36 + SetY = 2,-62 + SetFrame = 3,6 + SetX = 3,64 + SetY = 3,-103 + SetFrame = 4,7 + SetX = 4,109 + SetY = 4,-143 + SetFrame = 5,1 + SetX = 5,158 + SetY = 5,-168 + SetFrame = 6,6 + SetX = 6,114 + SetY = 6,-140 + SetFrame = 7,7 + SetX = 7,158 + SetY = 7,-168 + SetFrame = 8,5 + SetX = 8,85 + SetY = 8,-100 + SetFrame = 9,6 + SetX = 9,109 + SetY = 9,-131 + SetFrame = 10,7 + SetX = 10,158 + SetY = 10,-168 + SetFrame = 11,2 + SetX = 11,154 + SetY = 11,-71 + SetFrame = 12,0 + SetX = 12,158 + SetY = 12,-168 Graphic = grass Focus = UserAndTarget - SetX = 2,154 - SetY = 2,120 - SetX = 3,123 - SetY = 3,108 - SetX = 4,164 - SetY = 4,172 - SetX = 5,222 - SetY = 5,154 - SetX = 6,196 - SetY = 6,96 - SetX = 7,185 - SetY = 7,172 - SetX = 8,118 - SetY = 8,114 - SetX = 9,216 - SetY = 9,112 - SetX = 10,201 - SetY = 10,130 + SetX = 2,20 + SetY = 2,-162 + SetZ = 2,28 + SetX = 3,-3 + SetY = 3,-181 + SetFrame = 4,1 + SetX = 4,28 + SetY = 4,-81 + SetFrame = 5,5 + SetX = 5,73 + SetY = 5,-109 + SetFrame = 6,0 + SetX = 6,53 + SetY = 6,-200 + SetFrame = 7,1 + SetX = 7,44 + SetY = 7,-81 + SetFrame = 8,0 + SetX = 8,-7 + SetY = 8,-171 + SetFrame = 9,2 + SetX = 9,68 + SetY = 9,-175 + SetX = 10,57 + SetY = 10,-146 + SetVisible = 11,false Graphic = grass Focus = UserAndTarget - SetX = 3,258 - SetY = 3,208 - SetX = 4,263 - SetY = 4,242 - SetX = 5,175 - SetY = 5,80 - SetX = 6,284 - SetY = 6,210 - SetX = 7,232 - SetY = 7,214 - SetX = 8,274 - SetY = 8,270 - SetX = 10,357 - SetY = 10,182 + SetFrame = 3,2 + SetX = 3,101 + SetY = 3,-25 + SetZ = 3,29 + SetX = 4,105 + SetY = 4,28 + SetX = 5,36 + SetY = 5,-225 + SetX = 6,121 + SetY = 6,-21 + SetFrame = 7,0 + SetX = 7,81 + SetY = 7,-15 + SetFrame = 8,3 + SetX = 8,114 + SetY = 8,71 + SetVisible = 9,false Graphic = grass Focus = UserAndTarget - SetX = 4,211 - SetY = 4,78 - SetX = 5,118 - SetY = 5,178 - SetX = 6,336 - SetY = 6,158 - SetX = 7,362 - SetY = 7,176 + SetFrame = 4,3 + SetX = 4,64 + SetY = 4,-228 + SetZ = 4,30 + SetX = 5,-7 + SetY = 5,-71 + SetX = 6,162 + SetY = 6,-103 + SetX = 7,182 + SetY = 7,-75 + SetVisible = 8,false Graphic = grass Focus = UserAndTarget - SetX = 4,336 - SetY = 4,166 - SetX = 5,305 - SetY = 5,282 - SetX = 7,289 - SetY = 7,108 + SetX = 4,162 + SetY = 4,-90 + SetZ = 4,31 + SetFrame = 5,2 + SetX = 5,138 + SetY = 5,90 + SetVisible = 6,false Graphic = grass Focus = UserAndTarget - SetX = 4,154 - SetY = 4,136 - SetX = 5,346 - SetY = 5,194 - SetX = 7,154 - SetY = 7,112 + SetFrame = 4,2 + SetX = 4,20 + SetY = 4,-137 + SetZ = 4,32 + SetFrame = 5,0 + SetX = 5,170 + SetY = 5,-46 + SetVisible = 6,false Graphic = grass Focus = UserAndTarget - SetX = 5,216 - SetY = 5,96 + SetFrame = 5,2 + SetX = 5,68 + SetY = 5,-200 + SetZ = 5,33 + SetVisible = 6,false Graphic = grass Focus = UserAndTarget - SetX = 5,279 - SetY = 5,144 + SetFrame = 5,3 + SetX = 5,117 + SetY = 5,-125 + SetZ = 5,34 + SetVisible = 6,false + + Graphic = grass + Focus = UserAndTarget + SetFrame = 7,2 + SetX = 7,125 + SetY = 7,-181 + SetZ = 7,31 + SetVisible = 8,false + + Graphic = grass + Focus = UserAndTarget + SetX = 7,20 + SetY = 7,-175 + SetZ = 7,32 + SetVisible = 8,false + + Graphic = grass + Focus = UserAndTarget + SetFrame = 10,3 + SetX = 10,178 + SetY = 10,-65 + SetZ = 10,29 + SetVisible = 11,false Play = 1,Slash8,80 Play = 3,Slash8,80 diff --git a/PBS/Animations/Converted/Move/REFLECT.txt b/PBS/Animations/Converted/Move/REFLECT.txt index 72271fd92..a28db98e0 100644 --- a/PBS/Animations/Converted/Move/REFLECT.txt +++ b/PBS/Animations/Converted/Move/REFLECT.txt @@ -3,16 +3,18 @@ [Move,REFLECT] Name = REFLECT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal2 Focus = Target - SetX = 0,376 - SetY = 0,86 + SetFrame = 0,11 + SetX = 0,-8 + SetY = 0,-10 + SetZ = 0,27 SetOpacity = 0,75 SetOpacity = 1,100 SetOpacity = 2,150 @@ -22,66 +24,74 @@ Name = REFLECT Graphic = normal2 Focus = Target - SetX = 1,328 - SetY = 1,-18 - SetX = 2,304 - SetY = 2,22 - SetX = 3,288 - SetY = 3,86 + SetX = 1,-56 + SetY = 1,-114 + SetZ = 1,28 + SetX = 2,-80 + SetY = 2,-74 + SetX = 3,-96 + SetY = 3,-10 SetOpacity = 3,200 - SetX = 4,296 - SetY = 4,158 + SetX = 4,-88 + SetY = 4,62 SetOpacity = 4,255 - SetX = 5,280 - SetY = 5,214 - SetX = 6,416 - SetY = 6,238 - SetX = 7,312 - SetY = 7,222 + SetX = 5,-104 + SetY = 5,118 + SetX = 6,32 + SetY = 6,142 + SetX = 7,-72 + SetY = 7,126 Graphic = normal2 Focus = Target - SetX = 1,464 - SetY = 1,-10 - SetX = 2,488 - SetY = 2,38 - SetX = 3,480 - SetY = 3,94 - SetX = 4,512 - SetY = 4,158 - SetX = 5,496 - SetY = 5,230 - SetX = 6,336 - SetY = 6,150 - SetX = 7,432 - SetY = 7,230 + SetX = 1,80 + SetY = 1,-106 + SetZ = 1,29 + SetX = 2,104 + SetY = 2,-58 + SetX = 3,96 + SetY = 3,-2 + SetX = 4,128 + SetY = 4,62 + SetX = 5,112 + SetY = 5,134 + SetX = 6,-48 + SetY = 6,54 + SetX = 7,48 + SetY = 7,134 Graphic = normal2 Focus = Target - SetX = 2,392 - SetY = 2,-18 - SetY = 3,22 - SetX = 4,424 - SetY = 4,102 - SetX = 5,376 - SetY = 5,166 - SetX = 6,464 - SetY = 6,126 + SetX = 2,8 + SetY = 2,-114 + SetZ = 2,30 + SetY = 3,-74 + SetX = 4,40 + SetY = 4,6 + SetX = 5,-8 + SetY = 5,70 + SetX = 6,80 + SetY = 6,30 + SetVisible = 7,false Graphic = normal2 Focus = Target - SetX = 3,328 - SetY = 3,-18 - SetX = 4,352 - SetY = 4,38 - SetX = 5,320 - SetY = 5,78 + SetX = 3,-56 + SetY = 3,-114 + SetZ = 3,31 + SetX = 4,-32 + SetY = 4,-58 + SetX = 5,-64 + SetY = 5,-18 + SetVisible = 6,false Graphic = normal2 Focus = Target - SetX = 4,432 - SetY = 4,-10 - SetX = 5,400 - SetY = 5,54 + SetX = 4,48 + SetY = 4,-106 + SetZ = 4,32 + SetX = 5,16 + SetY = 5,-42 + SetVisible = 6,false Play = 0,Saint7,80 diff --git a/PBS/Animations/Converted/Move/REST.txt b/PBS/Animations/Converted/Move/REST.txt index 6a3627b8e..318022397 100644 --- a/PBS/Animations/Converted/Move/REST.txt +++ b/PBS/Animations/Converted/Move/REST.txt @@ -3,31 +3,38 @@ [Move,REST] Name = REST - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,357 - SetY = 0,67 - SetX = 1,338 - SetY = 1,49 - SetX = 2,320 - SetY = 2,30 - SetX = 3,307 - SetY = 3,21 - SetX = 4,317 - SetY = 4,38 - SetX = 5,294 - SetY = 5,1 - SetX = 6,348 - SetY = 6,50 - SetX = 7,330 - SetY = 7,37 - SetX = 8,308 - SetY = 8,10 + SetFrame = 0,20 + SetX = 0,-27 + SetY = 0,-29 + SetZ = 0,27 + SetX = 1,-46 + SetY = 1,-47 + SetX = 2,-64 + SetY = 2,-66 + SetX = 3,-77 + SetY = 3,-75 + SetFrame = 4,21 + SetX = 4,-67 + SetY = 4,-58 + SetFrame = 5,22 + SetX = 5,-90 + SetY = 5,-95 + SetFrame = 6,20 + SetX = 6,-36 + SetY = 6,-46 + SetFrame = 7,21 + SetX = 7,-54 + SetY = 7,-59 + SetFrame = 8,22 + SetX = 8,-76 + SetY = 8,-86 Play = 0,Refresh,80 diff --git a/PBS/Animations/Converted/Move/ROAR.txt b/PBS/Animations/Converted/Move/ROAR.txt index d186951e3..ccacb02c7 100644 --- a/PBS/Animations/Converted/Move/ROAR.txt +++ b/PBS/Animations/Converted/Move/ROAR.txt @@ -3,96 +3,106 @@ [Move,ROAR] Name = ROAR - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Growl Focus = Target - SetX = 0,193 - SetY = 0,215 + SetX = 0,-191 + SetY = 0,119 + SetZ = 0,29 SetAngle = 0,10 - SetX = 1,214 - SetY = 1,194 - SetX = 2,228 - SetY = 2,176 - SetX = 3,273 - SetY = 3,153 - SetX = 4,301 - SetY = 4,155 + SetX = 1,-170 + SetY = 1,98 + SetX = 2,-156 + SetY = 2,80 + SetX = 3,-111 + SetY = 3,57 + SetX = 4,-83 + SetY = 4,59 Graphic = Growl Focus = Target - SetX = 0,176 - SetY = 0,199 - SetX = 1,190 - SetY = 1,170 - SetX = 2,214 - SetY = 2,142 - SetX = 3,252 - SetY = 3,112 - SetX = 4,282 - SetY = 4,89 + SetFrame = 0,1 + SetX = 0,-208 + SetY = 0,103 + SetZ = 0,27 + SetX = 1,-194 + SetY = 1,74 + SetX = 2,-170 + SetY = 2,46 + SetX = 3,-132 + SetY = 3,16 + SetX = 4,-102 + SetY = 4,-7 Graphic = Growl Focus = Target - SetX = 0,182 - SetY = 0,245 - SetX = 1,209 - SetY = 1,238 + SetFrame = 0,2 + SetX = 0,-202 + SetY = 0,149 + SetZ = 0,28 + SetX = 1,-175 + SetY = 1,142 SetAngle = 1,6 - SetX = 2,223 - SetY = 2,220 - SetX = 3,258 - SetY = 3,213 - SetX = 4,292 - SetY = 4,239 + SetX = 2,-161 + SetY = 2,124 + SetX = 3,-126 + SetY = 3,117 + SetX = 4,-92 + SetY = 4,143 Play = 0,Wring Out,100,160 #------------------------------- [OppMove,ROAR] Name = ROAR - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Growl Focus = Target + SetFrame = 0,1 SetFlip = 0,true - SetX = 0,352 - SetY = 0,70 - SetX = 1,328 - SetY = 1,66 - SetX = 2,296 - SetY = 2,41 - SetX = 3,248 - SetY = 3,35 + SetX = 0,-32 + SetY = 0,-26 + SetZ = 0,28 + SetX = 1,-56 + SetY = 1,-30 + SetX = 2,-88 + SetY = 2,-55 + SetX = 3,-136 + SetY = 3,-61 Graphic = Growl Focus = Target - SetX = 0,352 - SetY = 0,132 - SetX = 1,328 - SetY = 1,145 - SetX = 2,296 - SetY = 2,164 - SetX = 3,264 - SetY = 3,200 + SetFrame = 0,1 + SetX = 0,-32 + SetY = 0,36 + SetZ = 0,29 + SetX = 1,-56 + SetY = 1,49 + SetX = 2,-88 + SetY = 2,68 + SetX = 3,-120 + SetY = 3,104 Graphic = Growl Focus = Target SetFlip = 0,true - SetX = 0,344 - SetY = 0,100 - SetX = 1,312 - SetX = 2,296 - SetY = 2,92 - SetX = 3,248 - SetY = 3,108 + SetX = 0,-40 + SetY = 0,4 + SetZ = 0,27 + SetX = 1,-72 + SetX = 2,-88 + SetY = 2,-4 + SetX = 3,-136 + SetY = 3,12 Play = 0,Wring Out,100,160 diff --git a/PBS/Animations/Converted/Move/ROCKSMASH.txt b/PBS/Animations/Converted/Move/ROCKSMASH.txt index 1d829a92d..381ac7203 100644 --- a/PBS/Animations/Converted/Move/ROCKSMASH.txt +++ b/PBS/Animations/Converted/Move/ROCKSMASH.txt @@ -3,16 +3,21 @@ [Move,ROCKSMASH] Name = ROCKSMASH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = rockice Focus = Target - SetX = 0,392 - SetY = 0,86 + SetX = 0,8 + SetY = 0,-10 + SetZ = 0,27 + SetFrame = 3,1 + SetFrame = 4,2 + SetFrame = 5,3 + SetFrame = 6,4 Play = 2,Earth1,80 Play = 2,Blow6,80 diff --git a/PBS/Animations/Converted/Move/ROCKTHROW.txt b/PBS/Animations/Converted/Move/ROCKTHROW.txt index 3c69bdf7a..3d245817a 100644 --- a/PBS/Animations/Converted/Move/ROCKTHROW.txt +++ b/PBS/Animations/Converted/Move/ROCKTHROW.txt @@ -3,27 +3,37 @@ [Move,ROCKTHROW] Name = ROCKTHROW - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Earth1 Focus = UserAndTarget - SetX = 3,352 - SetY = 3,110 + SetFrame = 3,1 + SetX = 3,175 + SetY = 3,-178 + SetZ = 3,28 + SetVisible = 4,false Graphic = Earth1 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,198 - SetY = 1,186 - SetX = 2,307 - SetY = 2,123 - SetX = 3,352 - SetY = 3,110 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,54 + SetY = 1,-59 + SetX = 2,139 + SetY = 2,-157 + SetFrame = 3,2 + SetX = 3,175 + SetY = 3,-178 + SetFrame = 4,3 + SetFrame = 5,4 + SetFrame = 6,5 + SetFrame = 7,6 Play = 0,throw,80 Play = 3,Earth1,80 diff --git a/PBS/Animations/Converted/Move/ROLLINGKICK.txt b/PBS/Animations/Converted/Move/ROLLINGKICK.txt index e6384557e..f2793e14e 100644 --- a/PBS/Animations/Converted/Move/ROLLINGKICK.txt +++ b/PBS/Animations/Converted/Move/ROLLINGKICK.txt @@ -3,42 +3,47 @@ [Move,ROLLINGKICK] Name = ROLLINGKICK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 4,360 - SetY = 4,78 + SetFrame = 4,7 + SetX = 4,-24 + SetY = 4,-18 + SetZ = 4,28 SetOpacity = 4,50 - SetX = 5,384 - SetY = 5,94 - SetX = 6,400 - SetY = 6,110 + SetX = 5,0 + SetY = 5,-2 + SetX = 6,16 + SetY = 6,14 SetOpacity = 6,25 + SetVisible = 7,false Graphic = normal1 Focus = Target - SetX = 0,232 - SetY = 0,102 + SetFrame = 0,7 + SetX = 0,-152 + SetY = 0,6 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 - SetX = 1,264 - SetY = 1,54 - SetX = 2,288 - SetY = 2,22 - SetX = 3,312 - SetY = 3,30 - SetX = 4,360 - SetY = 4,78 - SetX = 5,416 - SetY = 5,126 - SetX = 6,440 - SetY = 6,150 - SetX = 7,448 - SetY = 7,158 + SetX = 1,-120 + SetY = 1,-42 + SetX = 2,-96 + SetY = 2,-74 + SetX = 3,-72 + SetY = 3,-66 + SetX = 4,-24 + SetY = 4,-18 + SetX = 5,32 + SetY = 5,30 + SetX = 6,56 + SetY = 6,54 + SetX = 7,64 + SetY = 7,62 Play = 4,Blow4,80 diff --git a/PBS/Animations/Converted/Move/SANDATTACK.txt b/PBS/Animations/Converted/Move/SANDATTACK.txt index 291a6fd8c..d53c87092 100644 --- a/PBS/Animations/Converted/Move/SANDATTACK.txt +++ b/PBS/Animations/Converted/Move/SANDATTACK.txt @@ -3,538 +3,625 @@ [Move,SANDATTACK] Name = SANDATTACK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Sand-Attack Focus = UserAndTarget - SetX = 0,134 - SetY = 0,280 - SetX = 2,121 - SetY = 2,268 - SetX = 3,166 - SetY = 3,249 - SetX = 4,200 - SetY = 4,224 - SetX = 5,235 - SetY = 5,200 - SetX = 6,268 - SetY = 6,176 - SetX = 7,302 - SetY = 7,153 - SetX = 8,336 - SetY = 8,128 - SetX = 9,371 - SetY = 9,104 + SetX = 0,4 + SetY = 0,87 + SetZ = 0,27 + SetVisible = 1,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 3,179 - SetY = 3,261 - SetX = 4,217 - SetY = 4,240 - SetX = 5,256 - SetY = 5,219 - SetX = 6,294 - SetY = 6,198 - SetX = 7,332 - SetY = 7,177 - SetX = 8,371 - SetY = 8,157 - SetX = 9,409 - SetY = 9,135 + SetFrame = 1,2 + SetX = 1,14 + SetY = 1,39 + SetZ = 1,29 + SetX = 2,39 + SetY = 2,0 + SetX = 3,64 + SetY = 3,-40 + SetX = 4,89 + SetY = 4,-79 + SetX = 5,114 + SetY = 5,-118 + SetX = 6,139 + SetY = 6,-157 + SetX = 7,164 + SetY = 7,-196 + SetFrame = 8,0 + SetFlip = 8,true + SetX = 8,-10 + SetY = 8,98 + SetX = 9,14 + SetY = 9,68 + SetX = 10,41 + SetY = 10,26 + SetX = 11,68 + SetY = 11,-14 + SetX = 12,94 + SetY = 12,-54 + SetX = 13,121 + SetY = 13,-96 + SetX = 14,147 + SetY = 14,-135 + SetX = 15,175 + SetY = 15,-178 Graphic = Sand-Attack Focus = UserAndTarget - SetX = 1,147 - SetY = 1,249 - SetX = 2,179 - SetY = 2,224 - SetX = 3,211 - SetY = 3,198 - SetX = 4,243 - SetY = 4,173 - SetX = 5,275 - SetY = 5,148 - SetX = 6,307 - SetY = 6,123 - SetX = 7,339 - SetY = 7,98 - SetFlip = 8,true - SetX = 8,115 - SetY = 8,287 - SetX = 9,147 - SetY = 9,268 - SetX = 10,181 - SetY = 10,241 - SetX = 11,216 - SetY = 11,215 - SetX = 12,249 - SetY = 12,189 - SetX = 13,283 - SetY = 13,162 - SetX = 14,317 - SetY = 14,137 - SetX = 15,352 - SetY = 15,110 + SetFrame = 1,1 + SetX = 1,4 + SetY = 1,9 + SetZ = 1,30 + SetX = 2,33 + SetY = 2,-25 + SetX = 3,61 + SetY = 3,-59 + SetX = 4,89 + SetY = 4,-93 + SetX = 5,117 + SetY = 5,-128 + SetX = 6,146 + SetY = 6,-162 + SetX = 7,175 + SetY = 7,-196 + SetVisible = 8,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 1,134 - SetY = 1,230 - SetX = 2,171 - SetY = 2,208 - SetX = 3,207 - SetY = 3,186 - SetX = 4,243 - SetY = 4,164 - SetX = 5,279 - SetY = 5,142 - SetX = 6,315 - SetY = 6,120 - SetX = 7,352 - SetY = 7,98 - SetX = 9,160 - SetY = 9,261 - SetX = 10,196 - SetY = 10,235 - SetX = 11,232 - SetY = 11,209 - SetX = 12,268 - SetY = 12,183 - SetX = 13,304 - SetY = 13,157 - SetX = 14,340 - SetY = 14,131 - SetX = 15,377 - SetY = 15,104 + SetX = 1,25 + SetY = 1,68 + SetZ = 1,31 + SetX = 2,56 + SetY = 2,34 + SetX = 3,86 + SetY = 3,1 + SetX = 4,117 + SetY = 4,-29 + SetX = 5,147 + SetY = 5,-64 + SetX = 6,178 + SetY = 6,-96 + SetX = 7,209 + SetY = 7,-128 + SetVisible = 8,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 1,160 - SetY = 1,268 - SetX = 2,200 - SetY = 2,246 - SetX = 3,239 - SetY = 3,225 - SetX = 4,278 - SetY = 4,205 - SetX = 5,317 - SetY = 5,183 - SetX = 6,356 - SetY = 6,162 - SetX = 7,396 - SetY = 7,142 - SetFlip = 9,true - SetX = 9,179 - SetY = 9,249 - SetX = 10,219 - SetY = 10,225 - SetX = 11,257 - SetY = 11,202 - SetX = 12,297 - SetY = 12,179 - SetX = 13,336 - SetY = 13,157 - SetX = 14,376 - SetY = 14,134 - SetX = 15,416 - SetY = 15,110 + SetFrame = 2,2 + SetX = 2,-5 + SetY = 2,68 + SetZ = 2,27 + SetFrame = 3,0 + SetX = 3,29 + SetY = 3,39 + SetX = 4,56 + SetY = 4,0 + SetX = 5,83 + SetY = 5,-37 + SetX = 6,109 + SetY = 6,-75 + SetX = 7,135 + SetY = 7,-110 + SetX = 8,162 + SetY = 8,-150 + SetX = 9,189 + SetY = 9,-187 + SetVisible = 10,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 3,153 - SetY = 3,242 - SetX = 4,191 - SetY = 4,219 - SetX = 5,228 - SetY = 5,196 - SetX = 6,265 - SetY = 6,173 - SetX = 7,302 - SetY = 7,150 - SetX = 8,340 - SetY = 8,127 - SetX = 9,377 - SetY = 9,104 + SetX = 3,39 + SetY = 3,57 + SetZ = 3,28 + SetX = 4,69 + SetY = 4,25 + SetX = 5,100 + SetY = 5,-7 + SetX = 6,129 + SetY = 6,-40 + SetX = 7,159 + SetY = 7,-73 + SetX = 8,189 + SetY = 8,-104 + SetX = 9,219 + SetY = 9,-139 + SetVisible = 10,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 4,115 - SetY = 4,261 - SetX = 5,134 - SetY = 5,242 - SetX = 6,171 - SetY = 6,215 - SetX = 7,207 - SetY = 7,187 - SetX = 8,243 - SetY = 8,161 - SetX = 9,279 - SetY = 9,134 - SetX = 10,315 - SetY = 10,106 - SetX = 11,352 - SetY = 11,79 + SetFrame = 3,2 + SetX = 3,19 + SetY = 3,28 + SetZ = 3,32 + SetX = 4,49 + SetY = 4,-7 + SetX = 5,78 + SetY = 5,-43 + SetX = 6,107 + SetY = 6,-79 + SetX = 7,135 + SetY = 7,-115 + SetX = 8,165 + SetY = 8,-151 + SetX = 9,194 + SetY = 9,-187 + SetVisible = 10,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 5,166 - SetY = 5,274 - SetX = 6,204 - SetY = 6,249 - SetX = 7,241 - SetY = 7,224 - SetX = 8,278 - SetY = 8,198 - SetX = 9,315 - SetY = 9,173 - SetX = 10,352 - SetY = 10,148 - SetX = 11,390 - SetY = 11,123 + SetFrame = 4,1 + SetX = 4,-10 + SetY = 4,57 + SetZ = 4,33 + SetX = 5,4 + SetY = 5,28 + SetX = 6,33 + SetY = 6,-14 + SetX = 7,61 + SetY = 7,-57 + SetX = 8,89 + SetY = 8,-98 + SetX = 9,117 + SetY = 9,-140 + SetX = 10,146 + SetY = 10,-184 + SetX = 11,175 + SetY = 11,-226 + SetVisible = 12,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 5,160 - SetY = 5,268 - SetX = 6,200 - SetY = 6,243 - SetX = 7,239 - SetY = 7,219 - SetX = 8,278 - SetY = 8,195 - SetX = 9,317 - SetY = 9,171 - SetX = 10,356 - SetY = 10,147 - SetX = 11,396 - SetY = 11,123 + SetX = 5,29 + SetY = 5,78 + SetZ = 5,34 + SetX = 6,59 + SetY = 6,39 + SetX = 7,88 + SetY = 7,0 + SetX = 8,117 + SetY = 8,-40 + SetX = 9,146 + SetY = 9,-79 + SetX = 10,175 + SetY = 10,-118 + SetX = 11,204 + SetY = 11,-157 + SetVisible = 12,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 6,121 - SetY = 6,274 - SetX = 7,147 - SetY = 7,249 - SetX = 8,181 - SetY = 8,222 - SetX = 9,216 - SetY = 9,196 - SetX = 10,249 - SetY = 10,170 - SetX = 11,283 - SetY = 11,144 - SetX = 12,317 - SetY = 12,118 - SetX = 13,352 - SetY = 13,91 + SetFrame = 5,2 + SetX = 5,25 + SetY = 5,68 + SetZ = 5,35 + SetX = 6,56 + SetY = 6,29 + SetX = 7,86 + SetY = 7,-7 + SetX = 8,117 + SetY = 8,-45 + SetX = 9,147 + SetY = 9,-82 + SetX = 10,178 + SetY = 10,-120 + SetX = 11,209 + SetY = 11,-157 + SetVisible = 12,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 7,172 - SetY = 7,268 - SetX = 8,209 - SetY = 8,243 - SetX = 9,245 - SetY = 9,219 - SetX = 10,281 - SetY = 10,195 - SetX = 11,317 - SetY = 11,171 - SetX = 12,353 - SetY = 12,147 - SetX = 13,390 - SetY = 13,123 + SetFrame = 6,2 + SetX = 6,-5 + SetY = 6,78 + SetZ = 6,36 + SetX = 7,14 + SetY = 7,39 + SetX = 8,41 + SetY = 8,-3 + SetX = 9,68 + SetY = 9,-43 + SetX = 10,94 + SetY = 10,-84 + SetX = 11,121 + SetY = 11,-125 + SetX = 12,147 + SetY = 12,-165 + SetX = 13,175 + SetY = 13,-207 + SetVisible = 14,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 7,179 - SetY = 7,274 - SetX = 8,219 - SetY = 8,252 - SetX = 9,257 - SetY = 9,230 - SetX = 10,297 - SetY = 10,208 - SetX = 11,336 - SetY = 11,186 - SetX = 12,376 - SetY = 12,164 - SetX = 13,416 - SetY = 13,142 + SetX = 7,34 + SetY = 7,68 + SetZ = 7,37 + SetX = 8,63 + SetY = 8,29 + SetX = 9,91 + SetY = 9,-7 + SetX = 10,119 + SetY = 10,-45 + SetX = 11,147 + SetY = 11,-82 + SetX = 12,175 + SetY = 12,-120 + SetX = 13,204 + SetY = 13,-157 + SetVisible = 14,false + + Graphic = Sand-Attack + Focus = UserAndTarget + SetX = 7,39 + SetY = 7,78 + SetZ = 7,38 + SetX = 8,71 + SetY = 8,43 + SetX = 9,100 + SetY = 9,9 + SetX = 10,132 + SetY = 10,-25 + SetX = 11,162 + SetY = 11,-59 + SetX = 12,193 + SetY = 12,-93 + SetX = 13,225 + SetY = 13,-128 + SetVisible = 14,false + + Graphic = Sand-Attack + Focus = UserAndTarget + SetFrame = 9,2 + SetX = 9,25 + SetY = 9,57 + SetZ = 9,30 + SetX = 10,53 + SetY = 10,17 + SetX = 11,81 + SetY = 11,-23 + SetX = 12,109 + SetY = 12,-64 + SetX = 13,137 + SetY = 13,-104 + SetX = 14,165 + SetY = 14,-145 + SetX = 15,194 + SetY = 15,-187 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetFrame = 9,1 + SetFlip = 9,true + SetX = 9,39 + SetY = 9,39 + SetZ = 9,31 + SetX = 10,71 + SetY = 10,1 + SetX = 11,100 + SetY = 11,-34 + SetX = 12,132 + SetY = 12,-70 + SetX = 13,162 + SetY = 13,-104 + SetX = 14,193 + SetY = 14,-140 + SetX = 15,225 + SetY = 15,-178 Play = 0,Sand #------------------------------- [OppMove,SANDATTACK] Name = SANDATTACK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Sand-Attack Focus = UserAndTarget - SetX = 0,377 - SetY = 0,126 - SetX = 1,352 - SetY = 1,142 - SetX = 2,314 - SetY = 2,159 - SetX = 3,276 - SetY = 3,176 - SetX = 4,240 - SetY = 4,194 - SetX = 5,203 - SetY = 5,211 - SetX = 6,165 - SetY = 6,228 - SetX = 7,128 - SetY = 7,246 - SetX = 8,364 - SetY = 8,142 + SetFrame = 0,2 + SetX = 0,194 + SetY = 0,-153 + SetZ = 0,27 + SetX = 1,175 + SetY = 1,-128 + SetX = 2,145 + SetY = 2,-101 + SetX = 3,115 + SetY = 3,-75 + SetX = 4,87 + SetY = 4,-46 + SetX = 5,58 + SetY = 5,-20 + SetX = 6,28 + SetY = 6,6 + SetX = 7,0 + SetY = 7,34 + SetFrame = 8,0 + SetX = 8,184 + SetY = 8,-128 SetAngle = 8,270 - SetX = 9,320 - SetY = 9,154 - SetX = 10,284 - SetY = 10,167 - SetX = 11,249 - SetY = 11,179 - SetX = 12,214 - SetY = 12,192 - SetX = 13,179 - SetY = 13,205 - SetX = 14,144 - SetY = 14,217 - SetX = 15,108 - SetY = 15,230 + SetX = 9,150 + SetY = 9,-109 + SetX = 10,121 + SetY = 10,-89 + SetX = 11,94 + SetY = 11,-70 + SetX = 12,67 + SetY = 12,-50 + SetX = 13,39 + SetY = 13,-29 + SetX = 14,12 + SetY = 14,-10 + SetX = 15,-15 + SetY = 15,9 Graphic = Sand-Attack Focus = UserAndTarget - SetX = 1,339 - SetY = 1,123 - SetX = 2,300 - SetY = 2,138 - SetX = 3,262 - SetY = 3,153 - SetX = 4,224 - SetY = 4,168 - SetX = 5,185 - SetY = 5,183 - SetX = 6,147 - SetY = 6,198 - SetX = 7,108 - SetY = 7,214 - SetX = 9,339 - SetY = 9,154 - SetX = 10,302 - SetY = 10,164 - SetX = 11,266 - SetY = 11,173 - SetX = 12,230 - SetY = 12,183 - SetX = 13,194 - SetY = 13,192 - SetX = 14,158 - SetY = 14,201 - SetX = 15,121 - SetY = 15,211 + SetFrame = 1,1 + SetX = 1,164 + SetY = 1,-157 + SetZ = 1,28 + SetX = 2,134 + SetY = 2,-134 + SetX = 3,104 + SetY = 3,-110 + SetX = 4,75 + SetY = 4,-87 + SetX = 5,44 + SetY = 5,-64 + SetX = 6,14 + SetY = 6,-40 + SetX = 7,-15 + SetY = 7,-15 + SetVisible = 8,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 1,352 - SetY = 1,142 - SetX = 2,313 - SetY = 2,155 - SetX = 3,275 - SetY = 3,168 - SetX = 4,236 - SetY = 4,181 - SetX = 5,198 - SetY = 5,194 - SetX = 6,160 - SetY = 6,207 - SetX = 7,121 - SetY = 7,220 - SetX = 9,339 - SetY = 9,154 - SetX = 10,304 - SetY = 10,168 - SetX = 11,268 - SetY = 11,183 - SetX = 12,233 - SetY = 12,198 - SetX = 13,198 - SetY = 13,212 - SetX = 14,163 - SetY = 14,227 - SetX = 15,128 - SetY = 15,242 + SetX = 1,175 + SetY = 1,-128 + SetZ = 1,29 + SetX = 2,144 + SetY = 2,-107 + SetX = 3,114 + SetY = 3,-87 + SetX = 4,84 + SetY = 4,-67 + SetX = 5,54 + SetY = 5,-46 + SetX = 6,25 + SetY = 6,-26 + SetX = 7,-5 + SetY = 7,-6 + SetVisible = 8,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 2,371 - SetY = 2,116 - SetX = 3,326 - SetY = 3,129 - SetX = 4,291 - SetY = 4,143 - SetX = 5,256 - SetY = 5,157 - SetX = 6,220 - SetY = 6,170 - SetX = 7,185 - SetY = 7,183 - SetX = 8,150 - SetY = 8,197 - SetX = 9,115 - SetY = 9,211 + SetFrame = 2,1 + SetX = 2,189 + SetY = 2,-168 + SetZ = 2,30 + SetX = 3,154 + SetY = 3,-148 + SetX = 4,127 + SetY = 4,-126 + SetX = 5,100 + SetY = 5,-104 + SetX = 6,71 + SetY = 6,-84 + SetX = 7,44 + SetY = 7,-64 + SetX = 8,17 + SetY = 8,-42 + SetX = 9,-10 + SetY = 9,-20 + SetVisible = 10,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 3,339 - SetY = 3,148 - SetX = 4,302 - SetY = 4,159 - SetX = 5,266 - SetY = 5,168 - SetX = 6,230 - SetY = 6,179 - SetX = 7,194 - SetY = 7,190 - SetX = 8,158 - SetY = 8,200 - SetX = 9,121 - SetY = 9,211 + SetX = 3,164 + SetY = 3,-118 + SetZ = 3,31 + SetX = 4,135 + SetY = 4,-101 + SetX = 5,107 + SetY = 5,-87 + SetX = 6,79 + SetY = 6,-70 + SetX = 7,51 + SetY = 7,-53 + SetX = 8,23 + SetY = 8,-37 + SetX = 9,-5 + SetY = 9,-20 + SetVisible = 10,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 3,339 - SetY = 3,148 - SetX = 4,304 - SetY = 4,164 - SetX = 5,270 - SetY = 5,181 - SetX = 6,236 - SetY = 6,198 - SetX = 7,203 - SetY = 7,215 - SetX = 8,168 - SetY = 8,231 - SetX = 9,134 - SetY = 9,249 + SetFrame = 3,2 + SetX = 3,164 + SetY = 3,-118 + SetZ = 3,32 + SetX = 4,137 + SetY = 4,-93 + SetX = 5,110 + SetY = 5,-67 + SetX = 6,84 + SetY = 6,-40 + SetX = 7,58 + SetY = 7,-14 + SetX = 8,31 + SetY = 8,10 + SetX = 9,4 + SetY = 9,39 + SetVisible = 10,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 4,396 - SetY = 4,142 - SetX = 5,352 - SetY = 5,167 - SetX = 6,317 - SetY = 6,181 - SetX = 7,283 - SetY = 7,196 - SetX = 8,249 - SetY = 8,211 - SetX = 9,216 - SetY = 9,225 - SetX = 10,181 - SetY = 10,240 - SetX = 11,147 - SetY = 11,255 + SetX = 4,209 + SetY = 4,-128 + SetZ = 4,33 + SetX = 5,175 + SetY = 5,-89 + SetX = 6,147 + SetY = 6,-67 + SetX = 7,121 + SetY = 7,-43 + SetX = 8,94 + SetY = 8,-20 + SetX = 9,68 + SetY = 9,1 + SetX = 10,41 + SetY = 10,25 + SetX = 11,14 + SetY = 11,48 + SetVisible = 12,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 5,332 - SetY = 5,142 - SetX = 6,296 - SetY = 6,154 - SetX = 7,260 - SetY = 7,167 - SetX = 8,224 - SetY = 8,179 - SetX = 9,188 - SetY = 9,192 - SetX = 10,152 - SetY = 10,205 - SetX = 11,115 - SetY = 11,217 + SetFrame = 5,2 + SetX = 5,159 + SetY = 5,-128 + SetZ = 5,34 + SetX = 6,131 + SetY = 6,-109 + SetX = 7,103 + SetY = 7,-89 + SetX = 8,75 + SetY = 8,-70 + SetX = 9,46 + SetY = 9,-50 + SetX = 10,18 + SetY = 10,-29 + SetX = 11,-10 + SetY = 11,-10 + SetVisible = 12,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 5,339 - SetY = 5,148 - SetX = 6,301 - SetY = 6,159 - SetX = 7,264 - SetY = 7,168 - SetX = 8,227 - SetY = 8,179 - SetX = 9,190 - SetY = 9,190 - SetX = 10,152 - SetY = 10,200 - SetX = 11,115 - SetY = 11,211 + SetX = 5,164 + SetY = 5,-118 + SetZ = 5,35 + SetX = 6,135 + SetY = 6,-101 + SetX = 7,106 + SetY = 7,-87 + SetX = 8,77 + SetY = 8,-70 + SetX = 9,48 + SetY = 9,-53 + SetX = 10,18 + SetY = 10,-37 + SetX = 11,-10 + SetY = 11,-20 + SetVisible = 12,false Graphic = Sand-Attack Focus = UserAndTarget SetFlip = 6,true - SetX = 6,377 - SetY = 6,142 - SetX = 7,332 - SetY = 7,154 - SetX = 8,296 - SetY = 8,167 - SetX = 9,260 - SetY = 9,179 - SetX = 10,224 - SetY = 10,192 - SetX = 11,188 - SetY = 11,205 - SetX = 12,153 - SetY = 12,217 - SetX = 13,115 - SetY = 13,230 + SetX = 6,194 + SetY = 6,-128 + SetZ = 6,36 + SetX = 7,159 + SetY = 7,-109 + SetX = 8,131 + SetY = 8,-89 + SetX = 9,103 + SetY = 9,-70 + SetX = 10,75 + SetY = 10,-50 + SetX = 11,46 + SetY = 11,-29 + SetX = 12,19 + SetY = 12,-10 + SetX = 13,-10 + SetY = 13,9 + SetVisible = 14,false Graphic = Sand-Attack Focus = UserAndTarget - SetX = 7,326 - SetY = 7,129 - SetX = 8,289 - SetY = 8,140 - SetX = 9,254 - SetY = 9,150 - SetX = 10,217 - SetY = 10,161 - SetX = 11,181 - SetY = 11,171 - SetX = 12,145 - SetY = 12,181 - SetX = 13,108 - SetY = 13,192 + SetFrame = 7,2 + SetX = 7,154 + SetY = 7,-148 + SetZ = 7,37 + SetX = 8,125 + SetY = 8,-131 + SetX = 9,98 + SetY = 9,-115 + SetX = 10,69 + SetY = 10,-98 + SetX = 11,41 + SetY = 11,-82 + SetX = 12,13 + SetY = 12,-67 + SetX = 13,-15 + SetY = 13,-50 + SetVisible = 14,false Graphic = Sand-Attack Focus = UserAndTarget + SetFrame = 7,1 SetFlip = 7,true - SetX = 7,358 - SetY = 7,135 - SetX = 8,323 - SetY = 8,151 - SetX = 9,288 - SetY = 9,167 - SetX = 10,252 - SetY = 10,183 - SetX = 11,217 - SetY = 11,198 - SetX = 12,182 - SetY = 12,214 - SetX = 13,147 - SetY = 13,230 + SetX = 7,179 + SetY = 7,-139 + SetZ = 7,38 + SetX = 8,152 + SetY = 8,-114 + SetX = 9,125 + SetY = 9,-89 + SetX = 10,96 + SetY = 10,-64 + SetX = 11,69 + SetY = 11,-40 + SetX = 12,42 + SetY = 12,-15 + SetX = 13,14 + SetY = 13,9 + SetVisible = 14,false + + Graphic = Sand-Attack + Focus = UserAndTarget + SetX = 9,164 + SetY = 9,-109 + SetZ = 9,28 + SetX = 10,135 + SetY = 10,-93 + SetX = 11,107 + SetY = 11,-79 + SetX = 12,79 + SetY = 12,-64 + SetX = 13,51 + SetY = 13,-50 + SetX = 14,23 + SetY = 14,-35 + SetX = 15,-5 + SetY = 15,-20 + + Graphic = Sand-Attack + Focus = UserAndTarget + SetFrame = 9,2 + SetX = 9,164 + SetY = 9,-109 + SetZ = 9,29 + SetX = 10,137 + SetY = 10,-87 + SetX = 11,109 + SetY = 11,-64 + SetX = 12,82 + SetY = 12,-40 + SetX = 13,54 + SetY = 13,-18 + SetX = 14,27 + SetY = 14,4 + SetX = 15,0 + SetY = 15,28 Play = 0,Sand diff --git a/PBS/Animations/Converted/Move/SANDSTORM.txt b/PBS/Animations/Converted/Move/SANDSTORM.txt index aa4124b83..c0a5d545b 100644 --- a/PBS/Animations/Converted/Move/SANDSTORM.txt +++ b/PBS/Animations/Converted/Move/SANDSTORM.txt @@ -3,16 +3,18 @@ [Move,SANDSTORM] Name = SANDSTORM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,-350 SetY = 0,-30 + SetZ = 0,27 SetX = 1,153 SetY = 1,62 SetX = 2,-350 @@ -33,9 +35,11 @@ Name = SANDSTORM SetY = 9,252 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,31 SetY = 0,69 + SetZ = 0,28 SetX = 1,56 SetY = 1,85 SetX = 2,31 @@ -56,9 +60,11 @@ Name = SANDSTORM SetY = 9,175 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,156 SetY = 0,106 + SetZ = 0,29 SetX = 1,74 SetY = 1,223 SetX = 2,156 @@ -79,9 +85,11 @@ Name = SANDSTORM SetY = 9,267 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,165 SetY = 0,220 + SetZ = 0,30 SetX = 1,220 SetY = 1,207 SetX = 2,165 @@ -102,9 +110,11 @@ Name = SANDSTORM SetY = 9,197 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,267 SetY = 0,178 + SetZ = 0,31 SetX = 1,352 SetY = 1,253 SetX = 2,267 @@ -125,9 +135,11 @@ Name = SANDSTORM SetY = 9,82 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,309 SetY = 0,248 + SetZ = 0,32 SetX = 1,464 SetY = 1,227 SetX = 2,309 @@ -148,9 +160,11 @@ Name = SANDSTORM SetY = 9,61 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,388 SetY = 0,142 + SetZ = 0,33 SetX = 1,484 SetY = 1,76 SetX = 2,388 @@ -171,9 +185,11 @@ Name = SANDSTORM SetY = 9,158 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,448 SetY = 0,243 + SetZ = 0,34 SetX = 1,378 SetY = 1,130 SetX = 2,448 @@ -194,9 +210,11 @@ Name = SANDSTORM SetY = 9,240 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,35 SetY = 0,216 + SetZ = 0,35 SetX = 1,285 SetY = 1,142 SetX = 2,35 @@ -217,9 +235,11 @@ Name = SANDSTORM SetY = 9,206 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,276 SetY = 0,34 + SetZ = 0,36 SetX = 1,316 SetY = 1,22 SetX = 2,276 @@ -240,35 +260,154 @@ Name = SANDSTORM SetY = 9,64 Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,487 SetY = 0,32 - SetX = 4,358 - SetY = 4,16 - SetX = 5,487 - SetY = 5,32 - SetX = 9,311 - SetY = 9,55 + SetZ = 0,37 + SetVisible = 1,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,492 SetY = 0,135 - SetX = 4,267 - SetY = 4,63 - SetX = 5,492 - SetY = 5,135 - SetX = 9,328 - SetY = 9,146 + SetZ = 0,38 + SetVisible = 1,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,387 SetY = 0,18 - SetX = 9,251 - SetY = 9,305 + SetZ = 0,39 + SetVisible = 1,false Graphic = weather - Focus = Screen + Focus = Foreground + SetFrame = 0,3 SetX = 0,148 SetY = 0,9 + SetZ = 0,40 + SetVisible = 1,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,487 + SetY = 2,32 + SetZ = 2,37 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,492 + SetY = 2,135 + SetZ = 2,38 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,387 + SetY = 2,18 + SetZ = 2,39 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 2,3 + SetX = 2,148 + SetY = 2,9 + SetZ = 2,40 + SetVisible = 3,false + + Graphic = weather + Focus = Foreground + SetFrame = 4,3 + SetX = 4,358 + SetY = 4,16 + SetZ = 4,37 + SetX = 5,487 + SetY = 5,32 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 4,3 + SetX = 4,267 + SetY = 4,63 + SetZ = 4,38 + SetX = 5,492 + SetY = 5,135 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 5,3 + SetX = 5,387 + SetY = 5,18 + SetZ = 5,39 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 5,3 + SetX = 5,148 + SetY = 5,9 + SetZ = 5,40 + SetVisible = 6,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,487 + SetY = 7,32 + SetZ = 7,37 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,492 + SetY = 7,135 + SetZ = 7,38 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,387 + SetY = 7,18 + SetZ = 7,39 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 7,3 + SetX = 7,148 + SetY = 7,9 + SetZ = 7,40 + SetVisible = 8,false + + Graphic = weather + Focus = Foreground + SetFrame = 9,3 + SetX = 9,311 + SetY = 9,55 + SetZ = 9,37 + + Graphic = weather + Focus = Foreground + SetFrame = 9,3 + SetX = 9,328 + SetY = 9,146 + SetZ = 9,38 + + Graphic = weather + Focus = Foreground + SetFrame = 9,3 + SetX = 9,251 + SetY = 9,305 + SetZ = 9,39 diff --git a/PBS/Animations/Converted/Move/SCARYFACE.txt b/PBS/Animations/Converted/Move/SCARYFACE.txt index 9609f0bed..f361c176c 100644 --- a/PBS/Animations/Converted/Move/SCARYFACE.txt +++ b/PBS/Animations/Converted/Move/SCARYFACE.txt @@ -3,16 +3,18 @@ [Move,SCARYFACE] Name = SCARYFACE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal2 Focus = Target - SetX = 0,384 - SetY = 0,102 + SetFrame = 0,10 + SetX = 0,0 + SetY = 0,6 + SetZ = 0,27 SetOpacity = 0,150 SetZoomX = 1,125 SetZoomY = 1,125 diff --git a/PBS/Animations/Converted/Move/SCRATCH.txt b/PBS/Animations/Converted/Move/SCRATCH.txt index 699b0751c..6c5518454 100644 --- a/PBS/Animations/Converted/Move/SCRATCH.txt +++ b/PBS/Animations/Converted/Move/SCRATCH.txt @@ -3,22 +3,28 @@ [Move,SCRATCH] Name = SCRATCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = scratchbattle Focus = Target - SetX = 1,399 - SetY = 1,74 - SetX = 2,383 - SetY = 2,90 - SetX = 3,367 - SetY = 3,106 - SetX = 4,351 - SetY = 4,122 - SetY = 5,138 + SetX = 1,15 + SetY = 1,-22 + SetZ = 1,27 + SetFrame = 2,1 + SetX = 2,-1 + SetY = 2,-6 + SetFrame = 3,2 + SetX = 3,-17 + SetY = 3,10 + SetFrame = 4,3 + SetX = 4,-33 + SetY = 4,26 + SetFrame = 5,4 + SetY = 5,42 + SetVisible = 6,false Play = 0,Slash10,80 diff --git a/PBS/Animations/Converted/Move/SCREECH.txt b/PBS/Animations/Converted/Move/SCREECH.txt index 248fc2c32..4f0558b19 100644 --- a/PBS/Animations/Converted/Move/SCREECH.txt +++ b/PBS/Animations/Converted/Move/SCREECH.txt @@ -3,48 +3,57 @@ [Move,SCREECH] Name = SCREECH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Growl Focus = UserAndTarget - SetX = 0,179 - SetY = 0,142 - SetY = 1,135 - SetY = 2,236 - SetY = 3,135 - SetY = 5,129 - SetY = 6,135 - SetY = 7,123 - SetY = 8,129 - SetY = 9,135 + SetFrame = 0,1 + SetX = 0,39 + SetY = 0,-128 + SetZ = 0,28 + SetY = 1,-139 + SetFrame = 2,2 + SetY = 2,18 + SetFrame = 3,1 + SetY = 3,-139 + SetY = 5,-148 + SetY = 6,-139 + SetY = 7,-157 + SetY = 8,-148 + SetY = 9,-139 Graphic = Growl Focus = UserAndTarget - SetX = 0,179 - SetY = 0,230 - SetY = 1,224 - SetY = 2,129 - SetY = 3,217 - SetY = 4,236 - SetY = 5,224 - SetY = 6,230 - SetY = 7,224 - SetY = 9,230 + SetFrame = 0,2 + SetX = 0,39 + SetY = 0,9 + SetZ = 0,29 + SetY = 1,0 + SetFrame = 2,1 + SetY = 2,-148 + SetFrame = 3,2 + SetY = 3,-10 + SetY = 4,18 + SetY = 5,0 + SetY = 6,9 + SetY = 7,0 + SetY = 9,9 Graphic = Growl Focus = UserAndTarget - SetX = 0,179 - SetY = 0,186 - SetY = 1,179 - SetY = 2,192 - SetY = 3,179 - SetY = 4,192 - SetY = 6,179 - SetY = 7,173 - SetY = 9,179 + SetX = 0,39 + SetY = 0,-59 + SetZ = 0,27 + SetY = 1,-70 + SetY = 2,-50 + SetY = 3,-70 + SetY = 4,-50 + SetY = 6,-70 + SetY = 7,-79 + SetY = 9,-70 PlayUserCry = 0 diff --git a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt index 18b933ad8..6d3fd3f74 100644 --- a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt +++ b/PBS/Animations/Converted/Move/SELFDESTRUCT.txt @@ -3,65 +3,133 @@ [Move,SELFDESTRUCT] Name = SELFDESTRUCT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = 030-Explosion01 - Focus = Target - SetX = 2,464 - SetY = 2,142 - SetX = 3,296 - SetY = 3,78 - SetX = 4,464 - SetY = 4,142 - SetX = 6,360 - SetY = 6,166 - SetX = 9,336 - SetY = 9,70 - SetX = 12,448 - SetY = 12,118 - SetX = 14,360 - SetY = 14,182 - - Graphic = 030-Explosion01 - Focus = Target - SetX = 3,464 - SetY = 3,142 - SetX = 8,336 - SetY = 8,70 - SetX = 10,448 - SetY = 10,118 - SetX = 12,360 - SetY = 12,182 - SetX = 13,448 - SetY = 13,118 - SetX = 14,360 - SetY = 14,182 - - Graphic = 030-Explosion01 - Focus = Target - SetX = 5,360 - SetY = 5,166 - SetY = 11,174 - SetY = 13,182 + SetX = 0,0 + SetY = 0,0 Graphic = 030-Explosion01 Focus = Target - SetX = 0,296 - SetY = 0,78 - SetX = 6,464 - SetY = 6,142 - SetX = 8,360 - SetY = 8,166 - SetX = 11,336 - SetY = 11,70 - SetX = 14,448 - SetY = 14,118 - SetX = 16,360 - SetY = 16,182 + SetX = 0,-88 + SetY = 0,-18 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,5 + SetFrame = 5,6 + SetFrame = 6,5 + SetX = 6,80 + SetY = 6,46 + SetFrame = 7,6 + SetFrame = 8,3 + SetX = 8,-24 + SetY = 8,70 + SetFrame = 9,5 + SetFrame = 10,6 + SetFrame = 11,3 + SetX = 11,-48 + SetY = 11,-26 + SetFrame = 12,5 + SetFrame = 13,6 + SetFrame = 14,5 + SetX = 14,64 + SetY = 14,22 + SetFrame = 15,6 + SetX = 16,-24 + SetY = 16,86 + + Graphic = 030-Explosion01 + Focus = Target + SetX = 2,80 + SetY = 2,46 + SetZ = 2,28 + SetFrame = 3,4 + SetX = 3,-88 + SetY = 3,-18 + SetFrame = 4,2 + SetX = 4,80 + SetY = 4,46 + SetFrame = 5,3 + SetFrame = 6,1 + SetX = 6,-24 + SetY = 6,70 + SetFrame = 7,2 + SetFrame = 8,4 + SetFrame = 9,1 + SetX = 9,-48 + SetY = 9,-26 + SetFrame = 10,2 + SetFrame = 11,4 + SetFrame = 12,2 + SetX = 12,64 + SetY = 12,22 + SetFrame = 13,3 + SetX = 14,-24 + SetY = 14,86 + SetFrame = 15,5 + SetVisible = 16,false + + Graphic = 030-Explosion01 + Focus = Target + SetFrame = 3,1 + SetX = 3,80 + SetY = 3,46 + SetZ = 3,29 + SetVisible = 4,false + + Graphic = 030-Explosion01 + Focus = Target + SetFrame = 5,4 + SetX = 5,80 + SetY = 5,46 + SetZ = 5,29 + SetVisible = 6,false + + Graphic = 030-Explosion01 + Focus = Target + SetX = 5,-24 + SetY = 5,70 + SetZ = 5,30 + SetVisible = 6,false + + Graphic = 030-Explosion01 + Focus = Target + SetX = 8,-48 + SetY = 8,-26 + SetZ = 8,29 + SetVisible = 9,false + + Graphic = 030-Explosion01 + Focus = Target + SetX = 10,64 + SetY = 10,22 + SetZ = 10,29 + SetFrame = 11,1 + SetX = 12,-24 + SetY = 12,86 + SetFrame = 13,4 + SetX = 13,64 + SetY = 13,22 + SetX = 14,-24 + SetY = 14,86 + SetVisible = 15,false + + Graphic = 030-Explosion01 + Focus = Target + SetX = 11,-24 + SetY = 11,78 + SetZ = 11,30 + SetVisible = 12,false + + Graphic = 030-Explosion01 + Focus = Target + SetFrame = 13,2 + SetX = 13,-24 + SetY = 13,86 + SetZ = 13,30 + SetVisible = 14,false Play = 0,Explosion1,80 Play = 3,Explosion2,80 diff --git a/PBS/Animations/Converted/Move/SHADOWBALL.txt b/PBS/Animations/Converted/Move/SHADOWBALL.txt index 08d221545..7492e9c3d 100644 --- a/PBS/Animations/Converted/Move/SHADOWBALL.txt +++ b/PBS/Animations/Converted/Move/SHADOWBALL.txt @@ -3,48 +3,64 @@ [Move,SHADOWBALL] Name = SHADOWBALL - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 009-Weapon04 Focus = UserAndTarget - SetX = 7,263 - SetY = 7,74 + SetFrame = 7,12 + SetX = 7,105 + SetY = 7,-234 + SetZ = 7,28 SetZoomX = 7,25 SetZoomY = 7,25 - + SetVisible = 8,false + Graphic = 009-Weapon04 Focus = UserAndTarget - SetX = 1,144 - SetY = 1,204 - SetX = 2,154 - SetY = 2,176 - SetX = 3,175 - SetY = 3,152 - SetX = 4,201 - SetY = 4,130 - SetX = 5,227 - SetY = 5,108 - SetX = 6,248 - SetY = 6,100 - SetX = 8,294 - SetY = 8,86 + SetFrame = 8,11 + SetX = 8,129 + SetY = 8,-215 + SetZ = 8,27 SetZoomX = 8,50 SetZoomY = 8,50 SetOpacity = 8,100 - SetX = 9,315 - SetY = 9,102 + SetFrame = 9,10 + SetX = 9,146 + SetY = 9,-190 SetZoomX = 9,100 SetZoomY = 9,100 SetOpacity = 9,255 - SetX = 10,320 - SetY = 10,112 - SetX = 11,331 - SetY = 11,116 + SetFrame = 10,11 + SetX = 10,150 + SetY = 10,-175 + SetFrame = 11,12 + SetX = 11,158 + SetY = 11,-168 + SetFrame = 12,11 SetOpacity = 12,100 + SetFrame = 13,10 SetOpacity = 13,50 + + Graphic = 009-Weapon04 + Focus = UserAndTarget + SetFrame = 1,13 + SetX = 1,12 + SetY = 1,-31 + SetZ = 1,27 + SetX = 2,20 + SetY = 2,-75 + SetX = 3,36 + SetY = 3,-112 + SetX = 4,57 + SetY = 4,-146 + SetX = 5,77 + SetY = 5,-181 + SetX = 6,93 + SetY = 6,-193 + SetVisible = 7,false Play = 0,Collapse1,80 diff --git a/PBS/Animations/Converted/Move/SIGNALBEAM.txt b/PBS/Animations/Converted/Move/SIGNALBEAM.txt index 21eb384aa..38275e008 100644 --- a/PBS/Animations/Converted/Move/SIGNALBEAM.txt +++ b/PBS/Animations/Converted/Move/SIGNALBEAM.txt @@ -3,378 +3,413 @@ [Move,SIGNALBEAM] Name = SIGNALBEAM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Ultra Beam Focus = Target - SetX = 0,224 - SetY = 0,150 - SetX = 1,232 - SetY = 1,158 - SetX = 2,240 - SetY = 2,166 - SetX = 3,248 - SetY = 3,174 - SetX = 4,336 - SetY = 4,46 - SetX = 5,256 - SetY = 5,182 - SetX = 6,248 - SetY = 6,174 - SetX = 7,240 - SetY = 7,166 - SetX = 8,232 - SetY = 8,150 - SetX = 9,440 - SetY = 9,166 - SetX = 10,432 - SetY = 10,158 - SetX = 11,392 - SetY = 11,126 - SetX = 12,240 - SetY = 12,158 - SetX = 13,248 - SetY = 13,166 - SetX = 14,256 - SetY = 14,174 - SetX = 16,368 - SetY = 16,86 - SetX = 17,392 - SetY = 17,134 - SetX = 18,520 - SetY = 18,22 - SetX = 19,440 - SetY = 19,174 + SetFrame = 0,1 + SetX = 0,-160 + SetY = 0,54 + SetZ = 0,27 + SetFrame = 1,2 + SetX = 1,-152 + SetY = 1,62 + SetX = 2,-144 + SetY = 2,70 + SetX = 3,-136 + SetY = 3,78 + SetX = 4,-48 + SetY = 4,-50 + SetX = 5,-128 + SetY = 5,86 + SetX = 6,-136 + SetY = 6,78 + SetX = 7,-144 + SetY = 7,70 + SetX = 8,-152 + SetY = 8,54 + SetX = 9,56 + SetY = 9,70 + SetX = 10,48 + SetY = 10,62 + SetX = 11,8 + SetY = 11,30 + SetX = 12,-144 + SetY = 12,62 + SetX = 13,-136 + SetY = 13,70 + SetX = 14,-128 + SetY = 14,78 + SetX = 16,-16 + SetY = 16,-10 + SetX = 17,8 + SetY = 17,38 + SetX = 18,136 + SetY = 18,-74 + SetX = 19,56 + SetY = 19,78 Graphic = Ultra Beam Focus = Target - SetX = 1,384 - SetY = 1,110 - SetX = 2,352 - SetY = 2,62 - SetX = 3,328 - SetY = 3,38 - SetX = 4,544 - SetY = 4,46 - SetX = 6,536 + SetFrame = 0,2 + SetX = 0,-72 + SetY = 0,62 + SetZ = 0,30 + SetY = 1,46 + SetX = 2,-88 + SetY = 2,14 + SetX = 3,-104 + SetY = 3,6 + SetX = 5,-88 + SetY = 5,30 + SetX = 6,-72 SetY = 6,38 - SetX = 7,528 - SetY = 7,30 - SetX = 8,520 - SetY = 8,22 - SetX = 9,224 - SetY = 9,142 - SetX = 11,232 - SetY = 11,150 - SetX = 12,528 + SetX = 7,-64 + SetY = 7,54 + SetY = 8,78 + SetY = 10,62 + SetX = 11,-72 + SetY = 11,46 + SetX = 12,-88 SetY = 12,30 - SetX = 13,536 - SetY = 13,38 - SetX = 14,544 - SetY = 14,46 - SetX = 16,536 - SetY = 16,38 - SetX = 17,240 - SetY = 17,158 - SetX = 19,528 - SetY = 19,30 + SetX = 13,-96 + SetY = 13,6 + SetX = 14,-104 + SetY = 14,-2 + SetX = 15,-88 + SetX = 16,-80 + SetY = 16,22 + SetX = 17,-72 + SetY = 17,54 + SetX = 18,-64 + SetY = 18,70 + SetFrame = 19,3 + SetX = 19,-32 + SetY = 19,-42 Graphic = Ultra Beam Focus = Target - SetX = 2,528 - SetY = 2,22 - SetX = 3,536 - SetY = 3,38 - SetX = 4,256 - SetY = 4,182 - SetX = 5,352 - SetY = 5,70 - SetX = 6,376 - SetY = 6,102 - SetX = 7,400 - SetY = 7,126 - SetX = 8,432 - SetY = 8,158 - SetX = 9,512 - SetY = 9,14 - SetX = 11,520 - SetY = 11,22 - SetX = 12,360 - SetY = 12,94 - SetX = 13,352 + SetFrame = 0,3 + SetX = 0,-120 + SetY = 0,94 + SetZ = 0,32 + SetX = 1,-128 + SetY = 1,86 + SetX = 2,-136 + SetY = 2,78 + SetX = 3,-144 + SetY = 3,70 + SetX = 4,144 + SetY = 4,-66 + SetX = 5,40 + SetY = 5,38 + SetX = 6,24 + SetY = 6,22 + SetX = 7,-112 + SetY = 7,102 + SetX = 8,-104 + SetY = 8,110 + SetX = 9,-40 + SetY = 9,-50 + SetX = 10,-112 + SetY = 10,102 + SetX = 11,16 + SetY = 11,6 + SetX = 12,-128 + SetY = 12,86 + SetX = 13,56 SetY = 13,54 - SetX = 14,336 - SetY = 14,38 - SetX = 15,352 + SetX = 14,72 + SetY = 14,62 + SetX = 15,56 SetY = 15,46 - SetX = 16,248 - SetY = 16,166 - SetX = 17,528 - SetY = 17,30 - SetX = 18,416 - SetY = 18,158 - SetX = 19,560 - SetY = 19,70 + SetX = 16,24 + SetY = 16,22 + SetX = 17,0 + SetY = 17,-2 + SetX = 18,-24 + SetY = 18,-34 + SetFrame = 19,2 + SetX = 19,128 + SetY = 19,22 Graphic = Ultra Beam Focus = Target - SetX = 0,312 - SetY = 0,158 - SetY = 1,142 - SetX = 2,296 - SetY = 2,110 - SetX = 3,280 - SetY = 3,102 - SetX = 5,296 - SetY = 5,126 - SetX = 6,312 - SetY = 6,134 - SetX = 7,320 - SetY = 7,150 - SetY = 8,174 - SetY = 10,158 - SetX = 11,312 - SetY = 11,142 - SetX = 12,296 - SetY = 12,126 - SetX = 13,288 - SetY = 13,102 - SetX = 14,280 - SetY = 14,94 - SetX = 15,296 - SetX = 16,304 - SetY = 16,118 - SetX = 17,312 - SetY = 17,150 - SetX = 18,320 - SetY = 18,166 - SetX = 19,352 - SetY = 19,54 + SetFrame = 0,3 + SetX = 0,-80 + SetY = 0,6 + SetZ = 0,35 + SetX = 1,-72 + SetX = 2,-56 + SetY = 2,46 + SetX = 3,-40 + SetY = 3,62 + SetY = 4,70 + SetX = 5,-48 + SetY = 5,62 + SetY = 6,54 + SetX = 7,-64 + SetY = 7,38 + SetX = 8,-80 + SetY = 8,22 + SetX = 9,-96 + SetX = 10,-80 + SetY = 10,30 + SetX = 11,-56 + SetY = 11,46 + SetX = 12,-40 + SetY = 12,62 + SetY = 13,70 + SetY = 14,78 + SetY = 15,62 + SetX = 16,-56 + SetY = 16,54 + SetX = 17,-64 + SetY = 17,46 + SetX = 18,-72 + SetY = 18,22 + SetVisible = 19,false Graphic = Ultra Beam Focus = Target - SetX = 1,464 - SetY = 1,62 - SetX = 2,440 - SetY = 2,30 - SetX = 3,416 - SetY = 3,14 - SetY = 4,22 - SetX = 5,432 - SetY = 5,46 - SetX = 6,448 - SetY = 6,62 - SetX = 7,464 - SetY = 7,86 - SetX = 8,496 - SetY = 8,102 - SetY = 9,86 - SetX = 10,488 - SetY = 10,94 - SetX = 11,464 - SetY = 11,78 - SetX = 12,440 - SetY = 12,62 - SetX = 13,424 - SetY = 13,38 - SetY = 14,22 - SetX = 15,440 - SetY = 15,38 - SetX = 16,448 - SetY = 16,54 - SetX = 17,472 - SetY = 17,86 - SetX = 18,488 - SetY = 18,94 - SetX = 19,448 - SetY = 19,30 + SetFrame = 1,2 + SetX = 1,0 + SetY = 1,14 + SetZ = 1,28 + SetX = 2,-32 + SetY = 2,-34 + SetX = 3,-56 + SetY = 3,-58 + SetX = 4,160 + SetY = 4,-50 + SetX = 6,152 + SetY = 6,-58 + SetX = 7,144 + SetY = 7,-66 + SetX = 8,136 + SetY = 8,-74 + SetX = 9,-160 + SetY = 9,46 + SetX = 11,-152 + SetY = 11,54 + SetX = 12,144 + SetY = 12,-66 + SetX = 13,152 + SetY = 13,-58 + SetX = 14,160 + SetY = 14,-50 + SetX = 16,152 + SetY = 16,-58 + SetX = 17,-144 + SetY = 17,62 + SetVisible = 18,false Graphic = Ultra Beam Focus = Target - SetX = 0,264 - SetY = 0,190 - SetX = 1,256 - SetY = 1,182 - SetX = 2,248 - SetY = 2,174 - SetX = 3,240 - SetY = 3,166 - SetX = 4,528 - SetY = 4,30 - SetX = 5,424 - SetY = 5,134 - SetX = 6,408 - SetY = 6,118 - SetX = 7,272 - SetY = 7,198 - SetX = 8,280 - SetY = 8,206 - SetX = 9,344 - SetY = 9,46 - SetX = 10,272 - SetY = 10,198 - SetX = 11,400 - SetY = 11,102 - SetX = 12,256 - SetY = 12,182 - SetX = 13,440 - SetY = 13,150 - SetX = 14,456 - SetY = 14,158 - SetX = 15,440 - SetY = 15,142 - SetX = 16,408 - SetY = 16,118 - SetX = 17,384 - SetY = 17,94 - SetX = 18,360 - SetY = 18,62 - SetX = 19,512 - SetY = 19,118 + SetFrame = 1,2 + SetX = 1,80 + SetY = 1,-34 + SetZ = 1,31 + SetX = 2,56 + SetY = 2,-66 + SetX = 3,32 + SetY = 3,-82 + SetY = 4,-74 + SetX = 5,48 + SetY = 5,-50 + SetX = 6,64 + SetY = 6,-34 + SetX = 7,80 + SetY = 7,-10 + SetX = 8,112 + SetY = 8,6 + SetY = 9,-10 + SetX = 10,104 + SetY = 10,-2 + SetX = 11,80 + SetY = 11,-18 + SetX = 12,56 + SetY = 12,-34 + SetX = 13,40 + SetY = 13,-58 + SetY = 14,-74 + SetX = 15,56 + SetY = 15,-58 + SetX = 16,64 + SetY = 16,-42 + SetX = 17,88 + SetY = 17,-10 + SetX = 18,104 + SetY = 18,-2 + SetFrame = 19,3 + SetX = 19,64 + SetY = 19,-66 Graphic = Ultra Beam Focus = Target - SetX = 2,544 - SetY = 2,38 - SetX = 3,440 - SetY = 3,134 - SetX = 4,240 - SetY = 4,166 - SetX = 5,248 - SetY = 5,174 - SetX = 6,264 - SetY = 6,190 - SetX = 7,376 - SetY = 7,86 - SetX = 8,352 - SetY = 8,54 - SetX = 9,280 - SetY = 9,206 - SetX = 10,560 - SetY = 10,62 - SetX = 11,264 - SetY = 11,190 - SetX = 12,544 - SetY = 12,46 - SetX = 13,248 - SetY = 13,174 - SetX = 14,528 - SetY = 14,30 - SetX = 15,248 - SetY = 15,166 - SetX = 16,552 - SetY = 16,54 - SetX = 17,560 - SetY = 17,62 - SetX = 18,568 - SetY = 18,70 + SetFrame = 1,3 + SetX = 1,-8 + SetY = 1,-42 + SetZ = 1,34 + SetX = 2,24 + SetY = 2,6 + SetX = 3,152 + SetY = 3,-66 + SetX = 4,64 + SetY = 4,54 + SetX = 5,152 + SetY = 5,-58 + SetX = 6,168 + SetY = 6,-42 + SetX = 7,176 + SetY = 7,-34 + SetX = 8,184 + SetY = 8,-26 + SetX = 10,-16 + SetX = 11,168 + SetY = 11,-42 + SetX = 12,40 + SetY = 12,38 + SetX = 13,152 + SetY = 13,-58 + SetX = 14,-144 + SetY = 14,62 + SetX = 15,152 + SetY = 15,-58 + SetX = 16,-120 + SetY = 16,86 + SetX = 17,-112 + SetY = 17,94 + SetVisible = 18,false Graphic = Ultra Beam Focus = Target - SetX = 1,376 - SetY = 1,54 - SetX = 2,408 - SetY = 2,102 - SetX = 3,536 - SetY = 3,30 - SetX = 4,448 - SetY = 4,150 - SetX = 5,536 - SetY = 5,38 - SetX = 6,552 - SetY = 6,54 - SetX = 7,560 - SetY = 7,62 - SetX = 8,568 - SetY = 8,70 - SetX = 10,368 - SetX = 11,552 - SetY = 11,54 - SetX = 12,424 - SetY = 12,134 - SetX = 13,536 - SetY = 13,38 - SetX = 14,240 - SetY = 14,158 - SetX = 15,536 - SetY = 15,38 - SetX = 16,264 - SetY = 16,182 - SetX = 17,272 - SetY = 17,190 + SetFrame = 1,3 + SetX = 1,80 + SetY = 1,-58 + SetZ = 1,36 + SetX = 2,96 + SetY = 2,-26 + SetX = 3,112 + SetY = 3,-2 + SetX = 4,128 + SetX = 5,112 + SetY = 5,6 + SetX = 6,96 + SetY = 6,-18 + SetX = 7,72 + SetY = 7,-34 + SetY = 8,-58 + SetY = 9,-66 + SetY = 10,-50 + SetX = 11,96 + SetY = 11,-18 + SetX = 12,104 + SetY = 12,-10 + SetX = 13,120 + SetY = 13,-2 + SetX = 14,128 + SetY = 14,6 + SetX = 15,112 + SetY = 15,-2 + SetX = 16,104 + SetY = 16,-10 + SetX = 17,88 + SetY = 17,-18 + SetX = 18,72 + SetY = 18,-42 + SetVisible = 19,false Graphic = Ultra Beam Focus = Target - SetX = 0,304 - SetY = 0,102 - SetX = 1,312 - SetX = 2,328 - SetY = 2,142 - SetX = 3,344 - SetY = 3,158 - SetY = 4,166 - SetX = 5,336 - SetY = 5,158 - SetY = 6,150 - SetX = 7,320 - SetY = 7,134 - SetX = 8,304 - SetY = 8,118 - SetX = 9,288 - SetX = 10,304 - SetY = 10,126 - SetX = 11,328 - SetY = 11,142 - SetX = 12,344 - SetY = 12,158 - SetY = 13,166 - SetY = 14,174 - SetY = 15,158 - SetX = 16,328 - SetY = 16,150 - SetX = 17,320 - SetY = 17,142 - SetX = 18,312 - SetY = 18,118 + SetFrame = 2,2 + SetX = 2,144 + SetY = 2,-74 + SetZ = 2,29 + SetX = 3,152 + SetY = 3,-58 + SetX = 4,-128 + SetY = 4,86 + SetX = 5,-32 + SetY = 5,-26 + SetX = 6,-8 + SetY = 6,6 + SetX = 7,16 + SetY = 7,30 + SetX = 8,48 + SetY = 8,62 + SetX = 9,128 + SetY = 9,-82 + SetX = 11,136 + SetY = 11,-74 + SetX = 12,-24 + SetY = 12,-2 + SetX = 13,-32 + SetY = 13,-42 + SetX = 14,-48 + SetY = 14,-58 + SetX = 15,-32 + SetY = 15,-50 + SetX = 16,-136 + SetY = 16,70 + SetX = 17,144 + SetY = 17,-66 + SetX = 18,32 + SetY = 18,62 + SetFrame = 19,3 + SetX = 19,176 + SetY = 19,-26 Graphic = Ultra Beam Focus = Target - SetX = 1,464 - SetY = 1,38 - SetX = 2,480 - SetY = 2,70 - SetX = 3,496 - SetY = 3,94 - SetX = 4,512 - SetX = 5,496 - SetY = 5,102 - SetX = 6,480 - SetY = 6,78 - SetX = 7,456 - SetY = 7,62 - SetY = 8,38 - SetY = 9,30 - SetY = 10,46 - SetX = 11,480 - SetY = 11,78 - SetX = 12,488 - SetY = 12,86 - SetX = 13,504 - SetY = 13,94 - SetX = 14,512 - SetY = 14,102 - SetX = 15,496 - SetY = 15,94 - SetX = 16,488 - SetY = 16,86 - SetX = 17,472 - SetY = 17,78 - SetX = 18,456 - SetY = 18,54 + SetFrame = 2,3 + SetX = 2,160 + SetY = 2,-58 + SetZ = 2,33 + SetX = 3,56 + SetY = 3,38 + SetX = 4,-144 + SetY = 4,70 + SetX = 5,-136 + SetY = 5,78 + SetX = 6,-120 + SetY = 6,94 + SetX = 7,-8 + SetY = 7,-10 + SetX = 8,-32 + SetY = 8,-42 + SetX = 9,-104 + SetY = 9,110 + SetX = 10,176 + SetY = 10,-34 + SetX = 11,-120 + SetY = 11,94 + SetX = 12,160 + SetY = 12,-50 + SetX = 13,-136 + SetY = 13,78 + SetX = 14,144 + SetY = 14,-66 + SetX = 15,-136 + SetY = 15,70 + SetX = 16,168 + SetY = 16,-42 + SetX = 17,176 + SetY = 17,-34 + SetX = 18,184 + SetY = 18,-26 + SetVisible = 19,false + + Graphic = Ultra Beam + Focus = Target + SetFrame = 19,2 + SetX = 19,144 + SetY = 19,-66 + SetZ = 19,28 Play = 0,Teleport,80 Play = 2,Twine,80 diff --git a/PBS/Animations/Converted/Move/SILVERWIND.txt b/PBS/Animations/Converted/Move/SILVERWIND.txt index 4791fcd48..ca5e99414 100644 --- a/PBS/Animations/Converted/Move/SILVERWIND.txt +++ b/PBS/Animations/Converted/Move/SILVERWIND.txt @@ -3,260 +3,307 @@ [Move,SILVERWIND] Name = SILVERWIND - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Heal5 Focus = Target - SetX = 0,168 - SetY = 0,-10 + SetFrame = 0,12 + SetX = 0,-216 + SetY = 0,-106 + SetZ = 0,27 SetZoomX = 0,20 SetZoomY = 0,20 - SetX = 1,208 - SetY = 1,22 - SetX = 2,248 - SetY = 2,62 - SetX = 3,304 - SetY = 3,102 - SetX = 4,368 - SetY = 4,142 - SetX = 5,440 - SetY = 5,182 - SetX = 6,504 - SetY = 6,214 - SetX = 7,560 - SetY = 7,238 - SetX = 8,688 - SetY = 8,166 + SetX = 1,-176 + SetY = 1,-74 + SetX = 2,-136 + SetY = 2,-34 + SetX = 3,-80 + SetY = 3,6 + SetX = 4,-16 + SetY = 4,46 + SetX = 5,56 + SetY = 5,86 + SetX = 6,120 + SetY = 6,118 + SetX = 7,176 + SetY = 7,142 + SetX = 8,304 + SetY = 8,70 Graphic = Heal5 Focus = Target - SetX = 1,96 - SetY = 1,30 + SetFrame = 1,12 + SetX = 1,-288 + SetY = 1,-66 + SetZ = 1,28 SetZoomX = 1,20 SetZoomY = 1,20 - SetX = 2,264 - SetY = 2,-42 - SetX = 3,312 - SetY = 3,-2 - SetX = 4,368 - SetY = 4,46 - SetX = 5,448 - SetY = 5,86 - SetX = 6,520 - SetY = 6,110 - SetX = 7,608 - SetY = 7,142 - SetX = 8,576 - SetY = 8,230 + SetX = 2,-120 + SetY = 2,-138 + SetX = 3,-72 + SetY = 3,-98 + SetX = 4,-16 + SetY = 4,-50 + SetX = 5,64 + SetY = 5,-10 + SetX = 6,136 + SetY = 6,14 + SetX = 7,224 + SetY = 7,46 + SetX = 8,192 + SetY = 8,134 Graphic = Heal5 Focus = Target - SetX = 1,136 - SetY = 1,-42 + SetFrame = 1,12 + SetX = 1,-248 + SetY = 1,-138 + SetZ = 1,29 SetZoomX = 1,20 SetZoomY = 1,20 - SetX = 2,152 - SetY = 2,94 - SetX = 3,216 - SetY = 3,150 - SetX = 4,296 - SetY = 4,198 - SetX = 5,368 - SetY = 5,238 - SetX = 6,448 - SetY = 6,166 - SetX = 7,512 - SetY = 7,206 - SetX = 8,656 - SetY = 8,134 + SetX = 2,-232 + SetY = 2,-2 + SetX = 3,-168 + SetY = 3,54 + SetX = 4,-88 + SetY = 4,102 + SetX = 5,-16 + SetY = 5,142 + SetX = 6,64 + SetY = 6,70 + SetX = 7,128 + SetY = 7,110 + SetX = 8,272 + SetY = 8,38 Graphic = Heal5 Focus = Target - SetX = 2,192 - SetY = 2,6 + SetFrame = 2,12 + SetX = 2,-192 + SetY = 2,-90 + SetZ = 2,30 SetZoomX = 2,20 SetZoomY = 2,20 - SetX = 3,248 - SetY = 3,54 - SetX = 4,312 - SetY = 4,102 - SetX = 5,384 - SetY = 5,142 - SetX = 6,344 - SetY = 6,230 - SetX = 7,576 - SetY = 7,102 - SetX = 8,456 - SetY = 8,222 + SetX = 3,-136 + SetY = 3,-42 + SetX = 4,-72 + SetY = 4,6 + SetX = 5,0 + SetY = 5,46 + SetX = 6,-40 + SetY = 6,134 + SetX = 7,192 + SetY = 7,6 + SetX = 8,72 + SetY = 8,126 Graphic = Heal5 Focus = Target - SetX = 2,104 - SetY = 2,6 + SetFrame = 2,12 + SetX = 2,-280 + SetY = 2,-90 + SetZ = 2,31 SetZoomX = 2,20 SetZoomY = 2,20 - SetX = 3,160 - SetY = 3,70 - SetX = 4,224 - SetY = 4,134 - SetX = 5,280 - SetY = 5,190 - SetX = 6,480 - SetY = 6,70 - SetX = 7,272 - SetY = 7,230 - SetX = 8,488 - SetY = 8,134 + SetX = 3,-224 + SetY = 3,-26 + SetX = 4,-160 + SetY = 4,38 + SetX = 5,-104 + SetY = 5,94 + SetX = 6,96 + SetY = 6,-26 + SetX = 7,-112 + SetY = 7,134 + SetX = 8,104 + SetY = 8,38 Graphic = Heal5 Focus = Target - SetX = 3,240 - SetY = 3,-42 + SetFrame = 3,12 + SetX = 3,-144 + SetY = 3,-138 + SetZ = 3,32 SetZoomX = 3,20 SetZoomY = 3,20 - SetX = 4,304 - SetY = 4,-10 - SetX = 5,384 - SetY = 5,30 - SetX = 6,224 - SetY = 6,174 - SetX = 7,376 - SetY = 7,158 + SetX = 4,-80 + SetY = 4,-106 + SetX = 5,0 + SetY = 5,-66 + SetX = 6,-160 + SetY = 6,78 + SetX = 7,-8 + SetY = 7,62 + SetFrame = 8,11 SetFlip = 8,true - SetX = 8,336 - SetY = 8,110 + SetX = 8,-48 + SetY = 8,14 SetZoomX = 8,100 SetZoomY = 8,100 SetOpacity = 8,50 Graphic = Heal5 Focus = Target - SetX = 3,96 - SetY = 3,-10 + SetFrame = 3,12 + SetX = 3,-288 + SetY = 3,-106 + SetZ = 3,33 SetZoomX = 3,20 SetZoomY = 3,20 - SetX = 4,128 - SetY = 4,46 - SetX = 5,176 - SetY = 5,118 - SetX = 6,296 - SetY = 6,94 - SetX = 7,192 - SetY = 7,214 - SetX = 8,264 - SetY = 8,222 + SetX = 4,-256 + SetY = 4,-50 + SetX = 5,-208 + SetY = 5,22 + SetX = 6,-88 + SetY = 6,-2 + SetX = 7,-192 + SetY = 7,118 + SetX = 8,-120 + SetY = 8,126 Graphic = Heal5 Focus = Target - SetX = 3,216 - SetY = 3,38 + SetX = 3,-168 + SetY = 3,-58 + SetZ = 3,34 SetOpacity = 3,50 - SetX = 4,168 - SetY = 4,-26 + SetFrame = 4,12 + SetX = 4,-216 + SetY = 4,-122 SetZoomX = 4,20 SetZoomY = 4,20 SetOpacity = 4,255 - SetX = 5,232 - SetY = 5,38 - SetX = 6,152 - SetY = 6,150 - SetX = 7,664 - SetY = 7,78 - SetX = 8,624 + SetX = 5,-152 + SetY = 5,-58 + SetX = 6,-232 + SetY = 6,54 + SetX = 7,280 + SetY = 7,-18 + SetX = 8,240 Graphic = Heal5 Focus = Target - SetX = 4,408 - SetY = 4,-42 + SetFrame = 4,12 + SetX = 4,24 + SetY = 4,-138 + SetZ = 4,35 SetZoomX = 4,20 SetZoomY = 4,20 - SetX = 5,104 - SetY = 5,86 - SetX = 6,576 - SetY = 6,30 + SetX = 5,-280 + SetY = 5,-10 + SetX = 6,192 + SetY = 6,-66 + SetFrame = 7,11 SetFlip = 7,true - SetX = 7,336 - SetY = 7,110 + SetX = 7,-48 + SetY = 7,14 SetZoomX = 7,100 SetZoomY = 7,100 SetOpacity = 7,50 + SetVisible = 8,false Graphic = Heal5 Focus = Target - SetX = 4,216 - SetY = 4,38 + SetFrame = 4,1 + SetX = 4,-168 + SetY = 4,-58 + SetZ = 4,36 SetOpacity = 4,50 - SetX = 5,496 - SetY = 5,-10 + SetFrame = 5,12 + SetX = 5,112 + SetY = 5,-106 SetZoomX = 5,20 SetZoomY = 5,20 SetOpacity = 5,255 - SetX = 6,456 - SetY = 6,134 + SetFrame = 6,9 + SetX = 6,72 + SetY = 6,38 SetZoomX = 6,100 SetZoomY = 6,100 SetOpacity = 6,50 + SetFrame = 7,10 + SetVisible = 8,false Graphic = Heal5 Focus = Target - SetX = 5,424 - SetY = 5,6 + SetFrame = 5,10 + SetX = 5,40 + SetY = 5,-90 + SetZ = 5,37 SetOpacity = 5,50 - SetX = 7,344 - SetY = 7,54 + SetFrame = 6,11 + SetFrame = 7,12 + SetX = 7,-40 + SetY = 7,-42 SetZoomX = 7,20 SetZoomY = 7,20 SetOpacity = 7,255 + SetVisible = 8,false Graphic = Heal5 Focus = Target - SetX = 5,184 - SetY = 5,-34 + SetFrame = 5,12 + SetX = 5,-200 + SetY = 5,-130 + SetZ = 5,38 SetZoomX = 5,20 SetZoomY = 5,20 - SetX = 6,136 - SetY = 6,230 - SetX = 7,208 - SetY = 7,142 + SetX = 6,-248 + SetY = 6,134 + SetX = 7,-176 + SetY = 7,46 + SetVisible = 8,false Graphic = Heal5 Focus = Target - SetX = 5,88 - SetY = 5,166 + SetFrame = 5,12 + SetX = 5,-296 + SetY = 5,70 + SetZ = 5,39 SetZoomX = 5,20 SetZoomY = 5,20 - SetX = 6,264 - SetY = 6,6 - SetX = 7,520 - SetY = 7,30 + SetX = 6,-120 + SetY = 6,-90 + SetX = 7,136 + SetY = 7,-66 + SetVisible = 8,false Graphic = Heal5 Focus = Target - SetX = 5,96 - SetY = 5,6 + SetFrame = 5,12 + SetX = 5,-288 + SetY = 5,-90 + SetZ = 5,40 SetZoomX = 5,20 SetZoomY = 5,20 - SetX = 6,144 - SetY = 6,54 + SetX = 6,-240 + SetY = 6,-42 + SetVisible = 7,false Graphic = Heal5 Focus = Target - SetX = 5,376 - SetY = 5,-50 + SetFrame = 5,12 + SetX = 5,-8 + SetY = 5,-146 + SetZ = 5,41 SetZoomX = 5,20 SetZoomY = 5,20 - SetX = 6,440 - SetY = 6,-2 + SetX = 6,56 + SetY = 6,-98 + SetVisible = 7,false Graphic = Heal5 Focus = Target SetFlip = 5,true - SetX = 5,184 - SetY = 5,142 + SetX = 5,-200 + SetY = 5,46 + SetZ = 5,42 SetOpacity = 5,50 + SetFrame = 6,1 + SetVisible = 7,false Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/SING.txt b/PBS/Animations/Converted/Move/SING.txt index 69e50ac26..842e0535b 100644 --- a/PBS/Animations/Converted/Move/SING.txt +++ b/PBS/Animations/Converted/Move/SING.txt @@ -3,851 +3,1254 @@ [Move,SING] Name = SING - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poi.hear.mus Focus = Target - SetX = 0,200 - SetY = 0,211 - SetX = 1,212 - SetY = 1,227 - SetX = 2,219 - SetY = 2,223 - SetX = 3,241 - SetY = 3,193 - SetX = 4,255 - SetY = 4,194 - SetX = 5,252 - SetY = 5,198 - SetX = 6,264 - SetY = 6,163 - SetX = 7,310 - SetY = 7,172 - SetX = 8,336 - SetY = 8,142 - SetX = 9,240 - SetY = 9,223 - SetX = 10,255 - SetY = 10,220 - SetX = 11,350 - SetY = 11,115 - SetX = 12,249 - SetY = 12,208 - SetX = 13,262 - SetY = 13,202 - SetX = 14,293 - SetY = 14,188 - SetX = 15,228 - SetY = 15,222 - SetX = 16,241 - SetY = 16,215 - SetX = 17,281 - SetY = 17,220 - SetX = 18,316 - SetY = 18,186 - SetX = 19,345 - SetY = 19,170 - SetX = 20,247 - SetY = 20,225 - SetX = 21,296 - SetY = 21,218 - SetX = 22,229 - SetY = 22,243 - SetX = 23,255 - SetY = 23,236 - SetX = 24,401 - SetY = 24,90 - SetX = 25,272 - SetY = 25,217 - SetX = 26,286 - SetY = 26,208 - SetX = 27,318 - SetY = 27,207 - SetX = 28,265 - SetY = 28,213 - SetX = 29,285 - SetY = 29,218 - SetX = 30,315 - SetY = 30,202 - SetX = 31,251 - SetY = 31,221 - SetX = 32,278 - SetY = 32,213 - SetX = 33,314 - SetY = 33,197 - SetX = 34,280 - SetY = 34,207 - SetX = 35,317 - SetY = 35,212 - SetX = 36,218 - SetY = 36,234 - SetX = 37,299 - SetY = 37,197 - SetX = 38,349 - SetY = 38,171 - SetX = 39,404 - SetY = 39,142 - SetX = 40,427 - SetY = 40,104 - SetX = 41,431 - SetY = 41,90 - SetX = 42,410 - SetY = 42,88 - SetY = 43,93 - SetX = 44,355 - SetY = 44,65 - SetX = 45,388 - SetY = 45,57 - SetX = 46,400 - SetY = 46,48 - SetX = 47,410 - SetY = 47,36 - SetX = 48,436 - SetX = 49,432 - SetY = 49,14 - SetX = 50,435 - SetY = 50,9 - SetX = 51,438 - SetY = 51,11 + SetFrame = 0,7 + SetX = 0,-184 + SetY = 0,115 + SetZ = 0,27 + SetFrame = 1,8 + SetX = 1,-172 + SetY = 1,131 + SetX = 2,-165 + SetY = 2,127 + SetFrame = 3,9 + SetX = 3,-143 + SetY = 3,97 + SetX = 4,-129 + SetY = 4,98 + SetFrame = 5,10 + SetX = 5,-132 + SetY = 5,102 + SetFrame = 6,7 + SetX = 6,-120 + SetY = 6,67 + SetFrame = 7,8 + SetX = 7,-74 + SetY = 7,76 + SetFrame = 8,9 + SetX = 8,-48 + SetY = 8,46 + SetFrame = 9,10 + SetX = 9,-144 + SetY = 9,127 + SetFrame = 10,8 + SetX = 10,-129 + SetY = 10,124 + SetFrame = 11,11 + SetX = 11,-34 + SetY = 11,19 + SetX = 12,-135 + SetY = 12,112 + SetX = 13,-122 + SetY = 13,106 + SetX = 14,-91 + SetY = 14,92 + SetFrame = 15,9 + SetX = 15,-156 + SetY = 15,126 + SetFrame = 16,11 + SetX = 16,-143 + SetY = 16,119 + SetFrame = 17,10 + SetX = 17,-103 + SetY = 17,124 + SetFrame = 18,9 + SetX = 18,-68 + SetY = 18,90 + SetX = 19,-39 + SetY = 19,74 + SetFrame = 20,10 + SetX = 20,-137 + SetY = 20,129 + SetX = 21,-88 + SetY = 21,122 + SetX = 22,-155 + SetY = 22,147 + SetX = 23,-129 + SetY = 23,140 + SetFrame = 24,11 + SetX = 24,17 + SetY = 24,-6 + SetFrame = 25,9 + SetX = 25,-112 + SetY = 25,121 + SetFrame = 26,11 + SetX = 26,-98 + SetY = 26,112 + SetFrame = 27,10 + SetX = 27,-66 + SetY = 27,111 + SetFrame = 28,9 + SetX = 28,-119 + SetY = 28,117 + SetFrame = 29,10 + SetX = 29,-99 + SetY = 29,122 + SetFrame = 30,9 + SetX = 30,-69 + SetY = 30,106 + SetX = 31,-133 + SetY = 31,125 + SetFrame = 32,11 + SetX = 32,-106 + SetY = 32,117 + SetFrame = 33,9 + SetX = 33,-70 + SetY = 33,101 + SetX = 34,-104 + SetY = 34,111 + SetFrame = 35,10 + SetX = 35,-67 + SetY = 35,116 + SetFrame = 36,11 + SetX = 36,-166 + SetY = 36,138 + SetFrame = 37,9 + SetX = 37,-85 + SetY = 37,101 + SetFrame = 38,10 + SetX = 38,-35 + SetY = 38,75 + SetX = 39,20 + SetY = 39,46 + SetFrame = 40,8 + SetX = 40,43 + SetY = 40,8 + SetFrame = 41,11 + SetX = 41,47 + SetY = 41,-6 + SetFrame = 42,10 + SetX = 42,26 + SetY = 42,-8 + SetFrame = 43,11 + SetY = 43,-3 + SetX = 44,-29 + SetY = 44,-31 + SetFrame = 45,10 + SetX = 45,4 + SetY = 45,-39 + SetFrame = 46,11 + SetX = 46,16 + SetY = 46,-48 + SetX = 47,26 + SetY = 47,-60 + SetX = 48,52 + SetX = 49,48 + SetY = 49,-82 + SetFrame = 50,8 + SetX = 50,51 + SetY = 50,-87 + SetFrame = 51,10 + SetX = 51,54 + SetY = 51,-85 + SetVisible = 52,false Graphic = poi.hear.mus Focus = Target - SetX = 1,211 - SetY = 1,212 - SetX = 2,217 - SetY = 2,209 - SetX = 3,237 - SetY = 3,201 - SetX = 4,245 - SetY = 4,206 - SetX = 5,251 - SetY = 5,207 - SetX = 6,293 - SetY = 6,194 - SetX = 7,284 - SetY = 7,149 - SetX = 8,300 - SetY = 8,150 - SetX = 9,244 - SetY = 9,192 - SetX = 10,338 - SetY = 10,123 - SetX = 11,259 - SetY = 11,205 - SetX = 12,383 - SetY = 12,96 - SetX = 13,264 - SetY = 13,200 - SetX = 14,301 - SetY = 14,185 - SetX = 15,236 - SetY = 15,232 - SetX = 16,241 - SetY = 16,220 - SetX = 17,292 - SetY = 17,211 - SetX = 18,324 - SetY = 18,200 - SetX = 19,318 - SetY = 19,162 - SetX = 20,244 - SetY = 20,201 - SetX = 21,309 - SetY = 21,193 - SetX = 22,244 - SetY = 22,218 - SetX = 23,272 - SetY = 23,228 - SetX = 24,381 - SetY = 24,113 - SetX = 25,253 - SetY = 25,222 - SetX = 26,286 - SetY = 26,209 - SetX = 27,344 - SetY = 27,191 - SetX = 28,257 - SetY = 28,222 - SetX = 29,286 - SetY = 29,193 - SetX = 30,293 - SetY = 30,190 - SetX = 31,230 - SetY = 31,209 - SetX = 32,287 - SetY = 32,201 - SetX = 33,322 - SetY = 33,208 - SetX = 34,277 - SetY = 34,206 - SetX = 35,297 - SetY = 35,176 - SetX = 36,247 - SetY = 36,226 - SetX = 37,296 - SetY = 37,195 - SetX = 38,360 - SetY = 38,148 - SetX = 39,374 - SetY = 39,130 - SetX = 40,399 - SetY = 40,113 - SetX = 41,425 - SetY = 41,101 - SetX = 42,376 - SetY = 42,77 - SetX = 43,411 - SetY = 43,86 - SetX = 44,360 - SetY = 44,87 - SetX = 45,393 - SetY = 45,48 - SetX = 46,397 - SetY = 46,55 - SetX = 47,407 - SetY = 47,57 - SetX = 48,428 - SetY = 48,48 - SetY = 49,45 - SetX = 50,429 - SetY = 50,7 + SetFrame = 1,7 + SetX = 1,-173 + SetY = 1,116 + SetZ = 1,28 + SetX = 2,-167 + SetY = 2,113 + SetFrame = 3,8 + SetX = 3,-147 + SetY = 3,105 + SetFrame = 4,10 + SetX = 4,-139 + SetY = 4,110 + SetFrame = 5,8 + SetX = 5,-133 + SetY = 5,111 + SetX = 6,-91 + SetY = 6,98 + SetFrame = 7,7 + SetX = 7,-100 + SetY = 7,53 + SetX = 8,-84 + SetY = 8,54 + SetFrame = 9,9 + SetX = 9,-140 + SetY = 9,96 + SetFrame = 10,11 + SetX = 10,-46 + SetY = 10,27 + SetFrame = 11,9 + SetX = 11,-125 + SetY = 11,109 + SetX = 12,-1 + SetY = 12,0 + SetFrame = 13,8 + SetX = 13,-120 + SetY = 13,104 + SetFrame = 14,9 + SetX = 14,-83 + SetY = 14,89 + SetFrame = 15,8 + SetX = 15,-148 + SetY = 15,136 + SetFrame = 16,10 + SetX = 16,-143 + SetY = 16,124 + SetFrame = 17,8 + SetX = 17,-92 + SetY = 17,115 + SetFrame = 18,10 + SetX = 18,-60 + SetY = 18,104 + SetFrame = 19,11 + SetX = 19,-66 + SetY = 19,66 + SetX = 20,-140 + SetY = 20,105 + SetFrame = 21,9 + SetX = 21,-75 + SetY = 21,97 + SetX = 22,-140 + SetY = 22,122 + SetFrame = 23,8 + SetX = 23,-112 + SetY = 23,132 + SetFrame = 24,10 + SetX = 24,-3 + SetY = 24,17 + SetX = 25,-131 + SetY = 25,126 + SetFrame = 26,8 + SetX = 26,-98 + SetY = 26,113 + SetFrame = 27,9 + SetX = 27,-40 + SetY = 27,95 + SetFrame = 28,10 + SetX = 28,-127 + SetY = 28,126 + SetFrame = 29,11 + SetX = 29,-98 + SetY = 29,97 + SetX = 30,-91 + SetY = 30,94 + SetX = 31,-154 + SetY = 31,113 + SetFrame = 32,9 + SetX = 32,-97 + SetY = 32,105 + SetFrame = 33,10 + SetX = 33,-62 + SetY = 33,112 + SetFrame = 34,11 + SetX = 34,-107 + SetY = 34,110 + SetX = 35,-87 + SetY = 35,80 + SetFrame = 36,9 + SetX = 36,-137 + SetY = 36,130 + SetFrame = 37,11 + SetX = 37,-88 + SetY = 37,99 + SetX = 38,-24 + SetY = 38,52 + SetX = 39,-10 + SetY = 39,34 + SetFrame = 40,10 + SetX = 40,15 + SetY = 40,17 + SetX = 41,41 + SetY = 41,5 + SetFrame = 42,11 + SetX = 42,-8 + SetY = 42,-19 + SetFrame = 43,9 + SetX = 43,27 + SetY = 43,-10 + SetFrame = 44,10 + SetX = 44,-24 + SetY = 44,-9 + SetFrame = 45,11 + SetX = 45,9 + SetY = 45,-48 + SetFrame = 46,8 + SetX = 46,13 + SetY = 46,-41 + SetFrame = 47,10 + SetX = 47,23 + SetY = 47,-39 + SetX = 48,44 + SetY = 48,-48 + SetY = 49,-51 + SetFrame = 50,11 + SetX = 50,45 + SetY = 50,-89 + SetVisible = 51,false Graphic = poi.hear.mus Focus = Target - SetX = 2,236 - SetY = 2,216 - SetX = 4,257 - SetY = 4,202 - SetX = 5,256 - SetY = 5,174 - SetX = 6,294 - SetY = 6,173 - SetX = 7,306 - SetY = 7,166 - SetX = 8,234 - SetY = 8,243 - SetX = 9,342 - SetY = 9,145 - SetX = 10,338 - SetY = 10,132 - SetX = 11,230 - SetY = 11,198 - SetX = 12,260 - SetY = 12,195 - SetX = 13,401 - SetY = 13,107 - SetX = 14,427 - SetY = 14,108 - SetX = 15,329 - SetY = 15,174 - SetX = 16,274 - SetY = 16,212 - SetX = 17,293 - SetY = 17,181 - SetX = 18,304 - SetY = 18,178 - SetX = 19,227 - SetY = 19,247 - SetX = 20,354 - SetY = 20,147 - SetX = 21,276 - SetY = 21,191 - SetX = 22,321 - SetY = 22,192 - SetX = 23,266 - SetY = 23,209 - SetX = 24,352 - SetY = 24,168 - SetX = 25,372 - SetY = 25,118 - SetX = 26,420 - SetY = 26,111 - SetX = 27,316 - SetY = 27,181 - SetX = 28,347 - SetY = 28,169 - SetX = 29,376 - SetY = 29,138 - SetX = 30,403 - SetY = 30,127 - SetX = 31,340 - SetY = 31,194 - SetX = 32,347 - SetY = 32,177 - SetX = 33,222 - SetY = 33,235 - SetX = 34,397 - SetY = 34,183 - SetX = 35,341 - SetY = 35,180 - SetX = 36,334 - SetY = 36,184 - SetX = 37,383 - SetY = 37,137 - SetX = 38,355 - SetY = 38,145 - SetX = 39,410 - SetY = 39,107 - SetX = 40,403 - SetY = 40,118 - SetX = 41,417 - SetY = 41,63 - SetX = 42,407 - SetY = 42,55 - SetX = 43,394 - SetY = 43,77 - SetX = 44,364 - SetY = 44,50 - SetX = 45,396 - SetY = 45,51 - SetX = 46,415 - SetY = 46,43 - SetX = 47,437 - SetY = 47,49 - SetX = 48,436 - SetY = 48,44 - SetX = 49,437 - SetY = 49,5 - SetX = 50,424 - SetY = 50,20 + SetFrame = 2,8 + SetX = 2,-148 + SetY = 2,120 + SetZ = 2,29 + SetVisible = 3,false Graphic = poi.hear.mus Focus = Target - SetX = 8,222 - SetY = 8,198 - SetX = 9,351 - SetY = 9,130 - SetX = 10,257 - SetY = 10,192 - SetX = 11,355 - SetY = 11,107 - SetX = 12,394 - SetY = 12,113 - SetX = 13,419 - SetY = 13,90 - SetX = 14,430 - SetY = 14,96 - SetX = 15,331 - SetY = 15,164 - SetX = 16,373 - SetY = 16,152 - SetX = 17,353 - SetY = 17,142 - SetX = 18,445 - SetY = 18,95 - SetX = 19,231 - SetY = 19,236 - SetX = 20,363 - SetY = 20,162 - SetX = 21,400 - SetY = 21,118 - SetX = 22,324 - SetY = 22,186 - SetX = 23,378 - SetY = 23,141 - SetX = 24,357 - SetY = 24,173 - SetX = 25,383 - SetY = 25,135 - SetX = 26,426 - SetY = 26,116 - SetX = 27,419 - SetY = 27,94 - SetX = 28,344 - SetY = 28,163 - SetX = 29,378 - SetY = 29,148 - SetX = 30,425 - SetY = 30,113 - SetX = 31,312 - SetY = 31,182 - SetX = 32,370 - SetY = 32,165 - SetX = 33,253 - SetY = 33,226 - SetX = 34,390 - SetY = 34,148 - SetX = 35,439 - SetY = 35,113 - SetX = 36,348 - SetY = 36,154 - SetX = 37,405 - SetY = 37,121 - SetX = 38,432 - SetY = 38,113 + SetFrame = 4,10 + SetX = 4,-127 + SetY = 4,106 + SetZ = 4,29 + SetFrame = 5,7 + SetX = 5,-128 + SetY = 5,78 + SetFrame = 6,9 + SetX = 6,-90 + SetY = 6,77 + SetFrame = 7,8 + SetX = 7,-78 + SetY = 7,70 + SetX = 8,-150 + SetY = 8,147 + SetFrame = 9,11 + SetX = 9,-42 + SetY = 9,49 + SetFrame = 10,10 + SetX = 10,-46 + SetY = 10,36 + SetFrame = 11,11 + SetX = 11,-154 + SetY = 11,102 + SetFrame = 12,9 + SetX = 12,-124 + SetY = 12,99 + SetFrame = 13,10 + SetX = 13,17 + SetY = 13,11 + SetX = 14,43 + SetY = 14,12 + SetX = 15,-55 + SetY = 15,78 + SetFrame = 16,9 + SetX = 16,-110 + SetY = 16,116 + SetX = 17,-91 + SetY = 17,85 + SetFrame = 18,11 + SetX = 18,-80 + SetY = 18,82 + SetFrame = 19,8 + SetX = 19,-157 + SetY = 19,151 + SetFrame = 20,9 + SetX = 20,-30 + SetY = 20,51 + SetFrame = 21,11 + SetX = 21,-108 + SetY = 21,95 + SetFrame = 22,10 + SetX = 22,-63 + SetY = 22,96 + SetFrame = 23,9 + SetX = 23,-118 + SetY = 23,113 + SetFrame = 24,10 + SetX = 24,-32 + SetY = 24,72 + SetFrame = 25,11 + SetX = 25,-12 + SetY = 25,22 + SetFrame = 26,10 + SetX = 26,36 + SetY = 26,15 + SetFrame = 27,11 + SetX = 27,-68 + SetY = 27,85 + SetX = 28,-37 + SetY = 28,73 + SetFrame = 29,9 + SetX = 29,-8 + SetY = 29,42 + SetFrame = 30,10 + SetX = 30,19 + SetY = 30,31 + SetX = 31,-44 + SetY = 31,98 + SetX = 32,-37 + SetY = 32,81 + SetFrame = 33,11 + SetX = 33,-162 + SetY = 33,139 + SetFrame = 34,10 + SetX = 34,13 + SetY = 34,87 + SetFrame = 35,9 + SetX = 35,-43 + SetY = 35,84 + SetFrame = 36,10 + SetX = 36,-50 + SetY = 36,88 + SetX = 37,-1 + SetY = 37,41 + SetFrame = 38,8 + SetX = 38,-29 + SetY = 38,49 + SetFrame = 39,9 + SetX = 39,26 + SetY = 39,11 + SetFrame = 40,11 + SetX = 40,19 + SetY = 40,22 + SetFrame = 41,9 + SetX = 41,33 + SetY = 41,-33 + SetX = 42,23 + SetY = 42,-41 + SetFrame = 43,10 + SetX = 43,10 + SetY = 43,-19 + SetFrame = 44,9 + SetX = 44,-20 + SetY = 44,-46 + SetX = 45,12 + SetY = 45,-45 + SetFrame = 46,10 + SetX = 46,31 + SetY = 46,-53 + SetFrame = 47,9 + SetX = 47,53 + SetY = 47,-47 + SetX = 48,52 + SetY = 48,-52 + SetX = 49,53 + SetY = 49,-91 + SetFrame = 50,10 + SetX = 50,40 + SetY = 50,-76 + SetVisible = 51,false Graphic = poi.hear.mus Focus = Target - SetX = 13,282 - SetY = 13,189 - SetX = 14,226 - SetY = 14,238 - SetX = 15,448 - SetY = 15,78 - SetX = 16,356 - SetY = 16,148 - SetX = 17,384 - SetY = 17,150 - SetX = 18,442 - SetY = 18,83 - SetX = 19,427 - SetY = 19,72 - SetX = 20,345 - SetY = 20,152 - SetX = 21,368 - SetY = 21,119 - SetX = 22,416 - SetY = 22,113 - SetX = 23,356 - SetY = 23,155 - SetX = 24,221 - SetY = 24,234 - SetX = 25,352 - SetY = 25,134 - SetX = 26,403 - SetY = 26,86 - SetX = 27,416 - SetY = 27,109 - SetX = 28,423 - SetY = 28,116 - SetX = 29,392 - SetY = 29,153 - SetX = 30,231 - SetY = 30,240 - SetX = 31,394 - SetY = 31,133 - SetX = 32,345 - SetY = 32,145 - SetX = 33,387 - SetY = 33,146 - SetX = 34,421 - SetY = 34,114 - SetX = 35,408 - SetY = 35,98 - SetX = 36,423 - SetY = 36,119 - SetX = 37,379 - SetY = 37,104 - SetX = 38,422 - SetY = 38,90 + SetFrame = 8,7 + SetX = 8,-162 + SetY = 8,102 + SetZ = 8,30 + SetFrame = 9,9 + SetX = 9,-33 + SetY = 9,34 + SetX = 10,-127 + SetY = 10,96 + SetX = 11,-29 + SetY = 11,11 + SetFrame = 12,10 + SetX = 12,10 + SetY = 12,17 + SetFrame = 13,9 + SetX = 13,35 + SetY = 13,-6 + SetFrame = 14,11 + SetX = 14,46 + SetY = 14,0 + SetX = 15,-53 + SetY = 15,68 + SetFrame = 16,8 + SetX = 16,-11 + SetY = 16,56 + SetFrame = 17,11 + SetX = 17,-31 + SetY = 17,46 + SetFrame = 18,10 + SetX = 18,61 + SetY = 18,-1 + SetX = 19,-153 + SetY = 19,140 + SetX = 20,-21 + SetY = 20,66 + SetFrame = 21,9 + SetX = 21,16 + SetY = 21,22 + SetFrame = 22,11 + SetX = 22,-60 + SetY = 22,90 + SetFrame = 23,9 + SetX = 23,-6 + SetY = 23,45 + SetX = 24,-27 + SetY = 24,77 + SetX = 25,-1 + SetY = 25,39 + SetFrame = 26,10 + SetX = 26,42 + SetY = 26,20 + SetFrame = 27,11 + SetX = 27,35 + SetY = 27,-2 + SetFrame = 28,9 + SetX = 28,-40 + SetY = 28,67 + SetFrame = 29,10 + SetX = 29,-6 + SetY = 29,52 + SetFrame = 30,9 + SetX = 30,41 + SetY = 30,17 + SetFrame = 31,11 + SetX = 31,-72 + SetY = 31,86 + SetFrame = 32,9 + SetX = 32,-14 + SetY = 32,69 + SetX = 33,-131 + SetY = 33,130 + SetX = 34,6 + SetY = 34,52 + SetFrame = 35,10 + SetX = 35,55 + SetY = 35,17 + SetFrame = 36,11 + SetX = 36,-36 + SetY = 36,58 + SetFrame = 37,9 + SetX = 37,21 + SetY = 37,25 + SetFrame = 38,10 + SetX = 38,48 + SetY = 38,17 + SetVisible = 39,false Graphic = poi.hear.mus Focus = Target - SetX = 15,429 - SetY = 15,91 - SetX = 16,352 - SetY = 16,157 - SetX = 18,426 - SetY = 18,99 - SetX = 19,425 - SetY = 19,95 - SetX = 20,412 - SetY = 20,93 - SetX = 21,391 - SetY = 21,122 - SetX = 22,424 - SetY = 22,105 - SetX = 24,255 - SetY = 24,224 - SetX = 27,232 - SetY = 27,226 - SetX = 28,421 - SetY = 28,88 - SetX = 31,402 - SetY = 31,130 - SetX = 32,423 - SetY = 32,124 - SetX = 33,390 - SetY = 33,139 - SetX = 34,447 - SetY = 34,96 - SetX = 35,433 - SetY = 35,112 + SetFrame = 13,8 + SetX = 13,-102 + SetY = 13,93 + SetZ = 13,31 + SetX = 14,-158 + SetY = 14,142 + SetFrame = 15,9 + SetX = 15,64 + SetY = 15,-18 + SetFrame = 16,10 + SetX = 16,-28 + SetY = 16,52 + SetFrame = 17,8 + SetX = 17,0 + SetY = 17,54 + SetFrame = 18,9 + SetX = 18,58 + SetY = 18,-13 + SetX = 19,43 + SetY = 19,-24 + SetFrame = 20,8 + SetX = 20,-39 + SetY = 20,56 + SetFrame = 21,11 + SetX = 21,-16 + SetY = 21,23 + SetFrame = 22,10 + SetX = 22,32 + SetY = 22,17 + SetX = 23,-28 + SetY = 23,59 + SetFrame = 24,11 + SetX = 24,-163 + SetY = 24,138 + SetX = 25,-32 + SetY = 25,38 + SetX = 26,19 + SetY = 26,-10 + SetFrame = 27,8 + SetX = 27,32 + SetY = 27,13 + SetFrame = 28,10 + SetX = 28,39 + SetY = 28,20 + SetFrame = 29,8 + SetX = 29,8 + SetY = 29,57 + SetX = 30,-153 + SetY = 30,144 + SetFrame = 31,10 + SetX = 31,10 + SetY = 31,37 + SetFrame = 32,11 + SetX = 32,-39 + SetY = 32,49 + SetFrame = 33,10 + SetX = 33,3 + SetY = 33,50 + SetX = 34,37 + SetY = 34,18 + SetFrame = 35,11 + SetX = 35,24 + SetY = 35,2 + SetFrame = 36,10 + SetX = 36,39 + SetY = 36,23 + SetFrame = 37,11 + SetX = 37,-5 + SetY = 37,8 + SetFrame = 38,9 + SetX = 38,38 + SetY = 38,-6 + SetVisible = 39,false Graphic = poi.hear.mus Focus = Target - SetX = 15,437 - SetY = 15,85 - SetX = 16,416 - SetY = 16,84 - SetX = 25,413 - SetY = 25,98 - SetX = 27,209 - SetY = 27,217 - SetX = 31,400 - SetY = 31,125 + SetFrame = 15,8 + SetX = 15,45 + SetY = 15,-5 + SetZ = 15,32 + SetX = 16,-32 + SetY = 16,61 + SetVisible = 17,false Graphic = poi.hear.mus Focus = Target - SetX = 16,417 - SetY = 16,89 + SetFrame = 15,9 + SetX = 15,53 + SetY = 15,-11 + SetZ = 15,33 + SetFrame = 16,11 + SetX = 16,32 + SetY = 16,-12 + SetVisible = 17,false Graphic = poi.hear.mus Focus = Target - SetX = 16,417 - SetY = 16,93 + SetFrame = 16,8 + SetX = 16,33 + SetY = 16,-7 + SetZ = 16,34 + SetVisible = 17,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 16,10 + SetX = 16,33 + SetY = 16,-3 + SetZ = 16,35 + SetVisible = 17,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 18,8 + SetX = 18,42 + SetY = 18,3 + SetZ = 18,32 + SetX = 19,41 + SetY = 19,-1 + SetFrame = 20,11 + SetX = 20,28 + SetY = 20,-3 + SetFrame = 21,10 + SetX = 21,7 + SetY = 21,26 + SetX = 22,40 + SetY = 22,9 + SetVisible = 23,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 24,9 + SetX = 24,-129 + SetY = 24,128 + SetZ = 24,32 + SetVisible = 25,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 25,10 + SetX = 25,29 + SetY = 25,2 + SetZ = 25,33 + SetVisible = 26,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 27,9 + SetX = 27,-152 + SetY = 27,130 + SetZ = 27,32 + SetX = 28,37 + SetY = 28,-8 + SetVisible = 29,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 27,11 + SetX = 27,-175 + SetY = 27,121 + SetZ = 27,33 + SetVisible = 28,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 31,9 + SetX = 31,18 + SetY = 31,34 + SetZ = 31,32 + SetFrame = 32,10 + SetX = 32,39 + SetY = 32,28 + SetFrame = 33,11 + SetX = 33,6 + SetY = 33,43 + SetFrame = 34,9 + SetX = 34,63 + SetY = 34,0 + SetX = 35,49 + SetY = 35,16 + SetVisible = 36,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 31,11 + SetX = 31,16 + SetY = 31,29 + SetZ = 31,33 + SetVisible = 32,false Play = 0,Sing,80 #------------------------------- [OppMove,SING] Name = SING - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poi.hear.mus Focus = Target - SetX = 0,364 - SetY = 0,92 - SetX = 1,369 - SetY = 1,117 - SetX = 2,358 - SetY = 2,154 - SetX = 3,332 - SetY = 3,182 - SetX = 4,382 - SetY = 4,106 - SetX = 5,365 - SetY = 5,96 - SetX = 6,212 - SetY = 6,246 - SetX = 7,356 - SetY = 7,172 - SetX = 8,320 - SetY = 8,192 - SetX = 9,298 - SetY = 9,201 - SetX = 10,265 - SetY = 10,239 - SetX = 11,231 - SetY = 11,255 - SetX = 12,282 - SetY = 12,196 - SetX = 13,255 - SetY = 13,253 - SetX = 14,348 - SetY = 14,175 - SetX = 15,303 - SetY = 15,213 - SetX = 16,384 - SetY = 16,110 - SetX = 17,355 - SetY = 17,167 - SetX = 18,316 - SetY = 18,200 - SetX = 19,289 - SetY = 19,223 - SetX = 20,244 - SetY = 20,239 - SetX = 21,313 - SetY = 21,199 - SetX = 22,281 - SetY = 22,248 - SetX = 23,238 - SetY = 23,242 - SetX = 24,341 - SetY = 24,194 - SetX = 25,296 - SetY = 25,225 - SetX = 26,369 - SetY = 26,116 - SetX = 27,326 - SetY = 27,171 - SetX = 28,186 - SetY = 28,240 - SetX = 29,156 - SetY = 29,241 - SetX = 30,150 - SetX = 31,180 - SetY = 31,214 - SetX = 32,183 - SetX = 33,193 - SetY = 33,171 - SetX = 34,161 - SetY = 34,235 - SetX = 35,190 - SetY = 35,195 - SetX = 36,164 - SetY = 36,176 - SetX = 37,167 - SetY = 37,175 - SetX = 38,159 - SetY = 38,143 - SetX = 39,202 - SetY = 39,108 + SetFrame = 0,7 + SetX = 0,-20 + SetY = 0,-4 + SetZ = 0,27 + SetFrame = 1,9 + SetX = 1,-15 + SetY = 1,21 + SetFrame = 2,8 + SetX = 2,-26 + SetY = 2,58 + SetFrame = 3,10 + SetX = 3,-52 + SetY = 3,86 + SetX = 4,-2 + SetY = 4,10 + SetFrame = 5,11 + SetX = 5,-19 + SetY = 5,0 + SetX = 6,-172 + SetY = 6,150 + SetFrame = 7,8 + SetX = 7,-28 + SetY = 7,76 + SetFrame = 8,10 + SetX = 8,-64 + SetY = 8,96 + SetFrame = 9,9 + SetX = 9,-86 + SetY = 9,105 + SetFrame = 10,10 + SetX = 10,-119 + SetY = 10,143 + SetX = 11,-153 + SetY = 11,159 + SetFrame = 12,11 + SetX = 12,-102 + SetY = 12,100 + SetFrame = 13,8 + SetX = 13,-129 + SetY = 13,157 + SetFrame = 14,9 + SetX = 14,-36 + SetY = 14,79 + SetFrame = 15,11 + SetX = 15,-81 + SetY = 15,117 + SetX = 16,0 + SetY = 16,14 + SetFrame = 17,10 + SetX = 17,-29 + SetY = 17,71 + SetFrame = 18,11 + SetX = 18,-68 + SetY = 18,104 + SetX = 19,-95 + SetY = 19,127 + SetFrame = 20,9 + SetX = 20,-140 + SetY = 20,143 + SetFrame = 21,11 + SetX = 21,-71 + SetY = 21,103 + SetFrame = 22,10 + SetX = 22,-103 + SetY = 22,152 + SetFrame = 23,9 + SetX = 23,-146 + SetY = 23,146 + SetX = 24,-43 + SetY = 24,98 + SetX = 25,-88 + SetY = 25,129 + SetFrame = 26,11 + SetX = 26,-15 + SetY = 26,20 + SetX = 27,-58 + SetY = 27,75 + SetX = 28,-198 + SetY = 28,144 + SetX = 29,-228 + SetY = 29,145 + SetFrame = 30,10 + SetX = 30,-234 + SetX = 31,-204 + SetY = 31,118 + SetX = 32,-201 + SetFrame = 33,11 + SetX = 33,-191 + SetY = 33,75 + SetFrame = 34,10 + SetX = 34,-223 + SetY = 34,139 + SetX = 35,-194 + SetY = 35,99 + SetFrame = 36,11 + SetX = 36,-220 + SetY = 36,80 + SetFrame = 37,10 + SetX = 37,-217 + SetY = 37,79 + SetX = 38,-225 + SetY = 38,47 + SetX = 39,-182 + SetY = 39,12 SetOpacity = 39,243 - SetX = 40,183 - SetY = 40,119 + SetFrame = 40,11 + SetX = 40,-201 + SetY = 40,23 SetOpacity = 40,255 Graphic = poi.hear.mus Focus = Target - SetX = 0,365 - SetY = 0,125 - SetX = 1,350 - SetY = 1,146 - SetX = 2,356 - SetY = 2,143 - SetX = 3,304 - SetY = 3,177 - SetX = 4,294 - SetY = 4,203 - SetX = 5,383 - SetY = 5,125 - SetX = 6,228 - SetY = 6,232 - SetX = 7,375 - SetY = 7,166 - SetX = 8,344 - SetY = 8,188 - SetX = 9,282 - SetY = 9,205 - SetX = 10,287 - SetY = 10,225 - SetX = 11,242 - SetY = 11,244 - SetX = 12,314 - SetY = 12,207 - SetX = 13,240 - SetY = 13,244 - SetX = 14,342 - SetY = 14,181 - SetX = 15,332 - SetY = 15,221 - SetX = 16,377 - SetY = 16,126 - SetX = 17,360 - SetY = 17,154 - SetX = 18,309 - SetY = 18,211 - SetX = 19,284 - SetY = 19,236 - SetX = 20,252 - SetY = 20,256 - SetX = 21,345 - SetY = 21,203 - SetX = 22,300 - SetY = 22,240 - SetX = 23,231 - SetY = 23,245 - SetX = 24,350 - SetY = 24,216 - SetX = 25,306 - SetY = 25,242 - SetX = 26,361 - SetY = 26,143 - SetX = 27,333 - SetY = 27,171 - SetX = 28,183 - SetY = 28,258 - SetX = 29,163 - SetY = 29,239 - SetX = 30,176 - SetY = 30,223 - SetX = 31,173 - SetY = 31,204 - SetX = 32,159 - SetY = 32,186 - SetX = 33,182 - SetY = 33,191 - SetX = 34,153 - SetY = 34,221 - SetX = 35,181 - SetY = 35,163 - SetX = 36,193 - SetY = 36,197 - SetX = 37,191 - SetY = 37,163 - SetX = 38,172 - SetY = 38,161 - SetX = 39,204 - SetY = 39,163 - SetX = 40,183 - SetY = 40,100 + SetFrame = 0,8 + SetX = 0,-19 + SetY = 0,29 + SetZ = 0,28 + SetFrame = 1,10 + SetX = 1,-34 + SetY = 1,50 + SetFrame = 2,9 + SetX = 2,-28 + SetY = 2,47 + SetFrame = 3,11 + SetX = 3,-80 + SetY = 3,81 + SetX = 4,-90 + SetY = 4,107 + SetFrame = 5,10 + SetX = 5,-1 + SetY = 5,29 + SetFrame = 6,9 + SetX = 6,-156 + SetY = 6,136 + SetX = 7,-9 + SetY = 7,70 + SetX = 8,-40 + SetY = 8,92 + SetFrame = 9,8 + SetX = 9,-102 + SetY = 9,109 + SetFrame = 10,9 + SetX = 10,-97 + SetY = 10,129 + SetFrame = 11,8 + SetX = 11,-142 + SetY = 11,148 + SetFrame = 12,10 + SetX = 12,-70 + SetY = 12,111 + SetX = 13,-144 + SetY = 13,148 + SetFrame = 14,11 + SetX = 14,-42 + SetY = 14,85 + SetFrame = 15,10 + SetX = 15,-52 + SetY = 15,125 + SetX = 16,-7 + SetY = 16,30 + SetFrame = 17,11 + SetX = 17,-24 + SetY = 17,58 + SetFrame = 18,10 + SetX = 18,-75 + SetY = 18,115 + SetX = 19,-100 + SetY = 19,140 + SetX = 20,-132 + SetY = 20,160 + SetFrame = 21,9 + SetX = 21,-39 + SetY = 21,107 + SetX = 22,-84 + SetY = 22,144 + SetFrame = 23,10 + SetX = 23,-153 + SetY = 23,149 + SetX = 24,-34 + SetY = 24,120 + SetX = 25,-78 + SetY = 25,146 + SetX = 26,-23 + SetY = 26,47 + SetFrame = 27,9 + SetX = 27,-51 + SetY = 27,75 + SetFrame = 28,10 + SetX = 28,-201 + SetY = 28,162 + SetFrame = 29,9 + SetX = 29,-221 + SetY = 29,143 + SetX = 30,-208 + SetY = 30,127 + SetX = 31,-211 + SetY = 31,108 + SetFrame = 32,11 + SetX = 32,-225 + SetY = 32,90 + SetFrame = 33,10 + SetX = 33,-202 + SetY = 33,95 + SetFrame = 34,9 + SetX = 34,-231 + SetY = 34,125 + SetX = 35,-203 + SetY = 35,67 + SetFrame = 36,10 + SetX = 36,-191 + SetY = 36,101 + SetFrame = 37,9 + SetX = 37,-193 + SetY = 37,67 + SetFrame = 38,8 + SetX = 38,-212 + SetY = 38,65 + SetX = 39,-180 + SetY = 39,67 + SetX = 40,-201 + SetY = 40,4 Graphic = poi.hear.mus Focus = Target - SetX = 4,300 - SetY = 4,200 - SetX = 5,262 - SetY = 5,233 - SetX = 6,369 - SetY = 6,129 - SetX = 7,334 - SetY = 7,162 - SetX = 8,316 - SetY = 8,166 - SetX = 9,305 - SetY = 9,207 - SetX = 10,263 - SetY = 10,215 - SetX = 11,214 - SetY = 11,227 - SetX = 12,328 - SetY = 12,211 - SetX = 13,243 - SetY = 13,222 - SetX = 14,319 - SetY = 14,174 - SetX = 15,338 - SetY = 15,219 - SetX = 16,287 - SetY = 16,257 - SetX = 17,252 - SetY = 17,240 - SetX = 18,341 - SetY = 18,216 - SetX = 19,388 - SetY = 19,118 - SetX = 20,365 - SetY = 20,153 - SetX = 21,222 - SetY = 21,259 - SetX = 22,268 - SetY = 22,239 - SetX = 23,234 - SetY = 23,242 - SetX = 24,316 - SetY = 24,212 - SetX = 25,305 - SetY = 25,234 - SetX = 26,239 - SetY = 26,246 - SetX = 27,346 - SetY = 27,201 - SetX = 28,212 - SetY = 28,248 - SetX = 29,181 - SetY = 29,253 - SetX = 30,167 - SetY = 30,247 - SetX = 31,196 - SetY = 31,222 - SetX = 32,180 - SetY = 32,271 - SetX = 33,189 - SetY = 33,192 - SetX = 34,169 - SetY = 34,208 - SetX = 35,198 - SetY = 35,169 - SetX = 36,197 - SetY = 36,163 - SetX = 37,155 - SetY = 37,173 - SetX = 38,189 - SetY = 38,155 - SetX = 39,178 - SetY = 39,142 - SetX = 40,169 - SetY = 40,139 + SetFrame = 4,9 + SetX = 4,-84 + SetY = 4,104 + SetZ = 4,29 + SetFrame = 5,8 + SetX = 5,-122 + SetY = 5,137 + SetFrame = 6,10 + SetX = 6,-15 + SetY = 6,33 + SetFrame = 7,11 + SetX = 7,-50 + SetY = 7,66 + SetX = 8,-68 + SetY = 8,70 + SetFrame = 9,10 + SetX = 9,-79 + SetY = 9,111 + SetFrame = 10,8 + SetX = 10,-121 + SetY = 10,119 + SetFrame = 11,11 + SetX = 11,-170 + SetY = 11,131 + SetFrame = 12,8 + SetX = 12,-56 + SetY = 12,115 + SetFrame = 13,11 + SetX = 13,-141 + SetY = 13,126 + SetX = 14,-65 + SetY = 14,78 + SetFrame = 15,9 + SetX = 15,-46 + SetY = 15,123 + SetFrame = 16,10 + SetX = 16,-97 + SetY = 16,161 + SetFrame = 17,9 + SetX = 17,-132 + SetY = 17,144 + SetX = 18,-43 + SetY = 18,120 + SetX = 19,4 + SetY = 19,22 + SetX = 20,-19 + SetY = 20,57 + SetFrame = 21,8 + SetX = 21,-162 + SetY = 21,163 + SetX = 22,-116 + SetY = 22,143 + SetFrame = 23,11 + SetX = 23,-150 + SetY = 23,146 + SetFrame = 24,10 + SetX = 24,-68 + SetY = 24,116 + SetFrame = 25,8 + SetX = 25,-79 + SetY = 25,138 + SetFrame = 26,11 + SetX = 26,-145 + SetY = 26,150 + SetFrame = 27,10 + SetX = 27,-38 + SetY = 27,105 + SetFrame = 28,9 + SetX = 28,-172 + SetY = 28,152 + SetFrame = 29,8 + SetX = 29,-203 + SetY = 29,157 + SetX = 30,-217 + SetY = 30,151 + SetX = 31,-188 + SetY = 31,126 + SetX = 32,-204 + SetY = 32,175 + SetFrame = 33,9 + SetX = 33,-195 + SetY = 33,96 + SetFrame = 34,11 + SetX = 34,-215 + SetY = 34,112 + SetFrame = 35,10 + SetX = 35,-186 + SetY = 35,73 + SetFrame = 36,9 + SetX = 36,-187 + SetY = 36,67 + SetFrame = 37,11 + SetX = 37,-229 + SetY = 37,77 + SetFrame = 38,10 + SetX = 38,-195 + SetY = 38,59 + SetX = 39,-206 + SetY = 39,46 + SetX = 40,-215 + SetY = 40,43 Graphic = poi.hear.mus Focus = Target - SetX = 4,305 - SetY = 4,227 - SetX = 5,275 - SetY = 5,241 - SetX = 6,370 - SetY = 6,121 - SetX = 9,381 - SetY = 9,113 - SetX = 10,378 - SetY = 10,125 - SetX = 11,348 - SetY = 11,181 - SetX = 12,391 - SetY = 12,104 - SetX = 13,377 - SetY = 13,141 - SetX = 16,287 - SetY = 16,252 - SetX = 17,233 - SetY = 17,251 - SetX = 19,378 - SetY = 19,135 - SetX = 20,372 - SetY = 20,173 - SetX = 21,237 - SetY = 21,267 - SetX = 22,390 - SetY = 22,124 - SetX = 23,368 - SetY = 23,151 - SetX = 26,272 - SetY = 26,240 - SetX = 27,236 - SetY = 27,247 - SetX = 28,300 - SetY = 28,211 - SetX = 29,278 - SetY = 29,252 - SetX = 30,275 - SetY = 30,253 - SetX = 31,226 - SetY = 31,269 - SetX = 32,150 - SetY = 32,250 - SetX = 33,161 - SetY = 33,260 + SetFrame = 4,10 + SetX = 4,-79 + SetY = 4,131 + SetZ = 4,30 + SetX = 5,-109 + SetY = 5,145 + SetFrame = 6,11 + SetX = 6,-14 + SetY = 6,25 + SetVisible = 7,false Graphic = poi.hear.mus Focus = Target - SetX = 10,380 - SetY = 10,124 - SetX = 11,349 - SetY = 11,180 - SetX = 12,379 - SetY = 12,122 - SetX = 13,371 - SetY = 13,140 - SetX = 16,282 - SetY = 16,252 - SetX = 17,238 - SetY = 17,245 - SetX = 20,367 - SetY = 20,183 - SetX = 21,292 - SetY = 21,204 - SetX = 23,369 - SetY = 23,179 - SetX = 26,250 - SetY = 26,250 - SetX = 27,218 - SetY = 27,255 - SetX = 28,308 - SetY = 28,205 - SetX = 29,279 - SetY = 29,245 - SetX = 30,263 - SetY = 30,244 - SetX = 31,218 - SetY = 31,254 - SetX = 32,181 - SetY = 32,263 - SetX = 33,132 - SetY = 33,243 + SetFrame = 9,11 + SetX = 9,-3 + SetY = 9,17 + SetZ = 9,30 + SetX = 10,-6 + SetY = 10,29 + SetFrame = 11,10 + SetX = 11,-36 + SetY = 11,85 + SetFrame = 12,9 + SetX = 12,7 + SetY = 12,8 + SetFrame = 13,10 + SetX = 13,-7 + SetY = 13,45 + SetVisible = 14,false Graphic = poi.hear.mus Focus = Target - SetX = 11,319 - SetY = 11,172 - SetX = 13,361 - SetY = 13,158 - SetX = 23,335 - SetY = 23,156 - SetX = 27,241 - SetY = 27,261 - SetX = 28,327 - SetY = 28,222 - SetX = 30,262 - SetY = 30,252 + SetFrame = 10,9 + SetX = 10,-4 + SetY = 10,28 + SetZ = 10,31 + SetFrame = 11,11 + SetX = 11,-35 + SetY = 11,84 + SetX = 12,-5 + SetY = 12,26 + SetX = 13,-13 + SetY = 13,44 + SetVisible = 14,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 11,11 + SetX = 11,-65 + SetY = 11,76 + SetZ = 11,32 + SetVisible = 12,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 13,10 + SetX = 13,-23 + SetY = 13,62 + SetZ = 13,32 + SetVisible = 14,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 16,11 + SetX = 16,-97 + SetY = 16,156 + SetZ = 16,30 + SetFrame = 17,8 + SetX = 17,-151 + SetY = 17,155 + SetVisible = 18,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 16,10 + SetX = 16,-102 + SetY = 16,156 + SetZ = 16,31 + SetFrame = 17,9 + SetX = 17,-146 + SetY = 17,149 + SetVisible = 18,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 19,11 + SetX = 19,-6 + SetY = 19,39 + SetZ = 19,30 + SetFrame = 20,10 + SetX = 20,-12 + SetY = 20,77 + SetX = 21,-147 + SetY = 21,171 + SetX = 22,6 + SetY = 22,28 + SetFrame = 23,9 + SetX = 23,-16 + SetY = 23,55 + SetVisible = 24,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 20,8 + SetX = 20,-17 + SetY = 20,87 + SetZ = 20,31 + SetFrame = 21,11 + SetX = 21,-92 + SetY = 21,108 + SetVisible = 22,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 23,10 + SetX = 23,-15 + SetY = 23,83 + SetZ = 23,31 + SetVisible = 24,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 23,11 + SetX = 23,-49 + SetY = 23,60 + SetZ = 23,32 + SetVisible = 24,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 26,9 + SetX = 26,-112 + SetY = 26,144 + SetZ = 26,30 + SetX = 27,-148 + SetY = 27,151 + SetFrame = 28,11 + SetX = 28,-84 + SetY = 28,115 + SetFrame = 29,10 + SetX = 29,-106 + SetY = 29,156 + SetX = 30,-109 + SetY = 30,157 + SetX = 31,-158 + SetY = 31,173 + SetFrame = 32,11 + SetX = 32,-234 + SetY = 32,154 + SetFrame = 33,10 + SetX = 33,-223 + SetY = 33,164 + SetVisible = 34,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 26,8 + SetX = 26,-134 + SetY = 26,154 + SetZ = 26,31 + SetX = 27,-166 + SetY = 27,159 + SetFrame = 28,9 + SetX = 28,-76 + SetY = 28,109 + SetFrame = 29,11 + SetX = 29,-105 + SetY = 29,149 + SetFrame = 30,9 + SetX = 30,-121 + SetY = 30,148 + SetX = 31,-166 + SetY = 31,158 + SetFrame = 32,10 + SetX = 32,-203 + SetY = 32,167 + SetFrame = 33,11 + SetX = 33,-252 + SetY = 33,147 + SetVisible = 34,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 27,10 + SetX = 27,-143 + SetY = 27,165 + SetZ = 27,32 + SetX = 28,-57 + SetY = 28,126 + SetVisible = 29,false + + Graphic = poi.hear.mus + Focus = Target + SetFrame = 30,11 + SetX = 30,-122 + SetY = 30,156 + SetZ = 30,32 + SetVisible = 31,false Play = 0,Sing,95 diff --git a/PBS/Animations/Converted/Move/SKETCH.txt b/PBS/Animations/Converted/Move/SKETCH.txt index e34e1bcf1..c5a3f81e8 100644 --- a/PBS/Animations/Converted/Move/SKETCH.txt +++ b/PBS/Animations/Converted/Move/SKETCH.txt @@ -3,52 +3,54 @@ [Move,SKETCH] Name = SKETCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal2 Focus = Target - SetX = 0,152 - SetY = 0,30 + SetFrame = 0,14 + SetX = 0,-232 + SetY = 0,-66 + SetZ = 0,27 SetZoomX = 0,75 SetZoomY = 0,75 - SetX = 1,184 - SetY = 1,54 - SetX = 2,224 - SetY = 2,86 - SetX = 3,288 - SetY = 3,134 - SetX = 4,368 - SetY = 4,174 - SetX = 5,464 - SetY = 5,166 - SetX = 6,424 - SetY = 6,134 - SetX = 7,320 - SetY = 7,102 - SetX = 8,224 - SetY = 8,54 - SetX = 9,216 - SetY = 9,6 - SetX = 10,272 - SetY = 10,38 - SetX = 11,320 - SetY = 11,70 - SetX = 12,400 - SetY = 12,110 - SetX = 13,480 - SetY = 13,150 - SetX = 14,504 - SetY = 14,158 - SetX = 15,488 - SetY = 15,110 - SetX = 16,424 - SetY = 16,54 - SetX = 17,344 - SetY = 17,-18 + SetX = 1,-200 + SetY = 1,-42 + SetX = 2,-160 + SetY = 2,-10 + SetX = 3,-96 + SetY = 3,38 + SetX = 4,-16 + SetY = 4,78 + SetX = 5,80 + SetY = 5,70 + SetX = 6,40 + SetY = 6,38 + SetX = 7,-64 + SetY = 7,6 + SetX = 8,-160 + SetY = 8,-42 + SetX = 9,-168 + SetY = 9,-90 + SetX = 10,-112 + SetY = 10,-58 + SetX = 11,-64 + SetY = 11,-26 + SetX = 12,16 + SetY = 12,14 + SetX = 13,96 + SetY = 13,54 + SetX = 14,120 + SetY = 14,62 + SetX = 15,104 + SetY = 15,14 + SetX = 16,40 + SetY = 16,-42 + SetX = 17,-40 + SetY = 17,-114 Play = 0,Slash6,80 Play = 6,Slash6,80 diff --git a/PBS/Animations/Converted/Move/SLAM.txt b/PBS/Animations/Converted/Move/SLAM.txt index 980fc2447..ad7258b01 100644 --- a/PBS/Animations/Converted/Move/SLAM.txt +++ b/PBS/Animations/Converted/Move/SLAM.txt @@ -3,15 +3,20 @@ [Move,SLAM] Name = SLAM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 Play = 0,Blow6,80 diff --git a/PBS/Animations/Converted/Move/SLASH.txt b/PBS/Animations/Converted/Move/SLASH.txt index b6cbd331d..0c5b445e0 100644 --- a/PBS/Animations/Converted/Move/SLASH.txt +++ b/PBS/Animations/Converted/Move/SLASH.txt @@ -3,42 +3,55 @@ [Move,SLASH] Name = SLASH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = zan03 Focus = Target - SetX = 0,280 - SetY = 0,6 - SetX = 1,344 - SetY = 1,54 - SetX = 2,376 - SetY = 2,70 - SetX = 3,384 - SetY = 3,94 + SetX = 0,-104 + SetY = 0,-90 + SetZ = 0,28 + SetFrame = 1,1 + SetX = 1,-40 + SetY = 1,-42 + SetFrame = 2,2 + SetX = 2,-8 + SetY = 2,-26 + SetX = 3,0 + SetY = 3,-2 + SetVisible = 4,false Graphic = zan03 Focus = Target - SetX = 0,304 - SetY = 0,-26 - SetX = 1,320 - SetY = 1,86 - SetX = 2,336 - SetX = 3,352 - SetY = 3,118 + SetX = 0,-80 + SetY = 0,-122 + SetZ = 0,29 + SetFrame = 1,1 + SetX = 1,-64 + SetY = 1,-10 + SetFrame = 2,2 + SetX = 2,-48 + SetX = 3,-32 + SetY = 3,22 + SetVisible = 4,false Graphic = zan03 Focus = Target - SetX = 0,256 - SetY = 0,38 - SetX = 1,368 - SetY = 1,30 - SetX = 2,408 - SetY = 2,54 - SetX = 3,416 - SetY = 3,78 + SetX = 0,-128 + SetY = 0,-58 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,-16 + SetY = 1,-66 + SetFrame = 2,2 + SetX = 2,24 + SetY = 2,-42 + SetFrame = 3,3 + SetX = 3,32 + SetY = 3,-18 + SetVisible = 4,false Play = 0,Slash3,80 diff --git a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt index fec800d64..76817330c 100644 --- a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt +++ b/PBS/Animations/Converted/Move/SLEEPPOWDER.txt @@ -3,15 +3,30 @@ [Move,SLEEPPOWDER] Name = SLEEPPOWDER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Special5 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetVisible = 14,false Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/SLUDGE.txt b/PBS/Animations/Converted/Move/SLUDGE.txt index 400978648..ca99935a4 100644 --- a/PBS/Animations/Converted/Move/SLUDGE.txt +++ b/PBS/Animations/Converted/Move/SLUDGE.txt @@ -3,27 +3,46 @@ [Move,SLUDGE] Name = SLUDGE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - + SetX = 0,0 + SetY = 0,0 + Graphic = State1 Focus = Target - SetX = 0,128 - SetY = 0,236 - SetX = 1,172 - SetY = 1,186 + SetFrame = 5,5 + SetX = 5,-26 + SetY = 5,14 + SetZ = 5,27 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + + Graphic = State1 + Focus = UserAndTarget + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetFrame = 1,1 + SetX = 1,34 + SetY = 1,-59 SetAngle = 1,325 - SetX = 2,249 - SetY = 2,148 - SetX = 3,313 - SetY = 3,129 - SetX = 4,358 - SetY = 4,91 - SetY = 5,110 - SetAngle = 5,0 + SetFrame = 2,2 + SetX = 2,94 + SetY = 2,-118 + SetFrame = 3,3 + SetX = 3,144 + SetY = 3,-148 + SetFrame = 4,4 + SetX = 4,179 + SetY = 4,-207 + SetVisible = 5,false Play = 0,throw,80 Play = 7,Poison,80 diff --git a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt index 41e8bb365..9c258ae6d 100644 --- a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt +++ b/PBS/Animations/Converted/Move/SLUDGEBOMB.txt @@ -3,72 +3,96 @@ [Move,SLUDGEBOMB] Name = SLUDGEBOMB - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison4 Focus = UserAndTarget - SetX = 0,140 - SetY = 0,217 - SetX = 1,172 - SetY = 1,211 - SetX = 2,134 - SetX = 3,179 - SetY = 3,148 - SetX = 4,243 - SetY = 4,104 - SetX = 5,294 - SetY = 5,79 - SetX = 6,256 - SetY = 6,135 + SetX = 0,9 + SetY = 0,-10 + SetZ = 0,28 + SetX = 1,34 + SetY = 1,-20 + SetX = 2,4 + SetX = 3,39 + SetY = 3,-118 + SetX = 4,89 + SetY = 4,-187 + SetX = 5,129 + SetY = 5,-226 + SetFrame = 6,6 + SetX = 6,100 + SetY = 6,-139 + SetVisible = 7,false Graphic = poison4 Focus = UserAndTarget - SetX = 1,147 - SetY = 1,198 - SetX = 2,211 - SetY = 2,186 - SetX = 3,262 - SetY = 3,142 - SetX = 4,326 - SetY = 4,135 - SetX = 5,236 - SetY = 5,148 + SetFrame = 1,1 + SetX = 1,14 + SetY = 1,-40 + SetZ = 1,29 + SetFrame = 2,0 + SetX = 2,64 + SetY = 2,-59 + SetX = 3,104 + SetY = 3,-128 + SetX = 4,154 + SetY = 4,-139 + SetFrame = 5,5 + SetX = 5,84 + SetY = 5,-118 + SetVisible = 6,false Graphic = poison4 Focus = UserAndTarget - SetX = 2,166 - SetY = 2,186 - SetX = 3,192 - SetY = 3,167 - SetX = 4,217 - SetY = 4,154 + SetFrame = 2,2 + SetX = 2,29 + SetY = 2,-59 + SetZ = 2,30 + SetFrame = 3,3 + SetX = 3,50 + SetY = 3,-89 + SetFrame = 4,4 + SetX = 4,69 + SetY = 4,-109 + SetVisible = 5,false Graphic = poison4 Focus = UserAndTarget - SetX = 0,134 - SetY = 0,211 - SetX = 1,166 - SetY = 1,173 - SetX = 2,198 - SetY = 2,148 - SetX = 3,281 - SetY = 3,104 - SetX = 4,358 - SetY = 4,110 - SetX = 5,345 - SetX = 7,275 - SetY = 7,123 - SetX = 8,288 - SetY = 8,116 - SetX = 9,307 - SetY = 9,110 - SetX = 10,332 - SetX = 11,352 - SetX = 12,358 + SetX = 0,4 + SetY = 0,-20 + SetZ = 0,27 + SetX = 1,29 + SetY = 1,-79 + SetX = 2,54 + SetY = 2,-118 + SetX = 3,119 + SetY = 3,-187 + SetX = 4,179 + SetY = 4,-178 + SetX = 5,169 + SetFrame = 7,7 + SetX = 7,114 + SetY = 7,-157 + SetFrame = 8,8 + SetX = 8,125 + SetY = 8,-168 + SetFrame = 9,9 + SetX = 9,139 + SetY = 9,-178 + SetFrame = 10,10 + SetX = 10,159 + SetFrame = 11,11 + SetX = 11,175 + SetFrame = 12,12 + SetX = 12,179 + SetFrame = 13,13 + SetFrame = 14,14 + SetFrame = 15,1 + SetFrame = 16,0 Play = 3,Poison,80 Play = 5,Poison,80 diff --git a/PBS/Animations/Converted/Move/SMOG.txt b/PBS/Animations/Converted/Move/SMOG.txt index b25b5df8d..f49de2abd 100644 --- a/PBS/Animations/Converted/Move/SMOG.txt +++ b/PBS/Animations/Converted/Move/SMOG.txt @@ -3,15 +3,25 @@ [Move,SMOG] Name = SMOG - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison Focus = Target - SetX = 0,392 - SetY = 0,94 + SetFrame = 0,8 + SetX = 0,8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,7 + SetFrame = 2,6 + SetFrame = 3,5 + SetFrame = 4,4 + SetFrame = 5,3 + SetFrame = 6,2 + SetFrame = 7,1 + SetFrame = 8,0 Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/SMOKESCREEN.txt b/PBS/Animations/Converted/Move/SMOKESCREEN.txt index a0844f2df..0bd0fd8a1 100644 --- a/PBS/Animations/Converted/Move/SMOKESCREEN.txt +++ b/PBS/Animations/Converted/Move/SMOKESCREEN.txt @@ -3,94 +3,156 @@ [Move,SMOKESCREEN] Name = SMOKESCREEN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Anima (2) Focus = Target - SetX = 0,384 - SetY = 0,102 + SetFrame = 0,4 + SetX = 0,0 + SetY = 0,6 + SetZ = 0,27 + SetFrame = 1,3 + SetFrame = 2,2 + SetFrame = 3,1 + SetFrame = 4,0 SetFlip = 5,true SetZoomX = 5,110 SetZoomY = 5,110 + SetFrame = 6,1 SetZoomX = 6,100 SetZoomY = 6,100 + SetFrame = 7,2 + SetFrame = 8,3 + SetFrame = 9,4 SetFlip = 10,false - SetX = 10,336 - SetY = 10,78 - SetX = 11,408 - SetY = 11,62 - SetX = 12,440 - SetY = 12,110 + SetX = 10,-48 + SetY = 10,-18 + SetX = 11,24 + SetY = 11,-34 + SetFrame = 12,2 + SetX = 12,56 + SetY = 12,14 + SetFrame = 13,3 + SetFrame = 14,4 SetOpacity = 14,150 Graphic = Anima (2) Focus = Target - SetX = 2,336 - SetY = 2,78 - SetX = 10,408 - SetY = 10,62 - SetX = 11,440 - SetY = 11,110 - SetX = 12,320 + SetFrame = 2,4 + SetX = 2,-48 + SetY = 2,-18 + SetZ = 2,28 + SetFrame = 3,3 + SetFrame = 4,2 + SetFrame = 5,1 + SetFrame = 6,0 + SetFrame = 7,1 + SetFrame = 8,2 + SetFrame = 9,3 + SetX = 10,24 + SetY = 10,-34 + SetFrame = 11,1 + SetX = 11,56 + SetY = 11,14 + SetFrame = 12,3 + SetX = 12,-64 + SetFrame = 13,4 SetOpacity = 13,150 + SetVisible = 14,false Graphic = Anima (2) Focus = Target - SetX = 3,408 - SetY = 3,62 - SetX = 10,440 - SetY = 10,110 - SetX = 11,320 + SetFrame = 3,4 + SetX = 3,24 + SetY = 3,-34 + SetZ = 3,29 + SetFrame = 4,3 + SetFrame = 5,2 + SetFrame = 6,1 + SetFrame = 7,0 + SetFrame = 8,1 + SetFrame = 9,2 + SetFrame = 10,0 + SetX = 10,56 + SetY = 10,14 + SetFrame = 11,2 + SetX = 11,-64 + SetFrame = 12,3 SetFlip = 12,true - SetX = 12,352 - SetY = 12,126 + SetX = 12,-32 + SetY = 12,30 + SetFrame = 13,4 SetOpacity = 13,150 + SetVisible = 14,false Graphic = Anima (2) Focus = Target + SetFrame = 3,4 SetFlip = 3,true - SetX = 3,352 - SetY = 3,126 + SetX = 3,-32 + SetY = 3,30 + SetZ = 3,30 SetFlip = 4,false - SetX = 4,440 - SetY = 4,110 + SetX = 4,56 + SetY = 4,14 + SetFrame = 5,3 + SetFrame = 6,2 + SetFrame = 7,1 + SetFrame = 8,0 SetFlip = 9,true SetZoomX = 9,125 SetZoomY = 9,125 + SetFrame = 10,1 SetFlip = 10,false - SetX = 10,320 + SetX = 10,-64 SetZoomX = 10,100 SetZoomY = 10,100 + SetFrame = 11,2 SetFlip = 11,true - SetX = 11,352 - SetY = 11,126 + SetX = 11,-32 + SetY = 11,30 + SetVisible = 12,false Graphic = Anima (2) Focus = Target + SetFrame = 4,3 SetFlip = 4,true - SetX = 4,352 - SetY = 4,126 + SetX = 4,-32 + SetY = 4,30 + SetZ = 4,31 + SetFrame = 5,4 SetFlip = 5,false - SetX = 5,320 - SetY = 5,110 + SetX = 5,-64 + SetY = 5,14 + SetFrame = 6,3 + SetFrame = 7,2 + SetFrame = 8,1 + SetFrame = 9,0 + SetFrame = 10,1 SetFlip = 10,true - SetX = 10,352 - SetY = 10,126 + SetX = 10,-32 + SetY = 10,30 + SetVisible = 11,false Graphic = Anima (2) Focus = Target + SetFrame = 5,2 SetFlip = 5,true - SetX = 5,352 - SetY = 5,126 + SetX = 5,-32 + SetY = 5,30 + SetZ = 5,32 + SetFrame = 6,1 + SetFrame = 7,0 SetFlip = 8,false SetZoomX = 8,125 SetZoomY = 8,125 SetFlip = 9,true SetZoomX = 9,100 SetZoomY = 9,100 + SetVisible = 10,false Play = 0,Wind8,80 diff --git a/PBS/Animations/Converted/Move/SPIDERWEB.txt b/PBS/Animations/Converted/Move/SPIDERWEB.txt index 3dc30beeb..bedec3bad 100644 --- a/PBS/Animations/Converted/Move/SPIDERWEB.txt +++ b/PBS/Animations/Converted/Move/SPIDERWEB.txt @@ -3,59 +3,66 @@ [Move,SPIDERWEB] Name = SPIDERWEB - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ghost2 Focus = UserAndTarget + SetFrame = 3,12 SetFlip = 3,true - SetX = 3,358 - SetY = 3,98 + SetX = 3,179 + SetY = 3,-196 + SetZ = 3,28 SetOpacity = 3,20 + SetFrame = 4,13 SetFlip = 4,false - SetX = 4,281 - SetY = 4,142 + SetX = 4,119 + SetY = 4,-128 SetZoomX = 4,110 SetZoomY = 4,110 SetAngle = 4,330 SetOpacity = 4,255 - SetX = 5,288 + SetX = 5,125 SetZoomX = 5,100 SetZoomY = 5,100 - SetX = 6,307 - SetY = 6,129 + SetX = 6,139 + SetY = 6,-148 SetZoomX = 6,75 SetZoomY = 6,75 - SetX = 7,320 - SetY = 7,123 + SetX = 7,150 + SetY = 7,-157 SetZoomX = 7,50 SetZoomY = 7,50 + SetVisible = 8,false Graphic = ghost2 Focus = UserAndTarget - SetX = 0,192 - SetY = 0,205 + SetFrame = 0,13 + SetX = 0,50 + SetY = 0,-29 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 SetAngle = 0,330 - SetX = 1,204 - SetY = 1,192 + SetX = 1,59 + SetY = 1,-50 SetZoomX = 1,75 SetZoomY = 1,75 - SetX = 2,217 - SetY = 2,179 + SetX = 2,69 + SetY = 2,-70 SetZoomX = 2,100 SetZoomY = 2,100 - SetX = 3,249 - SetY = 3,161 + SetX = 3,94 + SetY = 3,-98 SetZoomX = 3,110 SetZoomY = 3,110 + SetFrame = 4,12 SetFlip = 4,true - SetX = 4,358 - SetY = 4,98 + SetX = 4,179 + SetY = 4,-196 SetZoomX = 4,100 SetZoomY = 4,100 SetAngle = 4,0 diff --git a/PBS/Animations/Converted/Move/SPIKECANNON.txt b/PBS/Animations/Converted/Move/SPIKECANNON.txt index 169ff8179..b2f42d538 100644 --- a/PBS/Animations/Converted/Move/SPIKECANNON.txt +++ b/PBS/Animations/Converted/Move/SPIKECANNON.txt @@ -3,68 +3,77 @@ [Move,SPIKECANNON] Name = SPIKECANNON - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 0,147 - SetY = 0,211 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,135 - SetX = 3,358 - SetY = 3,110 - SetY = 4,104 - SetX = 5,364 - SetY = 5,123 + SetX = 0,14 + SetY = 0,-20 + SetZ = 0,27 + SetX = 1,69 + SetY = 1,-70 + SetX = 2,129 + SetY = 2,-139 + SetX = 3,179 + SetY = 3,-178 + SetY = 4,-187 + SetX = 5,184 + SetY = 5,-157 Graphic = poison3 Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,262 - SetY = 3,142 - SetX = 4,345 - SetY = 4,148 - SetX = 5,320 - SetY = 5,104 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,104 + SetY = 3,-128 + SetX = 4,169 + SetY = 4,-118 + SetX = 5,150 + SetY = 5,-187 Graphic = poison3 Focus = UserAndTarget - SetX = 2,217 - SetY = 2,205 - SetX = 3,268 - SetY = 3,179 - SetX = 4,281 - SetY = 4,129 - SetX = 5,371 - SetY = 5,110 + SetX = 2,69 + SetY = 2,-29 + SetZ = 2,29 + SetX = 3,109 + SetY = 3,-70 + SetX = 4,119 + SetY = 4,-148 + SetFrame = 5,14 + SetX = 5,189 + SetY = 5,-178 SetOpacity = 5,50 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,192 - SetX = 3,198 - SetY = 3,167 - SetX = 4,371 - SetY = 4,85 + SetX = 2,19 + SetY = 2,-50 + SetZ = 2,30 + SetX = 3,54 + SetY = 3,-89 + SetFrame = 4,14 + SetX = 4,189 + SetY = 4,-217 SetOpacity = 4,50 - SetX = 5,332 - SetY = 5,91 + SetX = 5,159 + SetY = 5,-207 Graphic = poison3 Focus = UserAndTarget - SetX = 3,364 - SetY = 3,98 + SetFrame = 3,14 + SetX = 3,184 + SetY = 3,-196 + SetZ = 3,31 SetOpacity = 3,50 + SetVisible = 4,false Play = 0,Slash10,80 Play = 2,Slash10,80 @@ -73,68 +82,77 @@ Name = SPIKECANNON [Move,SPIKECANNON,1] Name = Spike Cannon hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 3,364 - SetY = 3,98 + SetFrame = 3,14 + SetX = 3,184 + SetY = 3,-196 + SetZ = 3,31 SetOpacity = 3,50 + SetVisible = 4,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,147 - SetY = 0,211 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,135 - SetX = 3,358 - SetY = 3,110 - SetY = 4,104 - SetX = 5,364 - SetY = 5,123 + SetX = 0,14 + SetY = 0,-20 + SetZ = 0,27 + SetX = 1,69 + SetY = 1,-70 + SetX = 2,129 + SetY = 2,-139 + SetX = 3,179 + SetY = 3,-178 + SetY = 4,-187 + SetX = 5,184 + SetY = 5,-157 Graphic = poison3 Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,262 - SetY = 3,142 - SetX = 4,345 - SetY = 4,148 - SetX = 5,320 - SetY = 5,104 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,104 + SetY = 3,-128 + SetX = 4,169 + SetY = 4,-118 + SetX = 5,150 + SetY = 5,-187 Graphic = poison3 Focus = UserAndTarget - SetX = 2,217 - SetY = 2,205 - SetX = 3,268 - SetY = 3,179 - SetX = 4,281 - SetY = 4,129 - SetX = 5,371 - SetY = 5,110 + SetX = 2,69 + SetY = 2,-29 + SetZ = 2,29 + SetX = 3,109 + SetY = 3,-70 + SetX = 4,119 + SetY = 4,-148 + SetFrame = 5,14 + SetX = 5,189 + SetY = 5,-178 SetOpacity = 5,50 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,192 - SetX = 3,198 - SetY = 3,167 - SetX = 4,371 - SetY = 4,85 + SetX = 2,19 + SetY = 2,-50 + SetZ = 2,30 + SetX = 3,54 + SetY = 3,-89 + SetFrame = 4,14 + SetX = 4,189 + SetY = 4,-217 SetOpacity = 4,50 - SetX = 5,332 - SetY = 5,91 + SetX = 5,159 + SetY = 5,-207 Play = 0,Slash10,80 Play = 2,Slash10,80 @@ -143,67 +161,76 @@ Name = Spike Cannon hit 2 [Move,SPIKECANNON,2] Name = Spike Cannon hit 3 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,192 - SetX = 3,198 - SetY = 3,167 - SetX = 4,371 - SetY = 4,85 + SetX = 2,19 + SetY = 2,-50 + SetZ = 2,30 + SetX = 3,54 + SetY = 3,-89 + SetFrame = 4,14 + SetX = 4,189 + SetY = 4,-217 SetOpacity = 4,50 - SetX = 5,332 - SetY = 5,91 + SetX = 5,159 + SetY = 5,-207 Graphic = poison3 Focus = UserAndTarget - SetX = 3,364 - SetY = 3,98 + SetFrame = 3,14 + SetX = 3,184 + SetY = 3,-196 + SetZ = 3,31 SetOpacity = 3,50 + SetVisible = 4,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,147 - SetY = 0,211 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,135 - SetX = 3,358 - SetY = 3,110 - SetY = 4,104 - SetX = 5,364 - SetY = 5,123 + SetX = 0,14 + SetY = 0,-20 + SetZ = 0,27 + SetX = 1,69 + SetY = 1,-70 + SetX = 2,129 + SetY = 2,-139 + SetX = 3,179 + SetY = 3,-178 + SetY = 4,-187 + SetX = 5,184 + SetY = 5,-157 Graphic = poison3 Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,262 - SetY = 3,142 - SetX = 4,345 - SetY = 4,148 - SetX = 5,320 - SetY = 5,104 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,104 + SetY = 3,-128 + SetX = 4,169 + SetY = 4,-118 + SetX = 5,150 + SetY = 5,-187 Graphic = poison3 Focus = UserAndTarget - SetX = 2,217 - SetY = 2,205 - SetX = 3,268 - SetY = 3,179 - SetX = 4,281 - SetY = 4,129 - SetX = 5,371 - SetY = 5,110 + SetX = 2,69 + SetY = 2,-29 + SetZ = 2,29 + SetX = 3,109 + SetY = 3,-70 + SetX = 4,119 + SetY = 4,-148 + SetFrame = 5,14 + SetX = 5,189 + SetY = 5,-178 SetOpacity = 5,50 Play = 0,Slash10,80 @@ -213,68 +240,77 @@ Name = Spike Cannon hit 3 [Move,SPIKECANNON,3] Name = Spike Cannon hit 4 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 2,217 - SetY = 2,205 - SetX = 3,268 - SetY = 3,179 - SetX = 4,281 - SetY = 4,129 - SetX = 5,371 - SetY = 5,110 + SetX = 2,69 + SetY = 2,-29 + SetZ = 2,29 + SetX = 3,109 + SetY = 3,-70 + SetX = 4,119 + SetY = 4,-148 + SetFrame = 5,14 + SetX = 5,189 + SetY = 5,-178 SetOpacity = 5,50 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,192 - SetX = 3,198 - SetY = 3,167 - SetX = 4,371 - SetY = 4,85 + SetX = 2,19 + SetY = 2,-50 + SetZ = 2,30 + SetX = 3,54 + SetY = 3,-89 + SetFrame = 4,14 + SetX = 4,189 + SetY = 4,-217 SetOpacity = 4,50 - SetX = 5,332 - SetY = 5,91 + SetX = 5,159 + SetY = 5,-207 Graphic = poison3 Focus = UserAndTarget - SetX = 3,364 - SetY = 3,98 + SetFrame = 3,14 + SetX = 3,184 + SetY = 3,-196 + SetZ = 3,31 SetOpacity = 3,50 + SetVisible = 4,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,147 - SetY = 0,211 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,135 - SetX = 3,358 - SetY = 3,110 - SetY = 4,104 - SetX = 5,364 - SetY = 5,123 + SetX = 0,14 + SetY = 0,-20 + SetZ = 0,27 + SetX = 1,69 + SetY = 1,-70 + SetX = 2,129 + SetY = 2,-139 + SetX = 3,179 + SetY = 3,-178 + SetY = 4,-187 + SetX = 5,184 + SetY = 5,-157 Graphic = poison3 Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,262 - SetY = 3,142 - SetX = 4,345 - SetY = 4,148 - SetX = 5,320 - SetY = 5,104 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,104 + SetY = 3,-128 + SetX = 4,169 + SetY = 4,-118 + SetX = 5,150 + SetY = 5,-187 Play = 0,Slash10,80 Play = 2,Slash10,80 @@ -283,68 +319,77 @@ Name = Spike Cannon hit 4 [Move,SPIKECANNON,4] Name = Spike Cannon hit 5 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 1,160 - SetY = 1,198 - SetX = 2,211 - SetY = 2,173 - SetX = 3,262 - SetY = 3,142 - SetX = 4,345 - SetY = 4,148 - SetX = 5,320 - SetY = 5,104 + SetX = 1,25 + SetY = 1,-40 + SetZ = 1,28 + SetX = 2,64 + SetY = 2,-79 + SetX = 3,104 + SetY = 3,-128 + SetX = 4,169 + SetY = 4,-118 + SetX = 5,150 + SetY = 5,-187 Graphic = poison3 Focus = UserAndTarget - SetX = 2,217 - SetY = 2,205 - SetX = 3,268 - SetY = 3,179 - SetX = 4,281 - SetY = 4,129 - SetX = 5,371 - SetY = 5,110 + SetX = 2,69 + SetY = 2,-29 + SetZ = 2,29 + SetX = 3,109 + SetY = 3,-70 + SetX = 4,119 + SetY = 4,-148 + SetFrame = 5,14 + SetX = 5,189 + SetY = 5,-178 SetOpacity = 5,50 Graphic = poison3 Focus = UserAndTarget - SetX = 2,153 - SetY = 2,192 - SetX = 3,198 - SetY = 3,167 - SetX = 4,371 - SetY = 4,85 + SetX = 2,19 + SetY = 2,-50 + SetZ = 2,30 + SetX = 3,54 + SetY = 3,-89 + SetFrame = 4,14 + SetX = 4,189 + SetY = 4,-217 SetOpacity = 4,50 - SetX = 5,332 - SetY = 5,91 + SetX = 5,159 + SetY = 5,-207 Graphic = poison3 Focus = UserAndTarget - SetX = 3,364 - SetY = 3,98 + SetFrame = 3,14 + SetX = 3,184 + SetY = 3,-196 + SetZ = 3,31 SetOpacity = 3,50 + SetVisible = 4,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,147 - SetY = 0,211 - SetX = 1,217 - SetY = 1,179 - SetX = 2,294 - SetY = 2,135 - SetX = 3,358 - SetY = 3,110 - SetY = 4,104 - SetX = 5,364 - SetY = 5,123 + SetX = 0,14 + SetY = 0,-20 + SetZ = 0,27 + SetX = 1,69 + SetY = 1,-70 + SetX = 2,129 + SetY = 2,-139 + SetX = 3,179 + SetY = 3,-178 + SetY = 4,-187 + SetX = 5,184 + SetY = 5,-157 Play = 0,Slash10,80 Play = 2,Slash10,80 diff --git a/PBS/Animations/Converted/Move/SPIKES.txt b/PBS/Animations/Converted/Move/SPIKES.txt index 08296e8c6..ae040a250 100644 --- a/PBS/Animations/Converted/Move/SPIKES.txt +++ b/PBS/Animations/Converted/Move/SPIKES.txt @@ -3,77 +3,83 @@ [Move,SPIKES] Name = SPIKES - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal2 Focus = UserAndTarget - SetX = 3,128 - SetY = 3,236 + SetFrame = 3,13 + SetX = 3,0 + SetY = 3,18 + SetZ = 3,28 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,153 - SetY = 4,154 - SetX = 5,185 - SetY = 5,110 - SetX = 6,128 - SetY = 6,230 - SetX = 7,147 - SetY = 7,148 - SetX = 8,371 - SetY = 8,66 - SetX = 9,409 - SetY = 9,129 - SetX = 10,307 - SetX = 12,358 - SetY = 12,110 - SetX = 13,307 - SetY = 13,129 + SetX = 4,19 + SetY = 4,-109 + SetX = 5,44 + SetY = 5,-178 + SetX = 6,0 + SetY = 6,9 + SetX = 7,14 + SetY = 7,-118 + SetX = 8,189 + SetY = 8,-246 + SetX = 9,219 + SetY = 9,-148 + SetX = 10,139 + SetX = 12,179 + SetY = 12,-178 + SetX = 13,139 + SetY = 13,-148 Graphic = normal2 Focus = UserAndTarget - SetX = 6,243 - SetY = 6,85 + SetFrame = 6,13 + SetX = 6,89 + SetY = 6,-217 + SetZ = 6,29 SetZoomX = 6,50 SetZoomY = 6,50 - SetX = 7,307 - SetY = 7,129 - SetX = 8,204 - SetY = 8,85 - SetX = 9,307 - SetY = 9,129 - SetX = 10,409 + SetX = 7,139 + SetY = 7,-148 + SetX = 8,59 + SetY = 8,-217 + SetX = 9,139 + SetY = 9,-148 + SetX = 10,219 Graphic = normal2 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,211 + SetFrame = 0,13 + SetX = 0,0 + SetY = 0,-20 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 - SetX = 1,140 - SetY = 1,161 - SetX = 2,166 - SetY = 2,116 - SetX = 3,211 - SetY = 3,85 - SetX = 4,268 - SetY = 4,91 - SetX = 5,307 - SetY = 5,129 - SetX = 7,288 - SetY = 7,60 - SetX = 8,307 - SetY = 8,129 - SetY = 9,47 - SetX = 10,358 - SetY = 10,110 - SetX = 12,307 - SetY = 12,129 - SetX = 13,358 - SetY = 13,110 + SetX = 1,9 + SetY = 1,-98 + SetX = 2,29 + SetY = 2,-168 + SetX = 3,64 + SetY = 3,-217 + SetX = 4,109 + SetY = 4,-207 + SetX = 5,139 + SetY = 5,-148 + SetX = 7,125 + SetY = 7,-256 + SetX = 8,139 + SetY = 8,-148 + SetY = 9,-276 + SetX = 10,179 + SetY = 10,-178 + SetX = 12,139 + SetY = 12,-148 + SetX = 13,179 + SetY = 13,-178 Play = 1,throw,80 Play = 5,Sword1,80 diff --git a/PBS/Animations/Converted/Move/SPLASH.txt b/PBS/Animations/Converted/Move/SPLASH.txt index 0866bc270..ba32815f3 100644 --- a/PBS/Animations/Converted/Move/SPLASH.txt +++ b/PBS/Animations/Converted/Move/SPLASH.txt @@ -3,64 +3,91 @@ [Move,SPLASH] Name = SPLASH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison2 Focus = User SetFlip = 1,true - SetX = 1,56 - SetY = 1,230 - SetX = 3,40 - SetY = 3,214 - SetX = 4,32 - SetY = 4,206 - SetX = 5,16 - SetY = 5,222 - SetFlip = 6,false - SetX = 6,240 - SetY = 6,206 - SetFlip = 7,true - SetX = 7,48 - SetX = 8,32 - SetY = 8,198 - SetX = 9,8 + SetX = 1,-72 + SetY = 1,6 + SetZ = 1,28 + SetVisible = 2,false Graphic = poison2 Focus = User - SetX = 2,200 - SetY = 2,222 - SetX = 4,208 - SetX = 5,224 - SetY = 5,214 + SetFrame = 2,1 + SetX = 2,72 + SetY = 2,-2 + SetZ = 2,29 + SetVisible = 3,false + + Graphic = poison2 + Focus = User + SetFrame = 3,1 + SetFlip = 3,true + SetX = 3,-88 + SetY = 3,-10 + SetZ = 3,28 + SetX = 4,-96 + SetY = 4,-18 + SetFrame = 5,2 + SetX = 5,-112 + SetY = 5,-2 + SetFrame = 6,1 + SetFlip = 6,false + SetX = 6,112 + SetY = 6,-18 + SetFrame = 7,0 + SetFlip = 7,true + SetX = 7,-80 + SetFrame = 8,1 + SetX = 8,-96 + SetY = 8,-26 + SetFrame = 9,2 + SetX = 9,-120 + + Graphic = poison2 + Focus = User + SetX = 4,80 + SetY = 4,-2 + SetZ = 4,29 + SetX = 5,96 + SetY = 5,-10 SetFlip = 6,true - SetX = 6,64 + SetX = 6,-64 + SetVisible = 7,false Graphic = poison2 Focus = User - SetX = 0,184 - SetY = 0,238 - SetX = 1,192 - SetY = 1,230 + SetX = 0,56 + SetY = 0,14 + SetZ = 0,27 + SetX = 1,64 + SetY = 1,6 SetFlip = 2,true - SetX = 2,48 - SetY = 2,222 + SetX = 2,-80 + SetY = 2,-2 + SetFrame = 3,1 SetFlip = 3,false - SetX = 3,208 - SetX = 4,224 - SetY = 4,230 - SetX = 5,232 - SetY = 5,238 + SetX = 3,80 + SetFrame = 4,2 + SetX = 4,96 + SetY = 4,6 + SetX = 5,104 + SetY = 5,14 SetFlip = 6,true - SetX = 6,8 + SetX = 6,-120 + SetFrame = 7,1 SetFlip = 7,false - SetX = 7,248 - SetY = 7,198 - SetX = 8,264 - SetX = 9,272 - SetY = 9,206 + SetX = 7,120 + SetY = 7,-26 + SetFrame = 8,2 + SetX = 8,136 + SetX = 9,144 + SetY = 9,-18 Play = 0,Water2,40,70 diff --git a/PBS/Animations/Converted/Move/SPORE.txt b/PBS/Animations/Converted/Move/SPORE.txt index 80ee659de..fd46bdff3 100644 --- a/PBS/Animations/Converted/Move/SPORE.txt +++ b/PBS/Animations/Converted/Move/SPORE.txt @@ -3,15 +3,30 @@ [Move,SPORE] Name = SPORE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Special5 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetVisible = 14,false Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/STEALTHROCK.txt b/PBS/Animations/Converted/Move/STEALTHROCK.txt index 47ec8d938..31a5ca617 100644 --- a/PBS/Animations/Converted/Move/STEALTHROCK.txt +++ b/PBS/Animations/Converted/Move/STEALTHROCK.txt @@ -3,161 +3,233 @@ [Move,STEALTHROCK] Name = STEALTHROCK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 0,5 SetX = 0,128 SetY = 0,224 + SetZ = 0,27 SetX = 1,150 SetY = 1,192 + SetFrame = 2,6 SetX = 2,180 SetY = 2,158 + SetFrame = 3,8 SetX = 3,208 SetY = 3,124 + SetFrame = 4,7 SetX = 4,248 SetY = 4,104 + SetFrame = 5,0 SetX = 5,290 SetY = 5,96 + SetFrame = 6,1 SetX = 6,336 SetY = 6,110 + SetFrame = 7,3 SetX = 7,370 SetY = 7,136 + SetFrame = 8,2 SetX = 8,384 SetY = 8,166 + SetFrame = 9,0 SetX = 9,290 SetY = 9,96 + SetFrame = 10,1 SetX = 10,336 SetY = 10,110 + SetFrame = 11,3 SetX = 11,370 SetY = 11,136 + SetFrame = 12,2 SetX = 12,384 SetY = 12,166 + SetFrame = 13,0 SetX = 13,290 SetY = 13,96 + SetFrame = 14,1 SetX = 14,336 SetY = 14,110 + SetFrame = 15,3 SetX = 15,370 SetY = 15,136 + SetFrame = 16,2 SetX = 16,384 SetY = 16,166 + SetFrame = 17,0 SetX = 17,290 SetY = 17,96 + SetFrame = 18,1 SetX = 18,336 SetY = 18,110 + SetFrame = 19,3 SetX = 19,370 SetY = 19,136 + SetFrame = 20,2 SetX = 20,384 SetY = 20,166 + SetFrame = 21,0 SetX = 21,323 SetY = 21,169 SetOpacity = 22,192 SetOpacity = 23,128 SetOpacity = 24,64 + SetFrame = 25,2 SetX = 25,288 SetY = 25,181 SetOpacity = 25,255 SetOpacity = 26,192 SetOpacity = 27,128 SetOpacity = 28,64 + SetVisible = 29,false Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 4,5 SetX = 4,128 SetY = 4,224 + SetZ = 4,28 SetX = 5,150 SetY = 5,192 + SetFrame = 6,6 SetX = 6,180 SetY = 6,158 + SetFrame = 7,8 SetX = 7,208 SetY = 7,124 + SetFrame = 8,7 SetX = 8,248 SetY = 8,104 + SetFrame = 9,5 SetX = 9,150 SetY = 9,192 + SetFrame = 10,6 SetX = 10,180 SetY = 10,158 + SetFrame = 11,8 SetX = 11,208 SetY = 11,124 + SetFrame = 12,7 SetX = 12,248 SetY = 12,104 + SetFrame = 13,5 SetX = 13,150 SetY = 13,192 + SetFrame = 14,6 SetX = 14,180 SetY = 14,158 + SetFrame = 15,8 SetX = 15,208 SetY = 15,124 + SetFrame = 16,7 SetX = 16,248 SetY = 16,104 + SetFrame = 17,1 SetX = 17,352 SetY = 17,186 + SetFrame = 18,2 SetX = 18,475 SetY = 18,175 SetOpacity = 18,192 + SetFrame = 19,1 SetX = 19,352 SetY = 19,186 SetOpacity = 19,128 + SetFrame = 20,2 SetX = 20,475 SetY = 20,175 SetOpacity = 20,64 + SetFrame = 21,3 SetX = 21,395 SetY = 21,190 SetOpacity = 21,255 SetOpacity = 22,192 SetOpacity = 23,128 SetOpacity = 24,64 + SetFrame = 25,1 SetX = 25,444 SetY = 25,176 SetOpacity = 25,255 SetOpacity = 26,192 SetOpacity = 27,128 SetOpacity = 28,64 + SetVisible = 29,false Graphic = Rock Tomb - Focus = Screen + Focus = Foreground SetX = 7,431 SetY = 7,188 + SetZ = 7,29 SetOpacity = 7,128 + SetFrame = 8,5 SetX = 8,128 SetY = 8,224 SetOpacity = 8,255 + SetFrame = 9,0 SetX = 9,431 SetY = 9,188 + SetFrame = 10,3 SetX = 10,295 SetY = 10,174 + SetFrame = 12,5 SetX = 12,128 SetY = 12,224 + SetFrame = 13,3 SetX = 13,295 SetY = 13,174 SetOpacity = 14,192 SetOpacity = 15,128 SetOpacity = 16,64 + SetFrame = 17,2 SetX = 17,475 SetY = 17,175 SetOpacity = 17,255 + SetFrame = 18,1 SetX = 18,352 SetY = 18,186 SetOpacity = 18,192 + SetFrame = 19,2 SetX = 19,475 SetY = 19,175 SetOpacity = 19,128 + SetFrame = 20,1 SetX = 20,352 SetY = 20,186 SetOpacity = 20,64 + SetFrame = 21,2 SetX = 21,288 SetY = 21,181 SetOpacity = 21,255 + SetVisible = 25,false Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 7,3 + SetX = 7,295 + SetY = 7,174 + SetZ = 7,31 + SetOpacity = 7,128 + SetFrame = 8,0 + SetX = 8,431 + SetY = 8,188 + SetOpacity = 8,192 + SetVisible = 9,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 8,3 SetX = 8,295 SetY = 8,174 + SetZ = 8,30 SetOpacity = 8,192 SetOpacity = 9,255 + SetFrame = 10,0 SetX = 10,431 SetY = 10,188 SetOpacity = 14,192 @@ -166,229 +238,333 @@ Name = STEALTHROCK SetX = 17,323 SetY = 17,169 SetOpacity = 17,255 + SetFrame = 21,1 SetX = 21,444 SetY = 21,176 - + SetVisible = 25,false + Graphic = Rock Tomb - Focus = Screen - SetX = 7,295 - SetY = 7,174 - SetOpacity = 7,128 - SetX = 8,431 - SetY = 8,188 - SetOpacity = 8,192 + Focus = Foreground + SetFrame = 11,1 SetX = 11,352 SetY = 11,186 + SetZ = 11,31 SetOpacity = 11,128 + SetFrame = 12,3 SetX = 12,295 SetY = 12,174 SetOpacity = 12,255 + SetFrame = 13,1 SetX = 13,352 SetY = 13,186 + SetFrame = 16,2 SetX = 16,475 SetY = 16,175 + SetFrame = 17,3 SetX = 17,395 SetY = 17,190 - + SetVisible = 21,false + Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 11,2 SetX = 11,475 SetY = 11,175 + SetZ = 11,32 SetOpacity = 11,128 SetOpacity = 12,192 SetOpacity = 13,255 + SetFrame = 16,1 SetX = 16,352 SetY = 16,186 + SetVisible = 17,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 12,1 + SetX = 12,352 + SetY = 12,186 + SetZ = 12,33 + SetOpacity = 12,192 + SetVisible = 13,false + + Graphic = Rock Tomb + Focus = Foreground + SetX = 15,323 + SetY = 15,169 + SetZ = 15,33 + SetOpacity = 15,128 + SetOpacity = 16,192 + SetVisible = 17,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 15,3 + SetX = 15,395 + SetY = 15,190 + SetZ = 15,34 + SetOpacity = 15,128 + SetOpacity = 16,192 + SetVisible = 17,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 19,1 SetX = 19,444 SetY = 19,176 + SetZ = 19,32 SetOpacity = 19,128 + SetFrame = 20,2 SetX = 20,288 SetY = 20,181 SetOpacity = 20,192 - + SetVisible = 21,false + Graphic = Rock Tomb - Focus = Screen - SetX = 12,352 - SetY = 12,186 - SetOpacity = 12,192 - SetX = 15,323 - SetY = 15,169 - SetOpacity = 15,128 - SetOpacity = 16,192 + Focus = Foreground + SetFrame = 19,2 SetX = 19,288 SetY = 19,181 + SetZ = 19,33 SetOpacity = 19,128 + SetFrame = 20,1 SetX = 20,444 SetY = 20,176 SetOpacity = 20,192 - - Graphic = Rock Tomb - Focus = Screen - SetX = 15,395 - SetY = 15,190 - SetOpacity = 15,128 - SetOpacity = 16,192 + SetVisible = 21,false Play = 0,Slam,80 #------------------------------- [OppMove,STEALTHROCK] Name = STEALTHROCK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 0,5 SetX = 0,376 SetY = 0,84 + SetZ = 0,27 SetX = 1,332 SetY = 1,72 + SetFrame = 2,6 SetX = 2,294 SetY = 2,62 + SetFrame = 3,8 SetX = 3,250 SetY = 3,74 + SetFrame = 4,7 SetX = 4,214 SetY = 4,104 + SetFrame = 5,0 SetX = 5,178 SetY = 5,142 + SetFrame = 6,1 SetX = 6,152 SetY = 6,178 + SetFrame = 7,3 SetX = 7,128 SetY = 7,224 + SetFrame = 8,2 SetX = 8,114 SetY = 8,274 + SetFrame = 9,0 SetX = 9,178 SetY = 9,142 + SetFrame = 10,1 SetX = 10,152 SetY = 10,178 + SetFrame = 11,3 SetX = 11,128 SetY = 11,224 + SetFrame = 12,2 SetX = 12,114 SetY = 12,274 + SetFrame = 13,0 SetX = 13,178 SetY = 13,142 + SetFrame = 14,1 SetX = 14,152 SetY = 14,178 + SetFrame = 15,3 SetX = 15,128 SetY = 15,224 + SetFrame = 16,2 SetX = 16,114 SetY = 16,274 + SetFrame = 17,0 SetX = 17,178 SetY = 17,142 + SetFrame = 18,1 SetX = 18,152 SetY = 18,178 + SetFrame = 19,3 SetX = 19,128 SetY = 19,224 + SetFrame = 20,2 SetX = 20,114 SetY = 20,274 + SetFrame = 21,0 SetX = 21,99 SetY = 21,265 SetOpacity = 22,192 SetOpacity = 23,128 SetOpacity = 24,64 + SetFrame = 25,2 SetX = 25,64 SetY = 25,277 SetOpacity = 25,255 SetOpacity = 26,192 SetOpacity = 27,128 SetOpacity = 28,64 + SetVisible = 29,false Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 4,5 SetX = 4,376 SetY = 4,84 + SetZ = 4,28 SetX = 5,332 SetY = 5,72 + SetFrame = 6,6 SetX = 6,294 SetY = 6,62 + SetFrame = 7,8 SetX = 7,250 SetY = 7,74 + SetFrame = 8,7 SetX = 8,214 SetY = 8,104 + SetFrame = 9,5 SetX = 9,332 SetY = 9,72 + SetFrame = 10,6 SetX = 10,294 SetY = 10,62 + SetFrame = 11,8 SetX = 11,250 SetY = 11,74 + SetFrame = 12,7 SetX = 12,214 SetY = 12,104 + SetFrame = 13,5 SetX = 13,332 SetY = 13,72 + SetFrame = 14,6 SetX = 14,294 SetY = 14,62 + SetFrame = 15,8 SetX = 15,250 SetY = 15,74 + SetFrame = 16,7 SetX = 16,214 SetY = 16,104 + SetFrame = 17,1 SetX = 17,128 SetY = 17,282 + SetFrame = 18,2 SetX = 18,251 SetY = 18,271 SetOpacity = 18,192 + SetFrame = 19,1 SetX = 19,128 SetY = 19,282 SetOpacity = 19,128 + SetFrame = 20,2 SetX = 20,251 SetY = 20,271 SetOpacity = 20,64 + SetFrame = 21,3 SetX = 21,171 SetY = 21,286 SetOpacity = 21,255 SetOpacity = 22,192 SetOpacity = 23,128 SetOpacity = 24,64 + SetFrame = 25,1 SetX = 25,220 SetY = 25,272 SetOpacity = 25,255 SetOpacity = 26,192 SetOpacity = 27,128 SetOpacity = 28,64 + SetVisible = 29,false Graphic = Rock Tomb - Focus = Screen + Focus = Foreground SetX = 7,207 SetY = 7,284 + SetZ = 7,29 SetOpacity = 7,128 + SetFrame = 8,5 SetX = 8,376 SetY = 8,84 SetOpacity = 8,255 + SetFrame = 9,0 SetX = 9,207 SetY = 9,284 + SetFrame = 10,3 SetX = 10,71 SetY = 10,270 + SetFrame = 12,5 SetX = 12,376 SetY = 12,84 + SetFrame = 13,3 SetX = 13,71 SetY = 13,270 SetOpacity = 14,192 SetOpacity = 15,128 SetOpacity = 16,64 + SetFrame = 17,2 SetX = 17,251 SetY = 17,271 SetOpacity = 17,255 + SetFrame = 18,1 SetX = 18,128 SetY = 18,282 SetOpacity = 18,192 + SetFrame = 19,2 SetX = 19,251 SetY = 19,271 SetOpacity = 19,128 + SetFrame = 20,1 SetX = 20,128 SetY = 20,282 SetOpacity = 20,64 + SetFrame = 21,2 SetX = 21,64 SetY = 21,277 SetOpacity = 21,255 + SetVisible = 25,false Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 7,3 + SetX = 7,71 + SetY = 7,270 + SetZ = 7,31 + SetOpacity = 7,128 + SetFrame = 8,0 + SetX = 8,207 + SetY = 8,284 + SetOpacity = 8,192 + SetVisible = 9,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 8,3 SetX = 8,71 SetY = 8,270 + SetZ = 8,30 SetOpacity = 8,192 SetOpacity = 9,255 + SetFrame = 10,0 SetX = 10,207 SetY = 10,284 SetOpacity = 14,192 @@ -397,67 +573,99 @@ Name = STEALTHROCK SetX = 17,99 SetY = 17,265 SetOpacity = 17,255 + SetFrame = 21,1 SetX = 21,220 SetY = 21,272 - + SetVisible = 25,false + Graphic = Rock Tomb - Focus = Screen - SetX = 7,71 - SetY = 7,270 - SetOpacity = 7,128 - SetX = 8,207 - SetY = 8,284 - SetOpacity = 8,192 + Focus = Foreground + SetFrame = 11,1 SetX = 11,128 SetY = 11,282 + SetZ = 11,31 SetOpacity = 11,128 + SetFrame = 12,3 SetX = 12,71 SetY = 12,270 SetOpacity = 12,255 + SetFrame = 13,1 SetX = 13,128 SetY = 13,282 + SetFrame = 16,2 SetX = 16,251 SetY = 16,271 + SetFrame = 17,3 SetX = 17,171 SetY = 17,286 - + SetVisible = 21,false + Graphic = Rock Tomb - Focus = Screen + Focus = Foreground + SetFrame = 11,2 SetX = 11,251 SetY = 11,271 + SetZ = 11,32 SetOpacity = 11,128 SetOpacity = 12,192 SetOpacity = 13,255 + SetFrame = 16,1 SetX = 16,128 SetY = 16,282 + SetVisible = 17,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 12,1 + SetX = 12,128 + SetY = 12,282 + SetZ = 12,33 + SetOpacity = 12,192 + SetVisible = 13,false + + Graphic = Rock Tomb + Focus = Foreground + SetX = 15,99 + SetY = 15,265 + SetZ = 15,33 + SetOpacity = 15,128 + SetOpacity = 16,192 + SetVisible = 17,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 15,3 + SetX = 15,171 + SetY = 15,286 + SetZ = 15,34 + SetOpacity = 15,128 + SetOpacity = 16,192 + SetVisible = 17,false + + Graphic = Rock Tomb + Focus = Foreground + SetFrame = 19,1 SetX = 19,220 SetY = 19,272 + SetZ = 19,32 SetOpacity = 19,128 + SetFrame = 20,2 SetX = 20,64 SetY = 20,277 SetOpacity = 20,192 - + SetVisible = 21,false + Graphic = Rock Tomb - Focus = Screen - SetX = 12,128 - SetY = 12,282 - SetOpacity = 12,192 - SetX = 15,99 - SetY = 15,265 - SetOpacity = 15,128 - SetOpacity = 16,192 + Focus = Foreground + SetFrame = 19,2 SetX = 19,64 SetY = 19,277 + SetZ = 19,33 SetOpacity = 19,128 + SetFrame = 20,1 SetX = 20,220 SetY = 20,272 SetOpacity = 20,192 - - Graphic = Rock Tomb - Focus = Screen - SetX = 15,171 - SetY = 15,286 - SetOpacity = 15,128 - SetOpacity = 16,192 + SetVisible = 21,false Play = 0,Slam,80 diff --git a/PBS/Animations/Converted/Move/STOMP.txt b/PBS/Animations/Converted/Move/STOMP.txt index 33f89b95a..d9eb50ec9 100644 --- a/PBS/Animations/Converted/Move/STOMP.txt +++ b/PBS/Animations/Converted/Move/STOMP.txt @@ -3,19 +3,22 @@ [Move,STOMP] Name = STOMP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = normal1 Focus = Target - SetX = 0,384 - SetY = 0,-18 - SetY = 1,22 - SetY = 2,54 - SetY = 3,70 - SetY = 4,78 + SetFrame = 0,6 + SetX = 0,0 + SetY = 0,-114 + SetZ = 0,27 + SetY = 1,-74 + SetY = 2,-42 + SetY = 3,-26 + SetY = 4,-18 + SetVisible = 6,false Play = 2,Blow6,80 diff --git a/PBS/Animations/Converted/Move/STRINGSHOT.txt b/PBS/Animations/Converted/Move/STRINGSHOT.txt index 04d51c8bd..e8dfcebc7 100644 --- a/PBS/Animations/Converted/Move/STRINGSHOT.txt +++ b/PBS/Animations/Converted/Move/STRINGSHOT.txt @@ -3,34 +3,74 @@ [Move,STRINGSHOT] Name = STRINGSHOT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 + + Graphic = water3 + Focus = UserAndTarget + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetZoomX = 0,25 + SetZoomY = 0,25 + SetX = 1,64 + SetY = 1,-70 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetX = 2,129 + SetY = 2,-148 + SetZoomX = 2,75 + SetZoomY = 2,75 + SetVisible = 3,false Graphic = water3 - Focus = Target - SetX = 1,128 - SetY = 1,236 + Focus = UserAndTarget + SetX = 1,0 + SetY = 1,18 + SetZ = 1,28 SetZoomX = 1,25 SetZoomY = 1,25 - SetX = 2,211 - SetY = 2,179 + SetX = 2,64 + SetY = 2,-70 SetZoomX = 2,50 SetZoomY = 2,50 - SetX = 3,281 - SetY = 3,142 + SetX = 3,119 + SetY = 3,-128 SetZoomX = 3,75 SetZoomY = 3,75 - SetX = 4,382 - SetY = 4,135 - SetZoomX = 4,100 - SetZoomY = 4,100 + SetVisible = 4,false + + Graphic = water3 + Focus = UserAndTarget + SetX = 2,0 + SetY = 2,18 + SetZ = 2,29 + SetZoomX = 2,25 + SetZoomY = 2,25 + SetX = 3,59 + SetY = 3,-59 + SetZoomX = 3,50 + SetZoomY = 3,50 + SetX = 4,119 + SetY = 4,-98 + SetZoomX = 4,75 + SetZoomY = 4,75 + SetVisible = 5,false + + Graphic = water3 + Focus = Target + SetX = 3,-2 + SetY = 3,14 + SetZ = 3,27 + SetZoomX = 4,95 + SetZoomY = 4,95 SetZoomX = 5,90 SetZoomY = 5,90 - SetX = 6,382 - SetY = 6,135 + SetX = 6,-2 + SetY = 6,14 SetZoomX = 7,95 SetZoomY = 7,95 SetZoomX = 8,100 @@ -44,24 +84,35 @@ Name = STRINGSHOT SetZoomX = 14,100 SetZoomY = 14,100 SetOpacity = 15,100 - + Graphic = water3 Focus = Target - SetX = 2,128 - SetY = 2,236 - SetZoomX = 2,25 - SetZoomY = 2,25 - SetX = 3,204 - SetY = 3,186 - SetZoomX = 3,50 - SetZoomY = 3,50 - SetX = 4,281 - SetY = 4,161 - SetZoomX = 4,75 - SetZoomY = 4,75 - SetX = 5,382 - SetZoomX = 5,100 - SetZoomY = 5,100 + SetX = 4,-2 + SetY = 4,39 + SetZ = 4,28 + SetZoomX = 5,90 + SetZoomY = 5,90 + SetX = 6,-2 + SetY = 6,39 + SetZoomX = 7,95 + SetZoomY = 7,95 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetZoomX = 10,95 + SetZoomY = 10,95 + SetZoomX = 11,90 + SetZoomY = 11,90 + SetZoomX = 13,95 + SetZoomY = 13,95 + SetZoomX = 14,100 + SetZoomY = 14,100 + SetOpacity = 15,100 + + Graphic = water3 + Focus = Target + SetX = 5,-2 + SetY = 5,65 + SetZ = 5,29 SetZoomX = 6,96 SetZoomY = 6,96 SetZoomX = 7,100 @@ -75,44 +126,6 @@ Name = STRINGSHOT SetZoomX = 14,100 SetZoomY = 14,100 SetOpacity = 15,100 - - Graphic = water3 - Focus = Target - SetX = 0,128 - SetY = 0,236 - SetZoomX = 0,25 - SetZoomY = 0,25 - SetX = 1,211 - SetY = 1,179 - SetZoomX = 1,50 - SetZoomY = 1,50 - SetX = 2,294 - SetY = 2,129 - SetZoomX = 2,75 - SetZoomY = 2,75 - SetX = 3,382 - SetY = 3,110 - SetZoomX = 3,100 - SetZoomY = 3,100 - SetZoomX = 4,95 - SetZoomY = 4,95 - SetZoomX = 5,90 - SetZoomY = 5,90 - SetX = 6,382 - SetY = 6,110 - SetZoomX = 7,95 - SetZoomY = 7,95 - SetZoomX = 8,100 - SetZoomY = 8,100 - SetZoomX = 10,95 - SetZoomY = 10,95 - SetZoomX = 11,90 - SetZoomY = 11,90 - SetZoomX = 13,95 - SetZoomY = 13,95 - SetZoomX = 14,100 - SetZoomY = 14,100 - SetOpacity = 15,100 Play = 0,throw,80 Play = 0,Battle1,80 diff --git a/PBS/Animations/Converted/Move/STRUGGLE.txt b/PBS/Animations/Converted/Move/STRUGGLE.txt index 29db02205..c2de19fc4 100644 --- a/PBS/Animations/Converted/Move/STRUGGLE.txt +++ b/PBS/Animations/Converted/Move/STRUGGLE.txt @@ -3,51 +3,60 @@ [Move,STRUGGLE] Name = STRUGGLE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Struggle Focus = User - SetX = 0,168 - SetY = 0,230 - SetX = 1,176 - SetY = 1,238 - SetY = 2,222 + SetFrame = 0,1 + SetX = 0,40 + SetY = 0,6 + SetZ = 0,28 + SetX = 1,48 + SetY = 1,14 + SetY = 2,-2 + SetFrame = 3,0 SetFlip = 3,true - SetY = 3,238 - SetX = 4,184 - SetY = 4,222 + SetY = 3,14 + SetX = 4,56 + SetY = 4,-2 + SetFrame = 5,1 SetFlip = 5,false - SetX = 5,176 - SetY = 5,230 - SetY = 6,214 - SetX = 7,168 - SetY = 7,230 - SetX = 8,80 - SetY = 8,206 - SetX = 9,72 - SetY = 9,238 + SetX = 5,48 + SetY = 5,6 + SetY = 6,-10 + SetX = 7,40 + SetY = 7,6 + SetFrame = 8,0 + SetX = 8,-48 + SetY = 8,-18 + SetX = 9,-56 + SetY = 9,14 Graphic = Struggle Focus = User - SetX = 0,88 - SetY = 0,230 - SetY = 1,246 - SetX = 2,96 - SetY = 2,230 + SetX = 0,-40 + SetY = 0,6 + SetZ = 0,27 + SetY = 1,22 + SetX = 2,-32 + SetY = 2,6 + SetFrame = 3,1 SetFlip = 3,true - SetY = 3,222 - SetX = 4,88 - SetY = 4,238 + SetY = 3,-2 + SetX = 4,-40 + SetY = 4,14 + SetFrame = 5,0 SetFlip = 5,false - SetY = 5,222 - SetX = 6,96 - SetY = 6,206 - SetX = 7,80 - SetY = 7,230 - SetX = 8,168 - SetY = 8,214 - SetY = 9,230 + SetY = 5,-2 + SetX = 6,-32 + SetY = 6,-18 + SetX = 7,-48 + SetY = 7,6 + SetFrame = 8,1 + SetX = 8,40 + SetY = 8,-10 + SetY = 9,6 diff --git a/PBS/Animations/Converted/Move/STUNSPORE.txt b/PBS/Animations/Converted/Move/STUNSPORE.txt index 553eafd01..c3c3c32d7 100644 --- a/PBS/Animations/Converted/Move/STUNSPORE.txt +++ b/PBS/Animations/Converted/Move/STUNSPORE.txt @@ -3,15 +3,30 @@ [Move,STUNSPORE] Name = STUNSPORE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Special5 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetVisible = 14,false Play = 0,Sand,80 diff --git a/PBS/Animations/Converted/Move/SUNNYDAY.txt b/PBS/Animations/Converted/Move/SUNNYDAY.txt index 758ce8b0c..7d4debf66 100644 --- a/PBS/Animations/Converted/Move/SUNNYDAY.txt +++ b/PBS/Animations/Converted/Move/SUNNYDAY.txt @@ -3,16 +3,17 @@ [Move,SUNNYDAY] Name = SUNNYDAY - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - + SetX = 0,0 + SetY = 0,0 + Graphic = weather - Focus = Screen + Focus = Foreground SetX = 0,64 SetY = 0,64 + SetZ = 0,28 SetOpacity = 0,64 SetX = 1,72 SetY = 1,72 diff --git a/PBS/Animations/Converted/Move/SUPERSONIC.txt b/PBS/Animations/Converted/Move/SUPERSONIC.txt index fe43debf8..f21a81aa3 100644 --- a/PBS/Animations/Converted/Move/SUPERSONIC.txt +++ b/PBS/Animations/Converted/Move/SUPERSONIC.txt @@ -3,95 +3,110 @@ [Move,SUPERSONIC] Name = SUPERSONIC - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Struggle Focus = UserAndTarget - SetX = 2,147 - SetY = 2,224 + SetFrame = 2,1 + SetX = 2,14 + SetY = 2,0 + SetZ = 2,28 SetAngle = 2,20 - SetX = 3,166 - SetY = 3,205 + SetX = 3,29 + SetY = 3,-29 SetZoomX = 3,120 SetZoomY = 3,120 - SetX = 4,204 - SetY = 4,179 + SetX = 4,59 + SetY = 4,-70 SetZoomX = 4,130 SetZoomY = 4,130 - SetX = 5,224 - SetY = 5,173 + SetX = 5,75 + SetY = 5,-79 SetZoomX = 5,120 SetZoomY = 5,120 - SetX = 6,204 - SetY = 6,186 - SetX = 7,236 - SetY = 7,161 + SetX = 6,59 + SetY = 6,-59 + SetX = 7,84 + SetY = 7,-98 SetZoomX = 7,130 SetZoomY = 7,130 - SetX = 8,243 - SetY = 8,167 + SetX = 8,89 + SetY = 8,-89 SetZoomX = 8,120 SetZoomY = 8,120 - SetX = 9,230 - SetX = 10,236 - SetY = 10,179 + SetX = 9,79 + SetX = 10,84 + SetY = 10,-70 SetZoomX = 10,130 SetZoomY = 10,130 + SetVisible = 11,false Graphic = Struggle Focus = UserAndTarget - SetX = 4,160 - SetY = 4,211 + SetFrame = 4,1 + SetX = 4,25 + SetY = 4,-20 + SetZ = 4,29 SetAngle = 4,20 - SetX = 5,172 - SetY = 5,205 - SetX = 7,185 - SetY = 7,192 - SetX = 8,192 - SetY = 8,198 + SetX = 5,34 + SetY = 5,-29 + SetVisible = 6,false + + Graphic = Struggle + Focus = UserAndTarget + SetFrame = 7,1 + SetX = 7,44 + SetY = 7,-50 + SetZ = 7,29 + SetAngle = 7,20 + SetX = 8,50 + SetY = 8,-40 + SetVisible = 9,false Graphic = Struggle Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 + SetFrame = 0,1 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 SetAngle = 1,20 - SetX = 2,172 - SetY = 2,205 + SetX = 2,34 + SetY = 2,-29 SetZoomX = 2,120 SetZoomY = 2,120 - SetX = 3,211 - SetY = 3,179 + SetX = 3,64 + SetY = 3,-70 SetZoomX = 3,130 SetZoomY = 3,130 - SetX = 4,256 - SetY = 4,154 + SetX = 4,100 + SetY = 4,-109 SetZoomX = 4,150 SetZoomY = 4,150 - SetX = 5,281 - SetY = 5,142 - SetX = 6,256 - SetY = 6,154 + SetX = 5,119 + SetY = 5,-128 + SetX = 6,100 + SetY = 6,-109 SetZoomX = 6,130 SetZoomY = 6,130 - SetX = 7,294 - SetY = 7,135 + SetX = 7,129 + SetY = 7,-139 SetZoomX = 7,150 SetZoomY = 7,150 - SetX = 8,300 - SetX = 9,294 + SetX = 8,134 + SetX = 9,129 SetZoomX = 9,130 SetZoomY = 9,130 - SetY = 10,142 + SetY = 10,-128 SetZoomX = 10,150 SetZoomY = 10,150 - SetX = 11,275 - SetY = 11,161 - SetX = 12,358 - SetY = 12,110 + SetX = 11,114 + SetY = 11,-98 + SetX = 12,179 + SetY = 12,-178 SetZoomX = 12,100 SetZoomY = 12,100 SetAngle = 12,0 diff --git a/PBS/Animations/Converted/Move/SWAGGER.txt b/PBS/Animations/Converted/Move/SWAGGER.txt index 5a2c22d8d..75e791a30 100644 --- a/PBS/Animations/Converted/Move/SWAGGER.txt +++ b/PBS/Animations/Converted/Move/SWAGGER.txt @@ -3,40 +3,42 @@ [Move,SWAGGER] Name = SWAGGER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = mixed status Focus = Target - SetX = 4,405 - SetY = 4,40 - SetX = 5,402 - SetY = 5,38 - SetX = 6,372 - SetY = 6,68 - SetX = 7,374 - SetY = 7,72 - SetX = 8,433 - SetY = 8,66 - SetX = 9,427 - SetY = 9,63 - SetX = 10,361 - SetY = 10,46 - SetX = 11,362 - SetX = 12,407 - SetY = 12,59 - SetX = 13,405 - SetY = 13,55 - SetX = 14,367 - SetY = 14,69 - SetX = 15,374 - SetY = 15,72 - SetX = 16,409 - SetY = 16,65 - SetX = 17,411 - SetY = 17,61 + SetFrame = 4,4 + SetX = 4,21 + SetY = 4,-56 + SetZ = 4,27 + SetX = 5,18 + SetY = 5,-58 + SetX = 6,-12 + SetY = 6,-28 + SetX = 7,-10 + SetY = 7,-24 + SetX = 8,49 + SetY = 8,-30 + SetX = 9,43 + SetY = 9,-33 + SetX = 10,-23 + SetY = 10,-50 + SetX = 11,-22 + SetX = 12,23 + SetY = 12,-37 + SetX = 13,21 + SetY = 13,-41 + SetX = 14,-17 + SetY = 14,-27 + SetX = 15,-10 + SetY = 15,-24 + SetX = 16,25 + SetY = 16,-31 + SetX = 17,27 + SetY = 17,-35 Play = 0,Swagger diff --git a/PBS/Animations/Converted/Move/SWEETKISS.txt b/PBS/Animations/Converted/Move/SWEETKISS.txt index 2a31daba9..549d4aa96 100644 --- a/PBS/Animations/Converted/Move/SWEETKISS.txt +++ b/PBS/Animations/Converted/Move/SWEETKISS.txt @@ -3,70 +3,81 @@ [Move,SWEETKISS] Name = SWEETKISS - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = electric2 Focus = Target - SetX = 8,368 - SetY = 8,54 - SetX = 9,376 - SetY = 9,46 - SetX = 10,384 - SetY = 10,38 - SetY = 11,30 + SetFrame = 8,9 + SetX = 8,-16 + SetY = 8,-42 + SetZ = 8,28 + SetX = 9,-8 + SetY = 9,-50 + SetFrame = 10,10 + SetX = 10,0 + SetY = 10,-58 + SetY = 11,-66 + SetFrame = 12,8 SetFlip = 12,true - SetX = 12,296 - SetY = 12,46 + SetX = 12,-88 + SetY = 12,-50 SetZoomX = 12,75 SetZoomY = 12,75 + SetVisible = 18,false Graphic = electric2 Focus = Target - SetX = 0,440 - SetY = 0,134 + SetFrame = 0,8 + SetX = 0,56 + SetY = 0,38 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 SetOpacity = 0,100 - SetX = 1,416 - SetY = 1,118 + SetX = 1,32 + SetY = 1,22 SetZoomX = 1,75 SetZoomY = 1,75 SetOpacity = 1,200 - SetX = 2,384 - SetY = 2,110 + SetX = 2,0 + SetY = 2,14 SetOpacity = 2,255 - SetX = 3,368 - SetY = 3,102 - SetX = 4,352 - SetY = 4,86 - SetX = 5,328 - SetY = 5,62 - SetX = 6,312 - SetY = 6,54 - SetX = 7,304 + SetX = 3,-16 + SetY = 3,6 + SetX = 4,-32 + SetY = 4,-10 + SetX = 5,-56 + SetY = 5,-34 + SetX = 6,-72 + SetY = 6,-42 + SetX = 7,-80 SetFlip = 8,true - SetX = 8,296 - SetY = 8,46 + SetX = 8,-88 + SetY = 8,-50 + SetFrame = 12,11 SetFlip = 12,false - SetX = 12,376 - SetY = 12,22 + SetX = 12,-8 + SetY = 12,-74 SetZoomX = 12,100 SetZoomY = 12,100 - SetX = 13,368 - SetY = 13,14 - SetY = 14,6 - SetX = 15,376 - SetY = 15,-2 - SetX = 16,384 - SetY = 16,-10 - SetY = 17,-18 + SetX = 13,-16 + SetY = 13,-82 + SetFrame = 14,12 + SetY = 14,-90 + SetX = 15,-8 + SetY = 15,-98 + SetFrame = 16,13 + SetX = 16,0 + SetY = 16,-106 + SetY = 17,-114 + SetFrame = 18,8 SetFlip = 18,true - SetX = 18,296 - SetY = 18,46 + SetX = 18,-88 + SetY = 18,-50 SetZoomX = 18,75 SetZoomY = 18,75 diff --git a/PBS/Animations/Converted/Move/SWIFT.txt b/PBS/Animations/Converted/Move/SWIFT.txt index fe5cb491e..cb646fce1 100644 --- a/PBS/Animations/Converted/Move/SWIFT.txt +++ b/PBS/Animations/Converted/Move/SWIFT.txt @@ -3,107 +3,141 @@ [Move,SWIFT] Name = SWIFT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 007-Weapon02 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,236 - SetX = 1,179 - SetY = 1,211 - SetX = 2,217 - SetY = 2,186 - SetX = 3,288 - SetY = 3,142 - SetX = 4,358 - SetY = 4,110 - SetX = 5,256 - SetY = 5,116 - SetX = 6,288 - SetY = 6,98 - SetX = 7,352 - SetY = 7,79 - SetX = 8,288 - SetY = 8,91 - SetX = 9,307 - SetY = 9,135 - SetX = 10,358 - SetY = 10,104 + SetFrame = 0,11 + SetX = 0,0 + SetY = 0,18 + SetZ = 0,27 + SetX = 1,39 + SetY = 1,-20 + SetX = 2,69 + SetY = 2,-59 + SetX = 3,125 + SetY = 3,-128 + SetX = 4,179 + SetY = 4,-178 + SetFrame = 5,13 + SetX = 5,100 + SetY = 5,-168 + SetX = 6,125 + SetY = 6,-196 + SetFrame = 7,11 + SetX = 7,175 + SetY = 7,-226 + SetX = 8,125 + SetY = 8,-207 + SetFrame = 9,13 + SetX = 9,139 + SetY = 9,-139 + SetX = 10,179 + SetY = 10,-187 + SetFrame = 11,12 Graphic = 007-Weapon02 Focus = UserAndTarget - SetX = 1,128 - SetY = 1,236 - SetX = 2,172 - SetY = 2,211 - SetX = 3,236 - SetY = 3,173 - SetX = 4,288 - SetY = 4,135 - SetX = 5,339 - SetY = 5,110 - SetX = 6,300 - SetY = 6,135 - SetX = 7,294 - SetY = 7,85 - SetX = 8,332 - SetY = 8,110 - SetX = 9,262 - SetY = 9,148 - SetX = 10,313 - SetY = 10,123 + SetFrame = 1,12 + SetX = 1,0 + SetY = 1,18 + SetZ = 1,28 + SetX = 2,34 + SetY = 2,-20 + SetX = 3,84 + SetY = 3,-79 + SetX = 4,125 + SetY = 4,-139 + SetX = 5,164 + SetY = 5,-178 + SetFrame = 6,11 + SetX = 6,134 + SetY = 6,-139 + SetX = 7,129 + SetY = 7,-217 + SetFrame = 8,12 + SetX = 8,159 + SetY = 8,-178 + SetX = 9,104 + SetY = 9,-118 + SetX = 10,144 + SetY = 10,-157 + SetVisible = 11,false Graphic = 007-Weapon02 Focus = UserAndTarget - SetX = 2,128 - SetY = 2,217 - SetX = 3,179 - SetY = 3,179 - SetX = 4,224 - SetY = 4,148 - SetX = 5,256 - SetY = 5,186 - SetX = 6,236 - SetY = 6,135 - SetX = 7,288 - SetY = 7,142 - SetX = 8,262 - SetY = 8,167 + SetFrame = 2,13 + SetX = 2,0 + SetY = 2,-10 + SetZ = 2,29 + SetX = 3,39 + SetY = 3,-70 + SetX = 4,75 + SetY = 4,-118 + SetFrame = 5,11 + SetX = 5,100 + SetY = 5,-59 + SetX = 6,84 + SetY = 6,-139 + SetFrame = 7,12 + SetX = 7,125 + SetY = 7,-128 + SetFrame = 8,13 + SetX = 8,104 + SetY = 8,-89 + SetVisible = 9,false Graphic = 007-Weapon02 Focus = UserAndTarget - SetX = 3,192 - SetY = 3,224 - SetX = 4,224 - SetY = 4,205 - SetX = 5,172 - SetY = 5,161 - SetX = 6,230 - SetY = 6,173 - SetX = 7,217 - SetY = 7,186 - SetX = 8,204 + SetFrame = 3,11 + SetX = 3,50 + SetY = 3,0 + SetZ = 3,30 + SetX = 4,75 + SetY = 4,-29 + SetX = 5,34 + SetY = 5,-98 + SetFrame = 6,12 + SetX = 6,79 + SetY = 6,-79 + SetFrame = 7,13 + SetX = 7,69 + SetY = 7,-59 + SetFrame = 8,12 + SetX = 8,59 + SetVisible = 9,false Graphic = 007-Weapon02 Focus = UserAndTarget - SetX = 3,115 - SetY = 3,205 - SetX = 4,147 - SetY = 4,179 - SetX = 5,179 - SetY = 5,205 - SetX = 6,185 - SetY = 6,211 - SetX = 7,166 + SetFrame = 3,11 + SetX = 3,-10 + SetY = 3,-29 + SetZ = 3,31 + SetX = 4,14 + SetY = 4,-70 + SetFrame = 5,12 + SetX = 5,39 + SetY = 5,-29 + SetFrame = 6,13 + SetX = 6,44 + SetY = 6,-20 + SetFrame = 7,12 + SetX = 7,29 + SetVisible = 8,false Graphic = 007-Weapon02 Focus = UserAndTarget - SetX = 4,128 - SetY = 4,242 + SetFrame = 4,12 + SetX = 4,0 + SetY = 4,28 + SetZ = 4,32 + SetFrame = 5,13 + SetFrame = 6,12 + SetVisible = 7,false Play = 0,Saint3,80 Play = 2,Saint3,80 diff --git a/PBS/Animations/Converted/Move/SWORDSDANCE.txt b/PBS/Animations/Converted/Move/SWORDSDANCE.txt index 32733332e..d4bbee088 100644 --- a/PBS/Animations/Converted/Move/SWORDSDANCE.txt +++ b/PBS/Animations/Converted/Move/SWORDSDANCE.txt @@ -3,95 +3,127 @@ [Move,SWORDSDANCE] Name = SWORDSDANCE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 - - Graphic = fly copy - Focus = Target - SetX = 0,436 - SetY = 0,219 - SetX = 1,434 - SetY = 1,177 - SetX = 2,348 - SetY = 2,150 - SetX = 3,350 - SetY = 3,81 - SetX = 4,435 - SetY = 4,32 - SetX = 5,341 - SetY = 5,107 - SetX = 6,369 - SetY = 6,127 - SetX = 7,403 - SetY = 7,81 - SetX = 8,383 - SetY = 8,117 - SetX = 9,317 - SetY = 9,129 - SetX = 10,331 - SetY = 10,98 - SetX = 11,332 - SetY = 11,45 - - Graphic = fly copy - Focus = Target - SetX = 1,393 - SetY = 1,4 - SetX = 2,435 - SetY = 2,155 - SetX = 3,427 - SetY = 3,75 - SetX = 4,396 - SetY = 4,162 - SetX = 5,382 - SetY = 5,103 - SetX = 6,393 - SetY = 6,113 - SetX = 8,361 - SetY = 8,123 - SetX = 9,435 - SetY = 9,106 - SetX = 10,304 - SetY = 10,82 - SetY = 11,40 - - Graphic = fly copy - Focus = Target - SetX = 4,458 - SetY = 4,119 - - Graphic = fly copy - Focus = Target - SetX = 4,303 - SetY = 4,111 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = Target - SetX = 0,343 - SetY = 0,215 - SetX = 1,341 - SetY = 1,177 - SetX = 2,391 - SetY = 2,58 - SetX = 3,384 - SetY = 3,133 - SetX = 4,362 - SetY = 4,35 - SetX = 5,424 - SetY = 5,108 - SetX = 6,397 - SetY = 6,114 - SetX = 7,385 - SetY = 7,123 - SetX = 8,417 - SetY = 8,103 - SetX = 9,351 - SetY = 9,120 - SetX = 10,461 - SetY = 10,53 - SetX = 11,465 + SetFrame = 0,10 + SetX = 0,-41 + SetY = 0,119 + SetZ = 0,27 + SetX = 1,-43 + SetY = 1,81 + SetFrame = 2,11 + SetX = 2,7 + SetY = 2,-38 + SetX = 3,0 + SetY = 3,37 + SetFrame = 4,10 + SetX = 4,-22 + SetY = 4,-61 + SetFrame = 5,13 + SetX = 5,40 + SetY = 5,12 + SetX = 6,13 + SetY = 6,18 + SetX = 7,1 + SetY = 7,27 + SetFrame = 8,12 + SetX = 8,33 + SetY = 8,7 + SetFrame = 9,13 + SetX = 9,-33 + SetY = 9,24 + SetFrame = 10,12 + SetX = 10,77 + SetY = 10,-43 + SetX = 11,81 + + Graphic = fly copy + Focus = Target + SetFrame = 0,10 + SetX = 0,52 + SetY = 0,123 + SetZ = 0,28 + SetX = 1,50 + SetY = 1,81 + SetX = 2,-36 + SetY = 2,54 + SetX = 3,-34 + SetY = 3,-15 + SetX = 4,51 + SetY = 4,-64 + SetFrame = 5,13 + SetX = 5,-43 + SetY = 5,11 + SetX = 6,-15 + SetY = 6,31 + SetFrame = 7,14 + SetX = 7,19 + SetY = 7,-15 + SetFrame = 8,13 + SetX = 8,-1 + SetY = 8,21 + SetX = 9,-67 + SetY = 9,33 + SetX = 10,-53 + SetY = 10,2 + SetX = 11,-52 + SetY = 11,-51 + + Graphic = fly copy + Focus = Target + SetFrame = 1,11 + SetX = 1,9 + SetY = 1,-92 + SetZ = 1,29 + SetFrame = 2,10 + SetX = 2,51 + SetY = 2,59 + SetX = 3,43 + SetY = 3,-21 + SetFrame = 4,11 + SetX = 4,12 + SetY = 4,66 + SetFrame = 5,12 + SetX = 5,-2 + SetY = 5,7 + SetX = 6,9 + SetY = 6,17 + SetVisible = 7,false + + Graphic = fly copy + Focus = Target + SetFrame = 4,13 + SetX = 4,74 + SetY = 4,23 + SetZ = 4,30 + SetVisible = 5,false + + Graphic = fly copy + Focus = Target + SetFrame = 4,13 + SetX = 4,-81 + SetY = 4,15 + SetZ = 4,31 + SetVisible = 5,false + + Graphic = fly copy + Focus = Target + SetFrame = 8,13 + SetX = 8,-23 + SetY = 8,27 + SetZ = 8,29 + SetFrame = 9,12 + SetX = 9,51 + SetY = 9,10 + SetFrame = 10,13 + SetX = 10,-80 + SetY = 10,-14 + SetY = 11,-56 Play = 0,Swords Dance,90 diff --git a/PBS/Animations/Converted/Move/TACKLE.txt b/PBS/Animations/Converted/Move/TACKLE.txt index 9feb546dd..2b6ef91ca 100644 --- a/PBS/Animations/Converted/Move/TACKLE.txt +++ b/PBS/Animations/Converted/Move/TACKLE.txt @@ -3,16 +3,17 @@ [Move,TACKLE] Name = TACKLE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Tackle_B Focus = Target - SetX = 2,384 - SetY = 2,99 + SetX = 2,0 + SetY = 2,3 + SetZ = 2,27 SetOpacity = 2,150 SetOpacity = 3,255 SetOpacity = 8,150 diff --git a/PBS/Animations/Converted/Move/TAILGLOW.txt b/PBS/Animations/Converted/Move/TAILGLOW.txt index 9fe70645b..be0194df4 100644 --- a/PBS/Animations/Converted/Move/TAILGLOW.txt +++ b/PBS/Animations/Converted/Move/TAILGLOW.txt @@ -3,18 +3,25 @@ [Move,TAILGLOW] Name = TAILGLOW - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Light1 Focus = Target - SetX = 0,384 - SetY = 0,94 + SetX = 0,0 + SetY = 0,-2 + SetZ = 0,27 SetOpacity = 0,50 + SetFrame = 1,1 SetOpacity = 1,255 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 SetZoomX = 7,110 SetZoomY = 7,110 SetZoomX = 8,115 diff --git a/PBS/Animations/Converted/Move/TAILWHIP.txt b/PBS/Animations/Converted/Move/TAILWHIP.txt index 0a30e16aa..3bfe7e0a7 100644 --- a/PBS/Animations/Converted/Move/TAILWHIP.txt +++ b/PBS/Animations/Converted/Move/TAILWHIP.txt @@ -3,34 +3,34 @@ [Move,TAILWHIP] Name = TAILWHIP - SetX = 0,128 - SetY = 0,224 - SetX = 1,149 - SetY = 1,227 - SetX = 2,168 - SetY = 2,235 - SetX = 3,143 - SetY = 3,238 - SetX = 4,107 - SetX = 5,84 - SetY = 5,230 - SetX = 6,106 - SetY = 6,228 - SetX = 7,128 - SetY = 7,224 - SetX = 9,149 - SetY = 9,227 - SetX = 10,168 - SetY = 10,235 - SetX = 11,143 - SetY = 11,238 - SetX = 12,107 - SetX = 13,84 - SetY = 13,230 - SetX = 14,106 - SetY = 14,228 - SetX = 15,128 - SetY = 15,224 + SetX = 0,0 + SetY = 0,0 + SetX = 1,21 + SetY = 1,3 + SetX = 2,40 + SetY = 2,11 + SetX = 3,15 + SetY = 3,14 + SetX = 4,-21 + SetX = 5,-44 + SetY = 5,6 + SetX = 6,-22 + SetY = 6,4 + SetX = 7,0 + SetY = 7,0 + SetX = 9,21 + SetY = 9,3 + SetX = 10,40 + SetY = 10,11 + SetX = 11,15 + SetY = 11,14 + SetX = 12,-21 + SetX = 13,-44 + SetY = 13,6 + SetX = 14,-22 + SetY = 14,4 + SetX = 15,0 + SetY = 15,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 diff --git a/PBS/Animations/Converted/Move/TELEPORT.txt b/PBS/Animations/Converted/Move/TELEPORT.txt index 1bde72f9b..049899193 100644 --- a/PBS/Animations/Converted/Move/TELEPORT.txt +++ b/PBS/Animations/Converted/Move/TELEPORT.txt @@ -3,58 +3,64 @@ [Move,TELEPORT] Name = TELEPORT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = ! Focus = User - SetX = 0,123 - SetY = 0,374 - SetX = 1,114 - SetY = 1,338 - SetX = 2,119 - SetY = 2,324 - SetX = 3,112 - SetY = 3,284 - SetX = 4,116 - SetY = 4,256 - SetX = 5,123 - SetY = 5,216 - SetX = 6,124 - SetY = 6,184 + SetFrame = 0,6 + SetX = 0,-5 + SetY = 0,150 + SetZ = 0,28 + SetX = 1,-14 + SetY = 1,114 + SetX = 2,-9 + SetY = 2,100 + SetX = 3,-16 + SetY = 3,60 + SetX = 4,-12 + SetY = 4,32 + SetX = 5,-5 + SetY = 5,-8 + SetX = 6,-4 + SetY = 6,-40 Graphic = ! Focus = User - SetX = 1,145 - SetY = 1,363 - SetX = 2,148 - SetY = 2,300 - SetX = 3,133 - SetY = 3,255 - SetX = 4,144 - SetY = 4,214 - SetX = 5,146 - SetY = 5,203 - SetX = 6,142 - SetY = 6,135 + SetFrame = 1,6 + SetX = 1,17 + SetY = 1,139 + SetZ = 1,29 + SetX = 2,20 + SetY = 2,76 + SetX = 3,5 + SetY = 3,31 + SetX = 4,16 + SetY = 4,-10 + SetX = 5,18 + SetY = 5,-21 + SetX = 6,14 + SetY = 6,-89 Graphic = ! Focus = User - SetX = 0,74 - SetY = 0,358 - SetX = 1,87 - SetY = 1,304 - SetX = 2,93 - SetY = 2,305 - SetX = 3,91 - SetY = 3,268 - SetX = 4,94 - SetY = 4,230 - SetY = 5,182 - SetX = 6,104 - SetY = 6,153 + SetFrame = 0,6 + SetX = 0,-54 + SetY = 0,134 + SetZ = 0,27 + SetX = 1,-41 + SetY = 1,80 + SetX = 2,-35 + SetY = 2,81 + SetX = 3,-37 + SetY = 3,44 + SetX = 4,-34 + SetY = 4,6 + SetY = 5,-42 + SetX = 6,-24 + SetY = 6,-71 Play = 0,Trump Card,80 diff --git a/PBS/Animations/Converted/Move/THUNDER.txt b/PBS/Animations/Converted/Move/THUNDER.txt index cddadc4ef..e03991e11 100644 --- a/PBS/Animations/Converted/Move/THUNDER.txt +++ b/PBS/Animations/Converted/Move/THUNDER.txt @@ -3,61 +3,92 @@ [Move,THUNDER] Name = THUNDER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Trovao Focus = Target + SetFrame = 1,12 SetFlip = 1,true - SetX = 1,376 - SetY = 1,86 + SetX = 1,-8 + SetY = 1,-10 + SetZ = 1,28 + SetFrame = 2,8 SetFlip = 2,false - SetY = 2,46 - SetY = 3,78 - SetX = 4,392 - SetY = 4,54 - SetX = 5,368 - SetY = 5,86 - SetX = 9,376 - SetY = 9,102 - SetOpacity = 9,100 + SetY = 2,-50 + SetFrame = 3,12 + SetY = 3,-18 + SetFrame = 4,8 + SetX = 4,8 + SetY = 4,-42 + SetFrame = 5,12 + SetX = 5,-16 + SetY = 5,-10 + SetVisible = 6,false Graphic = Trovao Focus = Target - SetX = 2,400 - SetY = 2,150 - SetX = 3,376 - SetX = 4,384 - SetY = 4,110 - SetX = 5,376 - SetY = 5,118 + SetFrame = 2,9 + SetX = 2,16 + SetY = 2,54 + SetZ = 2,29 + SetFrame = 3,14 + SetX = 3,-8 + SetFrame = 4,11 + SetX = 4,0 + SetY = 4,14 + SetFrame = 5,10 + SetX = 5,-8 + SetY = 5,22 + SetVisible = 6,false + + Graphic = Trovao + Focus = Target + SetFrame = 9,1 + SetX = 9,-8 + SetY = 9,6 + SetZ = 9,28 + SetOpacity = 9,100 + SetVisible = 10,false Graphic = Trovao Focus = Target + SetFrame = 0,12 SetFlip = 0,true - SetX = 0,392 - SetY = 0,-58 - SetX = 1,352 + SetX = 0,8 + SetY = 0,-154 + SetZ = 0,27 + SetFrame = 1,13 + SetX = 1,-32 + SetFrame = 2,7 SetFlip = 2,false - SetX = 2,376 - SetY = 2,-66 - SetX = 3,400 - SetY = 3,-34 - SetX = 4,384 - SetY = 4,-42 - SetX = 5,392 - SetY = 5,-34 - SetX = 6,376 - SetY = 6,102 + SetX = 2,-8 + SetY = 2,-162 + SetFrame = 3,13 + SetX = 3,16 + SetY = 3,-130 + SetFrame = 4,7 + SetX = 4,0 + SetY = 4,-138 + SetFrame = 5,13 + SetX = 5,8 + SetY = 5,-130 + SetFrame = 6,3 + SetX = 6,-8 + SetY = 6,6 + SetFrame = 7,4 + SetFrame = 8,2 SetFlip = 9,true + SetFrame = 10,0 SetFlip = 10,false SetOpacity = 10,100 SetFlip = 11,true SetZoomX = 11,150 SetZoomY = 11,150 SetOpacity = 11,20 + SetVisible = 12,false Play = 0,Thunder1,80 diff --git a/PBS/Animations/Converted/Move/THUNDERBOLT.txt b/PBS/Animations/Converted/Move/THUNDERBOLT.txt index 3a52332b5..28c9d0972 100644 --- a/PBS/Animations/Converted/Move/THUNDERBOLT.txt +++ b/PBS/Animations/Converted/Move/THUNDERBOLT.txt @@ -3,34 +3,47 @@ [Move,THUNDERBOLT] Name = THUNDERBOLT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 017-Thunder01 Focus = Target - SetX = 5,384 - SetY = 5,94 - SetY = 6,54 + SetX = 5,0 + SetY = 5,-2 + SetZ = 5,28 + SetFrame = 6,2 + SetY = 6,-42 SetOpacity = 6,100 + SetVisible = 7,false Graphic = 017-Thunder01 Focus = Target - SetX = 0,384 - SetY = 0,54 + SetFrame = 0,2 + SetX = 0,0 + SetY = 0,-42 + SetZ = 0,27 + SetFrame = 1,3 + SetFrame = 2,4 + SetFrame = 3,5 + SetFrame = 4,4 SetFlip = 4,true SetOpacity = 4,200 + SetFrame = 5,3 SetOpacity = 5,100 + SetFrame = 6,1 SetFlip = 6,false - SetY = 6,94 + SetY = 6,-2 SetOpacity = 6,255 SetFlip = 7,true + SetFrame = 8,0 SetFlip = 9,false SetZoomX = 9,120 SetZoomY = 9,120 SetOpacity = 9,100 + SetFrame = 10,1 SetOpacity = 10,50 SetFlip = 11,true SetOpacity = 11,20 diff --git a/PBS/Animations/Converted/Move/THUNDERFANG.txt b/PBS/Animations/Converted/Move/THUNDERFANG.txt index 5d3052c02..6a35c8345 100644 --- a/PBS/Animations/Converted/Move/THUNDERFANG.txt +++ b/PBS/Animations/Converted/Move/THUNDERFANG.txt @@ -3,64 +3,90 @@ [Move,THUNDERFANG] Name = THUNDERFANG - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = element fangs Focus = Target - SetX = 6,327 - SetY = 6,73 - SetX = 7,326 - SetX = 8,327 - SetY = 8,70 + SetFrame = 6,14 + SetX = 6,-57 + SetY = 6,-23 + SetZ = 6,28 + SetX = 7,-58 + SetX = 8,-57 + SetY = 8,-26 + SetVisible = 9,false Graphic = element fangs Focus = Target - SetX = 7,471 - SetY = 7,67 - SetX = 8,314 - SetY = 8,124 + SetFrame = 7,17 + SetX = 7,87 + SetY = 7,-29 + SetZ = 7,29 + SetX = 8,-70 + SetY = 8,28 + SetVisible = 9,false Graphic = element fangs Focus = Target - SetX = 8,481 - SetY = 8,124 + SetFrame = 8,14 + SetX = 8,97 + SetY = 8,28 + SetZ = 8,30 + SetVisible = 9,false Graphic = element fangs Focus = Target - SetX = 8,471 - SetY = 8,60 + SetFrame = 8,17 + SetX = 8,87 + SetY = 8,-36 + SetZ = 8,31 + SetVisible = 9,false Graphic = element fangs Focus = Target - SetX = 0,391 - SetY = 0,96 - SetY = 1,90 - SetX = 2,386 - SetY = 2,92 - SetX = 3,390 - SetY = 3,98 - SetX = 4,386 - SetY = 4,95 - SetX = 5,392 - SetY = 5,101 - SetX = 6,386 - SetY = 6,100 - SetX = 7,389 - SetY = 7,99 - SetX = 8,388 - SetY = 8,92 - SetX = 9,386 - SetY = 9,100 - SetX = 10,394 - SetY = 10,95 - SetX = 11,387 - SetY = 11,94 - SetX = 12,384 - SetY = 12,97 + SetX = 0,7 + SetY = 0,0 + SetZ = 0,27 + SetFrame = 1,1 + SetY = 1,-6 + SetFrame = 2,2 + SetX = 2,2 + SetY = 2,-4 + SetFrame = 3,3 + SetX = 3,6 + SetY = 3,2 + SetFrame = 4,4 + SetX = 4,2 + SetY = 4,-1 + SetFrame = 5,5 + SetX = 5,8 + SetY = 5,5 + SetFrame = 6,6 + SetX = 6,2 + SetY = 6,4 + SetFrame = 7,7 + SetX = 7,5 + SetY = 7,3 + SetFrame = 8,8 + SetX = 8,4 + SetY = 8,-4 + SetFrame = 9,9 + SetX = 9,2 + SetY = 9,4 + SetFrame = 10,10 + SetX = 10,10 + SetY = 10,-1 + SetFrame = 11,11 + SetX = 11,3 + SetY = 11,-2 + SetFrame = 12,12 + SetX = 12,0 + SetY = 12,1 + SetVisible = 13,false Play = 6,Super Fang Play = 7,Uproar,83,137 diff --git a/PBS/Animations/Converted/Move/THUNDERPUNCH.txt b/PBS/Animations/Converted/Move/THUNDERPUNCH.txt index 2cb6a3a47..6052ed554 100644 --- a/PBS/Animations/Converted/Move/THUNDERPUNCH.txt +++ b/PBS/Animations/Converted/Move/THUNDERPUNCH.txt @@ -3,102 +3,124 @@ [Move,THUNDERPUNCH] Name = THUNDERPUNCH - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = punches Focus = Target - SetX = 0,385 - SetY = 0,97 - SetX = 1,384 - SetY = 1,93 - SetX = 2,395 - SetY = 2,76 - SetX = 3,429 - SetY = 3,54 - SetX = 4,381 - SetY = 4,102 - SetX = 5,363 - SetY = 5,104 - SetX = 6,474 - SetY = 6,46 - SetX = 7,410 - SetY = 7,11 - SetX = 8,343 - SetY = 8,142 - SetX = 9,487 - SetY = 9,1 + SetFrame = 0,1 + SetX = 0,1 + SetY = 0,1 + SetZ = 0,27 + SetX = 1,0 + SetY = 1,-3 + SetFrame = 2,3 + SetX = 2,11 + SetY = 2,-20 + SetX = 3,45 + SetY = 3,-42 + SetX = 4,-3 + SetY = 4,6 + SetX = 5,-21 + SetY = 5,8 + SetX = 6,90 + SetY = 6,-50 + SetX = 7,26 + SetY = 7,-85 + SetX = 8,-41 + SetY = 8,46 + SetX = 9,103 + SetY = 9,-95 Graphic = punches Focus = Target - SetX = 2,412 - SetY = 2,82 - SetX = 3,378 - SetY = 3,108 - SetX = 4,410 - SetY = 4,105 - SetX = 5,390 - SetY = 5,126 - SetX = 6,440 - SetY = 6,16 - SetX = 7,478 - SetY = 7,55 - SetX = 8,450 - SetY = 8,47 - SetX = 9,305 - SetY = 9,184 + SetFrame = 2,3 + SetX = 2,28 + SetY = 2,-14 + SetZ = 2,28 + SetX = 3,-6 + SetY = 3,12 + SetX = 4,26 + SetY = 4,9 + SetX = 5,6 + SetY = 5,30 + SetX = 6,56 + SetY = 6,-80 + SetX = 7,94 + SetY = 7,-41 + SetX = 8,66 + SetY = 8,-49 + SetX = 9,-79 + SetY = 9,88 Graphic = punches Focus = Target - SetX = 2,385 - SetY = 2,92 - SetX = 3,386 - SetY = 3,98 - SetX = 4,429 - SetY = 4,67 - SetX = 5,391 - SetY = 5,58 - SetX = 6,311 - SetY = 6,144 - SetX = 7,317 - SetY = 7,138 - SetX = 8,386 - SetY = 8,94 - SetX = 9,383 + SetFrame = 2,1 + SetX = 2,1 + SetY = 2,-4 + SetZ = 2,29 + SetX = 3,2 + SetY = 3,2 + SetFrame = 4,3 + SetX = 4,45 + SetY = 4,-29 + SetX = 5,7 + SetY = 5,-38 + SetX = 6,-73 + SetY = 6,48 + SetX = 7,-67 + SetY = 7,42 + SetFrame = 8,1 + SetX = 8,2 + SetY = 8,-2 + SetX = 9,-1 Graphic = punches Focus = Target - SetX = 4,387 - SetY = 4,70 - SetX = 5,443 - SetY = 5,55 - SetX = 6,357 - SetY = 6,171 - SetX = 7,358 - SetY = 7,163 + SetFrame = 4,3 + SetX = 4,3 + SetY = 4,-26 + SetZ = 4,30 + SetX = 5,59 + SetY = 5,-41 + SetX = 6,-27 + SetY = 6,75 + SetX = 7,-26 + SetY = 7,67 + SetVisible = 8,false Graphic = punches Focus = Target - SetX = 4,389 - SetY = 4,99 - SetX = 5,385 - SetY = 5,93 - SetY = 6,97 - SetX = 7,424 - SetY = 7,60 + SetFrame = 4,1 + SetX = 4,5 + SetY = 4,3 + SetZ = 4,31 + SetX = 5,1 + SetY = 5,-3 + SetY = 6,1 + SetFrame = 7,3 + SetX = 7,40 + SetY = 7,-36 + SetVisible = 8,false Graphic = punches Focus = Target - SetX = 7,351 - SetY = 7,135 + SetFrame = 7,3 + SetX = 7,-33 + SetY = 7,39 + SetZ = 7,32 + SetVisible = 8,false Graphic = punches Focus = Target - SetX = 7,384 - SetY = 7,97 + SetFrame = 7,1 + SetX = 7,0 + SetY = 7,1 + SetZ = 7,33 + SetVisible = 8,false Play = 0,Mega Punch,100,89 Play = 0,Work Up,100,111 diff --git a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt index 4c5ba83c2..2eb02ba40 100644 --- a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt +++ b/PBS/Animations/Converted/Move/THUNDERSHOCK.txt @@ -3,17 +3,31 @@ [Move,THUNDERSHOCK] Name = THUNDERSHOCK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = electric1 Focus = Target - SetX = 0,376 - SetY = 0,94 + SetFrame = 0,8 + SetX = 0,-8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,7 + SetFrame = 2,6 + SetFrame = 3,5 + SetFrame = 4,4 + SetFrame = 5,3 + SetFrame = 6,2 + SetFrame = 7,1 + SetFrame = 8,0 + SetFrame = 9,1 SetFlip = 9,true + SetFrame = 10,3 + SetFrame = 11,5 + SetFrame = 12,7 SetOpacity = 12,100 Play = 0,Thunder1,80 diff --git a/PBS/Animations/Converted/Move/THUNDERWAVE.txt b/PBS/Animations/Converted/Move/THUNDERWAVE.txt index 28e33ba5c..64924933a 100644 --- a/PBS/Animations/Converted/Move/THUNDERWAVE.txt +++ b/PBS/Animations/Converted/Move/THUNDERWAVE.txt @@ -3,42 +3,63 @@ [Move,THUNDERWAVE] Name = THUNDERWAVE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = T. Shock Focus = Target - SetX = 6,392 - SetY = 6,114 - SetX = 7,368 - SetX = 8,408 - SetX = 9,360 - SetX = 12,344 - SetX = 13,352 - SetX = 14,360 - SetX = 15,368 + SetX = 6,8 + SetY = 6,18 + SetZ = 6,28 + SetFrame = 7,6 + SetX = 7,-16 + SetFrame = 8,2 + SetX = 8,24 + SetFrame = 9,6 + SetX = 9,-24 + SetFrame = 10,5 + SetFrame = 12,6 + SetX = 12,-40 + SetX = 13,-32 + SetFrame = 14,5 + SetX = 14,-24 + SetX = 15,-16 Graphic = T. Shock Focus = Target - SetX = 6,368 - SetY = 6,114 + SetFrame = 6,5 + SetX = 6,-16 + SetY = 6,18 + SetZ = 6,29 + SetVisible = 7,false Graphic = T. Shock Focus = Target - SetX = 1,392 - SetY = 1,42 - SetY = 2,58 - SetY = 3,82 - SetY = 4,98 - SetY = 5,114 - SetX = 6,408 - SetX = 8,368 - SetX = 9,416 - SetX = 12,424 - SetX = 13,432 - SetX = 14,424 + SetX = 1,8 + SetY = 1,-54 + SetZ = 1,27 + SetY = 2,-38 + SetFrame = 3,1 + SetY = 3,-14 + SetFrame = 4,0 + SetY = 4,2 + SetFrame = 5,1 + SetY = 5,18 + SetFrame = 6,2 + SetX = 6,24 + SetFrame = 7,3 + SetFrame = 8,5 + SetX = 8,-16 + SetFrame = 9,2 + SetX = 9,32 + SetFrame = 10,3 + SetFrame = 12,2 + SetX = 12,40 + SetX = 13,48 + SetFrame = 14,3 + SetX = 14,40 Play = 2,Paralyze1,80 diff --git a/PBS/Animations/Converted/Move/TOXIC.txt b/PBS/Animations/Converted/Move/TOXIC.txt index a7b96b385..a6a0cbca8 100644 --- a/PBS/Animations/Converted/Move/TOXIC.txt +++ b/PBS/Animations/Converted/Move/TOXIC.txt @@ -3,54 +3,117 @@ [Move,TOXIC] Name = TOXIC - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = State1 Focus = Target - SetX = 2,440 - SetY = 2,86 - SetX = 14,400 - SetY = 14,142 - SetX = 15,352 - SetY = 15,102 - SetX = 17,328 - SetY = 17,134 + SetX = 2,56 + SetY = 2,-10 + SetZ = 2,28 + SetFrame = 3,1 + SetFrame = 4,2 + SetFrame = 5,3 + SetFrame = 6,4 + SetFrame = 7,5 + SetFrame = 8,6 + SetFrame = 9,7 + SetFrame = 10,8 + SetFrame = 11,9 + SetFrame = 12,10 + SetFrame = 13,11 + SetX = 14,16 + SetY = 14,46 + SetX = 15,-32 + SetY = 15,6 + SetFrame = 16,12 + SetX = 17,-56 + SetY = 17,38 Graphic = State1 Focus = Target - SetX = 3,400 - SetY = 3,142 - SetX = 14,352 - SetY = 14,102 - SetX = 15,328 - SetY = 15,134 + SetX = 3,16 + SetY = 3,46 + SetZ = 3,29 + SetFrame = 4,1 + SetFrame = 5,2 + SetFrame = 6,3 + SetFrame = 7,4 + SetFrame = 8,5 + SetFrame = 9,6 + SetFrame = 10,7 + SetFrame = 11,8 + SetFrame = 12,9 + SetFrame = 13,10 + SetX = 14,-32 + SetY = 14,6 + SetX = 15,-56 + SetY = 15,38 + SetFrame = 16,11 + SetVisible = 17,false Graphic = State1 Focus = Target - SetX = 4,352 - SetY = 4,102 - SetX = 14,328 - SetY = 14,134 + SetX = 4,-32 + SetY = 4,6 + SetZ = 4,30 + SetFrame = 5,1 + SetFrame = 6,2 + SetFrame = 7,3 + SetFrame = 8,4 + SetFrame = 9,5 + SetFrame = 10,6 + SetFrame = 11,7 + SetFrame = 12,8 + SetFrame = 13,9 + SetX = 14,-56 + SetY = 14,38 + SetVisible = 15,false Graphic = State1 Focus = Target - SetX = 5,328 - SetY = 5,134 + SetX = 5,-56 + SetY = 5,38 + SetZ = 5,31 + SetFrame = 6,1 + SetFrame = 7,2 + SetFrame = 8,3 + SetFrame = 9,4 + SetFrame = 10,5 + SetFrame = 11,6 + SetFrame = 12,7 + SetFrame = 13,8 + SetVisible = 14,false Graphic = State1 Focus = Target - SetX = 0,304 - SetY = 0,118 - SetX = 14,440 - SetY = 14,86 - SetX = 15,400 - SetY = 15,142 - SetX = 17,352 - SetY = 17,102 + SetX = 0,-80 + SetY = 0,22 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 10,10 + SetFrame = 11,11 + SetFrame = 12,12 + SetFrame = 13,13 + SetFrame = 14,12 + SetX = 14,56 + SetY = 14,-10 + SetX = 15,16 + SetY = 15,46 + SetFrame = 16,13 + SetX = 17,-32 + SetY = 17,6 Play = 0,Poison,80 Play = 4,Poison,80 diff --git a/PBS/Animations/Converted/Move/TRICKROOM.txt b/PBS/Animations/Converted/Move/TRICKROOM.txt index 6cfcdfb38..9c802cb94 100644 --- a/PBS/Animations/Converted/Move/TRICKROOM.txt +++ b/PBS/Animations/Converted/Move/TRICKROOM.txt @@ -3,30 +3,31 @@ [Move,TRICKROOM] Name = TRICKROOM - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = mixed status Focus = UserAndTarget - SetX = 0,310 - SetY = 0,210 + SetFrame = 0,5 + SetX = 0,142 + SetY = 0,-21 SetZoomX = 0,446 SetZoomY = 0,273 - SetX = 1,311 - SetY = 1,209 - SetX = 3,313 - SetY = 3,211 - SetX = 4,311 - SetX = 5,313 - SetY = 5,212 - SetX = 6,311 - SetY = 7,211 - SetX = 8,313 - SetY = 8,213 - SetX = 9,310 - SetY = 9,211 + SetX = 1,142 + SetY = 1,-23 + SetX = 3,144 + SetY = 3,-20 + SetX = 4,142 + SetX = 5,144 + SetY = 5,-18 + SetX = 6,142 + SetY = 7,-20 + SetX = 8,144 + SetY = 8,-17 + SetX = 9,142 + SetY = 9,-20 Play = 0,MiningPing,100,84 diff --git a/PBS/Animations/Converted/Move/TWINEEDLE.txt b/PBS/Animations/Converted/Move/TWINEEDLE.txt index ccb1fb261..c7edad6a3 100644 --- a/PBS/Animations/Converted/Move/TWINEEDLE.txt +++ b/PBS/Animations/Converted/Move/TWINEEDLE.txt @@ -3,55 +3,64 @@ [Move,TWINEEDLE] Name = TWINEEDLE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 4,364 - SetY = 4,104 + SetFrame = 4,14 + SetX = 4,184 + SetY = 4,-187 + SetZ = 4,29 SetOpacity = 4,50 - SetX = 5,396 - SetY = 5,116 + SetX = 5,209 + SetY = 5,-168 + SetVisible = 6,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,192 - SetX = 1,185 - SetY = 1,173 - SetX = 2,256 - SetY = 2,154 - SetX = 3,300 - SetY = 3,129 - SetX = 4,358 - SetY = 4,116 - SetX = 5,390 - SetY = 5,129 - SetX = 6,396 - SetY = 6,116 + SetX = 0,0 + SetY = 0,-50 + SetZ = 0,27 + SetX = 1,44 + SetY = 1,-79 + SetX = 2,100 + SetY = 2,-109 + SetX = 3,134 + SetY = 3,-148 + SetX = 4,179 + SetY = 4,-168 + SetX = 5,204 + SetY = 5,-148 + SetFrame = 6,14 + SetX = 6,209 + SetY = 6,-168 SetZoomX = 6,125 SetZoomY = 6,125 SetOpacity = 6,50 + SetVisible = 7,false Graphic = poison3 Focus = UserAndTarget - SetX = 1,185 - SetY = 1,217 - SetX = 2,256 - SetY = 2,198 - SetX = 3,307 - SetY = 3,173 - SetX = 4,364 - SetY = 4,154 - SetX = 5,371 - SetY = 5,104 + SetX = 1,44 + SetY = 1,-10 + SetZ = 1,28 + SetX = 2,100 + SetY = 2,-40 + SetX = 3,139 + SetY = 3,-79 + SetX = 4,184 + SetY = 4,-109 + SetFrame = 5,14 + SetX = 5,189 + SetY = 5,-187 SetZoomX = 5,125 SetZoomY = 5,125 SetOpacity = 5,50 + SetVisible = 6,false Play = 0,throw,80 Play = 2,throw,80 @@ -61,55 +70,64 @@ Name = TWINEEDLE [Move,TWINEEDLE,1] Name = Twineedle hit 2 - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = poison3 Focus = UserAndTarget - SetX = 1,185 - SetY = 1,217 - SetX = 2,256 - SetY = 2,198 - SetX = 3,307 - SetY = 3,173 - SetX = 4,364 - SetY = 4,154 - SetX = 5,371 - SetY = 5,104 + SetX = 1,44 + SetY = 1,-10 + SetZ = 1,28 + SetX = 2,100 + SetY = 2,-40 + SetX = 3,139 + SetY = 3,-79 + SetX = 4,184 + SetY = 4,-109 + SetFrame = 5,14 + SetX = 5,189 + SetY = 5,-187 SetZoomX = 5,125 SetZoomY = 5,125 SetOpacity = 5,50 + SetVisible = 6,false Graphic = poison3 Focus = UserAndTarget - SetX = 4,364 - SetY = 4,104 + SetFrame = 4,14 + SetX = 4,184 + SetY = 4,-187 + SetZ = 4,29 SetOpacity = 4,50 - SetX = 5,396 - SetY = 5,116 + SetX = 5,209 + SetY = 5,-168 + SetVisible = 6,false Graphic = poison3 Focus = UserAndTarget - SetX = 0,128 - SetY = 0,192 - SetX = 1,185 - SetY = 1,173 - SetX = 2,256 - SetY = 2,154 - SetX = 3,300 - SetY = 3,129 - SetX = 4,358 - SetY = 4,116 - SetX = 5,390 - SetY = 5,129 - SetX = 6,396 - SetY = 6,116 + SetX = 0,0 + SetY = 0,-50 + SetZ = 0,27 + SetX = 1,44 + SetY = 1,-79 + SetX = 2,100 + SetY = 2,-109 + SetX = 3,134 + SetY = 3,-148 + SetX = 4,179 + SetY = 4,-168 + SetX = 5,204 + SetY = 5,-148 + SetFrame = 6,14 + SetX = 6,209 + SetY = 6,-168 SetZoomX = 6,125 SetZoomY = 6,125 SetOpacity = 6,50 + SetVisible = 7,false Play = 0,throw,80 Play = 2,throw,80 diff --git a/PBS/Animations/Converted/Move/TWISTER.txt b/PBS/Animations/Converted/Move/TWISTER.txt index 0499c6e10..c659d8980 100644 --- a/PBS/Animations/Converted/Move/TWISTER.txt +++ b/PBS/Animations/Converted/Move/TWISTER.txt @@ -3,17 +3,35 @@ [Move,TWISTER] Name = TWISTER - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = water3 Focus = Target - SetX = 0,384 - SetY = 0,78 + SetFrame = 0,11 + SetX = 0,0 + SetY = 0,-18 + SetZ = 0,27 + SetFrame = 1,10 + SetFrame = 2,9 + SetFrame = 3,8 + SetFrame = 4,7 + SetFrame = 5,6 + SetFrame = 6,5 + SetFrame = 7,4 + SetFrame = 8,3 + SetFrame = 9,2 + SetFrame = 10,1 + SetFrame = 11,2 SetFlip = 11,true + SetFrame = 12,5 + SetFrame = 13,6 + SetFrame = 14,7 + SetFrame = 15,9 + SetFrame = 16,10 Play = 0,Water3,80 Play = 0,Twine,80 diff --git a/PBS/Animations/Converted/Move/VINEWHIP.txt b/PBS/Animations/Converted/Move/VINEWHIP.txt index 3623b56bd..f954b1173 100644 --- a/PBS/Animations/Converted/Move/VINEWHIP.txt +++ b/PBS/Animations/Converted/Move/VINEWHIP.txt @@ -3,30 +3,43 @@ [Move,VINEWHIP] Name = VINEWHIP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 003-Attack01 Focus = Target - SetX = 2,368 - SetY = 2,118 + SetX = 2,-16 + SetY = 2,22 + SetZ = 2,28 SetOpacity = 2,150 - SetX = 3,336 + SetFrame = 3,6 + SetX = 3,-48 SetOpacity = 3,255 - SetX = 4,304 - SetY = 4,142 + SetFrame = 4,5 + SetX = 4,-80 + SetY = 4,46 + SetVisible = 5,false Graphic = 003-Attack01 Focus = Target - SetX = 0,448 - SetY = 0,14 - SetX = 1,408 - SetY = 1,46 - SetX = 2,368 - SetY = 2,94 - SetY = 3,118 + SetFrame = 0,5 + SetX = 0,64 + SetY = 0,-82 + SetZ = 0,27 + SetFrame = 1,6 + SetX = 1,24 + SetY = 1,-50 + SetFrame = 2,7 + SetX = 2,-16 + SetY = 2,-2 + SetFrame = 3,1 + SetY = 3,22 + SetFrame = 4,2 + SetFrame = 5,3 + SetFrame = 6,4 + SetVisible = 7,false Play = 2,Slash1,80 diff --git a/PBS/Animations/Converted/Move/WATERGUN.txt b/PBS/Animations/Converted/Move/WATERGUN.txt index 297b1a5cc..a9b0b5043 100644 --- a/PBS/Animations/Converted/Move/WATERGUN.txt +++ b/PBS/Animations/Converted/Move/WATERGUN.txt @@ -3,103 +3,125 @@ [Move,WATERGUN] Name = WATERGUN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = UserAndTarget - SetX = 0,160 - SetY = 0,200 + SetFrame = 0,5 + SetX = 0,25 + SetY = 0,-37 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 SetOpacity = 0,235 - SetX = 7,184 - SetY = 7,184 - SetX = 8,208 - SetY = 8,168 + SetX = 7,43 + SetY = 7,-62 + SetX = 8,62 + SetY = 8,-87 + SetVisible = 9,false Graphic = fly copy Focus = UserAndTarget - SetX = 1,184 - SetY = 1,181 + SetFrame = 1,5 + SetX = 1,43 + SetY = 1,-67 + SetZ = 1,28 SetZoomX = 1,50 SetZoomY = 1,50 SetOpacity = 1,235 - SetY = 2,190 - SetX = 3,185 - SetY = 3,181 - SetX = 7,208 - SetY = 7,165 - SetX = 8,232 - SetY = 8,149 + SetY = 2,-53 + SetX = 3,44 + SetY = 3,-67 + SetX = 7,62 + SetY = 7,-92 + SetX = 8,81 + SetY = 8,-117 + SetVisible = 10,false Graphic = fly copy Focus = UserAndTarget - SetX = 2,208 - SetY = 2,173 + SetFrame = 2,5 + SetX = 2,62 + SetY = 2,-79 + SetZ = 2,29 SetZoomX = 2,50 SetZoomY = 2,50 SetOpacity = 2,235 - SetY = 3,162 - SetX = 7,232 - SetY = 7,146 - SetX = 8,256 - SetY = 8,122 + SetY = 3,-96 + SetX = 7,81 + SetY = 7,-121 + SetX = 8,100 + SetY = 8,-159 + SetVisible = 11,false Graphic = fly copy Focus = UserAndTarget - SetX = 3,232 - SetY = 3,145 + SetFrame = 3,5 + SetX = 3,81 + SetY = 3,-123 + SetZ = 3,30 SetZoomX = 3,50 SetZoomY = 3,50 SetOpacity = 3,235 - SetX = 7,256 - SetY = 7,121 - SetX = 8,280 - SetY = 8,105 + SetX = 7,100 + SetY = 7,-160 + SetX = 8,118 + SetY = 8,-185 + SetVisible = 12,false Graphic = fly copy Focus = UserAndTarget - SetX = 4,252 - SetY = 4,124 + SetFrame = 4,5 + SetX = 4,96 + SetY = 4,-156 + SetZ = 4,31 SetZoomX = 4,50 SetZoomY = 4,50 SetOpacity = 4,235 - SetX = 7,280 - SetY = 7,108 - SetX = 8,304 - SetY = 8,100 + SetX = 7,118 + SetY = 7,-181 + SetX = 8,137 + SetY = 8,-193 + SetVisible = 13,false Graphic = fly copy Focus = UserAndTarget - SetX = 5,280 - SetY = 5,109 + SetFrame = 5,5 + SetX = 5,118 + SetY = 5,-179 + SetZ = 5,32 SetZoomX = 5,50 SetZoomY = 5,50 SetOpacity = 5,235 - SetX = 7,304 - SetY = 7,101 - SetX = 8,336 - SetY = 8,93 + SetX = 7,137 + SetY = 7,-192 + SetX = 8,162 + SetY = 8,-204 + SetVisible = 14,false Graphic = fly copy Focus = UserAndTarget - SetX = 6,305 - SetY = 6,99 + SetFrame = 6,5 + SetX = 6,138 + SetY = 6,-195 + SetZ = 6,33 SetZoomX = 6,50 SetZoomY = 6,50 SetOpacity = 6,235 - SetX = 7,336 - SetY = 7,91 - SetX = 8,368 + SetX = 7,162 + SetY = 7,-207 + SetX = 8,187 Graphic = fly copy Focus = UserAndTarget - SetX = 8,380 - SetY = 8,108 + SetFrame = 8,6 + SetX = 8,196 + SetY = 8,-181 + SetZ = 8,34 SetZoomX = 8,70 SetOpacity = 8,224 @@ -108,85 +130,114 @@ Name = WATERGUN [OppMove,WATERGUN] Name = WATERGUN - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = fly copy Focus = UserAndTarget - SetX = 0,352 - SetY = 0,81 + SetFrame = 0,5 + SetX = 0,175 + SetY = 0,-223 + SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 SetOpacity = 0,235 + SetVisible = 9,false Graphic = fly copy Focus = UserAndTarget - SetX = 1,328 - SetY = 1,96 + SetFrame = 1,5 + SetX = 1,156 + SetY = 1,-200 + SetZ = 1,28 SetZoomX = 1,50 SetZoomY = 1,50 SetOpacity = 1,235 + SetVisible = 10,false Graphic = fly copy Focus = UserAndTarget - SetX = 2,304 - SetY = 2,118 + SetFrame = 2,5 + SetX = 2,137 + SetY = 2,-165 + SetZ = 2,29 SetZoomX = 2,50 SetZoomY = 2,50 SetOpacity = 2,235 + SetVisible = 11,false Graphic = fly copy Focus = UserAndTarget - SetX = 3,280 - SetY = 3,134 + SetFrame = 3,5 + SetX = 3,118 + SetY = 3,-140 + SetZ = 3,30 SetZoomX = 3,50 SetZoomY = 3,50 SetOpacity = 3,235 + SetVisible = 12,false Graphic = fly copy Focus = UserAndTarget - SetX = 4,258 - SetY = 4,161 + SetFrame = 4,5 + SetX = 4,101 + SetY = 4,-98 + SetZ = 4,31 SetZoomX = 4,50 SetZoomY = 4,50 SetOpacity = 4,235 + SetVisible = 13,false Graphic = fly copy Focus = UserAndTarget - SetX = 5,232 - SetY = 5,179 + SetFrame = 5,5 + SetX = 5,81 + SetY = 5,-70 + SetZ = 5,32 SetZoomX = 5,50 SetZoomY = 5,50 SetOpacity = 5,235 + SetVisible = 14,false Graphic = fly copy Focus = UserAndTarget - SetX = 6,202 - SetY = 6,196 + SetFrame = 6,5 + SetX = 6,57 + SetY = 6,-43 + SetZ = 6,33 SetZoomX = 6,50 SetZoomY = 6,50 SetOpacity = 6,235 + SetVisible = 15,false Graphic = fly copy - Focus = User - SetX = 7,167 - SetY = 7,217 + Focus = UserAndTarget + SetFrame = 7,5 + SetX = 7,30 + SetY = 7,-10 + SetZ = 7,34 SetZoomX = 7,50 SetZoomY = 7,50 SetOpacity = 7,235 - SetX = 9,129 - SetY = 9,220 - SetZoomX = 9,100 - SetZoomY = 9,100 - SetOpacity = 9,255 + SetVisible = 9,false Graphic = fly copy Focus = User - SetX = 8,128 - SetY = 8,220 + SetFrame = 8,6 + SetX = 8,0 + SetY = 8,-4 + SetZ = 8,35 SetOpacity = 8,240 + SetVisible = 9,false + + Graphic = fly copy + Focus = User + SetFrame = 9,6 + SetX = 9,1 + SetY = 9,-4 + SetZ = 9,34 Play = 0,Yawn,88 diff --git a/PBS/Animations/Converted/Move/WATERPULSE.txt b/PBS/Animations/Converted/Move/WATERPULSE.txt index 5cb28905b..a5d067afe 100644 --- a/PBS/Animations/Converted/Move/WATERPULSE.txt +++ b/PBS/Animations/Converted/Move/WATERPULSE.txt @@ -3,42 +3,50 @@ [Move,WATERPULSE] Name = WATERPULSE - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 SetToneBlue = 15,255 SetToneBlue = 18,0 Graphic = Water pulse Focus = UserAndTarget - SetX = 0,131 - SetY = 0,229 - SetX = 1,208 - SetY = 1,192 - SetX = 2,232 - SetY = 2,184 - SetX = 3,240 - SetY = 3,176 - SetX = 4,264 - SetY = 4,160 - SetX = 5,280 - SetY = 5,144 - SetX = 6,304 - SetY = 6,128 - SetX = 7,337 - SetY = 7,114 - SetX = 8,361 - SetY = 8,110 - SetX = 9,356 - SetY = 9,104 - SetX = 10,350 - SetY = 10,107 - SetX = 11,354 - SetY = 11,105 - SetX = 12,349 - SetY = 12,100 - SetX = 13,350 - SetY = 13,122 - SetX = 14,344 + SetX = 0,2 + SetY = 0,7 + SetZ = 0,27 + SetX = 1,62 + SetY = 1,-50 + SetX = 2,81 + SetY = 2,-62 + SetX = 3,87 + SetY = 3,-75 + SetX = 4,106 + SetY = 4,-100 + SetX = 5,118 + SetY = 5,-125 + SetX = 6,137 + SetY = 6,-150 + SetX = 7,163 + SetY = 7,-171 + SetX = 8,182 + SetY = 8,-178 + SetFrame = 9,1 + SetX = 9,178 + SetY = 9,-187 + SetFrame = 10,2 + SetX = 10,173 + SetY = 10,-182 + SetFrame = 11,3 + SetX = 11,176 + SetY = 11,-185 + SetFrame = 12,4 + SetX = 12,172 + SetY = 12,-193 + SetFrame = 13,5 + SetX = 13,173 + SetY = 13,-159 + SetFrame = 14,6 + SetX = 14,168 + SetVisible = 15,false diff --git a/PBS/Animations/Converted/Move/WHIRLWIND.txt b/PBS/Animations/Converted/Move/WHIRLWIND.txt index 4d8efe7ca..3a2c035fe 100644 --- a/PBS/Animations/Converted/Move/WHIRLWIND.txt +++ b/PBS/Animations/Converted/Move/WHIRLWIND.txt @@ -3,15 +3,23 @@ [Move,WHIRLWIND] Name = WHIRLWIND - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Wind1 Focus = Target - SetX = 0,392 - SetY = 0,94 + SetX = 0,8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 Play = 0,Wind1,80 diff --git a/PBS/Animations/Converted/Move/WILLOWISP.txt b/PBS/Animations/Converted/Move/WILLOWISP.txt index 6f84606fc..9362d3d09 100644 --- a/PBS/Animations/Converted/Move/WILLOWISP.txt +++ b/PBS/Animations/Converted/Move/WILLOWISP.txt @@ -3,64 +3,83 @@ [Move,WILLOWISP] Name = WILLOWISP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = 015-Fire01 Focus = UserAndTarget + SetFrame = 1,5 SetFlip = 1,true - SetX = 1,134 - SetY = 1,179 + SetX = 1,4 + SetY = 1,-70 + SetZ = 1,28 SetAngle = 1,90 - SetX = 2,172 - SetY = 2,161 - SetX = 3,243 - SetY = 3,129 - SetX = 4,332 - SetY = 4,148 + SetFrame = 2,6 + SetX = 2,34 + SetY = 2,-98 + SetFrame = 3,7 + SetX = 3,89 + SetY = 3,-148 + SetX = 4,159 + SetY = 4,-118 + SetFrame = 5,2 SetFlip = 5,false - SetX = 5,358 - SetY = 5,110 + SetX = 5,179 + SetY = 5,-178 SetAngle = 5,0 + SetVisible = 6,false Graphic = 015-Fire01 Focus = UserAndTarget + SetFrame = 2,5 SetFlip = 2,true - SetX = 2,224 - SetY = 2,186 + SetX = 2,75 + SetY = 2,-59 + SetZ = 2,29 SetAngle = 2,90 - SetX = 3,288 - SetY = 3,167 + SetFrame = 3,6 + SetX = 3,125 + SetY = 3,-89 + SetFrame = 4,1 SetFlip = 4,false - SetX = 4,358 - SetY = 4,110 + SetX = 4,179 + SetY = 4,-178 SetAngle = 4,0 + SetVisible = 5,false Graphic = 015-Fire01 Focus = UserAndTarget - SetX = 3,358 - SetY = 3,110 + SetX = 3,179 + SetY = 3,-178 + SetZ = 3,30 + SetVisible = 4,false Graphic = 015-Fire01 Focus = UserAndTarget + SetFrame = 0,5 SetFlip = 0,true - SetX = 0,160 - SetY = 0,186 + SetX = 0,25 + SetY = 0,-59 + SetZ = 0,27 SetAngle = 0,90 - SetX = 1,198 - SetY = 1,167 - SetX = 2,262 - SetY = 2,129 - SetX = 3,320 - SetY = 3,104 - SetX = 4,300 - SetX = 5,352 - SetY = 5,110 + SetFrame = 1,6 + SetX = 1,54 + SetY = 1,-89 + SetFrame = 2,7 + SetX = 2,104 + SetY = 2,-148 + SetFrame = 3,5 + SetX = 3,150 + SetY = 3,-187 + SetX = 4,134 + SetX = 5,175 + SetY = 5,-178 + SetFrame = 6,3 SetFlip = 6,false - SetX = 6,358 + SetX = 6,179 SetAngle = 6,0 Play = 0,Fire2,80 diff --git a/PBS/Animations/Converted/Move/WINGATTACK.txt b/PBS/Animations/Converted/Move/WINGATTACK.txt index a87a5b6ef..bf6ce8c78 100644 --- a/PBS/Animations/Converted/Move/WINGATTACK.txt +++ b/PBS/Animations/Converted/Move/WINGATTACK.txt @@ -3,16 +3,30 @@ [Move,WINGATTACK] Name = WINGATTACK - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Wind1 Focus = Target - SetX = 0,392 - SetY = 0,94 + SetX = 0,8 + SetY = 0,-2 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 + SetFrame = 6,6 + SetFrame = 7,7 + SetFrame = 8,8 + SetFrame = 9,9 + SetFrame = 11,10 + SetFrame = 12,11 + SetFrame = 13,12 + SetFrame = 14,13 Play = 0,Wind1,80 Play = 2,Wind5,80 diff --git a/PBS/Animations/Converted/Move/WRAP.txt b/PBS/Animations/Converted/Move/WRAP.txt index ddb835963..cfaa2230d 100644 --- a/PBS/Animations/Converted/Move/WRAP.txt +++ b/PBS/Animations/Converted/Move/WRAP.txt @@ -3,42 +3,45 @@ [Move,WRAP] Name = WRAP - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Struggle Focus = Target - SetX = 0,440 - SetY = 0,102 - SetX = 1,480 - SetY = 1,94 - SetX = 2,488 - SetY = 2,102 - SetX = 3,464 - SetY = 3,94 - SetX = 4,432 - SetX = 5,464 - SetX = 6,496 - SetY = 6,102 - SetX = 7,480 + SetFrame = 0,1 + SetX = 0,56 + SetY = 0,6 + SetZ = 0,28 + SetX = 1,96 + SetY = 1,-2 + SetX = 2,104 + SetY = 2,6 + SetX = 3,80 + SetY = 3,-2 + SetX = 4,48 + SetX = 5,80 + SetX = 6,112 + SetY = 6,6 + SetX = 7,96 Graphic = Struggle Focus = Target - SetX = 0,320 - SetY = 0,102 - SetX = 1,288 - SetY = 1,94 - SetX = 2,240 - SetY = 2,102 - SetX = 3,264 - SetY = 3,94 - SetX = 4,296 - SetX = 5,256 - SetX = 6,216 - SetX = 7,264 + SetX = 0,-64 + SetY = 0,6 + SetZ = 0,27 + SetX = 1,-96 + SetY = 1,-2 + SetX = 2,-144 + SetY = 2,6 + SetX = 3,-120 + SetY = 3,-2 + SetX = 4,-88 + SetX = 5,-128 + SetX = 6,-168 + SetX = 7,-120 Play = 0,Slash10,80 Play = 3,Slash10,80 diff --git a/PBS/Animations/Converted/Move/WRINGOUT.txt b/PBS/Animations/Converted/Move/WRINGOUT.txt index 492aea149..2c5f945bf 100644 --- a/PBS/Animations/Converted/Move/WRINGOUT.txt +++ b/PBS/Animations/Converted/Move/WRINGOUT.txt @@ -3,53 +3,55 @@ [Move,WRINGOUT] Name = WRINGOUT - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Fakeout Focus = Target - SetX = 0,273 - SetY = 0,84 - SetX = 1,283 - SetY = 1,139 - SetX = 2,323 - SetY = 2,177 - SetX = 3,361 - SetY = 3,183 - SetX = 4,391 - SetY = 4,168 - SetX = 5,399 - SetY = 5,127 - SetX = 6,408 - SetY = 6,104 - SetX = 7,375 - SetY = 7,75 - SetX = 8,314 - SetY = 8,66 - SetX = 9,288 - SetY = 9,118 - SetX = 10,299 - SetY = 10,166 - SetX = 11,358 - SetY = 11,178 - SetX = 12,400 - SetY = 12,153 - SetX = 13,401 - SetY = 13,108 - SetX = 14,376 - SetY = 14,79 - SetX = 15,320 - SetY = 15,73 - SetX = 16,290 - SetY = 16,115 - SetX = 17,305 - SetY = 17,158 - SetX = 18,366 - SetY = 18,185 - SetX = 19,430 - SetY = 19,161 + SetFrame = 0,5 + SetX = 0,-111 + SetY = 0,-12 + SetZ = 0,27 + SetX = 1,-101 + SetY = 1,43 + SetX = 2,-61 + SetY = 2,81 + SetX = 3,-23 + SetY = 3,87 + SetX = 4,7 + SetY = 4,72 + SetX = 5,15 + SetY = 5,31 + SetX = 6,24 + SetY = 6,8 + SetX = 7,-9 + SetY = 7,-21 + SetX = 8,-70 + SetY = 8,-30 + SetX = 9,-96 + SetY = 9,22 + SetX = 10,-85 + SetY = 10,70 + SetX = 11,-26 + SetY = 11,82 + SetX = 12,16 + SetY = 12,57 + SetX = 13,17 + SetY = 13,12 + SetX = 14,-8 + SetY = 14,-17 + SetX = 15,-64 + SetY = 15,-23 + SetX = 16,-94 + SetY = 16,19 + SetX = 17,-79 + SetY = 17,62 + SetX = 18,-18 + SetY = 18,89 + SetX = 19,46 + SetY = 19,65 Play = 0,Wring Out diff --git a/PBS/Animations/Converted/Move/XSCISSOR.txt b/PBS/Animations/Converted/Move/XSCISSOR.txt index 317206c5c..ebb597a12 100644 --- a/PBS/Animations/Converted/Move/XSCISSOR.txt +++ b/PBS/Animations/Converted/Move/XSCISSOR.txt @@ -3,36 +3,43 @@ [Move,XSCISSOR] Name = XSCISSOR - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = X-Scizzor Focus = Target - SetX = 0,319 - SetY = 0,36 - SetX = 1,351 - SetY = 1,62 - SetX = 2,384 - SetY = 2,96 - SetX = 3,347 - SetY = 3,135 - SetX = 4,455 - SetY = 4,165 + SetFrame = 0,1 + SetX = 0,-65 + SetY = 0,-60 + SetZ = 0,28 + SetX = 1,-33 + SetY = 1,-34 + SetFrame = 2,0 + SetX = 2,0 + SetY = 2,0 + SetX = 3,-37 + SetY = 3,39 + SetFrame = 4,1 + SetX = 4,71 + SetY = 4,69 Graphic = X-Scizzor Focus = Target - SetX = 0,455 - SetY = 0,37 - SetX = 1,420 - SetY = 1,62 - SetX = 2,384 - SetY = 2,96 - SetX = 3,418 - SetY = 3,135 - SetX = 4,307 - SetY = 4,164 + SetX = 0,71 + SetY = 0,-59 + SetZ = 0,27 + SetX = 1,36 + SetY = 1,-34 + SetFrame = 2,1 + SetX = 2,0 + SetY = 2,0 + SetX = 3,34 + SetY = 3,39 + SetFrame = 4,0 + SetX = 4,-77 + SetY = 4,68 Play = 0,Slash,80 diff --git a/PBS/Animations/Converted/Move/ZAPCANNON.txt b/PBS/Animations/Converted/Move/ZAPCANNON.txt index c3d4becd2..1dfa328f8 100644 --- a/PBS/Animations/Converted/Move/ZAPCANNON.txt +++ b/PBS/Animations/Converted/Move/ZAPCANNON.txt @@ -3,19 +3,27 @@ [Move,ZAPCANNON] Name = ZAPCANNON - SetX = 0,128 - SetY = 0,224 + SetX = 0,0 + SetY = 0,0 - SetX = 0,384 - SetY = 0,96 + SetX = 0,0 + SetY = 0,0 Graphic = Thunder2 Focus = Target - SetX = 0,384 - SetY = 0,86 + SetX = 0,0 + SetY = 0,-10 + SetZ = 0,27 + SetFrame = 1,1 + SetFrame = 2,2 + SetFrame = 3,3 + SetFrame = 4,4 + SetFrame = 5,5 SetFlip = 6,true SetAngle = 6,180 + SetFrame = 7,4 SetOpacity = 7,100 + SetFrame = 8,3 SetAngle = 8,18 Play = 0,Thunder9,80 From 67acf46859c48cd649f86291881d2414a8cf291a Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 15 Feb 2024 20:15:03 +0000 Subject: [PATCH 19/49] Added new/shift buttons to Anim Editor timeline --- .../Control elements/007b_BitmapButton.rb | 30 +++++ .../902_Anim GameData/001_Animation.rb | 2 +- .../904_Anim Editor/001_AnimationEditor.rb | 80 ++++++++----- .../904_Anim Editor/901_ParticleDataHelper.rb | 49 +++++++- .../Anim Editor elements/001_Canvas.rb | 22 +++- .../Anim Editor elements/003_ParticleList.rb | 105 +++++++++++++++++- 6 files changed, 249 insertions(+), 39 deletions(-) create mode 100644 Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb diff --git a/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb b/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb new file mode 100644 index 000000000..7b3b258bf --- /dev/null +++ b/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb @@ -0,0 +1,30 @@ +#=============================================================================== +# +#=============================================================================== +class UIControls::BitmapButton < UIControls::Button + BUTTON_PADDING = 4 + + def initialize(x, y, viewport, button_bitmap) + super(button_bitmap.width + (BUTTON_PADDING * 2), button_bitmap.height + (BUTTON_PADDING * 2), viewport) + self.x = x + self.y = y + @button_bitmap = button_bitmap + end + + def set_interactive_rects + @interactions&.clear + @button_rect = Rect.new(0, 0, width, height) + @interactions = { + :button => @button_rect + } + end + + #----------------------------------------------------------------------------- + + def refresh + super + # Draw button bitmap + self.bitmap.blt(BUTTON_PADDING, BUTTON_PADDING, @button_bitmap, + Rect.new(0, 0, @button_bitmap.width, @button_bitmap.height)) + end +end diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 29972842b..5c32f614f 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -40,7 +40,7 @@ module GameData "EaseOut" => :ease_out, "EaseBoth" => :ease_both } - USER_AND_TARGET_SEPARATION = [200, -200, -200] # x, y, z (from user to target) + USER_AND_TARGET_SEPARATION = [200, -200, -100] # x, y, z (from user to target) # Properties that apply to the animation in general, not to individual # particles. They don't change during the animation. diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 7464fa212..386e9743d 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -206,8 +206,8 @@ class AnimationEditor def set_commands_pane_contents commands_pane = @components[:commands_pane] commands_pane.add_header_label(:header, _INTL("Edit particle at keyframe")) - commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -200, 200, 0) - commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -200, 200, 0) + commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -999, 999, 0) + commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -999, 999, 0) commands_pane.add_labelled_number_slider(:z, _INTL("Priority"), -50, 50, 0) # TODO: If the graphic is user's sprite/target's sprite, make :frame instead # a choice of front/back/same as the main sprite/opposite of the main @@ -257,7 +257,7 @@ class AnimationEditor particle_pane.get_control(:name).set_blacklist("User", "Target", "SE") particle_pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") particle_pane.add_labelled_button(:graphic, "", _INTL("Change")) - particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :user) + particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :undefined) # FlipIfFoe # RotateIfFoe # Delete button (if not "User"/"Target"/"SE") @@ -430,6 +430,8 @@ class AnimationEditor @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) end + #----------------------------------------------------------------------------- + def refresh_component_visibility(component_sym) component = @components[component_sym] # Panes are all mutually exclusive @@ -478,26 +480,6 @@ class AnimationEditor # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, # which should be indicated somehow in ctrl[1]. end - # Set an appropriate range for the X and Y properties depending on the - # particle's focus - case @anim[:particles][particle_index][:focus] - when :foreground, :midground, :background # Cover the whole screen - component.get_control(:x).min_value = -128 - component.get_control(:x).max_value = CANVAS_WIDTH + 128 - component.get_control(:y).min_value = -128 - component.get_control(:y).max_value = CANVAS_HEIGHT + 128 - when :user, :target, :user_side_foreground, :user_side_background, - :target_side_foreground, :target_side_background # Around the focus - component.get_control(:x).min_value = -CANVAS_WIDTH - component.get_control(:x).max_value = CANVAS_WIDTH - component.get_control(:y).min_value = -CANVAS_HEIGHT - component.get_control(:y).max_value = CANVAS_HEIGHT - when :user_and_target # Covers both foci - component.get_control(:x).min_value = -CANVAS_WIDTH - component.get_control(:x).max_value = GameData::Animation::USER_AND_TARGET_SEPARATION[0] + CANVAS_WIDTH - component.get_control(:y).min_value = GameData::Animation::USER_AND_TARGET_SEPARATION[1] - CANVAS_HEIGHT - component.get_control(:y).max_value = CANVAS_HEIGHT - end # Set an appropriate range for the priority (z) property depending on the # particle's focus case @anim[:particles][particle_index][:focus] @@ -598,6 +580,20 @@ class AnimationEditor :target_side_background => _INTL("Behind target's side") } end + when :particle_list + # Disable the "move particle up/down" buttons if the selected particle + # can't move that way (or there is no selected particle) + cur_index = particle_index + if cur_index < 1 + component.get_control(:move_particle_up).disable + else + component.get_control(:move_particle_up).enable + end + if cur_index < 0 || cur_index >= @anim[:particles].length - 2 + component.get_control(:move_particle_down).disable + else + component.get_control(:move_particle_down).enable + end when :animation_properties refresh_move_property_options case @anim[:type] @@ -721,8 +717,33 @@ class AnimationEditor when :keyframe_pane # TODO: Stuff here once I decide what controls to add. when :particle_list -# refresh if keyframe != old_keyframe || particle_index != old_particle_index - # TODO: Lots of stuff here when buttons are added to it. + case property + when :add_particle + new_idx = particle_index + if new_idx >= 0 + new_idx += 1 + new_idx = @anim[:particles].length - 1 if new_idx == 0 || new_idx >= @anim[:particles].length + end + AnimationEditor::ParticleDataHelper.add_particle(@anim[:particles], new_idx) + @components[:particle_list].set_particles(@anim[:particles]) + @components[:particle_list].particle_index = (new_idx >= 0) ? new_idx : @anim[:particles].length - 2 + @components[:particle_list].keyframe = -1 + refresh + when :move_particle_up + idx1 = particle_index + idx2 = idx1 - 1 + AnimationEditor::ParticleDataHelper.swap_particles(@anim[:particles], idx1, idx2) + @components[:particle_list].set_particles(@anim[:particles]) + @components[:particle_list].particle_index = idx2 + refresh + when :move_particle_down + idx1 = particle_index + idx2 = idx1 + 1 + AnimationEditor::ParticleDataHelper.swap_particles(@anim[:particles], idx1, idx2) + @components[:particle_list].set_particles(@anim[:particles]) + @components[:particle_list].particle_index = idx2 + refresh + end when :animation_properties # TODO: Will changes here need to refresh any other components (e.g. side # panes)? Probably. @@ -769,14 +790,15 @@ class AnimationEditor if component.respond_to?("values") # TODO: Make undo/redo snapshot. values = component.values - values.each_pair do |property, value| - apply_changed_value(sym, property, value) + if values + values.each_pair do |property, value| + apply_changed_value(sym, property, value) + end end end component.clear_changed end - # TODO: Call repaint only if component responds to it? Canvas won't. - component.repaint if sym == :particle_list || sym == :menu_bar + component.repaint if [:particle_list, :menu_bar].include?(sym) if @captured @captured = nil if !component.busy? break diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 3aa2bb22b..94ee451dd 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -190,17 +190,37 @@ module AnimationEditor::ParticleDataHelper end interps[frame] = interp if interp != :none set_points[frame] = value + # For visibility only, set the keyframe with the first command (of any kind) + # to be visible, unless the command being added overwrites it. Also figure + # out the first keyframe that has a command, and the first keyframe that has + # a non-visibility command (used below). + if property == :visible + first_cmd = (["User", "Target", "SE"].include?(particle[:name])) ? 0 : -1 + first_non_visible_cmd = -1 + particle.each_pair do |prop, value| + next if !value.is_a?(Array) || value.length == 0 + next if prop == property && value[0][0] == frame + first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0] + next if prop == :visible + first_non_visible_cmd = value[0][0] if first_non_visible_cmd < 0 || first_non_visible_cmd > value[0][0] + end + set_points[first_cmd] = true if first_cmd >= 0 && set_points[first_cmd].nil? + end # Convert points and interps back into particle[property] ret = [] if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) raise _INTL("Couldn't get default value for property {1}.", property) end val = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[property] - val = true if property == :visible && ["User", "Target", "SE"].include?(particle[:name]) length = [set_points.length, end_points.length].max length.times do |i| - if !set_points[i].nil? && set_points[i] != val - ret.push([i, 0, set_points[i]]) + if !set_points[i].nil? + if property == :visible && first_cmd >= 0 && i == first_cmd && + first_non_visible_cmd >= 0 && i == first_non_visible_cmd + ret.push([i, 0, set_points[i]]) if !set_points[i] + elsif set_points[i] != val + ret.push([i, 0, set_points[i]]) + end val = set_points[i] end if interps[i] && interps[i] != :none @@ -296,4 +316,27 @@ module AnimationEditor::ParticleDataHelper particle.delete(:se) if particle[:se].empty? end end + + #----------------------------------------------------------------------------- + + # Creates a new particle and inserts it at index. If there is a particle above + # the new one, the new particle will inherit its focus; otherwise it gets a + # default focus of :foreground. + def add_particle(particles, index) + new_particle = { + :name => _INTL("New particle"), + :graphic => GameData::Animation::PARTICLE_DEFAULT_VALUES[:graphic], + :focus => GameData::Animation::PARTICLE_DEFAULT_VALUES[:focus] + } + if index > 0 && index <= particles.length - 1 + old_particle = particles[index - 1] + new_particle[:focus] = old_particle[:focus] + end + index = particles.length - 1 if index < 0 + particles.insert(index, new_particle) + end + + def swap_particles(particles, index1, index2) + particles[index1], particles[index2] = particles[index2], particles[index1] + end end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 78854821e..abec007c1 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -299,7 +299,7 @@ class AnimationEditor::Canvas < Sprite spr.x = user_pos[0] + ((values[:x].to_f / distance[0]) * (target_pos[0] - user_pos[0])).to_i spr.y = user_pos[1] + ((values[:y].to_f / distance[1]) * (target_pos[1] - user_pos[1])).to_i when :user_side_foreground, :user_side_background - base_coords = Battle::Scene.pbBattlerPosition(target_idx) + base_coords = Battle::Scene.pbBattlerPosition(user_index) spr.x += base_coords[0] spr.y += base_coords[1] when :target_side_foreground, :target_side_background @@ -350,9 +350,12 @@ class AnimationEditor::Canvas < Sprite spr.y += spr.bitmap.height / 2 else spr.bitmap = RPG::Cache.load_bitmap("Graphics/Battle animations/", particle[:graphic]) - # TODO: Set the oy to spr.bitmap.height if particle[:graphic] has - # something special in it (don't know what yet). - if spr.bitmap.width > spr.bitmap.height * 2 + if [:foreground, :midground, :background].include?(particle[:focus]) && + spr.bitmap.width == AnimationEditor::CANVAS_WIDTH && + spr.bitmap.height >= AnimationEditor::CANVAS_HEIGHT - @message_bar_sprite.y + spr.ox = 0 + spr.oy = 0 + elsif spr.bitmap.width > spr.bitmap.height * 2 spr.src_rect.set(values[:frame] * spr.bitmap.height, 0, spr.bitmap.height, spr.bitmap.height) spr.ox = spr.bitmap.height / 2 spr.oy = spr.bitmap.height / 2 @@ -361,6 +364,9 @@ class AnimationEditor::Canvas < Sprite spr.ox = spr.bitmap.width / 2 spr.oy = spr.bitmap.height / 2 end + if particle[:graphic][/\[\s*bottom\s*\]\s*$/i] # [bottom] at end of filename + spr.oy = spr.bitmap.height + end end # Set z (priority) spr.z = values[:z] @@ -379,7 +385,13 @@ class AnimationEditor::Canvas < Sprite user_pos = 1000 + ((100 * ((user_index / 2) + 1)) * (user_index.even? ? 1 : -1)) target_pos = 1000 + ((100 * ((target_idx / 2) + 1)) * (target_idx.even? ? 1 : -1)) distance = GameData::Animation::USER_AND_TARGET_SEPARATION[2] - spr.z = user_pos + ((values[:z].to_f / distance) * (target_pos - user_pos)).to_i + if values[:z] >= 0 + spr.z += user_pos + elsif values[:z] <= distance + spr.z += target_pos + else + spr.z = user_pos + ((values[:z].to_f / distance) * (target_pos - user_pos)).to_i + end when :user_side_foreground, :target_side_foreground this_idx = (particle[:focus] == :user_side_foreground) ? user_index : target_idx spr.z += 1000 diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 9377d4d58..a24a29bed 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -1,5 +1,6 @@ #=============================================================================== -# +# TODO: The Add/Up/Down buttons don't get captured, and don't prevent anything +# else in this control highlighting when hovered over, and vice versa. #=============================================================================== class AnimationEditor::ParticleList < UIControls::BaseControl VIEWPORT_SPACING = 1 @@ -33,6 +34,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl SE_CONTROL_BG = Color.gray attr_reader :keyframe # The selected keyframe + attr_reader :values def initialize(x, y, width, height, viewport) super(width, height, viewport) @@ -75,6 +77,23 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @position_viewport) @position_sprite.ox = @position_sprite.width / 2 @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, Color.red) + # Selected particle line sprite + @particle_line_sprite = BitmapSprite.new(@position_viewport.rect.width, 3, @commands_viewport) + @particle_line_sprite.z = -10 + @particle_line_sprite.oy = @particle_line_sprite.height / 2 + @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, Color.red) + # Buttons and button bitmaps + initialze_button_bitmaps + @controls = [] + add_particle_button = UIControls::BitmapButton.new(x + 1, y + 1, viewport, @add_button_bitmap) + add_particle_button.set_interactive_rects + @controls.push([:add_particle, add_particle_button]) + up_particle_button = UIControls::BitmapButton.new(x + 22, y + 1, viewport, @up_button_bitmap) + up_particle_button.set_interactive_rects + @controls.push([:move_particle_up, up_particle_button]) + down_particle_button = UIControls::BitmapButton.new(x + 43, y + 1, viewport, @down_button_bitmap) + down_particle_button.set_interactive_rects + @controls.push([:move_particle_down, down_particle_button]) # List sprites and commands sprites @list_sprites = [] @commands_bg_sprites = [] @@ -94,6 +113,22 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands = {} end + def initialze_button_bitmaps + @add_button_bitmap = Bitmap.new(12, 12) + @add_button_bitmap.fill_rect(1, 5, 10, 2, TEXT_COLOR) + @add_button_bitmap.fill_rect(5, 1, 2, 10, TEXT_COLOR) + @up_button_bitmap = Bitmap.new(12, 12) + 5.times do |i| + @up_button_bitmap.fill_rect(1 + i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) + @up_button_bitmap.fill_rect(10 - i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) + end + @down_button_bitmap = Bitmap.new(12, 12) + 5.times do |i| + @down_button_bitmap.fill_rect(1 + i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) + @down_button_bitmap.fill_rect(10 - i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) + end + end + def draw_control_background self.bitmap.clear # Separator lines @@ -117,6 +152,12 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @time_scrollbar.dispose @timeline_sprite.dispose @position_sprite.dispose + @particle_line_sprite.dispose + @controls.each { |c| c[1].dispose } + @controls.clear + @add_button_bitmap.dispose + @up_button_bitmap.dispose + @down_button_bitmap.dispose dispose_listed_sprites @list_viewport.dispose @commands_bg_viewport.dispose @@ -133,6 +174,19 @@ class AnimationEditor::ParticleList < UIControls::BaseControl return (ret.is_a?(Array)) ? ret[0] : ret end + def particle_index=(val) + old_index = @row_index + @row_index = @particle_list.index { |row| (row.is_a?(Array) && row[0] == val) || + (!row.is_a?(Array) && row == val) } + invalidate if @row_index != old_index + end + + def keyframe=(val) + return if @keyframe == val + @keyframe = val + invalidate + end + def top_pos=(val) old_val = @top_pos total_height = (@particle_list.length * ROW_HEIGHT) + 1 @@ -146,6 +200,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands_bg_viewport.oy = @top_pos @commands_viewport.oy = @top_pos if @top_pos != old_val + refresh_particle_line invalidate_rows @old_top_pos = old_val end @@ -247,6 +302,34 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @invalid_commands = false end + def busy? + return true if @controls.any? { |c| c[1].busy? } + return super + end + + def changed? + return @changed + end + + def set_changed + @changed = true + @values = {} + end + + def clear_changed + super + @values = nil + end + + def get_control(id) + ret = nil + @controls.each do |c| + ret = c[1] if c[0] == id + break if ret + end + return ret + end + #----------------------------------------------------------------------------- def calculate_duration @@ -383,6 +466,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl :flip => _INTL("Flip"), :x => _INTL("X"), :y => _INTL("Y"), + :z => _INTL("Priority"), :zoom_x => _INTL("Zoom X"), :zoom_y => _INTL("Zoom Y"), :angle => _INTL("Angle"), @@ -394,6 +478,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def repaint @list_scrollbar.repaint if @list_scrollbar.invalid? @time_scrollbar.repaint if @time_scrollbar.invalid? + @controls.each { |c| c[1].repaint if c[1].invalid? } super if invalid? end @@ -437,6 +522,13 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end + def refresh_particle_line + @particle_line_sprite.visible = (particle_index >= 0) + if particle_index >= 0 + @particle_line_sprite.y = ((@row_index + 0.5) * ROW_HEIGHT).to_i + end + end + # TODO: Add indicator that this is selected (if so). Some kind of arrow on the # left, or a red horizontal line (like the keyframe's vertical line), or # fill_rect with colour instead of outline_rect? @@ -576,6 +668,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def refresh @old_top_pos = nil if @invalid + @controls.each { |c| c[1].refresh } draw_area_highlight refresh_timeline if @invalid || @invalid_time each_visible_particle do |i| @@ -717,12 +810,22 @@ class AnimationEditor::ParticleList < UIControls::BaseControl return if !self.visible @list_scrollbar.update @time_scrollbar.update + @controls.each { |c| c[1].update } super # Refresh sprites if a scrollbar has been moved self.top_pos = @list_scrollbar.position self.left_pos = @time_scrollbar.position # Update the current keyframe line's position refresh_position_line + # Update the selected particle line's position + refresh_particle_line + # Add/move particle buttons + @controls.each do |c| + next if !c[1].changed? + set_changed + @values[c[0]] = true + c[1].clear_changed + end if Input.release?(Input::MOUSERIGHT) on_right_mouse_release From f0fae4b9ecfc898d8d9c69f0524119346287a878 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 29 Feb 2024 00:54:01 +0000 Subject: [PATCH 20/49] Anim Editor: added NoUser property, added buttons to duplicate/delete particle and delete single commands --- .../801_UI controls/002_ControlsContainer.rb | 5 +- .../Control elements/006_NumberTextBox.rb | 28 ++-- .../Control elements/007b_BitmapButton.rb | 12 +- .../902_Anim GameData/001_Animation.rb | 10 +- .../903_Anim Compiler/001_Anim compiler.rb | 21 ++- .../904_Anim Editor/001_AnimationEditor.rb | 139 +++++++++++++----- .../002_AnimationEditor_popups.rb | 1 + .../904_Anim Editor/901_ParticleDataHelper.rb | 64 ++++++++ .../Anim Editor elements/001_Canvas.rb | 2 +- .../Anim Editor elements/003_ParticleList.rb | 9 +- 10 files changed, 229 insertions(+), 62 deletions(-) diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index 1978ef8fb..2151ae4dd 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -14,13 +14,14 @@ class UIControls::ControlsContainer OFFSET_FROM_LABEL_X = 90 OFFSET_FROM_LABEL_Y = 0 - def initialize(x, y, width, height) + def initialize(x, y, width, height, right_margin = 0) @viewport = Viewport.new(x, y, width, height) @viewport.z = 99999 @x = x @y = y @width = width @height = height + @right_margin = right_margin @label_offset_x = OFFSET_FROM_LABEL_X @label_offset_y = OFFSET_FROM_LABEL_Y @controls = [] @@ -193,7 +194,7 @@ class UIControls::ControlsContainer def control_size(has_label = false) if has_label - return @width - @label_offset_x, LINE_SPACING - @label_offset_y + return @width - @label_offset_x - @right_margin, LINE_SPACING - @label_offset_y end return @width, LINE_SPACING end diff --git a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb index 6316a1c27..a4886bd43 100644 --- a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb @@ -41,9 +41,14 @@ class UIControls::NumberTextBox < UIControls::TextBox self.invalidate end - # TODO: If current value is 0, replace it with ch instead of inserting ch? - def insert_char(ch) - self.value = @value.to_s.insert(@cursor_pos, ch).to_i + def insert_char(ch, index = -1) + old_val = @value + if @value == 0 + @value = ch.to_i + else + self.value = @value.to_s.insert((index >= 0) ? index : @cursor_pos, ch).to_i + end + return if @value == old_val @cursor_pos += 1 @cursor_pos = @cursor_pos.clamp(0, @value.to_s.length) @cursor_timer = System.uptime @@ -107,17 +112,20 @@ class UIControls::NumberTextBox < UIControls::TextBox def update_text_entry ret = false Input.gets.each_char do |ch| - next if !["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "-"].include?(ch) - if ch == "-" - next if @min_value >= 0 || @cursor_pos > 1 || (@cursor_pos > 0 && @value >= 0) - if @value < 0 + case ch + when "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" + insert_char(ch) + ret = true + when "-", "+" + if @value > 0 && @min_value < 0 && ch == "-" + insert_char(ch, 0) # Add a negative sign at the start + ret = true + elsif @value < 0 delete_at(0) # Remove the negative sign ret = true - next end + next end - insert_char(ch) - ret = true end return ret end diff --git a/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb b/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb index 7b3b258bf..443590016 100644 --- a/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb +++ b/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb @@ -4,11 +4,12 @@ class UIControls::BitmapButton < UIControls::Button BUTTON_PADDING = 4 - def initialize(x, y, viewport, button_bitmap) + def initialize(x, y, viewport, button_bitmap, disabled_bitmap = nil) super(button_bitmap.width + (BUTTON_PADDING * 2), button_bitmap.height + (BUTTON_PADDING * 2), viewport) self.x = x self.y = y @button_bitmap = button_bitmap + @disabled_bitmap = disabled_bitmap end def set_interactive_rects @@ -24,7 +25,12 @@ class UIControls::BitmapButton < UIControls::Button def refresh super # Draw button bitmap - self.bitmap.blt(BUTTON_PADDING, BUTTON_PADDING, @button_bitmap, - Rect.new(0, 0, @button_bitmap.width, @button_bitmap.height)) + if @disabled_bitmap && disabled? + self.bitmap.blt(BUTTON_PADDING, BUTTON_PADDING, @disabled_bitmap, + Rect.new(0, 0, @disabled_bitmap.width, @disabled_bitmap.height)) + else + self.bitmap.blt(BUTTON_PADDING, BUTTON_PADDING, @button_bitmap, + Rect.new(0, 0, @button_bitmap.width, @button_bitmap.height)) + end end end diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 5c32f614f..c83991760 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -4,6 +4,7 @@ module GameData attr_reader :move # Either the move's ID or the common animation's name (both are strings) attr_reader :version # Hit number attr_reader :name # Shown in the sublist; cosmetic only + attr_reader :no_user # Whether there is no "User" particle (false by default) attr_reader :no_target # Whether there is no "Target" particle (false by default) attr_reader :ignore # Whether the animation can't be played in battle attr_reader :flags @@ -14,7 +15,7 @@ module GameData DATA_FILENAME = "animations.dat" OPTIONAL = true - # TODO: All mentions of focus types can be found by searching for + # NOTE: All mentions of focus types can be found by searching for # :user_and_target, plus there's :foreground in PARTICLE_DEFAULT_VALUES # below. # TODO: Add :user_ground, :target_ground? @@ -30,6 +31,9 @@ module GameData "TargetSide" => :target_side_foreground, "TargetSideBackground" => :target_side_background, } + FOCUS_TYPES_WITH_USER = [ + :user, :user_and_target, :user_side_foreground, :user_side_background + ] FOCUS_TYPES_WITH_TARGET = [ :target, :user_and_target, :target_side_foreground, :target_side_background ] @@ -48,6 +52,7 @@ module GameData "SectionName" => [:id, "esU", {"Move" => :move, "OppMove" => :opp_move, "Common" => :common, "OppCommon" => :opp_common}], "Name" => [:name, "s"], + "NoUser" => [:no_user, "b"], "NoTarget" => [:no_target, "b"], "Ignore" => [:ignore, "b"], # TODO: Boolean for whether the animation will be played if the target is @@ -184,6 +189,7 @@ module GameData ret[:move] = move if !move.nil? ret[:version] = 0 ret[:name] = _INTL("New animation") + ret[:no_user] = false ret[:no_target] = false ret[:ignore] = false ret[:particles] = [ @@ -202,6 +208,7 @@ module GameData @move = hash[:move] @version = hash[:version] || 0 @name = hash[:name] + @no_user = hash[:no_user] || false @no_target = hash[:no_target] || false @ignore = hash[:ignore] || false @particles = hash[:particles] || [] @@ -217,6 +224,7 @@ module GameData ret[:move] = @move ret[:version] = @version ret[:name] = @name + ret[:no_user] = @no_user ret[:no_target] = @no_target ret[:ignore] = @ignore ret[:particles] = [] # Clone the @particles array, which is nested hashes and arrays diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index aeb088893..fb61aadab 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -94,12 +94,21 @@ module Compiler hash[:type] = hash[:id][0] hash[:move] = hash[:id][1] hash[:version] = hash[:id][2] || 0 + # Ensure there is at most one each of "User", "Target" and "SE" particles + ["User", "Target", "SE"].each do |type| + next if hash[:particles].count { |particle| particle[:name] == type } <= 1 + raise _INTL("Animation has more than 1 \"{1}\" particle, which isn't allowed.", type) + "\n" + FileLineData.linereport + end + # Ensure there is no "User" particle if "NoUser" is set + if hash[:particles].any? { |particle| particle[:name] == "User" } && hash[:no_user] + raise _INTL("Can't define a \"User\" particle and also set property \"NoUser\" to true.") + "\n" + FileLineData.linereport + end # Ensure there is no "Target" particle if "NoTarget" is set if hash[:particles].any? { |particle| particle[:name] == "Target" } && hash[:no_target] raise _INTL("Can't define a \"Target\" particle and also set property \"NoTarget\" to true.") + "\n" + FileLineData.linereport end - # Create "User", "SE" and "Target" particles if they don't exist but should - if hash[:particles].none? { |particle| particle[:name] == "User" } + # Create "User", "Target" and "SE" particles if they don't exist but should + if hash[:particles].none? { |particle| particle[:name] == "User" } && !hash[:no_user] hash[:particles].push({:name => "User"}) end if hash[:particles].none? { |particle| particle[:name] == "Target" } && !hash[:no_target] @@ -145,8 +154,12 @@ module Compiler when "Target" then particle[:graphic] = "TARGET" end end - # TODO: Ensure that particles don't have a focus involving a user if the - # animation itself doesn't involve a user. + # Ensure that particles don't have a focus involving a user if the + # animation itself doesn't involve a user + if hash[:no_user] && GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) + raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a user if property \"NoUser\" is set to true.", + particle[:name]) + "\n" + FileLineData.linereport + end # Ensure that particles don't have a focus involving a target if the # animation itself doesn't involve a target if hash[:no_target] && GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 386e9743d..49487c746 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -2,10 +2,9 @@ # #=============================================================================== class AnimationEditor - WINDOW_WIDTH = Settings::SCREEN_WIDTH + (32 * 10) - WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + (32 * 10) - BORDER_THICKNESS = 4 + WINDOW_WIDTH = Settings::SCREEN_WIDTH + 328 + (BORDER_THICKNESS * 4) + WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + 320 + (BORDER_THICKNESS * 4) # Components MENU_BAR_WIDTH = WINDOW_WIDTH @@ -25,6 +24,7 @@ class AnimationEditor SIDE_PANE_Y = CANVAS_Y SIDE_PANE_WIDTH = WINDOW_WIDTH - SIDE_PANE_X - BORDER_THICKNESS SIDE_PANE_HEIGHT = CANVAS_HEIGHT + PLAY_CONTROLS_HEIGHT + (BORDER_THICKNESS * 2) + SIDE_PANE_DELETE_MARGIN = 32 PARTICLE_LIST_X = BORDER_THICKNESS PARTICLE_LIST_Y = SIDE_PANE_Y + SIDE_PANE_HEIGHT + (BORDER_THICKNESS * 2) @@ -82,6 +82,9 @@ class AnimationEditor "Swamp", "SwampOpp", "Toxic", "UseItem", "WideGuard", "Wrap" ] + DELETABLE_COMMAND_PANE_PROPERTIES = [ + :x, :y, :z, :frame, :visible, :opacity, :zoom_x, :zoom_y, :angle, :flip, :blending + ] def initialize(anim_id, anim) load_settings @@ -113,7 +116,8 @@ class AnimationEditor @components[:canvas] = AnimationEditor::Canvas.new(@canvas_viewport, @anim, @settings) # Side panes [:commands_pane, :se_pane, :particle_pane, :keyframe_pane].each do |pane| - @components[pane] = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT) + @components[pane] = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, + (pane == :commands_pane) ? SIDE_PANE_DELETE_MARGIN : 0) end # TODO: Make a side pane for colour/tone editor (accessed from # @components[:commands_pane] via a button; has Apply/Cancel buttons @@ -228,6 +232,27 @@ class AnimationEditor # commands_pane.add_labelled_button(:masking, _INTL("Masking"), _INTL("Edit")) # TODO: Add buttons that shift all commands from the current keyframe and # later forwards/backwards in time? + # Add all "delete" buttons + delete_bitmap = Bitmap.new(16, 16) + delete_disabled_bitmap = Bitmap.new(16, 16) + 14.times do |i| + case i + when 0, 13 then wid = 3 + when 1, 12 then wid = 4 + else wid = 5 + end + delete_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.red) + delete_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.red) + delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(160, 160, 160)) + delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(160, 160, 160)) + end + DELETABLE_COMMAND_PANE_PROPERTIES.each do |property| + parent = commands_pane.get_control(property) + btn = UIControls::BitmapButton.new(parent.x + parent.width + 6, parent.y + 2, + commands_pane.viewport, delete_bitmap, delete_disabled_bitmap) + btn.set_interactive_rects + commands_pane.controls.push([(property.to_s + "_delete").to_sym, btn]) + end end def set_se_pane_contents @@ -260,8 +285,10 @@ class AnimationEditor particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :undefined) # FlipIfFoe # RotateIfFoe - # Delete button (if not "User"/"Target"/"SE") # Duplicate button + particle_pane.add_button(:duplicate, _INTL("Duplicate this particle")) + # Delete button (if not "User"/"Target"/"SE") + particle_pane.add_button(:delete, _INTL("Delete this particle")) # Shift all command timings by X keyframes (text box and button) # Move particle up/down the list? end @@ -308,6 +335,8 @@ class AnimationEditor # Create filepath controls # TODO: Have two TextBoxes, one for folder and one for filename? anim_properties.add_labelled_text_box(:pbs_path, _INTL("PBS filepath"), "") + # Create "involves a user" control + anim_properties.add_labelled_checkbox(:has_user, _INTL("Involves a user?"), true) # Create "involves a target" control anim_properties.add_labelled_checkbox(:has_target, _INTL("Involves a target?"), true) # Create flags control @@ -499,6 +528,14 @@ class AnimationEditor else component.get_control(:frame).enable end + # Enable/disable property delete buttons + DELETABLE_COMMAND_PANE_PROPERTIES.each do |property| + if AnimationEditor::ParticleDataHelper.has_command_at?(@anim[:particles][particle_index], property, keyframe) + component.get_control((property.to_s + "_delete").to_sym).enable + else + component.get_control((property.to_s + "_delete").to_sym).disable + end + end when :se_pane se_particle = @anim[:particles].select { |p| p[:name] == "SE" }[0] kyfrm = keyframe @@ -554,32 +591,39 @@ class AnimationEditor component.get_control(:graphic).enable component.get_control(:focus).enable end - # Set the possible foci depending on whether the animation involves a - # target - # TODO: Also filter for user/no user if implemented. - if @anim[:no_target] - component.get_control(:focus).values = { - :foreground => _INTL("Foreground"), - :midground => _INTL("Midground"), - :background => _INTL("Background"), - :user => _INTL("User"), - :user_side_foreground => _INTL("In front of user's side"), - :user_side_background => _INTL("Behind user's side") - } + # Enable/disable the Duplicate button + if ["SE"].include?(@anim[:particles][particle_index][:name]) + component.get_control(:duplicate).disable else - component.get_control(:focus).values = { - :foreground => _INTL("Foreground"), - :midground => _INTL("Midground"), - :background => _INTL("Background"), - :user => _INTL("User"), - :target => _INTL("Target"), - :user_and_target => _INTL("User and target"), - :user_side_foreground => _INTL("In front of user's side"), - :user_side_background => _INTL("Behind user's side"), - :target_side_foreground => _INTL("In front of target's side"), - :target_side_background => _INTL("Behind target's side") - } + component.get_control(:duplicate).enable end + # Enable/disable the Delete button + if ["User", "Target", "SE"].include?(@anim[:particles][particle_index][:name]) + component.get_control(:delete).disable + else + component.get_control(:delete).enable + end + # Set the possible foci depending on whether the animation involves a user + # and target + focus_values = { + :foreground => _INTL("Foreground"), + :midground => _INTL("Midground"), + :background => _INTL("Background"), + :user => _INTL("User"), + :target => _INTL("Target"), + :user_and_target => _INTL("User and target"), + :user_side_foreground => _INTL("In front of user's side"), + :user_side_background => _INTL("Behind user's side"), + :target_side_foreground => _INTL("In front of target's side"), + :target_side_background => _INTL("Behind target's side") + } + if @anim[:no_user] + GameData::Animation::FOCUS_TYPES_WITH_USER.each { |f| focus_values.delete(f) } + end + if @anim[:no_target] + GameData::Animation::FOCUS_TYPES_WITH_TARGET.each { |f| focus_values.delete(f) } + end + component.get_control(:focus).values = focus_values when :particle_list # Disable the "move particle up/down" buttons if the selected particle # can't move that way (or there is no selected particle) @@ -647,11 +691,17 @@ class AnimationEditor echoln "Color/Tone button clicked" else particle = @anim[:particles][particle_index] - new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) - if new_cmds - particle[property] = new_cmds + prop = property + if property.to_s[/_delete$/] + prop = property.to_s.sub(/_delete$/, "").to_sym + new_cmds = AnimationEditor::ParticleDataHelper.delete_command(particle, prop, keyframe) else - particle.delete(property) + new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) + end + if new_cmds + particle[prop] = new_cmds + else + particle.delete(prop) end @components[:particle_list].change_particle_commands(particle_index) @components[:play_controls].duration = @components[:particle_list].duration @@ -707,6 +757,18 @@ class AnimationEditor refresh_component(:particle_pane) refresh_component(:canvas) end + when :duplicate + AnimationEditor::ParticleDataHelper.duplicate_particle(@anim[:particles], particle_index) + @components[:particle_list].set_particles(@anim[:particles]) + @components[:particle_list].particle_index = particle_index + 1 + refresh + when :delete + if confirm_message(_INTL("Are you sure you want to delete this particle?")) + AnimationEditor::ParticleDataHelper.delete_particle(@anim[:particles], particle_index) + @components[:particle_list].set_particles(@anim[:particles]) + @components[:particle_list].keyframe = 0 if @anim[:particles][particle_index][:name] == "SE" + refresh + end else particle = @anim[:particles][particle_index] new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) @@ -762,10 +824,17 @@ class AnimationEditor when :pbs_path txt = value.gsub!(/\.txt$/, "") @anim[property] = txt + when :has_user + @anim[:no_user] = !value + # TODO: Add/delete the "User" particle accordingly, and change the foci + # of any other particle involving a user. Then refresh a lot of + # components. + refresh_component(:canvas) when :has_target @anim[:no_target] = !value - # TODO: Add/delete the "Target" particle accordingly. Then refresh a lot - # of components. + # TODO: Add/delete the "Target" particle accordingly, and change the + # foci of any other particle involving a target. Then refresh a + # lot of components. refresh_component(:canvas) when :usable @anim[:ignore] = !value diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 8612e5e70..2912f2302 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -96,6 +96,7 @@ class AnimationEditor anim_properties.get_control(:version).value = @anim[:version] || 0 anim_properties.get_control(:name).value = @anim[:name] || "" anim_properties.get_control(:pbs_path).value = (@anim[:pbs_path] || "unsorted") + ".txt" + anim_properties.get_control(:has_user).value = !@anim[:no_user] anim_properties.get_control(:has_target).value = !@anim[:no_target] anim_properties.get_control(:usable).value = !(@anim[:ignore] || false) # TODO: Populate flags. diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 94ee451dd..87fc8292d 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -167,6 +167,10 @@ module AnimationEditor::ParticleDataHelper particle[property] = value end + def has_command_at?(particle, property, frame) + return particle[property]&.any? { |cmd| (cmd[0] == frame) || (cmd[0] + cmd[1] == frame) } + end + def add_command(particle, property, frame, value) # Split particle[property] into values and interpolation arrays set_points = [] # All SetXYZ commands (the values thereof) @@ -244,6 +248,44 @@ module AnimationEditor::ParticleDataHelper return (ret.empty?) ? nil : ret end + # Cases: + # * SetXYZ - delete it + # * MoveXYZ start - turn into a SetXYZ at the end point + # * MoveXYZ end - delete it (this may happen to remove the start diamond too) + # * MoveXYZ end and start - merge both together (use first's type) + # * SetXYZ and MoveXYZ start - delete SetXYZ (leave MoveXYZ alone) + # * SetXYZ and MoveXYZ end - (unlikely) delete both + # * SetXYZ and MoveXYZ start and end - (unlikely) delete SetXYZ, merge Moves together + def delete_command(particle, property, frame) + # Find all relevant commands + set_now = nil + move_ending_now = nil + move_starting_now = nil + particle[property].each do |cmd| + if cmd[1] == 0 + set_now = cmd if cmd[0] == frame + else + move_starting_now = cmd if cmd[0] == frame + move_ending_now = cmd if cmd[0] + cmd[1] == frame + end + end + # Delete SetXYZ if it is at frame + particle[property].delete(set_now) if set_now + # Edit/delete MoveXYZ commands starting/ending at frame + if move_ending_now && move_starting_now # Merge both MoveXYZ commands + move_ending_now[1] += move_starting_now[1] + particle[property].delete(move_starting_now) + elsif move_ending_now # Delete MoveXYZ ending now + particle[property].delete(move_ending_now) + elsif move_starting_now && !set_now # Turn into SetXYZ at its end point + move_starting_now[0] += move_starting_now[1] + move_starting_now[1] = 0 + move_starting_now[3] = nil + move_starting_now.compact! + end + return (particle[property].empty?) ? nil : particle[property] + end + #----------------------------------------------------------------------------- def get_se_display_text(property, value) @@ -336,7 +378,29 @@ module AnimationEditor::ParticleDataHelper particles.insert(index, new_particle) end + # Copies the particle at index and inserts the copy immediately after that + # index. + def duplicate_particle(particles, index) + new_particle = {} + particles[index].each_pair do |key, value| + if value.is_a?(Array) + new_particle[key] = [] + value.each { |cmd| new_particle[key].push(cmd.clone) } + else + new_particle[key] = value.clone + end + end + new_particle[:name] += " (copy)" + particles.insert(index + 1, new_particle) + end + def swap_particles(particles, index1, index2) particles[index1], particles[index2] = particles[index2], particles[index1] end + + # Deletes the particle at the given index + def delete_particle(particles, index) + particles[index] = nil + particles.compact! + end end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index abec007c1..84b69755b 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -430,7 +430,7 @@ class AnimationEditor::Canvas < Sprite end @anim[:particles].each_with_index do |particle, i| if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) - refresh_particle(i) + refresh_particle(i) # Because there can be multiple targets else refresh_sprite(i) if particle[:name] != "SE" end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index a24a29bed..6ece125ee 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -7,7 +7,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl TIMELINE_HEIGHT = 24 - VIEWPORT_SPACING LIST_X = 0 LIST_Y = TIMELINE_HEIGHT + VIEWPORT_SPACING - LIST_WIDTH = 150 - VIEWPORT_SPACING + LIST_WIDTH = 180 - VIEWPORT_SPACING COMMANDS_X = LIST_WIDTH + VIEWPORT_SPACING COMMANDS_Y = LIST_Y @@ -83,7 +83,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @particle_line_sprite.oy = @particle_line_sprite.height / 2 @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, Color.red) # Buttons and button bitmaps - initialze_button_bitmaps + initialize_button_bitmaps @controls = [] add_particle_button = UIControls::BitmapButton.new(x + 1, y + 1, viewport, @add_button_bitmap) add_particle_button.set_interactive_rects @@ -113,7 +113,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands = {} end - def initialze_button_bitmaps + def initialize_button_bitmaps @add_button_bitmap = Bitmap.new(12, 12) @add_button_bitmap.fill_rect(1, 5, 10, 2, TEXT_COLOR) @add_button_bitmap.fill_rect(5, 1, 2, 10, TEXT_COLOR) @@ -529,9 +529,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end - # TODO: Add indicator that this is selected (if so). Some kind of arrow on the - # left, or a red horizontal line (like the keyframe's vertical line), or - # fill_rect with colour instead of outline_rect? def refresh_particle_list_sprite(index) spr = @list_sprites[index] return if !spr From ae32d59eb943c76d2ba24b49622e68a8fdf83511 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 12 Mar 2024 19:11:51 +0000 Subject: [PATCH 21/49] Anim Editor: added more animation interpolation types, greyed out timeline that isn't part of the animation --- .../901_Anim utilities/001_Anim utilities.rb | 44 ++++++++++++++++--- .../902_Anim GameData/001_Animation.rb | 2 - .../904_Anim Editor/001_AnimationEditor.rb | 11 +++-- .../002_AnimationEditor_popups.rb | 41 ++++++++++++----- .../904_Anim Editor/901_ParticleDataHelper.rb | 18 +++++++- .../Anim Editor elements/001_Canvas.rb | 7 ++- .../Anim Editor elements/003_ParticleList.rb | 26 +++++++++-- 7 files changed, 117 insertions(+), 32 deletions(-) diff --git a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb index b64095f19..83072c9ef 100644 --- a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb +++ b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb @@ -22,16 +22,14 @@ class Bitmap end end - # TODO: Add more curve types once it's decided which ones they are. See - # INTERPOLATION_TYPES. def draw_interpolation_line(x, y, width, height, gradient, type, color) + start_x = x + end_x = x + width - 1 + start_y = (gradient) ? y + height - 1 : y + end_y = (gradient) ? y : y + height - 1 case type when :linear # NOTE: https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm - start_x = x - end_x = x + width - 1 - start_y = (gradient) ? y + height - 1 : y - end_y = (gradient) ? y : y + height - 1 dx = end_x - start_x dy = -((end_y - start_y).abs) error = dx + dy @@ -52,6 +50,40 @@ class Bitmap draw_y += (gradient) ? -1 : 1 end end + when :ease_in, :ease_out, :ease_both # Quadratic + start_y = y + height - 1 + end_y = y + points = [] + (width + 1).times do |frame| + x = frame / width.to_f + case type + when :ease_in + points[frame] = (end_y - start_y) * x * x + when :ease_out + points[frame] = (end_y - start_y) * (1 - ((1 - x) * (1 - x))) + when :ease_both + if x < 0.5 + points[frame] = (end_y - start_y) * x * x * 2 + else + points[frame] = (end_y - start_y) * (1 - (((-2 * x) + 2) * ((-2 * x) + 2) / 2)) + end + end + points[frame] = points[frame].round + end + width.times do |frame| + line_y = points[frame] + if frame == 0 + line_height = 1 + else + line_height = [(points[frame] - points[frame - 1]).abs, 1].max + end + if !gradient # Going down + line_y = -(height - 1) - line_y - line_height + 1 + end + fill_rect(start_x + frame, start_y + line_y, 1, line_height, color) + end + else + raise _INTL("Unknown interpolation type {1}.", type) end end end diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index c83991760..c29f8790a 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -72,8 +72,6 @@ module GameData # NOTE: "Name" isn't a property here, because the particle's name comes # from the "Particle" property above. "Graphic" => [:graphic, "s"], - # TODO: If more focus types are added, add ones that involve a target to - # the Compiler's check relating to "NoTarget". "Focus" => [:focus, "e", FOCUS_TYPES], # TODO: FlipIfFoe, RotateIfFoe kinds of thing. diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 49487c746..f75bb3f92 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -215,7 +215,10 @@ class AnimationEditor commands_pane.add_labelled_number_slider(:z, _INTL("Priority"), -50, 50, 0) # TODO: If the graphic is user's sprite/target's sprite, make :frame instead # a choice of front/back/same as the main sprite/opposite of the main - # sprite. Will need two controls in the same space. + # sprite. Will need two controls in the same space, which is doable. + # Will also need to change the graphic chooser to only have "user"/ + # "target" options rather than all the variants that this control + # would manage. commands_pane.add_labelled_number_text_box(:frame, _INTL("Frame"), 0, 99, 0) commands_pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) commands_pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) @@ -317,6 +320,8 @@ class AnimationEditor def set_animation_properties_contents anim_properties = @components[:animation_properties] anim_properties.add_header_label(:header, _INTL("Animation properties")) + # Create "usable in battle" control + anim_properties.add_labelled_checkbox(:usable, _INTL("Can be used in battle?"), true) # Create animation type control anim_properties.add_labelled_dropdown_list(:type, _INTL("Animation type"), { :move => _INTL("Move"), @@ -341,8 +346,6 @@ class AnimationEditor anim_properties.add_labelled_checkbox(:has_target, _INTL("Involves a target?"), true) # Create flags control # TODO: List, TextBox and some Buttons to add/delete. - # Create "usable in battle" control - anim_properties.add_labelled_checkbox(:usable, _INTL("Can be used in battle?"), true) anim_properties.add_button(:close, _INTL("Close")) anim_properties.visible = false end @@ -420,6 +423,8 @@ class AnimationEditor # TODO: Ideally be able to independently choose base graphics, which will # be a separate setting here. :canvas_bg => "indoor1", + # NOTE: These sprite names are also used in Pokemon.play_cry and so should + # be a species ID (being a string is fine). :user_sprite_name => "ARCANINE", :target_sprite_name => "ABOMASNOW" } diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 2912f2302..903e432d4 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -187,15 +187,28 @@ class AnimationEditor preview_bitmap = nil set_preview_graphic = lambda do |sprite, filename| preview_bitmap&.dispose - # TODO: When the canvas works, use the proper user's/target's sprite here. - case filename - when "USER", "USER_BACK", "TARGET_BACK", "TARGET_OPP" - preview_bitmap = AnimatedBitmap.new("Graphics/Pokemon/Back/" + "000") - when "TARGET", "TARGET_FRONT", "USER_FRONT", "USER_OPP" - preview_bitmap = AnimatedBitmap.new("Graphics/Pokemon/Front/" + "000") - else - preview_bitmap = AnimatedBitmap.new(sprite_folder + filename) + folder = sprite_folder + fname = filename + if ["USER", "USER_BACK", "USER_FRONT", "USER_OPP", + "TARGET", "TARGET_FRONT", "TARGET_BACK", "TARGET_OPP"].include?(filename) + chunks = filename.split("_") + fname = (chunks[0] == "USER") ? @settings[:user_sprite_name].to_s : @settings[:target_sprite_name].to_s + case chunks[1] || "" + when "", "OPP" + # TODO: "TARGET" and "TARGET_OPP" will not be accurate in cases where + # the target is on the same side as the user. + if (chunks[0] == "USER") ^ (chunks[1] == "OPP") # xor + folder = (@settings[:user_opposes]) ? "Graphics/Pokemon/Front/" : "Graphics/Pokemon/Back/" + else + folder = (@settings[:user_opposes]) ? "Graphics/Pokemon/Back/" : "Graphics/Pokemon/Front/" + end + when "FRONT" + folder = "Graphics/Pokemon/Front/" + when "BACK" + folder = "Graphics/Pokemon/Back/" + end end + preview_bitmap = AnimatedBitmap.new(folder + fname) bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + list.x + list.width + 10, BORDER_THICKNESS + list.y, GRAPHIC_CHOOSER_PREVIEW_SIZE, GRAPHIC_CHOOSER_PREVIEW_SIZE, Color.white) @@ -294,10 +307,14 @@ class AnimationEditor when :play vol = audio_chooser.get_control(:volume).value ptch = audio_chooser.get_control(:pitch).value - # TODO: Play appropriate things if a cry is selected. See which - # battlers are defined in the editor's settings, and use their - # cries. - pbSEPlay(RPG::AudioFile.new("Anim/" + list.value, vol, ptch)) + case list.value + when "USER" + Pokemon.play_cry(@settings[:user_sprite_name]) + when "TARGET" + Pokemon.play_cry(@settings[:target_sprite_name]) + else + pbSEPlay(RPG::AudioFile.new("Anim/" + list.value, vol, ptch)) + end when :stop pbSEStop end diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 87fc8292d..df84037e1 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -37,8 +37,24 @@ module AnimationEditor::ParticleDataHelper case (cmd[3] || :linear) when :linear ret[0] = lerp(ret[0], cmd[2], cmd[1], cmd[0], frame).to_i + when :ease_in # Quadratic + x = (frame - cmd[0]) / cmd[1].to_f + ret[0] += (cmd[2] - ret[0]) * x * x + ret[0] = ret[0].round + when :ease_out # Quadratic + x = (frame - cmd[0]) / cmd[1].to_f + ret[0] += (cmd[2] - ret[0]) * (1 - ((1 - x) * (1 - x))) + ret[0] = ret[0].round + when :ease_both # Quadratic + x = (frame - cmd[0]) / cmd[1].to_f + if x < 0.5 + ret[0] += (cmd[2] - ret[0]) * x * x * 2 + else + ret[0] += (cmd[2] - ret[0]) * (1 - (((-2 * x) + 2) * ((-2 * x) + 2) / 2)) + end + ret[0] = ret[0].round else - # TODO: Use an appropriate interpolation. + raise _INTL("Unknown interpolation method {1}.", cmd[3]) end ret[1] = true # Interpolating break diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 84b69755b..1da9b6048 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -12,10 +12,9 @@ # TODO: Should the canvas be able to show boxes/faded sprites of particles from # the previous keyframe? I suppose ideally, but don't worry about it. -# TODO: Battler/particle sprites should be their own class, which combine a -# sprite and a target-dependent coloured frame. Alternatively, have the -# frame be a separate sprite but only draw it around the currently -# selected particle(s). +# TODO: Show a focus-dependent coloured frame around just the currently selected +# particle. Only show one frame even if the focus involves a target and +# there are multiple targets. # TODO: Ideally refresh the canvas while editing a particle's property in the # :commands_pane component (e.g. moving a number slider but not finalising # it). Refresh a single particle. I don't think any other side pane needs diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 6ece125ee..f8aebb6e8 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -31,7 +31,8 @@ class AnimationEditor::ParticleList < UIControls::BaseControl :target_side_foreground => Color.new(128, 248, 248), # Cyan :target_side_background => Color.new(128, 248, 248) # Cyan } - SE_CONTROL_BG = Color.gray + SE_CONTROL_BG_COLOR = Color.gray + TIME_AFTER_ANIMATION_COLOR = Color.new(224, 224, 224) attr_reader :keyframe # The selected keyframe attr_reader :values @@ -56,7 +57,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands_viewport = Viewport.new(@commands_bg_viewport.rect.x, @commands_bg_viewport.rect.y, @commands_bg_viewport.rect.width, @commands_bg_viewport.rect.height) @commands_viewport.z = self.viewport.z + 3 - # Create scrollbar + # Create scrollbars @list_scrollbar = UIControls::Scrollbar.new( x + width - UIControls::Scrollbar::SLIDER_WIDTH, @commands_bg_viewport.rect.y, @commands_bg_viewport.rect.height, self.viewport, false, true @@ -67,6 +68,13 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands_bg_viewport.rect.width, self.viewport, true, true ) @time_scrollbar.set_interactive_rects + # Time background bitmap sprite + @time_bg_sprite = BitmapSprite.new( + @commands_viewport.rect.width, + TIMELINE_HEIGHT + VIEWPORT_SPACING + @list_viewport.rect.height, self.viewport + ) + @time_bg_sprite.x = @commands_viewport.rect.x + @time_bg_sprite.y = self.y # Timeline bitmap sprite @timeline_sprite = BitmapSprite.new(@commands_viewport.rect.width, TIMELINE_HEIGHT, self.viewport) @timeline_sprite.x = @commands_viewport.rect.x @@ -150,6 +158,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def dispose @list_scrollbar.dispose @time_scrollbar.dispose + @time_bg_sprite.dispose @timeline_sprite.dispose @position_sprite.dispose @particle_line_sprite.dispose @@ -483,7 +492,16 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end def refresh_timeline + @time_bg_sprite.bitmap.clear @timeline_sprite.bitmap.clear + # Draw grey over the time after the end of the animation + dur = duration + draw_x = TIMELINE_LEFT_BUFFER + (dur * KEYFRAME_SPACING) - @left_pos + greyed_width = @time_bg_sprite.width - draw_x + if greyed_width > 0 + @time_bg_sprite.bitmap.fill_rect(draw_x, 0, greyed_width, @time_bg_sprite.height, TIME_AFTER_ANIMATION_COLOR) + @time_bg_sprite.bitmap.fill_rect(draw_x, TIMELINE_HEIGHT, greyed_width, VIEWPORT_SPACING, Color.black) + end # Draw hover highlight hover_color = nil if @captured_keyframe && !@captured_row @@ -538,7 +556,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl p_index = (@particle_list[index].is_a?(Array)) ? @particle_list[index][0] : @particle_list[index] particle_data = @particles[p_index] if particle_data[:name] == "SE" - bg_color = SE_CONTROL_BG + bg_color = SE_CONTROL_BG_COLOR else bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta end @@ -575,7 +593,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl particle_data = @particles[p_index] # Get the background color if particle_data[:name] == "SE" - bg_color = SE_CONTROL_BG + bg_color = SE_CONTROL_BG_COLOR else bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta end From 054d7820e4c72f088d9ae7bfc292ef45aa2c42d3 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 16 Mar 2024 00:08:00 +0000 Subject: [PATCH 22/49] Anim Editor: added interpolation editing --- .../902_Anim GameData/001_Animation.rb | 30 +- .../904_Anim Editor/001_AnimationEditor.rb | 21 ++ .../904_Anim Editor/901_ParticleDataHelper.rb | 179 ++++++++--- .../Anim Editor elements/003_ParticleList.rb | 279 +++++++++++++----- 4 files changed, 385 insertions(+), 124 deletions(-) diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index c29f8790a..eb4a28b83 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -41,8 +41,8 @@ module GameData "None" => :none, "Linear" => :linear, "EaseIn" => :ease_in, - "EaseOut" => :ease_out, - "EaseBoth" => :ease_both + "EaseBoth" => :ease_both, + "EaseOut" => :ease_out } USER_AND_TARGET_SEPARATION = [200, -200, -100] # x, y, z (from user to target) @@ -66,7 +66,7 @@ module GameData # change during the animation. # TODO: If more "SetXYZ"/"MoveXYZ" properties are added, ensure the "SetXYZ" # ones are given a duration of 0 in def validate_compiled_animation. - # Also add display names to def property_display_name. + # Also add display names to def self.property_display_name. SUB_SCHEMA = { # These properties cannot be changed partway through the animation. # NOTE: "Name" isn't a property here, because the particle's name comes @@ -162,6 +162,30 @@ module GameData :target_cry => nil } + def self.property_display_name(property) + return { + :frame => _INTL("Frame"), + :blending => _INTL("Blending"), + :flip => _INTL("Flip"), + :x => _INTL("X"), + :y => _INTL("Y"), + :z => _INTL("Priority"), + :zoom_x => _INTL("Zoom X"), + :zoom_y => _INTL("Zoom Y"), + :angle => _INTL("Angle"), + :visible => _INTL("Visible"), + :opacity => _INTL("Opacity") + }[property] || property.capitalize + end + + def self.property_can_interpolate?(property) + return false if !property + SUB_SCHEMA.each_value do |prop| + return true if prop[0] == property && prop[5] && prop[5] == INTERPOLATION_TYPES + end + return false + end + @@cmd_to_pbs_name = nil # Used for writing animation PBS files extend ClassMethodsIDNumbers diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index f75bb3f92..8300a4ffb 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -296,6 +296,9 @@ class AnimationEditor # Move particle up/down the list? end + # TODO: :keyframe_pane is currently inaccessible (intentionally). If it will + # have its own commands and should be accessible again, change def + # on_mouse_release in ParticleList. def set_keyframe_pane_contents keyframe_pane = @components[:keyframe_pane] keyframe_pane.add_header_label(:header, _INTL("Edit keyframe")) @@ -810,6 +813,24 @@ class AnimationEditor @components[:particle_list].set_particles(@anim[:particles]) @components[:particle_list].particle_index = idx2 refresh + when :cycle_interpolation + # value is [particle index, property, keyframe] + # Get current interpolation type + interp_type = nil + @anim[:particles][value[0]][value[1]].each do |cmd| + next if cmd[0] != value[2] + interp_type = cmd[3] if !interp_type + end + interp_type ||= :none + # Get the interpolation type to change to + interps = GameData::Animation::INTERPOLATION_TYPES.values + idx = (interps.index(interp_type) + 1) % interps.length + interp_type = interps[idx] + # Set the new interpolation type + AnimationEditor::ParticleDataHelper.set_interpolation(@anim[:particles][value[0]], value[1], value[2], interp_type) + @components[:particle_list].change_particle_commands(value[0]) + refresh_component(:commands_pane) + refresh_component(:canvas) end when :animation_properties # TODO: Will changes here need to refresh any other components (e.g. side diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index df84037e1..b782057ea 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -16,7 +16,7 @@ module AnimationEditor::ParticleDataHelper return ret end - def get_keyframe_particle_value(particle, frame, property) + def get_keyframe_particle_value(particle, property, frame) if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) raise _INTL("Couldn't get default value for property {1} for particle {2}.", property, particle[:name]) @@ -81,7 +81,7 @@ module AnimationEditor::ParticleDataHelper def get_all_keyframe_particle_values(particle, frame) ret = {} GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.each_pair do |prop, default| - ret[prop] = get_keyframe_particle_value(particle, frame, prop) + ret[prop] = get_keyframe_particle_value(particle, prop, frame) end return ret end @@ -151,7 +151,7 @@ module AnimationEditor::ParticleDataHelper # 0 - SetXYZ # [+/- duration, interpolation type] --- MoveXYZ (duration's sign is whether # it makes the value higher or lower) - def get_particle_property_commands_timeline(particle, commands, property) + def get_particle_property_commands_timeline(particle, property, commands) return nil if !commands || commands.length == 0 if particle[:name] == "SE" ret = [] @@ -188,6 +188,93 @@ module AnimationEditor::ParticleDataHelper end def add_command(particle, property, frame, value) + # Return a new set of commands if there isn't one + if !particle[property] || particle[property].empty? + return [[frame, 0, value]] + end + # Find all relevant commands + set_now = nil + move_ending_now = nil + move_overlapping_now = nil + particle[property].each do |cmd| + if cmd[1] == 0 + set_now = cmd if cmd[0] == frame + else + move_ending_now = cmd if cmd[0] + cmd[1] == frame + move_overlapping_now = cmd if cmd[0] < frame && cmd[0] + cmd[1] > frame + end + end + new_command_needed = true + # Replace existing command at frame if it has a duration of 0 + if set_now + set_now[2] = value + new_command_needed = false + end + # If a command has a duration >0 and ends at frame, replace its value + if move_ending_now + move_ending_now[2] = value + new_command_needed = false + end + return particle[property] if !new_command_needed + # Add a new command + new_cmd = [frame, 0, value] + particle[property].push(new_cmd) + # If the new command interrupts an interpolation, split that interpolation + if move_overlapping_now + end_frame = move_overlapping_now[0] + move_overlapping_now[1] + new_cmd[1] = end_frame - frame # Duration + new_cmd[2] = move_overlapping_now[2] # Value + new_cmd[3] = move_overlapping_now[3] # Interpolation type + move_overlapping_now[1] = frame - move_overlapping_now[0] # Duration + move_overlapping_now[2] = value # Value + end + # Sort and return the commands + particle[property].sort! { |a, b| a[0] == b[0] ? a[1] == b[1] ? 0 : a[1] <=> b[1] : a[0] <=> b[0] } + return particle[property] + end + + # Cases: + # * SetXYZ - delete it + # * MoveXYZ start - turn into a SetXYZ at the end point + # * MoveXYZ end - delete it (this may happen to remove the start diamond too) + # * MoveXYZ end and start - merge both together (use first's type) + # * SetXYZ and MoveXYZ start - delete SetXYZ (leave MoveXYZ alone) + # * SetXYZ and MoveXYZ end - (unlikely) delete both + # * SetXYZ and MoveXYZ start and end - (unlikely) delete SetXYZ, merge Moves together + def delete_command(particle, property, frame) + # Find all relevant commands + set_now = nil + move_ending_now = nil + move_starting_now = nil + particle[property].each do |cmd| + if cmd[1] == 0 + set_now = cmd if cmd[0] == frame + else + move_starting_now = cmd if cmd[0] == frame + move_ending_now = cmd if cmd[0] + cmd[1] == frame + end + end + # Delete SetXYZ if it is at frame + particle[property].delete(set_now) if set_now + # Edit/delete MoveXYZ commands starting/ending at frame + if move_ending_now && move_starting_now # Merge both MoveXYZ commands + move_ending_now[1] += move_starting_now[1] # Duration + move_ending_now[2] = move_starting_now[2] # Value + particle[property].delete(move_starting_now) + elsif move_ending_now # Delete MoveXYZ ending now + particle[property].delete(move_ending_now) + elsif move_starting_now && !set_now # Turn into SetXYZ at its end point + move_starting_now[0] += move_starting_now[1] + move_starting_now[1] = 0 + move_starting_now[3] = nil + move_starting_now.compact! + end + return (particle[property].empty?) ? nil : particle[property] + end + + # Removes commands for the particle's given property if they don't make a + # difference. Returns the resulting set of commands. + def optimize_commands(particle, property) # Split particle[property] into values and interpolation arrays set_points = [] # All SetXYZ commands (the values thereof) end_points = [] # End points of MoveXYZ commands (the values thereof) @@ -202,14 +289,6 @@ module AnimationEditor::ParticleDataHelper end end end - # Add new command to points (may replace an existing command) - interp = :none - (frame + 1).times do |i| - interp = :none if set_points[i] || end_points[i] - interp = interps[i] if interps[i] - end - interps[frame] = interp if interp != :none - set_points[frame] = value # For visibility only, set the keyframe with the first command (of any kind) # to be visible, unless the command being added overwrites it. Also figure # out the first keyframe that has a command, and the first keyframe that has @@ -264,42 +343,60 @@ module AnimationEditor::ParticleDataHelper return (ret.empty?) ? nil : ret end - # Cases: - # * SetXYZ - delete it - # * MoveXYZ start - turn into a SetXYZ at the end point - # * MoveXYZ end - delete it (this may happen to remove the start diamond too) - # * MoveXYZ end and start - merge both together (use first's type) - # * SetXYZ and MoveXYZ start - delete SetXYZ (leave MoveXYZ alone) - # * SetXYZ and MoveXYZ end - (unlikely) delete both - # * SetXYZ and MoveXYZ start and end - (unlikely) delete SetXYZ, merge Moves together - def delete_command(particle, property, frame) - # Find all relevant commands + # SetXYZ at frame + # - none: Do nothing. + # - interp: Add MoveXYZ (calc duration/value at end). + # MoveXYZ at frame + # - none: Turn into two SetXYZ (MoveXYZ's value for end point, calc value + # for start point). + # - interp: Change type. + # SetXYZ and MoveXYZ at frame + # - none: Turn MoveXYZ into SetXYZ at the end point. + # - interp: Change MoveXYZ's type. + # End of earlier MoveXYZ (or nothing) at frame + # - none: Do nothing. + # - interp: Add MoveXYZ (calc duration/value at end). + def set_interpolation(particle, property, frame, type) + # Find relevant command set_now = nil - move_ending_now = nil move_starting_now = nil particle[property].each do |cmd| - if cmd[1] == 0 - set_now = cmd if cmd[0] == frame + next if cmd[0] != frame + set_now = cmd if cmd[1] == 0 + move_starting_now = cmd if cmd[1] != 0 + end + if move_starting_now + # If a MoveXYZ command exists at frame, amend it + if type == :none + old_end_point = move_starting_now[0] + move_starting_now[1] + old_value = move_starting_now[2] + # Turn the MoveXYZ command into a SetXYZ (or just delete it if a SetXYZ + # already exists at frame) + if set_now + particle[property].delete(move_starting_now) + else + move_starting_now[1] = 0 + move_starting_now[2] = get_keyframe_particle_value(particle, property, frame)[0] + move_starting_now[3] = nil + move_starting_now.compact! + end + # Add a new SetXYZ at the end of the (former) interpolation + add_command(particle, property, old_end_point, old_value) else - move_starting_now = cmd if cmd[0] == frame - move_ending_now = cmd if cmd[0] + cmd[1] == frame + # Simply change the type + move_starting_now[3] = type + end + elsif type != :none + # If no MoveXYZ command exists at frame, make one (if type isn't :none) + particle[property].each do |cmd| # Assumes commands are sorted by keyframe + next if cmd[0] <= frame + val_at_end = get_keyframe_particle_value(particle, property, cmd[0])[0] + particle[property].push([frame, cmd[0] - frame, val_at_end, type]) + particle[property].sort! { |a, b| a[0] == b[0] ? a[1] == b[1] ? 0 : a[1] <=> b[1] : a[0] <=> b[0] } + break end end - # Delete SetXYZ if it is at frame - particle[property].delete(set_now) if set_now - # Edit/delete MoveXYZ commands starting/ending at frame - if move_ending_now && move_starting_now # Merge both MoveXYZ commands - move_ending_now[1] += move_starting_now[1] - particle[property].delete(move_starting_now) - elsif move_ending_now # Delete MoveXYZ ending now - particle[property].delete(move_ending_now) - elsif move_starting_now && !set_now # Turn into SetXYZ at its end point - move_starting_now[0] += move_starting_now[1] - move_starting_now[1] = 0 - move_starting_now[3] = nil - move_starting_now.compact! - end - return (particle[property].empty?) ? nil : particle[property] + return particle[property] end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index f8aebb6e8..280dcb4a1 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -8,10 +8,15 @@ class AnimationEditor::ParticleList < UIControls::BaseControl LIST_X = 0 LIST_Y = TIMELINE_HEIGHT + VIEWPORT_SPACING LIST_WIDTH = 180 - VIEWPORT_SPACING + EXPAND_BUTTON_X = VIEWPORT_SPACING + EXPAND_BUTTON_WIDTH = 19 + LIST_BOX_X = EXPAND_BUTTON_X + EXPAND_BUTTON_WIDTH + VIEWPORT_SPACING + LIST_INDENT = 8 COMMANDS_X = LIST_WIDTH + VIEWPORT_SPACING COMMANDS_Y = LIST_Y ROW_HEIGHT = 24 + ROW_SPACING = 1 # Gap at top of each row DIAMOND_SIZE = 3 TIMELINE_LEFT_BUFFER = DIAMOND_SIZE + 1 # Allows diamonds at keyframe 0 to be drawn fully TIMELINE_TEXT_SIZE = 16 @@ -19,6 +24,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl INTERP_LINE_HEIGHT = KEYFRAME_SPACING - ((DIAMOND_SIZE * 2) + 3) INTERP_LINE_Y = (ROW_HEIGHT / 2) - (INTERP_LINE_HEIGHT / 2) DURATION_BUFFER = 20 # Extra keyframes shown after the animation's end + PROPERTY_BG_COLOR = Color.new(224, 224, 224) CONTROL_BG_COLORS = { :foreground => Color.new(128, 160, 248), # Blue :midground => Color.new(128, 160, 248), # Blue @@ -32,7 +38,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl :target_side_background => Color.new(128, 248, 248) # Cyan } SE_CONTROL_BG_COLOR = Color.gray - TIME_AFTER_ANIMATION_COLOR = Color.new(224, 224, 224) + TIME_AFTER_ANIMATION_COLOR = Color.new(160, 160, 160) attr_reader :keyframe # The selected keyframe attr_reader :values @@ -312,10 +318,14 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end def busy? - return true if @controls.any? { |c| c[1].busy? } + return true if controls_busy? return super end + def controls_busy? + return @controls.any? { |c| c[1].busy? } + end + def changed? return @changed end @@ -366,7 +376,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl overall_commands = [] @particles[index].each_pair do |property, value| next if !value.is_a?(Array) - cmds = AnimationEditor::ParticleDataHelper.get_particle_property_commands_timeline(@particles[index], value, property) + cmds = AnimationEditor::ParticleDataHelper.get_particle_property_commands_timeline(@particles[index], property, value) @commands[[index, property]] = cmds cmds.each_with_index do |cmd, i| next if !cmd @@ -468,22 +478,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl #----------------------------------------------------------------------------- - def property_display_name(property) - return { - :frame => _INTL("Frame"), - :blending => _INTL("Blending"), - :flip => _INTL("Flip"), - :x => _INTL("X"), - :y => _INTL("Y"), - :z => _INTL("Priority"), - :zoom_x => _INTL("Zoom X"), - :zoom_y => _INTL("Zoom Y"), - :angle => _INTL("Angle"), - :visible => _INTL("Visible"), - :opacity => _INTL("Opacity") - }[property] || property.capitalize - end - def repaint @list_scrollbar.repaint if @list_scrollbar.invalid? @time_scrollbar.repaint if @time_scrollbar.invalid? @@ -503,21 +497,23 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @time_bg_sprite.bitmap.fill_rect(draw_x, TIMELINE_HEIGHT, greyed_width, VIEWPORT_SPACING, Color.black) end # Draw hover highlight - hover_color = nil - if @captured_keyframe && !@captured_row - if @hover_keyframe && @hover_keyframe == @captured_keyframe && !@hover_row + if !controls_busy? + hover_color = nil + if @captured_keyframe && !@captured_row + if @hover_keyframe && @hover_keyframe == @captured_keyframe && !@hover_row + hover_color = HOVER_COLOR + else + hover_color = CAPTURE_COLOR + end + draw_x = TIMELINE_LEFT_BUFFER + (@captured_keyframe * KEYFRAME_SPACING) - @left_pos + @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, + KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) + elsif !@captured_keyframe && !@captured_row && @hover_keyframe && !@hover_row hover_color = HOVER_COLOR - else - hover_color = CAPTURE_COLOR + draw_x = TIMELINE_LEFT_BUFFER + (@hover_keyframe * KEYFRAME_SPACING) - @left_pos + @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, + KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) end - draw_x = TIMELINE_LEFT_BUFFER + (@captured_keyframe * KEYFRAME_SPACING) - @left_pos - @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, - KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) - elsif !@captured_keyframe && !@captured_row && @hover_keyframe && !@hover_row - hover_color = HOVER_COLOR - draw_x = TIMELINE_LEFT_BUFFER + (@hover_keyframe * KEYFRAME_SPACING) - @left_pos - @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, - KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) end # Draw timeline markings each_visible_keyframe(true) do |i| @@ -551,37 +547,81 @@ class AnimationEditor::ParticleList < UIControls::BaseControl spr = @list_sprites[index] return if !spr spr.bitmap.clear - box_x = (@particle_list[index].is_a?(Array)) ? 16 : 0 - # Get the background color - p_index = (@particle_list[index].is_a?(Array)) ? @particle_list[index][0] : @particle_list[index] + # Get useful information + is_property = @particle_list[index].is_a?(Array) + p_index = (is_property) ? @particle_list[index][0] : @particle_list[index] particle_data = @particles[p_index] + box_x = LIST_BOX_X + box_x += LIST_INDENT if is_property + # Get the background color if particle_data[:name] == "SE" bg_color = SE_CONTROL_BG_COLOR + elsif is_property + bg_color = PROPERTY_BG_COLOR else bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta end # Draw hover highlight - hover_color = nil - if @captured_row && !@captured_keyframe - if @captured_row == index - if @hover_row && @hover_row == index && !@hover_keyframe - hover_color = HOVER_COLOR - else - hover_color = CAPTURE_COLOR + if !controls_busy? && !@captured_keyframe + hover_color = nil + if @captured_row + if @captured_row == index + if !@hover_keyframe && @hover_row && @hover_row == index && + @captured_row_button && @hover_row_button == @captured_row_button + hover_color = HOVER_COLOR + else + hover_color = CAPTURE_COLOR + end + end + elsif @hover_row && @hover_row == index && !@hover_keyframe + hover_color = HOVER_COLOR + end + if hover_color + case @captured_row_button || @hover_row_button + when :expand + spr.bitmap.fill_rect(EXPAND_BUTTON_X, (ROW_HEIGHT - EXPAND_BUTTON_WIDTH + 1) / 2, + EXPAND_BUTTON_WIDTH, EXPAND_BUTTON_WIDTH, hover_color) + when :row + spr.bitmap.fill_rect(box_x, ROW_SPACING, spr.width - box_x, spr.height - ROW_SPACING, hover_color) end end - elsif !@captured_row && !@captured_keyframe && @hover_row && @hover_row == index && !@hover_keyframe - hover_color = HOVER_COLOR end - spr.bitmap.fill_rect(box_x, 1, spr.width - box_x, spr.height - 1, hover_color) if hover_color # Draw outline - spr.bitmap.outline_rect(box_x, 1, spr.width - box_x, spr.height - 1, bg_color, 2) + spr.bitmap.outline_rect(box_x, ROW_SPACING, spr.width - box_x, spr.height - ROW_SPACING, bg_color, 2) # Draw text - if @particle_list[index].is_a?(Array) - draw_text(spr.bitmap, box_x + 4, 0, "→") # ► - draw_text(spr.bitmap, box_x + 4 + 17, 3, property_display_name(@particle_list[index][1])) + if is_property + draw_text(spr.bitmap, box_x + 4, 3, GameData::Animation.property_display_name(@particle_list[index][1]) + ":") else - draw_text(spr.bitmap, 4, 3, @particles[p_index][:name] || "Unnamed") + draw_text(spr.bitmap, box_x + 4, 3, @particles[p_index][:name] || "Unnamed") + end + # Draw expand/collapse arrow or dotted lines + if is_property + 6.times do |j| + spr.bitmap.fill_rect(10, j * 2, 1, 1, Color.black) + end + 9.times do |i| + spr.bitmap.fill_rect(10 + (i * 2), 12, 1, 1, Color.black) + end + elsif @expanded_particles.include?(p_index) + 11.times do |i| + j = (i == 0 || i == 10) ? 1 : 0 + h = [2, 4, 5, 6, 7, 8, 7, 6, 5, 4, 2][i] + h = ((i > 5) ? 10 - i : i) + 3 - j + spr.bitmap.fill_rect(5 + i, 9 + j, 1, h, Color.black) + end + elsif particle_data[:name] != "SE" + 11.times do |j| + i = (j == 0 || j == 10) ? 1 : 0 + w = [2, 4, 5, 6, 7, 8, 7, 6, 5, 4, 2][j] + w = ((j > 5) ? 10 - j : j) + 3 - i + spr.bitmap.fill_rect(7 + i, 7 + j, w, 1, Color.black) + end + end + # Draw dotted line leading to the next property line + if @particle_list[index + 1]&.is_a?(Array) + 5.times do |j| + spr.bitmap.fill_rect(10, 14 + (j * 2), 1, 1, Color.black) + end end end @@ -589,11 +629,14 @@ class AnimationEditor::ParticleList < UIControls::BaseControl bg_spr = @commands_bg_sprites[index] return if !bg_spr bg_spr.bitmap.clear - p_index = (@particle_list[index].is_a?(Array)) ? @particle_list[index][0] : @particle_list[index] + is_property = @particle_list[index].is_a?(Array) + p_index = (is_property) ? @particle_list[index][0] : @particle_list[index] particle_data = @particles[p_index] # Get the background color if particle_data[:name] == "SE" bg_color = SE_CONTROL_BG_COLOR + elsif is_property + bg_color = PROPERTY_BG_COLOR else bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta end @@ -604,33 +647,53 @@ class AnimationEditor::ParticleList < UIControls::BaseControl draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos # Draw bg if i < @duration - DURATION_BUFFER && visible_cmds[i] - bg_spr.bitmap.fill_rect(draw_x, 1, KEYFRAME_SPACING, ROW_HEIGHT - 2, bg_color) + bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, KEYFRAME_SPACING, ROW_HEIGHT - ROW_SPACING, bg_color) end # Draw hover highlight hover_color = nil - if @captured_row && @captured_keyframe - if @captured_row == index && @captured_keyframe == i - if @hover_row && @hover_row == index && @hover_keyframe && @hover_keyframe == i - hover_color = HOVER_COLOR - else - hover_color = CAPTURE_COLOR - end + if !controls_busy? + earlier_captured_keyframe = @captured_keyframe + later_captured_keyframe = (earlier_captured_keyframe || -1) + 1 + earlier_hovered_keyframe = @hover_keyframe + later_hovered_keyframe = (earlier_hovered_keyframe || -1) + 1 + if is_property + later_captured_keyframe = @captured_row_button || 0 + later_hovered_keyframe = @hover_row_button || 0 + end + if @captured_row && @captured_keyframe + if @captured_row == index && i >= earlier_captured_keyframe && i < later_captured_keyframe + if @hover_row && @hover_row == index && @hover_keyframe && i >= earlier_hovered_keyframe && i < later_hovered_keyframe + hover_color = HOVER_COLOR + else + hover_color = CAPTURE_COLOR + end + end + elsif !@captured_row && !@captured_keyframe && @hover_row && @hover_keyframe && + @hover_row == index && i >= earlier_hovered_keyframe && i < later_hovered_keyframe + hover_color = HOVER_COLOR + end + end + if hover_color + if is_property + bg_spr.bitmap.fill_rect(draw_x, 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, hover_color) + else + bg_spr.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, hover_color) end - elsif !@captured_row && !@captured_keyframe && - @hover_row && @hover_row == index && @hover_keyframe && @hover_keyframe == i - hover_color = HOVER_COLOR end - bg_spr.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, hover_color) if hover_color next if i >= @duration - DURATION_BUFFER next if !visible_cmds[i] # Draw outline - bg_spr.bitmap.fill_rect(draw_x, 1, KEYFRAME_SPACING, 1, Color.black) # Top - bg_spr.bitmap.fill_rect(draw_x, ROW_HEIGHT - 1, KEYFRAME_SPACING, 1, Color.black) # Bottom + outline_color = Color.black + if is_property + outline_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta + end + bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, KEYFRAME_SPACING, 1, outline_color) # Top + bg_spr.bitmap.fill_rect(draw_x, ROW_HEIGHT - 1, KEYFRAME_SPACING, 1, outline_color) # Bottom if i <= 0 || !visible_cmds[i - 1] - bg_spr.bitmap.fill_rect(draw_x, 1, 1, ROW_HEIGHT - 1, Color.black) # Left + bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, 1, ROW_HEIGHT - ROW_SPACING, outline_color) # Left end if i == @duration - DURATION_BUFFER - 1 || (i < @duration - 1 && !visible_cmds[i + 1]) - bg_spr.bitmap.fill_rect(draw_x + KEYFRAME_SPACING, 1, 1, ROW_HEIGHT - 1, Color.black) # Right + bg_spr.bitmap.fill_rect(draw_x + KEYFRAME_SPACING, ROW_SPACING, 1, ROW_HEIGHT - ROW_SPACING, outline_color) # Right end end end @@ -714,17 +777,47 @@ class AnimationEditor::ParticleList < UIControls::BaseControl listed_element = @particle_list[new_hover_row] p_index = listed_element.is_a?(Array) ? listed_element[0] : listed_element break if @particles[p_index][:name] == "SE" - ret = [area, nil, new_hover_row] + mouse_y_in_row = mouse_y + @top_pos - (new_hover_row * ROW_HEIGHT) - rect.y + case mouse_x + when EXPAND_BUTTON_X...(EXPAND_BUTTON_X + EXPAND_BUTTON_WIDTH) + next if listed_element.is_a?(Array) + next if mouse_y_in_row < (ROW_HEIGHT - EXPAND_BUTTON_WIDTH + 1) / 2 + next if mouse_y_in_row >= ((ROW_HEIGHT - EXPAND_BUTTON_WIDTH + 1) / 2) + EXPAND_BUTTON_WIDTH + ret = [area, nil, new_hover_row, :expand] + when LIST_BOX_X...(@list_viewport.rect.width) + next if listed_element.is_a?(Array) + next if mouse_y_in_row < ROW_SPACING + ret = [area, nil, new_hover_row, :row] + end when :timeline new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2) - 1) / KEYFRAME_SPACING break if new_hover_keyframe < 0 || new_hover_keyframe >= @duration ret = [area, new_hover_keyframe, nil] when :commands new_hover_row = (mouse_y + @top_pos - rect.y) / ROW_HEIGHT - new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2) - 1) / KEYFRAME_SPACING break if new_hover_row >= @particle_list.length + listed_element = @particle_list[new_hover_row] + if listed_element.is_a?(Array) + new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER - 1) / KEYFRAME_SPACING + else + new_hover_keyframe = (mouse_x + @left_pos - rect.x - TIMELINE_LEFT_BUFFER + (KEYFRAME_SPACING / 2) - 1) / KEYFRAME_SPACING + end break if new_hover_keyframe < 0 || new_hover_keyframe >= @duration - ret = [area, new_hover_keyframe, new_hover_row] + if listed_element.is_a?(Array) + break if !GameData::Animation.property_can_interpolate?(listed_element[1]) + cmds = @commands[listed_element] + break if !cmds + earlier_keyframe = nil + later_keyframe = nil + cmds.each_with_index do |cmd, i| + earlier_keyframe = i if cmd && i <= new_hover_keyframe + later_keyframe = i if cmd && !later_keyframe && i > new_hover_keyframe + end + break if !earlier_keyframe || !later_keyframe + ret = [area, earlier_keyframe, new_hover_row, later_keyframe] + else + ret = [area, new_hover_keyframe, new_hover_row] + end end break end @@ -738,6 +831,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @captured_area = hover_element[0] @captured_keyframe = hover_element[1] @captured_row = hover_element[2] + @captured_row_button = hover_element[3] end end @@ -748,19 +842,38 @@ class AnimationEditor::ParticleList < UIControls::BaseControl if hover_element.is_a?(Array) if @captured_area == hover_element[0] && @captured_keyframe == hover_element[1] && - @captured_row == hover_element[2] - if @captured_row && @particle_list[@captured_row].is_a?(Array) - # TODO: If I want to be able to select individual property rows and/or - # diamonds, I shouldn't have this line. - @captured_row = @particle_list.index(@particle_list[@captured_row][0]) + @captured_row == hover_element[2] && + @captured_row_button == hover_element[3] + if @captured_area == :commands && @captured_row && @particle_list[@captured_row].is_a?(Array) + set_changed + @values[:cycle_interpolation] = [*@particle_list[@captured_row], @captured_keyframe] + else + case @captured_row_button + when :expand + particle_index = @particle_list[@captured_row] + particle_index = particle_index[0] if particle_index.is_a?(Array) + if @expanded_particles.include?(particle_index) # Contract + @expanded_particles.delete(particle_index) + else # Expand + @expanded_particles.push(particle_index) + end + set_particles(@particles) + else # :row button or somewhere in the commands area or timeline, just change selection + if @captured_row && @particle_list[@captured_row].is_a?(Array) + @captured_row = @particle_list.index(@particle_list[@captured_row][0]) + end + set_changed if @keyframe != @captured_keyframe || @row_index != @captured_row + @keyframe = @captured_keyframe || -1 + # TODO: If :keyframe_pane should be accessible by clicking on the + # timeline, change the below line to = @captured_row || -1. + @row_index = @captured_row if @captured_row + end end - set_changed if @keyframe != @captured_keyframe || @row_index != @captured_row - @keyframe = @captured_keyframe || -1 - @row_index = @captured_row || -1 end end @captured_keyframe = nil @captured_row = nil + @captured_row_button = nil super # Make this control not busy again end @@ -778,6 +891,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @hover_area = nil @hover_keyframe = nil @hover_row = nil + @hover_row_button = nil return end # Check each interactive area for whether the mouse is hovering over it, and @@ -787,7 +901,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl invalidate if @hover_area != hover_element[0] # Moved to a different region case hover_element[0] when :list - invalidate_rows if @hover_row != hover_element[2] + invalidate_rows if @hover_row != hover_element[2] || @hover_row_button != hover_element[3] when :timeline invalidate_time if @hover_keyframe != hover_element[1] when :commands @@ -797,6 +911,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @hover_area = hover_element[0] @hover_keyframe = hover_element[1] @hover_row = hover_element[2] + @hover_row_button = hover_element[3] elsif hover_element if @hover_area == hover_element case @hover_area @@ -813,11 +928,13 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @hover_area = hover_element @hover_keyframe = nil @hover_row = nil + @hover_row_button = nil else invalidate if @hover_area @hover_area = nil @hover_keyframe = nil @hover_row = nil + @hover_row_button = nil end end @@ -825,7 +942,9 @@ class AnimationEditor::ParticleList < UIControls::BaseControl return if !self.visible @list_scrollbar.update @time_scrollbar.update - @controls.each { |c| c[1].update } + if !@captured_area + @controls.each { |c| c[1].update } + end super # Refresh sprites if a scrollbar has been moved self.top_pos = @list_scrollbar.position From 8a218ca834537d355b144b721fba5c1fb410fd2f Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 25 Mar 2024 16:44:43 +0000 Subject: [PATCH 23/49] Anim Editor: added color and tone side pane --- .../801_UI controls/002_ControlsContainer.rb | 22 +- .../902_Anim GameData/001_Animation.rb | 38 ++- .../904_Anim Editor/001_AnimationEditor.rb | 282 +++++++++++------- 3 files changed, 220 insertions(+), 122 deletions(-) diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index 2151ae4dd..cbc41c1b9 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -11,7 +11,7 @@ class UIControls::ControlsContainer attr_reader :viewport LINE_SPACING = 28 - OFFSET_FROM_LABEL_X = 90 + OFFSET_FROM_LABEL_X = 100 OFFSET_FROM_LABEL_Y = 0 def initialize(x, y, width, height, right_margin = 0) @@ -199,6 +199,15 @@ class UIControls::ControlsContainer return @width, LINE_SPACING end + def next_control_position(add_offset = false) + row_x = 0 + row_x += @label_offset_x if add_offset + row_y = @row_count * LINE_SPACING + row_y += @label_offset_y - LINE_SPACING if add_offset + row_y += @pixel_offset + return row_x, row_y + end + def add_control_at(id, control, x, y) control.x = x control.y = y @@ -209,13 +218,14 @@ class UIControls::ControlsContainer def add_control(id, control, add_offset = false, rows = 1) i = @controls.length - row_x = 0 - row_y = (add_offset ? @row_count - 1 : @row_count) * LINE_SPACING - ctrl_x = row_x + (add_offset ? @label_offset_x : 0) + ctrl_x, ctrl_y = next_control_position(add_offset) ctrl_x += 4 if control.is_a?(UIControls::List) - ctrl_y = row_y + (add_offset ? @label_offset_y : 0) + @pixel_offset add_control_at(id, control, ctrl_x, ctrl_y) - @row_count += rows if !add_offset + increment_row_count(rows) if !add_offset @pixel_offset -= (LINE_SPACING - UIControls::List::ROW_HEIGHT) * (rows - 1) if control.is_a?(UIControls::List) end + + def increment_row_count(count) + @row_count += count + end end diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index eb4a28b83..e3cba63df 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -149,9 +149,9 @@ module GameData :angle => 0, :visible => false, :opacity => 255, - :color_red => 255, - :color_green => 255, - :color_blue => 255, + :color_red => 0, + :color_green => 0, + :color_blue => 0, :color_alpha => 0, :tone_red => 0, :tone_green => 0, @@ -164,18 +164,26 @@ module GameData def self.property_display_name(property) return { - :frame => _INTL("Frame"), - :blending => _INTL("Blending"), - :flip => _INTL("Flip"), - :x => _INTL("X"), - :y => _INTL("Y"), - :z => _INTL("Priority"), - :zoom_x => _INTL("Zoom X"), - :zoom_y => _INTL("Zoom Y"), - :angle => _INTL("Angle"), - :visible => _INTL("Visible"), - :opacity => _INTL("Opacity") - }[property] || property.capitalize + :frame => _INTL("Frame"), + :blending => _INTL("Blending"), + :flip => _INTL("Flip"), + :x => _INTL("X"), + :y => _INTL("Y"), + :z => _INTL("Priority"), + :zoom_x => _INTL("Zoom X"), + :zoom_y => _INTL("Zoom Y"), + :angle => _INTL("Angle"), + :visible => _INTL("Visible"), + :opacity => _INTL("Opacity"), + :color_red => _INTL("Color Red"), + :color_green => _INTL("Color Green"), + :color_blue => _INTL("Color Blue"), + :color_alpha => _INTL("Color Alpha"), + :tone_red => _INTL("Tone Red"), + :tone_green => _INTL("Tone Green"), + :tone_blue => _INTL("Tone Blue"), + :tone_gray => _INTL("Tone Gray") + }[property] || property.to_s.capitalize end def self.property_can_interpolate?(property) diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 8300a4ffb..59db48eec 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -3,8 +3,8 @@ #=============================================================================== class AnimationEditor BORDER_THICKNESS = 4 - WINDOW_WIDTH = Settings::SCREEN_WIDTH + 328 + (BORDER_THICKNESS * 4) - WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + 320 + (BORDER_THICKNESS * 4) + WINDOW_WIDTH = Settings::SCREEN_WIDTH + 352 + (BORDER_THICKNESS * 4) + WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + 352 + (BORDER_THICKNESS * 4) # Components MENU_BAR_WIDTH = WINDOW_WIDTH @@ -20,10 +20,10 @@ class AnimationEditor PLAY_CONTROLS_WIDTH = CANVAS_WIDTH PLAY_CONTROLS_HEIGHT = 64 - (BORDER_THICKNESS * 2) - SIDE_PANE_X = CANVAS_X + CANVAS_WIDTH + (BORDER_THICKNESS * 2) - SIDE_PANE_Y = CANVAS_Y - SIDE_PANE_WIDTH = WINDOW_WIDTH - SIDE_PANE_X - BORDER_THICKNESS - SIDE_PANE_HEIGHT = CANVAS_HEIGHT + PLAY_CONTROLS_HEIGHT + (BORDER_THICKNESS * 2) + SIDE_PANE_X = CANVAS_X + CANVAS_WIDTH + (BORDER_THICKNESS * 2) + SIDE_PANE_Y = CANVAS_Y + SIDE_PANE_WIDTH = WINDOW_WIDTH - SIDE_PANE_X - BORDER_THICKNESS + SIDE_PANE_HEIGHT = CANVAS_HEIGHT + PLAY_CONTROLS_HEIGHT + (BORDER_THICKNESS * 2) SIDE_PANE_DELETE_MARGIN = 32 PARTICLE_LIST_X = BORDER_THICKNESS @@ -85,44 +85,64 @@ class AnimationEditor DELETABLE_COMMAND_PANE_PROPERTIES = [ :x, :y, :z, :frame, :visible, :opacity, :zoom_x, :zoom_y, :angle, :flip, :blending ] + DELETABLE_COLOR_TONE_PANE_PROPERTIES = [ + :color_red, :color_green, :color_blue, :color_alpha, + :tone_red, :tone_green, :tone_blue, :tone_gray + ] + + #----------------------------------------------------------------------------- def initialize(anim_id, anim) load_settings @anim_id = anim_id @anim = anim @pbs_path = anim[:pbs_path] + @property_pane = :commands_pane @quit = false - # Viewports + initialize_viewports + initialize_bitmaps + initialize_components + @captured = nil + set_components_contents + refresh + end + + def initialize_viewports @viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @viewport.z = 99999 @canvas_viewport = Viewport.new(CANVAS_X, CANVAS_Y, CANVAS_WIDTH, CANVAS_HEIGHT) @canvas_viewport.z = @viewport.z @pop_up_viewport = Viewport.new(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT) @pop_up_viewport.z = @viewport.z + 50 - # Background sprite + end + + def initialize_bitmaps + # Background for main editor @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) @screen_bitmap.z = -100 + # Background in which to draw the outline of the SE list box in the SE side pane @se_list_box_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) @se_list_box_bitmap.z = -90 @se_list_box_bitmap.visible = false + # Semi-transparent black overlay to dim the screen while a pop-up window is open @pop_up_bg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @pop_up_viewport) @pop_up_bg_bitmap.z = -100 @pop_up_bg_bitmap.visible = false + # Draw in these bitmaps draw_editor_background + end + + def initialize_components @components = {} # Menu bar @components[:menu_bar] = AnimationEditor::MenuBar.new(0, 0, MENU_BAR_WIDTH, MENU_BAR_HEIGHT, @viewport) # Canvas @components[:canvas] = AnimationEditor::Canvas.new(@canvas_viewport, @anim, @settings) # Side panes - [:commands_pane, :se_pane, :particle_pane, :keyframe_pane].each do |pane| + [:commands_pane, :color_tone_pane, :se_pane, :particle_pane, :keyframe_pane].each do |pane| @components[pane] = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, - (pane == :commands_pane) ? SIDE_PANE_DELETE_MARGIN : 0) + ([:commands_pane, :color_tone_pane].include?(pane)) ? SIDE_PANE_DELETE_MARGIN : 0) end - # TODO: Make a side pane for colour/tone editor (accessed from - # @components[:commands_pane] via a button; has Apply/Cancel buttons - # to retain/undo all its changes, although changes are made normally - # while in it and canvas is updated accordingly. # Timeline/particle list @components[:particle_list] = AnimationEditor::ParticleList.new( PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, @viewport @@ -148,9 +168,6 @@ class AnimationEditor AUDIO_CHOOSER_X, AUDIO_CHOOSER_Y, AUDIO_CHOOSER_WINDOW_WIDTH, AUDIO_CHOOSER_WINDOW_HEIGHT ) @components[:audio_chooser].viewport.z = @pop_up_viewport.z + 1 - @captured = nil - set_components_contents - refresh end def dispose @@ -164,6 +181,8 @@ class AnimationEditor @pop_up_viewport.dispose end + #----------------------------------------------------------------------------- + def keyframe return @components[:particle_list].keyframe end @@ -198,6 +217,8 @@ class AnimationEditor return ret end + #----------------------------------------------------------------------------- + def set_menu_bar_contents @components[:menu_bar].add_button(:quit, _INTL("Quit")) @components[:menu_bar].add_button(:save, _INTL("Save")) @@ -207,35 +228,24 @@ class AnimationEditor def set_canvas_contents end - def set_commands_pane_contents - commands_pane = @components[:commands_pane] - commands_pane.add_header_label(:header, _INTL("Edit particle at keyframe")) - commands_pane.add_labelled_number_text_box(:x, _INTL("X"), -999, 999, 0) - commands_pane.add_labelled_number_text_box(:y, _INTL("Y"), -999, 999, 0) - commands_pane.add_labelled_number_slider(:z, _INTL("Priority"), -50, 50, 0) - # TODO: If the graphic is user's sprite/target's sprite, make :frame instead - # a choice of front/back/same as the main sprite/opposite of the main - # sprite. Will need two controls in the same space, which is doable. - # Will also need to change the graphic chooser to only have "user"/ - # "target" options rather than all the variants that this control - # would manage. - commands_pane.add_labelled_number_text_box(:frame, _INTL("Frame"), 0, 99, 0) - commands_pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) - commands_pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) - commands_pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) - commands_pane.add_labelled_number_text_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) - commands_pane.add_labelled_number_text_box(:angle, _INTL("Angle"), -1080, 1080, 0) - commands_pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) - commands_pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { - 0 => _INTL("None"), - 1 => _INTL("Additive"), - 2 => _INTL("Subtractive") - }, 0) - commands_pane.add_labelled_button(:color_tone, _INTL("Color/Tone"), _INTL("Edit")) -# commands_pane.add_labelled_button(:masking, _INTL("Masking"), _INTL("Edit")) - # TODO: Add buttons that shift all commands from the current keyframe and - # later forwards/backwards in time? - # Add all "delete" buttons + def add_side_pane_tab_buttons(component, pane) + next_pos_x, next_pos_y = pane.next_control_position + # TODO: Add masking tab and properties. + [ + [:commands_pane, :general_tab, _INTL("General")], + [:color_tone_pane, :color_tone_tab, _INTL("Color/Tone")], +# [:masking_pane, :masking_tab, _INTL("Masking")] + ].each_with_index do |tab, i| + btn = UIControls::Button.new(100, 28, pane.viewport, tab[2]) + btn.set_fixed_size + btn.disable if tab[0] == component + pane.add_control_at(tab[1], btn, next_pos_x, next_pos_y) + next_pos_x += btn.width + end + pane.increment_row_count(1) + end + + def generate_delete_property_button_bitmaps delete_bitmap = Bitmap.new(16, 16) delete_disabled_bitmap = Bitmap.new(16, 16) 14.times do |i| @@ -249,49 +259,106 @@ class AnimationEditor delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(160, 160, 160)) delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(160, 160, 160)) end + return delete_bitmap, delete_disabled_bitmap + end + + def set_commands_pane_contents + pane = @components[:commands_pane] + pane.add_header_label(:header, _INTL("Edit particle at keyframe")) + # Tab buttons + add_side_pane_tab_buttons(:commands_pane, pane) + # Properties + pane.add_labelled_number_text_box(:x, _INTL("X"), -999, 999, 0) + pane.add_labelled_number_text_box(:y, _INTL("Y"), -999, 999, 0) + pane.add_labelled_number_slider(:z, _INTL("Priority"), -50, 50, 0) + # TODO: If the graphic is user's sprite/target's sprite, make :frame instead + # a choice of front/back/same as the main sprite/opposite of the main + # sprite. Will need two controls in the same space, which is doable. + # Will also need to change the graphic chooser to only have "user"/ + # "target" options rather than all the variants that this control + # would manage. + pane.add_labelled_number_text_box(:frame, _INTL("Frame"), 0, 99, 0) + pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) + pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) + pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) + pane.add_labelled_number_text_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) + pane.add_labelled_number_text_box(:angle, _INTL("Angle"), -1080, 1080, 0) + pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) + pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { + 0 => _INTL("None"), + 1 => _INTL("Additive"), + 2 => _INTL("Subtractive") + }, 0) + # TODO: Add buttons that shift all commands from the current keyframe and + # later forwards/backwards in time? + # Add all "delete" buttons + delete_bitmap, delete_disabled_bitmap = generate_delete_property_button_bitmaps DELETABLE_COMMAND_PANE_PROPERTIES.each do |property| - parent = commands_pane.get_control(property) + parent = pane.get_control(property) btn = UIControls::BitmapButton.new(parent.x + parent.width + 6, parent.y + 2, - commands_pane.viewport, delete_bitmap, delete_disabled_bitmap) + pane.viewport, delete_bitmap, delete_disabled_bitmap) btn.set_interactive_rects - commands_pane.controls.push([(property.to_s + "_delete").to_sym, btn]) + pane.controls.push([(property.to_s + "_delete").to_sym, btn]) + end + end + + def set_color_tone_pane_contents + pane = @components[:color_tone_pane] + pane.add_header_label(:header, _INTL("Edit particle at keyframe")) + # Tab buttons + add_side_pane_tab_buttons(:color_tone_pane, pane) + # Properties + pane.add_labelled_number_slider(:color_red, _INTL("Color Red"), 0, 255, 0) + pane.add_labelled_number_slider(:color_green, _INTL("Color Green"), 0, 255, 0) + pane.add_labelled_number_slider(:color_blue, _INTL("Color Blue"), 0, 255, 0) + pane.add_labelled_number_slider(:color_alpha, _INTL("Color Alpha"), 0, 255, 0) + pane.add_labelled_number_slider(:tone_red, _INTL("Tone Red"), -255, 255, 0) + pane.add_labelled_number_slider(:tone_green, _INTL("Tone Green"), -255, 255, 0) + pane.add_labelled_number_slider(:tone_blue, _INTL("Tone Blue"), -255, 255, 0) + pane.add_labelled_number_slider(:tone_gray, _INTL("Tone Gray"), 0, 255, 0) + # Add all "delete" buttons + delete_bitmap, delete_disabled_bitmap = generate_delete_property_button_bitmaps + DELETABLE_COLOR_TONE_PANE_PROPERTIES.each do |property| + parent = pane.get_control(property) + btn = UIControls::BitmapButton.new(parent.x + parent.width + 6, parent.y + 2, + pane.viewport, delete_bitmap, delete_disabled_bitmap) + btn.set_interactive_rects + pane.controls.push([(property.to_s + "_delete").to_sym, btn]) end end def set_se_pane_contents - se_pane = @components[:se_pane] - se_pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) - size = se_pane.control_size + pane = @components[:se_pane] + pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) + size = pane.control_size size[0] -= 10 size[1] = UIControls::List::ROW_HEIGHT * 5 # 5 rows - list = UIControls::List.new(*size, se_pane.viewport, []) - se_pane.add_control_at(:list, list, 5, 30) + list = UIControls::List.new(*size, pane.viewport, []) + pane.add_control_at(:list, list, 5, 30) button_height = UIControls::ControlsContainer::LINE_SPACING - add = UIControls::Button.new(101, button_height, se_pane.viewport, _INTL("Add")) + add = UIControls::Button.new(101, button_height, pane.viewport, _INTL("Add")) add.set_fixed_size - se_pane.add_control_at(:add, add, 1, 154) - edit = UIControls::Button.new(100, button_height, se_pane.viewport, _INTL("Edit")) + pane.add_control_at(:add, add, 1, 154) + edit = UIControls::Button.new(100, button_height, pane.viewport, _INTL("Edit")) edit.set_fixed_size - se_pane.add_control_at(:edit, edit, 102, 154) - delete = UIControls::Button.new(101, button_height, se_pane.viewport, _INTL("Delete")) + pane.add_control_at(:edit, edit, 102, 154) + delete = UIControls::Button.new(101, button_height, pane.viewport, _INTL("Delete")) delete.set_fixed_size - se_pane.add_control_at(:delete, delete, 202, 154) + pane.add_control_at(:delete, delete, 202, 154) end def set_particle_pane_contents - particle_pane = @components[:particle_pane] - particle_pane.add_header_label(:header, _INTL("Edit particle properties")) - particle_pane.add_labelled_text_box(:name, _INTL("Name"), "") - particle_pane.get_control(:name).set_blacklist("User", "Target", "SE") - particle_pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") - particle_pane.add_labelled_button(:graphic, "", _INTL("Change")) - particle_pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :undefined) + pane = @components[:particle_pane] + pane.add_header_label(:header, _INTL("Edit particle properties")) + pane.add_labelled_text_box(:name, _INTL("Name"), "") + pane.get_control(:name).set_blacklist("User", "Target", "SE") + pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") + pane.add_labelled_button(:graphic, "", _INTL("Change")) + pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :undefined) # FlipIfFoe # RotateIfFoe - # Duplicate button - particle_pane.add_button(:duplicate, _INTL("Duplicate this particle")) - # Delete button (if not "User"/"Target"/"SE") - particle_pane.add_button(:delete, _INTL("Delete this particle")) + pane.add_button(:duplicate, _INTL("Duplicate this particle")) + pane.add_button(:delete, _INTL("Delete this particle")) # Shift all command timings by X keyframes (text box and button) # Move particle up/down the list? end @@ -307,6 +374,7 @@ class AnimationEditor def set_side_panes_contents set_commands_pane_contents + set_color_tone_pane_contents set_se_pane_contents set_particle_pane_contents set_keyframe_pane_contents @@ -323,32 +391,22 @@ class AnimationEditor def set_animation_properties_contents anim_properties = @components[:animation_properties] anim_properties.add_header_label(:header, _INTL("Animation properties")) - # Create "usable in battle" control anim_properties.add_labelled_checkbox(:usable, _INTL("Can be used in battle?"), true) - # Create animation type control anim_properties.add_labelled_dropdown_list(:type, _INTL("Animation type"), { :move => _INTL("Move"), :common => _INTL("Common") }, :move) - # Create "opp" variant anim_properties.add_labelled_checkbox(:opp_variant, _INTL("User is opposing?"), false) - # Create move control anim_properties.add_labelled_text_box_dropdown_list(:move, "", [], "") move_ctrl = anim_properties.get_control(:move) move_ctrl.max_rows = 16 - # Create version control anim_properties.add_labelled_number_text_box(:version, _INTL("Version"), 0, 99, 0) - # Create animation name control anim_properties.add_labelled_text_box(:name, _INTL("Name"), "") - # Create filepath controls # TODO: Have two TextBoxes, one for folder and one for filename? anim_properties.add_labelled_text_box(:pbs_path, _INTL("PBS filepath"), "") - # Create "involves a user" control anim_properties.add_labelled_checkbox(:has_user, _INTL("Involves a user?"), true) - # Create "involves a target" control anim_properties.add_labelled_checkbox(:has_target, _INTL("Involves a target?"), true) - # Create flags control - # TODO: List, TextBox and some Buttons to add/delete. + # TODO: Flags control. Includes a List, TextBox and some add/delete Buttons. anim_properties.add_button(:close, _INTL("Close")) anim_properties.visible = false end @@ -429,7 +487,7 @@ class AnimationEditor # NOTE: These sprite names are also used in Pokemon.play_cry and so should # be a species ID (being a string is fine). :user_sprite_name => "ARCANINE", - :target_sprite_name => "ABOMASNOW" + :target_sprite_name => "CHARIZARD" } end @@ -473,10 +531,11 @@ class AnimationEditor component = @components[component_sym] # Panes are all mutually exclusive case component_sym - when :commands_pane + when :commands_pane, :color_tone_pane component.visible = (keyframe >= 0 && particle_index >= 0 && @anim[:particles][particle_index] && - @anim[:particles][particle_index][:name] != "SE") + @anim[:particles][particle_index][:name] != "SE") && + @property_pane == component_sym when :se_pane component.visible = (keyframe >= 0 && particle_index >= 0 && @anim[:particles][particle_index] && @@ -544,6 +603,22 @@ class AnimationEditor component.get_control((property.to_s + "_delete").to_sym).disable end end + when :color_tone_pane + new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) + component.controls.each do |ctrl| + next if !new_vals.include?(ctrl[0]) + ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") + # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, + # which should be indicated somehow in ctrl[1]. + end + # Enable/disable property delete buttons + DELETABLE_COLOR_TONE_PANE_PROPERTIES.each do |property| + if AnimationEditor::ParticleDataHelper.has_command_at?(@anim[:particles][particle_index], property, keyframe) + component.get_control((property.to_s + "_delete").to_sym).enable + else + component.get_control((property.to_s + "_delete").to_sym).disable + end + end when :se_pane se_particle = @anim[:particles].select { |p| p[:name] == "SE" }[0] kyfrm = keyframe @@ -692,11 +767,16 @@ class AnimationEditor when :play_controls # TODO: Will the play controls ever signal themselves as changed? I don't # think so. - when :commands_pane + when :commands_pane, :color_tone_pane case property - when :color_tone # Button - # TODO: Open the colour/tone side pane. - echoln "Color/Tone button clicked" + when :general_tab + @property_pane = :commands_pane + refresh_component(component_sym) + refresh_component(@property_pane) + when :color_tone_tab + @property_pane = :color_tone_pane + refresh_component(component_sym) + refresh_component(@property_pane) else particle = @anim[:particles][particle_index] prop = property @@ -713,13 +793,13 @@ class AnimationEditor end @components[:particle_list].change_particle_commands(particle_index) @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(:commands_pane) + refresh_component(component_sym) refresh_component(:canvas) end when :se_pane case property when :list # List - refresh_component(:se_pane) + refresh_component(component_sym) when :add # Button new_file, new_volume, new_pitch = choose_audio_file("", 100, 100) if new_file != "" @@ -727,11 +807,11 @@ class AnimationEditor AnimationEditor::ParticleDataHelper.add_se_command(particle, keyframe, new_file, new_volume, new_pitch) @components[:particle_list].change_particle_commands(particle_index) @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(:se_pane) + refresh_component(component_sym) end when :edit # Button particle = @anim[:particles][particle_index] - list = @components[:se_pane].get_control(:list) + list = @components[component_sym].get_control(:list) old_file = list.value old_volume, old_pitch = AnimationEditor::ParticleDataHelper.get_se_values_from_filename_and_frame(particle, keyframe, old_file) if old_file @@ -741,18 +821,18 @@ class AnimationEditor AnimationEditor::ParticleDataHelper.add_se_command(particle, keyframe, new_file, new_volume, new_pitch) @components[:particle_list].change_particle_commands(particle_index) @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(:se_pane) + refresh_component(component_sym) end end when :delete # Button particle = @anim[:particles][particle_index] - list = @components[:se_pane].get_control(:list) + list = @components[component_sym].get_control(:list) old_file = list.value if old_file AnimationEditor::ParticleDataHelper.delete_se_command(particle, keyframe, old_file) @components[:particle_list].change_particle_commands(particle_index) @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(:se_pane) + refresh_component(component_sym) end end when :particle_pane @@ -762,7 +842,7 @@ class AnimationEditor new_file = choose_graphic_file(@anim[:particles][p_index][:graphic]) if @anim[:particles][p_index][:graphic] != new_file @anim[:particles][p_index][:graphic] = new_file - refresh_component(:particle_pane) + refresh_component(component_sym) refresh_component(:canvas) end when :duplicate @@ -781,7 +861,7 @@ class AnimationEditor particle = @anim[:particles][particle_index] new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) @components[:particle_list].change_particle(particle_index) - refresh_component(:particle_pane) + refresh_component(component_sym) refresh_component(:canvas) end when :keyframe_pane @@ -837,15 +917,15 @@ class AnimationEditor # panes)? Probably. case property when :type, :opp_variant - type = @components[:animation_properties].get_control(:type).value - opp = @components[:animation_properties].get_control(:opp_variant).value + type = @components[component_sym].get_control(:type).value + opp = @components[component_sym].get_control(:opp_variant).value case type when :move @anim[:type] = (opp) ? :opp_move : :move when :common @anim[:type] = (opp) ? :opp_common : :common end - refresh_component(:animation_properties) + refresh_component(component_sym) refresh_component(:canvas) when :pbs_path txt = value.gsub!(/\.txt$/, "") From 323b62b7d57c44a8e9352d7c8e65f9d9bf498576 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 25 Mar 2024 22:08:11 +0000 Subject: [PATCH 24/49] Anim Editor: polishing, refactoring, ensuring data --- .../Control elements/101_Scrollbar.rb | 8 + .../903_Anim Compiler/001_Anim compiler.rb | 60 ++- .../904_Anim Editor/001_AnimationEditor.rb | 55 ++- .../Anim Editor elements/001_Canvas.rb | 8 +- .../Anim Editor elements/003_ParticleList.rb | 379 +++++++++++------- PBS/Animations/Converted/Move/ABSORB.txt | 1 - PBS/Animations/Converted/Move/MAGICCOAT.txt | 1 - 7 files changed, 336 insertions(+), 176 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb index d0a9f5c38..b91de8dac 100644 --- a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb +++ b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb @@ -33,6 +33,14 @@ class UIControls::Scrollbar < UIControls::BaseControl return (@range - @tray_size) * @slider_top / (@tray_size - @slider_size) end + def minimum? + return @slider_top <= 0 + end + + def maximum? + return @slider_top >= @tray_size - @slider_size + end + # Range is the total size of the large area that the scrollbar is able to # show part of. def range=(new_val) diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index fb61aadab..a31e7991f 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -47,7 +47,7 @@ module Compiler elsif line[/^\s*(\w+)\s*=\s*(.*)$/] # XXX=YYY lines if !data_hash - raise _INTL("Expected a section at the beginning of the file.\n{1}", FileLineData.linereport) + raise _INTL("Expected a section at the beginning of the file.") + "\n" + FileLineData.linereport end key = $~[1] if schema[key] # Property of the animation @@ -62,7 +62,7 @@ module Compiler end elsif sub_schema[key] # Property of a particle if !current_particle - raise _INTL("Particle hasn't been defined yet!\n{1}", FileLineData.linereport) + raise _INTL("Particle hasn't been defined yet!") + "\n" + FileLineData.linereport end value = get_csv_record($~[2], sub_schema[key]) if sub_schema[key][1][0] == "^" @@ -154,20 +154,51 @@ module Compiler when "Target" then particle[:graphic] = "TARGET" end end - # Ensure that particles don't have a focus involving a user if the - # animation itself doesn't involve a user - if hash[:no_user] && GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) - raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a user if property \"NoUser\" is set to true.", - particle[:name]) + "\n" + FileLineData.linereport + # Ensure that particles don't have a focus involving a user, and the + # animation doesn't play a user's cry, if the animation itself doesn't + # involve a user + if hash[:no_user] + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) + raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a user if property \"NoUser\" is set to true.", + particle[:name]) + "\n" + FileLineData.linereport + end + if particle[:name] == "SE" && particle[:user_cry] && !particle[:user_cry].empty? + raise _INTL("Animation can't play the user's cry if property \"NoUser\" is set to true.") + "\n" + FileLineData.linereport + end end - # Ensure that particles don't have a focus involving a target if the - # animation itself doesn't involve a target - if hash[:no_target] && GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) - raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a target if property \"NoTarget\" is set to true.", - particle[:name]) + "\n" + FileLineData.linereport + # Ensure that particles don't have a focus involving a target, and the + # animation doesn't play a target's cry, if the animation itself doesn't + # involve a target + if hash[:no_target] + if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a target if property \"NoTarget\" is set to true.", + particle[:name]) + "\n" + FileLineData.linereport + end + if particle[:name] == "SE" && particle[:target_cry] && !particle[:target_cry].empty? + raise _INTL("Animation can't play the target's cry if property \"NoTarget\" is set to true.") + "\n" + FileLineData.linereport + end + end + # Ensure that the same SE isn't played twice in the same frame + if particle[:name] == "SE" + [:se, :user_cry, :target_cry].each do |property| + next if !particle[property] + files_played = [] + particle[property].each do |play| + files_played[play[0]] ||= [] + if files_played[play[0]].include?(play[1]) + case property + when :se + raise _INTL("SE \"{1}\" should not play twice in the same frame ({2}).", play[1], play[0]) + "\n" + FileLineData.linereport + when :user_cry + raise _INTL("User's cry should not play twice in the same frame ({1}).", play[0]) + "\n" + FileLineData.linereport + when :target_cry + raise _INTL("Target's cry should not play twice in the same frame ({1}).", play[0]) + "\n" + FileLineData.linereport + end + end + files_played[play[0]].push(play[1]) + end + end end - # TODO: For SE particle, ensure that it doesn't play two instances of the - # same file in the same frame. # Convert all "SetXYZ" particle commands to "MoveXYZ" by giving them a # duration of 0 (even ones that can't have a "MoveXYZ" command) GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.keys.each do |prop| @@ -293,6 +324,7 @@ module Compiler rescue SystemCallError end raise Reset.new if e.is_a?(Hangup) + raise SystemExit.new if e.is_a?(RuntimeError) raise "Unknown exception when compiling animations." end end diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 59db48eec..17a0a1eb8 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -711,7 +711,7 @@ class AnimationEditor # Disable the "move particle up/down" buttons if the selected particle # can't move that way (or there is no selected particle) cur_index = particle_index - if cur_index < 1 + if cur_index < 1 || @anim[:particles][cur_index][:name] == "SE" component.get_control(:move_particle_up).disable else component.get_control(:move_particle_up).enable @@ -847,12 +847,14 @@ class AnimationEditor end when :duplicate AnimationEditor::ParticleDataHelper.duplicate_particle(@anim[:particles], particle_index) + @components[:particle_list].add_particle(particle_index + 1) @components[:particle_list].set_particles(@anim[:particles]) @components[:particle_list].particle_index = particle_index + 1 refresh when :delete if confirm_message(_INTL("Are you sure you want to delete this particle?")) AnimationEditor::ParticleDataHelper.delete_particle(@anim[:particles], particle_index) + @components[:particle_list].delete_particle(particle_index) @components[:particle_list].set_particles(@anim[:particles]) @components[:particle_list].keyframe = 0 if @anim[:particles][particle_index][:name] == "SE" refresh @@ -875,6 +877,7 @@ class AnimationEditor new_idx = @anim[:particles].length - 1 if new_idx == 0 || new_idx >= @anim[:particles].length end AnimationEditor::ParticleDataHelper.add_particle(@anim[:particles], new_idx) + @components[:particle_list].add_particle(new_idx) @components[:particle_list].set_particles(@anim[:particles]) @components[:particle_list].particle_index = (new_idx >= 0) ? new_idx : @anim[:particles].length - 2 @components[:particle_list].keyframe = -1 @@ -883,6 +886,7 @@ class AnimationEditor idx1 = particle_index idx2 = idx1 - 1 AnimationEditor::ParticleDataHelper.swap_particles(@anim[:particles], idx1, idx2) + @components[:particle_list].swap_particles(idx1, idx2) @components[:particle_list].set_particles(@anim[:particles]) @components[:particle_list].particle_index = idx2 refresh @@ -890,6 +894,7 @@ class AnimationEditor idx1 = particle_index idx2 = idx1 + 1 AnimationEditor::ParticleDataHelper.swap_particles(@anim[:particles], idx1, idx2) + @components[:particle_list].swap_particles(idx1, idx2) @components[:particle_list].set_particles(@anim[:particles]) @components[:particle_list].particle_index = idx2 refresh @@ -932,16 +937,48 @@ class AnimationEditor @anim[property] = txt when :has_user @anim[:no_user] = !value - # TODO: Add/delete the "User" particle accordingly, and change the foci - # of any other particle involving a user. Then refresh a lot of - # components. - refresh_component(:canvas) + if @anim[:no_user] + @anim[:particles].delete_if { |particle| particle[:name] == "User" } + @anim[:particles].each do |particle| + if ["USER", "USER_OPP", "USER_FRONT", "USER_BACK"].include?(particle[:graphic]) + particle[:graphic] = GameData::Animation::PARTICLE_DEFAULT_VALUES[:graphic] + end + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) + particle[:focus] = GameData::Animation::PARTICLE_DEFAULT_VALUES[:focus] + end + particle[:user_cry] = nil if particle[:name] == "SE" + end + @components[:particle_list].delete_particle(0) + elsif @anim[:particles].none? { |particle| particle[:name] == "User" } + @anim[:particles].insert(0, { + :name => "User", :focus => :user, :graphic => "USER" + }) + @components[:particle_list].add_particle(0) + end + @components[:particle_list].set_particles(@anim[:particles]) + refresh when :has_target @anim[:no_target] = !value - # TODO: Add/delete the "Target" particle accordingly, and change the - # foci of any other particle involving a target. Then refresh a - # lot of components. - refresh_component(:canvas) + if @anim[:no_target] + @anim[:particles].delete_if { |particle| particle[:name] == "Target" } + @anim[:particles].each do |particle| + if ["TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(particle[:graphic]) + particle[:graphic] = GameData::Animation::PARTICLE_DEFAULT_VALUES[:graphic] + end + if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + particle[:focus] = GameData::Animation::PARTICLE_DEFAULT_VALUES[:focus] + end + particle[:target_cry] = nil if particle[:name] == "SE" + end + @components[:particle_list].delete_particle(@anim[:no_user] ? 0 : 1) + elsif @anim[:particles].none? { |particle| particle[:name] == "Target" } + @anim[:particles].insert((@anim[:no_user] ? 0 : 1), { + :name => "Target", :focus => :target, :graphic => "TARGET" + }) + @components[:particle_list].add_particle((@anim[:no_user] ? 0 : 1)) + end + @components[:particle_list].set_particles(@anim[:particles]) + refresh when :usable @anim[:ignore] = !value else diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 1da9b6048..87e8e233a 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -321,25 +321,25 @@ class AnimationEditor::Canvas < Sprite spr.bitmap = @user_bitmap_back when "TARGET" if target_idx < 0 - raise _INTL("Particle {1} was given a graphic of \"TARGET\" but its focus doesn't include a target.", + raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET\" but its focus doesn't include a target.", particle[:name]) end spr.bitmap = (target_idx.even?) ? @target_bitmap_back : @target_bitmap_front when "TARGET_OPP" if target_idx < 0 - raise _INTL("Particle {1} was given a graphic of \"TARGET_OPP\" but its focus doesn't include a target.", + raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET_OPP\" but its focus doesn't include a target.", particle[:name]) end spr.bitmap = (target_idx.even?) ? @target_bitmap_front : @target_bitmap_back when "TARGET_FRONT" if target_idx < 0 - raise _INTL("Particle {1} was given a graphic of \"TARGET_FRONT\" but its focus doesn't include a target.", + raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET_FRONT\" but its focus doesn't include a target.", particle[:name]) end spr.bitmap = @target_bitmap_front when "TARGET_BACK" if target_idx < 0 - raise _INTL("Particle {1} was given a graphic of \"TARGET_BACK\" but its focus doesn't include a target.", + raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET_BACK\" but its focus doesn't include a target.", particle[:name]) end spr.bitmap = @target_bitmap_back diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 280dcb4a1..197ac7cb5 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -1,6 +1,5 @@ #=============================================================================== -# TODO: The Add/Up/Down buttons don't get captured, and don't prevent anything -# else in this control highlighting when hovered over, and vice versa. +# #=============================================================================== class AnimationEditor::ParticleList < UIControls::BaseControl VIEWPORT_SPACING = 1 @@ -48,66 +47,11 @@ class AnimationEditor::ParticleList < UIControls::BaseControl self.x = x self.y = y draw_control_background - # Create viewports - @list_viewport = Viewport.new( - x + LIST_X, y + LIST_Y, LIST_WIDTH, height - LIST_Y - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING - ) - @list_viewport.z = self.viewport.z + 1 - @commands_bg_viewport = Viewport.new( - x + COMMANDS_X, y + COMMANDS_Y, - width - COMMANDS_X - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @list_viewport.rect.height - ) - @commands_bg_viewport.z = self.viewport.z + 1 - @position_viewport = Viewport.new(@commands_bg_viewport.rect.x, y, @commands_bg_viewport.rect.width, height) - @position_viewport.z = self.viewport.z + 2 - @commands_viewport = Viewport.new(@commands_bg_viewport.rect.x, @commands_bg_viewport.rect.y, - @commands_bg_viewport.rect.width, @commands_bg_viewport.rect.height) - @commands_viewport.z = self.viewport.z + 3 - # Create scrollbars - @list_scrollbar = UIControls::Scrollbar.new( - x + width - UIControls::Scrollbar::SLIDER_WIDTH, @commands_bg_viewport.rect.y, - @commands_bg_viewport.rect.height, self.viewport, false, true - ) - @list_scrollbar.set_interactive_rects - @time_scrollbar = UIControls::Scrollbar.new( - @commands_bg_viewport.rect.x, y + height - UIControls::Scrollbar::SLIDER_WIDTH, - @commands_bg_viewport.rect.width, self.viewport, true, true - ) - @time_scrollbar.set_interactive_rects - # Time background bitmap sprite - @time_bg_sprite = BitmapSprite.new( - @commands_viewport.rect.width, - TIMELINE_HEIGHT + VIEWPORT_SPACING + @list_viewport.rect.height, self.viewport - ) - @time_bg_sprite.x = @commands_viewport.rect.x - @time_bg_sprite.y = self.y - # Timeline bitmap sprite - @timeline_sprite = BitmapSprite.new(@commands_viewport.rect.width, TIMELINE_HEIGHT, self.viewport) - @timeline_sprite.x = @commands_viewport.rect.x - @timeline_sprite.y = self.y - @timeline_sprite.bitmap.font.color = TEXT_COLOR - @timeline_sprite.bitmap.font.size = TIMELINE_TEXT_SIZE - # Position line sprite - @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @position_viewport) - @position_sprite.ox = @position_sprite.width / 2 - @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, Color.red) - # Selected particle line sprite - @particle_line_sprite = BitmapSprite.new(@position_viewport.rect.width, 3, @commands_viewport) - @particle_line_sprite.z = -10 - @particle_line_sprite.oy = @particle_line_sprite.height / 2 - @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, Color.red) - # Buttons and button bitmaps - initialize_button_bitmaps - @controls = [] - add_particle_button = UIControls::BitmapButton.new(x + 1, y + 1, viewport, @add_button_bitmap) - add_particle_button.set_interactive_rects - @controls.push([:add_particle, add_particle_button]) - up_particle_button = UIControls::BitmapButton.new(x + 22, y + 1, viewport, @up_button_bitmap) - up_particle_button.set_interactive_rects - @controls.push([:move_particle_up, up_particle_button]) - down_particle_button = UIControls::BitmapButton.new(x + 43, y + 1, viewport, @down_button_bitmap) - down_particle_button.set_interactive_rects - @controls.push([:move_particle_down, down_particle_button]) + initialize_viewports + initialize_scrollbars + initialize_timeline_bitmaps + initialize_selection_bitmaps + initialize_controls # List sprites and commands sprites @list_sprites = [] @commands_bg_sprites = [] @@ -127,7 +71,81 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands = {} end - def initialize_button_bitmaps + def initialize_viewports + @list_viewport = Viewport.new( + x + LIST_X, y + LIST_Y, LIST_WIDTH, height - LIST_Y - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING + ) + @list_viewport.z = self.viewport.z + 1 + @commands_bg_viewport = Viewport.new( + x + COMMANDS_X, y + COMMANDS_Y, + width - COMMANDS_X - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @list_viewport.rect.height + ) + @commands_bg_viewport.z = self.viewport.z + 1 + @position_viewport = Viewport.new(@commands_bg_viewport.rect.x, y, @commands_bg_viewport.rect.width, height) + @position_viewport.z = self.viewport.z + 2 + @commands_viewport = Viewport.new(@commands_bg_viewport.rect.x, @commands_bg_viewport.rect.y, + @commands_bg_viewport.rect.width, @commands_bg_viewport.rect.height) + @commands_viewport.z = self.viewport.z + 3 + end + + def initialize_scrollbars + # Vertical scrollbar + @list_scrollbar = UIControls::Scrollbar.new( + x + width - UIControls::Scrollbar::SLIDER_WIDTH, @commands_bg_viewport.rect.y, + @commands_bg_viewport.rect.height, self.viewport, false, true + ) + @list_scrollbar.set_interactive_rects + # Horizontal scrollbar + @time_scrollbar = UIControls::Scrollbar.new( + @commands_bg_viewport.rect.x, y + height - UIControls::Scrollbar::SLIDER_WIDTH, + @commands_bg_viewport.rect.width, self.viewport, true, true + ) + @time_scrollbar.set_interactive_rects + end + + def initialize_timeline_bitmaps + # Time background bitmap sprite + @time_bg_sprite = BitmapSprite.new( + @commands_viewport.rect.width, + TIMELINE_HEIGHT + VIEWPORT_SPACING + @list_viewport.rect.height, self.viewport + ) + @time_bg_sprite.x = @commands_viewport.rect.x + @time_bg_sprite.y = self.y + # Timeline bitmap sprite + @timeline_sprite = BitmapSprite.new(@commands_viewport.rect.width, TIMELINE_HEIGHT, self.viewport) + @timeline_sprite.x = @commands_viewport.rect.x + @timeline_sprite.y = self.y + @timeline_sprite.bitmap.font.color = TEXT_COLOR + @timeline_sprite.bitmap.font.size = TIMELINE_TEXT_SIZE + end + + def initialize_selection_bitmaps + # Position line sprite + @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @position_viewport) + @position_sprite.ox = @position_sprite.width / 2 + @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, Color.red) + # Selected particle line sprite + @particle_line_sprite = BitmapSprite.new(@position_viewport.rect.width, 3, @commands_viewport) + @particle_line_sprite.z = -10 + @particle_line_sprite.oy = @particle_line_sprite.height / 2 + @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, Color.red) + end + + def initialize_controls + generate_button_bitmaps + @controls = [] + add_particle_button = UIControls::BitmapButton.new(x + 1, y + 1, viewport, @add_button_bitmap) + add_particle_button.set_interactive_rects + @controls.push([:add_particle, add_particle_button]) + up_particle_button = UIControls::BitmapButton.new(x + 22, y + 1, viewport, @up_button_bitmap) + up_particle_button.set_interactive_rects + @controls.push([:move_particle_up, up_particle_button]) + down_particle_button = UIControls::BitmapButton.new(x + 43, y + 1, viewport, @down_button_bitmap) + down_particle_button.set_interactive_rects + @controls.push([:move_particle_down, down_particle_button]) + end + + def generate_button_bitmaps @add_button_bitmap = Bitmap.new(12, 12) @add_button_bitmap.fill_rect(1, 5, 10, 2, TEXT_COLOR) @add_button_bitmap.fill_rect(5, 1, 2, 10, TEXT_COLOR) @@ -143,24 +161,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end - def draw_control_background - self.bitmap.clear - # Separator lines - self.bitmap.fill_rect(0, TIMELINE_HEIGHT, width, VIEWPORT_SPACING, Color.black) - self.bitmap.fill_rect(LIST_WIDTH, 0, VIEWPORT_SPACING, height, Color.black) - self.bitmap.fill_rect(0, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, width, VIEWPORT_SPACING, Color.black) - self.bitmap.fill_rect(width - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, 0, VIEWPORT_SPACING, height, Color.black) - end - - def dispose_listed_sprites - @list_sprites.each { |p| p&.dispose } - @list_sprites.clear - @commands_bg_sprites.each { |p| p&.dispose } - @commands_bg_sprites.clear - @commands_sprites.each { |p| p&.dispose } - @commands_sprites.clear - end - def dispose @list_scrollbar.dispose @time_scrollbar.dispose @@ -179,6 +179,17 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @commands_viewport.dispose end + def dispose_listed_sprites + @list_sprites.each { |p| p&.dispose } + @list_sprites.clear + @commands_bg_sprites.each { |p| p&.dispose } + @commands_bg_sprites.clear + @commands_sprites.each { |p| p&.dispose } + @commands_sprites.clear + end + + #----------------------------------------------------------------------------- + def duration return [@duration - DURATION_BUFFER, 0].max end @@ -236,6 +247,71 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end + def scroll_to_row(new_row) + if new_row * ROW_HEIGHT < @top_pos + # Scroll up + new_pos = new_row * ROW_HEIGHT + loop do + @list_scrollbar.slider_top -= 1 + break if @list_scrollbar.position <= new_pos || @list_scrollbar.minimum? + end + elsif new_row * ROW_HEIGHT > @top_pos + @list_viewport.rect.height - ROW_HEIGHT + # Scroll down + new_pos = (new_row * ROW_HEIGHT) - @list_viewport.rect.height + ROW_HEIGHT + loop do + @list_scrollbar.slider_top += 1 + break if @list_scrollbar.position >= new_pos || @list_scrollbar.maximum? + end + end + end + + def scroll_to_keyframe(new_keyframe) + if TIMELINE_LEFT_BUFFER + (new_keyframe * KEYFRAME_SPACING) - (KEYFRAME_SPACING / 2) < @left_pos + # Scroll left + new_pos = TIMELINE_LEFT_BUFFER + (new_keyframe * KEYFRAME_SPACING) - (KEYFRAME_SPACING / 2) + loop do + @time_scrollbar.slider_top -= 1 + break if @time_scrollbar.position <= new_pos || @time_scrollbar.minimum? + end + elsif TIMELINE_LEFT_BUFFER + (new_keyframe * KEYFRAME_SPACING) + (KEYFRAME_SPACING / 2) > @left_pos + @commands_bg_viewport.rect.width + # Scroll right + new_pos = TIMELINE_LEFT_BUFFER + (new_keyframe * KEYFRAME_SPACING) + (KEYFRAME_SPACING / 2) - @commands_bg_viewport.rect.width + loop do + @time_scrollbar.slider_top += 1 + break if @time_scrollbar.position >= new_pos || @time_scrollbar.maximum? + end + end + end + + # Ensures that the array of which particle rows have been expanded ends up + # with the same particles having expanded rows after adding a particle. + def add_particle(index) + @expanded_particles.each_with_index do |idx, i| + @expanded_particles[i] += 1 if idx >= index + end + end + + # Ensures that the array of which particle rows have been expanded ends up + # with the same particles having expanded rows after deleting a particle. + def delete_particle(index) + @expanded_particles.delete(index) + @expanded_particles.each_with_index do |idx, i| + @expanded_particles[i] -= 1 if idx > index + end + end + + # Ensures that the array of which particle rows have been expanded ends up + # with the same particles having expanded rows after the swap. + def swap_particles(idx1, idx2) + if @expanded_particles.include?(idx1) && !@expanded_particles.include?(idx2) + @expanded_particles.delete(idx1) + @expanded_particles.push(idx2) + elsif @expanded_particles.include?(idx2) && !@expanded_particles.include?(idx1) + @expanded_particles.delete(idx2) + @expanded_particles.push(idx1) + end + end + def set_particles(particles) @particles = particles calculate_all_commands_and_durations @@ -449,9 +525,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl invalidate_rows end - # TODO: Methods that will show/hide individual property rows for a given - # @particles index. - #----------------------------------------------------------------------------- def each_visible_keyframe(early_start = false) @@ -478,6 +551,17 @@ class AnimationEditor::ParticleList < UIControls::BaseControl #----------------------------------------------------------------------------- + def draw_control_background + self.bitmap.clear + # Separator lines + self.bitmap.fill_rect(0, TIMELINE_HEIGHT, width, VIEWPORT_SPACING, Color.black) + self.bitmap.fill_rect(LIST_WIDTH, 0, VIEWPORT_SPACING, height, Color.black) + self.bitmap.fill_rect(0, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, width, VIEWPORT_SPACING, Color.black) + self.bitmap.fill_rect(width - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, 0, VIEWPORT_SPACING, height, Color.black) + end + + #----------------------------------------------------------------------------- + def repaint @list_scrollbar.repaint if @list_scrollbar.invalid? @time_scrollbar.repaint if @time_scrollbar.invalid? @@ -850,14 +934,16 @@ class AnimationEditor::ParticleList < UIControls::BaseControl else case @captured_row_button when :expand - particle_index = @particle_list[@captured_row] - particle_index = particle_index[0] if particle_index.is_a?(Array) - if @expanded_particles.include?(particle_index) # Contract - @expanded_particles.delete(particle_index) - else # Expand - @expanded_particles.push(particle_index) + old_row_idx_particle = @particle_list[@row_index] + idx_particle = @particle_list[@captured_row] + idx_particle = idx_particle[0] if idx_particle.is_a?(Array) + if @expanded_particles.include?(idx_particle) # Contract + @expanded_particles.delete(idx_particle) + else # Expand + @expanded_particles.push(idx_particle) end set_particles(@particles) + @row_index = @particle_list.index(old_row_idx_particle) else # :row button or somewhere in the commands area or timeline, just change selection if @captured_row && @particle_list[@captured_row].is_a?(Array) @captured_row = @particle_list.index(@particle_list[@captured_row][0]) @@ -877,11 +963,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl super # Make this control not busy again end - def on_right_mouse_release - # TODO: Toggle interpolation line at mouse's position. Should this also have - # a def on_right_mouse_press and @right_captured_whatever? - end - def update_hover_highlight # Remove the hover highlight if there are no interactions for this control # or if the mouse is off-screen @@ -938,6 +1019,59 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end + def update_input + # Left/right to change current keyframe + if Input.repeat?(Input::LEFT) + if @keyframe > 0 + @keyframe -= 1 + scroll_to_keyframe(@keyframe) + set_changed + end + elsif Input.repeat?(Input::RIGHT) + if @keyframe < @duration - 1 + @keyframe += 1 + scroll_to_keyframe(@keyframe) + set_changed + end + end + # Up/down to change selected particle + if Input.repeat?(Input::UP) + if @row_index > 0 + loop do + @row_index -= 1 + break if !@particle_list[@row_index].is_a?(Array) + end + scroll_to_row(@row_index) + set_changed + end + elsif Input.repeat?(Input::DOWN) + if @row_index < @particle_list.length - 1 + loop do + @row_index += 1 + break if !@particle_list[@row_index].is_a?(Array) + end + @keyframe = 0 if @row_index >= @particle_list.length - 1 && @keyframe < 0 + scroll_to_row(@row_index) + set_changed + end + end + # Mouse scroll wheel + mouse_x, mouse_y = mouse_pos + if mouse_x && mouse_y + if @interactions[:list].contains?(mouse_x, mouse_y) || + @interactions[:commands].contains?(mouse_x, mouse_y) + wheel_v = Input.scroll_v + if wheel_v > 0 # Scroll up + @list_scrollbar.slider_top -= UIControls::Scrollbar::SCROLL_DISTANCE + self.top_pos = @list_scrollbar.position + elsif wheel_v < 0 # Scroll down + @list_scrollbar.slider_top += UIControls::Scrollbar::SCROLL_DISTANCE + self.top_pos = @list_scrollbar.position + end + end + end + end + def update return if !self.visible @list_scrollbar.update @@ -949,9 +1083,8 @@ class AnimationEditor::ParticleList < UIControls::BaseControl # Refresh sprites if a scrollbar has been moved self.top_pos = @list_scrollbar.position self.left_pos = @time_scrollbar.position - # Update the current keyframe line's position + # Update the positions of the selected particle/keyframe lines refresh_position_line - # Update the selected particle line's position refresh_particle_line # Add/move particle buttons @controls.each do |c| @@ -960,55 +1093,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @values[c[0]] = true c[1].clear_changed end - - if Input.release?(Input::MOUSERIGHT) - on_right_mouse_release - end - - # TODO: This is testing code, and should be replaced by clicking on the - # timeline or a command sprite. Maybe keep it after all? If so, - # probably change left/right to <>, and also move the scrollbar(s) to - # keep the "cursor" on-screen. - if Input.repeat?(Input::LEFT) - if @keyframe > 0 - @keyframe -= 1 - set_changed - end - elsif Input.repeat?(Input::RIGHT) - if @keyframe < @duration - 1 - @keyframe += 1 - set_changed - end - # TODO: If this is to be kept, @row_index should be changed by potentially - # more than 1, so that @particle_list[@row_index] is an integer and - # not an array. - # elsif Input.repeat?(Input::UP) - # if @row_index > 0 - # @row_index -= 1 - # set_changed - # end - # elsif Input.repeat?(Input::DOWN) - # if @row_index < @particles.length - 1 - # @row_index += 1 - # set_changed - # end - end - - # Mouse scroll wheel - mouse_x, mouse_y = mouse_pos - if mouse_x && mouse_y - if @interactions[:list].contains?(mouse_x, mouse_y) || - @interactions[:commands].contains?(mouse_x, mouse_y) - wheel_v = Input.scroll_v - if wheel_v > 0 # Scroll up - @list_scrollbar.slider_top -= UIControls::Scrollbar::SCROLL_DISTANCE - self.top_pos = @list_scrollbar.position - elsif wheel_v < 0 # Scroll down - @list_scrollbar.slider_top += UIControls::Scrollbar::SCROLL_DISTANCE - self.top_pos = @list_scrollbar.position - end - end - end - + # Up/down/left/right navigation, and mouse scroll wheel + update_input end end diff --git a/PBS/Animations/Converted/Move/ABSORB.txt b/PBS/Animations/Converted/Move/ABSORB.txt index 36e86f959..6545786ea 100644 --- a/PBS/Animations/Converted/Move/ABSORB.txt +++ b/PBS/Animations/Converted/Move/ABSORB.txt @@ -236,7 +236,6 @@ Name = ABSORB SetY = 12,-50 SetVisible = 13,false - Play = 0,Absorb2,80 Play = 0,Absorb2,80 Play = 2,Absorb2,80 Play = 5,Absorb2,80 diff --git a/PBS/Animations/Converted/Move/MAGICCOAT.txt b/PBS/Animations/Converted/Move/MAGICCOAT.txt index db99696f9..47acb1267 100644 --- a/PBS/Animations/Converted/Move/MAGICCOAT.txt +++ b/PBS/Animations/Converted/Move/MAGICCOAT.txt @@ -166,5 +166,4 @@ Name = MAGICCOAT SetVisible = 9,false Play = 0,Sword2,80 - Play = 0,Sword2,80,101 Play = 4,Sword2,80 From 76e2b5a4fbf2b0309a03ecb198e55dea7aee1e85 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 31 Mar 2024 00:12:51 +0000 Subject: [PATCH 25/49] Anim Editor: added particle frames to canvas, added mouse interactions to canvas --- .../801_UI controls/002_ControlsContainer.rb | 16 +- .../Control elements/001_BaseControl.rb | 1 + .../904_Anim Editor/001_AnimationEditor.rb | 20 +- .../Anim Editor elements/001_Canvas.rb | 312 ++++++++++++++++-- .../Anim Editor elements/003_ParticleList.rb | 5 +- 5 files changed, 316 insertions(+), 38 deletions(-) diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index cbc41c1b9..ae7fa0b98 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -37,6 +37,16 @@ class UIControls::ControlsContainer @viewport.dispose end + #----------------------------------------------------------------------------- + + def visible=(value) + @visible = value + @controls.each { |c| c[1].visible = value } + repaint if @visible + end + + #----------------------------------------------------------------------------- + def busy? return !@captured.nil? end @@ -49,12 +59,6 @@ class UIControls::ControlsContainer @values = nil end - def visible=(value) - @visible = value - @controls.each { |c| c[1].visible = value } - repaint if @visible - end - def get_control(id) ret = nil @controls.each do |c| diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index 98b9a0591..327f86975 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -63,6 +63,7 @@ class UIControls::BaseControl < BitmapSprite def disable return if disabled? @disabled = true + @hover_area = nil invalidate end diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 17a0a1eb8..c576dc173 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -568,6 +568,7 @@ class AnimationEditor case component_sym when :canvas component.keyframe = keyframe + component.selected_particle = particle_index when :commands_pane new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) component.controls.each do |ctrl| @@ -762,8 +763,23 @@ class AnimationEditor refresh_component(:particle_list) end when :canvas - # TODO: Detect and apply changes made in canvas, e.g. moving particle, - # double-clicking to add particle, deleting particle. + case property + when :particle_index + @components[:particle_list].particle_index = value + refresh + when :x, :y + particle = @anim[:particles][particle_index] + prop = property + new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) + if new_cmds + particle[prop] = new_cmds + else + particle.delete(prop) + end + @components[:particle_list].change_particle_commands(particle_index) + @components[:play_controls].duration = @components[:particle_list].duration + refresh + end when :play_controls # TODO: Will the play controls ever signal themselves as changed? I don't # think so. diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 87e8e233a..ccaaf33b7 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -9,31 +9,24 @@ # 1100, 1200, 1300... +/-50 = player battlers. # 2000 +/-50 = player side foreground, foreground focus. # 9999+ = UI - -# TODO: Should the canvas be able to show boxes/faded sprites of particles from -# the previous keyframe? I suppose ideally, but don't worry about it. -# TODO: Show a focus-dependent coloured frame around just the currently selected -# particle. Only show one frame even if the focus involves a target and -# there are multiple targets. -# TODO: Ideally refresh the canvas while editing a particle's property in the -# :commands_pane component (e.g. moving a number slider but not finalising -# it). Refresh a single particle. I don't think any other side pane needs -# to refresh the canvas in the middle of changing a value. The new value -# of a control in the middle of being changed isn't part of the particle's -# data, so it'll need to be input manually somehow. #=============================================================================== class AnimationEditor::Canvas < Sprite + attr_reader :values + def initialize(viewport, anim, settings) super(viewport) - @anim = anim - @settings = settings - @keyframe = 0 - @user_coords = [] - @target_coords = [] - @playing = false # TODO: What should this affect? Is it needed? + @anim = anim + @settings = settings + @keyframe = 0 + @selected_particle = -2 + @captured = nil + @user_coords = [] + @target_coords = [] + @playing = false # TODO: What should this affect? Is it needed? initialize_background initialize_battlers initialize_particle_sprites + initialize_particle_frames refresh end @@ -59,11 +52,29 @@ class AnimationEditor::Canvas < Sprite @particle_sprites = [] end + def initialize_particle_frames + # Frame for selected particle + @sel_frame_bitmap = Bitmap.new(64, 64) + @sel_frame_bitmap.outline_rect(0, 0, @sel_frame_bitmap.width, @sel_frame_bitmap.height, Color.new(0, 0, 0, 64)) + @sel_frame_bitmap.outline_rect(2, 2, @sel_frame_bitmap.width - 4, @sel_frame_bitmap.height - 4, Color.new(0, 0, 0, 64)) + @sel_frame_sprite = Sprite.new(viewport) + @sel_frame_sprite.bitmap = @sel_frame_bitmap + @sel_frame_sprite.z = 99999 + @sel_frame_sprite.ox = @sel_frame_bitmap.width / 2 + @sel_frame_sprite.oy = @sel_frame_bitmap.height / 2 + # Frame for other particles + @frame_bitmap = Bitmap.new(64, 64) + @frame_bitmap.outline_rect(1, 1, @frame_bitmap.width - 2, @frame_bitmap.height - 2, Color.new(0, 0, 0, 64)) + @frame_sprites = [] + end + def dispose @user_bitmap_front&.dispose @user_bitmap_back&.dispose @target_bitmap_front&.dispose @target_bitmap_back&.dispose + @sel_frame_bitmap&.dispose + @frame_bitmap&.dispose @player_base.dispose @foe_base.dispose @message_bar_sprite.dispose @@ -77,6 +88,15 @@ class AnimationEditor::Canvas < Sprite end end @particle_sprites.clear + @frame_sprites.each do |s| + if s.is_a?(Array) + s.each { |s2| s2.dispose if s2 && !s2.disposed? } + else + s.dispose if s && !s.disposed? + end + end + @frame_sprites.clear + @sel_frame_sprite&.dispose super end @@ -110,8 +130,20 @@ class AnimationEditor::Canvas < Sprite return ret end + def first_target_index + return target_indices.compact[0] + end + def position_empty?(index) - return user_index != index && !target_indices.include?(index) + return false if !@anim[:no_user] && user_index == index + return false if !@anim[:no_target] && target_indices.include?(index) + return true + end + + def selected_particle=(val) + return if @selected_particle == val + @selected_particle = val + refresh_particle_frame end def keyframe=(val) @@ -120,14 +152,28 @@ class AnimationEditor::Canvas < Sprite refresh end + def mouse_pos + mouse_coords = Mouse.getMousePos + return nil, nil if !mouse_coords + ret_x = mouse_coords[0] - self.viewport.rect.x - self.x + ret_y = mouse_coords[1] - self.viewport.rect.y - self.y + return nil, nil if ret_x < 0 || ret_x >= self.viewport.rect.width || + ret_y < 0 || ret_y >= self.viewport.rect.height + return ret_x, ret_y + end + #----------------------------------------------------------------------------- def busy? - return false + return !@captured.nil? end def changed? - return false + return !@values.nil? + end + + def clear_changed + @values = nil end #----------------------------------------------------------------------------- @@ -165,25 +211,45 @@ class AnimationEditor::Canvas < Sprite @message_bar_sprite.y = Settings::SCREEN_HEIGHT - @message_bar_sprite.height end - # TODO: def refresh_box_display which checks @settings for whether boxes - # should be drawn around sprites. + def create_frame_sprite(index, sub_index = -1) + if sub_index >= 0 + return if @frame_sprites[index] && @frame_sprites[index][sub_index] && !@frame_sprites[index][sub_index].disposed? + else + return if @frame_sprites[index] && !@frame_sprites[index].disposed? + end + sprite = Sprite.new(viewport) + sprite.bitmap = @frame_bitmap + sprite.z = 99998 + sprite.ox = @frame_bitmap.width / 2 + sprite.oy = @frame_bitmap.height / 2 + if sub_index >= 0 + @frame_sprites[index] ||= [] + @frame_sprites[index][sub_index] = sprite + else + @frame_sprites[index] = sprite + end + end # TODO: Create shadow sprites? def ensure_battler_sprites if !@side_size0 || @side_size0 != side_size(0) @battler_sprites.each_with_index { |s, i| s.dispose if i.even? && s && !s.disposed? } + idx_user = @anim[:particles].index { |particle| particle[:name] == "User" } @side_size0 = side_size(0) @side_size0.times do |i| next if position_empty?(i * 2) @battler_sprites[i * 2] = Sprite.new(self.viewport) + create_frame_sprite(idx_user) end end if !@side_size1 || @side_size1 != side_size(1) @battler_sprites.each_with_index { |s, i| s.dispose if i.odd? && s && !s.disposed? } + idx_target = @anim[:particles].index { |particle| particle[:name] == "Target" } @side_size1 = side_size(1) @side_size1.times do |i| next if position_empty?((i * 2) + 1) @battler_sprites[(i * 2) + 1] = Sprite.new(self.viewport) + create_frame_sprite(idx_target, (i * 2) + 1) end end end @@ -236,6 +302,7 @@ class AnimationEditor::Canvas < Sprite @particle_sprites[index] = [] end @particle_sprites[index][target_idx] = Sprite.new(self.viewport) + create_frame_sprite(index, target_idx) else if @particle_sprites[index].is_a?(Array) @particle_sprites[index].each { |s| s.dispose if s && !s.disposed? } @@ -244,13 +311,14 @@ class AnimationEditor::Canvas < Sprite return if @particle_sprites[index] && !@particle_sprites[index].disposed? end @particle_sprites[index] = Sprite.new(self.viewport) + create_frame_sprite(index) end end - def refresh_sprite(index, target_idx = -1) + def get_sprite_and_frame(index, target_idx = -1) + spr = nil + frame = nil particle = @anim[:particles][index] - return if !particle - # Get sprite case particle[:name] when "SE" return @@ -258,18 +326,32 @@ class AnimationEditor::Canvas < Sprite spr = @battler_sprites[user_index] raise _INTL("Sprite for particle {1} not found somehow (battler index {2}).", particle[:name], user_index) if !spr + idx_user = @anim[:particles].index { |particle| particle[:name] == "User" } + frame = @frame_sprites[idx_user] when "Target" spr = @battler_sprites[target_idx] raise _INTL("Sprite for particle {1} not found somehow (battler index {2}).", particle[:name], target_idx) if !spr + idx_target = @anim[:particles].index { |particle| particle[:name] == "Target" } + frame = @frame_sprites[idx_target][target_idx] else create_particle_sprite(index, target_idx) if target_idx >= 0 spr = @particle_sprites[index][target_idx] + frame = @frame_sprites[index][target_idx] else spr = @particle_sprites[index] + frame = @frame_sprites[index] end end + return spr, frame + end + + def refresh_sprite(index, target_idx = -1) + particle = @anim[:particles][index] + return if !particle || particle[:name] == "SE" + # Get sprite + spr, frame = get_sprite_and_frame(index, target_idx) # Calculate all values of particle at the current keyframe values = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(particle, @keyframe) values.each_pair do |property, val| @@ -277,6 +359,7 @@ class AnimationEditor::Canvas < Sprite end # Set visibility spr.visible = values[:visible] + frame.visible = spr.visible return if !spr.visible # Set opacity spr.opacity = values[:opacity] @@ -408,12 +491,28 @@ class AnimationEditor::Canvas < Sprite # Set color and tone spr.color.set(values[:color_red], values[:color_green], values[:color_blue], values[:color_alpha]) spr.tone.set(values[:tone_red], values[:tone_green], values[:tone_blue], values[:tone_gray]) + # Position frame over spr + frame.x = spr.x + frame.y = spr.y + case @anim[:particles][index][:graphic] + when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" + frame.y -= spr.bitmap.height / 2 + end end def refresh_particle(index) target_indices.each { |target_idx| refresh_sprite(index, target_idx) } end + def refresh_particle_frame + return if @selected_particle < 0 || @selected_particle >= @anim[:particles].length - 1 + focus = @anim[:particles][@selected_particle][:focus] + frame_color = AnimationEditor::ParticleList::CONTROL_BG_COLORS[focus] || Color.magenta + @sel_frame_bitmap.outline_rect(1, 1, @sel_frame_bitmap.width - 2, @sel_frame_bitmap.height - 2, frame_color) + update_selected_particle_frame + end + def refresh refresh_bg_graphics ensure_battler_sprites @@ -434,14 +533,169 @@ class AnimationEditor::Canvas < Sprite refresh_sprite(i) if particle[:name] != "SE" end end + refresh_particle_frame # Intentionally after refreshing particles end #----------------------------------------------------------------------------- - # TODO: def update_input. Includes def pbSpriteHitTest equivalent. + def mouse_in_sprite?(sprite, mouse_x, mouse_y) + return false if mouse_x < sprite.x - sprite.ox + return false if mouse_x >= sprite.x - sprite.ox + sprite.width + return false if mouse_y < sprite.y - sprite.oy + return false if mouse_y >= sprite.y - sprite.oy + sprite.height + return true + end + + def on_mouse_press + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + # Check if mouse is over particle frame + if @sel_frame_sprite.visible && + mouse_x >= @sel_frame_sprite.x - @sel_frame_sprite.ox && + mouse_x < @sel_frame_sprite.x - @sel_frame_sprite.ox + @sel_frame_sprite.width && + mouse_y >= @sel_frame_sprite.y - @sel_frame_sprite.oy && + mouse_y < @sel_frame_sprite.y - @sel_frame_sprite.oy + @sel_frame_sprite.height + @captured = [@sel_frame_sprite.x, @sel_frame_sprite.y, + @sel_frame_sprite.x - mouse_x, @sel_frame_sprite.y - mouse_y] + return + end + # Find closest particle to mouse + nearest_index = -1 + nearest_distance = -1 + @frame_sprites.each_with_index do |sprite, index| + sprites = (sprite.is_a?(Array)) ? sprite : [sprite] + sprites.each do |spr| + next if !spr || !spr.visible + next if !mouse_in_sprite?(spr, mouse_x, mouse_y) + dist = (spr.x - mouse_x) ** 2 + (spr.y - mouse_y) ** 2 + next if nearest_distance >= 0 && nearest_distance < dist + nearest_index = index + nearest_distance = dist + end + end + return if nearest_index < 0 + @values = { :particle_index => nearest_index } + end + + def on_mouse_release + @captured = nil + end + + def update_input + if Input.trigger?(Input::MOUSELEFT) + on_mouse_press + elsif busy? && Input.release?(Input::MOUSELEFT) + on_mouse_release + end + end + + def update_particle_moved + return if !busy? + mouse_x, mouse_y = mouse_pos + return if !mouse_x || !mouse_y + new_canvas_x = mouse_x + @captured[2] + new_canvas_y = mouse_y + @captured[3] + return if @captured[0] == new_canvas_x && @captured[1] == new_canvas_y + particle = @anim[:particles][@selected_particle] + if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + sprite, frame = get_sprite_and_frame(@selected_particle, first_target_index) + else + sprite, frame = get_sprite_and_frame(@selected_particle) + end + # Check if moved horizontally + if @captured[0] != new_canvas_x + new_canvas_pos = mouse_x + @captured[2] + new_pos = new_canvas_x + case particle[:focus] + when :foreground, :midground, :background + when :user + new_pos -= @user_coords[0] + when :target + new_pos -= @target_coords[first_target_index][0] + when :user_and_target + user_pos = @user_coords + target_pos = @target_coords[first_target_index] + distance = GameData::Animation::USER_AND_TARGET_SEPARATION + new_pos -= user_pos[0] + new_pos *= distance[0] + new_pos /= target_pos[0] - user_pos[0] + when :user_side_foreground, :user_side_background + base_coords = Battle::Scene.pbBattlerPosition(user_index) + new_pos -= base_coords[0] + when :target_side_foreground, :target_side_background + base_coords = Battle::Scene.pbBattlerPosition(first_target_index) + new_pos -= base_coords[0] + end + @values ||= {} + @values[:x] = new_pos + @captured[0] = new_canvas_x + sprite.x = new_canvas_x + end + # Check if moved vertically + if @captured[1] != new_canvas_y + new_pos = new_canvas_y + case particle[:focus] + when :foreground, :midground, :background + when :user + new_pos -= @user_coords[1] + when :target + new_pos -= @target_coords[first_target_index][1] + when :user_and_target + user_pos = @user_coords + target_pos = @target_coords[first_target_index] + distance = GameData::Animation::USER_AND_TARGET_SEPARATION + new_pos -= user_pos[1] + new_pos *= distance[1] + new_pos /= target_pos[1] - user_pos[1] + when :user_side_foreground, :user_side_background + base_coords = Battle::Scene.pbBattlerPosition(user_index) + new_pos -= base_coords[1] + when :target_side_foreground, :target_side_background + base_coords = Battle::Scene.pbBattlerPosition(first_target_index) + new_pos -= base_coords[1] + end + @values ||= {} + @values[:y] = new_pos + @captured[1] = new_canvas_y + sprite.y = new_canvas_y + end + end + + def update_selected_particle_frame + if @selected_particle < 0 || @selected_particle >= @anim[:particles].length - 1 + @sel_frame_sprite.visible = false + return + end + case @anim[:particles][@selected_particle][:name] + when "User" + target = @battler_sprites[user_index] + raise _INTL("Sprite for particle \"{1}\" not found somehow.", + @anim[:particles][@selected_particle][:name]) if !target + when "Target" + target = @battler_sprites[target_indices[0]] + raise _INTL("Sprite for particle \"{1}\" not found somehow.", + @anim[:particles][@selected_particle][:name]) if !target + else + target = @particle_sprites[@selected_particle] + target = target[target_indices[0]] if target&.is_a?(Array) + end + if !target || !target.visible + @sel_frame_sprite.visible = false + return + end + @sel_frame_sprite.visible = true + @sel_frame_sprite.x = target.x + @sel_frame_sprite.y = target.y + case @anim[:particles][@selected_particle][:graphic] + when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" + @sel_frame_sprite.y -= target.bitmap.height / 2 + end + end def update - # TODO: Update input (mouse clicks, dragging particles). - # TODO: Keyboard shortcuts? + update_input + update_particle_moved + update_selected_particle_frame end end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 197ac7cb5..47cff1cdf 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -204,12 +204,15 @@ class AnimationEditor::ParticleList < UIControls::BaseControl old_index = @row_index @row_index = @particle_list.index { |row| (row.is_a?(Array) && row[0] == val) || (!row.is_a?(Array) && row == val) } - invalidate if @row_index != old_index + return if @row_index == old_index + invalidate + scroll_to_row(@row_index) end def keyframe=(val) return if @keyframe == val @keyframe = val + scroll_to_keyframe(@keyframe) invalidate end From 1977bd866c679229191c82b2f1378cc22ef72b6e Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 31 Mar 2024 23:19:31 +0100 Subject: [PATCH 26/49] Anim Editor: added filter text box to selection screen, disabled animations are listed in red --- .../Control elements/008_List.rb | 22 ++ .../903_Anim Compiler/001_Anim compiler.rb | 24 ++- .../904_Anim Editor/001_AnimationEditor.rb | 64 +++--- .../904_Anim Editor/010_AnimationSelector.rb | 189 ++++++++++++------ .../Anim Editor elements/001_Canvas.rb | 12 +- 5 files changed, 208 insertions(+), 103 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/008_List.rb b/Data/Scripts/801_UI controls/Control elements/008_List.rb index 0c2288d1c..bbdbae989 100644 --- a/Data/Scripts/801_UI controls/Control elements/008_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_List.rb @@ -146,10 +146,32 @@ class UIControls::List < UIControls::BaseControl ) end txt = (val.is_a?(Array)) ? val[1] : val + text_color = TEXT_COLOR + if txt[/^\\c\[([0-9]+)\]/i] + text_colors = [ + [ 0, 112, 248], [120, 184, 232], # 1 Blue + [232, 32, 16], [248, 168, 184], # 2 Red + [ 96, 176, 72], [174, 208, 144], # 3 Green + [ 72, 216, 216], [168, 224, 224], # 4 Cyan + [208, 56, 184], [232, 160, 224], # 5 Magenta + [232, 208, 32], [248, 232, 136], # 6 Yellow + [160, 160, 168], [208, 208, 216], # 7 Gray + [240, 240, 248], [200, 200, 208], # 8 White + [114, 64, 232], [184, 168, 224], # 9 Purple + [248, 152, 24], [248, 200, 152], # 10 Orange + MessageConfig::DARK_TEXT_MAIN_COLOR, + MessageConfig::DARK_TEXT_SHADOW_COLOR, # 11 Dark default + MessageConfig::LIGHT_TEXT_MAIN_COLOR, + MessageConfig::LIGHT_TEXT_SHADOW_COLOR # 12 Light default + ] + self.bitmap.font.color = Color.new(*text_colors[2 * ($1.to_i - 1)]) + txt = txt.gsub(/^\\c\[[0-9]+\]/i, "") + end draw_text(self.bitmap, @interactions[i].x + TEXT_PADDING_X, @interactions[i].y + TEXT_OFFSET_Y - (@top_row * ROW_HEIGHT), txt) + self.bitmap.font.color = TEXT_COLOR end end diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index a31e7991f..ab2f6fe5f 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -154,25 +154,33 @@ module Compiler when "Target" then particle[:graphic] = "TARGET" end end - # Ensure that particles don't have a focus involving a user, and the - # animation doesn't play a user's cry, if the animation itself doesn't - # involve a user + # If the animation doesn't involve a user, ensure that particles don't + # have a focus/graphic that involves a user, and that the animation + # doesn't play a user's cry if hash[:no_user] if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a user if property \"NoUser\" is set to true.", - particle[:name]) + "\n" + FileLineData.linereport + particle[:name]) + "\n" + FileLineData.linereport + end + if ["USER", "USER_OPP", "USER_FRONT", "USER_BACK"].include?(particle[:graphic]) + raise _INTL("Particle \"{1}\" can't have a \"Graphic\" that involves a user if property \"NoUser\" is set to true.", + particle[:name]) + "\n" + FileLineData.linereport end if particle[:name] == "SE" && particle[:user_cry] && !particle[:user_cry].empty? raise _INTL("Animation can't play the user's cry if property \"NoUser\" is set to true.") + "\n" + FileLineData.linereport end end - # Ensure that particles don't have a focus involving a target, and the - # animation doesn't play a target's cry, if the animation itself doesn't - # involve a target + # If the animation doesn't involve a target, ensure that particles don't + # have a focus/graphic that involves a target, and that the animation + # doesn't play a target's cry if hash[:no_target] if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) raise _INTL("Particle \"{1}\" can't have a \"Focus\" that involves a target if property \"NoTarget\" is set to true.", - particle[:name]) + "\n" + FileLineData.linereport + particle[:name]) + "\n" + FileLineData.linereport + end + if ["TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(particle[:graphic]) + raise _INTL("Particle \"{1}\" can't have a \"Graphic\" that involves a target if property \"NoTarget\" is set to true.", + particle[:name]) + "\n" + FileLineData.linereport end if particle[:name] == "SE" && particle[:target_cry] && !particle[:target_cry].empty? raise _INTL("Animation can't play the target's cry if property \"NoTarget\" is set to true.") + "\n" + FileLineData.linereport diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index c576dc173..d311134b9 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -191,6 +191,38 @@ class AnimationEditor return @components[:particle_list].particle_index end + def load_settings + # TODO: Load these from a saved file. + @settings = { + :side_sizes => [1, 1], + :user_index => 0, + :target_indices => [1], + :user_opposes => false, + # TODO: Ideally be able to independently choose base graphics, which will + # be a separate setting here. + :canvas_bg => "indoor1", + # NOTE: These sprite names are also used in Pokemon.play_cry and so should + # be a species ID (being a string is fine). + :user_sprite_name => "ARCANINE", + :target_sprite_name => "CHARIZARD" + } + end + + def save + GameData::Animation.register(@anim, @anim_id) + Compiler.write_battle_animation_file(@anim[:pbs_path]) + if @anim[:pbs_path] != @pbs_path + if GameData::Animation::DATA.any? { |_key, anim| anim.pbs_path == @pbs_path } + Compiler.write_battle_animation_file(@pbs_path) + elsif FileTest.exist?("PBS/Animations/" + @pbs_path + ".txt") + File.delete("PBS/Animations/" + @pbs_path + ".txt") + end + @pbs_path = @anim[:pbs_path] + end + end + + #----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- # Returns the animation's name for display in the menu bar and elsewhere. @@ -474,38 +506,6 @@ class AnimationEditor #----------------------------------------------------------------------------- - def load_settings - # TODO: Load these from a saved file. - @settings = { - :side_sizes => [1, 1], - :user_index => 0, - :target_indices => [1], - :user_opposes => false, - # TODO: Ideally be able to independently choose base graphics, which will - # be a separate setting here. - :canvas_bg => "indoor1", - # NOTE: These sprite names are also used in Pokemon.play_cry and so should - # be a species ID (being a string is fine). - :user_sprite_name => "ARCANINE", - :target_sprite_name => "CHARIZARD" - } - end - - def save - GameData::Animation.register(@anim, @anim_id) - Compiler.write_battle_animation_file(@anim[:pbs_path]) - if @anim[:pbs_path] != @pbs_path - if GameData::Animation::DATA.any? { |_key, anim| anim.pbs_path == @pbs_path } - Compiler.write_battle_animation_file(@pbs_path) - elsif FileTest.exist?("PBS/Animations/" + @pbs_path + ".txt") - File.delete("PBS/Animations/" + @pbs_path + ".txt") - end - @pbs_path = @anim[:pbs_path] - end - end - - #----------------------------------------------------------------------------- - def draw_editor_background # Fill the whole screen with white @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.white) diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index cae1b1a6d..7500badb1 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -2,30 +2,37 @@ # #=============================================================================== class AnimationEditor::AnimationSelector - BORDER_THICKNESS = 4 + BORDER_THICKNESS = 4 + LABEL_OFFSET_X = -4 # Position of label relative to what they're labelling + LABEL_OFFSET_Y = -32 - QUIT_BUTTON_WIDTH = 80 - QUIT_BUTTON_HEIGHT = 30 + QUIT_BUTTON_WIDTH = 80 + QUIT_BUTTON_HEIGHT = 30 - TYPE_BUTTONS_X = 2 - TYPE_BUTTONS_Y = 62 - TYPE_BUTTON_WIDTH = 100 - TYPE_BUTTON_HEIGHT = 48 + TYPE_BUTTONS_X = 2 + TYPE_BUTTONS_Y = 62 + TYPE_BUTTON_WIDTH = 100 + TYPE_BUTTON_HEIGHT = 48 - MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 4 - MOVES_LIST_Y = TYPE_BUTTONS_Y + 4 - MOVES_LIST_WIDTH = 200 - MOVES_LIST_HEIGHT = 26 * UIControls::List::ROW_HEIGHT + MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 4 + MOVES_LIST_Y = TYPE_BUTTONS_Y + 4 + MOVES_LIST_WIDTH = 200 + MOVES_LIST_HEIGHT = 26 * UIControls::List::ROW_HEIGHT - ANIMATIONS_LIST_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 8 - ANIMATIONS_LIST_Y = MOVES_LIST_Y - ANIMATIONS_LIST_WIDTH = 300 - ANIMATIONS_LIST_HEIGHT = MOVES_LIST_HEIGHT + ANIMATIONS_LIST_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 8 + ANIMATIONS_LIST_Y = MOVES_LIST_Y + ANIMATIONS_LIST_WIDTH = 300 + ANIMATIONS_LIST_HEIGHT = MOVES_LIST_HEIGHT - ACTION_BUTTON_WIDTH = 200 - ACTION_BUTTON_HEIGHT = 48 - ACTION_BUTTON_X = ANIMATIONS_LIST_X + ANIMATIONS_LIST_WIDTH + 4 - ACTION_BUTTON_Y = TYPE_BUTTONS_Y + ((ANIMATIONS_LIST_HEIGHT - (ACTION_BUTTON_HEIGHT * 3)) / 2) + 4 + ACTION_BUTTON_WIDTH = 200 + ACTION_BUTTON_HEIGHT = 48 + ACTION_BUTTON_X = ANIMATIONS_LIST_X + ANIMATIONS_LIST_WIDTH + 4 + ACTION_BUTTON_Y = TYPE_BUTTONS_Y + ((ANIMATIONS_LIST_HEIGHT - (ACTION_BUTTON_HEIGHT * 3)) / 2) + 4 + + FILTER_BOX_WIDTH = ACTION_BUTTON_WIDTH + FILTER_BOX_HEIGHT = UIControls::TextBox::TEXT_BOX_HEIGHT + FILTER_BOX_X = ACTION_BUTTON_X + FILTER_BOX_Y = MOVES_LIST_Y # Pop-up window MESSAGE_BOX_WIDTH = AnimationEditor::WINDOW_WIDTH * 3 / 4 @@ -35,34 +42,35 @@ class AnimationEditor::AnimationSelector MESSAGE_BOX_SPACING = 16 def initialize - generate_lists + @animation_type = 0 # 0=move, 1=common + @filter_text = "" + @quit = false + generate_full_lists + initialize_viewports + initialize_bitmaps + initialize_controls + refresh + end + + def initialize_viewports @viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) @viewport.z = 99999 @pop_up_viewport = Viewport.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) @pop_up_viewport.z = @viewport.z + 50 + end + + def initialize_bitmaps + # Background @screen_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @viewport) + # Semi-transparent black overlay to dim the screen while a pop-up window is open @pop_up_bg_bitmap = BitmapSprite.new(AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, @pop_up_viewport) @pop_up_bg_bitmap.z = -100 @pop_up_bg_bitmap.visible = false + # Draw in these bitmaps draw_editor_background - @animation_type = 0 # 0=move, 1=common - @quit = false - create_controls - refresh end - def dispose - @screen_bitmap.dispose - @pop_up_bg_bitmap.dispose - @components.dispose - @viewport.dispose - @pop_up_viewport.dispose - end - - LABEL_OFFSET_X = -4 - LABEL_OFFSET_Y = -32 - - def create_controls + def initialize_controls @components = UIControls::ControlsContainer.new(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT) # Quit button btn = UIControls::Button.new(QUIT_BUTTON_WIDTH, QUIT_BUTTON_HEIGHT, @viewport, _INTL("Quit")) @@ -82,11 +90,6 @@ class AnimationEditor::AnimationSelector btn.set_fixed_size @components.add_control_at(val[0], btn, TYPE_BUTTONS_X, TYPE_BUTTONS_Y + (i * TYPE_BUTTON_HEIGHT)) end - # TODO: Add filter text box for :moves_list's contents. Applies the filter - # upon every change to the text box's value. Perhaps it should only do - # so after 0.5 seconds of non-typing. What exactly should the filter - # be applied to? Animation's name, move's name (if there is one), what - # else? Flags? # Moves list label label = UIControls::Label.new(MOVES_LIST_WIDTH, TYPE_BUTTON_HEIGHT, @viewport, _INTL("Moves")) label.header = true @@ -107,8 +110,25 @@ class AnimationEditor::AnimationSelector btn.set_fixed_size @components.add_control_at(val[0], btn, ACTION_BUTTON_X, ACTION_BUTTON_Y + (i * ACTION_BUTTON_HEIGHT)) end + # Filter text box + text_box = UIControls::TextBox.new(FILTER_BOX_WIDTH, FILTER_BOX_HEIGHT, @viewport, "") + @components.add_control_at(:filter, text_box, FILTER_BOX_X, FILTER_BOX_Y) + # Filter text box label + label = UIControls::Label.new(FILTER_BOX_WIDTH, TYPE_BUTTON_HEIGHT, @viewport, _INTL("Filter text")) + label.header = true + @components.add_control_at(:filter_label, label, FILTER_BOX_X + LABEL_OFFSET_X, FILTER_BOX_Y + LABEL_OFFSET_Y) end + def dispose + @screen_bitmap.dispose + @pop_up_bg_bitmap.dispose + @components.dispose + @viewport.dispose + @pop_up_viewport.dispose + end + + #----------------------------------------------------------------------------- + def draw_editor_background # Fill the whole screen with white @screen_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.white) @@ -120,6 +140,8 @@ class AnimationEditor::AnimationSelector areas.each do |area| @screen_bitmap.bitmap.outline_rect(area[0] - 2, area[1] - 2, area[2] + 4, area[3] + 4, Color.black) end + # Make the pop-up background semi-transparent + @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) end #----------------------------------------------------------------------------- @@ -198,36 +220,72 @@ class AnimationEditor::AnimationSelector #----------------------------------------------------------------------------- - def generate_lists - @move_list = [] - @common_list = [] - @move_animations = {} - @common_animations = {} + def generate_full_lists + @full_move_animations = {} + @full_common_animations = {} GameData::Animation.keys.each do |id| anim = GameData::Animation.get(id) name = "" + name += "\\c[2]" if anim.ignore name += _INTL("[Foe]") + " " if anim.opposing_animation? name += "[#{anim.version}]" + " " if anim.version > 0 name += (anim.name || anim.move) if anim.move_animation? move_name = GameData::Move.try_get(anim.move)&.name || anim.move - @move_list.push([anim.move, move_name]) if !@move_animations[anim.move] - @move_animations[anim.move] ||= [] - @move_animations[anim.move].push([id, name]) + @full_move_animations[anim.move] ||= [] + @full_move_animations[anim.move].push([id, name, move_name]) elsif anim.common_animation? - @common_list.push([anim.move, anim.move]) if !@common_animations[anim.move] - @common_animations[anim.move] ||= [] - @common_animations[anim.move].push([id, name]) + @full_common_animations[anim.move] ||= [] + @full_common_animations[anim.move].push([id, name]) end end + @full_move_animations.values.each do |val| + val.sort! { |a, b| a[1] <=> b[1] } + end + @full_common_animations.values.each do |val| + val.sort! { |a, b| a[1] <=> b[1] } + end + apply_list_filter + end + + def apply_list_filter + # Apply filter + if @filter_text == "" + @move_animations = @full_move_animations.clone + @common_animations = @full_common_animations.clone + else + filter = @filter_text.downcase + @move_animations.clear + @full_move_animations.each_pair do |move, anims| + anims.each do |anim| + next if !anim[1].downcase.include?(filter) && !anim[2].downcase.include?(filter) + @move_animations[move] ||= [] + @move_animations[move].push(anim) + end + end + @common_animations.clear + @full_common_animations.each_pair do |common, anims| + anims.each do |anim| + next if !anim[1].downcase.include?(filter) && !common.downcase.include?(filter) + @common_animations[common] ||= [] + @common_animations[common].push(anim) + end + end + end + # Create move list from the filtered results + @move_list = [] + @move_animations.each_pair do |move_id, anims| + @move_list.push([move_id, anims[0][2]]) + end + @move_list.uniq! @move_list.sort! + # Create common list from the filtered results + @common_list = [] + @common_animations.each_pair do |move_id, anims| + @common_list.push([move_id, move_id]) + end + @common_list.uniq! @common_list.sort! - @move_animations.values.each do |val| - val.sort! { |a, b| a[1] <=> b[1] } - end - @common_animations.values.each do |val| - val.sort! { |a, b| a[1] <=> b[1] } - end end def selected_move_animations @@ -284,7 +342,7 @@ class AnimationEditor::AnimationSelector new_id = GameData::Animation.keys.max + 1 screen = AnimationEditor.new(new_id, new_anim) screen.run - generate_lists + generate_full_lists when :moves @animation_type = 0 @components.get_control(:moves_list).selected = -1 @@ -298,7 +356,7 @@ class AnimationEditor::AnimationSelector if anim_id screen = AnimationEditor.new(anim_id, GameData::Animation.get(anim_id).clone_as_hash) screen.run - generate_lists + generate_full_lists end when :copy anim_id = selected_animation_id @@ -308,7 +366,7 @@ class AnimationEditor::AnimationSelector new_id = GameData::Animation.keys.max + 1 screen = AnimationEditor.new(new_id, new_anim) screen.run - generate_lists + generate_full_lists end when :delete anim_id = selected_animation_id @@ -320,7 +378,7 @@ class AnimationEditor::AnimationSelector elsif FileTest.exist?("PBS/Animations/" + pbs_path + ".txt") File.delete("PBS/Animations/" + pbs_path + ".txt") end - generate_lists + generate_full_lists end end refresh @@ -334,6 +392,13 @@ class AnimationEditor::AnimationSelector end @components.clear_changed end + # Detect change to filter text + filter_ctrl = @components.get_control(:filter) + if filter_ctrl.value != @filter_text + @filter_text = filter_ctrl.value + apply_list_filter + refresh + end end def run diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index ccaaf33b7..7c92d0204 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -300,6 +300,8 @@ class AnimationEditor::Canvas < Sprite else @particle_sprites[index].dispose if @particle_sprites[index] && !@particle_sprites[index].disposed? @particle_sprites[index] = [] + @frame_sprites[index].dispose if @frame_sprites[index] && !@frame_sprites[index].disposed? + @frame_sprites[index] = [] end @particle_sprites[index][target_idx] = Sprite.new(self.viewport) create_frame_sprite(index, target_idx) @@ -307,6 +309,8 @@ class AnimationEditor::Canvas < Sprite if @particle_sprites[index].is_a?(Array) @particle_sprites[index].each { |s| s.dispose if s && !s.disposed? } @particle_sprites[index] = nil + @frame_sprites[index].each { |s| s.dispose if s && !s.disposed? } + @frame_sprites[index] = nil else return if @particle_sprites[index] && !@particle_sprites[index].disposed? end @@ -502,7 +506,13 @@ class AnimationEditor::Canvas < Sprite end def refresh_particle(index) - target_indices.each { |target_idx| refresh_sprite(index, target_idx) } + one_per_side = [:target_side_foreground, :target_side_background].include?(@anim[:particles][index][:focus]) + sides_covered = [] + target_indices.each do |target_idx| + next if one_per_side && sides_covered.include?(target_idx % 2) + refresh_sprite(index, target_idx) + sides_covered.push(target_idx % 2) + end end def refresh_particle_frame From 9c3314843a0f69e46c8cb156d935b1b06a464c15 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 4 Apr 2024 21:33:08 +0100 Subject: [PATCH 27/49] Anim Editor: refactoring side pane code --- .../801_UI controls/002_ControlsContainer.rb | 1 - ...7b_BitmapButton.rb => 008_BitmapButton.rb} | 0 .../{008_List.rb => 009_List.rb} | 0 ...09_DropdownList.rb => 010_DropdownList.rb} | 0 ...downList.rb => 011_TextBoxDropdownList.rb} | 0 .../904_Anim Editor/001_AnimationEditor.rb | 495 +++------------ .../003_AnimationEditor_side_panes.rb | 597 ++++++++++++++++++ .../904_Anim Editor/901_ParticleDataHelper.rb | 13 + .../Anim Editor elements/001_Canvas.rb | 70 +- 9 files changed, 764 insertions(+), 412 deletions(-) rename Data/Scripts/801_UI controls/Control elements/{007b_BitmapButton.rb => 008_BitmapButton.rb} (100%) rename Data/Scripts/801_UI controls/Control elements/{008_List.rb => 009_List.rb} (100%) rename Data/Scripts/801_UI controls/Control elements/{009_DropdownList.rb => 010_DropdownList.rb} (100%) rename Data/Scripts/801_UI controls/Control elements/{010_TextBoxDropdownList.rb => 011_TextBoxDropdownList.rb} (100%) create mode 100644 Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index ae7fa0b98..c6d79a592 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -221,7 +221,6 @@ class UIControls::ControlsContainer end def add_control(id, control, add_offset = false, rows = 1) - i = @controls.length ctrl_x, ctrl_y = next_control_position(add_offset) ctrl_x += 4 if control.is_a?(UIControls::List) add_control_at(id, control, ctrl_x, ctrl_y) diff --git a/Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb b/Data/Scripts/801_UI controls/Control elements/008_BitmapButton.rb similarity index 100% rename from Data/Scripts/801_UI controls/Control elements/007b_BitmapButton.rb rename to Data/Scripts/801_UI controls/Control elements/008_BitmapButton.rb diff --git a/Data/Scripts/801_UI controls/Control elements/008_List.rb b/Data/Scripts/801_UI controls/Control elements/009_List.rb similarity index 100% rename from Data/Scripts/801_UI controls/Control elements/008_List.rb rename to Data/Scripts/801_UI controls/Control elements/009_List.rb diff --git a/Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb similarity index 100% rename from Data/Scripts/801_UI controls/Control elements/009_DropdownList.rb rename to Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb diff --git a/Data/Scripts/801_UI controls/Control elements/010_TextBoxDropdownList.rb b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb similarity index 100% rename from Data/Scripts/801_UI controls/Control elements/010_TextBoxDropdownList.rb rename to Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index d311134b9..4a7f9c416 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -2,6 +2,10 @@ # #=============================================================================== class AnimationEditor + attr_reader :property_pane + attr_reader :components + attr_reader :anim + BORDER_THICKNESS = 4 WINDOW_WIDTH = Settings::SCREEN_WIDTH + 352 + (BORDER_THICKNESS * 4) WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + 352 + (BORDER_THICKNESS * 4) @@ -121,6 +125,7 @@ class AnimationEditor @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) @screen_bitmap.z = -100 # Background in which to draw the outline of the SE list box in the SE side pane + # TODO: Get rid of this by drawing a list's box in the control itself. @se_list_box_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) @se_list_box_bitmap.z = -90 @se_list_box_bitmap.visible = false @@ -128,6 +133,20 @@ class AnimationEditor @pop_up_bg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @pop_up_viewport) @pop_up_bg_bitmap.z = -100 @pop_up_bg_bitmap.visible = false + # Bitmaps for "delete this property change" buttons in the side pane + @delete_bitmap = Bitmap.new(16, 16) + @delete_disabled_bitmap = Bitmap.new(16, 16) + 14.times do |i| + case i + when 0, 13 then wid = 3 + when 1, 12 then wid = 4 + else wid = 5 + end + @delete_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.red) + @delete_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.red) + @delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(160, 160, 160)) + @delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(160, 160, 160)) + end # Draw in these bitmaps draw_editor_background end @@ -139,9 +158,11 @@ class AnimationEditor # Canvas @components[:canvas] = AnimationEditor::Canvas.new(@canvas_viewport, @anim, @settings) # Side panes - [:commands_pane, :color_tone_pane, :se_pane, :particle_pane, :keyframe_pane].each do |pane| - @components[pane] = UIControls::ControlsContainer.new(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, - ([:commands_pane, :color_tone_pane].include?(pane)) ? SIDE_PANE_DELETE_MARGIN : 0) + AnimationEditor::SidePanes.each_pane do |pane, hash| + @components[pane] = UIControls::ControlsContainer.new( + SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, + hash[:deletable_properties].nil? ? 0 : SIDE_PANE_DELETE_MARGIN + ) end # Timeline/particle list @components[:particle_list] = AnimationEditor::ParticleList.new( @@ -174,6 +195,8 @@ class AnimationEditor @screen_bitmap.dispose @se_list_box_bitmap.dispose @pop_up_bg_bitmap.dispose + @delete_bitmap.dispose + @delete_disabled_bitmap.dispose @components.each_value { |c| c.dispose } @components.clear @viewport.dispose @@ -223,8 +246,6 @@ class AnimationEditor #----------------------------------------------------------------------------- - #----------------------------------------------------------------------------- - # Returns the animation's name for display in the menu bar and elsewhere. def get_animation_display_name ret = "" @@ -277,139 +298,20 @@ class AnimationEditor pane.increment_row_count(1) end - def generate_delete_property_button_bitmaps - delete_bitmap = Bitmap.new(16, 16) - delete_disabled_bitmap = Bitmap.new(16, 16) - 14.times do |i| - case i - when 0, 13 then wid = 3 - when 1, 12 then wid = 4 - else wid = 5 - end - delete_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.red) - delete_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.red) - delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(160, 160, 160)) - delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(160, 160, 160)) - end - return delete_bitmap, delete_disabled_bitmap - end - - def set_commands_pane_contents - pane = @components[:commands_pane] - pane.add_header_label(:header, _INTL("Edit particle at keyframe")) - # Tab buttons - add_side_pane_tab_buttons(:commands_pane, pane) - # Properties - pane.add_labelled_number_text_box(:x, _INTL("X"), -999, 999, 0) - pane.add_labelled_number_text_box(:y, _INTL("Y"), -999, 999, 0) - pane.add_labelled_number_slider(:z, _INTL("Priority"), -50, 50, 0) - # TODO: If the graphic is user's sprite/target's sprite, make :frame instead - # a choice of front/back/same as the main sprite/opposite of the main - # sprite. Will need two controls in the same space, which is doable. - # Will also need to change the graphic chooser to only have "user"/ - # "target" options rather than all the variants that this control - # would manage. - pane.add_labelled_number_text_box(:frame, _INTL("Frame"), 0, 99, 0) - pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) - pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) - pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) - pane.add_labelled_number_text_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) - pane.add_labelled_number_text_box(:angle, _INTL("Angle"), -1080, 1080, 0) - pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) - pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { - 0 => _INTL("None"), - 1 => _INTL("Additive"), - 2 => _INTL("Subtractive") - }, 0) - # TODO: Add buttons that shift all commands from the current keyframe and - # later forwards/backwards in time? - # Add all "delete" buttons - delete_bitmap, delete_disabled_bitmap = generate_delete_property_button_bitmaps - DELETABLE_COMMAND_PANE_PROPERTIES.each do |property| - parent = pane.get_control(property) - btn = UIControls::BitmapButton.new(parent.x + parent.width + 6, parent.y + 2, - pane.viewport, delete_bitmap, delete_disabled_bitmap) - btn.set_interactive_rects - pane.controls.push([(property.to_s + "_delete").to_sym, btn]) - end - end - - def set_color_tone_pane_contents - pane = @components[:color_tone_pane] - pane.add_header_label(:header, _INTL("Edit particle at keyframe")) - # Tab buttons - add_side_pane_tab_buttons(:color_tone_pane, pane) - # Properties - pane.add_labelled_number_slider(:color_red, _INTL("Color Red"), 0, 255, 0) - pane.add_labelled_number_slider(:color_green, _INTL("Color Green"), 0, 255, 0) - pane.add_labelled_number_slider(:color_blue, _INTL("Color Blue"), 0, 255, 0) - pane.add_labelled_number_slider(:color_alpha, _INTL("Color Alpha"), 0, 255, 0) - pane.add_labelled_number_slider(:tone_red, _INTL("Tone Red"), -255, 255, 0) - pane.add_labelled_number_slider(:tone_green, _INTL("Tone Green"), -255, 255, 0) - pane.add_labelled_number_slider(:tone_blue, _INTL("Tone Blue"), -255, 255, 0) - pane.add_labelled_number_slider(:tone_gray, _INTL("Tone Gray"), 0, 255, 0) - # Add all "delete" buttons - delete_bitmap, delete_disabled_bitmap = generate_delete_property_button_bitmaps - DELETABLE_COLOR_TONE_PANE_PROPERTIES.each do |property| - parent = pane.get_control(property) - btn = UIControls::BitmapButton.new(parent.x + parent.width + 6, parent.y + 2, - pane.viewport, delete_bitmap, delete_disabled_bitmap) - btn.set_interactive_rects - pane.controls.push([(property.to_s + "_delete").to_sym, btn]) - end - end - - def set_se_pane_contents - pane = @components[:se_pane] - pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) - size = pane.control_size - size[0] -= 10 - size[1] = UIControls::List::ROW_HEIGHT * 5 # 5 rows - list = UIControls::List.new(*size, pane.viewport, []) - pane.add_control_at(:list, list, 5, 30) - button_height = UIControls::ControlsContainer::LINE_SPACING - add = UIControls::Button.new(101, button_height, pane.viewport, _INTL("Add")) - add.set_fixed_size - pane.add_control_at(:add, add, 1, 154) - edit = UIControls::Button.new(100, button_height, pane.viewport, _INTL("Edit")) - edit.set_fixed_size - pane.add_control_at(:edit, edit, 102, 154) - delete = UIControls::Button.new(101, button_height, pane.viewport, _INTL("Delete")) - delete.set_fixed_size - pane.add_control_at(:delete, delete, 202, 154) - end - - def set_particle_pane_contents - pane = @components[:particle_pane] - pane.add_header_label(:header, _INTL("Edit particle properties")) - pane.add_labelled_text_box(:name, _INTL("Name"), "") - pane.get_control(:name).set_blacklist("User", "Target", "SE") - pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") - pane.add_labelled_button(:graphic, "", _INTL("Change")) - pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :undefined) - # FlipIfFoe - # RotateIfFoe - pane.add_button(:duplicate, _INTL("Duplicate this particle")) - pane.add_button(:delete, _INTL("Delete this particle")) - # Shift all command timings by X keyframes (text box and button) - # Move particle up/down the list? - end - - # TODO: :keyframe_pane is currently inaccessible (intentionally). If it will - # have its own commands and should be accessible again, change def - # on_mouse_release in ParticleList. - def set_keyframe_pane_contents - keyframe_pane = @components[:keyframe_pane] - keyframe_pane.add_header_label(:header, _INTL("Edit keyframe")) - # TODO: Various command-shifting options. - end - def set_side_panes_contents - set_commands_pane_contents - set_color_tone_pane_contents - set_se_pane_contents - set_particle_pane_contents - set_keyframe_pane_contents + AnimationEditor::SidePanes.each_pane do |pane, hash| + deletable_properties = hash[:deletable_properties] + AnimationEditor::SidePanes.each_property(pane) do |property, hash| + hash[:new].call(@components[pane], self) if hash[:new] + if deletable_properties&.include?(property) + parent = @components[pane].get_control(property) + btn = UIControls::BitmapButton.new(parent.x + parent.width + 6, parent.y + 2, + @components[pane].viewport, @delete_bitmap, @delete_disabled_bitmap) + btn.set_interactive_rects + @components[pane].controls.push([(property.to_s + "_delete").to_sym, btn]) + end + end + end end def set_particle_list_contents @@ -528,23 +430,11 @@ class AnimationEditor #----------------------------------------------------------------------------- def refresh_component_visibility(component_sym) - component = @components[component_sym] # Panes are all mutually exclusive - case component_sym - when :commands_pane, :color_tone_pane - component.visible = (keyframe >= 0 && particle_index >= 0 && - @anim[:particles][particle_index] && - @anim[:particles][particle_index][:name] != "SE") && - @property_pane == component_sym - when :se_pane - component.visible = (keyframe >= 0 && particle_index >= 0 && - @anim[:particles][particle_index] && - @anim[:particles][particle_index][:name] == "SE") - @se_list_box_bitmap.visible = component.visible - when :particle_pane - component.visible = (keyframe < 0 && particle_index >= 0) - when :keyframe_pane - component.visible = (keyframe >= 0 && particle_index < 0) + side_pane = AnimationEditor::SidePanes.get_pane(component_sym) + if side_pane && side_pane[:set_visible] + @components[component_sym].visible = side_pane[:set_visible].call(self, @anim, keyframe, particle_index) + @se_list_box_bitmap.visible = @components[component_sym].visible if component_sym == :se_pane end end @@ -569,145 +459,6 @@ class AnimationEditor when :canvas component.keyframe = keyframe component.selected_particle = particle_index - when :commands_pane - new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) - component.controls.each do |ctrl| - next if !new_vals.include?(ctrl[0]) - ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") - # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, - # which should be indicated somehow in ctrl[1]. - end - # Set an appropriate range for the priority (z) property depending on the - # particle's focus - case @anim[:particles][particle_index][:focus] - when :user_and_target - component.get_control(:z).min_value = GameData::Animation::USER_AND_TARGET_SEPARATION[2] - 50 - component.get_control(:z).max_value = 50 - else - component.get_control(:z).min_value = -50 - component.get_control(:z).max_value = 50 - end - # Disable the "Frame" control if the particle's graphic is predefined to - # be the user's or target's sprite - # TODO: Also disable it if the particle's graphic isn't a spritesheet. - if ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", - "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(@anim[:particles][particle_index][:graphic]) - component.get_control(:frame).disable - else - component.get_control(:frame).enable - end - # Enable/disable property delete buttons - DELETABLE_COMMAND_PANE_PROPERTIES.each do |property| - if AnimationEditor::ParticleDataHelper.has_command_at?(@anim[:particles][particle_index], property, keyframe) - component.get_control((property.to_s + "_delete").to_sym).enable - else - component.get_control((property.to_s + "_delete").to_sym).disable - end - end - when :color_tone_pane - new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) - component.controls.each do |ctrl| - next if !new_vals.include?(ctrl[0]) - ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") - # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, - # which should be indicated somehow in ctrl[1]. - end - # Enable/disable property delete buttons - DELETABLE_COLOR_TONE_PANE_PROPERTIES.each do |property| - if AnimationEditor::ParticleDataHelper.has_command_at?(@anim[:particles][particle_index], property, keyframe) - component.get_control((property.to_s + "_delete").to_sym).enable - else - component.get_control((property.to_s + "_delete").to_sym).disable - end - end - when :se_pane - se_particle = @anim[:particles].select { |p| p[:name] == "SE" }[0] - kyfrm = keyframe - # Populate list of files - list = [] - se_particle.each_pair do |property, values| - next if !values.is_a?(Array) - values.each do |val| - next if val[0] != kyfrm - text = AnimationEditor::ParticleDataHelper.get_se_display_text(property, val) - case property - when :user_cry then list.push(["USER", text]) - when :target_cry then list.push(["TARGET", text]) - when :se then list.push([val[2], text]) - end - end - end - list.sort! { |a, b| a[1].downcase <=> b[1].downcase } - component.get_control(:list).values = list - # Enable/disable the "Edit" and "Delete" buttons - if list.length > 0 && component.get_control(:list).value - component.get_control(:edit).enable - component.get_control(:delete).enable - else - component.get_control(:edit).disable - component.get_control(:delete).disable - end - when :particle_pane - # Display particle's graphic's name - new_vals = AnimationEditor::ParticleDataHelper.get_all_particle_values(@anim[:particles][particle_index]) - component.controls.each do |ctrl| - next if !new_vals.include?(ctrl[0]) - ctrl[1].value = new_vals[ctrl[0]] if ctrl[1].respond_to?("value=") - end - graphic_name = @anim[:particles][particle_index][:graphic] - graphic_override_names = { - "USER" => _INTL("[[User's sprite]]"), - "USER_OPP" => _INTL("[[User's other side sprite]]"), - "USER_FRONT" => _INTL("[[User's front sprite]]"), - "USER_BACK" => _INTL("[[User's back sprite]]"), - "TARGET" => _INTL("[[Target's sprite]]"), - "TARGET_OPP" => _INTL("[[Target's other side sprite]]"), - "TARGET_FRONT" => _INTL("[[Target's front sprite]]"), - "TARGET_BACK" => _INTL("[[Target's back sprite]]"), - } - graphic_name = graphic_override_names[graphic_name] if graphic_override_names[graphic_name] - component.get_control(:graphic_name).text = graphic_name - # Enable/disable the Graphic and Focus controls for "User"/"Target" - if ["User", "Target"].include?(@anim[:particles][particle_index][:name]) - component.get_control(:graphic).disable - component.get_control(:focus).disable - else - component.get_control(:graphic).enable - component.get_control(:focus).enable - end - # Enable/disable the Duplicate button - if ["SE"].include?(@anim[:particles][particle_index][:name]) - component.get_control(:duplicate).disable - else - component.get_control(:duplicate).enable - end - # Enable/disable the Delete button - if ["User", "Target", "SE"].include?(@anim[:particles][particle_index][:name]) - component.get_control(:delete).disable - else - component.get_control(:delete).enable - end - # Set the possible foci depending on whether the animation involves a user - # and target - focus_values = { - :foreground => _INTL("Foreground"), - :midground => _INTL("Midground"), - :background => _INTL("Background"), - :user => _INTL("User"), - :target => _INTL("Target"), - :user_and_target => _INTL("User and target"), - :user_side_foreground => _INTL("In front of user's side"), - :user_side_background => _INTL("Behind user's side"), - :target_side_foreground => _INTL("In front of target's side"), - :target_side_background => _INTL("Behind target's side") - } - if @anim[:no_user] - GameData::Animation::FOCUS_TYPES_WITH_USER.each { |f| focus_values.delete(f) } - end - if @anim[:no_target] - GameData::Animation::FOCUS_TYPES_WITH_TARGET.each { |f| focus_values.delete(f) } - end - component.get_control(:focus).values = focus_values when :particle_list # Disable the "move particle up/down" buttons if the selected particle # can't move that way (or there is no selected particle) @@ -732,6 +483,42 @@ class AnimationEditor component.get_control(:move_label).text = _INTL("Common animation") end # TODO: Maybe other things as well? + else + # Side panes + if AnimationEditor::SidePanes.is_side_pane?(component_sym) + # Refresh each control's value + if AnimationEditor::SidePanes.get_pane(component_sym)[:unchanging_properties] + new_vals = AnimationEditor::ParticleDataHelper.get_all_particle_values(@anim[:particles][particle_index]) + component.controls.each do |ctrl| + next if !new_vals.include?(ctrl[0]) + ctrl[1].value = new_vals[ctrl[0]] if ctrl[1].respond_to?("value=") + end + else + new_vals = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(@anim[:particles][particle_index], keyframe) + component.controls.each do |ctrl| + next if !new_vals.include?(ctrl[0]) + ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") + # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, + # which should be indicated somehow in ctrl[1]. + end + end + # Additional refreshing of controls + AnimationEditor::SidePanes.each_property(component_sym) do |property, hash| + next if !hash[:refresh_value] + hash[:refresh_value].call(component.get_control(property), self) + end + # Enable/disable property delete buttons + deletable_properties = AnimationEditor::SidePanes.get_pane(component_sym)[:deletable_properties] + if deletable_properties + deletable_properties.each do |property| + if AnimationEditor::ParticleDataHelper.has_command_at?(@anim[:particles][particle_index], property, keyframe) + component.get_control((property.to_s + "_delete").to_sym).enable + else + component.get_control((property.to_s + "_delete").to_sym).disable + end + end + end + end end end @@ -783,107 +570,6 @@ class AnimationEditor when :play_controls # TODO: Will the play controls ever signal themselves as changed? I don't # think so. - when :commands_pane, :color_tone_pane - case property - when :general_tab - @property_pane = :commands_pane - refresh_component(component_sym) - refresh_component(@property_pane) - when :color_tone_tab - @property_pane = :color_tone_pane - refresh_component(component_sym) - refresh_component(@property_pane) - else - particle = @anim[:particles][particle_index] - prop = property - if property.to_s[/_delete$/] - prop = property.to_s.sub(/_delete$/, "").to_sym - new_cmds = AnimationEditor::ParticleDataHelper.delete_command(particle, prop, keyframe) - else - new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, keyframe, value) - end - if new_cmds - particle[prop] = new_cmds - else - particle.delete(prop) - end - @components[:particle_list].change_particle_commands(particle_index) - @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(component_sym) - refresh_component(:canvas) - end - when :se_pane - case property - when :list # List - refresh_component(component_sym) - when :add # Button - new_file, new_volume, new_pitch = choose_audio_file("", 100, 100) - if new_file != "" - particle = @anim[:particles][particle_index] - AnimationEditor::ParticleDataHelper.add_se_command(particle, keyframe, new_file, new_volume, new_pitch) - @components[:particle_list].change_particle_commands(particle_index) - @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(component_sym) - end - when :edit # Button - particle = @anim[:particles][particle_index] - list = @components[component_sym].get_control(:list) - old_file = list.value - old_volume, old_pitch = AnimationEditor::ParticleDataHelper.get_se_values_from_filename_and_frame(particle, keyframe, old_file) - if old_file - new_file, new_volume, new_pitch = choose_audio_file(old_file, old_volume, old_pitch) - if new_file != old_file || new_volume != old_volume || new_pitch != old_pitch - AnimationEditor::ParticleDataHelper.delete_se_command(particle, keyframe, old_file) - AnimationEditor::ParticleDataHelper.add_se_command(particle, keyframe, new_file, new_volume, new_pitch) - @components[:particle_list].change_particle_commands(particle_index) - @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(component_sym) - end - end - when :delete # Button - particle = @anim[:particles][particle_index] - list = @components[component_sym].get_control(:list) - old_file = list.value - if old_file - AnimationEditor::ParticleDataHelper.delete_se_command(particle, keyframe, old_file) - @components[:particle_list].change_particle_commands(particle_index) - @components[:play_controls].duration = @components[:particle_list].duration - refresh_component(component_sym) - end - end - when :particle_pane - case property - when :graphic # Button - p_index = particle_index - new_file = choose_graphic_file(@anim[:particles][p_index][:graphic]) - if @anim[:particles][p_index][:graphic] != new_file - @anim[:particles][p_index][:graphic] = new_file - refresh_component(component_sym) - refresh_component(:canvas) - end - when :duplicate - AnimationEditor::ParticleDataHelper.duplicate_particle(@anim[:particles], particle_index) - @components[:particle_list].add_particle(particle_index + 1) - @components[:particle_list].set_particles(@anim[:particles]) - @components[:particle_list].particle_index = particle_index + 1 - refresh - when :delete - if confirm_message(_INTL("Are you sure you want to delete this particle?")) - AnimationEditor::ParticleDataHelper.delete_particle(@anim[:particles], particle_index) - @components[:particle_list].delete_particle(particle_index) - @components[:particle_list].set_particles(@anim[:particles]) - @components[:particle_list].keyframe = 0 if @anim[:particles][particle_index][:name] == "SE" - refresh - end - else - particle = @anim[:particles][particle_index] - new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) - @components[:particle_list].change_particle(particle_index) - refresh_component(component_sym) - refresh_component(:canvas) - end - when :keyframe_pane - # TODO: Stuff here once I decide what controls to add. when :particle_list case property when :add_particle @@ -1000,6 +686,29 @@ class AnimationEditor else @anim[property] = value end + else + # Side panes + if AnimationEditor::SidePanes.is_side_pane?(component_sym) + if [:commands_pane, :color_tone_pane].include?(component_sym) && + [:general_tab, :color_tone_tab].include?(property) + @property_pane = { + :general_tab => :commands_pane, + :color_tone_tab => :color_tone_pane + }[property] + refresh_component(component_sym) + refresh_component(@property_pane) + else + hash = AnimationEditor::SidePanes.get_property(component_sym, property) + if hash && hash[:apply_value] + hash[:apply_value].call(value, self) + else + hash = AnimationEditor::SidePanes.get_pane(component_sym) + if hash && hash[:apply_value] + hash[:apply_value].call(property, value, self) + end + end + end + end end end diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb new file mode 100644 index 000000000..23375bfff --- /dev/null +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -0,0 +1,597 @@ +#=============================================================================== +# +#=============================================================================== +module AnimationEditor::SidePanes + @@panes = {} + @@properties = {} + + def self.is_side_pane?(pane) + return @@panes.keys.include?(pane) + end + + def self.add_pane(symbol, hash) + @@panes[symbol] = hash + end + + def self.add_property(pane, symbol, hash) + @@properties[pane] ||= {} + @@properties[pane][symbol] = hash + end + + def self.each_pane + @@panes.each_pair { |pane, hash| yield pane, hash } + end + + def self.each_property(pane) + return if !@@properties[pane] + @@properties[pane].each_pair do |property, hash| + yield property, hash + end + end + + def self.get_pane(pane) + return @@panes[pane] + end + + def self.get_property(pane, property) + return nil if !@@properties[pane] || !@@properties[pane][property] + return @@properties[pane][property] + end + + def self.remove_pane(pane) + @@panes.remove(pane) + @@properties.remove(pane) + end + + def self.remove_property(pane, property) + @@properties[pane]&.remove(property) + end +end + +#=============================================================================== +# +#=============================================================================== +AnimationEditor::SidePanes.add_pane(:commands_pane, { + :deletable_properties => AnimationEditor::DELETABLE_COMMAND_PANE_PROPERTIES, + :set_visible => proc { |editor, anim, keyframe, particle_index| + next keyframe >= 0 && particle_index >= 0 && + anim[:particles][particle_index] && + anim[:particles][particle_index][:name] != "SE" && + editor.property_pane == :commands_pane + }, + :apply_value => proc { |property, value, editor| + particle = editor.anim[:particles][editor.particle_index] + prop = property + if property.to_s[/_delete$/] + prop = property.to_s.sub(/_delete$/, "").to_sym + new_cmds = AnimationEditor::ParticleDataHelper.delete_command(particle, prop, editor.keyframe) + else + new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, editor.keyframe, value) + end + if new_cmds + particle[prop] = new_cmds + else + particle.delete(prop) + end + editor.components[:particle_list].change_particle_commands(editor.particle_index) + editor.components[:play_controls].duration = editor.components[:particle_list].duration + editor.refresh_component(:commands_pane) + editor.refresh_component(:canvas) + } +}) + +AnimationEditor::SidePanes.add_pane(:color_tone_pane, { + :deletable_properties => AnimationEditor::DELETABLE_COLOR_TONE_PANE_PROPERTIES, + :set_visible => proc { |editor, anim, keyframe, particle_index| + next keyframe >= 0 && particle_index >= 0 && + anim[:particles][particle_index] && + anim[:particles][particle_index][:name] != "SE" && + editor.property_pane == :color_tone_pane + }, + :apply_value => proc { |property, value, editor| + particle = editor.anim[:particles][editor.particle_index] + prop = property + if property.to_s[/_delete$/] + prop = property.to_s.sub(/_delete$/, "").to_sym + new_cmds = AnimationEditor::ParticleDataHelper.delete_command(particle, prop, editor.keyframe) + else + new_cmds = AnimationEditor::ParticleDataHelper.add_command(particle, property, editor.keyframe, value) + end + if new_cmds + particle[prop] = new_cmds + else + particle.delete(prop) + end + editor.components[:particle_list].change_particle_commands(editor.particle_index) + editor.components[:play_controls].duration = editor.components[:particle_list].duration + editor.refresh_component(:color_tone_pane) + editor.refresh_component(:canvas) + } +}) + +# NOTE: Doesn't need an :apply_value proc. +AnimationEditor::SidePanes.add_pane(:se_pane, { + :set_visible => proc { |editor, anim, keyframe, particle_index| + next keyframe >= 0 && particle_index >= 0 && + anim[:particles][particle_index] && + anim[:particles][particle_index][:name] == "SE" + } +}) + +AnimationEditor::SidePanes.add_pane(:particle_pane, { + :unchanging_properties => true, + :set_visible => proc { |editor, anim, keyframe, particle_index| + next keyframe < 0 && particle_index >= 0 + }, + :apply_value => proc { |property, value, editor| + particle = editor.anim[:particles][editor.particle_index] + new_cmds = AnimationEditor::ParticleDataHelper.set_property(particle, property, value) + editor.components[:particle_list].change_particle(editor.particle_index) + editor.refresh_component(:particle_pane) + editor.refresh_component(:canvas) + } +}) + +# AnimationEditor::SidePanes.add_pane(:keyframe_pane, { +# :set_visible => proc { |editor, anim, keyframe, particle_index| +# next keyframe >= 0 && particle_index < 0 +# } +# }) + +#=============================================================================== +# +#=============================================================================== +AnimationEditor::SidePanes.add_property(:commands_pane, :header, { + :new => proc { |pane, editor| + pane.add_header_label(:header, _INTL("Edit particle at keyframe")) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :tab_buttons, { + :new => proc { |pane, editor| + editor.add_side_pane_tab_buttons(:commands_pane, pane) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :x, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:x, _INTL("X"), -999, 999, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :y, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:y, _INTL("Y"), -999, 999, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :z, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:z, _INTL("Priority"), -50, 50, 0) + }, + :refresh_value => proc { |control, editor| + # Set an appropriate range for the priority (z) property depending on the + # particle's focus + case editor.anim[:particles][editor.particle_index][:focus] + when :user_and_target + control.min_value = GameData::Animation::USER_AND_TARGET_SEPARATION[2] - 50 + control.max_value = 50 + else + control.min_value = -50 + control.max_value = 50 + end + } +}) + +# TODO: If the graphic is user's sprite/target's sprite, make :frame instead +# a choice of front/back/same as the main sprite/opposite of the main +# sprite. Will need two controls in the same space, which is doable. +# Will also need to change the graphic chooser to only have "user"/ +# "target" options rather than all the variants that this control +# would manage. +AnimationEditor::SidePanes.add_property(:commands_pane, :frame, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:frame, _INTL("Frame"), 0, 99, 0) + }, + :refresh_value => proc { |control, editor| + # Disable the "Frame" control if the particle's graphic is predefined to be + # the user's or target's sprite + # TODO: Also disable it if the particle's graphic isn't a spritesheet. + graphic = editor.anim[:particles][editor.particle_index][:graphic] + if ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(graphic) + control.disable + else + control.enable + end + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :visible, { + :new => proc { |pane, editor| + pane.add_labelled_checkbox(:visible, _INTL("Visible"), true) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :opacity, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:opacity, _INTL("Opacity"), 0, 255, 255) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :zoom_x, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:zoom_x, _INTL("Zoom X"), 0, 1000, 100) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :zoom_y, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:zoom_y, _INTL("Zoom Y"), 0, 1000, 100) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :angle, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:angle, _INTL("Angle"), -1080, 1080, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :flip, { + :new => proc { |pane, editor| + pane.add_labelled_checkbox(:flip, _INTL("Flip"), false) + } +}) + +AnimationEditor::SidePanes.add_property(:commands_pane, :blending, { + :new => proc { |pane, editor| + pane.add_labelled_dropdown_list(:blending, _INTL("Blending"), { + 0 => _INTL("None"), + 1 => _INTL("Additive"), + 2 => _INTL("Subtractive") + }, 0) + } +}) + +# TODO: Add buttons that shift all commands from the current keyframe and later +# forwards/backwards in time? + +#=============================================================================== +# +#=============================================================================== +AnimationEditor::SidePanes.add_property(:color_tone_pane, :header, { + :new => proc { |pane, editor| + pane.add_header_label(:header, _INTL("Edit particle at keyframe")) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :tab_buttons, { + :new => proc { |pane, editor| + editor.add_side_pane_tab_buttons(:color_tone_pane, pane) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :color_red, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:color_red, _INTL("Color Red"), 0, 255, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :color_green, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:color_green, _INTL("Color Green"), 0, 255, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :color_blue, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:color_blue, _INTL("Color Blue"), 0, 255, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :color_alpha, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:color_alpha, _INTL("Color Alpha"), 0, 255, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :tone_red, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:tone_red, _INTL("Tone Red"), -255, 255, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :tone_green, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:tone_green, _INTL("Tone Green"), -255, 255, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :tone_blue, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:tone_blue, _INTL("Tone Blue"), -255, 255, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:color_tone_pane, :tone_gray, { + :new => proc { |pane, editor| + pane.add_labelled_number_slider(:tone_gray, _INTL("Tone Gray"), 0, 255, 0) + } +}) + +#=============================================================================== +# +#=============================================================================== +AnimationEditor::SidePanes.add_property(:se_pane, :header, { + :new => proc { |pane, editor| + pane.add_header_label(:header, _INTL("Edit sound effects at keyframe")) + } +}) + +AnimationEditor::SidePanes.add_property(:se_pane, :list, { + :new => proc { |pane, editor| + size = pane.control_size + size[0] -= 10 + size[1] = UIControls::List::ROW_HEIGHT * 5 # 5 rows + list = UIControls::List.new(*size, pane.viewport, []) + pane.add_control_at(:list, list, 5, 30) + }, + :refresh_value => proc { |control, editor| + se_particle = editor.anim[:particles].select { |ptcl| ptcl[:name] == "SE" }[0] + keyframe = editor.keyframe + # Populate list of files + list = [] + se_particle.each_pair do |property, values| + next if !values.is_a?(Array) + values.each do |val| + next if val[0] != keyframe + text = AnimationEditor::ParticleDataHelper.get_se_display_text(property, val) + case property + when :user_cry then list.push(["USER", text]) + when :target_cry then list.push(["TARGET", text]) + when :se then list.push([val[2], text]) + end + end + end + list.sort! { |a, b| a[1].downcase <=> b[1].downcase } + control.values = list + }, + :apply_value => proc { |value, editor| + editor.refresh_component(:se_pane) + } +}) + +AnimationEditor::SidePanes.add_property(:se_pane, :add, { + :new => proc { |pane, editor| + button_height = UIControls::ControlsContainer::LINE_SPACING + button = UIControls::Button.new(101, button_height, pane.viewport, _INTL("Add")) + button.set_fixed_size + pane.add_control_at(:add, button, 1, 154) + }, + :apply_value => proc { |value, editor| + new_file, new_volume, new_pitch = editor.choose_audio_file("", 100, 100) + if new_file != "" + particle = editor.anim[:particles][editor.particle_index] + AnimationEditor::ParticleDataHelper.add_se_command(particle, editor.keyframe, new_file, new_volume, new_pitch) + editor.components[:particle_list].change_particle_commands(editor.particle_index) + editor.components[:play_controls].duration = editor.components[:particle_list].duration + editor.refresh_component(:se_pane) + end + } +}) + +AnimationEditor::SidePanes.add_property(:se_pane, :edit, { + :new => proc { |pane, editor| + button_height = UIControls::ControlsContainer::LINE_SPACING + button = UIControls::Button.new(100, button_height, pane.viewport, _INTL("Edit")) + button.set_fixed_size + pane.add_control_at(:edit, button, 102, 154) + }, + :refresh_value => proc { |control, editor| + has_se = AnimationEditor::ParticleDataHelper.has_se_command_at?(editor.anim[:particles], editor.keyframe) + list = editor.components[:se_pane].get_control(:list) + if has_se && list.value + control.enable + else + control.disable + end + }, + :apply_value => proc { |value, editor| + particle = editor.anim[:particles][editor.particle_index] + list = editor.components[:se_pane].get_control(:list) + old_file = list.value + old_volume, old_pitch = AnimationEditor::ParticleDataHelper.get_se_values_from_filename_and_frame(particle, editor.keyframe, old_file) + if old_file + new_file, new_volume, new_pitch = editor.choose_audio_file(old_file, old_volume, old_pitch) + if new_file != old_file || new_volume != old_volume || new_pitch != old_pitch + AnimationEditor::ParticleDataHelper.delete_se_command(particle, editor.keyframe, old_file) + AnimationEditor::ParticleDataHelper.add_se_command(particle, editor.keyframe, new_file, new_volume, new_pitch) + editor.components[:particle_list].change_particle_commands(editor.particle_index) + editor.components[:play_controls].duration = editor.components[:particle_list].duration + editor.refresh_component(:se_pane) + end + end + } +}) + +AnimationEditor::SidePanes.add_property(:se_pane, :delete, { + :new => proc { |pane, editor| + button_height = UIControls::ControlsContainer::LINE_SPACING + button = UIControls::Button.new(101, button_height, pane.viewport, _INTL("Delete")) + button.set_fixed_size + pane.add_control_at(:delete, button, 202, 154) + }, + :refresh_value => proc { |control, editor| + has_se = AnimationEditor::ParticleDataHelper.has_se_command_at?(editor.anim[:particles], editor.keyframe) + list = editor.components[:se_pane].get_control(:list) + if has_se && list.value + control.enable + else + control.disable + end + }, + :apply_value => proc { |value, editor| + particle = editor.anim[:particles][editor.particle_index] + list = editor.components[:se_pane].get_control(:list) + old_file = list.value + if old_file + AnimationEditor::ParticleDataHelper.delete_se_command(particle, editor.keyframe, old_file) + editor.components[:particle_list].change_particle_commands(editor.particle_index) + editor.components[:play_controls].duration = editor.components[:particle_list].duration + editor.refresh_component(:se_pane) + end + } +}) + +#=============================================================================== +# +#=============================================================================== +AnimationEditor::SidePanes.add_property(:particle_pane, :header, { + :new => proc { |pane, editor| + pane.add_header_label(:header, _INTL("Edit particle properties")) + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :name, { + :new => proc { |pane, editor| + pane.add_labelled_text_box(:name, _INTL("Name"), "") + pane.get_control(:name).set_blacklist("", "User", "Target", "SE") + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :graphic_name, { + :new => proc { |pane, editor| + pane.add_labelled_label(:graphic_name, _INTL("Graphic"), "") + }, + :refresh_value => proc { |control, editor| + graphic_name = editor.anim[:particles][editor.particle_index][:graphic] + graphic_override_names = { + "USER" => _INTL("[[User's sprite]]"), + "USER_OPP" => _INTL("[[User's other side sprite]]"), + "USER_FRONT" => _INTL("[[User's front sprite]]"), + "USER_BACK" => _INTL("[[User's back sprite]]"), + "TARGET" => _INTL("[[Target's sprite]]"), + "TARGET_OPP" => _INTL("[[Target's other side sprite]]"), + "TARGET_FRONT" => _INTL("[[Target's front sprite]]"), + "TARGET_BACK" => _INTL("[[Target's back sprite]]"), + } + graphic_name = graphic_override_names[graphic_name] if graphic_override_names[graphic_name] + control.text = graphic_name + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :graphic, { + :new => proc { |pane, editor| + pane.add_labelled_button(:graphic, "", _INTL("Change")) + }, + :refresh_value => proc { |control, editor| + if ["User", "Target"].include?(editor.anim[:particles][editor.particle_index][:name]) + control.disable + else + control.enable + end + }, + :apply_value => proc { |value, editor| + p_index = editor.particle_index + new_file = editor.choose_graphic_file(editor.anim[:particles][p_index][:graphic]) + if editor.anim[:particles][p_index][:graphic] != new_file + editor.anim[:particles][p_index][:graphic] = new_file + editor.refresh_component(:particle_pane) + editor.refresh_component(:canvas) + end + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :focus, { + :new => proc { |pane, editor| + pane.add_labelled_dropdown_list(:focus, _INTL("Focus"), {}, :undefined) + }, + :refresh_value => proc { |control, editor| + if ["User", "Target"].include?(editor.anim[:particles][editor.particle_index][:name]) + control.disable + else + control.enable + end + focus_values = { + :foreground => _INTL("Foreground"), + :midground => _INTL("Midground"), + :background => _INTL("Background"), + :user => _INTL("User"), + :target => _INTL("Target"), + :user_and_target => _INTL("User and target"), + :user_side_foreground => _INTL("In front of user's side"), + :user_side_background => _INTL("Behind user's side"), + :target_side_foreground => _INTL("In front of target's side"), + :target_side_background => _INTL("Behind target's side") + } + if editor.anim[:no_user] + GameData::Animation::FOCUS_TYPES_WITH_USER.each { |f| focus_values.delete(f) } + end + if editor.anim[:no_target] + GameData::Animation::FOCUS_TYPES_WITH_TARGET.each { |f| focus_values.delete(f) } + end + control.values = focus_values + } +}) + +# TODO: FlipIfFoe. +# TODO: RotateIfFoe. + +AnimationEditor::SidePanes.add_property(:particle_pane, :duplicate, { + :new => proc { |pane, editor| + pane.add_button(:duplicate, _INTL("Duplicate this particle")) + }, + :refresh_value => proc { |control, editor| + if ["SE"].include?(editor.anim[:particles][editor.particle_index][:name]) + control.disable + else + control.enable + end + }, + :apply_value => proc { |value, editor| + p_index = editor.particle_index + AnimationEditor::ParticleDataHelper.duplicate_particle(editor.anim[:particles], p_index) + editor.components[:particle_list].add_particle(p_index + 1) + editor.components[:particle_list].set_particles(editor.anim[:particles]) + editor.components[:particle_list].particle_index = p_index + 1 + editor.refresh + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :delete, { + :new => proc { |pane, editor| + pane.add_button(:delete, _INTL("Delete this particle")) + }, + :refresh_value => proc { |control, editor| + if ["User", "Target", "SE"].include?(editor.anim[:particles][editor.particle_index][:name]) + control.disable + else + control.enable + end + }, + :apply_value => proc { |value, editor| + if editor.confirm_message(_INTL("Are you sure you want to delete this particle?")) + p_index = editor.particle_index + AnimationEditor::ParticleDataHelper.delete_particle(editor.anim[:particles], p_index) + editor.components[:particle_list].delete_particle(p_index) + editor.components[:particle_list].set_particles(editor.anim[:particles]) + editor.components[:particle_list].keyframe = 0 if editor.anim[:particles][p_index][:name] == "SE" + editor.refresh + end + } +}) + +# TODO: Various ways to bulk shift this particle's commands earlier/later. + +#=============================================================================== +# NOTE: keyframe_pane is currently inaccessible (intentionally). If it will have +# its own commands and should be accessible again, change def +# on_mouse_release in ParticleList. +#=============================================================================== +# AnimationEditor::SidePanes.add_property(:keyframe_pane, :header, { +# :new => proc { |pane, editor| +# pane.add_header_label(:header, _INTL("Edit keyframe")) +# } +# }) + +# TODO: Various command-shifting options (insert/delete keyframe). diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index b782057ea..544364905 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -187,6 +187,19 @@ module AnimationEditor::ParticleDataHelper return particle[property]&.any? { |cmd| (cmd[0] == frame) || (cmd[0] + cmd[1] == frame) } end + def has_se_command_at?(particles, frame) + ret = false + se_particle = particles.select { |ptcl| ptcl[:name] == "SE" }[0] + if se_particle + se_particle.each_pair do |prop, values| + next if !values.is_a?(Array) || values.length == 0 + ret = values.any? { |value| value[0] == frame } + break if ret + end + end + return ret + end + def add_command(particle, property, frame, value) # Return a new set of commands if there isn't one if !particle[property] || particle[property].empty? diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 7c92d0204..c697668fa 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -65,6 +65,7 @@ class AnimationEditor::Canvas < Sprite # Frame for other particles @frame_bitmap = Bitmap.new(64, 64) @frame_bitmap.outline_rect(1, 1, @frame_bitmap.width - 2, @frame_bitmap.height - 2, Color.new(0, 0, 0, 64)) + @battler_frame_sprites = [] @frame_sprites = [] end @@ -88,6 +89,8 @@ class AnimationEditor::Canvas < Sprite end end @particle_sprites.clear + @battler_frame_sprites.each { |s| s.dispose if s && !s.disposed? } + @battler_frame_sprites.clear @frame_sprites.each do |s| if s.is_a?(Array) s.each { |s2| s2.dispose if s2 && !s2.disposed? } @@ -213,9 +216,19 @@ class AnimationEditor::Canvas < Sprite def create_frame_sprite(index, sub_index = -1) if sub_index >= 0 - return if @frame_sprites[index] && @frame_sprites[index][sub_index] && !@frame_sprites[index][sub_index].disposed? + if @frame_sprites[index].is_a?(Array) + return if @frame_sprites[index][sub_index] && !@frame_sprites[index][sub_index].disposed? + else + @frame_sprites[index].dispose if @frame_sprites[index] && !@frame_sprites[index].disposed? + @frame_sprites[index] = [] + end else - return if @frame_sprites[index] && !@frame_sprites[index].disposed? + if @frame_sprites[index].is_a?(Array) + @frame_sprites[index].each { |s| s.dispose if s && !s.disposed? } + @frame_sprites[index] = nil + else + return if @frame_sprites[index] && !@frame_sprites[index].disposed? + end end sprite = Sprite.new(viewport) sprite.bitmap = @frame_bitmap @@ -231,27 +244,42 @@ class AnimationEditor::Canvas < Sprite end # TODO: Create shadow sprites? + # TODO: Make this also refresh if the layout of the battle changes (i.e. which + # battlers are the user/target). def ensure_battler_sprites - if !@side_size0 || @side_size0 != side_size(0) + if @sides_swapped.nil? || @sides_swapped != sides_swapped? || + !@side_size0 || @side_size0 != side_size(0) @battler_sprites.each_with_index { |s, i| s.dispose if i.even? && s && !s.disposed? } - idx_user = @anim[:particles].index { |particle| particle[:name] == "User" } + @battler_frame_sprites.each_with_index { |s, i| s.dispose if i.even? && s && !s.disposed? } @side_size0 = side_size(0) @side_size0.times do |i| - next if position_empty?(i * 2) + next if user_index != i * 2 && !target_indices.include?(i * 2) @battler_sprites[i * 2] = Sprite.new(self.viewport) - create_frame_sprite(idx_user) + frame_sprite = Sprite.new(viewport) + frame_sprite.bitmap = @frame_bitmap + frame_sprite.z = 99998 + frame_sprite.ox = @frame_bitmap.width / 2 + frame_sprite.oy = @frame_bitmap.height / 2 + @battler_frame_sprites[i * 2] = frame_sprite end end - if !@side_size1 || @side_size1 != side_size(1) + if @sides_swapped.nil? || @sides_swapped != sides_swapped? || + !@side_size1 || @side_size1 != side_size(1) @battler_sprites.each_with_index { |s, i| s.dispose if i.odd? && s && !s.disposed? } - idx_target = @anim[:particles].index { |particle| particle[:name] == "Target" } + @battler_frame_sprites.each_with_index { |s, i| s.dispose if i.odd? && s && !s.disposed? } @side_size1 = side_size(1) @side_size1.times do |i| - next if position_empty?((i * 2) + 1) + next if user_index != (i * 2) + 1 && !target_indices.include?((i * 2) + 1) @battler_sprites[(i * 2) + 1] = Sprite.new(self.viewport) - create_frame_sprite(idx_target, (i * 2) + 1) + frame_sprite = Sprite.new(viewport) + frame_sprite.bitmap = @frame_bitmap + frame_sprite.z = 99998 + frame_sprite.ox = @frame_bitmap.width / 2 + frame_sprite.oy = @frame_bitmap.height / 2 + @battler_frame_sprites[(i * 2) + 1] = frame_sprite end end + @sides_swapped = sides_swapped? end def refresh_battler_graphics @@ -300,8 +328,6 @@ class AnimationEditor::Canvas < Sprite else @particle_sprites[index].dispose if @particle_sprites[index] && !@particle_sprites[index].disposed? @particle_sprites[index] = [] - @frame_sprites[index].dispose if @frame_sprites[index] && !@frame_sprites[index].disposed? - @frame_sprites[index] = [] end @particle_sprites[index][target_idx] = Sprite.new(self.viewport) create_frame_sprite(index, target_idx) @@ -309,8 +335,6 @@ class AnimationEditor::Canvas < Sprite if @particle_sprites[index].is_a?(Array) @particle_sprites[index].each { |s| s.dispose if s && !s.disposed? } @particle_sprites[index] = nil - @frame_sprites[index].each { |s| s.dispose if s && !s.disposed? } - @frame_sprites[index] = nil else return if @particle_sprites[index] && !@particle_sprites[index].disposed? end @@ -330,14 +354,12 @@ class AnimationEditor::Canvas < Sprite spr = @battler_sprites[user_index] raise _INTL("Sprite for particle {1} not found somehow (battler index {2}).", particle[:name], user_index) if !spr - idx_user = @anim[:particles].index { |particle| particle[:name] == "User" } - frame = @frame_sprites[idx_user] + frame = @battler_frame_sprites[user_index] when "Target" spr = @battler_sprites[target_idx] raise _INTL("Sprite for particle {1} not found somehow (battler index {2}).", particle[:name], target_idx) if !spr - idx_target = @anim[:particles].index { |particle| particle[:name] == "Target" } - frame = @frame_sprites[idx_target][target_idx] + frame = @battler_frame_sprites[target_idx] else create_particle_sprite(index, target_idx) if target_idx >= 0 @@ -572,6 +594,18 @@ class AnimationEditor::Canvas < Sprite # Find closest particle to mouse nearest_index = -1 nearest_distance = -1 + @battler_frame_sprites.each_with_index do |sprite, index| + next if !sprite || !sprite.visible + next if !mouse_in_sprite?(sprite, mouse_x, mouse_y) + dist = (sprite.x - mouse_x) ** 2 + (sprite.y - mouse_y) ** 2 + next if nearest_distance >= 0 && nearest_distance < dist + if index == user_index + nearest_index = @anim[:particles].index { |particle| particle[:name] == "User" } + else + nearest_index = @anim[:particles].index { |particle| particle[:name] == "Target" } + end + nearest_distance = dist + end @frame_sprites.each_with_index do |sprite, index| sprites = (sprite.is_a?(Array)) ? sprite : [sprite] sprites.each do |spr| From 29140a517e3943409173dd91c3f7d9dd97423a38 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 4 Apr 2024 22:39:01 +0100 Subject: [PATCH 28/49] List control now draws its own background --- .../Control elements/009_List.rb | 29 +++++++++------ .../Control elements/010_DropdownList.rb | 18 +++------- .../011_TextBoxDropdownList.rb | 18 +++------- .../904_Anim Editor/001_AnimationEditor.rb | 36 +++++++------------ .../002_AnimationEditor_popups.rb | 18 ++++------ .../003_AnimationEditor_side_panes.rb | 6 ++-- .../904_Anim Editor/010_AnimationSelector.rb | 22 ++++-------- 7 files changed, 57 insertions(+), 90 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/009_List.rb b/Data/Scripts/801_UI controls/Control elements/009_List.rb index bbdbae989..fe5ea0a68 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_List.rb @@ -2,17 +2,19 @@ # #=============================================================================== class UIControls::List < UIControls::BaseControl - LIST_X = 0 - LIST_Y = 0 - ROW_HEIGHT = 24 - TEXT_PADDING_X = 4 - TEXT_OFFSET_Y = 3 + BORDER_THICKNESS = 2 + ROW_HEIGHT = 24 + TEXT_PADDING_X = 4 + TEXT_OFFSET_Y = 3 SELECTED_ROW_COLOR = Color.green def initialize(width, height, viewport, values = []) super(width, height, viewport) - @scrollbar = UIControls::Scrollbar.new(LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH, LIST_Y, height, viewport) + @scrollbar = UIControls::Scrollbar.new( + width - UIControls::Scrollbar::SLIDER_WIDTH - BORDER_THICKNESS, BORDER_THICKNESS, + height - (BORDER_THICKNESS * 2), viewport + ) @scrollbar.set_interactive_rects @scrollbar.range = ROW_HEIGHT @scrollbar.z = self.z + 1 @@ -30,12 +32,12 @@ class UIControls::List < UIControls::BaseControl def x=(new_val) super(new_val) - @scrollbar.x = new_val + LIST_X + width - UIControls::Scrollbar::SLIDER_WIDTH + @scrollbar.x = new_val + width - UIControls::Scrollbar::SLIDER_WIDTH - BORDER_THICKNESS end def y=(new_val) super(new_val) - @scrollbar.y = new_val + LIST_Y + @scrollbar.y = new_val + BORDER_THICKNESS end def z=(new_val) @@ -101,7 +103,10 @@ class UIControls::List < UIControls::BaseControl def set_interactive_rects @interactions = {} @values.length.times do |i| - @interactions[i] = Rect.new(LIST_X, LIST_Y + (ROW_HEIGHT * i), width - LIST_X, ROW_HEIGHT) + @interactions[i] = Rect.new( + BORDER_THICKNESS, BORDER_THICKNESS + (ROW_HEIGHT * i), + width - (BORDER_THICKNESS * 2), ROW_HEIGHT + ) end end @@ -133,7 +138,11 @@ class UIControls::List < UIControls::BaseControl end def refresh - super + self.bitmap.clear + # Draw control outline and background + self.bitmap.outline_rect(0, 0, width, height, Color.black) + self.bitmap.fill_rect(1, 1, width - 2, height - 2, Color.white) + draw_area_highlight # Draw text options @values.each_with_index do |val, i| next if i < @top_row || i >= @top_row + @rows_count diff --git a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb index bebc7f231..cf9c75ad8 100644 --- a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb @@ -55,26 +55,16 @@ class UIControls::DropdownList < UIControls::BaseControl #----------------------------------------------------------------------------- def make_dropdown_menu - menu_height = UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min - # Draw menu's background - @dropdown_menu_bg = BitmapSprite.new(@button_rect.width, menu_height + 4, self.viewport) - @dropdown_menu_bg.x = self.x + @button_rect.x - @dropdown_menu_bg.y = self.y + @button_rect.y + @button_rect.height - @dropdown_menu_bg.z = self.z + 1 - @dropdown_menu_bg.bitmap.outline_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.black) - @dropdown_menu_bg.bitmap.fill_rect(1, 1, @dropdown_menu_bg.width - 2, @dropdown_menu_bg.height - 2, Color.white) - # Create menu - @dropdown_menu = UIControls::List.new(@button_rect.width - 4, menu_height, self.viewport, @options) - @dropdown_menu.x = @dropdown_menu_bg.x + 2 - @dropdown_menu.y = @dropdown_menu_bg.y + 2 + menu_height = (UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min) + (UIControls::List::BORDER_THICKNESS * 2) + @dropdown_menu = UIControls::List.new(@button_rect.width, menu_height, self.viewport, @options) + @dropdown_menu.x = self.x + @button_rect.x + @dropdown_menu.y = self.y + @button_rect.y + @button_rect.height @dropdown_menu.z = self.z + 2 @dropdown_menu.set_interactive_rects @dropdown_menu.repaint end def remove_dropdown_menu - @dropdown_menu_bg&.dispose - @dropdown_menu_bg = nil @dropdown_menu&.dispose @dropdown_menu = nil @captured_area = nil diff --git a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb index b240662d2..f65bc6ea1 100644 --- a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb @@ -51,26 +51,16 @@ class UIControls::TextBoxDropdownList < UIControls::TextBox #----------------------------------------------------------------------------- def make_dropdown_menu - menu_height = UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min - # Draw menu's background - @dropdown_menu_bg = BitmapSprite.new(@text_box_rect.width + @button_rect.width, menu_height + 4, self.viewport) - @dropdown_menu_bg.x = self.x + @text_box_rect.x - @dropdown_menu_bg.y = self.y + @text_box_rect.y + @text_box_rect.height - @dropdown_menu_bg.z = self.z + 1 - @dropdown_menu_bg.bitmap.outline_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.black) - @dropdown_menu_bg.bitmap.fill_rect(1, 1, @dropdown_menu_bg.width - 2, @dropdown_menu_bg.height - 2, Color.white) - # Create menu - @dropdown_menu = UIControls::List.new(@text_box_rect.width + @button_rect.width - 4, menu_height, self.viewport, @options) - @dropdown_menu.x = @dropdown_menu_bg.x + 2 - @dropdown_menu.y = @dropdown_menu_bg.y + 2 + menu_height = (UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min) + (UIControls::List::BORDER_THICKNESS * 2) + @dropdown_menu = UIControls::List.new(@text_box_rect.width + @button_rect.width, menu_height, self.viewport, @options) + @dropdown_menu.x = self.x + @text_box_rect.x + @dropdown_menu.y = self.y + @text_box_rect.y + @text_box_rect.height @dropdown_menu.z = self.z + 2 @dropdown_menu.set_interactive_rects @dropdown_menu.repaint end def remove_dropdown_menu - @dropdown_menu_bg&.dispose - @dropdown_menu_bg = nil @dropdown_menu&.dispose @dropdown_menu = nil @captured_area = nil diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 4a7f9c416..9716ac33d 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -50,21 +50,21 @@ class AnimationEditor CHOOSER_BUTTON_WIDTH = 150 CHOOSER_BUTTON_HEIGHT = MESSAGE_BOX_BUTTON_HEIGHT - CHOOSER_FILE_LIST_X = 8 - CHOOSER_FILE_LIST_Y = 32 - CHOOSER_FILE_LIST_WIDTH = CHOOSER_BUTTON_WIDTH * 2 - CHOOSER_FILE_LIST_HEIGHT = UIControls::List::ROW_HEIGHT * 15 + CHOOSER_FILE_LIST_X = 6 + CHOOSER_FILE_LIST_Y = 30 + CHOOSER_FILE_LIST_WIDTH = (CHOOSER_BUTTON_WIDTH * 2) + (UIControls::List::BORDER_THICKNESS * 2) + CHOOSER_FILE_LIST_HEIGHT = (UIControls::List::ROW_HEIGHT * 15) + (UIControls::List::BORDER_THICKNESS * 2) GRAPHIC_CHOOSER_PREVIEW_SIZE = 320 # Square - GRAPHIC_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 10 + GRAPHIC_CHOOSER_PREVIEW_SIZE + 8 - GRAPHIC_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 + GRAPHIC_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 8 + GRAPHIC_CHOOSER_PREVIEW_SIZE + 8 + GRAPHIC_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 8 + CHOOSER_BUTTON_HEIGHT + 8 GRAPHIC_CHOOSER_X = ((WINDOW_WIDTH - GRAPHIC_CHOOSER_WINDOW_WIDTH) / 2) GRAPHIC_CHOOSER_Y = ((WINDOW_HEIGHT - GRAPHIC_CHOOSER_WINDOW_HEIGHT) / 2) - AUDIO_CHOOSER_LABEL_WIDTH = UIControls::ControlsContainer::OFFSET_FROM_LABEL_X + AUDIO_CHOOSER_LABEL_WIDTH = UIControls::ControlsContainer::OFFSET_FROM_LABEL_X - 10 AUDIO_CHOOSER_SLIDER_WIDTH = (CHOOSER_BUTTON_WIDTH * 2) - AUDIO_CHOOSER_LABEL_WIDTH AUDIO_CHOOSER_WINDOW_WIDTH = CHOOSER_FILE_LIST_X + CHOOSER_FILE_LIST_WIDTH + 8 + (CHOOSER_BUTTON_WIDTH * 2) + 4 - AUDIO_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 10 + CHOOSER_BUTTON_HEIGHT + 8 + AUDIO_CHOOSER_WINDOW_HEIGHT = CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 8 + CHOOSER_BUTTON_HEIGHT + 8 AUDIO_CHOOSER_X = ((WINDOW_WIDTH - AUDIO_CHOOSER_WINDOW_WIDTH) / 2) AUDIO_CHOOSER_Y = ((WINDOW_HEIGHT - AUDIO_CHOOSER_WINDOW_HEIGHT) / 2) @@ -124,11 +124,6 @@ class AnimationEditor # Background for main editor @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) @screen_bitmap.z = -100 - # Background in which to draw the outline of the SE list box in the SE side pane - # TODO: Get rid of this by drawing a list's box in the control itself. - @se_list_box_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) - @se_list_box_bitmap.z = -90 - @se_list_box_bitmap.visible = false # Semi-transparent black overlay to dim the screen while a pop-up window is open @pop_up_bg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @pop_up_viewport) @pop_up_bg_bitmap.z = -100 @@ -193,7 +188,6 @@ class AnimationEditor def dispose @screen_bitmap.dispose - @se_list_box_bitmap.dispose @pop_up_bg_bitmap.dispose @delete_bitmap.dispose @delete_disabled_bitmap.dispose @@ -357,7 +351,7 @@ class AnimationEditor btn.set_fixed_size graphic_chooser.add_control_at(option[0], btn, CHOOSER_FILE_LIST_X + (CHOOSER_BUTTON_WIDTH * i), - CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 4) + CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 2) end graphic_chooser.visible = false end @@ -373,14 +367,14 @@ class AnimationEditor btn = UIControls::Button.new(CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, audio_chooser.viewport, option[1]) btn.set_fixed_size audio_chooser.add_control_at(option[0], btn, - CHOOSER_FILE_LIST_X + (CHOOSER_BUTTON_WIDTH * i), - CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 4) + CHOOSER_FILE_LIST_X + (CHOOSER_BUTTON_WIDTH * i) + 2, + CHOOSER_FILE_LIST_Y + CHOOSER_FILE_LIST_HEIGHT + 2) end # Volume and pitch sliders [[:volume, _INTL("Volume"), 0, 100], [:pitch, _INTL("Pitch"), 0, 200]].each_with_index do |option, i| label = UIControls::Label.new(AUDIO_CHOOSER_LABEL_WIDTH, 28, audio_chooser.viewport, option[1]) audio_chooser.add_control_at((option[0].to_s + "_label").to_sym, label, - list.x + list.width + 8, list.y + (28 * i)) + list.x + list.width + 6, list.y + (28 * i)) slider = UIControls::NumberSlider.new(AUDIO_CHOOSER_SLIDER_WIDTH, 28, audio_chooser.viewport, option[2], option[3], 100) audio_chooser.add_control_at(option[0], slider, label.x + label.width, label.y) end @@ -389,7 +383,7 @@ class AnimationEditor btn = UIControls::Button.new(CHOOSER_BUTTON_WIDTH, MESSAGE_BOX_BUTTON_HEIGHT, audio_chooser.viewport, option[1]) btn.set_fixed_size audio_chooser.add_control_at(option[0], btn, - list.x + list.width + 8 + (CHOOSER_BUTTON_WIDTH * i), + list.x + list.width + 6 + (CHOOSER_BUTTON_WIDTH * i), list.y + (28 * 2)) end audio_chooser.visible = false @@ -420,9 +414,6 @@ class AnimationEditor BORDER_THICKNESS, Color.white, Color.black) @screen_bitmap.bitmap.border_rect(PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, BORDER_THICKNESS, Color.white, Color.black) - # Draw box around SE list box in side pane - @se_list_box_bitmap.bitmap.outline_rect(SIDE_PANE_X + 3, SIDE_PANE_Y + 24 + 4, - SIDE_PANE_WIDTH - 6, (5 * UIControls::List::ROW_HEIGHT) + 4, Color.black) # Make the pop-up background semi-transparent @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) end @@ -434,7 +425,6 @@ class AnimationEditor side_pane = AnimationEditor::SidePanes.get_pane(component_sym) if side_pane && side_pane[:set_visible] @components[component_sym].visible = side_pane[:set_visible].call(self, @anim, keyframe, particle_index) - @se_list_box_bitmap.visible = @components[component_sym].visible if component_sym == :se_pane end end diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 903e432d4..8f269c0d5 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -153,8 +153,6 @@ class AnimationEditor graphic_chooser.visible = true # Draw box around list control list = graphic_chooser.get_control(:list) - bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x - 2, BORDER_THICKNESS + list.y - 2, - list.width + 4, list.height + 4, Color.black) # Get a list of files files = get_all_files_in_folder_and_prepend( sprite_folder, ["*.png", "*.jpg", "*.jpeg"], @@ -177,13 +175,13 @@ class AnimationEditor list.values = files list.selected = idx # Create sprite preview - bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x + list.width + 10 - 2, - BORDER_THICKNESS + list.y - 2, + bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x + list.width + 6, + BORDER_THICKNESS + list.y, GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, Color.black) preview_sprite = Sprite.new(@pop_up_viewport) - preview_sprite.x = graphic_chooser.x + list.x + list.width + 10 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) - preview_sprite.y = graphic_chooser.y + list.y + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) + preview_sprite.x = graphic_chooser.x + list.x + list.width + 8 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) + preview_sprite.y = graphic_chooser.y + list.y + 2 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) preview_bitmap = nil set_preview_graphic = lambda do |sprite, filename| preview_bitmap&.dispose @@ -209,7 +207,7 @@ class AnimationEditor end end preview_bitmap = AnimatedBitmap.new(folder + fname) - bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + list.x + list.width + 10, BORDER_THICKNESS + list.y, + bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + list.x + list.width + 8, BORDER_THICKNESS + list.y + 2, GRAPHIC_CHOOSER_PREVIEW_SIZE, GRAPHIC_CHOOSER_PREVIEW_SIZE, Color.white) next if !preview_bitmap @@ -219,8 +217,8 @@ class AnimationEditor sprite.zoom_x = sprite.zoom_y = zoom sprite.ox = sprite.width / 2 sprite.oy = sprite.height / 2 - bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + sprite.x - graphic_chooser.x - (sprite.width * sprite.zoom_x / 2), - BORDER_THICKNESS + sprite.y - graphic_chooser.y - (sprite.height * sprite.zoom_y / 2), + bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + sprite.x - graphic_chooser.x - (sprite.width * sprite.zoom_x / 2).round, + BORDER_THICKNESS + sprite.y - graphic_chooser.y - (sprite.height * sprite.zoom_y / 2).round, sprite.width * sprite.zoom_x, sprite.height * sprite.zoom_y, Color.magenta) end @@ -270,8 +268,6 @@ class AnimationEditor audio_chooser.visible = true # Draw box around list control list = audio_chooser.get_control(:list) - bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x - 2, BORDER_THICKNESS + list.y - 2, - list.width + 4, list.height + 4, Color.black) # Get a list of files files = get_all_files_in_folder_and_prepend( audio_folder, ["*.wav", "*.ogg", "*.mp3", "*.wma"], diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index 23375bfff..16985bff2 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -331,10 +331,10 @@ AnimationEditor::SidePanes.add_property(:se_pane, :header, { AnimationEditor::SidePanes.add_property(:se_pane, :list, { :new => proc { |pane, editor| size = pane.control_size - size[0] -= 10 - size[1] = UIControls::List::ROW_HEIGHT * 5 # 5 rows + size[0] -= 6 + size[1] = (UIControls::List::ROW_HEIGHT * 5) + (UIControls::List::BORDER_THICKNESS * 2) # 5 rows list = UIControls::List.new(*size, pane.viewport, []) - pane.add_control_at(:list, list, 5, 30) + pane.add_control_at(:list, list, 3, 28) }, :refresh_value => proc { |control, editor| se_particle = editor.anim[:particles].select { |ptcl| ptcl[:name] == "SE" }[0] diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 7500badb1..ff54a2f30 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -14,19 +14,19 @@ class AnimationEditor::AnimationSelector TYPE_BUTTON_WIDTH = 100 TYPE_BUTTON_HEIGHT = 48 - MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 4 - MOVES_LIST_Y = TYPE_BUTTONS_Y + 4 - MOVES_LIST_WIDTH = 200 - MOVES_LIST_HEIGHT = 26 * UIControls::List::ROW_HEIGHT + MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 2 + MOVES_LIST_Y = TYPE_BUTTONS_Y + 2 + MOVES_LIST_WIDTH = 200 + (UIControls::List::BORDER_THICKNESS * 2) + MOVES_LIST_HEIGHT = (26 * UIControls::List::ROW_HEIGHT) + (UIControls::List::BORDER_THICKNESS * 2) - ANIMATIONS_LIST_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 8 + ANIMATIONS_LIST_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 4 ANIMATIONS_LIST_Y = MOVES_LIST_Y - ANIMATIONS_LIST_WIDTH = 300 + ANIMATIONS_LIST_WIDTH = 300 + (UIControls::List::BORDER_THICKNESS * 2) ANIMATIONS_LIST_HEIGHT = MOVES_LIST_HEIGHT ACTION_BUTTON_WIDTH = 200 ACTION_BUTTON_HEIGHT = 48 - ACTION_BUTTON_X = ANIMATIONS_LIST_X + ANIMATIONS_LIST_WIDTH + 4 + ACTION_BUTTON_X = ANIMATIONS_LIST_X + ANIMATIONS_LIST_WIDTH + 2 ACTION_BUTTON_Y = TYPE_BUTTONS_Y + ((ANIMATIONS_LIST_HEIGHT - (ACTION_BUTTON_HEIGHT * 3)) / 2) + 4 FILTER_BOX_WIDTH = ACTION_BUTTON_WIDTH @@ -132,14 +132,6 @@ class AnimationEditor::AnimationSelector def draw_editor_background # Fill the whole screen with white @screen_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.white) - # Outlines around lists - areas = [ - [MOVES_LIST_X, MOVES_LIST_Y, MOVES_LIST_WIDTH, MOVES_LIST_HEIGHT], - [ANIMATIONS_LIST_X, ANIMATIONS_LIST_Y, ANIMATIONS_LIST_WIDTH, ANIMATIONS_LIST_HEIGHT] - ] - areas.each do |area| - @screen_bitmap.bitmap.outline_rect(area[0] - 2, area[1] - 2, area[2] + 4, area[3] + 4, Color.black) - end # Make the pop-up background semi-transparent @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) end From f34f9040c6a6e7106693dd4bcea4dfb4f8549c4a Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 7 Apr 2024 19:51:17 +0100 Subject: [PATCH 29/49] Anim Editor: graphics and audio now support subfolders, other tweaks --- .../100_convert old anims to new.rb | 12 +- .../904_Anim Editor/001_AnimationEditor.rb | 20 +- .../002_AnimationEditor_popups.rb | 63 +++--- .../003_AnimationEditor_side_panes.rb | 4 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 30 +-- .../Anim Editor elements/001_Canvas.rb | 51 +++-- .../Anim Editor elements/003_ParticleList.rb | 19 +- .../Common/Attract.txt | 10 +- .../Common/Bind.txt | 6 +- .../Common/Burn.txt | 4 +- .../Common/Confusion.txt | 4 +- .../Common/FireSpin.txt | 42 ++-- .../Common/Frozen.txt | 12 +- .../Common/Hail.txt | 44 ++--- .../Common/HealthDown.txt | 22 +-- .../Common/HealthUp.txt | 8 +- .../Common/LeechSeed.txt | 24 +-- .../Common/Paralysis.txt | 6 +- .../Common/ParentalBond.txt | 4 +- .../Common/Poison.txt | 4 +- .../Common/Rain.txt | 38 ++-- .../Common/Sandstorm.txt | 60 +++--- .../Common/Shadow.txt | 10 +- .../Common/ShadowSky.txt | 4 +- .../Common/Shiny.txt | 10 +- .../Common/Sleep.txt | 12 +- .../Common/StatDown.txt | 22 +-- .../Common/StatUp.txt | 14 +- .../Common/Sun.txt | 4 +- .../Common/SuperShiny.txt | 10 +- .../Common/Toxic.txt | 4 +- .../Common/Wrap.txt | 6 +- .../Move/ABSORB.txt | 22 +-- .../Move/ACID.txt | 8 +- .../Move/ACIDARMOR.txt | 4 +- .../Move/ACIDSPRAY.txt | 16 +- .../Move/ACROBATICS.txt | 6 +- .../Move/ACUPRESSURE.txt | 20 +- .../Move/AERIALACE.txt | 42 ++-- .../Move/AGILITY.txt | 12 +- .../Move/ALLYSWITCH.txt | 4 +- .../Move/AMNESIA.txt | 4 +- .../Move/ANCIENTPOWER.txt | 36 ++-- .../Move/AQUARING.txt | 12 +- .../Move/AROMATHERAPY.txt | 22 +-- .../Move/AURORABEAM.txt | 36 ++-- .../Move/BARRIER.txt | 6 +- .../Move/BEATUP.txt | 36 ++-- .../Move/BIND.txt | 6 +- .../Move/BITE.txt | 4 +- .../Move/BLASTBURN.txt | 28 +-- .../Move/BLOCK.txt | 4 +- .../Move/BLUEFLARE.txt | 8 +- .../Move/BODYSLAM.txt | 4 +- .../Move/BRICKBREAK.txt | 4 +- .../Move/BUBBLE.txt | 24 +-- .../Move/BUBBLEBEAM.txt | 36 ++-- .../Move/BULKUP.txt | 14 +- .../Move/BULLETPUNCH.txt | 22 +-- .../Move/BULLETSEED.txt | 60 +++--- .../Move/CHARGE.txt | 16 +- .../Move/CHARM.txt | 8 +- .../Move/CLEARSMOG.txt | 4 +- .../Move/CLOSECOMBAT.txt | 34 ++-- .../Move/COMETPUNCH.txt | 30 +-- .../Move/CONFUSERAY.txt | 4 +- .../Move/COTTONGUARD.txt | 14 +- .../Move/COTTONSPORE.txt | 4 +- .../Move/COUNTER.txt | 22 +-- .../Move/CRUNCH.txt | 14 +- .../Move/CRUSHCLAW.txt | 4 +- .../Move/CURSE.txt | 4 +- .../{Converted => Example anims}/Move/CUT.txt | 4 +- .../Move/DEFENSECURL.txt | 4 +- .../Move/DETECT.txt | 4 +- .../Move/DISABLE.txt | 8 +- .../Move/DIZZYPUNCH.txt | 48 ++--- .../Move/DOUBLEEDGE.txt | 12 +- .../Move/DOUBLEKICK.txt | 12 +- .../Move/DOUBLESLAP.txt | 40 ++-- .../Move/DRAGONBREATH.txt | 18 +- .../Move/DRAGONCLAW.txt | 4 +- .../Move/DRAGONDANCE.txt | 6 +- .../Move/DRAGONRAGE.txt | 10 +- .../Move/DYNAMICPUNCH.txt | 6 +- .../Move/EMBER.txt | 6 +- .../Move/ENCORE.txt | 6 +- .../Move/ENERGYBALL.txt | 4 +- .../Move/ERUPTION.txt | 8 +- .../Move/EXPLOSION.txt | 10 +- .../Move/FAKEOUT.txt | 6 +- .../Move/FAKETEARS.txt | 14 +- .../Move/FIERYDANCE.txt | 18 +- .../Move/FINALGAMBIT.txt | 4 +- .../Move/FIREBLAST.txt | 4 +- .../Move/FIREFANG.txt | 20 +- .../Move/FIREPLEDGE.txt | 4 +- .../Move/FIREPUNCH.txt | 24 +-- .../Move/FIRESPIN.txt | 4 +- .../Move/FLAIL.txt | 4 +- .../Move/FLAMEBURST.txt | 36 ++-- .../Move/FLAMECHARGE.txt | 22 +-- .../Move/FLAMETHROWER.txt | 42 ++-- .../Move/FLAMEWHEEL.txt | 84 ++++---- .../Move/FLASH.txt | 4 +- .../{Converted => Example anims}/Move/FLY.txt | 8 +- .../Move/FOCUSENERGY.txt | 6 +- .../Move/FOLLOWME.txt | 12 +- .../Move/FORESIGHT.txt | 4 +- .../Move/FRENZYPLANT.txt | 4 +- .../Move/FURYATTACK.txt | 80 ++++---- .../Move/FURYCUTTER.txt | 4 +- .../Move/FURYSWIPES.txt | 180 +++++++++--------- .../Move/FUTURESIGHT.txt | 8 +- .../Move/GASTROACID.txt | 16 +- .../Move/GIGADRAIN.txt | 22 +-- .../Move/GLARE.txt | 6 +- .../Move/GRASSWHISTLE.txt | 24 +-- .../Move/GROWL.txt | 16 +- .../Move/GRUDGE.txt | 20 +- .../Move/GUST.txt | 8 +- .../Move/HAIL.txt | 44 ++--- .../Move/HARDEN.txt | 4 +- .../Move/HEADBUTT.txt | 4 +- .../Move/HEATWAVE.txt | 4 +- .../Move/HIGHJUMPKICK.txt | 4 +- .../Move/HORNATTACK.txt | 6 +- .../Move/HYDROPUMP.txt | 8 +- .../Move/HYPERFANG.txt | 4 +- .../Move/ICEBALL.txt | 4 +- .../Move/ICEFANG.txt | 14 +- .../Move/ICEPUNCH.txt | 26 +-- .../Move/ICICLESPEAR.txt | 20 +- .../Move/ICYWIND.txt | 8 +- .../Move/INFERNO.txt | 56 +++--- .../Move/IRONHEAD.txt | 14 +- .../Move/JUMPKICK.txt | 4 +- .../Move/KARATECHOP.txt | 4 +- .../Move/KINESIS.txt | 4 +- .../Move/LEAFBLADE.txt | 4 +- .../Move/LEECHLIFE.txt | 18 +- .../Move/LEECHSEED.txt | 28 +-- .../Move/LEER.txt | 8 +- .../Move/LICK.txt | 4 +- .../Move/LIGHTSCREEN.txt | 12 +- .../Move/LOCKON.txt | 12 +- .../Move/LOVELYKISS.txt | 14 +- .../Move/LOWKICK.txt | 4 +- .../Move/LUCKYCHANT.txt | 46 ++--- .../Move/MACHPUNCH.txt | 6 +- .../Move/MAGICCOAT.txt | 24 +-- .../Move/MEANLOOK.txt | 4 +- .../Move/MEGADRAIN.txt | 40 ++-- .../Move/MEGAHORN.txt | 16 +- .../Move/MEGAKICK.txt | 6 +- .../Move/MEGAPUNCH.txt | 6 +- .../Move/METALCLAW.txt | 4 +- .../Move/METEORMASH.txt | 18 +- .../Move/METRONOME.txt | 8 +- .../Move/MIST.txt | 8 +- .../Move/MISTBALL.txt | 6 +- .../Move/MOONLIGHT.txt | 4 +- .../Move/MORNINGSUN.txt | 6 +- .../Move/NIGHTMARE.txt | 14 +- .../Move/OUTRAGE.txt | 16 +- .../Move/OVERHEAT.txt | 20 +- .../Move/PAYDAY.txt | 10 +- .../Move/PETALDANCE.txt | 12 +- .../Move/PINMISSILE.txt | 50 ++--- .../Move/POISONFANG.txt | 8 +- .../Move/POISONGAS.txt | 20 +- .../Move/POISONPOWDER.txt | 4 +- .../Move/POISONSTING.txt | 8 +- .../Move/POISONTAIL.txt | 4 +- .../Move/POUND.txt | 6 +- .../Move/PSYCHIC.txt | 10 +- .../Move/PSYCHOCUT.txt | 24 +-- .../Move/QUICKATTACK.txt | 4 +- .../Move/RAINDANCE.txt | 38 ++-- .../Move/RAZORLEAF.txt | 24 +-- .../Move/REFLECT.txt | 14 +- .../Move/REST.txt | 4 +- .../Move/ROAR.txt | 16 +- .../Move/ROCKSMASH.txt | 4 +- .../Move/ROCKTHROW.txt | 6 +- .../Move/ROLLINGKICK.txt | 6 +- .../Move/SANDATTACK.txt | 62 +++--- .../Move/SANDSTORM.txt | 60 +++--- .../Move/SCARYFACE.txt | 4 +- .../Move/SCRATCH.txt | 4 +- .../Move/SCREECH.txt | 8 +- .../Move/SELFDESTRUCT.txt | 20 +- .../Move/SHADOWBALL.txt | 8 +- .../Move/SIGNALBEAM.txt | 24 +-- .../Move/SILVERWIND.txt | 34 ++-- .../Move/SING.txt | 74 +++---- .../Move/SKETCH.txt | 4 +- .../Move/SLAM.txt | 4 +- .../Move/SLASH.txt | 8 +- .../Move/SLEEPPOWDER.txt | 4 +- .../Move/SLUDGE.txt | 6 +- .../Move/SLUDGEBOMB.txt | 10 +- .../Move/SMOG.txt | 4 +- .../Move/SMOKESCREEN.txt | 14 +- .../Move/SPIDERWEB.txt | 6 +- .../Move/SPIKECANNON.txt | 60 +++--- .../Move/SPIKES.txt | 8 +- .../Move/SPLASH.txt | 12 +- .../Move/SPORE.txt | 4 +- .../Move/STEALTHROCK.txt | 52 ++--- .../Move/STOMP.txt | 4 +- .../Move/STRINGSHOT.txt | 14 +- .../Move/STRUGGLE.txt | 6 +- .../Move/STUNSPORE.txt | 4 +- .../Move/SUNNYDAY.txt | 4 +- .../Move/SUPERSONIC.txt | 10 +- .../Move/SWAGGER.txt | 4 +- .../Move/SWEETKISS.txt | 6 +- .../Move/SWIFT.txt | 14 +- .../Move/SWORDSDANCE.txt | 14 +- .../Move/TACKLE.txt | 4 +- .../Move/TAILGLOW.txt | 4 +- .../Move/TAILWHIP.txt | 2 +- .../Move/TELEPORT.txt | 8 +- .../Move/THUNDER.txt | 10 +- .../Move/THUNDERBOLT.txt | 6 +- .../Move/THUNDERFANG.txt | 12 +- .../Move/THUNDERPUNCH.txt | 16 +- .../Move/THUNDERSHOCK.txt | 4 +- .../Move/THUNDERWAVE.txt | 8 +- .../Move/TOXIC.txt | 12 +- .../Move/TRICKROOM.txt | 4 +- .../Move/TWINEEDLE.txt | 16 +- .../Move/TWISTER.txt | 4 +- .../Move/VINEWHIP.txt | 6 +- .../Move/WATERGUN.txt | 40 ++-- .../Move/WATERPULSE.txt | 4 +- .../Move/WHIRLWIND.txt | 4 +- .../Move/WILLOWISP.txt | 10 +- .../Move/WINGATTACK.txt | 4 +- .../Move/WRAP.txt | 6 +- .../Move/WRINGOUT.txt | 4 +- .../Move/XSCISSOR.txt | 6 +- .../Move/ZAPCANNON.txt | 4 +- 244 files changed, 1900 insertions(+), 1891 deletions(-) rename PBS/Animations/{Converted => Example anims}/Common/Attract.txt (93%) rename PBS/Animations/{Converted => Example anims}/Common/Bind.txt (90%) rename PBS/Animations/{Converted => Example anims}/Common/Burn.txt (91%) rename PBS/Animations/{Converted => Example anims}/Common/Confusion.txt (95%) rename PBS/Animations/{Converted => Example anims}/Common/FireSpin.txt (80%) rename PBS/Animations/{Converted => Example anims}/Common/Frozen.txt (90%) rename PBS/Animations/{Converted => Example anims}/Common/Hail.txt (87%) rename PBS/Animations/{Converted => Example anims}/Common/HealthDown.txt (92%) rename PBS/Animations/{Converted => Example anims}/Common/HealthUp.txt (89%) rename PBS/Animations/{Converted => Example anims}/Common/LeechSeed.txt (88%) rename PBS/Animations/{Converted => Example anims}/Common/Paralysis.txt (93%) rename PBS/Animations/{Converted => Example anims}/Common/ParentalBond.txt (88%) rename PBS/Animations/{Converted => Example anims}/Common/Poison.txt (91%) rename PBS/Animations/{Converted => Example anims}/Common/Rain.txt (89%) rename PBS/Animations/{Converted => Example anims}/Common/Sandstorm.txt (87%) rename PBS/Animations/{Converted => Example anims}/Common/Shadow.txt (90%) rename PBS/Animations/{Converted => Example anims}/Common/ShadowSky.txt (90%) rename PBS/Animations/{Converted => Example anims}/Common/Shiny.txt (90%) rename PBS/Animations/{Converted => Example anims}/Common/Sleep.txt (88%) rename PBS/Animations/{Converted => Example anims}/Common/StatDown.txt (91%) rename PBS/Animations/{Converted => Example anims}/Common/StatUp.txt (92%) rename PBS/Animations/{Converted => Example anims}/Common/Sun.txt (93%) rename PBS/Animations/{Converted => Example anims}/Common/SuperShiny.txt (90%) rename PBS/Animations/{Converted => Example anims}/Common/Toxic.txt (91%) rename PBS/Animations/{Converted => Example anims}/Common/Wrap.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/ABSORB.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/ACID.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/ACIDARMOR.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/ACIDSPRAY.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/ACROBATICS.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/ACUPRESSURE.txt (84%) rename PBS/Animations/{Converted => Example anims}/Move/AERIALACE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/AGILITY.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/ALLYSWITCH.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/AMNESIA.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/ANCIENTPOWER.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/AQUARING.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/AROMATHERAPY.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/AURORABEAM.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/BARRIER.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/BEATUP.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/BIND.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/BITE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/BLASTBURN.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/BLOCK.txt (86%) rename PBS/Animations/{Converted => Example anims}/Move/BLUEFLARE.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/BODYSLAM.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/BRICKBREAK.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/BUBBLE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/BUBBLEBEAM.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/BULKUP.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/BULLETPUNCH.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/BULLETSEED.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/CHARGE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/CHARM.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/CLEARSMOG.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/CLOSECOMBAT.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/COMETPUNCH.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/CONFUSERAY.txt (96%) rename PBS/Animations/{Converted => Example anims}/Move/COTTONGUARD.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/COTTONSPORE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/COUNTER.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/CRUNCH.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/CRUSHCLAW.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/CURSE.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/CUT.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/DEFENSECURL.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/DETECT.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/DISABLE.txt (85%) rename PBS/Animations/{Converted => Example anims}/Move/DIZZYPUNCH.txt (86%) rename PBS/Animations/{Converted => Example anims}/Move/DOUBLEEDGE.txt (84%) rename PBS/Animations/{Converted => Example anims}/Move/DOUBLEKICK.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/DOUBLESLAP.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/DRAGONBREATH.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/DRAGONCLAW.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/DRAGONDANCE.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/DRAGONRAGE.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/DYNAMICPUNCH.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/EMBER.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/ENCORE.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/ENERGYBALL.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/ERUPTION.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/EXPLOSION.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/FAKEOUT.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/FAKETEARS.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/FIERYDANCE.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/FINALGAMBIT.txt (95%) rename PBS/Animations/{Converted => Example anims}/Move/FIREBLAST.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/FIREFANG.txt (85%) rename PBS/Animations/{Converted => Example anims}/Move/FIREPLEDGE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/FIREPUNCH.txt (86%) rename PBS/Animations/{Converted => Example anims}/Move/FIRESPIN.txt (95%) rename PBS/Animations/{Converted => Example anims}/Move/FLAIL.txt (95%) rename PBS/Animations/{Converted => Example anims}/Move/FLAMEBURST.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/FLAMECHARGE.txt (79%) rename PBS/Animations/{Converted => Example anims}/Move/FLAMETHROWER.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/FLAMEWHEEL.txt (82%) rename PBS/Animations/{Converted => Example anims}/Move/FLASH.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/FLY.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/FOCUSENERGY.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/FOLLOWME.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/FORESIGHT.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/FRENZYPLANT.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/FURYATTACK.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/FURYCUTTER.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/FURYSWIPES.txt (82%) rename PBS/Animations/{Converted => Example anims}/Move/FUTURESIGHT.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/GASTROACID.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/GIGADRAIN.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/GLARE.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/GRASSWHISTLE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/GROWL.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/GRUDGE.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/GUST.txt (96%) rename PBS/Animations/{Converted => Example anims}/Move/HAIL.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/HARDEN.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/HEADBUTT.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/HEATWAVE.txt (97%) rename PBS/Animations/{Converted => Example anims}/Move/HIGHJUMPKICK.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/HORNATTACK.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/HYDROPUMP.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/HYPERFANG.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/ICEBALL.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/ICEFANG.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/ICEPUNCH.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/ICICLESPEAR.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/ICYWIND.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/INFERNO.txt (86%) rename PBS/Animations/{Converted => Example anims}/Move/IRONHEAD.txt (85%) rename PBS/Animations/{Converted => Example anims}/Move/JUMPKICK.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/KARATECHOP.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/KINESIS.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/LEAFBLADE.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/LEECHLIFE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/LEECHSEED.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/LEER.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/LICK.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/LIGHTSCREEN.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/LOCKON.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/LOVELYKISS.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/LOWKICK.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/LUCKYCHANT.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/MACHPUNCH.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/MAGICCOAT.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/MEANLOOK.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/MEGADRAIN.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/MEGAHORN.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/MEGAKICK.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/MEGAPUNCH.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/METALCLAW.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/METEORMASH.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/METRONOME.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/MIST.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/MISTBALL.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/MOONLIGHT.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/MORNINGSUN.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/NIGHTMARE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/OUTRAGE.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/OVERHEAT.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/PAYDAY.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/PETALDANCE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/PINMISSILE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/POISONFANG.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/POISONGAS.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/POISONPOWDER.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/POISONSTING.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/POISONTAIL.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/POUND.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/PSYCHIC.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/PSYCHOCUT.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/QUICKATTACK.txt (96%) rename PBS/Animations/{Converted => Example anims}/Move/RAINDANCE.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/RAZORLEAF.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/REFLECT.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/REST.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/ROAR.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/ROCKSMASH.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/ROCKTHROW.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/ROLLINGKICK.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/SANDATTACK.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/SANDSTORM.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/SCARYFACE.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/SCRATCH.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/SCREECH.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/SELFDESTRUCT.txt (86%) rename PBS/Animations/{Converted => Example anims}/Move/SHADOWBALL.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/SIGNALBEAM.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/SILVERWIND.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/SING.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/SKETCH.txt (95%) rename PBS/Animations/{Converted => Example anims}/Move/SLAM.txt (86%) rename PBS/Animations/{Converted => Example anims}/Move/SLASH.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/SLEEPPOWDER.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/SLUDGE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/SLUDGEBOMB.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/SMOG.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/SMOKESCREEN.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/SPIDERWEB.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/SPIKECANNON.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/SPIKES.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/SPLASH.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/SPORE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/STEALTHROCK.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/STOMP.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/STRINGSHOT.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/STRUGGLE.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/STUNSPORE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/SUNNYDAY.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/SUPERSONIC.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/SWAGGER.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/SWEETKISS.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/SWIFT.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/SWORDSDANCE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/TACKLE.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/TAILGLOW.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/TAILWHIP.txt (96%) rename PBS/Animations/{Converted => Example anims}/Move/TELEPORT.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/THUNDER.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/THUNDERBOLT.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/THUNDERFANG.txt (88%) rename PBS/Animations/{Converted => Example anims}/Move/THUNDERPUNCH.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/THUNDERSHOCK.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/THUNDERWAVE.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/TOXIC.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/TRICKROOM.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/TWINEEDLE.txt (91%) rename PBS/Animations/{Converted => Example anims}/Move/TWISTER.txt (93%) rename PBS/Animations/{Converted => Example anims}/Move/VINEWHIP.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/WATERGUN.txt (87%) rename PBS/Animations/{Converted => Example anims}/Move/WATERPULSE.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/WHIRLWIND.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/WILLOWISP.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/WINGATTACK.txt (92%) rename PBS/Animations/{Converted => Example anims}/Move/WRAP.txt (90%) rename PBS/Animations/{Converted => Example anims}/Move/WRINGOUT.txt (94%) rename PBS/Animations/{Converted => Example anims}/Move/XSCISSOR.txt (89%) rename PBS/Animations/{Converted => Example anims}/Move/ZAPCANNON.txt (90%) diff --git a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb index fffe1934a..c2c6e5494 100644 --- a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb +++ b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb @@ -16,7 +16,7 @@ module AnimationConverter next if !anim.name || anim.name == "" || anim.length <= 1 # Get folder and filename for new PBS file - folder = "Converted/" + folder = "Example anims/" folder += (anim.name[/^Common:/]) ? "Common/" : "Move/" filename = anim.name.gsub(/^Common:/, "") filename.gsub!(/^Move:/, "") @@ -47,7 +47,7 @@ module AnimationConverter :type => type, :move => last_move, :version => last_version, - :name => filename, + :name => "Example anim", :particles => [], :pbs_path => pbs_path } @@ -92,7 +92,7 @@ module AnimationConverter default_frame[AnimFrame::FOCUS] = 4 # 1=target, 2=user, 3=user and target, 4=screen - default_frame[99] = anim.graphic + default_frame[99] = "Examples/" + anim.graphic last_frame_values = [] # Go through each frame @@ -106,7 +106,7 @@ module AnimationConverter # focus, start a new particle. if i > 1 && frame_num > 0 && index_lookup[i] && index_lookup[i] >= 0 && last_frame_values[index_lookup[i]] - this_graphic = (cel[AnimFrame::PATTERN] == -1) ? "USER" : (cel[AnimFrame::PATTERN] == -2) ? "TARGET" : anim.graphic + this_graphic = (cel[AnimFrame::PATTERN] == -1) ? "USER" : (cel[AnimFrame::PATTERN] == -2) ? "TARGET" : "Examples/" + anim.graphic if last_frame_values[index_lookup[i]][AnimFrame::FOCUS] != cel[AnimFrame::FOCUS] || last_frame_values[index_lookup[i]][99] != this_graphic # Graphic index_lookup[i] = -1 @@ -138,8 +138,8 @@ module AnimationConverter particle[:graphic] = "TARGET" last_frame[99] = "TARGET" else - particle[:graphic] = anim.graphic - last_frame[99] = anim.graphic + particle[:graphic] = "Examples/" + anim.graphic + last_frame[99] = "Examples/" + anim.graphic end end # Set focus for non-User/non-Target diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 9716ac33d..fc1fd3da0 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -458,7 +458,7 @@ class AnimationEditor else component.get_control(:move_particle_up).enable end - if cur_index < 0 || cur_index >= @anim[:particles].length - 2 + if cur_index < 0 || cur_index >= @anim[:particles].length - 1 || @anim[:particles][cur_index][:name] == "SE" component.get_control(:move_particle_down).disable else component.get_control(:move_particle_down).enable @@ -563,15 +563,11 @@ class AnimationEditor when :particle_list case property when :add_particle - new_idx = particle_index - if new_idx >= 0 - new_idx += 1 - new_idx = @anim[:particles].length - 1 if new_idx == 0 || new_idx >= @anim[:particles].length - end + new_idx = particle_index + 1 AnimationEditor::ParticleDataHelper.add_particle(@anim[:particles], new_idx) @components[:particle_list].add_particle(new_idx) @components[:particle_list].set_particles(@anim[:particles]) - @components[:particle_list].particle_index = (new_idx >= 0) ? new_idx : @anim[:particles].length - 2 + @components[:particle_list].particle_index = new_idx @components[:particle_list].keyframe = -1 refresh when :move_particle_up @@ -630,6 +626,7 @@ class AnimationEditor when :has_user @anim[:no_user] = !value if @anim[:no_user] + user_idx = @anim[:particles].index { |particle| particle[:name] == "User" } @anim[:particles].delete_if { |particle| particle[:name] == "User" } @anim[:particles].each do |particle| if ["USER", "USER_OPP", "USER_FRONT", "USER_BACK"].include?(particle[:graphic]) @@ -640,7 +637,7 @@ class AnimationEditor end particle[:user_cry] = nil if particle[:name] == "SE" end - @components[:particle_list].delete_particle(0) + @components[:particle_list].delete_particle(user_idx) elsif @anim[:particles].none? { |particle| particle[:name] == "User" } @anim[:particles].insert(0, { :name => "User", :focus => :user, :graphic => "USER" @@ -652,6 +649,7 @@ class AnimationEditor when :has_target @anim[:no_target] = !value if @anim[:no_target] + target_idx = @anim[:particles].index { |particle| particle[:name] == "Target" } @anim[:particles].delete_if { |particle| particle[:name] == "Target" } @anim[:particles].each do |particle| if ["TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(particle[:graphic]) @@ -662,12 +660,12 @@ class AnimationEditor end particle[:target_cry] = nil if particle[:name] == "SE" end - @components[:particle_list].delete_particle(@anim[:no_user] ? 0 : 1) + @components[:particle_list].delete_particle(target_idx) elsif @anim[:particles].none? { |particle| particle[:name] == "Target" } - @anim[:particles].insert((@anim[:no_user] ? 0 : 1), { + @anim[:particles].insert(0, { :name => "Target", :focus => :target, :graphic => "TARGET" }) - @components[:particle_list].add_particle((@anim[:no_user] ? 0 : 1)) + @components[:particle_list].add_particle(0) end @components[:particle_list].set_particles(@anim[:particles]) refresh diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 8f269c0d5..903e5ea1a 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -126,26 +126,24 @@ class AnimationEditor #----------------------------------------------------------------------------- - # Generates a list of all files in the given folder which have a file - # extension that matches one in exts. Removes any files from the list whose - # filename is the same as one in prepends (case insensitive), and then adds - # all the files in prepends to the start of the list. - def get_all_files_in_folder_and_prepend(folder, exts, prepends) + # Generates a list of all files in the given folder and its subfolders which + # have a file extension that matches one in exts. Removes any files from the + # list whose filename is the same as one in blacklist (case insensitive). + def get_all_files_in_folder(folder, exts, blacklist) ret = [] - Dir.chdir(folder) do - exts.each do |type| - Dir.glob(type) { |f| ret.push([File.basename(f, ".*"), f]) } - end + Dir.all(folder).each do |f| + next if !exts.include?(File.extname(f)) + file = f.sub(folder + "/", "") + ret.push([file.sub(File.extname(file), ""), file]) end - ret.delete_if { |f| prepends.any? { |add| add[0] == f[0].upcase } } + ret.delete_if { |f| blacklist.any? { |add| add.upcase == f[0].upcase } } ret.sort! { |a, b| a[0].downcase <=> b[0].downcase } - ret.prepend(*prepends) return ret end def choose_graphic_file(selected) selected ||= "" - sprite_folder = "Graphics/Battle animations/" + sprite_folder = "Graphics/Battle animations" # Show pop-up window @pop_up_bg_bitmap.visible = true bg_bitmap = create_pop_up_window(GRAPHIC_CHOOSER_WINDOW_WIDTH, GRAPHIC_CHOOSER_WINDOW_HEIGHT) @@ -154,17 +152,26 @@ class AnimationEditor # Draw box around list control list = graphic_chooser.get_control(:list) # Get a list of files - files = get_all_files_in_folder_and_prepend( - sprite_folder, ["*.png", "*.jpg", "*.jpeg"], - [["USER", _INTL("[[User's sprite]]")], - ["USER_OPP", _INTL("[[User's other side sprite]]")], - ["USER_FRONT", _INTL("[[User's front sprite]]")], - ["USER_BACK", _INTL("[[User's back sprite]]")], - ["TARGET", _INTL("[[Target's sprite]]")], - ["TARGET_OPP", _INTL("[[Target's other side sprite]]")], - ["TARGET_FRONT", _INTL("[[Target's front sprite]]")], - ["TARGET_BACK", _INTL("[[Target's back sprite]]")]] + files = get_all_files_in_folder( + sprite_folder, [".png", ".jpg", ".jpeg"], + ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"] ) + if !@anim[:no_target] + files.prepend( + ["TARGET", _INTL("[[Target's sprite]]")], + ["TARGET_OPP", _INTL("[[Target's other side sprite]]")], + ["TARGET_FRONT", _INTL("[[Target's front sprite]]")], + ["TARGET_BACK", _INTL("[[Target's back sprite]]")] + ) + end + if !@anim[:no_user] + files.prepend( + ["USER", _INTL("[[User's sprite]]")], + ["USER_OPP", _INTL("[[User's other side sprite]]")], + ["USER_FRONT", _INTL("[[User's front sprite]]")], + ["USER_BACK", _INTL("[[User's back sprite]]")] + ) + end idx = 0 files.each_with_index do |f, i| next if f[0] != selected @@ -185,7 +192,7 @@ class AnimationEditor preview_bitmap = nil set_preview_graphic = lambda do |sprite, filename| preview_bitmap&.dispose - folder = sprite_folder + folder = sprite_folder + "/" fname = filename if ["USER", "USER_BACK", "USER_FRONT", "USER_OPP", "TARGET", "TARGET_FRONT", "TARGET_BACK", "TARGET_OPP"].include?(filename) @@ -260,7 +267,7 @@ class AnimationEditor def choose_audio_file(selected, volume = 100, pitch = 100) selected ||= "" - audio_folder = "Audio/SE/Anim/" + audio_folder = "Audio/SE/Anim" # Show pop-up window @pop_up_bg_bitmap.visible = true bg_bitmap = create_pop_up_window(AUDIO_CHOOSER_WINDOW_WIDTH, AUDIO_CHOOSER_WINDOW_HEIGHT) @@ -269,11 +276,9 @@ class AnimationEditor # Draw box around list control list = audio_chooser.get_control(:list) # Get a list of files - files = get_all_files_in_folder_and_prepend( - audio_folder, ["*.wav", "*.ogg", "*.mp3", "*.wma"], - [["USER", _INTL("[[User's cry]]")], - ["TARGET", _INTL("[[Target's cry]]")]] - ) + files = get_all_files_in_folder(audio_folder, [".wav", ".ogg", ".mp3", ".wma"], ["USER", "TARGET"]) + files.prepend(["TARGET", _INTL("[[Target's cry]]")]) if !@anim[:no_target] + files.prepend(["USER", _INTL("[[User's cry]]")]) if !@anim[:no_user] idx = 0 files.each_with_index do |f, i| next if f[0] != selected diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index 16985bff2..84691d0ce 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -337,7 +337,7 @@ AnimationEditor::SidePanes.add_property(:se_pane, :list, { pane.add_control_at(:list, list, 3, 28) }, :refresh_value => proc { |control, editor| - se_particle = editor.anim[:particles].select { |ptcl| ptcl[:name] == "SE" }[0] + se_particle = editor.anim[:particles].select { |particle| particle[:name] == "SE" }[0] keyframe = editor.keyframe # Populate list of files list = [] @@ -542,7 +542,7 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :duplicate, { pane.add_button(:duplicate, _INTL("Duplicate this particle")) }, :refresh_value => proc { |control, editor| - if ["SE"].include?(editor.anim[:particles][editor.particle_index][:name]) + if editor.anim[:particles][editor.particle_index][:name] == "SE" control.disable else control.enable diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 544364905..75cdd3bc4 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -6,10 +6,10 @@ module AnimationEditor::ParticleDataHelper def get_duration(particles) ret = 0 - particles.each do |p| - p.each_pair do |cmd, val| - next if !val.is_a?(Array) || val.length == 0 - max = val.last[0] + val.last[1] # Keyframe + duration + particles.each do |particle| + particle.each_pair do |property, value| + next if !value.is_a?(Array) || value.length == 0 + max = value.last[0] + value.last[1] # Keyframe + duration ret = max if ret < max end end @@ -133,9 +133,9 @@ module AnimationEditor::ParticleDataHelper def get_particle_commands_timeline(particle) ret = [] durations = [] - particle.each_pair do |prop, val| - next if !val.is_a?(Array) - val.each do |cmd| + particle.each_pair do |property, value| + next if !value.is_a?(Array) + value.each do |cmd| ret[cmd[0]] = true if cmd[1] > 0 ret[cmd[0] + cmd[1]] = true @@ -189,9 +189,9 @@ module AnimationEditor::ParticleDataHelper def has_se_command_at?(particles, frame) ret = false - se_particle = particles.select { |ptcl| ptcl[:name] == "SE" }[0] + se_particle = particles.select { |particle| particle[:name] == "SE" }[0] if se_particle - se_particle.each_pair do |prop, values| + se_particle.each_pair do |property, values| next if !values.is_a?(Array) || values.length == 0 ret = values.any? { |value| value[0] == frame } break if ret @@ -496,16 +496,15 @@ module AnimationEditor::ParticleDataHelper :graphic => GameData::Animation::PARTICLE_DEFAULT_VALUES[:graphic], :focus => GameData::Animation::PARTICLE_DEFAULT_VALUES[:focus] } - if index > 0 && index <= particles.length - 1 - old_particle = particles[index - 1] - new_particle[:focus] = old_particle[:focus] + if index > 0 && index <= particles.length && particles[index - 1][:name] != "SE" + new_particle[:focus] = particles[index - 1][:focus] end - index = particles.length - 1 if index < 0 + index = particles.length if index < 0 particles.insert(index, new_particle) end # Copies the particle at index and inserts the copy immediately after that - # index. + # index. This assumes the original particle can be copied, i.e. isn't "SE". def duplicate_particle(particles, index) new_particle = {} particles[index].each_pair do |key, value| @@ -524,7 +523,8 @@ module AnimationEditor::ParticleDataHelper particles[index1], particles[index2] = particles[index2], particles[index1] end - # Deletes the particle at the given index + # Deletes the particle at the given index. This assumes the particle can be + # deleted, i.e. isn't "User"/"Target"/"SE". def delete_particle(particles, index) particles[index] = nil particles.compact! diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index c697668fa..5eb5b0cb4 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -13,11 +13,14 @@ class AnimationEditor::Canvas < Sprite attr_reader :values + FRAME_SIZE = 48 + def initialize(viewport, anim, settings) super(viewport) @anim = anim @settings = settings @keyframe = 0 + @display_keyframe = 0 @selected_particle = -2 @captured = nil @user_coords = [] @@ -54,7 +57,7 @@ class AnimationEditor::Canvas < Sprite def initialize_particle_frames # Frame for selected particle - @sel_frame_bitmap = Bitmap.new(64, 64) + @sel_frame_bitmap = Bitmap.new(FRAME_SIZE, FRAME_SIZE) @sel_frame_bitmap.outline_rect(0, 0, @sel_frame_bitmap.width, @sel_frame_bitmap.height, Color.new(0, 0, 0, 64)) @sel_frame_bitmap.outline_rect(2, 2, @sel_frame_bitmap.width - 4, @sel_frame_bitmap.height - 4, Color.new(0, 0, 0, 64)) @sel_frame_sprite = Sprite.new(viewport) @@ -63,7 +66,7 @@ class AnimationEditor::Canvas < Sprite @sel_frame_sprite.ox = @sel_frame_bitmap.width / 2 @sel_frame_sprite.oy = @sel_frame_bitmap.height / 2 # Frame for other particles - @frame_bitmap = Bitmap.new(64, 64) + @frame_bitmap = Bitmap.new(FRAME_SIZE, FRAME_SIZE) @frame_bitmap.outline_rect(1, 1, @frame_bitmap.width - 2, @frame_bitmap.height - 2, Color.new(0, 0, 0, 64)) @battler_frame_sprites = [] @frame_sprites = [] @@ -150,8 +153,10 @@ class AnimationEditor::Canvas < Sprite end def keyframe=(val) - return if @keyframe == val || val < 0 + return if @keyframe == val @keyframe = val + return if val < 0 + @display_keyframe = val refresh end @@ -379,7 +384,7 @@ class AnimationEditor::Canvas < Sprite # Get sprite spr, frame = get_sprite_and_frame(index, target_idx) # Calculate all values of particle at the current keyframe - values = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(particle, @keyframe) + values = AnimationEditor::ParticleDataHelper.get_all_keyframe_particle_values(particle, @display_keyframe) values.each_pair do |property, val| values[property] = val[0] end @@ -429,28 +434,12 @@ class AnimationEditor::Canvas < Sprite when "USER_BACK" spr.bitmap = @user_bitmap_back when "TARGET" - if target_idx < 0 - raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET\" but its focus doesn't include a target.", - particle[:name]) - end spr.bitmap = (target_idx.even?) ? @target_bitmap_back : @target_bitmap_front when "TARGET_OPP" - if target_idx < 0 - raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET_OPP\" but its focus doesn't include a target.", - particle[:name]) - end spr.bitmap = (target_idx.even?) ? @target_bitmap_front : @target_bitmap_back when "TARGET_FRONT" - if target_idx < 0 - raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET_FRONT\" but its focus doesn't include a target.", - particle[:name]) - end spr.bitmap = @target_bitmap_front when "TARGET_BACK" - if target_idx < 0 - raise _INTL("Particle \"{1}\" was given a graphic of \"TARGET_BACK\" but its focus doesn't include a target.", - particle[:name]) - end spr.bitmap = @target_bitmap_back end spr.ox = spr.bitmap.width / 2 @@ -520,7 +509,10 @@ class AnimationEditor::Canvas < Sprite # Position frame over spr frame.x = spr.x frame.y = spr.y - case @anim[:particles][index][:graphic] + # TODO: Offset frame.x and frame.y for screen-sized sprites with a + # screen-based focus, and for sprites whose graphic has "[bottom]" in + # its name. + case particle[:graphic] when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" frame.y -= spr.bitmap.height / 2 @@ -538,7 +530,8 @@ class AnimationEditor::Canvas < Sprite end def refresh_particle_frame - return if @selected_particle < 0 || @selected_particle >= @anim[:particles].length - 1 + return if @selected_particle < 0 || @selected_particle >= @anim[:particles].length || + @anim[:particles][@selected_particle][:name] == "SE" focus = @anim[:particles][@selected_particle][:focus] frame_color = AnimationEditor::ParticleList::CONTROL_BG_COLORS[focus] || Color.magenta @sel_frame_bitmap.outline_rect(1, 1, @sel_frame_bitmap.width - 2, @sel_frame_bitmap.height - 2, frame_color) @@ -587,8 +580,10 @@ class AnimationEditor::Canvas < Sprite mouse_x < @sel_frame_sprite.x - @sel_frame_sprite.ox + @sel_frame_sprite.width && mouse_y >= @sel_frame_sprite.y - @sel_frame_sprite.oy && mouse_y < @sel_frame_sprite.y - @sel_frame_sprite.oy + @sel_frame_sprite.height - @captured = [@sel_frame_sprite.x, @sel_frame_sprite.y, - @sel_frame_sprite.x - mouse_x, @sel_frame_sprite.y - mouse_y] + if @keyframe >= 0 + @captured = [@sel_frame_sprite.x, @sel_frame_sprite.y, + @sel_frame_sprite.x - mouse_x, @sel_frame_sprite.y - mouse_y] + end return end # Find closest particle to mouse @@ -706,7 +701,8 @@ class AnimationEditor::Canvas < Sprite end def update_selected_particle_frame - if @selected_particle < 0 || @selected_particle >= @anim[:particles].length - 1 + if @selected_particle < 0 || @selected_particle >= @anim[:particles].length || + @anim[:particles][@selected_particle][:name] == "SE" @sel_frame_sprite.visible = false return end @@ -721,7 +717,7 @@ class AnimationEditor::Canvas < Sprite @anim[:particles][@selected_particle][:name]) if !target else target = @particle_sprites[@selected_particle] - target = target[target_indices[0]] if target&.is_a?(Array) + target = target[first_target_index] if target&.is_a?(Array) end if !target || !target.visible @sel_frame_sprite.visible = false @@ -730,6 +726,9 @@ class AnimationEditor::Canvas < Sprite @sel_frame_sprite.visible = true @sel_frame_sprite.x = target.x @sel_frame_sprite.y = target.y + # TODO: Offset sel_frame_sprite.x and sel_frame_sprite.y for screen-sized + # sprites with a screen-based focus, and for sprites whose graphic has + # "[bottom]" in its name. case @anim[:particles][@selected_particle][:graphic] when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 47cff1cdf..a83178690 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -202,8 +202,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def particle_index=(val) old_index = @row_index - @row_index = @particle_list.index { |row| (row.is_a?(Array) && row[0] == val) || - (!row.is_a?(Array) && row == val) } + @row_index = @particle_list.index { |row| !row.is_a?(Array) && row == val } return if @row_index == old_index invalidate scroll_to_row(@row_index) @@ -690,6 +689,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl spr.bitmap.fill_rect(10 + (i * 2), 12, 1, 1, Color.black) end elsif @expanded_particles.include?(p_index) + # Draw down-pointing arrow 11.times do |i| j = (i == 0 || i == 10) ? 1 : 0 h = [2, 4, 5, 6, 7, 8, 7, 6, 5, 4, 2][i] @@ -697,6 +697,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl spr.bitmap.fill_rect(5 + i, 9 + j, 1, h, Color.black) end elsif particle_data[:name] != "SE" + # Draw right-pointing arrow 11.times do |j| i = (j == 0 || j == 10) ? 1 : 0 w = [2, 4, 5, 6, 7, 8, 7, 6, 5, 4, 2][j] @@ -1049,13 +1050,19 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end elsif Input.repeat?(Input::DOWN) if @row_index < @particle_list.length - 1 + old_row_index = @row_index loop do @row_index += 1 - break if !@particle_list[@row_index].is_a?(Array) + break if !@particle_list[@row_index].is_a?(Array) || @row_index >= @particle_list.length + end + if @row_index < @particle_list.length + @keyframe = 0 if @keyframe < 0 && !@particle_list[@row_index].is_a?(Array) && + @particles[@particle_list[@row_index]][:name] == "SE" + scroll_to_row(@row_index) + set_changed + else + @row_index = old_row_index end - @keyframe = 0 if @row_index >= @particle_list.length - 1 && @keyframe < 0 - scroll_to_row(@row_index) - set_changed end end # Mouse scroll wheel diff --git a/PBS/Animations/Converted/Common/Attract.txt b/PBS/Animations/Example anims/Common/Attract.txt similarity index 93% rename from PBS/Animations/Converted/Common/Attract.txt rename to PBS/Animations/Example anims/Common/Attract.txt index bece8957a..9cf78fa57 100644 --- a/PBS/Animations/Converted/Common/Attract.txt +++ b/PBS/Animations/Example anims/Common/Attract.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Attract] -Name = Attract +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Attract SetX = 0,0 SetY = 0,0 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 7,2 SetX = 7,-29 @@ -39,7 +39,7 @@ Name = Attract SetY = 17,-93 SetOpacity = 17,64 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 8,2 SetX = 8,-35 @@ -67,7 +67,7 @@ Name = Attract SetY = 17,-70 SetOpacity = 17,64 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 12,2 SetX = 12,13 @@ -87,7 +87,7 @@ Name = Attract SetY = 17,-72 SetOpacity = 17,64 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 0,2 SetX = 0,-10 diff --git a/PBS/Animations/Converted/Common/Bind.txt b/PBS/Animations/Example anims/Common/Bind.txt similarity index 90% rename from PBS/Animations/Converted/Common/Bind.txt rename to PBS/Animations/Example anims/Common/Bind.txt index ae16518ad..49da0b318 100644 --- a/PBS/Animations/Converted/Common/Bind.txt +++ b/PBS/Animations/Example anims/Common/Bind.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Bind] -Name = Bind +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Bind SetX = 0,0 SetY = 0,0 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetFrame = 0,1 SetX = 0,56 @@ -27,7 +27,7 @@ Name = Bind SetY = 6,6 SetX = 7,96 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetX = 0,-64 SetY = 0,6 diff --git a/PBS/Animations/Converted/Common/Burn.txt b/PBS/Animations/Example anims/Common/Burn.txt similarity index 91% rename from PBS/Animations/Converted/Common/Burn.txt rename to PBS/Animations/Example anims/Common/Burn.txt index b87a2d198..f255e28c8 100644 --- a/PBS/Animations/Converted/Common/Burn.txt +++ b/PBS/Animations/Example anims/Common/Burn.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Burn] -Name = Burn +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Burn SetX = 0,0 SetY = 0,0 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 0,2 SetX = 0,0 diff --git a/PBS/Animations/Converted/Common/Confusion.txt b/PBS/Animations/Example anims/Common/Confusion.txt similarity index 95% rename from PBS/Animations/Converted/Common/Confusion.txt rename to PBS/Animations/Example anims/Common/Confusion.txt index 524811ff7..9cf48a078 100644 --- a/PBS/Animations/Converted/Common/Confusion.txt +++ b/PBS/Animations/Example anims/Common/Confusion.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Confusion] -Name = Confusion +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Confusion SetX = 0,0 SetY = 0,0 - Graphic = confused + Graphic = Examples/confused Focus = Target SetX = 0,0 SetY = 0,-33 diff --git a/PBS/Animations/Converted/Common/FireSpin.txt b/PBS/Animations/Example anims/Common/FireSpin.txt similarity index 80% rename from PBS/Animations/Converted/Common/FireSpin.txt rename to PBS/Animations/Example anims/Common/FireSpin.txt index 5355c281d..6f404644a 100644 --- a/PBS/Animations/Converted/Common/FireSpin.txt +++ b/PBS/Animations/Example anims/Common/FireSpin.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,FireSpin] -Name = FireSpin +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FireSpin SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,16 SetX = 0,-29 @@ -17,7 +17,7 @@ Name = FireSpin SetZ = 0,27 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,16 SetX = 0,9 @@ -25,7 +25,7 @@ Name = FireSpin SetZ = 0,28 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,16 SetX = 0,44 @@ -33,7 +33,7 @@ Name = FireSpin SetZ = 0,29 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 1,16 SetX = 1,-29 @@ -41,7 +41,7 @@ Name = FireSpin SetZ = 1,30 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 1,16 SetX = 1,10 @@ -49,7 +49,7 @@ Name = FireSpin SetZ = 1,31 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 1,16 SetX = 1,47 @@ -57,7 +57,7 @@ Name = FireSpin SetZ = 1,32 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 2,16 SetX = 2,-25 @@ -65,7 +65,7 @@ Name = FireSpin SetZ = 2,33 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 2,16 SetX = 2,11 @@ -73,7 +73,7 @@ Name = FireSpin SetZ = 2,34 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 2,16 SetX = 2,49 @@ -81,7 +81,7 @@ Name = FireSpin SetZ = 2,35 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 3,16 SetX = 3,-27 @@ -89,7 +89,7 @@ Name = FireSpin SetZ = 3,36 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 3,16 SetX = 3,12 @@ -97,7 +97,7 @@ Name = FireSpin SetZ = 3,37 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 3,16 SetX = 3,47 @@ -105,7 +105,7 @@ Name = FireSpin SetZ = 3,38 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 4,16 SetX = 4,-28 @@ -113,7 +113,7 @@ Name = FireSpin SetZ = 4,39 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 4,16 SetX = 4,13 @@ -121,7 +121,7 @@ Name = FireSpin SetZ = 4,40 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 4,16 SetX = 4,51 @@ -129,7 +129,7 @@ Name = FireSpin SetZ = 4,41 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 5,16 SetX = 5,-29 @@ -137,7 +137,7 @@ Name = FireSpin SetZ = 5,42 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 5,16 SetX = 5,13 @@ -145,7 +145,7 @@ Name = FireSpin SetZ = 5,43 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 5,16 SetX = 5,50 @@ -153,7 +153,7 @@ Name = FireSpin SetZ = 5,44 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 5,16 SetX = 5,-10 @@ -161,7 +161,7 @@ Name = FireSpin SetZ = 5,45 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 5,16 SetX = 5,31 diff --git a/PBS/Animations/Converted/Common/Frozen.txt b/PBS/Animations/Example anims/Common/Frozen.txt similarity index 90% rename from PBS/Animations/Converted/Common/Frozen.txt rename to PBS/Animations/Example anims/Common/Frozen.txt index 81ceb6db3..0a5ade93b 100644 --- a/PBS/Animations/Converted/Common/Frozen.txt +++ b/PBS/Animations/Example anims/Common/Frozen.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Frozen] -Name = Frozen +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Frozen SetX = 0,0 SetY = 0,0 - Graphic = 016-Ice01 + Graphic = Examples/016-Ice01 Focus = Target SetFrame = 0,6 SetX = 0,-56 @@ -34,7 +34,7 @@ Name = Frozen SetY = 13,-2 SetVisible = 14,false - Graphic = 016-Ice01 + Graphic = Examples/016-Ice01 Focus = Target SetFrame = 1,9 SetX = 1,0 @@ -42,7 +42,7 @@ Name = Frozen SetZ = 1,29 SetVisible = 2,false - Graphic = 016-Ice01 + Graphic = Examples/016-Ice01 Focus = Target SetFrame = 6,11 SetX = 6,0 @@ -52,7 +52,7 @@ Name = Frozen SetOpacity = 7,255 SetVisible = 8,false - Graphic = 016-Ice01 + Graphic = Examples/016-Ice01 Focus = Target SetFrame = 9,8 SetX = 9,48 @@ -70,7 +70,7 @@ Name = Frozen SetY = 13,46 SetVisible = 14,false - Graphic = 016-Ice01 + Graphic = Examples/016-Ice01 Focus = Target SetFrame = 0,9 SetX = 0,0 diff --git a/PBS/Animations/Converted/Common/Hail.txt b/PBS/Animations/Example anims/Common/Hail.txt similarity index 87% rename from PBS/Animations/Converted/Common/Hail.txt rename to PBS/Animations/Example anims/Common/Hail.txt index 2799efa60..be0097fed 100644 --- a/PBS/Animations/Converted/Common/Hail.txt +++ b/PBS/Animations/Example anims/Common/Hail.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Hail] -Name = Hail +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Hail SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 SetX = 0,37 @@ -43,7 +43,7 @@ Name = Hail SetY = 10,107 SetVisible = 11,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 SetX = 0,164 @@ -53,7 +53,7 @@ Name = Hail SetY = 1,117 SetVisible = 2,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,8 SetX = 0,302 @@ -69,7 +69,7 @@ Name = Hail SetY = 3,164 SetVisible = 4,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 SetX = 0,440 @@ -88,7 +88,7 @@ Name = Hail SetY = 4,210 SetVisible = 5,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 SetX = 0,362 @@ -96,7 +96,7 @@ Name = Hail SetZ = 0,31 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,7 SetX = 2,78 @@ -104,7 +104,7 @@ Name = Hail SetZ = 2,31 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 3,9 SetX = 3,441 @@ -112,7 +112,7 @@ Name = Hail SetZ = 3,28 SetVisible = 4,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,9 SetX = 4,259 @@ -139,7 +139,7 @@ Name = Hail SetX = 12,198 SetY = 12,28 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,8 SetX = 4,72 @@ -147,7 +147,7 @@ Name = Hail SetZ = 4,32 SetVisible = 5,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 5,9 SetX = 5,225 @@ -155,7 +155,7 @@ Name = Hail SetZ = 5,28 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 6,8 SetX = 6,334 @@ -163,7 +163,7 @@ Name = Hail SetZ = 6,29 SetVisible = 7,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 SetX = 6,465 @@ -186,7 +186,7 @@ Name = Hail SetX = 12,230 SetY = 12,142 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 SetX = 6,161 @@ -196,7 +196,7 @@ Name = Hail SetY = 7,172 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 8,8 SetX = 8,180 @@ -206,7 +206,7 @@ Name = Hail SetY = 9,99 SetVisible = 10,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 8,9 SetX = 8,444 @@ -219,7 +219,7 @@ Name = Hail SetY = 10,89 SetVisible = 11,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,9 SetX = 9,28 @@ -234,7 +234,7 @@ Name = Hail SetX = 12,167 SetY = 12,237 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 11,8 SetX = 11,176 @@ -242,7 +242,7 @@ Name = Hail SetZ = 11,28 SetVisible = 12,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 11,7 SetX = 11,281 @@ -252,7 +252,7 @@ Name = Hail SetX = 12,41 SetY = 12,229 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 11,9 SetX = 11,299 @@ -260,14 +260,14 @@ Name = Hail SetZ = 11,34 SetVisible = 12,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 12,8 SetX = 12,474 SetY = 12,59 SetZ = 12,29 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 12,9 SetX = 12,449 diff --git a/PBS/Animations/Converted/Common/HealthDown.txt b/PBS/Animations/Example anims/Common/HealthDown.txt similarity index 92% rename from PBS/Animations/Converted/Common/HealthDown.txt rename to PBS/Animations/Example anims/Common/HealthDown.txt index d4d03ad85..9b76daf90 100644 --- a/PBS/Animations/Converted/Common/HealthDown.txt +++ b/PBS/Animations/Example anims/Common/HealthDown.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,HealthDown] -Name = HealthDown +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HealthDown SetX = 0,0 SetY = 0,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,5 SetX = 0,-50 @@ -35,7 +35,7 @@ Name = HealthDown SetY = 9,92 SetVisible = 10,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,5 SetX = 0,35 @@ -57,7 +57,7 @@ Name = HealthDown SetY = 7,62 SetVisible = 8,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,5 SetX = 0,22 @@ -70,7 +70,7 @@ Name = HealthDown SetX = 1,-16 SetVisible = 2,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 1,5 SetX = 1,35 @@ -93,7 +93,7 @@ Name = HealthDown SetY = 8,82 SetVisible = 9,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 1,5 SetX = 1,22 @@ -117,7 +117,7 @@ Name = HealthDown SetY = 8,72 SetVisible = 9,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 2,5 SetX = 2,-16 @@ -137,7 +137,7 @@ Name = HealthDown SetOpacity = 7,126 SetVisible = 8,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 2,5 SetX = 2,-1 @@ -153,7 +153,7 @@ Name = HealthDown SetY = 6,23 SetVisible = 7,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 2,5 SetX = 2,-41 @@ -165,7 +165,7 @@ Name = HealthDown SetToneBlue = 2,-128 SetVisible = 3,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 3,5 SetX = 3,-41 @@ -180,7 +180,7 @@ Name = HealthDown SetY = 6,42 SetVisible = 7,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 3,5 SetX = 3,25 diff --git a/PBS/Animations/Converted/Common/HealthUp.txt b/PBS/Animations/Example anims/Common/HealthUp.txt similarity index 89% rename from PBS/Animations/Converted/Common/HealthUp.txt rename to PBS/Animations/Example anims/Common/HealthUp.txt index 3cbcf564a..c39ee7470 100644 --- a/PBS/Animations/Converted/Common/HealthUp.txt +++ b/PBS/Animations/Example anims/Common/HealthUp.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,HealthUp] -Name = HealthUp +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HealthUp SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 1,10 SetX = 1,48 @@ -24,7 +24,7 @@ Name = HealthUp SetY = 10,-26 SetVisible = 11,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 4,10 SetX = 4,-40 @@ -34,7 +34,7 @@ Name = HealthUp SetFrame = 8,7 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 0,10 SetX = 0,8 diff --git a/PBS/Animations/Converted/Common/LeechSeed.txt b/PBS/Animations/Example anims/Common/LeechSeed.txt similarity index 88% rename from PBS/Animations/Converted/Common/LeechSeed.txt rename to PBS/Animations/Example anims/Common/LeechSeed.txt index 2ea67cb3b..f6de11ef8 100644 --- a/PBS/Animations/Converted/Common/LeechSeed.txt +++ b/PBS/Animations/Example anims/Common/LeechSeed.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,LeechSeed] -Name = LeechSeed +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LeechSeed SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 0,11 SetX = 0,200 @@ -27,7 +27,7 @@ Name = LeechSeed SetY = 5,0 SetVisible = 6,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 1,11 SetX = 1,164 @@ -44,7 +44,7 @@ Name = LeechSeed SetY = 5,9 SetVisible = 6,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 2,11 SetX = 2,200 @@ -62,7 +62,7 @@ Name = LeechSeed SetX = 7,4 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 3,11 SetX = 3,189 @@ -80,7 +80,7 @@ Name = LeechSeed SetX = 8,4 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 4,12 SetX = 4,144 @@ -92,7 +92,7 @@ Name = LeechSeed SetY = 6,-118 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 7,12 SetX = 7,0 @@ -100,7 +100,7 @@ Name = LeechSeed SetZ = 7,27 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 9,10 SetX = 9,4 @@ -120,7 +120,7 @@ Name = LeechSeed SetX = 19,25 SetY = 19,-20 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 10,10 SetX = 10,-15 @@ -139,7 +139,7 @@ Name = LeechSeed SetY = 18,-20 SetVisible = 19,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 11,10 SetX = 11,14 @@ -155,7 +155,7 @@ Name = LeechSeed SetY = 17,-20 SetVisible = 18,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 12,10 SetX = 12,-25 @@ -168,7 +168,7 @@ Name = LeechSeed SetY = 16,-20 SetVisible = 17,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 13,10 SetX = 13,25 diff --git a/PBS/Animations/Converted/Common/Paralysis.txt b/PBS/Animations/Example anims/Common/Paralysis.txt similarity index 93% rename from PBS/Animations/Converted/Common/Paralysis.txt rename to PBS/Animations/Example anims/Common/Paralysis.txt index e9ecffd08..bcb0f93bc 100644 --- a/PBS/Animations/Converted/Common/Paralysis.txt +++ b/PBS/Animations/Example anims/Common/Paralysis.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Paralysis] -Name = Paralysis +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Paralysis SetX = 0,0 SetY = 0,0 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetFrame = 1,1 SetX = 1,40 @@ -37,7 +37,7 @@ Name = Paralysis SetX = 11,24 SetY = 11,14 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetX = 1,-48 SetY = 1,-2 diff --git a/PBS/Animations/Converted/Common/ParentalBond.txt b/PBS/Animations/Example anims/Common/ParentalBond.txt similarity index 88% rename from PBS/Animations/Converted/Common/ParentalBond.txt rename to PBS/Animations/Example anims/Common/ParentalBond.txt index 1cd8121fc..8e6b912a0 100644 --- a/PBS/Animations/Converted/Common/ParentalBond.txt +++ b/PBS/Animations/Example anims/Common/ParentalBond.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,ParentalBond] -Name = ParentalBond +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ParentalBond SetX = 0,0 SetY = 0,0 - Graphic = Tackle_B + Graphic = Examples/Tackle_B Focus = Target SetX = 2,0 SetY = 2,3 diff --git a/PBS/Animations/Converted/Common/Poison.txt b/PBS/Animations/Example anims/Common/Poison.txt similarity index 91% rename from PBS/Animations/Converted/Common/Poison.txt rename to PBS/Animations/Example anims/Common/Poison.txt index 169f19cf9..830d75989 100644 --- a/PBS/Animations/Converted/Common/Poison.txt +++ b/PBS/Animations/Example anims/Common/Poison.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Poison] -Name = Poison +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Poison SetX = 0,0 SetY = 0,0 - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetX = 1,0 SetY = 1,-10 diff --git a/PBS/Animations/Converted/Common/Rain.txt b/PBS/Animations/Example anims/Common/Rain.txt similarity index 89% rename from PBS/Animations/Converted/Common/Rain.txt rename to PBS/Animations/Example anims/Common/Rain.txt index ec19e6455..16d1592ed 100644 --- a/PBS/Animations/Converted/Common/Rain.txt +++ b/PBS/Animations/Example anims/Common/Rain.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Rain] -Name = Rain +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Rain SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,197 @@ -33,7 +33,7 @@ Name = Rain SetX = 9,99 SetY = 9,55 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,275 @@ -58,7 +58,7 @@ Name = Rain SetX = 9,253 SetY = 9,148 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,355 @@ -83,7 +83,7 @@ Name = Rain SetX = 9,254 SetY = 9,274 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,450 @@ -108,7 +108,7 @@ Name = Rain SetX = 9,418 SetY = 9,243 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,83 @@ -133,7 +133,7 @@ Name = Rain SetX = 9,181 SetY = 9,238 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,231 @@ -158,7 +158,7 @@ Name = Rain SetX = 9,108 SetY = 9,245 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,352 @@ -183,7 +183,7 @@ Name = Rain SetX = 9,25 SetY = 9,205 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,467 @@ -208,7 +208,7 @@ Name = Rain SetX = 9,148 SetY = 9,25 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 1,2 SetX = 1,482 @@ -224,7 +224,7 @@ Name = Rain SetY = 5,252 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,2 SetX = 2,27 @@ -238,7 +238,7 @@ Name = Rain SetY = 5,241 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,2 SetX = 4,409 @@ -246,7 +246,7 @@ Name = Rain SetZ = 4,37 SetVisible = 5,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 SetX = 7,471 @@ -254,7 +254,7 @@ Name = Rain SetZ = 7,35 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 SetX = 7,363 @@ -262,7 +262,7 @@ Name = Rain SetZ = 7,36 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 SetX = 7,443 @@ -270,28 +270,28 @@ Name = Rain SetZ = 7,37 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,247 SetY = 9,72 SetZ = 9,35 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,365 SetY = 9,42 SetZ = 9,36 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,479 SetY = 9,180 SetZ = 9,37 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,474 diff --git a/PBS/Animations/Converted/Common/Sandstorm.txt b/PBS/Animations/Example anims/Common/Sandstorm.txt similarity index 87% rename from PBS/Animations/Converted/Common/Sandstorm.txt rename to PBS/Animations/Example anims/Common/Sandstorm.txt index 6c681a450..37ab031bd 100644 --- a/PBS/Animations/Converted/Common/Sandstorm.txt +++ b/PBS/Animations/Example anims/Common/Sandstorm.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Sandstorm] -Name = Sandstorm +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Sandstorm SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,-350 @@ -34,7 +34,7 @@ Name = Sandstorm SetX = 9,32 SetY = 9,252 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,31 @@ -59,7 +59,7 @@ Name = Sandstorm SetX = 9,119 SetY = 9,175 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,156 @@ -84,7 +84,7 @@ Name = Sandstorm SetX = 9,143 SetY = 9,267 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,165 @@ -109,7 +109,7 @@ Name = Sandstorm SetX = 9,222 SetY = 9,197 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,267 @@ -134,7 +134,7 @@ Name = Sandstorm SetX = 9,162 SetY = 9,82 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,309 @@ -159,7 +159,7 @@ Name = Sandstorm SetX = 9,49 SetY = 9,61 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,388 @@ -184,7 +184,7 @@ Name = Sandstorm SetX = 9,21 SetY = 9,158 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,448 @@ -209,7 +209,7 @@ Name = Sandstorm SetX = 9,350 SetY = 9,240 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,35 @@ -234,7 +234,7 @@ Name = Sandstorm SetX = 9,481 SetY = 9,206 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,276 @@ -259,7 +259,7 @@ Name = Sandstorm SetX = 9,456 SetY = 9,64 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,487 @@ -267,7 +267,7 @@ Name = Sandstorm SetZ = 0,37 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,492 @@ -275,7 +275,7 @@ Name = Sandstorm SetZ = 0,38 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,387 @@ -283,7 +283,7 @@ Name = Sandstorm SetZ = 0,39 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,148 @@ -291,7 +291,7 @@ Name = Sandstorm SetZ = 0,40 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,487 @@ -299,7 +299,7 @@ Name = Sandstorm SetZ = 2,37 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,492 @@ -307,7 +307,7 @@ Name = Sandstorm SetZ = 2,38 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,387 @@ -315,7 +315,7 @@ Name = Sandstorm SetZ = 2,39 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,148 @@ -323,7 +323,7 @@ Name = Sandstorm SetZ = 2,40 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 SetX = 4,358 @@ -333,7 +333,7 @@ Name = Sandstorm SetY = 5,32 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 SetX = 4,267 @@ -343,7 +343,7 @@ Name = Sandstorm SetY = 5,135 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 SetX = 5,387 @@ -351,7 +351,7 @@ Name = Sandstorm SetZ = 5,39 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 SetX = 5,148 @@ -359,7 +359,7 @@ Name = Sandstorm SetZ = 5,40 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,487 @@ -367,7 +367,7 @@ Name = Sandstorm SetZ = 7,37 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,492 @@ -375,7 +375,7 @@ Name = Sandstorm SetZ = 7,38 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,387 @@ -383,7 +383,7 @@ Name = Sandstorm SetZ = 7,39 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,148 @@ -391,21 +391,21 @@ Name = Sandstorm SetZ = 7,40 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,311 SetY = 9,55 SetZ = 9,37 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,328 SetY = 9,146 SetZ = 9,38 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,251 diff --git a/PBS/Animations/Converted/Common/Shadow.txt b/PBS/Animations/Example anims/Common/Shadow.txt similarity index 90% rename from PBS/Animations/Converted/Common/Shadow.txt rename to PBS/Animations/Example anims/Common/Shadow.txt index 26501b2e7..08d018e79 100644 --- a/PBS/Animations/Converted/Common/Shadow.txt +++ b/PBS/Animations/Example anims/Common/Shadow.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Shadow] -Name = Shadow +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Shadow SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 2,5 SetX = 2,56 @@ -29,7 +29,7 @@ Name = Shadow SetY = 9,22 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 3,5 SetX = 3,-88 @@ -46,7 +46,7 @@ Name = Shadow SetY = 8,22 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 5,5 SetX = 5,32 @@ -58,7 +58,7 @@ Name = Shadow SetY = 7,22 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 0,5 SetX = 0,-24 diff --git a/PBS/Animations/Converted/Common/ShadowSky.txt b/PBS/Animations/Example anims/Common/ShadowSky.txt similarity index 90% rename from PBS/Animations/Converted/Common/ShadowSky.txt rename to PBS/Animations/Example anims/Common/ShadowSky.txt index 2905db533..a323eac69 100644 --- a/PBS/Animations/Converted/Common/ShadowSky.txt +++ b/PBS/Animations/Example anims/Common/ShadowSky.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,ShadowSky] -Name = ShadowSky +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ShadowSky SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,10 SetX = 0,258 diff --git a/PBS/Animations/Converted/Common/Shiny.txt b/PBS/Animations/Example anims/Common/Shiny.txt similarity index 90% rename from PBS/Animations/Converted/Common/Shiny.txt rename to PBS/Animations/Example anims/Common/Shiny.txt index 8f7b3a289..39b08ade5 100644 --- a/PBS/Animations/Converted/Common/Shiny.txt +++ b/PBS/Animations/Example anims/Common/Shiny.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Shiny] -Name = Shiny +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Shiny SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 2,5 SetX = 2,56 @@ -29,7 +29,7 @@ Name = Shiny SetY = 9,22 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 3,5 SetX = 3,-57 @@ -46,7 +46,7 @@ Name = Shiny SetY = 8,22 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 5,5 SetX = 5,32 @@ -58,7 +58,7 @@ Name = Shiny SetY = 7,22 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 0,5 SetX = 0,-24 diff --git a/PBS/Animations/Converted/Common/Sleep.txt b/PBS/Animations/Example anims/Common/Sleep.txt similarity index 88% rename from PBS/Animations/Converted/Common/Sleep.txt rename to PBS/Animations/Example anims/Common/Sleep.txt index fa28516c5..5cf8d6488 100644 --- a/PBS/Animations/Converted/Common/Sleep.txt +++ b/PBS/Animations/Example anims/Common/Sleep.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Sleep] -Name = Sleep +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Sleep SetX = 0,0 SetY = 0,0 - Graphic = 028-State01 + Graphic = Examples/028-State01 Focus = Target SetFrame = 3,8 SetX = 3,40 @@ -34,7 +34,7 @@ Name = Sleep SetX = 11,79 SetY = 11,-76 - Graphic = 028-State01 + Graphic = Examples/028-State01 Focus = Target SetFrame = 4,8 SetX = 4,47 @@ -56,7 +56,7 @@ Name = Sleep SetY = 10,-71 SetVisible = 11,false - Graphic = 028-State01 + Graphic = Examples/028-State01 Focus = Target SetFrame = 5,8 SetX = 5,-14 @@ -66,7 +66,7 @@ Name = Sleep SetZoomY = 5,50 SetVisible = 6,false - Graphic = 028-State01 + Graphic = Examples/028-State01 Focus = Target SetFrame = 7,8 SetX = 7,40 @@ -76,7 +76,7 @@ Name = Sleep SetZoomY = 7,50 SetVisible = 8,false - Graphic = 028-State01 + Graphic = Examples/028-State01 Focus = Target SetFrame = 1,8 SetX = 1,24 diff --git a/PBS/Animations/Converted/Common/StatDown.txt b/PBS/Animations/Example anims/Common/StatDown.txt similarity index 91% rename from PBS/Animations/Converted/Common/StatDown.txt rename to PBS/Animations/Example anims/Common/StatDown.txt index 1911e8b2b..3a5c97b0d 100644 --- a/PBS/Animations/Converted/Common/StatDown.txt +++ b/PBS/Animations/Example anims/Common/StatDown.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,StatDown] -Name = StatDown +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = StatDown SetX = 0,0 SetY = 0,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,5 SetX = 0,-50 @@ -32,7 +32,7 @@ Name = StatDown SetY = 9,92 SetVisible = 10,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,5 SetX = 0,35 @@ -51,7 +51,7 @@ Name = StatDown SetY = 7,62 SetVisible = 8,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,5 SetX = 0,22 @@ -61,7 +61,7 @@ Name = StatDown SetX = 1,-16 SetVisible = 2,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 1,5 SetX = 1,35 @@ -81,7 +81,7 @@ Name = StatDown SetY = 8,82 SetVisible = 9,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 1,5 SetX = 1,22 @@ -102,7 +102,7 @@ Name = StatDown SetY = 8,72 SetVisible = 9,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 2,5 SetX = 2,-16 @@ -119,7 +119,7 @@ Name = StatDown SetOpacity = 7,126 SetVisible = 8,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 2,5 SetX = 2,-1 @@ -132,7 +132,7 @@ Name = StatDown SetY = 6,23 SetVisible = 7,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 2,5 SetX = 2,-41 @@ -141,7 +141,7 @@ Name = StatDown SetOpacity = 2,126 SetVisible = 3,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 3,5 SetX = 3,-41 @@ -153,7 +153,7 @@ Name = StatDown SetY = 6,42 SetVisible = 7,false - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 3,5 SetX = 3,25 diff --git a/PBS/Animations/Converted/Common/StatUp.txt b/PBS/Animations/Example anims/Common/StatUp.txt similarity index 92% rename from PBS/Animations/Converted/Common/StatUp.txt rename to PBS/Animations/Example anims/Common/StatUp.txt index ecc8d05b5..5628f05fd 100644 --- a/PBS/Animations/Converted/Common/StatUp.txt +++ b/PBS/Animations/Example anims/Common/StatUp.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,StatUp] -Name = StatUp +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = StatUp SetX = 0,0 SetY = 0,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,6 SetX = 0,-41 @@ -28,7 +28,7 @@ Name = StatUp SetY = 9,-94 SetOpacity = 9,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,6 SetX = 0,7 @@ -47,7 +47,7 @@ Name = StatUp SetY = 9,-142 SetOpacity = 9,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 0,6 SetX = 0,55 @@ -68,7 +68,7 @@ Name = StatUp SetY = 9,-94 SetOpacity = 9,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 2,6 SetX = 2,-9 @@ -85,7 +85,7 @@ Name = StatUp SetY = 9,-38 SetOpacity = 9,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 3,6 SetX = 3,39 @@ -101,7 +101,7 @@ Name = StatUp SetY = 9,-6 SetOpacity = 9,0 - Graphic = ! + Graphic = Examples/! Focus = Target SetFrame = 5,6 SetX = 5,-25 diff --git a/PBS/Animations/Converted/Common/Sun.txt b/PBS/Animations/Example anims/Common/Sun.txt similarity index 93% rename from PBS/Animations/Converted/Common/Sun.txt rename to PBS/Animations/Example anims/Common/Sun.txt index 75c826696..5436488da 100644 --- a/PBS/Animations/Converted/Common/Sun.txt +++ b/PBS/Animations/Example anims/Common/Sun.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Sun] -Name = Sun +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Sun SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetX = 0,64 SetY = 0,64 diff --git a/PBS/Animations/Converted/Common/SuperShiny.txt b/PBS/Animations/Example anims/Common/SuperShiny.txt similarity index 90% rename from PBS/Animations/Converted/Common/SuperShiny.txt rename to PBS/Animations/Example anims/Common/SuperShiny.txt index f605b7146..6d8d76e64 100644 --- a/PBS/Animations/Converted/Common/SuperShiny.txt +++ b/PBS/Animations/Example anims/Common/SuperShiny.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,SuperShiny] -Name = SuperShiny +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SuperShiny SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 2,5 SetX = 2,56 @@ -29,7 +29,7 @@ Name = SuperShiny SetY = 9,22 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 3,5 SetX = 3,-57 @@ -46,7 +46,7 @@ Name = SuperShiny SetY = 8,22 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 5,5 SetX = 5,32 @@ -58,7 +58,7 @@ Name = SuperShiny SetY = 7,22 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = Target SetFrame = 0,5 SetX = 0,-24 diff --git a/PBS/Animations/Converted/Common/Toxic.txt b/PBS/Animations/Example anims/Common/Toxic.txt similarity index 91% rename from PBS/Animations/Converted/Common/Toxic.txt rename to PBS/Animations/Example anims/Common/Toxic.txt index 1989ada67..1fbba8aa9 100644 --- a/PBS/Animations/Converted/Common/Toxic.txt +++ b/PBS/Animations/Example anims/Common/Toxic.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Toxic] -Name = Toxic +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Toxic SetX = 0,0 SetY = 0,0 - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetX = 1,0 SetY = 1,-10 diff --git a/PBS/Animations/Converted/Common/Wrap.txt b/PBS/Animations/Example anims/Common/Wrap.txt similarity index 90% rename from PBS/Animations/Converted/Common/Wrap.txt rename to PBS/Animations/Example anims/Common/Wrap.txt index 10cbdeb6a..a1abc7497 100644 --- a/PBS/Animations/Converted/Common/Wrap.txt +++ b/PBS/Animations/Example anims/Common/Wrap.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Common,Wrap] -Name = Wrap +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = Wrap SetX = 0,0 SetY = 0,0 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetFrame = 0,1 SetX = 0,56 @@ -27,7 +27,7 @@ Name = Wrap SetY = 6,6 SetX = 7,96 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetX = 0,-64 SetY = 0,6 diff --git a/PBS/Animations/Converted/Move/ABSORB.txt b/PBS/Animations/Example anims/Move/ABSORB.txt similarity index 92% rename from PBS/Animations/Converted/Move/ABSORB.txt rename to PBS/Animations/Example anims/Move/ABSORB.txt index 6545786ea..33c6ff400 100644 --- a/PBS/Animations/Converted/Move/ABSORB.txt +++ b/PBS/Animations/Example anims/Move/ABSORB.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ABSORB] -Name = ABSORB +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ABSORB SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 0,11 SetX = 0,179 @@ -55,7 +55,7 @@ Name = ABSORB SetX = 17,0 SetY = 17,-10 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 1,11 SetX = 1,209 @@ -100,7 +100,7 @@ Name = ABSORB SetY = 16,-10 SetVisible = 17,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 1,12 SetX = 1,184 @@ -123,7 +123,7 @@ Name = ABSORB SetY = 7,-79 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 2,13 SetX = 2,200 @@ -144,7 +144,7 @@ Name = ABSORB SetY = 7,-109 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 2,11 SetX = 2,169 @@ -160,7 +160,7 @@ Name = ABSORB SetY = 6,-148 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 3,11 SetX = 3,204 @@ -173,7 +173,7 @@ Name = ABSORB SetY = 5,-178 SetVisible = 6,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 4,12 SetX = 4,169 @@ -184,7 +184,7 @@ Name = ABSORB SetY = 5,-196 SetVisible = 6,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 9,5 SetX = 9,14 @@ -207,7 +207,7 @@ Name = ABSORB SetY = 15,-10 SetVisible = 16,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 10,5 SetFlip = 10,true @@ -225,7 +225,7 @@ Name = ABSORB SetY = 14,-10 SetVisible = 15,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 11,5 SetX = 11,-20 diff --git a/PBS/Animations/Converted/Move/ACID.txt b/PBS/Animations/Example anims/Move/ACID.txt similarity index 92% rename from PBS/Animations/Converted/Move/ACID.txt rename to PBS/Animations/Example anims/Move/ACID.txt index a4fad9d47..43399b9a4 100644 --- a/PBS/Animations/Converted/Move/ACID.txt +++ b/PBS/Animations/Example anims/Move/ACID.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ACID] -Name = ACID +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ACID SetX = 0,0 SetY = 0,0 - Graphic = poison2 + Graphic = Examples/poison2 Focus = UserAndTarget SetFrame = 1,4 SetX = 1,14 @@ -28,7 +28,7 @@ Name = ACID SetY = 6,-217 SetVisible = 7,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = UserAndTarget SetFrame = 3,4 SetX = 3,19 @@ -42,7 +42,7 @@ Name = ACID SetY = 5,-207 SetVisible = 6,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = UserAndTarget SetFrame = 0,3 SetX = 0,14 diff --git a/PBS/Animations/Converted/Move/ACIDARMOR.txt b/PBS/Animations/Example anims/Move/ACIDARMOR.txt similarity index 92% rename from PBS/Animations/Converted/Move/ACIDARMOR.txt rename to PBS/Animations/Example anims/Move/ACIDARMOR.txt index ed09f91a3..3db55072f 100644 --- a/PBS/Animations/Converted/Move/ACIDARMOR.txt +++ b/PBS/Animations/Example anims/Move/ACIDARMOR.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ACIDARMOR] -Name = ACIDARMOR +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ACIDARMOR SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = Target SetFrame = 0,1 SetX = 0,8 diff --git a/PBS/Animations/Converted/Move/ACIDSPRAY.txt b/PBS/Animations/Example anims/Move/ACIDSPRAY.txt similarity index 91% rename from PBS/Animations/Converted/Move/ACIDSPRAY.txt rename to PBS/Animations/Example anims/Move/ACIDSPRAY.txt index f5d777d7f..f89b927b6 100644 --- a/PBS/Animations/Converted/Move/ACIDSPRAY.txt +++ b/PBS/Animations/Example anims/Move/ACIDSPRAY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ACIDSPRAY] -Name = ACIDSPRAY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ACIDSPRAY SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 0,-43 SetY = 0,-88 @@ -35,7 +35,7 @@ Name = ACIDSPRAY SetZoomX = 8,79 SetZoomY = 8,79 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 1,-18 SetY = 1,-88 @@ -59,7 +59,7 @@ Name = ACIDSPRAY SetZoomX = 8,79 SetZoomY = 8,79 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 1,10 SetY = 1,-79 @@ -72,7 +72,7 @@ Name = ACIDSPRAY SetY = 4,-33 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 2,34 SetY = 2,-87 @@ -97,7 +97,7 @@ Name = ACIDSPRAY SetZoomX = 8,79 SetZoomY = 8,79 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 2,57 SetY = 2,-84 @@ -121,7 +121,7 @@ Name = ACIDSPRAY SetZoomX = 8,79 SetZoomY = 8,79 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 5,1 SetX = 5,-23 @@ -132,7 +132,7 @@ Name = ACIDSPRAY SetAngle = 5,180 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 6,1 SetX = 6,-2 diff --git a/PBS/Animations/Converted/Move/ACROBATICS.txt b/PBS/Animations/Example anims/Move/ACROBATICS.txt similarity index 89% rename from PBS/Animations/Converted/Move/ACROBATICS.txt rename to PBS/Animations/Example anims/Move/ACROBATICS.txt index 485c09332..2c336a885 100644 --- a/PBS/Animations/Converted/Move/ACROBATICS.txt +++ b/PBS/Animations/Example anims/Move/ACROBATICS.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ACROBATICS] -Name = ACROBATICS +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ACROBATICS SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 2,12 SetX = 2,-8 @@ -26,7 +26,7 @@ Name = ACROBATICS SetZoomX = 6,84 SetZoomY = 6,84 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 0,13 SetX = 0,8 diff --git a/PBS/Animations/Converted/Move/ACUPRESSURE.txt b/PBS/Animations/Example anims/Move/ACUPRESSURE.txt similarity index 84% rename from PBS/Animations/Converted/Move/ACUPRESSURE.txt rename to PBS/Animations/Example anims/Move/ACUPRESSURE.txt index bc39fae0c..3b66c323e 100644 --- a/PBS/Animations/Converted/Move/ACUPRESSURE.txt +++ b/PBS/Animations/Example anims/Move/ACUPRESSURE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ACUPRESSURE] -Name = ACUPRESSURE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ACUPRESSURE SetX = 0,0 SetY = 0,0 - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 0,13 SetX = 0,15 @@ -31,7 +31,7 @@ Name = ACUPRESSURE SetY = 8,-4 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 4,14 SetX = 4,1 @@ -45,7 +45,7 @@ Name = ACUPRESSURE SetY = 8,-16 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 5,15 SetX = 5,-17 @@ -60,7 +60,7 @@ Name = ACUPRESSURE SetY = 8,20 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 6,15 SetX = 6,43 @@ -74,7 +74,7 @@ Name = ACUPRESSURE SetY = 8,25 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 7,15 SetX = 7,44 @@ -83,7 +83,7 @@ Name = ACUPRESSURE SetY = 8,-6 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 8,15 SetX = 8,46 @@ -91,7 +91,7 @@ Name = ACUPRESSURE SetZ = 8,32 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 8,14 SetX = 8,61 @@ -99,7 +99,7 @@ Name = ACUPRESSURE SetZ = 8,33 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 8,15 SetX = 8,-16 @@ -107,7 +107,7 @@ Name = ACUPRESSURE SetZ = 8,34 SetVisible = 9,false - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 8,14 SetX = 8,11 diff --git a/PBS/Animations/Converted/Move/AERIALACE.txt b/PBS/Animations/Example anims/Move/AERIALACE.txt similarity index 91% rename from PBS/Animations/Converted/Move/AERIALACE.txt rename to PBS/Animations/Example anims/Move/AERIALACE.txt index 61e509071..c09af01f3 100644 --- a/PBS/Animations/Converted/Move/AERIALACE.txt +++ b/PBS/Animations/Example anims/Move/AERIALACE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,AERIALACE] -Name = AERIALACE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -13,7 +13,7 @@ Name = AERIALACE SetX = 0,0 SetY = 0,0 - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetX = 0,84 SetY = 0,-50 @@ -30,7 +30,7 @@ Name = AERIALACE SetOpacity = 3,85 SetVisible = 4,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetX = 1,58 SetY = 1,-25 @@ -49,7 +49,7 @@ Name = AERIALACE SetOpacity = 4,85 SetVisible = 5,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetX = 2,27 SetY = 2,2 @@ -70,7 +70,7 @@ Name = AERIALACE SetY = 5,6 SetVisible = 6,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 3,1 SetX = 3,-13 @@ -78,7 +78,7 @@ Name = AERIALACE SetZ = 3,30 SetVisible = 4,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 4,1 SetX = 4,-53 @@ -135,7 +135,7 @@ Name = AERIALACE SetY = 7,6 SetVisible = 8,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 6,6 SetX = 6,-3 @@ -155,7 +155,7 @@ Name = AERIALACE SetX = 11,106 SetY = 11,-90 - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 6,6 SetX = 6,9 @@ -175,7 +175,7 @@ Name = AERIALACE SetY = 11,-99 SetOpacity = 11,128 - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 6,6 SetX = 6,26 @@ -194,7 +194,7 @@ Name = AERIALACE SetY = 10,-37 SetVisible = 11,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 6,6 SetX = 6,24 @@ -210,7 +210,7 @@ Name = AERIALACE SetY = 9,-58 SetVisible = 10,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 6,6 SetX = 6,-21 @@ -226,7 +226,7 @@ Name = AERIALACE SetY = 9,-64 SetVisible = 10,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 7,6 SetX = 7,35 @@ -242,7 +242,7 @@ Name = AERIALACE SetY = 11,-89 SetOpacity = 11,128 - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 7,6 SetX = 7,48 @@ -254,7 +254,7 @@ Name = AERIALACE SetY = 9,-34 SetVisible = 10,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = Target SetFrame = 8,6 SetX = 8,95 @@ -271,7 +271,7 @@ Name = AERIALACE Play = 0,Ace,80 #------------------------------- [OppMove,AERIALACE] -Name = AERIALACE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -283,7 +283,7 @@ Name = AERIALACE SetOpacity = 3,0 SetOpacity = 5,255 - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = User SetX = 0,101 SetY = 0,-56 @@ -334,7 +334,7 @@ Name = AERIALACE SetY = 5,38 SetVisible = 6,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = User SetFrame = 5,7 SetX = 5,54 @@ -357,7 +357,7 @@ Name = AERIALACE SetY = 11,-85 SetOpacity = 11,85 - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = User SetFrame = 5,7 SetX = 5,30 @@ -378,7 +378,7 @@ Name = AERIALACE SetOpacity = 10,170 SetVisible = 11,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = User SetFrame = 5,7 SetX = 5,-3 @@ -400,7 +400,7 @@ Name = AERIALACE SetOpacity = 10,85 SetVisible = 11,false - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = User SetFrame = 5,7 SetX = 5,-27 @@ -423,7 +423,7 @@ Name = AERIALACE SetY = 11,22 SetOpacity = 11,85 - Graphic = Aerial Ace + Graphic = Examples/Aerial Ace Focus = User SetFrame = 5,7 SetX = 5,19 diff --git a/PBS/Animations/Converted/Move/AGILITY.txt b/PBS/Animations/Example anims/Move/AGILITY.txt similarity index 91% rename from PBS/Animations/Converted/Move/AGILITY.txt rename to PBS/Animations/Example anims/Move/AGILITY.txt index 631b98e03..a84b0b1e5 100644 --- a/PBS/Animations/Converted/Move/AGILITY.txt +++ b/PBS/Animations/Example anims/Move/AGILITY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,AGILITY] -Name = AGILITY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = AGILITY SetX = 0,0 SetY = 0,0 - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 0,5 SetX = 0,-98 @@ -26,7 +26,7 @@ Name = AGILITY SetX = 8,107 SetX = 9,132 - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 0,5 SetX = 0,-53 @@ -42,7 +42,7 @@ Name = AGILITY SetX = 7,187 SetVisible = 8,false - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 1,5 SetX = 1,-88 @@ -58,7 +58,7 @@ Name = AGILITY SetX = 8,87 SetX = 9,112 - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 2,5 SetX = 2,-98 @@ -73,7 +73,7 @@ Name = AGILITY SetX = 8,112 SetX = 9,147 - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 0,5 SetX = 0,-76 diff --git a/PBS/Animations/Converted/Move/ALLYSWITCH.txt b/PBS/Animations/Example anims/Move/ALLYSWITCH.txt similarity index 94% rename from PBS/Animations/Converted/Move/ALLYSWITCH.txt rename to PBS/Animations/Example anims/Move/ALLYSWITCH.txt index ae6dd00da..8cc0e053f 100644 --- a/PBS/Animations/Converted/Move/ALLYSWITCH.txt +++ b/PBS/Animations/Example anims/Move/ALLYSWITCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ALLYSWITCH] -Name = ALLYSWITCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ALLYSWITCH SetX = 0,0 SetY = 0,0 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = User SetFrame = 0,10 SetX = 0,9 diff --git a/PBS/Animations/Converted/Move/AMNESIA.txt b/PBS/Animations/Example anims/Move/AMNESIA.txt similarity index 89% rename from PBS/Animations/Converted/Move/AMNESIA.txt rename to PBS/Animations/Example anims/Move/AMNESIA.txt index 7d8f13d14..8e1185c09 100644 --- a/PBS/Animations/Converted/Move/AMNESIA.txt +++ b/PBS/Animations/Example anims/Move/AMNESIA.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,AMNESIA] -Name = AMNESIA +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = AMNESIA SetX = 0,0 SetY = 0,0 - Graphic = mixed + Graphic = Examples/mixed Focus = Target SetFrame = 0,3 SetX = 0,44 diff --git a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt b/PBS/Animations/Example anims/Move/ANCIENTPOWER.txt similarity index 89% rename from PBS/Animations/Converted/Move/ANCIENTPOWER.txt rename to PBS/Animations/Example anims/Move/ANCIENTPOWER.txt index 90eabf91c..5296beb64 100644 --- a/PBS/Animations/Converted/Move/ANCIENTPOWER.txt +++ b/PBS/Animations/Example anims/Move/ANCIENTPOWER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ANCIENTPOWER] -Name = ANCIENTPOWER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ANCIENTPOWER SetX = 0,0 SetY = 0,0 - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 0,10 SetX = 0,-89 @@ -33,7 +33,7 @@ Name = ANCIENTPOWER SetX = 10,-64 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 0,11 SetX = 0,177 @@ -58,7 +58,7 @@ Name = ANCIENTPOWER SetY = 10,-88 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 0,9 SetX = 0,12 @@ -82,7 +82,7 @@ Name = ANCIENTPOWER SetY = 11,-8 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 6,6 SetX = 6,-56 @@ -99,7 +99,7 @@ Name = ANCIENTPOWER SetY = 11,-77 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 6,8 SetX = 6,112 @@ -114,7 +114,7 @@ Name = ANCIENTPOWER SetY = 11,-7 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 6,13 SetX = 6,32 @@ -123,7 +123,7 @@ Name = ANCIENTPOWER SetY = 7,17 SetVisible = 8,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 8,5 SetX = 8,56 @@ -135,7 +135,7 @@ Name = ANCIENTPOWER SetY = 11,-91 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 10,6 SetX = 10,-16 @@ -145,7 +145,7 @@ Name = ANCIENTPOWER SetY = 11,-3 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = User SetFrame = 10,10 SetX = 10,56 @@ -154,7 +154,7 @@ Name = ANCIENTPOWER SetY = 11,24 SetVisible = 12,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,10 SetX = 12,-50 @@ -185,7 +185,7 @@ Name = ANCIENTPOWER SetX = 29,181 SetVisible = 30,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,11 SetX = 12,125 @@ -207,7 +207,7 @@ Name = ANCIENTPOWER SetY = 23,-187 SetVisible = 24,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,9 SetX = 12,31 @@ -235,7 +235,7 @@ Name = ANCIENTPOWER SetY = 26,-137 SetVisible = 27,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,6 SetX = 12,-6 @@ -266,7 +266,7 @@ Name = ANCIENTPOWER SetY = 28,-182 SetVisible = 29,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,8 SetX = 12,100 @@ -290,7 +290,7 @@ Name = ANCIENTPOWER SetY = 24,-135 SetVisible = 25,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,6 SetX = 12,-25 @@ -323,7 +323,7 @@ Name = ANCIENTPOWER SetY = 30,-175 SetVisible = 31,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,5 SetX = 12,81 @@ -349,7 +349,7 @@ Name = ANCIENTPOWER SetY = 25,-218 SetVisible = 26,false - Graphic = Ancient-PowerFilesheet + Graphic = Examples/Ancient-PowerFilesheet Focus = UserAndTarget SetFrame = 12,10 SetX = 12,18 diff --git a/PBS/Animations/Converted/Move/AQUARING.txt b/PBS/Animations/Example anims/Move/AQUARING.txt similarity index 87% rename from PBS/Animations/Converted/Move/AQUARING.txt rename to PBS/Animations/Example anims/Move/AQUARING.txt index df97bc137..0f205f408 100644 --- a/PBS/Animations/Converted/Move/AQUARING.txt +++ b/PBS/Animations/Example anims/Move/AQUARING.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,AQUARING] -Name = AQUARING +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = AQUARING SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetX = 2,203 SetY = 2,-181 @@ -23,7 +23,7 @@ Name = AQUARING SetX = 5,197 SetY = 5,-204 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetX = 3,209 SetY = 3,-176 @@ -34,7 +34,7 @@ Name = AQUARING SetX = 5,201 SetY = 5,-206 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 4,5 SetX = 4,196 @@ -42,14 +42,14 @@ Name = AQUARING SetZ = 4,30 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetX = 4,201 SetY = 4,-187 SetZ = 4,31 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetX = 0,207 SetY = 0,-185 diff --git a/PBS/Animations/Converted/Move/AROMATHERAPY.txt b/PBS/Animations/Example anims/Move/AROMATHERAPY.txt similarity index 90% rename from PBS/Animations/Converted/Move/AROMATHERAPY.txt rename to PBS/Animations/Example anims/Move/AROMATHERAPY.txt index 471d3515e..55904b151 100644 --- a/PBS/Animations/Converted/Move/AROMATHERAPY.txt +++ b/PBS/Animations/Example anims/Move/AROMATHERAPY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,AROMATHERAPY] -Name = AROMATHERAPY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = AROMATHERAPY SetX = 0,0 SetY = 0,0 - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetX = 0,608 SetY = 0,-50 @@ -36,7 +36,7 @@ Name = AROMATHERAPY SetX = 9,248 SetY = 9,174 - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 1,1 SetX = 1,664 @@ -63,7 +63,7 @@ Name = AROMATHERAPY SetX = 9,112 SetY = 9,142 - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 2,2 SetX = 2,584 @@ -86,7 +86,7 @@ Name = AROMATHERAPY SetY = 8,86 SetVisible = 9,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 2,3 SetX = 2,464 @@ -106,7 +106,7 @@ Name = AROMATHERAPY SetY = 7,198 SetVisible = 8,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetX = 3,672 SetY = 3,46 @@ -124,7 +124,7 @@ Name = AROMATHERAPY SetY = 7,62 SetVisible = 8,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 3,2 SetX = 3,664 @@ -143,7 +143,7 @@ Name = AROMATHERAPY SetY = 7,30 SetVisible = 8,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 3,3 SetX = 3,640 @@ -158,7 +158,7 @@ Name = AROMATHERAPY SetX = 6,128 SetVisible = 7,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 4,1 SetX = 4,336 @@ -172,7 +172,7 @@ Name = AROMATHERAPY SetY = 6,118 SetVisible = 7,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 5,1 SetX = 5,680 @@ -183,7 +183,7 @@ Name = AROMATHERAPY SetY = 6,6 SetVisible = 7,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Foreground SetFrame = 5,2 SetX = 5,552 diff --git a/PBS/Animations/Converted/Move/AURORABEAM.txt b/PBS/Animations/Example anims/Move/AURORABEAM.txt similarity index 89% rename from PBS/Animations/Converted/Move/AURORABEAM.txt rename to PBS/Animations/Example anims/Move/AURORABEAM.txt index dc264af82..93ca837cf 100644 --- a/PBS/Animations/Converted/Move/AURORABEAM.txt +++ b/PBS/Animations/Example anims/Move/AURORABEAM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,AURORABEAM] -Name = AURORABEAM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = AURORABEAM SetX = 0,0 SetY = 0,0 - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 0,1 SetX = 0,0 @@ -33,7 +33,7 @@ Name = AURORABEAM SetZoomY = 4,100 SetVisible = 6,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 1,3 SetX = 1,-26 @@ -59,7 +59,7 @@ Name = AURORABEAM SetZoomY = 5,200 SetVisible = 6,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 1,1 SetX = 1,0 @@ -81,7 +81,7 @@ Name = AURORABEAM SetY = 5,-114 SetVisible = 6,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 2,1 SetX = 2,0 @@ -98,7 +98,7 @@ Name = AURORABEAM SetY = 5,-120 SetVisible = 6,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 2,3 SetX = 2,-64 @@ -117,7 +117,7 @@ Name = AURORABEAM SetY = 5,-51 SetVisible = 6,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 2,5 SetX = 2,217 @@ -134,7 +134,7 @@ Name = AURORABEAM SetX = 5,128 SetVisible = 6,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 2,3 SetX = 2,185 @@ -149,7 +149,7 @@ Name = AURORABEAM SetY = 4,-51 SetVisible = 5,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 3,2 SetX = 3,-13 @@ -162,7 +162,7 @@ Name = AURORABEAM SetY = 4,-171 SetVisible = 5,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 3,3 SetX = 3,198 @@ -174,7 +174,7 @@ Name = AURORABEAM SetY = 4,-171 SetVisible = 5,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 3,4 SetX = 3,134 @@ -186,7 +186,7 @@ Name = AURORABEAM SetX = 4,172 SetVisible = 5,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = User SetFrame = 4,5 SetX = 4,211 @@ -196,7 +196,7 @@ Name = AURORABEAM SetZoomY = 4,50 SetVisible = 5,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = UserAndTarget SetFrame = 6,4 SetX = 6,0 @@ -228,7 +228,7 @@ Name = AURORABEAM SetZoomY = 15,100 SetOpacity = 15,50 - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = UserAndTarget SetFrame = 6,1 SetX = 6,0 @@ -248,7 +248,7 @@ Name = AURORABEAM SetY = 12,-178 SetVisible = 13,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = UserAndTarget SetFrame = 7,2 SetX = 7,50 @@ -269,7 +269,7 @@ Name = AURORABEAM SetY = 11,-178 SetVisible = 12,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = UserAndTarget SetFrame = 8,1 SetX = 8,54 @@ -282,7 +282,7 @@ Name = AURORABEAM SetY = 10,-178 SetVisible = 11,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = UserAndTarget SetFrame = 8,2 SetX = 8,125 @@ -297,7 +297,7 @@ Name = AURORABEAM SetZoomY = 9,100 SetVisible = 10,false - Graphic = 023-Burst01 + Graphic = Examples/023-Burst01 Focus = UserAndTarget SetFrame = 9,3 SetX = 9,184 diff --git a/PBS/Animations/Converted/Move/BARRIER.txt b/PBS/Animations/Example anims/Move/BARRIER.txt similarity index 92% rename from PBS/Animations/Converted/Move/BARRIER.txt rename to PBS/Animations/Example anims/Move/BARRIER.txt index a7d679125..c762f5d0c 100644 --- a/PBS/Animations/Converted/Move/BARRIER.txt +++ b/PBS/Animations/Example anims/Move/BARRIER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BARRIER] -Name = BARRIER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BARRIER SetX = 0,0 SetY = 0,0 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 1,7 SetX = 1,-28 @@ -38,7 +38,7 @@ Name = BARRIER SetFrame = 9,7 SetX = 9,-17 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 0,15 SetX = 0,8 diff --git a/PBS/Animations/Converted/Move/BEATUP.txt b/PBS/Animations/Example anims/Move/BEATUP.txt similarity index 90% rename from PBS/Animations/Converted/Move/BEATUP.txt rename to PBS/Animations/Example anims/Move/BEATUP.txt index f520ecfcd..3bcb691e7 100644 --- a/PBS/Animations/Converted/Move/BEATUP.txt +++ b/PBS/Animations/Example anims/Move/BEATUP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BEATUP] -Name = BEATUP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BEATUP SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,17 SetX = 0,0 @@ -25,7 +25,7 @@ Name = BEATUP SetZoomY = 3,125 SetOpacity = 3,100 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 1,20 SetX = 1,8 @@ -42,7 +42,7 @@ Name = BEATUP Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,1] -Name = Beat Up hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -50,7 +50,7 @@ Name = Beat Up hit 2 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 1,20 SetX = 1,8 @@ -64,7 +64,7 @@ Name = Beat Up hit 2 SetZoomY = 3,125 SetOpacity = 3,50 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,17 SetX = 0,0 @@ -83,7 +83,7 @@ Name = Beat Up hit 2 Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,2] -Name = Beat Up hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -91,7 +91,7 @@ Name = Beat Up hit 3 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,17 SetX = 0,0 @@ -107,7 +107,7 @@ Name = Beat Up hit 3 SetZoomY = 3,125 SetOpacity = 3,100 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 1,20 SetX = 1,8 @@ -124,7 +124,7 @@ Name = Beat Up hit 3 Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,3] -Name = Beat Up hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -132,7 +132,7 @@ Name = Beat Up hit 4 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 1,20 SetX = 1,8 @@ -146,7 +146,7 @@ Name = Beat Up hit 4 SetZoomY = 3,125 SetOpacity = 3,50 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,17 SetX = 0,0 @@ -165,7 +165,7 @@ Name = Beat Up hit 4 Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,4] -Name = Beat Up hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -173,7 +173,7 @@ Name = Beat Up hit 5 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,17 SetX = 0,0 @@ -189,7 +189,7 @@ Name = Beat Up hit 5 SetZoomY = 3,125 SetOpacity = 3,100 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 1,20 SetX = 1,8 @@ -206,7 +206,7 @@ Name = Beat Up hit 5 Play = 0,Blow4,80 #------------------------------- [Move,BEATUP,5] -Name = Beat Up hit 6 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -214,7 +214,7 @@ Name = Beat Up hit 6 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 1,20 SetX = 1,8 @@ -228,7 +228,7 @@ Name = Beat Up hit 6 SetZoomY = 3,125 SetOpacity = 3,50 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,17 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/BIND.txt b/PBS/Animations/Example anims/Move/BIND.txt similarity index 90% rename from PBS/Animations/Converted/Move/BIND.txt rename to PBS/Animations/Example anims/Move/BIND.txt index 765db1bba..48c4a9bc3 100644 --- a/PBS/Animations/Converted/Move/BIND.txt +++ b/PBS/Animations/Example anims/Move/BIND.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BIND] -Name = BIND +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BIND SetX = 0,0 SetY = 0,0 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetFrame = 0,1 SetX = 0,56 @@ -27,7 +27,7 @@ Name = BIND SetY = 6,6 SetX = 7,96 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetX = 0,-64 SetY = 0,6 diff --git a/PBS/Animations/Converted/Move/BITE.txt b/PBS/Animations/Example anims/Move/BITE.txt similarity index 92% rename from PBS/Animations/Converted/Move/BITE.txt rename to PBS/Animations/Example anims/Move/BITE.txt index dc7498b80..8749acec7 100644 --- a/PBS/Animations/Converted/Move/BITE.txt +++ b/PBS/Animations/Example anims/Move/BITE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BITE] -Name = BITE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BITE SetX = 0,0 SetY = 0,0 - Graphic = Crunch + Graphic = Examples/Crunch Focus = Target SetX = 0,2 SetY = 0,0 diff --git a/PBS/Animations/Converted/Move/BLASTBURN.txt b/PBS/Animations/Example anims/Move/BLASTBURN.txt similarity index 92% rename from PBS/Animations/Converted/Move/BLASTBURN.txt rename to PBS/Animations/Example anims/Move/BLASTBURN.txt index 297578857..2f285a123 100644 --- a/PBS/Animations/Converted/Move/BLASTBURN.txt +++ b/PBS/Animations/Example anims/Move/BLASTBURN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BLASTBURN] -Name = BLASTBURN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BLASTBURN SetX = 0,0 SetY = 0,0 - Graphic = Firebird + Graphic = Examples/Firebird Focus = UserAndTarget SetFrame = 0,5 SetX = 0,0 @@ -36,7 +36,7 @@ Name = BLASTBURN SetZoomY = 5,50 SetVisible = 6,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = UserAndTarget SetFrame = 5,11 SetFlip = 5,true @@ -45,7 +45,7 @@ Name = BLASTBURN SetZ = 5,28 SetVisible = 6,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 6,11 SetX = 6,-26 @@ -86,7 +86,7 @@ Name = BLASTBURN SetX = 16,-26 SetOpacity = 16,100 - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 6,16 SetX = 6,-39 @@ -130,7 +130,7 @@ Name = BLASTBURN SetX = 16,-52 SetOpacity = 16,100 - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 6,12 SetX = 6,-26 @@ -169,7 +169,7 @@ Name = BLASTBURN SetY = 16,14 SetOpacity = 16,100 - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 7,11 SetX = 7,-20 @@ -177,7 +177,7 @@ Name = BLASTBURN SetZ = 7,30 SetVisible = 8,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 9,16 SetX = 9,-58 @@ -203,7 +203,7 @@ Name = BLASTBURN SetOpacity = 14,100 SetVisible = 15,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 9,13 SetX = 9,0 @@ -229,7 +229,7 @@ Name = BLASTBURN SetOpacity = 14,100 SetVisible = 15,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 9,13 SetX = 9,57 @@ -243,7 +243,7 @@ Name = BLASTBURN SetY = 11,-11 SetVisible = 12,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 10,10 SetX = 10,-13 @@ -253,7 +253,7 @@ Name = BLASTBURN SetX = 11,-64 SetVisible = 12,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 10,14 SetX = 10,-45 @@ -261,7 +261,7 @@ Name = BLASTBURN SetZ = 10,34 SetVisible = 11,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 13,19 SetX = 13,12 @@ -273,7 +273,7 @@ Name = BLASTBURN SetOpacity = 14,100 SetVisible = 15,false - Graphic = Firebird + Graphic = Examples/Firebird Focus = Target SetFrame = 13,12 SetX = 13,57 diff --git a/PBS/Animations/Converted/Move/BLOCK.txt b/PBS/Animations/Example anims/Move/BLOCK.txt similarity index 86% rename from PBS/Animations/Converted/Move/BLOCK.txt rename to PBS/Animations/Example anims/Move/BLOCK.txt index 660656ddd..5a1dccd31 100644 --- a/PBS/Animations/Converted/Move/BLOCK.txt +++ b/PBS/Animations/Example anims/Move/BLOCK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BLOCK] -Name = BLOCK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BLOCK SetX = 0,0 SetY = 0,0 - Graphic = block + Graphic = Examples/block Focus = Target SetX = 0,1 SetY = 0,0 diff --git a/PBS/Animations/Converted/Move/BLUEFLARE.txt b/PBS/Animations/Example anims/Move/BLUEFLARE.txt similarity index 87% rename from PBS/Animations/Converted/Move/BLUEFLARE.txt rename to PBS/Animations/Example anims/Move/BLUEFLARE.txt index 338edd8d1..6d5d3df2c 100644 --- a/PBS/Animations/Converted/Move/BLUEFLARE.txt +++ b/PBS/Animations/Example anims/Move/BLUEFLARE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BLUEFLARE] -Name = BLUEFLARE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BLUEFLARE SetX = 0,0 SetY = 0,0 - Graphic = anim sheet.2 + Graphic = Examples/anim sheet.2 Focus = Target SetFrame = 4,13 SetX = 4,6 @@ -22,7 +22,7 @@ Name = BLUEFLARE SetX = 6,8 SetVisible = 7,false - Graphic = anim sheet.2 + Graphic = Examples/anim sheet.2 Focus = Target SetFrame = 8,16 SetX = 8,0 @@ -37,7 +37,7 @@ Name = BLUEFLARE SetX = 11,1 SetY = 11,-4 - Graphic = anim sheet.2 + Graphic = Examples/anim sheet.2 Focus = Target SetFrame = 0,10 SetX = 0,-2 diff --git a/PBS/Animations/Converted/Move/BODYSLAM.txt b/PBS/Animations/Example anims/Move/BODYSLAM.txt similarity index 87% rename from PBS/Animations/Converted/Move/BODYSLAM.txt rename to PBS/Animations/Example anims/Move/BODYSLAM.txt index 6bc6a24e2..1f64daeb8 100644 --- a/PBS/Animations/Converted/Move/BODYSLAM.txt +++ b/PBS/Animations/Example anims/Move/BODYSLAM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BODYSLAM] -Name = BODYSLAM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BODYSLAM SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/BRICKBREAK.txt b/PBS/Animations/Example anims/Move/BRICKBREAK.txt similarity index 93% rename from PBS/Animations/Converted/Move/BRICKBREAK.txt rename to PBS/Animations/Example anims/Move/BRICKBREAK.txt index 7c362e3bb..c7e85ac26 100644 --- a/PBS/Animations/Converted/Move/BRICKBREAK.txt +++ b/PBS/Animations/Example anims/Move/BRICKBREAK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BRICKBREAK] -Name = BRICKBREAK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BRICKBREAK SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,13 SetX = 0,-88 diff --git a/PBS/Animations/Converted/Move/BUBBLE.txt b/PBS/Animations/Example anims/Move/BUBBLE.txt similarity index 92% rename from PBS/Animations/Converted/Move/BUBBLE.txt rename to PBS/Animations/Example anims/Move/BUBBLE.txt index ef912e45a..45e15221f 100644 --- a/PBS/Animations/Converted/Move/BUBBLE.txt +++ b/PBS/Animations/Example anims/Move/BUBBLE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BUBBLE] -Name = BUBBLE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BUBBLE SetX = 0,0 SetY = 0,0 - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 0,13 SetX = 0,0 @@ -45,7 +45,7 @@ Name = BUBBLE SetX = 12,179 SetY = 12,-178 - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 1,13 SetX = 1,4 @@ -79,7 +79,7 @@ Name = BUBBLE SetY = 11,-207 SetVisible = 12,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 1,12 SetX = 1,0 @@ -111,7 +111,7 @@ Name = BUBBLE SetY = 11,-196 SetVisible = 12,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 2,13 SetX = 2,0 @@ -142,7 +142,7 @@ Name = BUBBLE SetOpacity = 11,100 SetVisible = 12,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 3,13 SetX = 3,9 @@ -166,7 +166,7 @@ Name = BUBBLE SetY = 10,-256 SetVisible = 11,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 3,12 SetX = 3,0 @@ -192,7 +192,7 @@ Name = BUBBLE SetOpacity = 10,100 SetVisible = 11,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 4,13 SetX = 4,29 @@ -214,7 +214,7 @@ Name = BUBBLE SetY = 9,-196 SetVisible = 10,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 5,12 SetX = 5,0 @@ -232,7 +232,7 @@ Name = BUBBLE SetY = 9,-148 SetVisible = 10,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 6,13 SetX = 6,25 @@ -248,7 +248,7 @@ Name = BUBBLE SetY = 9,-148 SetVisible = 10,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 6,17 SetX = 6,175 @@ -270,7 +270,7 @@ Name = BUBBLE SetOpacity = 9,100 SetVisible = 10,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 8,17 SetX = 8,179 diff --git a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt b/PBS/Animations/Example anims/Move/BUBBLEBEAM.txt similarity index 93% rename from PBS/Animations/Converted/Move/BUBBLEBEAM.txt rename to PBS/Animations/Example anims/Move/BUBBLEBEAM.txt index c945e1d82..d02455bbd 100644 --- a/PBS/Animations/Converted/Move/BUBBLEBEAM.txt +++ b/PBS/Animations/Example anims/Move/BUBBLEBEAM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BUBBLEBEAM] -Name = BUBBLEBEAM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BUBBLEBEAM SetX = 0,0 SetY = 0,0 - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 0,13 SetX = 0,0 @@ -51,7 +51,7 @@ Name = BUBBLEBEAM SetX = 15,179 SetY = 15,-178 - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 1,13 SetX = 1,9 @@ -91,7 +91,7 @@ Name = BUBBLEBEAM SetY = 14,-196 SetVisible = 15,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 1,12 SetX = 1,50 @@ -130,7 +130,7 @@ Name = BUBBLEBEAM SetAngle = 13,0 SetVisible = 14,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 2,13 SetX = 2,0 @@ -168,7 +168,7 @@ Name = BUBBLEBEAM SetY = 13,-196 SetVisible = 14,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetX = 2,19 SetY = 2,-20 @@ -204,7 +204,7 @@ Name = BUBBLEBEAM SetOpacity = 13,50 SetVisible = 14,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 3,12 SetX = 3,114 @@ -240,7 +240,7 @@ Name = BUBBLEBEAM SetY = 13,-118 SetVisible = 14,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 3,1 SetX = 3,64 @@ -269,7 +269,7 @@ Name = BUBBLEBEAM SetY = 12,-285 SetVisible = 13,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetX = 3,25 SetY = 3,-10 @@ -303,7 +303,7 @@ Name = BUBBLEBEAM SetY = 12,-79 SetVisible = 13,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 4,2 SetX = 4,44 @@ -335,7 +335,7 @@ Name = BUBBLEBEAM SetY = 12,-217 SetVisible = 13,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 4,12 SetX = 4,34 @@ -361,7 +361,7 @@ Name = BUBBLEBEAM SetY = 11,-109 SetVisible = 12,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 4,12 SetX = 4,125 @@ -378,7 +378,7 @@ Name = BUBBLEBEAM SetOpacity = 7,100 SetVisible = 8,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 4,12 SetX = 4,89 @@ -405,7 +405,7 @@ Name = BUBBLEBEAM SetY = 11,-139 SetVisible = 12,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 4,12 SetX = 4,69 @@ -429,7 +429,7 @@ Name = BUBBLEBEAM SetY = 11,0 SetVisible = 12,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetX = 4,125 SetY = 4,-70 @@ -454,7 +454,7 @@ Name = BUBBLEBEAM SetY = 11,-226 SetVisible = 12,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetX = 6,44 SetY = 6,18 @@ -472,7 +472,7 @@ Name = BUBBLEBEAM SetY = 10,-59 SetVisible = 11,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 6,3 SetX = 6,139 @@ -489,7 +489,7 @@ Name = BUBBLEBEAM SetY = 10,-10 SetVisible = 11,false - Graphic = 018-Water01 + Graphic = Examples/018-Water01 Focus = UserAndTarget SetFrame = 9,12 SetX = 9,50 diff --git a/PBS/Animations/Converted/Move/BULKUP.txt b/PBS/Animations/Example anims/Move/BULKUP.txt similarity index 89% rename from PBS/Animations/Converted/Move/BULKUP.txt rename to PBS/Animations/Example anims/Move/BULKUP.txt index ef3fca83a..4027b4b24 100644 --- a/PBS/Animations/Converted/Move/BULKUP.txt +++ b/PBS/Animations/Example anims/Move/BULKUP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BULKUP] -Name = BULKUP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BULKUP SetX = 0,0 SetY = 0,0 - Graphic = animsheet + Graphic = Examples/animsheet Focus = Target SetFrame = 0,15 SetX = 0,80 @@ -24,7 +24,7 @@ Name = BULKUP SetOpacity = 3,50 SetVisible = 4,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = Target SetFrame = 0,15 SetX = 0,-40 @@ -39,7 +39,7 @@ Name = BULKUP SetOpacity = 3,50 SetVisible = 4,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = Target SetFrame = 6,15 SetX = 6,80 @@ -54,7 +54,7 @@ Name = BULKUP SetOpacity = 9,50 SetVisible = 10,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = Target SetFrame = 6,15 SetX = 6,-40 @@ -69,7 +69,7 @@ Name = BULKUP SetOpacity = 9,50 SetVisible = 10,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = Target SetFrame = 12,15 SetX = 12,80 @@ -84,7 +84,7 @@ Name = BULKUP SetOpacity = 15,50 SetVisible = 16,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = Target SetFrame = 12,15 SetX = 12,-40 diff --git a/PBS/Animations/Converted/Move/BULLETPUNCH.txt b/PBS/Animations/Example anims/Move/BULLETPUNCH.txt similarity index 89% rename from PBS/Animations/Converted/Move/BULLETPUNCH.txt rename to PBS/Animations/Example anims/Move/BULLETPUNCH.txt index f27ad61d9..5ac86c488 100644 --- a/PBS/Animations/Converted/Move/BULLETPUNCH.txt +++ b/PBS/Animations/Example anims/Move/BULLETPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BULLETPUNCH] -Name = BULLETPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BULLETPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 0,15 SetX = 0,14 @@ -52,7 +52,7 @@ Name = BULLETPUNCH SetOpacity = 10,44 SetVisible = 11,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 0,2 SetX = 0,2 @@ -96,7 +96,7 @@ Name = BULLETPUNCH SetOpacity = 10,84 SetVisible = 11,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,15 SetX = 2,42 @@ -104,7 +104,7 @@ Name = BULLETPUNCH SetZ = 2,29 SetVisible = 3,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,2 SetX = 2,21 @@ -112,7 +112,7 @@ Name = BULLETPUNCH SetZ = 2,30 SetVisible = 3,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 4,15 SetX = 4,-12 @@ -120,7 +120,7 @@ Name = BULLETPUNCH SetZ = 4,29 SetVisible = 5,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 4,2 SetX = 4,-32 @@ -128,7 +128,7 @@ Name = BULLETPUNCH SetZ = 4,30 SetVisible = 5,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 6,15 SetX = 6,62 @@ -136,7 +136,7 @@ Name = BULLETPUNCH SetZ = 6,29 SetVisible = 7,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 6,2 SetX = 6,43 @@ -144,7 +144,7 @@ Name = BULLETPUNCH SetZ = 6,30 SetVisible = 7,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 8,15 SetX = 8,11 @@ -152,7 +152,7 @@ Name = BULLETPUNCH SetZ = 8,29 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 8,2 SetX = 8,-5 diff --git a/PBS/Animations/Converted/Move/BULLETSEED.txt b/PBS/Animations/Example anims/Move/BULLETSEED.txt similarity index 90% rename from PBS/Animations/Converted/Move/BULLETSEED.txt rename to PBS/Animations/Example anims/Move/BULLETSEED.txt index ad930cdd2..3fb0b6d6b 100644 --- a/PBS/Animations/Converted/Move/BULLETSEED.txt +++ b/PBS/Animations/Example anims/Move/BULLETSEED.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,BULLETSEED] -Name = BULLETSEED +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = BULLETSEED SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 0,25 SetY = 0,-40 @@ -36,7 +36,7 @@ Name = BULLETSEED SetX = 10,175 SetY = 10,-276 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -59,7 +59,7 @@ Name = BULLETSEED SetY = 9,-226 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 2,34 SetY = 2,-40 @@ -76,7 +76,7 @@ Name = BULLETSEED SetY = 8,-178 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 3,34 SetY = 3,-29 @@ -90,7 +90,7 @@ Name = BULLETSEED SetX = 7,144 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 4,39 SetY = 4,-10 @@ -110,7 +110,7 @@ Name = BULLETSEED Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,1] -Name = Bullet Seed hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -118,7 +118,7 @@ Name = Bullet Seed hit 2 SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 4,39 SetY = 4,-10 @@ -129,7 +129,7 @@ Name = Bullet Seed hit 2 SetY = 6,-98 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 0,25 SetY = 0,-40 @@ -156,7 +156,7 @@ Name = Bullet Seed hit 2 SetX = 10,175 SetY = 10,-276 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -179,7 +179,7 @@ Name = Bullet Seed hit 2 SetY = 9,-226 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 2,34 SetY = 2,-40 @@ -196,7 +196,7 @@ Name = Bullet Seed hit 2 SetY = 8,-178 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 3,34 SetY = 3,-29 @@ -219,7 +219,7 @@ Name = Bullet Seed hit 2 Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,2] -Name = Bullet Seed hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -227,7 +227,7 @@ Name = Bullet Seed hit 3 SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 3,34 SetY = 3,-29 @@ -241,7 +241,7 @@ Name = Bullet Seed hit 3 SetX = 7,144 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 4,39 SetY = 4,-10 @@ -252,7 +252,7 @@ Name = Bullet Seed hit 3 SetY = 6,-98 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 0,25 SetY = 0,-40 @@ -279,7 +279,7 @@ Name = Bullet Seed hit 3 SetX = 10,175 SetY = 10,-276 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -302,7 +302,7 @@ Name = Bullet Seed hit 3 SetY = 9,-226 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 2,34 SetY = 2,-40 @@ -328,7 +328,7 @@ Name = Bullet Seed hit 3 Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,3] -Name = Bullet Seed hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -336,7 +336,7 @@ Name = Bullet Seed hit 4 SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 2,34 SetY = 2,-40 @@ -353,7 +353,7 @@ Name = Bullet Seed hit 4 SetY = 8,-178 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 3,34 SetY = 3,-29 @@ -367,7 +367,7 @@ Name = Bullet Seed hit 4 SetX = 7,144 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 4,39 SetY = 4,-10 @@ -378,7 +378,7 @@ Name = Bullet Seed hit 4 SetY = 6,-98 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 0,25 SetY = 0,-40 @@ -405,7 +405,7 @@ Name = Bullet Seed hit 4 SetX = 10,175 SetY = 10,-276 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -437,7 +437,7 @@ Name = Bullet Seed hit 4 Play = 9,Knock,80 #------------------------------- [Move,BULLETSEED,4] -Name = Bullet Seed hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -445,7 +445,7 @@ Name = Bullet Seed hit 5 SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -468,7 +468,7 @@ Name = Bullet Seed hit 5 SetY = 9,-226 SetVisible = 10,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 2,34 SetY = 2,-40 @@ -485,7 +485,7 @@ Name = Bullet Seed hit 5 SetY = 8,-178 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 3,34 SetY = 3,-29 @@ -499,7 +499,7 @@ Name = Bullet Seed hit 5 SetX = 7,144 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 4,39 SetY = 4,-10 @@ -510,7 +510,7 @@ Name = Bullet Seed hit 5 SetY = 6,-98 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 0,25 SetY = 0,-40 diff --git a/PBS/Animations/Converted/Move/CHARGE.txt b/PBS/Animations/Example anims/Move/CHARGE.txt similarity index 91% rename from PBS/Animations/Converted/Move/CHARGE.txt rename to PBS/Animations/Example anims/Move/CHARGE.txt index d994488ae..939970935 100644 --- a/PBS/Animations/Converted/Move/CHARGE.txt +++ b/PBS/Animations/Example anims/Move/CHARGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CHARGE] -Name = CHARGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CHARGE SetX = 0,0 SetY = 0,0 - Graphic = electric2 + Graphic = Examples/electric2 Focus = User SetX = 0,200 SetY = 0,14 @@ -41,7 +41,7 @@ Name = CHARGE SetFrame = 11,6 SetOpacity = 11,100 - Graphic = electric2 + Graphic = Examples/electric2 Focus = User SetFrame = 1,3 SetX = 1,-160 @@ -73,7 +73,7 @@ Name = CHARGE SetX = 11,104 SetY = 11,-2 - Graphic = electric2 + Graphic = Examples/electric2 Focus = User SetFrame = 3,4 SetX = 3,200 @@ -95,7 +95,7 @@ Name = CHARGE SetY = 8,-2 SetVisible = 9,false - Graphic = electric2 + Graphic = Examples/electric2 Focus = User SetX = 4,-200 SetY = 4,14 @@ -112,7 +112,7 @@ Name = CHARGE SetY = 8,-50 SetVisible = 9,false - Graphic = electric2 + Graphic = Examples/electric2 Focus = User SetX = 5,216 SetY = 5,22 @@ -127,7 +127,7 @@ Name = CHARGE SetY = 8,54 SetVisible = 9,false - Graphic = electric2 + Graphic = Examples/electric2 Focus = User SetFrame = 7,1 SetX = 7,48 @@ -135,7 +135,7 @@ Name = CHARGE SetZ = 7,32 SetVisible = 8,false - Graphic = electric2 + Graphic = Examples/electric2 Focus = User SetFrame = 10,4 SetX = 10,80 diff --git a/PBS/Animations/Converted/Move/CHARM.txt b/PBS/Animations/Example anims/Move/CHARM.txt similarity index 91% rename from PBS/Animations/Converted/Move/CHARM.txt rename to PBS/Animations/Example anims/Move/CHARM.txt index cbcb3cd75..80b417202 100644 --- a/PBS/Animations/Converted/Move/CHARM.txt +++ b/PBS/Animations/Example anims/Move/CHARM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CHARM] -Name = CHARM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CHARM SetX = 0,0 SetY = 0,0 - Graphic = electric2 + Graphic = Examples/electric2 Focus = Target SetFrame = 2,9 SetX = 2,56 @@ -30,7 +30,7 @@ Name = CHARM SetY = 7,-26 SetVisible = 8,false - Graphic = electric2 + Graphic = Examples/electric2 Focus = Target SetFrame = 5,9 SetX = 5,-8 @@ -38,7 +38,7 @@ Name = CHARM SetZ = 5,29 SetVisible = 6,false - Graphic = electric2 + Graphic = Examples/electric2 Focus = Target SetFrame = 0,9 SetX = 0,-48 diff --git a/PBS/Animations/Converted/Move/CLEARSMOG.txt b/PBS/Animations/Example anims/Move/CLEARSMOG.txt similarity index 90% rename from PBS/Animations/Converted/Move/CLEARSMOG.txt rename to PBS/Animations/Example anims/Move/CLEARSMOG.txt index 06460ee9c..53b1c5f9f 100644 --- a/PBS/Animations/Converted/Move/CLEARSMOG.txt +++ b/PBS/Animations/Example anims/Move/CLEARSMOG.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CLEARSMOG] -Name = CLEARSMOG +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CLEARSMOG SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 0,6 SetX = 0,200 diff --git a/PBS/Animations/Converted/Move/CLOSECOMBAT.txt b/PBS/Animations/Example anims/Move/CLOSECOMBAT.txt similarity index 89% rename from PBS/Animations/Converted/Move/CLOSECOMBAT.txt rename to PBS/Animations/Example anims/Move/CLOSECOMBAT.txt index ee2895bfc..a5d4504e6 100644 --- a/PBS/Animations/Converted/Move/CLOSECOMBAT.txt +++ b/PBS/Animations/Example anims/Move/CLOSECOMBAT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CLOSECOMBAT] -Name = CLOSECOMBAT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CLOSECOMBAT SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 1,7 SetX = 1,-23 @@ -53,7 +53,7 @@ Name = CLOSECOMBAT SetX = 13,18 SetY = 13,1 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 1,9 SetX = 1,-52 @@ -91,7 +91,7 @@ Name = CLOSECOMBAT SetX = 13,4 SetY = 13,7 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 1,11 SetX = 1,-31 @@ -121,7 +121,7 @@ Name = CLOSECOMBAT SetY = 8,27 SetVisible = 9,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 2,9 SetX = 2,33 @@ -148,7 +148,7 @@ Name = CLOSECOMBAT SetY = 7,-9 SetVisible = 8,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 2,9 SetX = 2,-5 @@ -172,7 +172,7 @@ Name = CLOSECOMBAT SetY = 7,-2 SetVisible = 8,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 2,11 SetX = 2,16 @@ -190,7 +190,7 @@ Name = CLOSECOMBAT SetY = 5,14 SetVisible = 6,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 3,7 SetX = 3,29 @@ -203,7 +203,7 @@ Name = CLOSECOMBAT SetY = 5,-1 SetVisible = 6,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 3,7 SetX = 3,-7 @@ -216,7 +216,7 @@ Name = CLOSECOMBAT SetY = 5,7 SetVisible = 6,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 3,11 SetX = 3,15 @@ -224,7 +224,7 @@ Name = CLOSECOMBAT SetZ = 3,36 SetVisible = 4,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 4,10 SetX = 4,-1 @@ -257,7 +257,7 @@ Name = CLOSECOMBAT SetX = 13,-12 SetY = 13,20 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 11,7 SetX = 11,-11 @@ -265,7 +265,7 @@ Name = CLOSECOMBAT SetZ = 11,30 SetVisible = 12,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 11,9 SetX = 11,18 @@ -273,7 +273,7 @@ Name = CLOSECOMBAT SetZ = 11,31 SetVisible = 12,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 11,11 SetX = 11,9 @@ -281,21 +281,21 @@ Name = CLOSECOMBAT SetZ = 11,32 SetVisible = 12,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 13,9 SetX = 13,-30 SetY = 13,-27 SetZ = 13,30 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 13,7 SetX = 13,0 SetY = 13,-33 SetZ = 13,31 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 13,11 SetX = 13,-10 diff --git a/PBS/Animations/Converted/Move/COMETPUNCH.txt b/PBS/Animations/Example anims/Move/COMETPUNCH.txt similarity index 88% rename from PBS/Animations/Converted/Move/COMETPUNCH.txt rename to PBS/Animations/Example anims/Move/COMETPUNCH.txt index 59c3d9f5b..9690bf02a 100644 --- a/PBS/Animations/Converted/Move/COMETPUNCH.txt +++ b/PBS/Animations/Example anims/Move/COMETPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,COMETPUNCH] -Name = COMETPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = COMETPUNCH SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 2,48 SetY = 2,-18 @@ -22,7 +22,7 @@ Name = COMETPUNCH SetY = 5,14 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,-32 SetY = 0,6 @@ -45,7 +45,7 @@ Name = COMETPUNCH Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,1] -Name = Comet Punch hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -53,7 +53,7 @@ Name = Comet Punch hit 2 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,-32 SetY = 0,6 @@ -71,7 +71,7 @@ Name = Comet Punch hit 2 SetY = 6,14 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 2,48 SetY = 2,-18 @@ -89,7 +89,7 @@ Name = Comet Punch hit 2 Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,2] -Name = Comet Punch hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -97,7 +97,7 @@ Name = Comet Punch hit 3 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 2,48 SetY = 2,-18 @@ -110,7 +110,7 @@ Name = Comet Punch hit 3 SetY = 5,14 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,-32 SetY = 0,6 @@ -133,7 +133,7 @@ Name = Comet Punch hit 3 Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,3] -Name = Comet Punch hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -141,7 +141,7 @@ Name = Comet Punch hit 4 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,-32 SetY = 0,6 @@ -159,7 +159,7 @@ Name = Comet Punch hit 4 SetY = 6,14 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 2,48 SetY = 2,-18 @@ -177,7 +177,7 @@ Name = Comet Punch hit 4 Play = 5,Blow1,80 #------------------------------- [Move,COMETPUNCH,4] -Name = Comet Punch hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -185,7 +185,7 @@ Name = Comet Punch hit 5 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 2,48 SetY = 2,-18 @@ -198,7 +198,7 @@ Name = Comet Punch hit 5 SetY = 5,14 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,-32 SetY = 0,6 diff --git a/PBS/Animations/Converted/Move/CONFUSERAY.txt b/PBS/Animations/Example anims/Move/CONFUSERAY.txt similarity index 96% rename from PBS/Animations/Converted/Move/CONFUSERAY.txt rename to PBS/Animations/Example anims/Move/CONFUSERAY.txt index 0b626df22..320a13b50 100644 --- a/PBS/Animations/Converted/Move/CONFUSERAY.txt +++ b/PBS/Animations/Example anims/Move/CONFUSERAY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CONFUSERAY] -Name = CONFUSERAY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CONFUSERAY SetX = 0,0 SetY = 0,0 - Graphic = estranho + Graphic = Examples/estranho Focus = UserAndTarget SetFrame = 0,1 SetX = 0,19 diff --git a/PBS/Animations/Converted/Move/COTTONGUARD.txt b/PBS/Animations/Example anims/Move/COTTONGUARD.txt similarity index 87% rename from PBS/Animations/Converted/Move/COTTONGUARD.txt rename to PBS/Animations/Example anims/Move/COTTONGUARD.txt index fce74b8d8..b83e4dd50 100644 --- a/PBS/Animations/Converted/Move/COTTONGUARD.txt +++ b/PBS/Animations/Example anims/Move/COTTONGUARD.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,COTTONGUARD] -Name = COTTONGUARD +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = COTTONGUARD SetX = 0,0 SetY = 0,0 - Graphic = animsheet + Graphic = Examples/animsheet Focus = User SetFrame = 0,15 SetX = 0,-15 @@ -28,7 +28,7 @@ Name = COTTONGUARD SetY = 6,9 SetVisible = 7,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = User SetFrame = 1,15 SetX = 1,28 @@ -46,7 +46,7 @@ Name = COTTONGUARD SetY = 6,-7 SetVisible = 7,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = User SetFrame = 3,15 SetX = 3,5 @@ -60,7 +60,7 @@ Name = COTTONGUARD SetY = 6,28 SetVisible = 7,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = User SetFrame = 3,15 SetX = 3,39 @@ -74,7 +74,7 @@ Name = COTTONGUARD SetY = 6,41 SetVisible = 7,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = User SetFrame = 3,15 SetX = 3,48 @@ -88,7 +88,7 @@ Name = COTTONGUARD SetY = 6,45 SetVisible = 7,false - Graphic = animsheet + Graphic = Examples/animsheet Focus = User SetFrame = 4,15 SetX = 4,1 diff --git a/PBS/Animations/Converted/Move/COTTONSPORE.txt b/PBS/Animations/Example anims/Move/COTTONSPORE.txt similarity index 91% rename from PBS/Animations/Converted/Move/COTTONSPORE.txt rename to PBS/Animations/Example anims/Move/COTTONSPORE.txt index 3e097ad24..2e3717c14 100644 --- a/PBS/Animations/Converted/Move/COTTONSPORE.txt +++ b/PBS/Animations/Example anims/Move/COTTONSPORE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,COTTONSPORE] -Name = COTTONSPORE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = COTTONSPORE SetX = 0,0 SetY = 0,0 - Graphic = Special5 + Graphic = Examples/Special5 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/COUNTER.txt b/PBS/Animations/Example anims/Move/COUNTER.txt similarity index 89% rename from PBS/Animations/Converted/Move/COUNTER.txt rename to PBS/Animations/Example anims/Move/COUNTER.txt index 141dce508..235f96260 100644 --- a/PBS/Animations/Converted/Move/COUNTER.txt +++ b/PBS/Animations/Example anims/Move/COUNTER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,COUNTER] -Name = COUNTER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = COUNTER SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetX = 0,200 SetY = 0,-196 @@ -35,7 +35,7 @@ Name = COUNTER SetY = 5,-187 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetX = 1,202 SetY = 1,-195 @@ -53,7 +53,7 @@ Name = COUNTER SetY = 5,-206 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 1,15 SetX = 1,175 @@ -71,7 +71,7 @@ Name = COUNTER SetY = 5,-267 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 2,15 SetX = 2,212 @@ -86,7 +86,7 @@ Name = COUNTER SetY = 5,-175 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 3,15 SetX = 3,218 @@ -100,7 +100,7 @@ Name = COUNTER SetY = 5,-265 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetX = 3,201 SetY = 3,-196 @@ -113,7 +113,7 @@ Name = COUNTER SetY = 5,-334 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetX = 4,200 SetY = 4,-200 @@ -125,7 +125,7 @@ Name = COUNTER SetZoomY = 5,50 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 5,15 SetX = 5,175 @@ -135,7 +135,7 @@ Name = COUNTER SetZoomY = 5,50 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 5,15 SetX = 5,193 @@ -145,7 +145,7 @@ Name = COUNTER SetZoomY = 5,50 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetX = 5,211 SetY = 5,-206 diff --git a/PBS/Animations/Converted/Move/CRUNCH.txt b/PBS/Animations/Example anims/Move/CRUNCH.txt similarity index 91% rename from PBS/Animations/Converted/Move/CRUNCH.txt rename to PBS/Animations/Example anims/Move/CRUNCH.txt index ee2a77c63..cf94707b6 100644 --- a/PBS/Animations/Converted/Move/CRUNCH.txt +++ b/PBS/Animations/Example anims/Move/CRUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CRUNCH] -Name = CRUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CRUNCH SetX = 0,0 SetY = 0,0 - Graphic = teeth + Graphic = Examples/teeth Focus = Target SetX = 0,12 SetY = 0,1 @@ -50,7 +50,7 @@ Name = CRUNCH SetY = 12,1 SetVisible = 13,false - Graphic = teeth + Graphic = Examples/teeth Focus = Target SetFrame = 7,13 SetX = 7,60 @@ -65,7 +65,7 @@ Name = CRUNCH SetY = 10,32 SetVisible = 11,false - Graphic = teeth + Graphic = Examples/teeth Focus = Target SetFrame = 7,13 SetX = 7,-41 @@ -81,7 +81,7 @@ Name = CRUNCH SetY = 10,20 SetVisible = 11,false - Graphic = teeth + Graphic = Examples/teeth Focus = Target SetFrame = 8,13 SetX = 8,-41 @@ -95,7 +95,7 @@ Name = CRUNCH SetY = 10,45 SetVisible = 11,false - Graphic = teeth + Graphic = Examples/teeth Focus = Target SetFrame = 8,13 SetX = 8,58 @@ -108,7 +108,7 @@ Name = CRUNCH SetY = 10,18 SetVisible = 11,false - Graphic = teeth + Graphic = Examples/teeth Focus = Target SetFrame = 10,14 SetX = 10,-59 diff --git a/PBS/Animations/Converted/Move/CRUSHCLAW.txt b/PBS/Animations/Example anims/Move/CRUSHCLAW.txt similarity index 92% rename from PBS/Animations/Converted/Move/CRUSHCLAW.txt rename to PBS/Animations/Example anims/Move/CRUSHCLAW.txt index b386c9935..948584b47 100644 --- a/PBS/Animations/Converted/Move/CRUSHCLAW.txt +++ b/PBS/Animations/Example anims/Move/CRUSHCLAW.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CRUSHCLAW] -Name = CRUSHCLAW +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CRUSHCLAW SetX = 0,0 SetY = 0,0 - Graphic = dragon claw + Graphic = Examples/dragon claw Focus = Target SetFrame = 0,1 SetX = 0,3 diff --git a/PBS/Animations/Converted/Move/CURSE.txt b/PBS/Animations/Example anims/Move/CURSE.txt similarity index 90% rename from PBS/Animations/Converted/Move/CURSE.txt rename to PBS/Animations/Example anims/Move/CURSE.txt index 2d5f1a19d..71b61f4b0 100644 --- a/PBS/Animations/Converted/Move/CURSE.txt +++ b/PBS/Animations/Example anims/Move/CURSE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CURSE] -Name = CURSE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CURSE SetX = 0,0 SetY = 0,0 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 0,8 SetX = 0,8 diff --git a/PBS/Animations/Converted/Move/CUT.txt b/PBS/Animations/Example anims/Move/CUT.txt similarity index 89% rename from PBS/Animations/Converted/Move/CUT.txt rename to PBS/Animations/Example anims/Move/CUT.txt index 40903b7a5..516e7780e 100644 --- a/PBS/Animations/Converted/Move/CUT.txt +++ b/PBS/Animations/Example anims/Move/CUT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,CUT] -Name = CUT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = CUT SetX = 0,0 SetY = 0,0 - Graphic = 004-Attack02 + Graphic = Examples/004-Attack02 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/DEFENSECURL.txt b/PBS/Animations/Example anims/Move/DEFENSECURL.txt similarity index 92% rename from PBS/Animations/Converted/Move/DEFENSECURL.txt rename to PBS/Animations/Example anims/Move/DEFENSECURL.txt index 321a33cfd..35b6d589e 100644 --- a/PBS/Animations/Converted/Move/DEFENSECURL.txt +++ b/PBS/Animations/Example anims/Move/DEFENSECURL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DEFENSECURL] -Name = DEFENSECURL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DEFENSECURL SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = User SetFrame = 0,5 SetX = 0,5 diff --git a/PBS/Animations/Converted/Move/DETECT.txt b/PBS/Animations/Example anims/Move/DETECT.txt similarity index 91% rename from PBS/Animations/Converted/Move/DETECT.txt rename to PBS/Animations/Example anims/Move/DETECT.txt index bc3fbae2b..2e41ba394 100644 --- a/PBS/Animations/Converted/Move/DETECT.txt +++ b/PBS/Animations/Example anims/Move/DETECT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DETECT] -Name = DETECT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DETECT SetX = 0,0 SetY = 0,0 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 0,8 SetX = 0,229 diff --git a/PBS/Animations/Converted/Move/DISABLE.txt b/PBS/Animations/Example anims/Move/DISABLE.txt similarity index 85% rename from PBS/Animations/Converted/Move/DISABLE.txt rename to PBS/Animations/Example anims/Move/DISABLE.txt index 9cbf71799..dc8c86dc2 100644 --- a/PBS/Animations/Converted/Move/DISABLE.txt +++ b/PBS/Animations/Example anims/Move/DISABLE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DISABLE] -Name = DISABLE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DISABLE SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 4,8 SetX = 4,200 @@ -17,14 +17,14 @@ Name = DISABLE SetZ = 4,28 SetAngle = 4,45 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 6,7 SetX = 6,203 SetY = 6,-200 SetZ = 6,29 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 0,10 SetX = 0,200 diff --git a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt b/PBS/Animations/Example anims/Move/DIZZYPUNCH.txt similarity index 86% rename from PBS/Animations/Converted/Move/DIZZYPUNCH.txt rename to PBS/Animations/Example anims/Move/DIZZYPUNCH.txt index b816e88f8..a39c73069 100644 --- a/PBS/Animations/Converted/Move/DIZZYPUNCH.txt +++ b/PBS/Animations/Example anims/Move/DIZZYPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DIZZYPUNCH] -Name = DIZZYPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DIZZYPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 0,1 SetX = 0,0 @@ -41,7 +41,7 @@ Name = DIZZYPUNCH SetX = 17,0 SetY = 17,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 1,1 SetX = 1,4 @@ -61,7 +61,7 @@ Name = DIZZYPUNCH SetY = 8,15 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,11 SetX = 2,63 @@ -79,7 +79,7 @@ Name = DIZZYPUNCH SetY = 8,43 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,11 SetX = 2,87 @@ -97,7 +97,7 @@ Name = DIZZYPUNCH SetY = 8,16 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 3,11 SetX = 3,-38 @@ -107,7 +107,7 @@ Name = DIZZYPUNCH SetY = 4,-36 SetVisible = 5,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 3,11 SetX = 3,-68 @@ -115,7 +115,7 @@ Name = DIZZYPUNCH SetZ = 3,32 SetVisible = 4,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 5,11 SetX = 5,-7 @@ -123,7 +123,7 @@ Name = DIZZYPUNCH SetZ = 5,32 SetVisible = 6,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 6,11 SetX = 6,48 @@ -135,7 +135,7 @@ Name = DIZZYPUNCH SetY = 8,33 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,11 SetX = 7,-28 @@ -145,7 +145,7 @@ Name = DIZZYPUNCH SetY = 8,-38 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,11 SetX = 7,42 @@ -155,7 +155,7 @@ Name = DIZZYPUNCH SetY = 8,-60 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 8,11 SetX = 8,43 @@ -163,7 +163,7 @@ Name = DIZZYPUNCH SetZ = 8,34 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 8,11 SetX = 8,63 @@ -171,7 +171,7 @@ Name = DIZZYPUNCH SetZ = 8,35 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 10,1 SetX = 10,4 @@ -190,7 +190,7 @@ Name = DIZZYPUNCH SetX = 17,23 SetY = 17,15 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 11,11 SetX = 11,63 @@ -207,7 +207,7 @@ Name = DIZZYPUNCH SetX = 17,38 SetY = 17,43 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 11,11 SetX = 11,87 @@ -224,7 +224,7 @@ Name = DIZZYPUNCH SetX = 17,-27 SetY = 17,16 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 12,11 SetX = 12,-38 @@ -234,7 +234,7 @@ Name = DIZZYPUNCH SetY = 13,-36 SetVisible = 14,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 12,11 SetX = 12,-68 @@ -242,7 +242,7 @@ Name = DIZZYPUNCH SetZ = 12,32 SetVisible = 13,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 14,11 SetX = 14,-7 @@ -250,7 +250,7 @@ Name = DIZZYPUNCH SetZ = 14,32 SetVisible = 15,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 15,11 SetX = 15,48 @@ -261,7 +261,7 @@ Name = DIZZYPUNCH SetX = 17,-48 SetY = 17,33 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 16,11 SetX = 16,-28 @@ -270,7 +270,7 @@ Name = DIZZYPUNCH SetX = 17,-7 SetY = 17,-38 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 16,11 SetX = 16,42 @@ -279,14 +279,14 @@ Name = DIZZYPUNCH SetX = 17,-23 SetY = 17,-60 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 17,11 SetX = 17,43 SetY = 17,-22 SetZ = 17,34 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 17,11 SetX = 17,63 diff --git a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt b/PBS/Animations/Example anims/Move/DOUBLEEDGE.txt similarity index 84% rename from PBS/Animations/Converted/Move/DOUBLEEDGE.txt rename to PBS/Animations/Example anims/Move/DOUBLEEDGE.txt index a0d191049..87679917e 100644 --- a/PBS/Animations/Converted/Move/DOUBLEEDGE.txt +++ b/PBS/Animations/Example anims/Move/DOUBLEEDGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DOUBLEEDGE] -Name = DOUBLEEDGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DOUBLEEDGE SetX = 0,0 SetY = 0,0 - Graphic = Divine_Smash + Graphic = Examples/Divine_Smash Focus = User SetFrame = 1,11 SetX = 1,70 @@ -20,7 +20,7 @@ Name = DOUBLEEDGE SetY = 3,-57 SetVisible = 4,false - Graphic = Divine_Smash + Graphic = Examples/Divine_Smash Focus = User SetFrame = 2,11 SetX = 2,-32 @@ -28,7 +28,7 @@ Name = DOUBLEEDGE SetZ = 2,29 SetVisible = 3,false - Graphic = Divine_Smash + Graphic = Examples/Divine_Smash Focus = Target SetFrame = 5,14 SetX = 5,-26 @@ -41,7 +41,7 @@ Name = DOUBLEEDGE SetX = 10,-32 SetAngle = 10,90 - Graphic = Divine_Smash + Graphic = Examples/Divine_Smash Focus = Target SetFrame = 8,4 SetX = 8,-26 @@ -49,7 +49,7 @@ Name = DOUBLEEDGE SetZ = 8,28 SetVisible = 9,false - Graphic = Divine_Smash + Graphic = Examples/Divine_Smash Focus = User SetFrame = 0,11 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/DOUBLEKICK.txt b/PBS/Animations/Example anims/Move/DOUBLEKICK.txt similarity index 89% rename from PBS/Animations/Converted/Move/DOUBLEKICK.txt rename to PBS/Animations/Example anims/Move/DOUBLEKICK.txt index 77d6fa51b..9d1d62120 100644 --- a/PBS/Animations/Converted/Move/DOUBLEKICK.txt +++ b/PBS/Animations/Example anims/Move/DOUBLEKICK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DOUBLEKICK] -Name = DOUBLEKICK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DOUBLEKICK SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,7 SetX = 0,-48 @@ -25,7 +25,7 @@ Name = DOUBLEKICK SetY = 3,-18 SetOpacity = 5,100 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 2,7 SetX = 2,56 @@ -40,7 +40,7 @@ Name = DOUBLEKICK Play = 3,Blow3,80 #------------------------------- [Move,DOUBLEKICK,1] -Name = Double Kick hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -48,7 +48,7 @@ Name = Double Kick hit 2 SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 2,7 SetX = 2,56 @@ -59,7 +59,7 @@ Name = Double Kick hit 2 SetOpacity = 2,100 SetVisible = 3,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,7 SetX = 0,-48 diff --git a/PBS/Animations/Converted/Move/DOUBLESLAP.txt b/PBS/Animations/Example anims/Move/DOUBLESLAP.txt similarity index 87% rename from PBS/Animations/Converted/Move/DOUBLESLAP.txt rename to PBS/Animations/Example anims/Move/DOUBLESLAP.txt index c526fa808..3d56a50ee 100644 --- a/PBS/Animations/Converted/Move/DOUBLESLAP.txt +++ b/PBS/Animations/Example anims/Move/DOUBLESLAP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DOUBLESLAP] -Name = DOUBLESLAP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DOUBLESLAP SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 7,20 SetX = 7,0 @@ -17,7 +17,7 @@ Name = DOUBLESLAP SetZ = 7,28 SetVisible = 8,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,15 SetX = 0,136 @@ -34,7 +34,7 @@ Name = DOUBLESLAP SetFrame = 8,19 SetOpacity = 8,100 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 3,20 SetX = 3,8 @@ -48,7 +48,7 @@ Name = DOUBLESLAP Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,1] -Name = DoubleSlap hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -56,7 +56,7 @@ Name = DoubleSlap hit 2 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 3,20 SetX = 3,8 @@ -66,7 +66,7 @@ Name = DoubleSlap hit 2 SetFrame = 4,19 SetVisible = 5,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 7,20 SetX = 7,0 @@ -74,7 +74,7 @@ Name = DoubleSlap hit 2 SetZ = 7,28 SetVisible = 8,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,15 SetX = 0,136 @@ -95,7 +95,7 @@ Name = DoubleSlap hit 2 Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,2] -Name = DoubleSlap hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -103,7 +103,7 @@ Name = DoubleSlap hit 3 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,15 SetX = 0,136 @@ -120,7 +120,7 @@ Name = DoubleSlap hit 3 SetFrame = 8,19 SetOpacity = 8,100 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 3,20 SetX = 3,8 @@ -130,7 +130,7 @@ Name = DoubleSlap hit 3 SetFrame = 4,19 SetVisible = 5,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 7,20 SetX = 7,0 @@ -142,7 +142,7 @@ Name = DoubleSlap hit 3 Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,3] -Name = DoubleSlap hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -150,7 +150,7 @@ Name = DoubleSlap hit 4 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 7,20 SetX = 7,0 @@ -158,7 +158,7 @@ Name = DoubleSlap hit 4 SetZ = 7,28 SetVisible = 8,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,15 SetX = 0,136 @@ -175,7 +175,7 @@ Name = DoubleSlap hit 4 SetFrame = 8,19 SetOpacity = 8,100 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 3,20 SetX = 3,8 @@ -189,7 +189,7 @@ Name = DoubleSlap hit 4 Play = 7,Blow5,80 #------------------------------- [Move,DOUBLESLAP,4] -Name = DoubleSlap hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -197,7 +197,7 @@ Name = DoubleSlap hit 5 SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 3,20 SetX = 3,8 @@ -207,7 +207,7 @@ Name = DoubleSlap hit 5 SetFrame = 4,19 SetVisible = 5,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 7,20 SetX = 7,0 @@ -215,7 +215,7 @@ Name = DoubleSlap hit 5 SetZ = 7,28 SetVisible = 8,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,15 SetX = 0,136 diff --git a/PBS/Animations/Converted/Move/DRAGONBREATH.txt b/PBS/Animations/Example anims/Move/DRAGONBREATH.txt similarity index 90% rename from PBS/Animations/Converted/Move/DRAGONBREATH.txt rename to PBS/Animations/Example anims/Move/DRAGONBREATH.txt index 21506cce8..6ac276d29 100644 --- a/PBS/Animations/Converted/Move/DRAGONBREATH.txt +++ b/PBS/Animations/Example anims/Move/DRAGONBREATH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DRAGONBREATH] -Name = DRAGONBREATH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DRAGONBREATH SetX = 0,0 SetY = 0,0 - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetX = 0,19 SetY = 0,-29 @@ -32,7 +32,7 @@ Name = DRAGONBREATH SetFrame = 7,6 SetFrame = 8,7 - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetX = 1,39 SetY = 1,-40 @@ -52,7 +52,7 @@ Name = DRAGONBREATH SetZoomY = 5,100 SetVisible = 6,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFlip = 2,true SetX = 2,69 @@ -69,7 +69,7 @@ Name = DRAGONBREATH SetZoomY = 5,75 SetVisible = 6,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFlip = 2,true SetX = 2,39 @@ -83,7 +83,7 @@ Name = DRAGONBREATH SetZoomY = 4,75 SetVisible = 5,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetX = 2,84 SetY = 2,-109 @@ -96,7 +96,7 @@ Name = DRAGONBREATH SetZoomY = 3,100 SetVisible = 4,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFrame = 3,1 SetFlip = 3,true @@ -107,7 +107,7 @@ Name = DRAGONBREATH SetZoomY = 3,50 SetVisible = 4,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFrame = 3,1 SetFlip = 3,true @@ -118,7 +118,7 @@ Name = DRAGONBREATH SetZoomY = 3,40 SetVisible = 4,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetX = 3,64 SetY = 3,-20 diff --git a/PBS/Animations/Converted/Move/DRAGONCLAW.txt b/PBS/Animations/Example anims/Move/DRAGONCLAW.txt similarity index 90% rename from PBS/Animations/Converted/Move/DRAGONCLAW.txt rename to PBS/Animations/Example anims/Move/DRAGONCLAW.txt index b792232f0..7195e7d30 100644 --- a/PBS/Animations/Converted/Move/DRAGONCLAW.txt +++ b/PBS/Animations/Example anims/Move/DRAGONCLAW.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DRAGONCLAW] -Name = DRAGONCLAW +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DRAGONCLAW SetX = 0,0 SetY = 0,0 - Graphic = poison + Graphic = Examples/poison Focus = Target SetFrame = 0,9 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/DRAGONDANCE.txt b/PBS/Animations/Example anims/Move/DRAGONDANCE.txt similarity index 90% rename from PBS/Animations/Converted/Move/DRAGONDANCE.txt rename to PBS/Animations/Example anims/Move/DRAGONDANCE.txt index 964e04dfc..6c13c2cc2 100644 --- a/PBS/Animations/Converted/Move/DRAGONDANCE.txt +++ b/PBS/Animations/Example anims/Move/DRAGONDANCE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DRAGONDANCE] -Name = DRAGONDANCE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DRAGONDANCE SetX = 0,0 SetY = 0,0 - Graphic = electric1 + Graphic = Examples/electric1 Focus = Target SetFrame = 3,9 SetX = 3,8 @@ -23,7 +23,7 @@ Name = DRAGONDANCE SetFrame = 8,10 SetVisible = 9,false - Graphic = electric1 + Graphic = Examples/electric1 Focus = Target SetFrame = 1,9 SetX = 1,8 diff --git a/PBS/Animations/Converted/Move/DRAGONRAGE.txt b/PBS/Animations/Example anims/Move/DRAGONRAGE.txt similarity index 90% rename from PBS/Animations/Converted/Move/DRAGONRAGE.txt rename to PBS/Animations/Example anims/Move/DRAGONRAGE.txt index 3384984e9..ab2a7f0c6 100644 --- a/PBS/Animations/Converted/Move/DRAGONRAGE.txt +++ b/PBS/Animations/Example anims/Move/DRAGONRAGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DRAGONRAGE] -Name = DRAGONRAGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DRAGONRAGE SetX = 0,0 SetY = 0,0 - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetX = 1,39 SetY = 1,-40 @@ -29,7 +29,7 @@ Name = DRAGONRAGE SetZoomY = 5,100 SetVisible = 6,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFlip = 2,true SetX = 2,69 @@ -42,7 +42,7 @@ Name = DRAGONRAGE SetY = 4,-59 SetVisible = 5,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFlip = 3,true SetX = 3,79 @@ -50,7 +50,7 @@ Name = DRAGONRAGE SetZ = 3,30 SetVisible = 4,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetX = 0,19 SetY = 0,-29 diff --git a/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt b/PBS/Animations/Example anims/Move/DYNAMICPUNCH.txt similarity index 92% rename from PBS/Animations/Converted/Move/DYNAMICPUNCH.txt rename to PBS/Animations/Example anims/Move/DYNAMICPUNCH.txt index eb6b8dfde..a36b09d77 100644 --- a/PBS/Animations/Converted/Move/DYNAMICPUNCH.txt +++ b/PBS/Animations/Example anims/Move/DYNAMICPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,DYNAMICPUNCH] -Name = DYNAMICPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = DYNAMICPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 1,5 SetY = 1,3 @@ -23,7 +23,7 @@ Name = DYNAMICPUNCH SetY = 5,12 SetVisible = 7,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 0,5 SetY = 0,2 diff --git a/PBS/Animations/Converted/Move/EMBER.txt b/PBS/Animations/Example anims/Move/EMBER.txt similarity index 92% rename from PBS/Animations/Converted/Move/EMBER.txt rename to PBS/Animations/Example anims/Move/EMBER.txt index 2c49ea8a8..582e7a475 100644 --- a/PBS/Animations/Converted/Move/EMBER.txt +++ b/PBS/Animations/Example anims/Move/EMBER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,EMBER] -Name = EMBER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = EMBER SetX = 0,0 SetY = 0,0 - Graphic = Flames + Graphic = Examples/Flames Focus = UserAndTarget SetX = 9,142 SetY = 9,-153 @@ -21,7 +21,7 @@ Name = EMBER SetFlip = 11,false SetFrame = 12,2 - Graphic = Flames + Graphic = Examples/Flames Focus = UserAndTarget SetFrame = 1,2 SetX = 1,12 diff --git a/PBS/Animations/Converted/Move/ENCORE.txt b/PBS/Animations/Example anims/Move/ENCORE.txt similarity index 94% rename from PBS/Animations/Converted/Move/ENCORE.txt rename to PBS/Animations/Example anims/Move/ENCORE.txt index e284648f4..25e7962d5 100644 --- a/PBS/Animations/Converted/Move/ENCORE.txt +++ b/PBS/Animations/Example anims/Move/ENCORE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ENCORE] -Name = ENCORE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ENCORE SetX = 0,0 SetY = 0,0 - Graphic = BABACOMETRO + Graphic = Examples/BABACOMETRO Focus = UserAndTarget SetFrame = 0,16 SetX = 0,-25 @@ -45,7 +45,7 @@ Name = ENCORE SetFrame = 18,15 SetX = 18,14 - Graphic = BABACOMETRO + Graphic = Examples/BABACOMETRO Focus = UserAndTarget SetFrame = 0,15 SetX = 0,34 diff --git a/PBS/Animations/Converted/Move/ENERGYBALL.txt b/PBS/Animations/Example anims/Move/ENERGYBALL.txt similarity index 93% rename from PBS/Animations/Converted/Move/ENERGYBALL.txt rename to PBS/Animations/Example anims/Move/ENERGYBALL.txt index c6e4f7a4f..0b5fd8e4f 100644 --- a/PBS/Animations/Converted/Move/ENERGYBALL.txt +++ b/PBS/Animations/Example anims/Move/ENERGYBALL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ENERGYBALL] -Name = ENERGYBALL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ENERGYBALL SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 0,9 SetY = 0,21 diff --git a/PBS/Animations/Converted/Move/ERUPTION.txt b/PBS/Animations/Example anims/Move/ERUPTION.txt similarity index 94% rename from PBS/Animations/Converted/Move/ERUPTION.txt rename to PBS/Animations/Example anims/Move/ERUPTION.txt index bb5bc80b3..55ff8f16d 100644 --- a/PBS/Animations/Converted/Move/ERUPTION.txt +++ b/PBS/Animations/Example anims/Move/ERUPTION.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ERUPTION] -Name = ERUPTION +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ERUPTION SetX = 0,0 SetY = 0,0 - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFrame = 2,8 SetX = 2,64 @@ -35,7 +35,7 @@ Name = ERUPTION SetAngle = 7,10 SetVisible = 8,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFrame = 4,8 SetX = 4,14 @@ -50,7 +50,7 @@ Name = ERUPTION SetY = 6,-178 SetVisible = 7,false - Graphic = fire5 + Graphic = Examples/fire5 Focus = UserAndTarget SetFrame = 0,8 SetX = 0,25 diff --git a/PBS/Animations/Converted/Move/EXPLOSION.txt b/PBS/Animations/Example anims/Move/EXPLOSION.txt similarity index 94% rename from PBS/Animations/Converted/Move/EXPLOSION.txt rename to PBS/Animations/Example anims/Move/EXPLOSION.txt index 233c3c1dd..32707e51c 100644 --- a/PBS/Animations/Converted/Move/EXPLOSION.txt +++ b/PBS/Animations/Example anims/Move/EXPLOSION.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,EXPLOSION] -Name = EXPLOSION +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = EXPLOSION SetX = 0,0 SetY = 0,0 - Graphic = Fire3 + Graphic = Examples/Fire3 Focus = Target SetFrame = 0,5 SetX = 0,40 @@ -41,7 +41,7 @@ Name = EXPLOSION SetOpacity = 15,150 SetVisible = 16,false - Graphic = Fire3 + Graphic = Examples/Fire3 Focus = Target SetFrame = 2,10 SetX = 2,40 @@ -69,7 +69,7 @@ Name = EXPLOSION SetFrame = 14,22 SetVisible = 15,false - Graphic = Fire3 + Graphic = Examples/Fire3 Focus = Target SetFrame = 6,14 SetX = 6,40 @@ -83,7 +83,7 @@ Name = EXPLOSION SetFrame = 12,20 SetVisible = 13,false - Graphic = Fire3 + Graphic = Examples/Fire3 Focus = Target SetFrame = 0,11 SetX = 0,-88 diff --git a/PBS/Animations/Converted/Move/FAKEOUT.txt b/PBS/Animations/Example anims/Move/FAKEOUT.txt similarity index 91% rename from PBS/Animations/Converted/Move/FAKEOUT.txt rename to PBS/Animations/Example anims/Move/FAKEOUT.txt index 5aeb00eba..f6193cc83 100644 --- a/PBS/Animations/Converted/Move/FAKEOUT.txt +++ b/PBS/Animations/Example anims/Move/FAKEOUT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FAKEOUT] -Name = FAKEOUT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FAKEOUT SetX = 0,0 SetY = 0,0 - Graphic = Fakeout + Graphic = Examples/Fakeout Focus = Target SetFrame = 0,5 SetFlip = 0,true @@ -28,7 +28,7 @@ Name = FAKEOUT SetX = 15,96 SetVisible = 20,false - Graphic = Fakeout + Graphic = Examples/Fakeout Focus = Target SetFrame = 0,5 SetX = 0,-96 diff --git a/PBS/Animations/Converted/Move/FAKETEARS.txt b/PBS/Animations/Example anims/Move/FAKETEARS.txt similarity index 89% rename from PBS/Animations/Converted/Move/FAKETEARS.txt rename to PBS/Animations/Example anims/Move/FAKETEARS.txt index 8b7224413..44b116f60 100644 --- a/PBS/Animations/Converted/Move/FAKETEARS.txt +++ b/PBS/Animations/Example anims/Move/FAKETEARS.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FAKETEARS] -Name = FAKETEARS +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FAKETEARS SetX = 0,0 SetY = 0,0 - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetX = 0,56 SetY = 0,14 @@ -39,7 +39,7 @@ Name = FAKETEARS SetX = 9,142 SetY = 9,24 - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFlip = 1,true SetX = 1,-72 @@ -47,7 +47,7 @@ Name = FAKETEARS SetZ = 1,28 SetVisible = 2,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFrame = 2,1 SetX = 2,72 @@ -55,7 +55,7 @@ Name = FAKETEARS SetZ = 2,29 SetVisible = 3,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFrame = 3,1 SetFlip = 3,true @@ -77,7 +77,7 @@ Name = FAKETEARS SetX = 9,-144 SetY = 9,3 - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFrame = 4,1 SetX = 4,93 @@ -90,7 +90,7 @@ Name = FAKETEARS SetY = 6,-21 SetVisible = 7,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFrame = 5,1 SetFlip = 5,true diff --git a/PBS/Animations/Converted/Move/FIERYDANCE.txt b/PBS/Animations/Example anims/Move/FIERYDANCE.txt similarity index 90% rename from PBS/Animations/Converted/Move/FIERYDANCE.txt rename to PBS/Animations/Example anims/Move/FIERYDANCE.txt index 8e41b1194..a46e7c08c 100644 --- a/PBS/Animations/Converted/Move/FIERYDANCE.txt +++ b/PBS/Animations/Example anims/Move/FIERYDANCE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FIERYDANCE] -Name = FIERYDANCE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FIERYDANCE SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,16 SetX = 0,35 @@ -46,7 +46,7 @@ Name = FIERYDANCE SetX = 12,1 SetY = 12,-4 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 1,16 SetX = 1,-20 @@ -77,7 +77,7 @@ Name = FIERYDANCE SetY = 10,-39 SetVisible = 11,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 1,16 SetX = 1,27 @@ -106,7 +106,7 @@ Name = FIERYDANCE SetY = 9,-46 SetVisible = 10,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 3,18 SetX = 3,-46 @@ -119,7 +119,7 @@ Name = FIERYDANCE SetY = 5,22 SetVisible = 6,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 4,15 SetX = 4,-11 @@ -127,7 +127,7 @@ Name = FIERYDANCE SetZ = 4,31 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 7,16 SetX = 7,26 @@ -138,7 +138,7 @@ Name = FIERYDANCE SetY = 8,-44 SetVisible = 9,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 7,16 SetX = 7,-25 @@ -149,7 +149,7 @@ Name = FIERYDANCE SetY = 8,-47 SetVisible = 9,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 7,16 SetX = 7,-33 diff --git a/PBS/Animations/Converted/Move/FINALGAMBIT.txt b/PBS/Animations/Example anims/Move/FINALGAMBIT.txt similarity index 95% rename from PBS/Animations/Converted/Move/FINALGAMBIT.txt rename to PBS/Animations/Example anims/Move/FINALGAMBIT.txt index 752865176..9ae008579 100644 --- a/PBS/Animations/Converted/Move/FINALGAMBIT.txt +++ b/PBS/Animations/Example anims/Move/FINALGAMBIT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FINALGAMBIT] -Name = FINALGAMBIT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FINALGAMBIT SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 0,7 SetX = 0,-20 diff --git a/PBS/Animations/Converted/Move/FIREBLAST.txt b/PBS/Animations/Example anims/Move/FIREBLAST.txt similarity index 92% rename from PBS/Animations/Converted/Move/FIREBLAST.txt rename to PBS/Animations/Example anims/Move/FIREBLAST.txt index f1f2210a7..99fb1590c 100644 --- a/PBS/Animations/Converted/Move/FIREBLAST.txt +++ b/PBS/Animations/Example anims/Move/FIREBLAST.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FIREBLAST] -Name = FIREBLAST +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FIREBLAST SetX = 0,0 SetY = 0,0 - Graphic = fire blast + Graphic = Examples/fire blast Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/FIREFANG.txt b/PBS/Animations/Example anims/Move/FIREFANG.txt similarity index 85% rename from PBS/Animations/Converted/Move/FIREFANG.txt rename to PBS/Animations/Example anims/Move/FIREFANG.txt index 13958e69f..729a74a52 100644 --- a/PBS/Animations/Converted/Move/FIREFANG.txt +++ b/PBS/Animations/Example anims/Move/FIREFANG.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FIREFANG] -Name = FIREFANG +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FIREFANG SetX = 0,0 SetY = 0,0 - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetX = 0,7 SetY = 0,-2 @@ -48,7 +48,7 @@ Name = FIREFANG SetFrame = 12,12 SetY = 12,-3 - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 7,15 SetX = 7,27 @@ -60,7 +60,7 @@ Name = FIREFANG SetY = 10,-7 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 8,15 SetX = 8,34 @@ -72,7 +72,7 @@ Name = FIREFANG SetY = 10,-27 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 8,15 SetX = 8,-31 @@ -84,7 +84,7 @@ Name = FIREFANG SetY = 10,-43 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 9,15 SetX = 9,-25 @@ -94,7 +94,7 @@ Name = FIREFANG SetY = 10,-48 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 10,15 SetX = 10,-26 @@ -102,7 +102,7 @@ Name = FIREFANG SetZ = 10,32 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 10,15 SetX = 10,-9 @@ -110,7 +110,7 @@ Name = FIREFANG SetZ = 10,33 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 10,15 SetX = 10,-28 @@ -118,7 +118,7 @@ Name = FIREFANG SetZ = 10,34 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 10,15 SetX = 10,-19 diff --git a/PBS/Animations/Converted/Move/FIREPLEDGE.txt b/PBS/Animations/Example anims/Move/FIREPLEDGE.txt similarity index 92% rename from PBS/Animations/Converted/Move/FIREPLEDGE.txt rename to PBS/Animations/Example anims/Move/FIREPLEDGE.txt index b15f26a7d..63b7eb266 100644 --- a/PBS/Animations/Converted/Move/FIREPLEDGE.txt +++ b/PBS/Animations/Example anims/Move/FIREPLEDGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FIREPLEDGE] -Name = FIREPLEDGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FIREPLEDGE SetX = 0,0 SetY = 0,0 - Graphic = anim sheet.2 + Graphic = Examples/anim sheet.2 Focus = Target SetFrame = 0,10 SetX = 0,4 diff --git a/PBS/Animations/Converted/Move/FIREPUNCH.txt b/PBS/Animations/Example anims/Move/FIREPUNCH.txt similarity index 86% rename from PBS/Animations/Converted/Move/FIREPUNCH.txt rename to PBS/Animations/Example anims/Move/FIREPUNCH.txt index fa51d9704..19ce0d427 100644 --- a/PBS/Animations/Converted/Move/FIREPUNCH.txt +++ b/PBS/Animations/Example anims/Move/FIREPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FIREPUNCH] -Name = FIREPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FIREPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 0,3 SetY = 0,1 @@ -30,7 +30,7 @@ Name = FIREPUNCH SetY = 6,-22 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 1,6 SetY = 1,-1 @@ -49,7 +49,7 @@ Name = FIREPUNCH SetY = 6,0 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 3,1 SetY = 3,5 @@ -64,7 +64,7 @@ Name = FIREPUNCH SetY = 6,17 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 4,0 SetY = 4,7 @@ -77,7 +77,7 @@ Name = FIREPUNCH SetY = 6,2 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 5,3 SetY = 5,8 @@ -86,7 +86,7 @@ Name = FIREPUNCH SetY = 6,10 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,9 SetX = 7,19 @@ -94,7 +94,7 @@ Name = FIREPUNCH SetZ = 7,32 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 8,9 SetX = 8,-10 @@ -102,7 +102,7 @@ Name = FIREPUNCH SetZ = 8,33 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 9,9 SetX = 9,14 @@ -110,7 +110,7 @@ Name = FIREPUNCH SetZ = 9,34 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 10,9 SetX = 10,4 @@ -118,7 +118,7 @@ Name = FIREPUNCH SetZ = 10,35 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 11,9 SetX = 11,19 @@ -126,7 +126,7 @@ Name = FIREPUNCH SetZ = 11,36 SetVisible = 12,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 11,9 SetX = 11,-7 diff --git a/PBS/Animations/Converted/Move/FIRESPIN.txt b/PBS/Animations/Example anims/Move/FIRESPIN.txt similarity index 95% rename from PBS/Animations/Converted/Move/FIRESPIN.txt rename to PBS/Animations/Example anims/Move/FIRESPIN.txt index 11408f8ad..6a815e3a4 100644 --- a/PBS/Animations/Converted/Move/FIRESPIN.txt +++ b/PBS/Animations/Example anims/Move/FIRESPIN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FIRESPIN] -Name = FIRESPIN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FIRESPIN SetX = 0,0 SetY = 0,0 - Graphic = grass2 + Graphic = Examples/grass2 Focus = Target SetFrame = 0,9 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/FLAIL.txt b/PBS/Animations/Example anims/Move/FLAIL.txt similarity index 95% rename from PBS/Animations/Converted/Move/FLAIL.txt rename to PBS/Animations/Example anims/Move/FLAIL.txt index 6207d8ec2..ba68ba3bd 100644 --- a/PBS/Animations/Converted/Move/FLAIL.txt +++ b/PBS/Animations/Example anims/Move/FLAIL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FLAIL] -Name = FLAIL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FLAIL SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = UserAndTarget SetFrame = 0,7 SetX = 0,176 diff --git a/PBS/Animations/Converted/Move/FLAMEBURST.txt b/PBS/Animations/Example anims/Move/FLAMEBURST.txt similarity index 87% rename from PBS/Animations/Converted/Move/FLAMEBURST.txt rename to PBS/Animations/Example anims/Move/FLAMEBURST.txt index d3ae74f1d..47f9db4b5 100644 --- a/PBS/Animations/Converted/Move/FLAMEBURST.txt +++ b/PBS/Animations/Example anims/Move/FLAMEBURST.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FLAMEBURST] -Name = FLAMEBURST +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FLAMEBURST SetX = 0,0 SetY = 0,0 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 0,1 SetY = 0,5 @@ -30,7 +30,7 @@ Name = FLAMEBURST SetX = 8,-25 SetY = 8,28 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 1,16 SetY = 1,18 @@ -49,7 +49,7 @@ Name = FLAMEBURST SetX = 8,-30 SetY = 8,10 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 1,-13 SetY = 1,14 @@ -69,7 +69,7 @@ Name = FLAMEBURST SetX = 8,-4 SetY = 8,34 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 2,5 SetY = 2,-2 @@ -86,7 +86,7 @@ Name = FLAMEBURST SetX = 8,-1 SetY = 8,12 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 3,15 SetY = 3,-13 @@ -102,7 +102,7 @@ Name = FLAMEBURST SetX = 8,-11 SetY = 8,3 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 3,26 SetY = 3,15 @@ -118,7 +118,7 @@ Name = FLAMEBURST SetX = 8,-31 SetY = 8,-9 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 3,-4 SetY = 3,-18 @@ -134,7 +134,7 @@ Name = FLAMEBURST SetX = 8,-15 SetY = 8,-14 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 4,-15 SetY = 4,-19 @@ -148,7 +148,7 @@ Name = FLAMEBURST SetX = 8,4 SetY = 8,-9 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 4,10 SetY = 4,-19 @@ -162,7 +162,7 @@ Name = FLAMEBURST SetX = 8,18 SetY = 8,11 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 4,29 SetY = 4,11 @@ -176,7 +176,7 @@ Name = FLAMEBURST SetX = 8,28 SetY = 8,37 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 5,30 SetY = 5,18 @@ -188,7 +188,7 @@ Name = FLAMEBURST SetX = 8,36 SetY = 8,-3 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 5,36 SetY = 5,-4 @@ -200,7 +200,7 @@ Name = FLAMEBURST SetX = 8,25 SetY = 8,-9 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 5,21 SetY = 5,-14 @@ -212,7 +212,7 @@ Name = FLAMEBURST SetX = 8,12 SetY = 8,-30 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 6,38 SetY = 6,34 @@ -221,7 +221,7 @@ Name = FLAMEBURST SetY = 7,-36 SetX = 8,-11 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 6,-40 SetY = 6,-20 @@ -231,7 +231,7 @@ Name = FLAMEBURST SetX = 8,-32 SetY = 8,-22 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,21 SetY = 7,-35 @@ -239,7 +239,7 @@ Name = FLAMEBURST SetX = 8,47 SetY = 8,20 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,7 SetY = 7,-47 diff --git a/PBS/Animations/Converted/Move/FLAMECHARGE.txt b/PBS/Animations/Example anims/Move/FLAMECHARGE.txt similarity index 79% rename from PBS/Animations/Converted/Move/FLAMECHARGE.txt rename to PBS/Animations/Example anims/Move/FLAMECHARGE.txt index a3f62420c..40002a8e1 100644 --- a/PBS/Animations/Converted/Move/FLAMECHARGE.txt +++ b/PBS/Animations/Example anims/Move/FLAMECHARGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FLAMECHARGE] -Name = FLAMECHARGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,70 +9,70 @@ Name = FLAMECHARGE SetX = 0,0 SetY = 0,0 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 0,2 SetX = 0,-28 SetY = 0,17 SetZ = 0,27 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 0,2 SetX = 0,-13 SetY = 0,25 SetZ = 0,28 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 1,2 SetX = 1,6 SetY = 1,28 SetZ = 1,29 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 2,2 SetX = 2,24 SetY = 2,16 SetZ = 2,30 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 3,2 SetX = 3,21 SetY = 3,-6 SetZ = 3,31 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 4,2 SetX = 4,9 SetY = 4,-20 SetZ = 4,32 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 5,2 SetX = 5,-6 SetY = 5,-23 SetZ = 5,33 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 6,2 SetX = 6,-24 SetY = 6,-20 SetZ = 6,34 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 7,2 SetX = 7,-27 SetY = 7,-1 SetZ = 7,35 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 8,1 SetX = 8,-2 diff --git a/PBS/Animations/Converted/Move/FLAMETHROWER.txt b/PBS/Animations/Example anims/Move/FLAMETHROWER.txt similarity index 90% rename from PBS/Animations/Converted/Move/FLAMETHROWER.txt rename to PBS/Animations/Example anims/Move/FLAMETHROWER.txt index 77a55ffcc..4033a72a6 100644 --- a/PBS/Animations/Converted/Move/FLAMETHROWER.txt +++ b/PBS/Animations/Example anims/Move/FLAMETHROWER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FLAMETHROWER] -Name = FLAMETHROWER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FLAMETHROWER SetX = 0,0 SetY = 0,0 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 0,2 SetX = 0,-219 @@ -17,7 +17,7 @@ Name = FLAMETHROWER SetZ = 0,27 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 1,1 SetX = 1,-201 @@ -25,7 +25,7 @@ Name = FLAMETHROWER SetZ = 1,28 SetVisible = 10,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 2,1 SetX = 2,-187 @@ -33,7 +33,7 @@ Name = FLAMETHROWER SetZ = 2,29 SetVisible = 11,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 3,1 SetX = 3,-161 @@ -41,7 +41,7 @@ Name = FLAMETHROWER SetZ = 3,30 SetVisible = 12,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 4,1 SetX = 4,-129 @@ -49,7 +49,7 @@ Name = FLAMETHROWER SetZ = 4,31 SetVisible = 13,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 5,1 SetX = 5,-99 @@ -57,20 +57,20 @@ Name = FLAMETHROWER SetZ = 5,32 SetVisible = 14,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 6,-69 SetY = 6,8 SetZ = 6,33 SetVisible = 15,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,-32 SetY = 7,-12 SetZ = 7,34 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 8,-5 SetY = 8,-24 @@ -79,7 +79,7 @@ Name = FLAMETHROWER Play = 0,Whirlwind,100,121 #------------------------------- [OppMove,FLAMETHROWER] -Name = FLAMETHROWER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -87,7 +87,7 @@ Name = FLAMETHROWER SetX = 0,0 SetY = 0,0 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 0,2 SetX = 0,-3 @@ -131,7 +131,7 @@ Name = FLAMETHROWER SetY = 18,122 SetVisible = 19,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 1,2 SetX = 1,-23 @@ -168,7 +168,7 @@ Name = FLAMETHROWER SetY = 17,87 SetVisible = 18,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 2,2 SetX = 2,-42 @@ -206,7 +206,7 @@ Name = FLAMETHROWER SetY = 16,62 SetVisible = 17,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 3,1 SetX = 3,-71 @@ -241,7 +241,7 @@ Name = FLAMETHROWER SetY = 15,59 SetVisible = 16,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 4,1 SetX = 4,-85 @@ -268,7 +268,7 @@ Name = FLAMETHROWER SetY = 14,28 SetVisible = 15,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 5,1 SetX = 5,-117 @@ -290,7 +290,7 @@ Name = FLAMETHROWER SetY = 13,19 SetVisible = 14,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 6,1 SetX = 6,-146 @@ -312,7 +312,7 @@ Name = FLAMETHROWER SetY = 12,-4 SetVisible = 13,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetFrame = 8,1 SetX = 8,-195 @@ -329,7 +329,7 @@ Name = FLAMETHROWER SetY = 12,-15 SetVisible = 13,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 9,-248 SetY = 9,98 @@ -338,7 +338,7 @@ Name = FLAMETHROWER SetY = 10,109 SetVisible = 11,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 10,-262 SetY = 10,131 diff --git a/PBS/Animations/Converted/Move/FLAMEWHEEL.txt b/PBS/Animations/Example anims/Move/FLAMEWHEEL.txt similarity index 82% rename from PBS/Animations/Converted/Move/FLAMEWHEEL.txt rename to PBS/Animations/Example anims/Move/FLAMEWHEEL.txt index 1d461c1f0..4984e6c76 100644 --- a/PBS/Animations/Converted/Move/FLAMEWHEEL.txt +++ b/PBS/Animations/Example anims/Move/FLAMEWHEEL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FLAMEWHEEL] -Name = FLAMEWHEEL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FLAMEWHEEL SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 0,9 SetX = 0,21 @@ -24,7 +24,7 @@ Name = FLAMEWHEEL SetX = 10,210 SetY = 10,-195 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 0,9 SetX = 0,45 @@ -32,7 +32,7 @@ Name = FLAMEWHEEL SetZ = 0,28 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 1,9 SetX = 1,50 @@ -42,7 +42,7 @@ Name = FLAMEWHEEL SetY = 7,-3 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 2,9 SetX = 2,26 @@ -50,7 +50,7 @@ Name = FLAMEWHEEL SetZ = 2,30 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 3,9 SetX = 3,0 @@ -58,7 +58,7 @@ Name = FLAMEWHEEL SetZ = 3,31 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 4,9 SetX = 4,-11 @@ -66,7 +66,7 @@ Name = FLAMEWHEEL SetZ = 4,32 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 5,9 SetX = 5,-9 @@ -74,7 +74,7 @@ Name = FLAMEWHEEL SetZ = 5,33 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,9 SetX = 6,1 @@ -82,7 +82,7 @@ Name = FLAMEWHEEL SetZ = 6,34 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,24 @@ -90,7 +90,7 @@ Name = FLAMEWHEEL SetZ = 7,35 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,46 @@ -98,7 +98,7 @@ Name = FLAMEWHEEL SetZ = 7,36 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,46 @@ -106,7 +106,7 @@ Name = FLAMEWHEEL SetZ = 7,37 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,31 @@ -114,7 +114,7 @@ Name = FLAMEWHEEL SetZ = 7,38 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,11 @@ -122,7 +122,7 @@ Name = FLAMEWHEEL SetZ = 7,39 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,-5 @@ -130,7 +130,7 @@ Name = FLAMEWHEEL SetZ = 7,40 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,-14 @@ -138,7 +138,7 @@ Name = FLAMEWHEEL SetZ = 7,41 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,-12 @@ -146,7 +146,7 @@ Name = FLAMEWHEEL SetZ = 7,42 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,-2 @@ -154,7 +154,7 @@ Name = FLAMEWHEEL SetZ = 7,43 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,35 @@ -162,28 +162,28 @@ Name = FLAMEWHEEL SetZ = 7,44 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 10,10 SetX = 10,230 SetY = 10,-156 SetZ = 10,28 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 10,10 SetX = 10,184 SetY = 10,-231 SetZ = 10,29 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 11,10 SetX = 11,195 SetY = 11,-150 SetZ = 11,30 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 11,10 SetX = 11,230 @@ -193,7 +193,7 @@ Name = FLAMEWHEEL Play = 0,Trump Card,100,110 #------------------------------- [OppMove,FLAMEWHEEL] -Name = FLAMEWHEEL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -201,7 +201,7 @@ Name = FLAMEWHEEL SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 0,9 SetX = 0,210 @@ -218,7 +218,7 @@ Name = FLAMEWHEEL SetX = 11,7 SetY = 11,-1 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 0,9 SetX = 0,225 @@ -226,7 +226,7 @@ Name = FLAMEWHEEL SetZ = 0,28 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 1,9 SetX = 1,229 @@ -234,7 +234,7 @@ Name = FLAMEWHEEL SetZ = 1,29 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 2,9 SetX = 2,217 @@ -242,7 +242,7 @@ Name = FLAMEWHEEL SetZ = 2,30 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 3,9 SetX = 3,196 @@ -252,7 +252,7 @@ Name = FLAMEWHEEL SetY = 4,-175 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 4,9 SetX = 4,185 @@ -260,7 +260,7 @@ Name = FLAMEWHEEL SetZ = 4,32 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 5,9 SetX = 5,193 @@ -268,7 +268,7 @@ Name = FLAMEWHEEL SetZ = 5,33 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 SetX = 6,203 @@ -276,7 +276,7 @@ Name = FLAMEWHEEL SetZ = 6,34 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 SetX = 6,218 @@ -284,7 +284,7 @@ Name = FLAMEWHEEL SetZ = 6,35 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 SetX = 6,229 @@ -292,7 +292,7 @@ Name = FLAMEWHEEL SetZ = 6,36 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 SetX = 6,217 @@ -300,7 +300,7 @@ Name = FLAMEWHEEL SetZ = 6,37 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,200 @@ -308,7 +308,7 @@ Name = FLAMEWHEEL SetZ = 7,38 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,192 @@ -316,7 +316,7 @@ Name = FLAMEWHEEL SetZ = 7,39 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 SetX = 7,196 @@ -324,7 +324,7 @@ Name = FLAMEWHEEL SetZ = 7,40 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 10,10 SetX = 10,37 @@ -332,7 +332,7 @@ Name = FLAMEWHEEL SetZ = 10,28 SetX = 11,27 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 10,10 SetX = 10,-7 @@ -341,14 +341,14 @@ Name = FLAMEWHEEL SetX = 11,-8 SetY = 11,31 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 11,10 SetX = 11,-14 SetY = 11,-37 SetZ = 11,30 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 11,10 SetX = 11,34 diff --git a/PBS/Animations/Converted/Move/FLASH.txt b/PBS/Animations/Example anims/Move/FLASH.txt similarity index 92% rename from PBS/Animations/Converted/Move/FLASH.txt rename to PBS/Animations/Example anims/Move/FLASH.txt index 641f25817..7212898be 100644 --- a/PBS/Animations/Converted/Move/FLASH.txt +++ b/PBS/Animations/Example anims/Move/FLASH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FLASH] -Name = FLASH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FLASH SetX = 0,0 SetY = 0,0 - Graphic = Light1 + Graphic = Examples/Light1 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/FLY.txt b/PBS/Animations/Example anims/Move/FLY.txt similarity index 91% rename from PBS/Animations/Converted/Move/FLY.txt rename to PBS/Animations/Example anims/Move/FLY.txt index c03296b12..281bb99f4 100644 --- a/PBS/Animations/Converted/Move/FLY.txt +++ b/PBS/Animations/Example anims/Move/FLY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FLY] -Name = FLY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FLY SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,3 SetX = 0,-103 @@ -33,7 +33,7 @@ Name = FLY Play = 0,Take Down,80,110 #------------------------------- [Move,FLY,1] -Name = Fly charging +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -41,7 +41,7 @@ Name = Fly charging SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = User SetFrame = 0,5 SetX = 0,6 diff --git a/PBS/Animations/Converted/Move/FOCUSENERGY.txt b/PBS/Animations/Example anims/Move/FOCUSENERGY.txt similarity index 89% rename from PBS/Animations/Converted/Move/FOCUSENERGY.txt rename to PBS/Animations/Example anims/Move/FOCUSENERGY.txt index d417b0038..d908b50fe 100644 --- a/PBS/Animations/Converted/Move/FOCUSENERGY.txt +++ b/PBS/Animations/Example anims/Move/FOCUSENERGY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FOCUSENERGY] -Name = FOCUSENERGY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FOCUSENERGY SetX = 0,0 SetY = 0,0 - Graphic = Fire3 + Graphic = Examples/Fire3 Focus = User SetFrame = 4,29 SetX = 4,16 @@ -18,7 +18,7 @@ Name = FOCUSENERGY SetFrame = 5,28 SetVisible = 6,false - Graphic = Fire3 + Graphic = Examples/Fire3 Focus = User SetFrame = 0,29 SetX = 0,16 diff --git a/PBS/Animations/Converted/Move/FOLLOWME.txt b/PBS/Animations/Example anims/Move/FOLLOWME.txt similarity index 89% rename from PBS/Animations/Converted/Move/FOLLOWME.txt rename to PBS/Animations/Example anims/Move/FOLLOWME.txt index fb6f1e0a5..1ff7803c8 100644 --- a/PBS/Animations/Converted/Move/FOLLOWME.txt +++ b/PBS/Animations/Example anims/Move/FOLLOWME.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FOLLOWME] -Name = FOLLOWME +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FOLLOWME SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetX = 0,2 SetY = 0,1 @@ -36,7 +36,7 @@ Name = FOLLOWME SetY = 9,139 SetVisible = 10,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 6,1 SetX = 6,-117 @@ -47,7 +47,7 @@ Name = FOLLOWME Play = 0,Follow Me,85,102 #------------------------------- [OppMove,FOLLOWME] -Name = FOLLOWME +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -55,14 +55,14 @@ Name = FOLLOWME SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetX = 5,-102 SetY = 5,110 SetZ = 5,28 SetVisible = 6,false - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 0,1 SetX = 0,-193 diff --git a/PBS/Animations/Converted/Move/FORESIGHT.txt b/PBS/Animations/Example anims/Move/FORESIGHT.txt similarity index 93% rename from PBS/Animations/Converted/Move/FORESIGHT.txt rename to PBS/Animations/Example anims/Move/FORESIGHT.txt index 01e99c84f..fc391383f 100644 --- a/PBS/Animations/Converted/Move/FORESIGHT.txt +++ b/PBS/Animations/Example anims/Move/FORESIGHT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FORESIGHT] -Name = FORESIGHT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FORESIGHT SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,8 SetX = 0,-112 diff --git a/PBS/Animations/Converted/Move/FRENZYPLANT.txt b/PBS/Animations/Example anims/Move/FRENZYPLANT.txt similarity index 94% rename from PBS/Animations/Converted/Move/FRENZYPLANT.txt rename to PBS/Animations/Example anims/Move/FRENZYPLANT.txt index 69a06b6de..2b1f3345b 100644 --- a/PBS/Animations/Converted/Move/FRENZYPLANT.txt +++ b/PBS/Animations/Example anims/Move/FRENZYPLANT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FRENZYPLANT] -Name = FRENZYPLANT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FRENZYPLANT SetX = 0,0 SetY = 0,0 - Graphic = grass2 + Graphic = Examples/grass2 Focus = UserAndTarget SetX = 0,34 SetY = 0,-50 diff --git a/PBS/Animations/Converted/Move/FURYATTACK.txt b/PBS/Animations/Example anims/Move/FURYATTACK.txt similarity index 87% rename from PBS/Animations/Converted/Move/FURYATTACK.txt rename to PBS/Animations/Example anims/Move/FURYATTACK.txt index 8cd4f9e09..02589b9c7 100644 --- a/PBS/Animations/Converted/Move/FURYATTACK.txt +++ b/PBS/Animations/Example anims/Move/FURYATTACK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FURYATTACK] -Name = FURYATTACK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FURYATTACK SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,0 @@ -29,7 +29,7 @@ Name = FURYATTACK SetFrame = 6,1 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,0 @@ -47,7 +47,7 @@ Name = FURYATTACK Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,1] -Name = Fury Attack hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -55,7 +55,7 @@ Name = Fury Attack hit 2 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,0 @@ -69,7 +69,7 @@ Name = Fury Attack hit 2 SetY = 5,-121 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,0 @@ -93,7 +93,7 @@ Name = Fury Attack hit 2 Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,2] -Name = Fury Attack hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -101,7 +101,7 @@ Name = Fury Attack hit 3 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,0 @@ -121,7 +121,7 @@ Name = Fury Attack hit 3 SetFrame = 6,1 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,0 @@ -139,7 +139,7 @@ Name = Fury Attack hit 3 Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,3] -Name = Fury Attack hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -147,7 +147,7 @@ Name = Fury Attack hit 4 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,0 @@ -161,7 +161,7 @@ Name = Fury Attack hit 4 SetY = 5,-121 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,0 @@ -185,7 +185,7 @@ Name = Fury Attack hit 4 Play = 5,normaldamage,80 #------------------------------- [Move,FURYATTACK,4] -Name = Fury Attack hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -193,7 +193,7 @@ Name = Fury Attack hit 5 SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,0 @@ -213,7 +213,7 @@ Name = Fury Attack hit 5 SetFrame = 6,1 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,0 @@ -231,7 +231,7 @@ Name = Fury Attack hit 5 Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK] -Name = FURYATTACK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -239,14 +239,14 @@ Name = FURYATTACK SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = User SetX = 3,1 SetY = 3,18 SetZ = 3,27 SetVisible = 4,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,159 @@ -261,7 +261,7 @@ Name = FURYATTACK SetY = 5,-42 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 SetX = 4,0 @@ -271,7 +271,7 @@ Name = FURYATTACK SetFrame = 6,1 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,164 @@ -290,7 +290,7 @@ Name = FURYATTACK Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,1] -Name = Fury Attack hit 2 opp +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -298,7 +298,7 @@ Name = Fury Attack hit 2 opp SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,164 @@ -313,14 +313,14 @@ Name = Fury Attack hit 2 opp SetY = 2,-32 SetVisible = 3,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = User SetX = 3,1 SetY = 3,18 SetZ = 3,27 SetVisible = 4,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,159 @@ -335,7 +335,7 @@ Name = Fury Attack hit 2 opp SetY = 5,-42 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 SetX = 4,0 @@ -349,7 +349,7 @@ Name = Fury Attack hit 2 opp Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,2] -Name = Fury Attack hit 3 opp +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -357,7 +357,7 @@ Name = Fury Attack hit 3 opp SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 SetX = 4,0 @@ -367,7 +367,7 @@ Name = Fury Attack hit 3 opp SetFrame = 6,1 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,164 @@ -382,14 +382,14 @@ Name = Fury Attack hit 3 opp SetY = 2,-32 SetVisible = 3,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = User SetX = 3,1 SetY = 3,18 SetZ = 3,27 SetVisible = 4,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,159 @@ -408,7 +408,7 @@ Name = Fury Attack hit 3 opp Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,3] -Name = Fury Attack hit 4 opp +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -416,7 +416,7 @@ Name = Fury Attack hit 4 opp SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,159 @@ -431,7 +431,7 @@ Name = Fury Attack hit 4 opp SetY = 5,-42 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 SetX = 4,0 @@ -441,7 +441,7 @@ Name = Fury Attack hit 4 opp SetFrame = 6,1 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,164 @@ -456,7 +456,7 @@ Name = Fury Attack hit 4 opp SetY = 2,-32 SetVisible = 3,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = User SetX = 3,1 SetY = 3,18 @@ -467,7 +467,7 @@ Name = Fury Attack hit 4 opp Play = 5,normaldamage,80 #------------------------------- [OppMove,FURYATTACK,4] -Name = Fury Attack hit 5 opp +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -475,14 +475,14 @@ Name = Fury Attack hit 5 opp SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = User SetX = 3,1 SetY = 3,18 SetZ = 3,27 SetVisible = 4,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 SetX = 3,159 @@ -497,7 +497,7 @@ Name = Fury Attack hit 5 opp SetY = 5,-42 SetVisible = 6,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 SetX = 4,0 @@ -507,7 +507,7 @@ Name = Fury Attack hit 5 opp SetFrame = 6,1 SetFrame = 7,2 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,164 diff --git a/PBS/Animations/Converted/Move/FURYCUTTER.txt b/PBS/Animations/Example anims/Move/FURYCUTTER.txt similarity index 89% rename from PBS/Animations/Converted/Move/FURYCUTTER.txt rename to PBS/Animations/Example anims/Move/FURYCUTTER.txt index 7aa7464f7..acbfa5589 100644 --- a/PBS/Animations/Converted/Move/FURYCUTTER.txt +++ b/PBS/Animations/Example anims/Move/FURYCUTTER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FURYCUTTER] -Name = FURYCUTTER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FURYCUTTER SetX = 0,0 SetY = 0,0 - Graphic = Sword6 + Graphic = Examples/Sword6 Focus = Target SetX = 0,0 SetY = 0,-10 diff --git a/PBS/Animations/Converted/Move/FURYSWIPES.txt b/PBS/Animations/Example anims/Move/FURYSWIPES.txt similarity index 82% rename from PBS/Animations/Converted/Move/FURYSWIPES.txt rename to PBS/Animations/Example anims/Move/FURYSWIPES.txt index 91fc09487..1d777909e 100644 --- a/PBS/Animations/Converted/Move/FURYSWIPES.txt +++ b/PBS/Animations/Example anims/Move/FURYSWIPES.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FURYSWIPES] -Name = FURYSWIPES +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FURYSWIPES SetX = 0,0 SetY = 0,0 - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 0,6 SetX = 0,53 @@ -30,7 +30,7 @@ Name = FURYSWIPES SetOpacity = 5,128 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 2,7 SetX = 2,13 @@ -60,7 +60,7 @@ Name = FURYSWIPES SetOpacity = 10,128 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 3,8 SetX = 3,19 @@ -74,7 +74,7 @@ Name = FURYSWIPES SetY = 5,131 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,-52 @@ -85,7 +85,7 @@ Name = FURYSWIPES SetY = 5,132 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,55 @@ -96,7 +96,7 @@ Name = FURYSWIPES SetY = 5,0 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-117 @@ -104,7 +104,7 @@ Name = FURYSWIPES SetZ = 5,32 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-47 @@ -112,7 +112,7 @@ Name = FURYSWIPES SetZ = 5,33 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,15 @@ -120,7 +120,7 @@ Name = FURYSWIPES SetZ = 5,34 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,73 @@ -128,7 +128,7 @@ Name = FURYSWIPES SetZ = 5,35 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,99 @@ -136,7 +136,7 @@ Name = FURYSWIPES SetZ = 5,36 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 7,7 SetX = 7,-14 @@ -153,7 +153,7 @@ Name = FURYSWIPES SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 8,7 SetX = 8,-22 @@ -167,7 +167,7 @@ Name = FURYSWIPES SetY = 10,82 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,37 @@ -178,7 +178,7 @@ Name = FURYSWIPES SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,61 @@ -189,7 +189,7 @@ Name = FURYSWIPES SetY = 10,110 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,75 @@ -197,7 +197,7 @@ Name = FURYSWIPES SetZ = 10,32 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,96 @@ -205,7 +205,7 @@ Name = FURYSWIPES SetZ = 10,33 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,-53 @@ -216,7 +216,7 @@ Name = FURYSWIPES Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,1] -Name = Fury Swipes hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -224,7 +224,7 @@ Name = Fury Swipes hit 2 SetX = 0,0 SetY = 0,0 - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 0,6 SetX = 0,53 @@ -245,7 +245,7 @@ Name = Fury Swipes hit 2 SetOpacity = 5,128 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 2,7 SetX = 2,13 @@ -275,7 +275,7 @@ Name = Fury Swipes hit 2 SetOpacity = 10,128 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 3,8 SetX = 3,19 @@ -289,7 +289,7 @@ Name = Fury Swipes hit 2 SetY = 5,131 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,-52 @@ -300,7 +300,7 @@ Name = Fury Swipes hit 2 SetY = 5,132 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,55 @@ -311,7 +311,7 @@ Name = Fury Swipes hit 2 SetY = 5,0 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-117 @@ -319,7 +319,7 @@ Name = Fury Swipes hit 2 SetZ = 5,32 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-47 @@ -327,7 +327,7 @@ Name = Fury Swipes hit 2 SetZ = 5,33 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,15 @@ -335,7 +335,7 @@ Name = Fury Swipes hit 2 SetZ = 5,34 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,73 @@ -343,7 +343,7 @@ Name = Fury Swipes hit 2 SetZ = 5,35 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,99 @@ -351,7 +351,7 @@ Name = Fury Swipes hit 2 SetZ = 5,36 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 7,7 SetX = 7,-14 @@ -368,7 +368,7 @@ Name = Fury Swipes hit 2 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 8,7 SetX = 8,-22 @@ -382,7 +382,7 @@ Name = Fury Swipes hit 2 SetY = 10,82 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,37 @@ -393,7 +393,7 @@ Name = Fury Swipes hit 2 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,61 @@ -404,7 +404,7 @@ Name = Fury Swipes hit 2 SetY = 10,110 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,75 @@ -412,7 +412,7 @@ Name = Fury Swipes hit 2 SetZ = 10,32 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,96 @@ -420,7 +420,7 @@ Name = Fury Swipes hit 2 SetZ = 10,33 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,-53 @@ -431,7 +431,7 @@ Name = Fury Swipes hit 2 Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,2] -Name = Fury Swipes hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -439,7 +439,7 @@ Name = Fury Swipes hit 3 SetX = 0,0 SetY = 0,0 - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 0,6 SetX = 0,53 @@ -460,7 +460,7 @@ Name = Fury Swipes hit 3 SetOpacity = 5,128 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 2,7 SetX = 2,13 @@ -490,7 +490,7 @@ Name = Fury Swipes hit 3 SetOpacity = 10,128 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 3,8 SetX = 3,19 @@ -504,7 +504,7 @@ Name = Fury Swipes hit 3 SetY = 5,131 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,-52 @@ -515,7 +515,7 @@ Name = Fury Swipes hit 3 SetY = 5,132 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,55 @@ -526,7 +526,7 @@ Name = Fury Swipes hit 3 SetY = 5,0 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-117 @@ -534,7 +534,7 @@ Name = Fury Swipes hit 3 SetZ = 5,32 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-47 @@ -542,7 +542,7 @@ Name = Fury Swipes hit 3 SetZ = 5,33 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,15 @@ -550,7 +550,7 @@ Name = Fury Swipes hit 3 SetZ = 5,34 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,73 @@ -558,7 +558,7 @@ Name = Fury Swipes hit 3 SetZ = 5,35 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,99 @@ -566,7 +566,7 @@ Name = Fury Swipes hit 3 SetZ = 5,36 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 7,7 SetX = 7,-14 @@ -583,7 +583,7 @@ Name = Fury Swipes hit 3 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 8,7 SetX = 8,-22 @@ -597,7 +597,7 @@ Name = Fury Swipes hit 3 SetY = 10,82 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,37 @@ -608,7 +608,7 @@ Name = Fury Swipes hit 3 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,61 @@ -619,7 +619,7 @@ Name = Fury Swipes hit 3 SetY = 10,110 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,75 @@ -627,7 +627,7 @@ Name = Fury Swipes hit 3 SetZ = 10,32 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,96 @@ -635,7 +635,7 @@ Name = Fury Swipes hit 3 SetZ = 10,33 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,-53 @@ -646,7 +646,7 @@ Name = Fury Swipes hit 3 Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,3] -Name = Fury Swipes hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -654,7 +654,7 @@ Name = Fury Swipes hit 4 SetX = 0,0 SetY = 0,0 - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 0,6 SetX = 0,53 @@ -675,7 +675,7 @@ Name = Fury Swipes hit 4 SetOpacity = 5,128 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 2,7 SetX = 2,13 @@ -705,7 +705,7 @@ Name = Fury Swipes hit 4 SetOpacity = 10,128 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 3,8 SetX = 3,19 @@ -719,7 +719,7 @@ Name = Fury Swipes hit 4 SetY = 5,131 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,-52 @@ -730,7 +730,7 @@ Name = Fury Swipes hit 4 SetY = 5,132 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,55 @@ -741,7 +741,7 @@ Name = Fury Swipes hit 4 SetY = 5,0 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-117 @@ -749,7 +749,7 @@ Name = Fury Swipes hit 4 SetZ = 5,32 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-47 @@ -757,7 +757,7 @@ Name = Fury Swipes hit 4 SetZ = 5,33 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,15 @@ -765,7 +765,7 @@ Name = Fury Swipes hit 4 SetZ = 5,34 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,73 @@ -773,7 +773,7 @@ Name = Fury Swipes hit 4 SetZ = 5,35 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,99 @@ -781,7 +781,7 @@ Name = Fury Swipes hit 4 SetZ = 5,36 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 7,7 SetX = 7,-14 @@ -798,7 +798,7 @@ Name = Fury Swipes hit 4 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 8,7 SetX = 8,-22 @@ -812,7 +812,7 @@ Name = Fury Swipes hit 4 SetY = 10,82 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,37 @@ -823,7 +823,7 @@ Name = Fury Swipes hit 4 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,61 @@ -834,7 +834,7 @@ Name = Fury Swipes hit 4 SetY = 10,110 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,75 @@ -842,7 +842,7 @@ Name = Fury Swipes hit 4 SetZ = 10,32 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,96 @@ -850,7 +850,7 @@ Name = Fury Swipes hit 4 SetZ = 10,33 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,-53 @@ -861,7 +861,7 @@ Name = Fury Swipes hit 4 Play = 0,Fury Swipes #------------------------------- [Move,FURYSWIPES,4] -Name = Fury Swipes hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -869,7 +869,7 @@ Name = Fury Swipes hit 5 SetX = 0,0 SetY = 0,0 - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 0,6 SetX = 0,53 @@ -890,7 +890,7 @@ Name = Fury Swipes hit 5 SetOpacity = 5,128 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 2,7 SetX = 2,13 @@ -920,7 +920,7 @@ Name = Fury Swipes hit 5 SetOpacity = 10,128 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 3,8 SetX = 3,19 @@ -934,7 +934,7 @@ Name = Fury Swipes hit 5 SetY = 5,131 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,-52 @@ -945,7 +945,7 @@ Name = Fury Swipes hit 5 SetY = 5,132 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 4,10 SetX = 4,55 @@ -956,7 +956,7 @@ Name = Fury Swipes hit 5 SetY = 5,0 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-117 @@ -964,7 +964,7 @@ Name = Fury Swipes hit 5 SetZ = 5,32 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,-47 @@ -972,7 +972,7 @@ Name = Fury Swipes hit 5 SetZ = 5,33 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,15 @@ -980,7 +980,7 @@ Name = Fury Swipes hit 5 SetZ = 5,34 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,73 @@ -988,7 +988,7 @@ Name = Fury Swipes hit 5 SetZ = 5,35 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 5,5 SetX = 5,99 @@ -996,7 +996,7 @@ Name = Fury Swipes hit 5 SetZ = 5,36 SetVisible = 6,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 7,7 SetX = 7,-14 @@ -1013,7 +1013,7 @@ Name = Fury Swipes hit 5 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 8,7 SetX = 8,-22 @@ -1027,7 +1027,7 @@ Name = Fury Swipes hit 5 SetY = 10,82 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,37 @@ -1038,7 +1038,7 @@ Name = Fury Swipes hit 5 SetY = 10,119 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 9,10 SetX = 9,61 @@ -1049,7 +1049,7 @@ Name = Fury Swipes hit 5 SetY = 10,110 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,75 @@ -1057,7 +1057,7 @@ Name = Fury Swipes hit 5 SetZ = 10,32 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,96 @@ -1065,7 +1065,7 @@ Name = Fury Swipes hit 5 SetZ = 10,33 SetVisible = 11,false - Graphic = Scratch + Shadow Claw + Graphic = Examples/Scratch + Shadow Claw Focus = Target SetFrame = 10,11 SetX = 10,-53 diff --git a/PBS/Animations/Converted/Move/FUTURESIGHT.txt b/PBS/Animations/Example anims/Move/FUTURESIGHT.txt similarity index 90% rename from PBS/Animations/Converted/Move/FUTURESIGHT.txt rename to PBS/Animations/Example anims/Move/FUTURESIGHT.txt index b66512a36..b2c1fc874 100644 --- a/PBS/Animations/Converted/Move/FUTURESIGHT.txt +++ b/PBS/Animations/Example anims/Move/FUTURESIGHT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,FUTURESIGHT] -Name = FUTURESIGHT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = FUTURESIGHT SetX = 0,0 SetY = 0,0 - Graphic = face and eye + Graphic = Examples/face and eye Focus = User SetFrame = 0,10 SetX = 0,17 @@ -33,7 +33,7 @@ Name = FUTURESIGHT Play = 0,Flash2,80,78 #------------------------------- [Move,FUTURESIGHT,1] -Name = Future Sight hit +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -41,7 +41,7 @@ Name = Future Sight hit SetX = 0,0 SetY = 0,0 - Graphic = face and eye + Graphic = Examples/face and eye Focus = Target SetFrame = 0,10 SetX = 0,17 diff --git a/PBS/Animations/Converted/Move/GASTROACID.txt b/PBS/Animations/Example anims/Move/GASTROACID.txt similarity index 89% rename from PBS/Animations/Converted/Move/GASTROACID.txt rename to PBS/Animations/Example anims/Move/GASTROACID.txt index 535831da2..cf2f45ae6 100644 --- a/PBS/Animations/Converted/Move/GASTROACID.txt +++ b/PBS/Animations/Example anims/Move/GASTROACID.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,GASTROACID] -Name = GASTROACID +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = GASTROACID SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 0,-31 SetY = 0,14 @@ -37,7 +37,7 @@ Name = GASTROACID SetY = 9,-13 SetX = 10,-19 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 1,9 SetY = 1,24 @@ -63,7 +63,7 @@ Name = GASTROACID SetY = 9,-5 SetVisible = 10,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 2,-21 SetY = 2,18 @@ -77,7 +77,7 @@ Name = GASTROACID SetY = 4,27 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 3,18 SetY = 3,23 @@ -89,7 +89,7 @@ Name = GASTROACID SetY = 4,-27 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 4,-40 SetY = 4,-73 @@ -99,7 +99,7 @@ Name = GASTROACID SetOpacity = 4,200 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 6,-41 SetY = 6,-69 @@ -111,7 +111,7 @@ Name = GASTROACID SetY = 7,-60 SetVisible = 8,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetX = 9,-36 SetY = 9,-72 diff --git a/PBS/Animations/Converted/Move/GIGADRAIN.txt b/PBS/Animations/Example anims/Move/GIGADRAIN.txt similarity index 91% rename from PBS/Animations/Converted/Move/GIGADRAIN.txt rename to PBS/Animations/Example anims/Move/GIGADRAIN.txt index 0da555b0e..f5102f103 100644 --- a/PBS/Animations/Converted/Move/GIGADRAIN.txt +++ b/PBS/Animations/Example anims/Move/GIGADRAIN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,GIGADRAIN] -Name = GIGADRAIN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = GIGADRAIN SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,8 SetX = 0,169 @@ -30,7 +30,7 @@ Name = GIGADRAIN SetFrame = 8,12 SetFrame = 9,13 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,9 SetX = 0,189 @@ -54,7 +54,7 @@ Name = GIGADRAIN SetX = 9,29 SetY = 9,-20 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 1,9 SetX = 1,169 @@ -79,7 +79,7 @@ Name = GIGADRAIN SetX = 9,19 SetY = 9,-40 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 1,9 SetX = 1,164 @@ -101,7 +101,7 @@ Name = GIGADRAIN SetY = 8,-50 SetVisible = 9,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 2,9 SetX = 2,125 @@ -122,7 +122,7 @@ Name = GIGADRAIN SetY = 8,-40 SetVisible = 9,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 2,9 SetX = 2,194 @@ -141,7 +141,7 @@ Name = GIGADRAIN SetY = 7,-79 SetVisible = 8,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 3,9 SetX = 3,84 @@ -159,7 +159,7 @@ Name = GIGADRAIN SetY = 7,-59 SetVisible = 8,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 3,9 SetX = 3,154 @@ -171,7 +171,7 @@ Name = GIGADRAIN SetY = 5,-79 SetVisible = 6,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 4,9 SetX = 4,114 @@ -181,7 +181,7 @@ Name = GIGADRAIN SetY = 5,-50 SetVisible = 6,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 4,9 SetX = 4,209 diff --git a/PBS/Animations/Converted/Move/GLARE.txt b/PBS/Animations/Example anims/Move/GLARE.txt similarity index 90% rename from PBS/Animations/Converted/Move/GLARE.txt rename to PBS/Animations/Example anims/Move/GLARE.txt index 5c6ee51cb..80dd0a06b 100644 --- a/PBS/Animations/Converted/Move/GLARE.txt +++ b/PBS/Animations/Example anims/Move/GLARE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,GLARE] -Name = GLARE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = GLARE SetX = 0,0 SetY = 0,0 - Graphic = face and eye + Graphic = Examples/face and eye Focus = UserAndTarget SetFrame = 0,10 SetX = 0,241 @@ -29,7 +29,7 @@ Name = GLARE SetY = 4,-210 SetVisible = 6,false - Graphic = face and eye + Graphic = Examples/face and eye Focus = UserAndTarget SetFrame = 0,10 SetX = 0,177 diff --git a/PBS/Animations/Converted/Move/GRASSWHISTLE.txt b/PBS/Animations/Example anims/Move/GRASSWHISTLE.txt similarity index 92% rename from PBS/Animations/Converted/Move/GRASSWHISTLE.txt rename to PBS/Animations/Example anims/Move/GRASSWHISTLE.txt index 5b78752a0..e6642b22d 100644 --- a/PBS/Animations/Converted/Move/GRASSWHISTLE.txt +++ b/PBS/Animations/Example anims/Move/GRASSWHISTLE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,GRASSWHISTLE] -Name = GRASSWHISTLE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = GRASSWHISTLE SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetX = 0,14 SetY = 0,-29 @@ -57,7 +57,7 @@ Name = GRASSWHISTLE SetFrame = 15,2 SetY = 15,-157 - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 2,3 SetX = 2,9 @@ -101,7 +101,7 @@ Name = GRASSWHISTLE SetY = 14,-59 SetVisible = 15,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 2,9 SetX = 2,19 @@ -144,7 +144,7 @@ Name = GRASSWHISTLE SetY = 14,-207 SetVisible = 15,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 4,11 SetX = 4,84 @@ -176,7 +176,7 @@ Name = GRASSWHISTLE SetY = 12,-139 SetVisible = 13,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 4,9 SetX = 4,44 @@ -199,7 +199,7 @@ Name = GRASSWHISTLE SetY = 9,-98 SetVisible = 10,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 6,11 SetX = 6,134 @@ -207,7 +207,7 @@ Name = GRASSWHISTLE SetZ = 6,32 SetVisible = 7,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 6,9 SetX = 6,34 @@ -215,7 +215,7 @@ Name = GRASSWHISTLE SetZ = 6,33 SetVisible = 7,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 8,11 SetX = 8,150 @@ -223,7 +223,7 @@ Name = GRASSWHISTLE SetZ = 8,32 SetVisible = 9,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 8,9 SetX = 8,34 @@ -231,7 +231,7 @@ Name = GRASSWHISTLE SetZ = 8,33 SetVisible = 9,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 11,12 SetX = 11,225 @@ -239,7 +239,7 @@ Name = GRASSWHISTLE SetZ = 11,31 SetVisible = 12,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = UserAndTarget SetFrame = 11,9 SetX = 11,34 diff --git a/PBS/Animations/Converted/Move/GROWL.txt b/PBS/Animations/Example anims/Move/GROWL.txt similarity index 90% rename from PBS/Animations/Converted/Move/GROWL.txt rename to PBS/Animations/Example anims/Move/GROWL.txt index 475c861ae..545daedc2 100644 --- a/PBS/Animations/Converted/Move/GROWL.txt +++ b/PBS/Animations/Example anims/Move/GROWL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,GROWL] -Name = GROWL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = GROWL SetX = 0,0 SetY = 0,0 - Graphic = Growl + Graphic = Examples/Growl Focus = User SetFrame = 0,1 SetFlip = 0,true @@ -31,7 +31,7 @@ Name = GROWL SetX = 7,102 SetY = 7,37 - Graphic = Growl + Graphic = Examples/Growl Focus = User SetX = 0,64 SetY = 0,-13 @@ -44,7 +44,7 @@ Name = GROWL SetX = 6,98 SetX = 7,115 - Graphic = Growl + Graphic = Examples/Growl Focus = User SetFrame = 0,1 SetX = 0,57 @@ -68,7 +68,7 @@ Name = GROWL PlayUserCry = 0 #------------------------------- [OppMove,GROWL] -Name = GROWL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -76,7 +76,7 @@ Name = GROWL SetX = 0,0 SetY = 0,0 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFrame = 0,1 SetFlip = 0,true @@ -98,7 +98,7 @@ Name = GROWL SetX = 7,-96 SetY = 7,-36 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFrame = 0,1 SetX = 0,-58 @@ -119,7 +119,7 @@ Name = GROWL SetX = 7,-96 SetY = 7,77 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFlip = 0,true SetX = 0,-58 diff --git a/PBS/Animations/Converted/Move/GRUDGE.txt b/PBS/Animations/Example anims/Move/GRUDGE.txt similarity index 93% rename from PBS/Animations/Converted/Move/GRUDGE.txt rename to PBS/Animations/Example anims/Move/GRUDGE.txt index 4a529499f..aebdd9844 100644 --- a/PBS/Animations/Converted/Move/GRUDGE.txt +++ b/PBS/Animations/Example anims/Move/GRUDGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,GRUDGE] -Name = GRUDGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = GRUDGE SetX = 0,0 SetY = 0,0 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetX = 0,128 SetY = 0,6 @@ -46,7 +46,7 @@ Name = GRUDGE SetX = 11,80 SetY = 11,22 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 1,3 SetX = 1,128 @@ -79,7 +79,7 @@ Name = GRUDGE SetX = 11,112 SetY = 11,14 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 2,2 SetX = 2,128 @@ -110,7 +110,7 @@ Name = GRUDGE SetFrame = 11,3 SetX = 11,80 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetX = 3,128 SetY = 3,6 @@ -140,7 +140,7 @@ Name = GRUDGE SetX = 11,40 SetY = 11,-50 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 4,3 SetX = 4,128 @@ -167,7 +167,7 @@ Name = GRUDGE SetX = 11,-24 SetY = 11,-50 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetX = 6,120 SetY = 6,6 @@ -188,7 +188,7 @@ Name = GRUDGE SetX = 11,-72 SetY = 11,-42 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 7,5 SetX = 7,120 @@ -207,7 +207,7 @@ Name = GRUDGE SetX = 11,-112 SetY = 11,-2 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 8,2 SetX = 8,112 @@ -222,7 +222,7 @@ Name = GRUDGE SetX = 11,-56 SetY = 11,22 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 10,7 SetX = 10,48 diff --git a/PBS/Animations/Converted/Move/GUST.txt b/PBS/Animations/Example anims/Move/GUST.txt similarity index 96% rename from PBS/Animations/Converted/Move/GUST.txt rename to PBS/Animations/Example anims/Move/GUST.txt index a67458869..006d8754d 100644 --- a/PBS/Animations/Converted/Move/GUST.txt +++ b/PBS/Animations/Example anims/Move/GUST.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,GUST] -Name = GUST +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = GUST SetX = 0,0 SetY = 0,0 - Graphic = Gust + Graphic = Examples/Gust Focus = Target SetX = 0,0 SetY = 0,5 @@ -65,7 +65,7 @@ Name = GUST Play = 21,hit,80 #------------------------------- [OppMove,GUST] -Name = GUST +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -73,7 +73,7 @@ Name = GUST SetX = 0,0 SetY = 0,0 - Graphic = Gust + Graphic = Examples/Gust Focus = Target SetX = 0,-256 SetY = 0,133 diff --git a/PBS/Animations/Converted/Move/HAIL.txt b/PBS/Animations/Example anims/Move/HAIL.txt similarity index 87% rename from PBS/Animations/Converted/Move/HAIL.txt rename to PBS/Animations/Example anims/Move/HAIL.txt index f9cf9ca5e..af14df8f0 100644 --- a/PBS/Animations/Converted/Move/HAIL.txt +++ b/PBS/Animations/Example anims/Move/HAIL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HAIL] -Name = HAIL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HAIL SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 SetX = 0,37 @@ -43,7 +43,7 @@ Name = HAIL SetY = 10,107 SetVisible = 11,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 SetX = 0,164 @@ -53,7 +53,7 @@ Name = HAIL SetY = 1,117 SetVisible = 2,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,8 SetX = 0,302 @@ -69,7 +69,7 @@ Name = HAIL SetY = 3,164 SetVisible = 4,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 SetX = 0,440 @@ -88,7 +88,7 @@ Name = HAIL SetY = 4,210 SetVisible = 5,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 SetX = 0,362 @@ -96,7 +96,7 @@ Name = HAIL SetZ = 0,31 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,7 SetX = 2,78 @@ -104,7 +104,7 @@ Name = HAIL SetZ = 2,31 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 3,9 SetX = 3,441 @@ -112,7 +112,7 @@ Name = HAIL SetZ = 3,28 SetVisible = 4,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,9 SetX = 4,259 @@ -139,7 +139,7 @@ Name = HAIL SetX = 12,198 SetY = 12,28 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,8 SetX = 4,72 @@ -147,7 +147,7 @@ Name = HAIL SetZ = 4,32 SetVisible = 5,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 5,9 SetX = 5,225 @@ -155,7 +155,7 @@ Name = HAIL SetZ = 5,28 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 6,8 SetX = 6,334 @@ -163,7 +163,7 @@ Name = HAIL SetZ = 6,29 SetVisible = 7,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 SetX = 6,465 @@ -186,7 +186,7 @@ Name = HAIL SetX = 12,230 SetY = 12,142 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 SetX = 6,161 @@ -196,7 +196,7 @@ Name = HAIL SetY = 7,172 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 8,8 SetX = 8,180 @@ -206,7 +206,7 @@ Name = HAIL SetY = 9,99 SetVisible = 10,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 8,9 SetX = 8,444 @@ -219,7 +219,7 @@ Name = HAIL SetY = 10,89 SetVisible = 11,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,9 SetX = 9,28 @@ -234,7 +234,7 @@ Name = HAIL SetX = 12,167 SetY = 12,237 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 11,8 SetX = 11,176 @@ -242,7 +242,7 @@ Name = HAIL SetZ = 11,28 SetVisible = 12,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 11,7 SetX = 11,281 @@ -252,7 +252,7 @@ Name = HAIL SetX = 12,41 SetY = 12,229 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 11,9 SetX = 11,299 @@ -260,14 +260,14 @@ Name = HAIL SetZ = 11,34 SetVisible = 12,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 12,8 SetX = 12,474 SetY = 12,59 SetZ = 12,29 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 12,9 SetX = 12,449 diff --git a/PBS/Animations/Converted/Move/HARDEN.txt b/PBS/Animations/Example anims/Move/HARDEN.txt similarity index 88% rename from PBS/Animations/Converted/Move/HARDEN.txt rename to PBS/Animations/Example anims/Move/HARDEN.txt index a4da43206..805a8d959 100644 --- a/PBS/Animations/Converted/Move/HARDEN.txt +++ b/PBS/Animations/Example anims/Move/HARDEN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HARDEN] -Name = HARDEN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HARDEN SetX = 0,0 SetY = 0,0 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = User SetFrame = 0,15 SetX = 0,5 diff --git a/PBS/Animations/Converted/Move/HEADBUTT.txt b/PBS/Animations/Example anims/Move/HEADBUTT.txt similarity index 88% rename from PBS/Animations/Converted/Move/HEADBUTT.txt rename to PBS/Animations/Example anims/Move/HEADBUTT.txt index c6cc1a2d6..ce0c4edc1 100644 --- a/PBS/Animations/Converted/Move/HEADBUTT.txt +++ b/PBS/Animations/Example anims/Move/HEADBUTT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HEADBUTT] -Name = HEADBUTT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HEADBUTT SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/HEATWAVE.txt b/PBS/Animations/Example anims/Move/HEATWAVE.txt similarity index 97% rename from PBS/Animations/Converted/Move/HEATWAVE.txt rename to PBS/Animations/Example anims/Move/HEATWAVE.txt index 3d5798d32..883729855 100644 --- a/PBS/Animations/Converted/Move/HEATWAVE.txt +++ b/PBS/Animations/Example anims/Move/HEATWAVE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HEATWAVE] -Name = HEATWAVE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HEATWAVE SetX = 0,0 SetY = 0,0 - Graphic = 011-Weapon06 + Graphic = Examples/011-Weapon06 Focus = UserAndTarget SetFrame = 0,8 SetX = 0,100 diff --git a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt b/PBS/Animations/Example anims/Move/HIGHJUMPKICK.txt similarity index 92% rename from PBS/Animations/Converted/Move/HIGHJUMPKICK.txt rename to PBS/Animations/Example anims/Move/HIGHJUMPKICK.txt index 85da1a054..75473236d 100644 --- a/PBS/Animations/Converted/Move/HIGHJUMPKICK.txt +++ b/PBS/Animations/Example anims/Move/HIGHJUMPKICK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HIGHJUMPKICK] -Name = HIGHJUMPKICK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HIGHJUMPKICK SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,7 SetX = 0,120 diff --git a/PBS/Animations/Converted/Move/HORNATTACK.txt b/PBS/Animations/Example anims/Move/HORNATTACK.txt similarity index 89% rename from PBS/Animations/Converted/Move/HORNATTACK.txt rename to PBS/Animations/Example anims/Move/HORNATTACK.txt index 8bbcab4ac..93f55e195 100644 --- a/PBS/Animations/Converted/Move/HORNATTACK.txt +++ b/PBS/Animations/Example anims/Move/HORNATTACK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HORNATTACK] -Name = HORNATTACK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HORNATTACK SetX = 0,0 SetY = 0,0 - Graphic = Cosmo-01 + Graphic = Examples/Cosmo-01 Focus = UserAndTarget SetFrame = 4,9 SetX = 4,204 @@ -20,7 +20,7 @@ Name = HORNATTACK SetOpacity = 4,100 SetVisible = 5,false - Graphic = Cosmo-01 + Graphic = Examples/Cosmo-01 Focus = UserAndTarget SetFrame = 0,7 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/HYDROPUMP.txt b/PBS/Animations/Example anims/Move/HYDROPUMP.txt similarity index 92% rename from PBS/Animations/Converted/Move/HYDROPUMP.txt rename to PBS/Animations/Example anims/Move/HYDROPUMP.txt index e69499614..9c644a9e0 100644 --- a/PBS/Animations/Converted/Move/HYDROPUMP.txt +++ b/PBS/Animations/Example anims/Move/HYDROPUMP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HYDROPUMP] -Name = HYDROPUMP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HYDROPUMP SetX = 0,0 SetY = 0,0 - Graphic = icewater + Graphic = Examples/icewater Focus = Target SetFrame = 2,14 SetX = 2,96 @@ -27,7 +27,7 @@ Name = HYDROPUMP SetFrame = 13,12 SetVisible = 14,false - Graphic = icewater + Graphic = Examples/icewater Focus = Target SetFrame = 5,14 SetX = 5,-88 @@ -43,7 +43,7 @@ Name = HYDROPUMP SetFrame = 13,8 SetVisible = 14,false - Graphic = icewater + Graphic = Examples/icewater Focus = Target SetFrame = 0,14 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/HYPERFANG.txt b/PBS/Animations/Example anims/Move/HYPERFANG.txt similarity index 90% rename from PBS/Animations/Converted/Move/HYPERFANG.txt rename to PBS/Animations/Example anims/Move/HYPERFANG.txt index b3543ccf9..b685b89f4 100644 --- a/PBS/Animations/Converted/Move/HYPERFANG.txt +++ b/PBS/Animations/Example anims/Move/HYPERFANG.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,HYPERFANG] -Name = HYPERFANG +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = HYPERFANG SetX = 0,0 SetY = 0,0 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetX = 0,-8 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/ICEBALL.txt b/PBS/Animations/Example anims/Move/ICEBALL.txt similarity index 92% rename from PBS/Animations/Converted/Move/ICEBALL.txt rename to PBS/Animations/Example anims/Move/ICEBALL.txt index ff325770e..fa6a4f44a 100644 --- a/PBS/Animations/Converted/Move/ICEBALL.txt +++ b/PBS/Animations/Example anims/Move/ICEBALL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ICEBALL] -Name = ICEBALL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ICEBALL SetX = 0,0 SetY = 0,0 - Graphic = icewater + Graphic = Examples/icewater Focus = UserAndTarget SetX = 0,0 SetY = 0,18 diff --git a/PBS/Animations/Converted/Move/ICEFANG.txt b/PBS/Animations/Example anims/Move/ICEFANG.txt similarity index 90% rename from PBS/Animations/Converted/Move/ICEFANG.txt rename to PBS/Animations/Example anims/Move/ICEFANG.txt index d49d00389..8b3b8e743 100644 --- a/PBS/Animations/Converted/Move/ICEFANG.txt +++ b/PBS/Animations/Example anims/Move/ICEFANG.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ICEFANG] -Name = ICEFANG +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ICEFANG SetX = 0,0 SetY = 0,0 - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetX = 0,11 SetY = 0,-2 @@ -51,7 +51,7 @@ Name = ICEFANG SetX = 12,7 SetY = 12,-1 - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 7,16 SetX = 7,-54 @@ -72,7 +72,7 @@ Name = ICEFANG SetOpacity = 11,204 SetVisible = 12,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 8,16 SetX = 8,-52 @@ -90,7 +90,7 @@ Name = ICEFANG SetOpacity = 11,224 SetVisible = 12,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 8,16 SetX = 8,89 @@ -105,7 +105,7 @@ Name = ICEFANG SetOpacity = 10,174 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 9,16 SetX = 9,15 @@ -116,7 +116,7 @@ Name = ICEFANG SetOpacity = 10,224 SetVisible = 11,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 10,16 SetX = 10,66 diff --git a/PBS/Animations/Converted/Move/ICEPUNCH.txt b/PBS/Animations/Example anims/Move/ICEPUNCH.txt similarity index 89% rename from PBS/Animations/Converted/Move/ICEPUNCH.txt rename to PBS/Animations/Example anims/Move/ICEPUNCH.txt index 3eaa15105..9143b35e6 100644 --- a/PBS/Animations/Converted/Move/ICEPUNCH.txt +++ b/PBS/Animations/Example anims/Move/ICEPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ICEPUNCH] -Name = ICEPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ICEPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 0,6 SetX = 0,0 @@ -37,7 +37,7 @@ Name = ICEPUNCH SetX = 10,-23 SetY = 10,-87 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 1,6 SetX = 1,3 @@ -60,7 +60,7 @@ Name = ICEPUNCH SetX = 10,16 SetY = 10,-54 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,8 SetX = 2,-36 @@ -81,7 +81,7 @@ Name = ICEPUNCH SetX = 10,84 SetY = 10,81 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 3,8 SetX = 3,-1 @@ -99,7 +99,7 @@ Name = ICEPUNCH SetY = 9,-49 SetVisible = 10,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 3,8 SetX = 3,8 @@ -117,7 +117,7 @@ Name = ICEPUNCH SetY = 9,21 SetVisible = 10,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 4,8 SetX = 4,24 @@ -134,7 +134,7 @@ Name = ICEPUNCH SetY = 9,-1 SetVisible = 10,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 4,6 SetX = 4,-6 @@ -149,7 +149,7 @@ Name = ICEPUNCH SetY = 8,21 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 5,8 SetX = 5,-52 @@ -161,7 +161,7 @@ Name = ICEPUNCH SetY = 8,-16 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 5,6 SetX = 5,-3 @@ -173,7 +173,7 @@ Name = ICEPUNCH SetY = 8,-4 SetVisible = 9,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,8 SetX = 7,8 @@ -181,7 +181,7 @@ Name = ICEPUNCH SetZ = 7,36 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,8 SetX = 7,-21 @@ -189,7 +189,7 @@ Name = ICEPUNCH SetZ = 7,37 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,8 SetX = 7,9 diff --git a/PBS/Animations/Converted/Move/ICICLESPEAR.txt b/PBS/Animations/Example anims/Move/ICICLESPEAR.txt similarity index 91% rename from PBS/Animations/Converted/Move/ICICLESPEAR.txt rename to PBS/Animations/Example anims/Move/ICICLESPEAR.txt index c0622e9ec..efc798786 100644 --- a/PBS/Animations/Converted/Move/ICICLESPEAR.txt +++ b/PBS/Animations/Example anims/Move/ICICLESPEAR.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ICICLESPEAR] -Name = ICICLESPEAR +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ICICLESPEAR SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,5 SetFlip = 0,true @@ -35,7 +35,7 @@ Name = ICICLESPEAR Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,1] -Name = Icicle Spear hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -43,7 +43,7 @@ Name = Icicle Spear hit 2 SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,5 SetFlip = 0,true @@ -69,7 +69,7 @@ Name = Icicle Spear hit 2 Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,2] -Name = Icicle Spear hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -77,7 +77,7 @@ Name = Icicle Spear hit 3 SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,5 SetFlip = 0,true @@ -103,7 +103,7 @@ Name = Icicle Spear hit 3 Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,3] -Name = Icicle Spear hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -111,7 +111,7 @@ Name = Icicle Spear hit 4 SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,5 SetFlip = 0,true @@ -137,7 +137,7 @@ Name = Icicle Spear hit 4 Play = 2,Ice2,80 #------------------------------- [Move,ICICLESPEAR,4] -Name = Icicle Spear hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -145,7 +145,7 @@ Name = Icicle Spear hit 5 SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,5 SetFlip = 0,true diff --git a/PBS/Animations/Converted/Move/ICYWIND.txt b/PBS/Animations/Example anims/Move/ICYWIND.txt similarity index 92% rename from PBS/Animations/Converted/Move/ICYWIND.txt rename to PBS/Animations/Example anims/Move/ICYWIND.txt index cbf63df2e..612d8c1cd 100644 --- a/PBS/Animations/Converted/Move/ICYWIND.txt +++ b/PBS/Animations/Example anims/Move/ICYWIND.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ICYWIND] -Name = ICYWIND +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ICYWIND SetX = 0,0 SetY = 0,0 - Graphic = Ice1 + Graphic = Examples/Ice1 Focus = UserAndTarget SetX = 1,4 SetY = 1,-50 @@ -28,7 +28,7 @@ Name = ICYWIND SetY = 5,-139 SetVisible = 6,false - Graphic = Ice1 + Graphic = Examples/Ice1 Focus = UserAndTarget SetX = 3,34 SetY = 3,-70 @@ -40,7 +40,7 @@ Name = ICYWIND SetZoomY = 4,75 SetVisible = 5,false - Graphic = Ice1 + Graphic = Examples/Ice1 Focus = UserAndTarget SetX = 0,9 SetY = 0,-50 diff --git a/PBS/Animations/Converted/Move/INFERNO.txt b/PBS/Animations/Example anims/Move/INFERNO.txt similarity index 86% rename from PBS/Animations/Converted/Move/INFERNO.txt rename to PBS/Animations/Example anims/Move/INFERNO.txt index 6c3e71710..8041564ff 100644 --- a/PBS/Animations/Converted/Move/INFERNO.txt +++ b/PBS/Animations/Example anims/Move/INFERNO.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,INFERNO] -Name = INFERNO +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = INFERNO SetX = 0,0 SetY = 0,0 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 0,-16 SetY = 0,32 @@ -32,7 +32,7 @@ Name = INFERNO SetX = 9,-8 SetY = 9,33 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 0,21 SetY = 0,27 @@ -55,7 +55,7 @@ Name = INFERNO SetX = 9,-33 SetY = 9,33 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 1,3 SetY = 1,23 @@ -77,7 +77,7 @@ Name = INFERNO SetX = 9,-13 SetY = 9,12 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 1,-7 SetY = 1,9 @@ -99,7 +99,7 @@ Name = INFERNO SetX = 9,-32 SetY = 9,4 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 1,18 SetY = 1,11 @@ -121,7 +121,7 @@ Name = INFERNO SetX = 9,-35 SetY = 9,-18 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 2,-20 SetY = 2,7 @@ -141,7 +141,7 @@ Name = INFERNO SetX = 9,-14 SetY = 9,-8 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 2,2 SetY = 2,-1 @@ -161,7 +161,7 @@ Name = INFERNO SetX = 9,7 SetY = 9,9 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 2,-35 SetY = 2,-4 @@ -181,7 +181,7 @@ Name = INFERNO SetX = 9,22 SetY = 9,32 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 3,9 SetY = 3,3 @@ -192,7 +192,7 @@ Name = INFERNO SetY = 5,21 SetVisible = 6,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 3,-27 SetY = 3,-7 @@ -203,7 +203,7 @@ Name = INFERNO SetY = 5,-17 SetVisible = 6,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 3,28 SetY = 3,-1 @@ -212,7 +212,7 @@ Name = INFERNO SetY = 4,-3 SetVisible = 5,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 3,-4 SetY = 3,-15 @@ -221,35 +221,35 @@ Name = INFERNO SetY = 4,-12 SetVisible = 5,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 4,-17 SetY = 4,-22 SetZ = 4,39 SetVisible = 5,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 4,-41 SetY = 4,-17 SetZ = 4,40 SetVisible = 5,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 4,18 SetY = 4,-20 SetZ = 4,41 SetVisible = 5,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 4,-2 SetY = 4,-38 SetZ = 4,42 SetVisible = 5,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,11 SetY = 7,12 @@ -259,7 +259,7 @@ Name = INFERNO SetX = 9,33 SetY = 9,11 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,16 SetY = 7,-15 @@ -269,7 +269,7 @@ Name = INFERNO SetX = 9,13 SetY = 9,-8 - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,3 SetY = 7,-25 @@ -278,7 +278,7 @@ Name = INFERNO SetY = 8,-13 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,-43 SetY = 7,-17 @@ -287,7 +287,7 @@ Name = INFERNO SetY = 8,-26 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,-29 SetY = 7,-35 @@ -296,7 +296,7 @@ Name = INFERNO SetY = 8,-37 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,-1 SetY = 7,-44 @@ -305,7 +305,7 @@ Name = INFERNO SetY = 8,-39 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,35 SetY = 7,-19 @@ -314,7 +314,7 @@ Name = INFERNO SetY = 8,-34 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 7,38 SetY = 7,7 @@ -323,21 +323,21 @@ Name = INFERNO SetY = 8,-48 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 8,39 SetY = 8,20 SetZ = 8,43 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 8,30 SetY = 8,42 SetZ = 8,44 SetVisible = 9,false - Graphic = Flames + Graphic = Examples/Flames Focus = Target SetX = 8,12 SetY = 8,-63 diff --git a/PBS/Animations/Converted/Move/IRONHEAD.txt b/PBS/Animations/Example anims/Move/IRONHEAD.txt similarity index 85% rename from PBS/Animations/Converted/Move/IRONHEAD.txt rename to PBS/Animations/Example anims/Move/IRONHEAD.txt index 16a2dfb7f..514c8e6ac 100644 --- a/PBS/Animations/Converted/Move/IRONHEAD.txt +++ b/PBS/Animations/Example anims/Move/IRONHEAD.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,IRONHEAD] -Name = IRONHEAD +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = IRONHEAD SetX = 0,0 SetY = 0,0 - Graphic = Iron Head + Graphic = Examples/Iron Head Focus = Target SetFrame = 1,2 SetX = 1,0 @@ -20,7 +20,7 @@ Name = IRONHEAD SetFrame = 6,0 SetOpacity = 7,128 - Graphic = Iron Head + Graphic = Examples/Iron Head Focus = Target SetFrame = 2,5 SetX = 2,-53 @@ -33,7 +33,7 @@ Name = IRONHEAD SetOpacity = 4,128 SetVisible = 5,false - Graphic = Iron Head + Graphic = Examples/Iron Head Focus = Target SetFrame = 2,6 SetX = 2,53 @@ -46,7 +46,7 @@ Name = IRONHEAD SetOpacity = 4,128 SetVisible = 5,false - Graphic = Iron Head + Graphic = Examples/Iron Head Focus = Target SetFrame = 3,7 SetX = 3,-105 @@ -56,7 +56,7 @@ Name = IRONHEAD SetY = 4,-69 SetVisible = 5,false - Graphic = Iron Head + Graphic = Examples/Iron Head Focus = Target SetFrame = 3,8 SetX = 3,77 @@ -66,7 +66,7 @@ Name = IRONHEAD SetY = 4,-42 SetVisible = 5,false - Graphic = Iron Head + Graphic = Examples/Iron Head Focus = Target SetFrame = 3,8 SetX = 3,-109 diff --git a/PBS/Animations/Converted/Move/JUMPKICK.txt b/PBS/Animations/Example anims/Move/JUMPKICK.txt similarity index 92% rename from PBS/Animations/Converted/Move/JUMPKICK.txt rename to PBS/Animations/Example anims/Move/JUMPKICK.txt index 29bad7914..de0ba19a9 100644 --- a/PBS/Animations/Converted/Move/JUMPKICK.txt +++ b/PBS/Animations/Example anims/Move/JUMPKICK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,JUMPKICK] -Name = JUMPKICK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = JUMPKICK SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,7 SetX = 0,120 diff --git a/PBS/Animations/Converted/Move/KARATECHOP.txt b/PBS/Animations/Example anims/Move/KARATECHOP.txt similarity index 93% rename from PBS/Animations/Converted/Move/KARATECHOP.txt rename to PBS/Animations/Example anims/Move/KARATECHOP.txt index 92704fb78..654194936 100644 --- a/PBS/Animations/Converted/Move/KARATECHOP.txt +++ b/PBS/Animations/Example anims/Move/KARATECHOP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,KARATECHOP] -Name = KARATECHOP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = KARATECHOP SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,13 SetX = 0,-152 diff --git a/PBS/Animations/Converted/Move/KINESIS.txt b/PBS/Animations/Example anims/Move/KINESIS.txt similarity index 91% rename from PBS/Animations/Converted/Move/KINESIS.txt rename to PBS/Animations/Example anims/Move/KINESIS.txt index fd2efecab..0aec951a4 100644 --- a/PBS/Animations/Converted/Move/KINESIS.txt +++ b/PBS/Animations/Example anims/Move/KINESIS.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,KINESIS] -Name = KINESIS +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = KINESIS SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 0,2 SetX = 0,-1 diff --git a/PBS/Animations/Converted/Move/LEAFBLADE.txt b/PBS/Animations/Example anims/Move/LEAFBLADE.txt similarity index 94% rename from PBS/Animations/Converted/Move/LEAFBLADE.txt rename to PBS/Animations/Example anims/Move/LEAFBLADE.txt index 3b557d97d..cd9e16f77 100644 --- a/PBS/Animations/Converted/Move/LEAFBLADE.txt +++ b/PBS/Animations/Example anims/Move/LEAFBLADE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LEAFBLADE] -Name = LEAFBLADE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LEAFBLADE SetX = 0,0 SetY = 0,0 - Graphic = Sword5 + Graphic = Examples/Sword5 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/LEECHLIFE.txt b/PBS/Animations/Example anims/Move/LEECHLIFE.txt similarity index 91% rename from PBS/Animations/Converted/Move/LEECHLIFE.txt rename to PBS/Animations/Example anims/Move/LEECHLIFE.txt index 666ac4c05..192c4747d 100644 --- a/PBS/Animations/Converted/Move/LEECHLIFE.txt +++ b/PBS/Animations/Example anims/Move/LEECHLIFE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LEECHLIFE] -Name = LEECHLIFE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LEECHLIFE SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,14 SetX = 0,29 @@ -48,7 +48,7 @@ Name = LEECHLIFE SetX = 11,14 SetY = 11,9 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 4,8 SetX = 4,164 @@ -75,7 +75,7 @@ Name = LEECHLIFE SetX = 11,-25 SetY = 11,-20 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 4,9 SetX = 4,200 @@ -101,7 +101,7 @@ Name = LEECHLIFE SetY = 10,-89 SetVisible = 11,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 6,9 SetX = 6,200 @@ -118,7 +118,7 @@ Name = LEECHLIFE SetY = 9,-148 SetVisible = 10,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 6,8 SetX = 6,164 @@ -130,7 +130,7 @@ Name = LEECHLIFE SetY = 8,-118 SetVisible = 9,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 7,8 SetX = 7,194 @@ -140,7 +140,7 @@ Name = LEECHLIFE SetX = 8,109 SetVisible = 9,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 7,8 SetX = 7,150 @@ -148,7 +148,7 @@ Name = LEECHLIFE SetZ = 7,33 SetVisible = 8,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 7,8 SetX = 7,209 diff --git a/PBS/Animations/Converted/Move/LEECHSEED.txt b/PBS/Animations/Example anims/Move/LEECHSEED.txt similarity index 88% rename from PBS/Animations/Converted/Move/LEECHSEED.txt rename to PBS/Animations/Example anims/Move/LEECHSEED.txt index 742974432..da40a8b9a 100644 --- a/PBS/Animations/Converted/Move/LEECHSEED.txt +++ b/PBS/Animations/Example anims/Move/LEECHSEED.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LEECHSEED] -Name = LEECHSEED +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LEECHSEED SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 4,14 SetY = 4,-29 @@ -20,21 +20,21 @@ Name = LEECHSEED SetY = 6,-168 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 8,175 SetY = 8,-207 SetZ = 8,29 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 10,229 SetY = 10,-148 SetZ = 10,29 SetVisible = 11,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 12,3 SetX = 12,229 @@ -46,7 +46,7 @@ Name = LEECHSEED SetFrame = 20,2 SetVisible = 24,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 0,14 SetY = 0,-29 @@ -74,7 +74,7 @@ Name = LEECHSEED SetFrame = 20,1 SetVisible = 24,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 2,14 SetY = 2,-29 @@ -104,7 +104,7 @@ Name = LEECHSEED SetVisible = 24,false #------------------------------- [OppMove,LEECHSEED] -Name = LEECHSEED +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -112,7 +112,7 @@ Name = LEECHSEED SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 2,200 SetY = 2,-196 @@ -136,7 +136,7 @@ Name = LEECHSEED SetFrame = 16,2 SetVisible = 24,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 4,200 SetY = 4,-196 @@ -147,21 +147,21 @@ Name = LEECHSEED SetY = 6,-237 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 8,64 SetY = 8,-128 SetZ = 8,29 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 10,25 SetY = 10,39 SetZ = 10,29 SetVisible = 11,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 12,3 SetX = 12,25 @@ -173,7 +173,7 @@ Name = LEECHSEED SetFrame = 20,2 SetVisible = 24,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetX = 0,200 SetY = 0,-196 diff --git a/PBS/Animations/Converted/Move/LEER.txt b/PBS/Animations/Example anims/Move/LEER.txt similarity index 90% rename from PBS/Animations/Converted/Move/LEER.txt rename to PBS/Animations/Example anims/Move/LEER.txt index 4b179069f..886858ca9 100644 --- a/PBS/Animations/Converted/Move/LEER.txt +++ b/PBS/Animations/Example anims/Move/LEER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LEER] -Name = LEER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LEER SetX = 0,0 SetY = 0,0 - Graphic = leer + Graphic = Examples/leer Focus = UserAndTarget SetX = 0,14 SetY = 0,-29 @@ -29,7 +29,7 @@ Name = LEER Play = 0,Saint9 #------------------------------- [OppMove,LEER] -Name = LEER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -37,7 +37,7 @@ Name = LEER SetX = 0,0 SetY = 0,0 - Graphic = leer + Graphic = Examples/leer Focus = UserAndTarget SetX = 0,173 SetY = 0,-226 diff --git a/PBS/Animations/Converted/Move/LICK.txt b/PBS/Animations/Example anims/Move/LICK.txt similarity index 89% rename from PBS/Animations/Converted/Move/LICK.txt rename to PBS/Animations/Example anims/Move/LICK.txt index c4b659479..db69d7770 100644 --- a/PBS/Animations/Converted/Move/LICK.txt +++ b/PBS/Animations/Example anims/Move/LICK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LICK] -Name = LICK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LICK SetX = 0,0 SetY = 0,0 - Graphic = ghost1 + Graphic = Examples/ghost1 Focus = Target SetFrame = 0,11 SetX = 0,16 diff --git a/PBS/Animations/Converted/Move/LIGHTSCREEN.txt b/PBS/Animations/Example anims/Move/LIGHTSCREEN.txt similarity index 89% rename from PBS/Animations/Converted/Move/LIGHTSCREEN.txt rename to PBS/Animations/Example anims/Move/LIGHTSCREEN.txt index 64e296ef1..312e99e38 100644 --- a/PBS/Animations/Converted/Move/LIGHTSCREEN.txt +++ b/PBS/Animations/Example anims/Move/LIGHTSCREEN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LIGHTSCREEN] -Name = LIGHTSCREEN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LIGHTSCREEN SetX = 0,0 SetY = 0,0 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 1,10 SetX = 1,58 @@ -39,7 +39,7 @@ Name = LIGHTSCREEN SetX = 10,46 SetY = 10,-39 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 4,10 SetX = 4,-16 @@ -59,7 +59,7 @@ Name = LIGHTSCREEN SetX = 10,-7 SetY = 10,-38 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 7,6 SetX = 7,56 @@ -72,7 +72,7 @@ Name = LIGHTSCREEN SetX = 10,-37 SetY = 10,39 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 8,10 SetX = 8,0 @@ -84,7 +84,7 @@ Name = LIGHTSCREEN SetX = 10,64 SetY = 10,66 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 1,15 SetBlending = 1,1 diff --git a/PBS/Animations/Converted/Move/LOCKON.txt b/PBS/Animations/Example anims/Move/LOCKON.txt similarity index 91% rename from PBS/Animations/Converted/Move/LOCKON.txt rename to PBS/Animations/Example anims/Move/LOCKON.txt index c12ff39d7..041b9a4f6 100644 --- a/PBS/Animations/Converted/Move/LOCKON.txt +++ b/PBS/Animations/Example anims/Move/LOCKON.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LOCKON] -Name = LOCKON +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LOCKON SetX = 0,0 SetY = 0,0 - Graphic = mixed + Graphic = Examples/mixed Focus = Target SetFrame = 2,4 SetX = 2,11 @@ -21,7 +21,7 @@ Name = LOCKON SetY = 3,1 SetVisible = 4,false - Graphic = mixed + Graphic = Examples/mixed Focus = Target SetFrame = 4,5 SetX = 4,20 @@ -34,7 +34,7 @@ Name = LOCKON SetY = 6,-9 SetVisible = 7,false - Graphic = mixed + Graphic = Examples/mixed Focus = Target SetFrame = 7,6 SetX = 7,12 @@ -44,7 +44,7 @@ Name = LOCKON SetZoomY = 7,200 SetVisible = 8,false - Graphic = mixed + Graphic = Examples/mixed Focus = Target SetFrame = 8,6 SetX = 8,11 @@ -96,7 +96,7 @@ Name = LOCKON SetY = 29,-3 SetOpacity = 29,168 - Graphic = mixed + Graphic = Examples/mixed Focus = Target SetFrame = 0,4 SetX = 0,11 diff --git a/PBS/Animations/Converted/Move/LOVELYKISS.txt b/PBS/Animations/Example anims/Move/LOVELYKISS.txt similarity index 89% rename from PBS/Animations/Converted/Move/LOVELYKISS.txt rename to PBS/Animations/Example anims/Move/LOVELYKISS.txt index eda2e43e9..a94b7e7b1 100644 --- a/PBS/Animations/Converted/Move/LOVELYKISS.txt +++ b/PBS/Animations/Example anims/Move/LOVELYKISS.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LOVELYKISS] -Name = LOVELYKISS +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LOVELYKISS SetX = 0,0 SetY = 0,0 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = UserAndTarget SetFrame = 0,4 SetX = 0,208 @@ -34,7 +34,7 @@ Name = LOVELYKISS SetX = 9,178 SetY = 9,-184 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = UserAndTarget SetFrame = 1,5 SetX = 1,193 @@ -59,7 +59,7 @@ Name = LOVELYKISS SetX = 9,185 SetY = 9,-262 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = UserAndTarget SetFrame = 1,3 SetX = 1,217 @@ -83,7 +83,7 @@ Name = LOVELYKISS SetX = 9,189 SetY = 9,-215 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = UserAndTarget SetFrame = 5,5 SetX = 5,189 @@ -97,7 +97,7 @@ Name = LOVELYKISS SetX = 9,187 SetY = 9,-237 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = UserAndTarget SetFrame = 6,5 SetX = 6,180 @@ -107,7 +107,7 @@ Name = LOVELYKISS SetY = 7,-256 SetVisible = 8,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = UserAndTarget SetFrame = 7,5 SetX = 7,158 diff --git a/PBS/Animations/Converted/Move/LOWKICK.txt b/PBS/Animations/Example anims/Move/LOWKICK.txt similarity index 91% rename from PBS/Animations/Converted/Move/LOWKICK.txt rename to PBS/Animations/Example anims/Move/LOWKICK.txt index 6565bb021..032758c3a 100644 --- a/PBS/Animations/Converted/Move/LOWKICK.txt +++ b/PBS/Animations/Example anims/Move/LOWKICK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LOWKICK] -Name = LOWKICK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LOWKICK SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,7 SetX = 0,96 diff --git a/PBS/Animations/Converted/Move/LUCKYCHANT.txt b/PBS/Animations/Example anims/Move/LUCKYCHANT.txt similarity index 87% rename from PBS/Animations/Converted/Move/LUCKYCHANT.txt rename to PBS/Animations/Example anims/Move/LUCKYCHANT.txt index 06826ba52..3a803d408 100644 --- a/PBS/Animations/Converted/Move/LUCKYCHANT.txt +++ b/PBS/Animations/Example anims/Move/LUCKYCHANT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,LUCKYCHANT] -Name = LUCKYCHANT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = LUCKYCHANT SetX = 0,0 SetY = 0,0 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 0,14 SetX = 0,192 @@ -18,7 +18,7 @@ Name = LUCKYCHANT SetOpacity = 0,220 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 0,8 SetX = 0,162 @@ -40,7 +40,7 @@ Name = LUCKYCHANT SetY = 7,-221 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 0,8 SetX = 0,162 @@ -62,7 +62,7 @@ Name = LUCKYCHANT SetY = 7,-243 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 1,8 SetX = 1,167 @@ -82,7 +82,7 @@ Name = LUCKYCHANT SetY = 7,-250 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 1,8 SetX = 1,182 @@ -101,7 +101,7 @@ Name = LUCKYCHANT SetY = 7,-250 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 2,8 SetX = 2,237 @@ -119,7 +119,7 @@ Name = LUCKYCHANT SetY = 7,-267 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 2,8 SetX = 2,230 @@ -137,7 +137,7 @@ Name = LUCKYCHANT SetY = 7,-201 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 2,8 SetX = 2,217 @@ -155,7 +155,7 @@ Name = LUCKYCHANT SetY = 7,-187 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 2,8 SetX = 2,233 @@ -173,7 +173,7 @@ Name = LUCKYCHANT SetY = 7,-154 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 2,8 SetX = 2,179 @@ -191,7 +191,7 @@ Name = LUCKYCHANT SetY = 7,-151 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 3,8 SetX = 3,242 @@ -206,7 +206,7 @@ Name = LUCKYCHANT SetY = 7,-123 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 3,8 SetX = 3,175 @@ -222,7 +222,7 @@ Name = LUCKYCHANT SetY = 7,-132 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 3,8 SetX = 3,235 @@ -238,7 +238,7 @@ Name = LUCKYCHANT SetY = 7,-107 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 4,8 SetX = 4,233 @@ -252,7 +252,7 @@ Name = LUCKYCHANT SetY = 7,-135 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 4,8 SetX = 4,169 @@ -260,7 +260,7 @@ Name = LUCKYCHANT SetZ = 4,41 SetVisible = 5,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 6,8 SetX = 6,154 @@ -270,7 +270,7 @@ Name = LUCKYCHANT SetY = 7,-165 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 6,8 SetX = 6,165 @@ -280,7 +280,7 @@ Name = LUCKYCHANT SetY = 7,-185 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 7,8 SetX = 7,236 @@ -288,7 +288,7 @@ Name = LUCKYCHANT SetZ = 7,43 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 7,8 SetX = 7,245 @@ -296,7 +296,7 @@ Name = LUCKYCHANT SetZ = 7,44 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 7,8 SetX = 7,228 @@ -304,7 +304,7 @@ Name = LUCKYCHANT SetZ = 7,45 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 7,8 SetX = 7,217 @@ -312,7 +312,7 @@ Name = LUCKYCHANT SetZ = 7,46 SetOpacity = 9,128 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = UserAndTarget SetFrame = 7,8 SetX = 7,222 diff --git a/PBS/Animations/Converted/Move/MACHPUNCH.txt b/PBS/Animations/Example anims/Move/MACHPUNCH.txt similarity index 94% rename from PBS/Animations/Converted/Move/MACHPUNCH.txt rename to PBS/Animations/Example anims/Move/MACHPUNCH.txt index f6da2b24d..fd434ee84 100644 --- a/PBS/Animations/Converted/Move/MACHPUNCH.txt +++ b/PBS/Animations/Example anims/Move/MACHPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MACHPUNCH] -Name = MACHPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MACHPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,5 SetX = 2,15 @@ -17,7 +17,7 @@ Name = MACHPUNCH SetZ = 2,28 SetVisible = 3,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 0,5 SetX = 0,19 diff --git a/PBS/Animations/Converted/Move/MAGICCOAT.txt b/PBS/Animations/Example anims/Move/MAGICCOAT.txt similarity index 87% rename from PBS/Animations/Converted/Move/MAGICCOAT.txt rename to PBS/Animations/Example anims/Move/MAGICCOAT.txt index 47acb1267..4d39ebb6e 100644 --- a/PBS/Animations/Converted/Move/MAGICCOAT.txt +++ b/PBS/Animations/Example anims/Move/MAGICCOAT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MAGICCOAT] -Name = MAGICCOAT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MAGICCOAT SetX = 0,0 SetY = 0,0 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 0,15 SetX = 0,1 @@ -20,7 +20,7 @@ Name = MAGICCOAT SetOpacity = 9,72 SetOpacity = 10,37 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 2,7 SetX = 2,4 @@ -44,7 +44,7 @@ Name = MAGICCOAT SetX = 10,6 SetY = 10,50 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 2,7 SetX = 2,19 @@ -69,7 +69,7 @@ Name = MAGICCOAT SetX = 10,63 SetY = 10,-41 - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 2,7 SetX = 2,44 @@ -93,7 +93,7 @@ Name = MAGICCOAT SetY = 9,14 SetVisible = 10,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 2,7 SetX = 2,21 @@ -115,7 +115,7 @@ Name = MAGICCOAT SetY = 8,-17 SetVisible = 9,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 2,7 SetX = 2,-47 @@ -125,7 +125,7 @@ Name = MAGICCOAT SetY = 3,-25 SetVisible = 4,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 2,7 SetX = 2,-47 @@ -133,7 +133,7 @@ Name = MAGICCOAT SetZ = 2,33 SetVisible = 3,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 6,7 SetX = 6,57 @@ -141,7 +141,7 @@ Name = MAGICCOAT SetZ = 6,32 SetVisible = 7,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 6,7 SetX = 6,69 @@ -149,7 +149,7 @@ Name = MAGICCOAT SetZ = 6,33 SetVisible = 7,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 8,7 SetX = 8,-27 @@ -157,7 +157,7 @@ Name = MAGICCOAT SetZ = 8,32 SetVisible = 9,false - Graphic = anim sheet + Graphic = Examples/anim sheet Focus = Target SetFrame = 8,7 SetX = 8,-15 diff --git a/PBS/Animations/Converted/Move/MEANLOOK.txt b/PBS/Animations/Example anims/Move/MEANLOOK.txt similarity index 89% rename from PBS/Animations/Converted/Move/MEANLOOK.txt rename to PBS/Animations/Example anims/Move/MEANLOOK.txt index 3023a1cc8..ea658f769 100644 --- a/PBS/Animations/Converted/Move/MEANLOOK.txt +++ b/PBS/Animations/Example anims/Move/MEANLOOK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MEANLOOK] -Name = MEANLOOK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MEANLOOK SetX = 0,0 SetY = 0,0 - Graphic = face and eye + Graphic = Examples/face and eye Focus = Target SetFrame = 0,10 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/MEGADRAIN.txt b/PBS/Animations/Example anims/Move/MEGADRAIN.txt similarity index 90% rename from PBS/Animations/Converted/Move/MEGADRAIN.txt rename to PBS/Animations/Example anims/Move/MEGADRAIN.txt index c5adb854a..9f3aa3c62 100644 --- a/PBS/Animations/Converted/Move/MEGADRAIN.txt +++ b/PBS/Animations/Example anims/Move/MEGADRAIN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MEGADRAIN] -Name = MEGADRAIN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MEGADRAIN SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 0,8 SetX = 0,169 @@ -30,7 +30,7 @@ Name = MEGADRAIN SetFrame = 8,12 SetFrame = 9,13 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 1,8 SetX = 1,209 @@ -51,7 +51,7 @@ Name = MEGADRAIN SetX = 9,29 SetY = 9,-20 - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 2,8 SetX = 2,164 @@ -71,7 +71,7 @@ Name = MEGADRAIN SetY = 8,-79 SetVisible = 9,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 3,8 SetX = 3,189 @@ -88,7 +88,7 @@ Name = MEGADRAIN SetY = 8,-50 SetVisible = 9,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 3,8 SetX = 3,189 @@ -104,7 +104,7 @@ Name = MEGADRAIN SetY = 7,-139 SetVisible = 8,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 4,8 SetX = 4,194 @@ -118,7 +118,7 @@ Name = MEGADRAIN SetY = 7,-79 SetVisible = 8,false - Graphic = rockice + Graphic = Examples/rockice Focus = UserAndTarget SetFrame = 4,8 SetX = 4,189 @@ -134,7 +134,7 @@ Name = MEGADRAIN Play = 7,Absorb2,80 #------------------------------- [OppMove,MEGADRAIN] -Name = MEGADRAIN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -142,7 +142,7 @@ Name = MEGADRAIN SetX = 0,0 SetY = 0,0 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 0,11 SetX = 0,0 @@ -161,7 +161,7 @@ Name = MEGADRAIN SetY = 5,-193 SetVisible = 6,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 1,11 SetX = 1,0 @@ -178,7 +178,7 @@ Name = MEGADRAIN SetY = 5,-195 SetVisible = 6,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 2,11 SetX = 2,0 @@ -197,7 +197,7 @@ Name = MEGADRAIN SetY = 7,-198 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 3,11 SetX = 3,3 @@ -216,7 +216,7 @@ Name = MEGADRAIN SetY = 8,-195 SetVisible = 9,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 4,12 SetX = 4,139 @@ -228,7 +228,7 @@ Name = MEGADRAIN SetY = 6,-173 SetVisible = 7,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 7,12 SetX = 7,178 @@ -236,7 +236,7 @@ Name = MEGADRAIN SetZ = 7,27 SetVisible = 8,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 9,10 SetX = 9,208 @@ -266,7 +266,7 @@ Name = MEGADRAIN SetX = 19,218 SetY = 19,-225 - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 10,10 SetX = 10,188 @@ -294,7 +294,7 @@ Name = MEGADRAIN SetY = 18,-231 SetVisible = 19,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 11,10 SetX = 11,211 @@ -318,7 +318,7 @@ Name = MEGADRAIN SetY = 17,-226 SetVisible = 18,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 12,10 SetX = 12,185 @@ -337,7 +337,7 @@ Name = MEGADRAIN SetY = 16,-228 SetVisible = 17,false - Graphic = leech-seed + Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 13,10 SetX = 13,211 diff --git a/PBS/Animations/Converted/Move/MEGAHORN.txt b/PBS/Animations/Example anims/Move/MEGAHORN.txt similarity index 90% rename from PBS/Animations/Converted/Move/MEGAHORN.txt rename to PBS/Animations/Example anims/Move/MEGAHORN.txt index 73b09c95c..10c313535 100644 --- a/PBS/Animations/Converted/Move/MEGAHORN.txt +++ b/PBS/Animations/Example anims/Move/MEGAHORN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MEGAHORN] -Name = MEGAHORN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MEGAHORN SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,44 SetY = 0,-59 @@ -34,7 +34,7 @@ Name = MEGAHORN SetY = 9,-178 SetVisible = 11,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 0,14 SetX = 0,-60 @@ -54,7 +54,7 @@ Name = MEGAHORN SetY = 5,18 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 0,14 SetX = 0,114 @@ -77,7 +77,7 @@ Name = MEGAHORN SetZoomY = 5,150 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 0,14 SetX = 0,59 @@ -91,7 +91,7 @@ Name = MEGAHORN SetY = 2,-29 SetVisible = 3,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 2,14 SetX = 2,-5 @@ -101,7 +101,7 @@ Name = MEGAHORN SetZoomY = 2,25 SetVisible = 3,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 4,14 SetX = 4,64 @@ -111,7 +111,7 @@ Name = MEGAHORN SetZoomY = 4,25 SetVisible = 5,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 9,14 SetX = 9,169 diff --git a/PBS/Animations/Converted/Move/MEGAKICK.txt b/PBS/Animations/Example anims/Move/MEGAKICK.txt similarity index 88% rename from PBS/Animations/Converted/Move/MEGAKICK.txt rename to PBS/Animations/Example anims/Move/MEGAKICK.txt index ee16a430e..10858a323 100644 --- a/PBS/Animations/Converted/Move/MEGAKICK.txt +++ b/PBS/Animations/Example anims/Move/MEGAKICK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MEGAKICK] -Name = MEGAKICK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,14 +9,14 @@ Name = MEGAKICK SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 3,0 SetY = 3,14 SetZ = 3,28 SetVisible = 4,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetFrame = 0,9 SetX = 0,-8 diff --git a/PBS/Animations/Converted/Move/MEGAPUNCH.txt b/PBS/Animations/Example anims/Move/MEGAPUNCH.txt similarity index 93% rename from PBS/Animations/Converted/Move/MEGAPUNCH.txt rename to PBS/Animations/Example anims/Move/MEGAPUNCH.txt index db09ae984..12ffb87c8 100644 --- a/PBS/Animations/Converted/Move/MEGAPUNCH.txt +++ b/PBS/Animations/Example anims/Move/MEGAPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MEGAPUNCH] -Name = MEGAPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MEGAPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 2,12 SetY = 2,8 @@ -26,7 +26,7 @@ Name = MEGAPUNCH SetY = 9,5 SetOpacity = 9,200 - Graphic = punches + Graphic = Examples/punches Focus = Target SetX = 0,0 SetY = 0,-1 diff --git a/PBS/Animations/Converted/Move/METALCLAW.txt b/PBS/Animations/Example anims/Move/METALCLAW.txt similarity index 92% rename from PBS/Animations/Converted/Move/METALCLAW.txt rename to PBS/Animations/Example anims/Move/METALCLAW.txt index 07187a17d..6ec3334c6 100644 --- a/PBS/Animations/Converted/Move/METALCLAW.txt +++ b/PBS/Animations/Example anims/Move/METALCLAW.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,METALCLAW] -Name = METALCLAW +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = METALCLAW SetX = 0,0 SetY = 0,0 - Graphic = dragon claw + Graphic = Examples/dragon claw Focus = UserAndTarget SetFrame = 0,1 SetX = 0,202 diff --git a/PBS/Animations/Converted/Move/METEORMASH.txt b/PBS/Animations/Example anims/Move/METEORMASH.txt similarity index 91% rename from PBS/Animations/Converted/Move/METEORMASH.txt rename to PBS/Animations/Example anims/Move/METEORMASH.txt index 644cc2240..bc7ee7c0c 100644 --- a/PBS/Animations/Converted/Move/METEORMASH.txt +++ b/PBS/Animations/Example anims/Move/METEORMASH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,METEORMASH] -Name = METEORMASH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = METEORMASH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 0,2 SetX = 0,204 @@ -24,7 +24,7 @@ Name = METEORMASH SetX = 7,204 SetY = 7,-196 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 1,15 SetX = 1,203 @@ -51,7 +51,7 @@ Name = METEORMASH SetX = 9,225 SetY = 9,-129 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 1,15 SetX = 1,165 @@ -79,7 +79,7 @@ Name = METEORMASH SetX = 9,182 SetY = 9,-117 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 2,15 SetX = 2,227 @@ -105,7 +105,7 @@ Name = METEORMASH SetX = 9,214 SetY = 9,-260 - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 2,15 SetX = 2,235 @@ -126,7 +126,7 @@ Name = METEORMASH SetY = 7,-268 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 3,15 SetX = 3,188 @@ -134,7 +134,7 @@ Name = METEORMASH SetZ = 3,32 SetVisible = 4,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 5,15 SetX = 5,166 @@ -148,7 +148,7 @@ Name = METEORMASH SetY = 7,-217 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = UserAndTarget SetFrame = 5,15 SetX = 5,189 diff --git a/PBS/Animations/Converted/Move/METRONOME.txt b/PBS/Animations/Example anims/Move/METRONOME.txt similarity index 93% rename from PBS/Animations/Converted/Move/METRONOME.txt rename to PBS/Animations/Example anims/Move/METRONOME.txt index 5222557b8..635cf1aeb 100644 --- a/PBS/Animations/Converted/Move/METRONOME.txt +++ b/PBS/Animations/Example anims/Move/METRONOME.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,METRONOME] -Name = METRONOME +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = METRONOME SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetX = 0,-210 SetY = 0,126 @@ -46,7 +46,7 @@ Name = METRONOME Play = 0,Metronome,94 #------------------------------- [OppMove,METRONOME] -Name = METRONOME +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -54,7 +54,7 @@ Name = METRONOME SetX = 0,0 SetY = 0,0 - Graphic = finger.spoon + Graphic = Examples/finger.spoon Focus = Target SetFrame = 0,1 SetX = 0,-2 diff --git a/PBS/Animations/Converted/Move/MIST.txt b/PBS/Animations/Example anims/Move/MIST.txt similarity index 89% rename from PBS/Animations/Converted/Move/MIST.txt rename to PBS/Animations/Example anims/Move/MIST.txt index 82fc2d939..e9a5646de 100644 --- a/PBS/Animations/Converted/Move/MIST.txt +++ b/PBS/Animations/Example anims/Move/MIST.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MIST] -Name = MIST +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MIST SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 4,6 SetX = 4,30 @@ -21,7 +21,7 @@ Name = MIST SetY = 6,17 SetVisible = 7,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 5,6 SetX = 5,42 @@ -31,7 +31,7 @@ Name = MIST SetY = 6,-32 SetVisible = 7,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,6 SetX = 0,1 diff --git a/PBS/Animations/Converted/Move/MISTBALL.txt b/PBS/Animations/Example anims/Move/MISTBALL.txt similarity index 93% rename from PBS/Animations/Converted/Move/MISTBALL.txt rename to PBS/Animations/Example anims/Move/MISTBALL.txt index 8ca910618..80e223951 100644 --- a/PBS/Animations/Converted/Move/MISTBALL.txt +++ b/PBS/Animations/Example anims/Move/MISTBALL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MISTBALL] -Name = MISTBALL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MISTBALL SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetX = 3,201 SetY = 3,-181 @@ -28,7 +28,7 @@ Name = MISTBALL SetOpacity = 7,144 SetVisible = 8,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetX = 0,200 SetY = 0,-196 diff --git a/PBS/Animations/Converted/Move/MOONLIGHT.txt b/PBS/Animations/Example anims/Move/MOONLIGHT.txt similarity index 92% rename from PBS/Animations/Converted/Move/MOONLIGHT.txt rename to PBS/Animations/Example anims/Move/MOONLIGHT.txt index bf0f7b930..e1dd4af82 100644 --- a/PBS/Animations/Converted/Move/MOONLIGHT.txt +++ b/PBS/Animations/Example anims/Move/MOONLIGHT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MOONLIGHT] -Name = MOONLIGHT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MOONLIGHT SetX = 0,0 SetY = 0,0 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetFrame = 0,12 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/MORNINGSUN.txt b/PBS/Animations/Example anims/Move/MORNINGSUN.txt similarity index 90% rename from PBS/Animations/Converted/Move/MORNINGSUN.txt rename to PBS/Animations/Example anims/Move/MORNINGSUN.txt index 96628bbbc..9de4e1892 100644 --- a/PBS/Animations/Converted/Move/MORNINGSUN.txt +++ b/PBS/Animations/Example anims/Move/MORNINGSUN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,MORNINGSUN] -Name = MORNINGSUN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = MORNINGSUN SetX = 0,0 SetY = 0,0 - Graphic = Heal3 + Graphic = Examples/Heal3 Focus = Target SetFrame = 10,15 SetX = 10,0 @@ -18,7 +18,7 @@ Name = MORNINGSUN SetOpacity = 10,100 SetVisible = 11,false - Graphic = Heal3 + Graphic = Examples/Heal3 Focus = Target SetX = 0,0 SetY = 0,-26 diff --git a/PBS/Animations/Converted/Move/NIGHTMARE.txt b/PBS/Animations/Example anims/Move/NIGHTMARE.txt similarity index 92% rename from PBS/Animations/Converted/Move/NIGHTMARE.txt rename to PBS/Animations/Example anims/Move/NIGHTMARE.txt index f2477d320..f53881f0d 100644 --- a/PBS/Animations/Converted/Move/NIGHTMARE.txt +++ b/PBS/Animations/Example anims/Move/NIGHTMARE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,NIGHTMARE] -Name = NIGHTMARE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = NIGHTMARE SetX = 0,0 SetY = 0,0 - Graphic = 022-Darkness01 + Graphic = Examples/022-Darkness01 Focus = Target SetFrame = 1,6 SetX = 1,40 @@ -48,7 +48,7 @@ Name = NIGHTMARE SetZoomX = 11,100 SetZoomY = 11,100 - Graphic = 022-Darkness01 + Graphic = Examples/022-Darkness01 Focus = Target SetFrame = 2,6 SetFlip = 2,true @@ -79,7 +79,7 @@ Name = NIGHTMARE SetOpacity = 10,255 SetVisible = 11,false - Graphic = 022-Darkness01 + Graphic = Examples/022-Darkness01 Focus = Target SetFrame = 4,3 SetX = 4,-8 @@ -102,7 +102,7 @@ Name = NIGHTMARE SetOpacity = 8,150 SetVisible = 9,false - Graphic = 022-Darkness01 + Graphic = Examples/022-Darkness01 Focus = Target SetFrame = 4,6 SetX = 4,40 @@ -116,7 +116,7 @@ Name = NIGHTMARE SetOpacity = 6,200 SetVisible = 7,false - Graphic = 022-Darkness01 + Graphic = Examples/022-Darkness01 Focus = Target SetFrame = 8,10 SetFlip = 8,true @@ -126,7 +126,7 @@ Name = NIGHTMARE SetOpacity = 8,100 SetVisible = 9,false - Graphic = 022-Darkness01 + Graphic = Examples/022-Darkness01 Focus = Target SetX = 0,0 SetY = 0,6 diff --git a/PBS/Animations/Converted/Move/OUTRAGE.txt b/PBS/Animations/Example anims/Move/OUTRAGE.txt similarity index 93% rename from PBS/Animations/Converted/Move/OUTRAGE.txt rename to PBS/Animations/Example anims/Move/OUTRAGE.txt index 5cdf4f566..5fe66452b 100644 --- a/PBS/Animations/Converted/Move/OUTRAGE.txt +++ b/PBS/Animations/Example anims/Move/OUTRAGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,OUTRAGE] -Name = OUTRAGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = OUTRAGE SetX = 0,0 SetY = 0,0 - Graphic = Fogo - 01 + Graphic = Examples/Fogo - 01 Focus = UserAndTarget SetFrame = 0,4 SetX = 0,-20 @@ -51,7 +51,7 @@ Name = OUTRAGE SetX = 12,189 SetY = 12,-196 - Graphic = Fogo - 01 + Graphic = Examples/Fogo - 01 Focus = UserAndTarget SetFrame = 2,5 SetX = 2,39 @@ -94,7 +94,7 @@ Name = OUTRAGE SetY = 11,-148 SetVisible = 12,false - Graphic = Fogo - 01 + Graphic = Examples/Fogo - 01 Focus = UserAndTarget SetFrame = 3,5 SetFlip = 3,true @@ -128,7 +128,7 @@ Name = OUTRAGE SetY = 10,-118 SetVisible = 11,false - Graphic = Fogo - 01 + Graphic = Examples/Fogo - 01 Focus = UserAndTarget SetFrame = 4,5 SetX = 4,44 @@ -157,7 +157,7 @@ Name = OUTRAGE SetY = 9,-59 SetVisible = 10,false - Graphic = Fogo - 01 + Graphic = Examples/Fogo - 01 Focus = UserAndTarget SetFrame = 5,5 SetX = 5,75 @@ -176,7 +176,7 @@ Name = OUTRAGE SetX = 8,29 SetVisible = 9,false - Graphic = Fogo - 01 + Graphic = Examples/Fogo - 01 Focus = UserAndTarget SetFrame = 5,5 SetX = 5,29 @@ -195,7 +195,7 @@ Name = OUTRAGE SetY = 8,-10 SetVisible = 9,false - Graphic = Fogo - 01 + Graphic = Examples/Fogo - 01 Focus = UserAndTarget SetFrame = 7,5 SetX = 7,0 diff --git a/PBS/Animations/Converted/Move/OVERHEAT.txt b/PBS/Animations/Example anims/Move/OVERHEAT.txt similarity index 89% rename from PBS/Animations/Converted/Move/OVERHEAT.txt rename to PBS/Animations/Example anims/Move/OVERHEAT.txt index ced5a5d8c..7bc8f2d89 100644 --- a/PBS/Animations/Converted/Move/OVERHEAT.txt +++ b/PBS/Animations/Example anims/Move/OVERHEAT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,OVERHEAT] -Name = OVERHEAT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = OVERHEAT SetX = 0,0 SetY = 0,0 - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 0,4 SetY = 0,-70 @@ -37,7 +37,7 @@ Name = OVERHEAT SetFrame = 11,11 SetY = 11,-178 - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 1,34 SetY = 1,-70 @@ -46,7 +46,7 @@ Name = OVERHEAT SetY = 2,-40 SetVisible = 3,false - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 2,64 SetY = 2,-157 @@ -62,7 +62,7 @@ Name = OVERHEAT SetY = 6,-20 SetVisible = 7,false - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 2,19 SetY = 2,0 @@ -83,7 +83,7 @@ Name = OVERHEAT SetOpacity = 6,255 SetVisible = 7,false - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 3,-25 SetY = 3,-89 @@ -93,7 +93,7 @@ Name = OVERHEAT SetY = 5,-237 SetVisible = 6,false - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 3,100 SetY = 3,-10 @@ -104,7 +104,7 @@ Name = OVERHEAT SetY = 5,-29 SetVisible = 6,false - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 4,144 SetY = 4,-157 @@ -121,7 +121,7 @@ Name = OVERHEAT SetOpacity = 7,100 SetVisible = 8,false - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 4,-35 SetY = 4,-59 @@ -130,7 +130,7 @@ Name = OVERHEAT SetY = 5,-50 SetVisible = 6,false - Graphic = fire4 + Graphic = Examples/fire4 Focus = UserAndTarget SetX = 4,39 SetY = 4,-139 diff --git a/PBS/Animations/Converted/Move/PAYDAY.txt b/PBS/Animations/Example anims/Move/PAYDAY.txt similarity index 88% rename from PBS/Animations/Converted/Move/PAYDAY.txt rename to PBS/Animations/Example anims/Move/PAYDAY.txt index 79b2070f7..fcccfe30e 100644 --- a/PBS/Animations/Converted/Move/PAYDAY.txt +++ b/PBS/Animations/Example anims/Move/PAYDAY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,PAYDAY] -Name = PAYDAY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = PAYDAY SetX = 0,0 SetY = 0,0 - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 2,12 SetX = 2,0 @@ -29,7 +29,7 @@ Name = PAYDAY SetY = 8,-226 SetVisible = 9,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 4,12 SetX = 4,0 @@ -39,7 +39,7 @@ Name = PAYDAY SetY = 5,-139 SetVisible = 7,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 5,12 SetX = 5,0 @@ -47,7 +47,7 @@ Name = PAYDAY SetZ = 5,30 SetVisible = 6,false - Graphic = 008-Weapon03 + Graphic = Examples/008-Weapon03 Focus = UserAndTarget SetFrame = 0,12 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/PETALDANCE.txt b/PBS/Animations/Example anims/Move/PETALDANCE.txt similarity index 92% rename from PBS/Animations/Converted/Move/PETALDANCE.txt rename to PBS/Animations/Example anims/Move/PETALDANCE.txt index 118da1da8..cced47093 100644 --- a/PBS/Animations/Converted/Move/PETALDANCE.txt +++ b/PBS/Animations/Example anims/Move/PETALDANCE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,PETALDANCE] -Name = PETALDANCE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = PETALDANCE SetX = 0,0 SetY = 0,0 - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Target SetX = 2,192 SetY = 2,-138 @@ -38,7 +38,7 @@ Name = PETALDANCE SetZoomY = 9,120 SetVisible = 10,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Target SetFrame = 3,2 SetX = 3,-40 @@ -60,7 +60,7 @@ Name = PETALDANCE SetY = 8,-34 SetVisible = 9,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Target SetX = 5,-64 SetY = 5,-138 @@ -74,7 +74,7 @@ Name = PETALDANCE SetY = 8,-74 SetVisible = 9,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Target SetFrame = 7,1 SetX = 7,-64 @@ -82,7 +82,7 @@ Name = PETALDANCE SetZ = 7,31 SetVisible = 8,false - Graphic = Anima (1) + Graphic = Examples/Anima (1) Focus = Target SetFrame = 0,3 SetX = 0,-160 diff --git a/PBS/Animations/Converted/Move/PINMISSILE.txt b/PBS/Animations/Example anims/Move/PINMISSILE.txt similarity index 92% rename from PBS/Animations/Converted/Move/PINMISSILE.txt rename to PBS/Animations/Example anims/Move/PINMISSILE.txt index ad497d9db..f75e28415 100644 --- a/PBS/Animations/Converted/Move/PINMISSILE.txt +++ b/PBS/Animations/Example anims/Move/PINMISSILE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,PINMISSILE] -Name = PINMISSILE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = PINMISSILE SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-79 @@ -34,7 +34,7 @@ Name = PINMISSILE SetOpacity = 8,50 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 4,29 SetY = 4,-98 @@ -55,7 +55,7 @@ Name = PINMISSILE SetZoomY = 8,125 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 5,14 SetX = 5,184 @@ -64,7 +64,7 @@ Name = PINMISSILE SetOpacity = 5,50 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,25 SetY = 0,-70 @@ -106,7 +106,7 @@ Name = PINMISSILE Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,1] -Name = Pin Missile hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -114,7 +114,7 @@ Name = Pin Missile hit 2 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,25 SetY = 0,-70 @@ -148,7 +148,7 @@ Name = Pin Missile hit 2 SetAngle = 9,0 SetOpacity = 9,50 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-79 @@ -173,7 +173,7 @@ Name = Pin Missile hit 2 SetOpacity = 8,50 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 4,29 SetY = 4,-98 @@ -194,7 +194,7 @@ Name = Pin Missile hit 2 SetZoomY = 8,125 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 5,14 SetX = 5,184 @@ -211,7 +211,7 @@ Name = Pin Missile hit 2 Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,2] -Name = Pin Missile hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -219,7 +219,7 @@ Name = Pin Missile hit 3 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 5,14 SetX = 5,184 @@ -228,7 +228,7 @@ Name = Pin Missile hit 3 SetOpacity = 5,50 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,25 SetY = 0,-70 @@ -262,7 +262,7 @@ Name = Pin Missile hit 3 SetAngle = 9,0 SetOpacity = 9,50 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-79 @@ -287,7 +287,7 @@ Name = Pin Missile hit 3 SetOpacity = 8,50 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 4,29 SetY = 4,-98 @@ -316,7 +316,7 @@ Name = Pin Missile hit 3 Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,3] -Name = Pin Missile hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -324,7 +324,7 @@ Name = Pin Missile hit 4 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 4,29 SetY = 4,-98 @@ -345,7 +345,7 @@ Name = Pin Missile hit 4 SetZoomY = 8,125 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 5,14 SetX = 5,184 @@ -354,7 +354,7 @@ Name = Pin Missile hit 4 SetOpacity = 5,50 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,25 SetY = 0,-70 @@ -388,7 +388,7 @@ Name = Pin Missile hit 4 SetAngle = 9,0 SetOpacity = 9,50 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-79 @@ -421,7 +421,7 @@ Name = Pin Missile hit 4 Play = 8,Slash10,80 #------------------------------- [Move,PINMISSILE,4] -Name = Pin Missile hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -429,7 +429,7 @@ Name = Pin Missile hit 5 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-79 @@ -454,7 +454,7 @@ Name = Pin Missile hit 5 SetOpacity = 8,50 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 4,29 SetY = 4,-98 @@ -475,7 +475,7 @@ Name = Pin Missile hit 5 SetZoomY = 8,125 SetVisible = 9,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 5,14 SetX = 5,184 @@ -484,7 +484,7 @@ Name = Pin Missile hit 5 SetOpacity = 5,50 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,25 SetY = 0,-70 diff --git a/PBS/Animations/Converted/Move/POISONFANG.txt b/PBS/Animations/Example anims/Move/POISONFANG.txt similarity index 90% rename from PBS/Animations/Converted/Move/POISONFANG.txt rename to PBS/Animations/Example anims/Move/POISONFANG.txt index 20800c185..e83f39361 100644 --- a/PBS/Animations/Converted/Move/POISONFANG.txt +++ b/PBS/Animations/Example anims/Move/POISONFANG.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,POISONFANG] -Name = POISONFANG +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = POISONFANG SetX = 0,0 SetY = 0,0 - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 7,13 SetX = 7,-30 @@ -19,7 +19,7 @@ Name = POISONFANG SetY = 8,4 SetVisible = 9,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 7,13 SetX = 7,66 @@ -29,7 +29,7 @@ Name = POISONFANG SetY = 8,5 SetVisible = 9,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetX = 0,6 SetY = 0,8 diff --git a/PBS/Animations/Converted/Move/POISONGAS.txt b/PBS/Animations/Example anims/Move/POISONGAS.txt similarity index 91% rename from PBS/Animations/Converted/Move/POISONGAS.txt rename to PBS/Animations/Example anims/Move/POISONGAS.txt index f2e8742d9..a115cea77 100644 --- a/PBS/Animations/Converted/Move/POISONGAS.txt +++ b/PBS/Animations/Example anims/Move/POISONGAS.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,POISONGAS] -Name = POISONGAS +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = POISONGAS SetX = 0,0 SetY = 0,0 - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 0,8 SetX = 0,0 @@ -36,7 +36,7 @@ Name = POISONGAS SetFrame = 13,0 SetOpacity = 13,100 - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 1,7 SetX = 1,0 @@ -73,7 +73,7 @@ Name = POISONGAS SetY = 10,-139 SetVisible = 11,false - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 2,1 SetX = 2,0 @@ -101,7 +101,7 @@ Name = POISONGAS SetY = 10,-98 SetVisible = 11,false - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 3,8 SetX = 3,29 @@ -123,7 +123,7 @@ Name = POISONGAS SetY = 8,-109 SetVisible = 9,false - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 3,5 SetX = 3,0 @@ -141,7 +141,7 @@ Name = POISONGAS SetY = 7,-40 SetVisible = 8,false - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 5,4 SetFlip = 5,true @@ -156,7 +156,7 @@ Name = POISONGAS SetY = 7,-50 SetVisible = 8,false - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 6,5 SetX = 6,79 @@ -167,7 +167,7 @@ Name = POISONGAS SetY = 7,-59 SetVisible = 8,false - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 6,6 SetX = 6,89 @@ -175,7 +175,7 @@ Name = POISONGAS SetZ = 6,34 SetVisible = 7,false - Graphic = poison + Graphic = Examples/poison Focus = UserAndTarget SetFrame = 6,2 SetFlip = 6,true diff --git a/PBS/Animations/Converted/Move/POISONPOWDER.txt b/PBS/Animations/Example anims/Move/POISONPOWDER.txt similarity index 91% rename from PBS/Animations/Converted/Move/POISONPOWDER.txt rename to PBS/Animations/Example anims/Move/POISONPOWDER.txt index a1e5c3914..1181fdc94 100644 --- a/PBS/Animations/Converted/Move/POISONPOWDER.txt +++ b/PBS/Animations/Example anims/Move/POISONPOWDER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,POISONPOWDER] -Name = POISONPOWDER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = POISONPOWDER SetX = 0,0 SetY = 0,0 - Graphic = Special5 + Graphic = Examples/Special5 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/POISONSTING.txt b/PBS/Animations/Example anims/Move/POISONSTING.txt similarity index 92% rename from PBS/Animations/Converted/Move/POISONSTING.txt rename to PBS/Animations/Example anims/Move/POISONSTING.txt index 16e1e9289..7e1e0f5d0 100644 --- a/PBS/Animations/Converted/Move/POISONSTING.txt +++ b/PBS/Animations/Example anims/Move/POISONSTING.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,POISONSTING] -Name = POISONSTING +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = POISONSTING SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,0 @@ -38,7 +38,7 @@ Name = POISONSTING Play = 6,Slash10,80 #------------------------------- [OppMove,POISONSTING] -Name = POISONSTING +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -46,7 +46,7 @@ Name = POISONSTING SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,174 diff --git a/PBS/Animations/Converted/Move/POISONTAIL.txt b/PBS/Animations/Example anims/Move/POISONTAIL.txt similarity index 91% rename from PBS/Animations/Converted/Move/POISONTAIL.txt rename to PBS/Animations/Example anims/Move/POISONTAIL.txt index 722cdae59..aa07cc83b 100644 --- a/PBS/Animations/Converted/Move/POISONTAIL.txt +++ b/PBS/Animations/Example anims/Move/POISONTAIL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,POISONTAIL] -Name = POISONTAIL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = POISONTAIL SetX = 0,0 SetY = 0,0 - Graphic = firepoison + Graphic = Examples/firepoison Focus = Target SetFrame = 0,8 SetX = 0,8 diff --git a/PBS/Animations/Converted/Move/POUND.txt b/PBS/Animations/Example anims/Move/POUND.txt similarity index 90% rename from PBS/Animations/Converted/Move/POUND.txt rename to PBS/Animations/Example anims/Move/POUND.txt index 6a129fe41..1b8710a74 100644 --- a/PBS/Animations/Converted/Move/POUND.txt +++ b/PBS/Animations/Example anims/Move/POUND.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,POUND] -Name = POUND +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = POUND SetX = 0,0 SetY = 0,0 - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 3,20 SetX = 3,8 @@ -18,7 +18,7 @@ Name = POUND SetOpacity = 4,100 SetVisible = 5,false - Graphic = many + Graphic = Examples/many Focus = Target SetFrame = 0,17 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/PSYCHIC.txt b/PBS/Animations/Example anims/Move/PSYCHIC.txt similarity index 93% rename from PBS/Animations/Converted/Move/PSYCHIC.txt rename to PBS/Animations/Example anims/Move/PSYCHIC.txt index cef7d7a02..7eeed1c22 100644 --- a/PBS/Animations/Converted/Move/PSYCHIC.txt +++ b/PBS/Animations/Example anims/Move/PSYCHIC.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,PSYCHIC] -Name = PSYCHIC +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = PSYCHIC SetX = 0,0 SetY = 0,0 - Graphic = efftest4 + Graphic = Examples/efftest4 Focus = Target SetX = 0,0 SetY = 0,-2 @@ -18,7 +18,7 @@ Name = PSYCHIC SetFrame = 2,2 SetVisible = 3,false - Graphic = efftest4 + Graphic = Examples/efftest4 Focus = Target SetFrame = 5,2 SetX = 5,0 @@ -51,7 +51,7 @@ Name = PSYCHIC SetZoomY = 17,100 SetOpacity = 17,75 - Graphic = efftest4 + Graphic = Examples/efftest4 Focus = Target SetFrame = 9,2 SetX = 9,0 @@ -62,7 +62,7 @@ Name = PSYCHIC SetOpacity = 9,180 SetVisible = 12,false - Graphic = efftest4 + Graphic = Examples/efftest4 Focus = Target SetFrame = 0,14 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/PSYCHOCUT.txt b/PBS/Animations/Example anims/Move/PSYCHOCUT.txt similarity index 92% rename from PBS/Animations/Converted/Move/PSYCHOCUT.txt rename to PBS/Animations/Example anims/Move/PSYCHOCUT.txt index 4cad4b33a..6be3b7e1d 100644 --- a/PBS/Animations/Converted/Move/PSYCHOCUT.txt +++ b/PBS/Animations/Example anims/Move/PSYCHOCUT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,PSYCHOCUT] -Name = PSYCHOCUT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = PSYCHOCUT SetX = 0,0 SetY = 0,0 - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 0,15 SetX = 0,-244 @@ -24,7 +24,7 @@ Name = PSYCHOCUT SetOpacity = 2,107 SetVisible = 3,false - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 1,13 SetX = 1,-221 @@ -38,7 +38,7 @@ Name = PSYCHOCUT SetY = 3,167 SetVisible = 4,false - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 4,10 SetX = 4,-258 @@ -46,7 +46,7 @@ Name = PSYCHOCUT SetZ = 4,27 SetVisible = 5,false - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 5,8 SetX = 5,-253 @@ -54,7 +54,7 @@ Name = PSYCHOCUT SetZ = 5,28 SetVisible = 6,false - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 6,7 SetX = 6,-240 @@ -62,7 +62,7 @@ Name = PSYCHOCUT SetZ = 6,27 SetVisible = 7,false - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 7,6 SetX = 7,-224 @@ -70,7 +70,7 @@ Name = PSYCHOCUT SetZ = 7,28 SetVisible = 8,false - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 8,5 SetX = 8,-221 @@ -111,7 +111,7 @@ Name = PSYCHOCUT SetOpacity = 18,60 SetVisible = 19,false - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = Target SetFrame = 9,13 SetX = 9,-223 @@ -134,7 +134,7 @@ Name = PSYCHOCUT Play = 0,Psycho Cut #------------------------------- [OppMove,PSYCHOCUT] -Name = PSYCHOCUT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -142,7 +142,7 @@ Name = PSYCHOCUT SetX = 0,0 SetY = 0,0 - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = UserAndTarget SetFrame = 0,12 SetX = 0,209 @@ -220,7 +220,7 @@ Name = PSYCHOCUT SetY = 18,62 SetOpacity = 18,64 - Graphic = Psycho Cut + Graphic = Examples/Psycho Cut Focus = UserAndTarget SetFrame = 0,15 SetX = 0,203 diff --git a/PBS/Animations/Converted/Move/QUICKATTACK.txt b/PBS/Animations/Example anims/Move/QUICKATTACK.txt similarity index 96% rename from PBS/Animations/Converted/Move/QUICKATTACK.txt rename to PBS/Animations/Example anims/Move/QUICKATTACK.txt index 08d883079..82407ce21 100644 --- a/PBS/Animations/Converted/Move/QUICKATTACK.txt +++ b/PBS/Animations/Example anims/Move/QUICKATTACK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,QUICKATTACK] -Name = QUICKATTACK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -60,7 +60,7 @@ Name = QUICKATTACK SetOpacity = 7,85 SetVisible = 8,false - Graphic = Tackle_B + Graphic = Examples/Tackle_B Focus = Target SetX = 7,0 SetY = 7,0 diff --git a/PBS/Animations/Converted/Move/RAINDANCE.txt b/PBS/Animations/Example anims/Move/RAINDANCE.txt similarity index 89% rename from PBS/Animations/Converted/Move/RAINDANCE.txt rename to PBS/Animations/Example anims/Move/RAINDANCE.txt index a213c37c6..c450fede7 100644 --- a/PBS/Animations/Converted/Move/RAINDANCE.txt +++ b/PBS/Animations/Example anims/Move/RAINDANCE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,RAINDANCE] -Name = RAINDANCE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = RAINDANCE SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,197 @@ -33,7 +33,7 @@ Name = RAINDANCE SetX = 9,99 SetY = 9,55 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,275 @@ -58,7 +58,7 @@ Name = RAINDANCE SetX = 9,253 SetY = 9,148 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,355 @@ -83,7 +83,7 @@ Name = RAINDANCE SetX = 9,254 SetY = 9,274 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,450 @@ -108,7 +108,7 @@ Name = RAINDANCE SetX = 9,418 SetY = 9,243 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,83 @@ -133,7 +133,7 @@ Name = RAINDANCE SetX = 9,181 SetY = 9,238 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,231 @@ -158,7 +158,7 @@ Name = RAINDANCE SetX = 9,108 SetY = 9,245 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,352 @@ -183,7 +183,7 @@ Name = RAINDANCE SetX = 9,25 SetY = 9,205 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 SetX = 0,467 @@ -208,7 +208,7 @@ Name = RAINDANCE SetX = 9,148 SetY = 9,25 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 1,2 SetX = 1,482 @@ -224,7 +224,7 @@ Name = RAINDANCE SetY = 5,252 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,2 SetX = 2,27 @@ -238,7 +238,7 @@ Name = RAINDANCE SetY = 5,241 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,2 SetX = 4,409 @@ -246,7 +246,7 @@ Name = RAINDANCE SetZ = 4,37 SetVisible = 5,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 SetX = 7,471 @@ -254,7 +254,7 @@ Name = RAINDANCE SetZ = 7,35 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 SetX = 7,363 @@ -262,7 +262,7 @@ Name = RAINDANCE SetZ = 7,36 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 SetX = 7,443 @@ -270,28 +270,28 @@ Name = RAINDANCE SetZ = 7,37 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,247 SetY = 9,72 SetZ = 9,35 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,365 SetY = 9,42 SetZ = 9,36 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,479 SetY = 9,180 SetZ = 9,37 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,474 diff --git a/PBS/Animations/Converted/Move/RAZORLEAF.txt b/PBS/Animations/Example anims/Move/RAZORLEAF.txt similarity index 90% rename from PBS/Animations/Converted/Move/RAZORLEAF.txt rename to PBS/Animations/Example anims/Move/RAZORLEAF.txt index 760cdc902..f2d14ebf7 100644 --- a/PBS/Animations/Converted/Move/RAZORLEAF.txt +++ b/PBS/Animations/Example anims/Move/RAZORLEAF.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,RAZORLEAF] -Name = RAZORLEAF +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = RAZORLEAF SetX = 0,0 SetY = 0,0 - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 1,1 SetX = 1,12 @@ -49,7 +49,7 @@ Name = RAZORLEAF SetX = 12,158 SetY = 12,-168 - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetX = 2,20 SetY = 2,-162 @@ -78,7 +78,7 @@ Name = RAZORLEAF SetY = 10,-146 SetVisible = 11,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 3,2 SetX = 3,101 @@ -98,7 +98,7 @@ Name = RAZORLEAF SetY = 8,71 SetVisible = 9,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 4,3 SetX = 4,64 @@ -112,7 +112,7 @@ Name = RAZORLEAF SetY = 7,-75 SetVisible = 8,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetX = 4,162 SetY = 4,-90 @@ -122,7 +122,7 @@ Name = RAZORLEAF SetY = 5,90 SetVisible = 6,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 4,2 SetX = 4,20 @@ -133,7 +133,7 @@ Name = RAZORLEAF SetY = 5,-46 SetVisible = 6,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 5,2 SetX = 5,68 @@ -141,7 +141,7 @@ Name = RAZORLEAF SetZ = 5,33 SetVisible = 6,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 5,3 SetX = 5,117 @@ -149,7 +149,7 @@ Name = RAZORLEAF SetZ = 5,34 SetVisible = 6,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 7,2 SetX = 7,125 @@ -157,14 +157,14 @@ Name = RAZORLEAF SetZ = 7,31 SetVisible = 8,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetX = 7,20 SetY = 7,-175 SetZ = 7,32 SetVisible = 8,false - Graphic = grass + Graphic = Examples/grass Focus = UserAndTarget SetFrame = 10,3 SetX = 10,178 diff --git a/PBS/Animations/Converted/Move/REFLECT.txt b/PBS/Animations/Example anims/Move/REFLECT.txt similarity index 88% rename from PBS/Animations/Converted/Move/REFLECT.txt rename to PBS/Animations/Example anims/Move/REFLECT.txt index a28db98e0..44ad29807 100644 --- a/PBS/Animations/Converted/Move/REFLECT.txt +++ b/PBS/Animations/Example anims/Move/REFLECT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,REFLECT] -Name = REFLECT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = REFLECT SetX = 0,0 SetY = 0,0 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetFrame = 0,11 SetX = 0,-8 @@ -22,7 +22,7 @@ Name = REFLECT SetOpacity = 6,150 SetOpacity = 7,100 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetX = 1,-56 SetY = 1,-114 @@ -42,7 +42,7 @@ Name = REFLECT SetX = 7,-72 SetY = 7,126 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetX = 1,80 SetY = 1,-106 @@ -60,7 +60,7 @@ Name = REFLECT SetX = 7,48 SetY = 7,134 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetX = 2,8 SetY = 2,-114 @@ -74,7 +74,7 @@ Name = REFLECT SetY = 6,30 SetVisible = 7,false - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetX = 3,-56 SetY = 3,-114 @@ -85,7 +85,7 @@ Name = REFLECT SetY = 5,-18 SetVisible = 6,false - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetX = 4,48 SetY = 4,-106 diff --git a/PBS/Animations/Converted/Move/REST.txt b/PBS/Animations/Example anims/Move/REST.txt similarity index 93% rename from PBS/Animations/Converted/Move/REST.txt rename to PBS/Animations/Example anims/Move/REST.txt index 318022397..7315388c1 100644 --- a/PBS/Animations/Converted/Move/REST.txt +++ b/PBS/Animations/Example anims/Move/REST.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,REST] -Name = REST +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = REST SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,20 SetX = 0,-27 diff --git a/PBS/Animations/Converted/Move/ROAR.txt b/PBS/Animations/Example anims/Move/ROAR.txt similarity index 89% rename from PBS/Animations/Converted/Move/ROAR.txt rename to PBS/Animations/Example anims/Move/ROAR.txt index ccacb02c7..ccd10004f 100644 --- a/PBS/Animations/Converted/Move/ROAR.txt +++ b/PBS/Animations/Example anims/Move/ROAR.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ROAR] -Name = ROAR +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ROAR SetX = 0,0 SetY = 0,0 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetX = 0,-191 SetY = 0,119 @@ -24,7 +24,7 @@ Name = ROAR SetX = 4,-83 SetY = 4,59 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFrame = 0,1 SetX = 0,-208 @@ -39,7 +39,7 @@ Name = ROAR SetX = 4,-102 SetY = 4,-7 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFrame = 0,2 SetX = 0,-202 @@ -58,7 +58,7 @@ Name = ROAR Play = 0,Wring Out,100,160 #------------------------------- [OppMove,ROAR] -Name = ROAR +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -66,7 +66,7 @@ Name = ROAR SetX = 0,0 SetY = 0,0 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFrame = 0,1 SetFlip = 0,true @@ -80,7 +80,7 @@ Name = ROAR SetX = 3,-136 SetY = 3,-61 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFrame = 0,1 SetX = 0,-32 @@ -93,7 +93,7 @@ Name = ROAR SetX = 3,-120 SetY = 3,104 - Graphic = Growl + Graphic = Examples/Growl Focus = Target SetFlip = 0,true SetX = 0,-40 diff --git a/PBS/Animations/Converted/Move/ROCKSMASH.txt b/PBS/Animations/Example anims/Move/ROCKSMASH.txt similarity index 88% rename from PBS/Animations/Converted/Move/ROCKSMASH.txt rename to PBS/Animations/Example anims/Move/ROCKSMASH.txt index 381ac7203..1537b5de1 100644 --- a/PBS/Animations/Converted/Move/ROCKSMASH.txt +++ b/PBS/Animations/Example anims/Move/ROCKSMASH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ROCKSMASH] -Name = ROCKSMASH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ROCKSMASH SetX = 0,0 SetY = 0,0 - Graphic = rockice + Graphic = Examples/rockice Focus = Target SetX = 0,8 SetY = 0,-10 diff --git a/PBS/Animations/Converted/Move/ROCKTHROW.txt b/PBS/Animations/Example anims/Move/ROCKTHROW.txt similarity index 89% rename from PBS/Animations/Converted/Move/ROCKTHROW.txt rename to PBS/Animations/Example anims/Move/ROCKTHROW.txt index 3d245817a..45ccd4ffc 100644 --- a/PBS/Animations/Converted/Move/ROCKTHROW.txt +++ b/PBS/Animations/Example anims/Move/ROCKTHROW.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ROCKTHROW] -Name = ROCKTHROW +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ROCKTHROW SetX = 0,0 SetY = 0,0 - Graphic = Earth1 + Graphic = Examples/Earth1 Focus = UserAndTarget SetFrame = 3,1 SetX = 3,175 @@ -17,7 +17,7 @@ Name = ROCKTHROW SetZ = 3,28 SetVisible = 4,false - Graphic = Earth1 + Graphic = Examples/Earth1 Focus = UserAndTarget SetX = 0,0 SetY = 0,18 diff --git a/PBS/Animations/Converted/Move/ROLLINGKICK.txt b/PBS/Animations/Example anims/Move/ROLLINGKICK.txt similarity index 91% rename from PBS/Animations/Converted/Move/ROLLINGKICK.txt rename to PBS/Animations/Example anims/Move/ROLLINGKICK.txt index f2793e14e..9f065d109 100644 --- a/PBS/Animations/Converted/Move/ROLLINGKICK.txt +++ b/PBS/Animations/Example anims/Move/ROLLINGKICK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ROLLINGKICK] -Name = ROLLINGKICK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ROLLINGKICK SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 4,7 SetX = 4,-24 @@ -23,7 +23,7 @@ Name = ROLLINGKICK SetOpacity = 6,25 SetVisible = 7,false - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,7 SetX = 0,-152 diff --git a/PBS/Animations/Converted/Move/SANDATTACK.txt b/PBS/Animations/Example anims/Move/SANDATTACK.txt similarity index 90% rename from PBS/Animations/Converted/Move/SANDATTACK.txt rename to PBS/Animations/Example anims/Move/SANDATTACK.txt index d53c87092..31527ff27 100644 --- a/PBS/Animations/Converted/Move/SANDATTACK.txt +++ b/PBS/Animations/Example anims/Move/SANDATTACK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SANDATTACK] -Name = SANDATTACK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,14 +9,14 @@ Name = SANDATTACK SetX = 0,0 SetY = 0,0 - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 0,4 SetY = 0,87 SetZ = 0,27 SetVisible = 1,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 1,2 SetX = 1,14 @@ -53,7 +53,7 @@ Name = SANDATTACK SetX = 15,175 SetY = 15,-178 - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 1,1 SetX = 1,4 @@ -73,7 +73,7 @@ Name = SANDATTACK SetY = 7,-196 SetVisible = 8,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 1,25 SetY = 1,68 @@ -92,7 +92,7 @@ Name = SANDATTACK SetY = 7,-128 SetVisible = 8,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 2,2 SetX = 2,-5 @@ -115,7 +115,7 @@ Name = SANDATTACK SetY = 9,-187 SetVisible = 10,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 3,39 SetY = 3,57 @@ -134,7 +134,7 @@ Name = SANDATTACK SetY = 9,-139 SetVisible = 10,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 3,2 SetX = 3,19 @@ -154,7 +154,7 @@ Name = SANDATTACK SetY = 9,-187 SetVisible = 10,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 4,1 SetX = 4,-10 @@ -176,7 +176,7 @@ Name = SANDATTACK SetY = 11,-226 SetVisible = 12,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 5,29 SetY = 5,78 @@ -195,7 +195,7 @@ Name = SANDATTACK SetY = 11,-157 SetVisible = 12,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 5,2 SetX = 5,25 @@ -215,7 +215,7 @@ Name = SANDATTACK SetY = 11,-157 SetVisible = 12,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 6,2 SetX = 6,-5 @@ -237,7 +237,7 @@ Name = SANDATTACK SetY = 13,-207 SetVisible = 14,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 7,34 SetY = 7,68 @@ -256,7 +256,7 @@ Name = SANDATTACK SetY = 13,-157 SetVisible = 14,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 7,39 SetY = 7,78 @@ -275,7 +275,7 @@ Name = SANDATTACK SetY = 13,-128 SetVisible = 14,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 9,2 SetX = 9,25 @@ -294,7 +294,7 @@ Name = SANDATTACK SetX = 15,194 SetY = 15,-187 - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 9,1 SetFlip = 9,true @@ -317,7 +317,7 @@ Name = SANDATTACK Play = 0,Sand #------------------------------- [OppMove,SANDATTACK] -Name = SANDATTACK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -325,7 +325,7 @@ Name = SANDATTACK SetX = 0,0 SetY = 0,0 - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 0,2 SetX = 0,194 @@ -364,7 +364,7 @@ Name = SANDATTACK SetX = 15,-15 SetY = 15,9 - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 1,1 SetX = 1,164 @@ -384,7 +384,7 @@ Name = SANDATTACK SetY = 7,-15 SetVisible = 8,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 1,175 SetY = 1,-128 @@ -403,7 +403,7 @@ Name = SANDATTACK SetY = 7,-6 SetVisible = 8,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 2,1 SetX = 2,189 @@ -425,7 +425,7 @@ Name = SANDATTACK SetY = 9,-20 SetVisible = 10,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 3,164 SetY = 3,-118 @@ -444,7 +444,7 @@ Name = SANDATTACK SetY = 9,-20 SetVisible = 10,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 3,2 SetX = 3,164 @@ -464,7 +464,7 @@ Name = SANDATTACK SetY = 9,39 SetVisible = 10,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 4,209 SetY = 4,-128 @@ -485,7 +485,7 @@ Name = SANDATTACK SetY = 11,48 SetVisible = 12,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 5,2 SetX = 5,159 @@ -505,7 +505,7 @@ Name = SANDATTACK SetY = 11,-10 SetVisible = 12,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 5,164 SetY = 5,-118 @@ -524,7 +524,7 @@ Name = SANDATTACK SetY = 11,-20 SetVisible = 12,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFlip = 6,true SetX = 6,194 @@ -546,7 +546,7 @@ Name = SANDATTACK SetY = 13,9 SetVisible = 14,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 7,2 SetX = 7,154 @@ -566,7 +566,7 @@ Name = SANDATTACK SetY = 13,-50 SetVisible = 14,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 7,1 SetFlip = 7,true @@ -587,7 +587,7 @@ Name = SANDATTACK SetY = 13,9 SetVisible = 14,false - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetX = 9,164 SetY = 9,-109 @@ -605,7 +605,7 @@ Name = SANDATTACK SetX = 15,-5 SetY = 15,-20 - Graphic = Sand-Attack + Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 9,2 SetX = 9,164 diff --git a/PBS/Animations/Converted/Move/SANDSTORM.txt b/PBS/Animations/Example anims/Move/SANDSTORM.txt similarity index 87% rename from PBS/Animations/Converted/Move/SANDSTORM.txt rename to PBS/Animations/Example anims/Move/SANDSTORM.txt index c0a5d545b..541e5bb20 100644 --- a/PBS/Animations/Converted/Move/SANDSTORM.txt +++ b/PBS/Animations/Example anims/Move/SANDSTORM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SANDSTORM] -Name = SANDSTORM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SANDSTORM SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,-350 @@ -34,7 +34,7 @@ Name = SANDSTORM SetX = 9,32 SetY = 9,252 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,31 @@ -59,7 +59,7 @@ Name = SANDSTORM SetX = 9,119 SetY = 9,175 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,156 @@ -84,7 +84,7 @@ Name = SANDSTORM SetX = 9,143 SetY = 9,267 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,165 @@ -109,7 +109,7 @@ Name = SANDSTORM SetX = 9,222 SetY = 9,197 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,267 @@ -134,7 +134,7 @@ Name = SANDSTORM SetX = 9,162 SetY = 9,82 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,309 @@ -159,7 +159,7 @@ Name = SANDSTORM SetX = 9,49 SetY = 9,61 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,388 @@ -184,7 +184,7 @@ Name = SANDSTORM SetX = 9,21 SetY = 9,158 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,448 @@ -209,7 +209,7 @@ Name = SANDSTORM SetX = 9,350 SetY = 9,240 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,35 @@ -234,7 +234,7 @@ Name = SANDSTORM SetX = 9,481 SetY = 9,206 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,276 @@ -259,7 +259,7 @@ Name = SANDSTORM SetX = 9,456 SetY = 9,64 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,487 @@ -267,7 +267,7 @@ Name = SANDSTORM SetZ = 0,37 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,492 @@ -275,7 +275,7 @@ Name = SANDSTORM SetZ = 0,38 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,387 @@ -283,7 +283,7 @@ Name = SANDSTORM SetZ = 0,39 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 SetX = 0,148 @@ -291,7 +291,7 @@ Name = SANDSTORM SetZ = 0,40 SetVisible = 1,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,487 @@ -299,7 +299,7 @@ Name = SANDSTORM SetZ = 2,37 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,492 @@ -307,7 +307,7 @@ Name = SANDSTORM SetZ = 2,38 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,387 @@ -315,7 +315,7 @@ Name = SANDSTORM SetZ = 2,39 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 SetX = 2,148 @@ -323,7 +323,7 @@ Name = SANDSTORM SetZ = 2,40 SetVisible = 3,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 SetX = 4,358 @@ -333,7 +333,7 @@ Name = SANDSTORM SetY = 5,32 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 SetX = 4,267 @@ -343,7 +343,7 @@ Name = SANDSTORM SetY = 5,135 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 SetX = 5,387 @@ -351,7 +351,7 @@ Name = SANDSTORM SetZ = 5,39 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 SetX = 5,148 @@ -359,7 +359,7 @@ Name = SANDSTORM SetZ = 5,40 SetVisible = 6,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,487 @@ -367,7 +367,7 @@ Name = SANDSTORM SetZ = 7,37 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,492 @@ -375,7 +375,7 @@ Name = SANDSTORM SetZ = 7,38 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,387 @@ -383,7 +383,7 @@ Name = SANDSTORM SetZ = 7,39 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 SetX = 7,148 @@ -391,21 +391,21 @@ Name = SANDSTORM SetZ = 7,40 SetVisible = 8,false - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,311 SetY = 9,55 SetZ = 9,37 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,328 SetY = 9,146 SetZ = 9,38 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,251 diff --git a/PBS/Animations/Converted/Move/SCARYFACE.txt b/PBS/Animations/Example anims/Move/SCARYFACE.txt similarity index 93% rename from PBS/Animations/Converted/Move/SCARYFACE.txt rename to PBS/Animations/Example anims/Move/SCARYFACE.txt index f361c176c..9fcb97680 100644 --- a/PBS/Animations/Converted/Move/SCARYFACE.txt +++ b/PBS/Animations/Example anims/Move/SCARYFACE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SCARYFACE] -Name = SCARYFACE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SCARYFACE SetX = 0,0 SetY = 0,0 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetFrame = 0,10 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/SCRATCH.txt b/PBS/Animations/Example anims/Move/SCRATCH.txt similarity index 90% rename from PBS/Animations/Converted/Move/SCRATCH.txt rename to PBS/Animations/Example anims/Move/SCRATCH.txt index 6c5518454..c4cbd7c88 100644 --- a/PBS/Animations/Converted/Move/SCRATCH.txt +++ b/PBS/Animations/Example anims/Move/SCRATCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SCRATCH] -Name = SCRATCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SCRATCH SetX = 0,0 SetY = 0,0 - Graphic = scratchbattle + Graphic = Examples/scratchbattle Focus = Target SetX = 1,15 SetY = 1,-22 diff --git a/PBS/Animations/Converted/Move/SCREECH.txt b/PBS/Animations/Example anims/Move/SCREECH.txt similarity index 90% rename from PBS/Animations/Converted/Move/SCREECH.txt rename to PBS/Animations/Example anims/Move/SCREECH.txt index 4f0558b19..24a9eba30 100644 --- a/PBS/Animations/Converted/Move/SCREECH.txt +++ b/PBS/Animations/Example anims/Move/SCREECH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SCREECH] -Name = SCREECH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SCREECH SetX = 0,0 SetY = 0,0 - Graphic = Growl + Graphic = Examples/Growl Focus = UserAndTarget SetFrame = 0,1 SetX = 0,39 @@ -26,7 +26,7 @@ Name = SCREECH SetY = 8,-148 SetY = 9,-139 - Graphic = Growl + Graphic = Examples/Growl Focus = UserAndTarget SetFrame = 0,2 SetX = 0,39 @@ -43,7 +43,7 @@ Name = SCREECH SetY = 7,0 SetY = 9,9 - Graphic = Growl + Graphic = Examples/Growl Focus = UserAndTarget SetX = 0,39 SetY = 0,-59 diff --git a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt b/PBS/Animations/Example anims/Move/SELFDESTRUCT.txt similarity index 86% rename from PBS/Animations/Converted/Move/SELFDESTRUCT.txt rename to PBS/Animations/Example anims/Move/SELFDESTRUCT.txt index 6d3fd3f74..eeacc7d57 100644 --- a/PBS/Animations/Converted/Move/SELFDESTRUCT.txt +++ b/PBS/Animations/Example anims/Move/SELFDESTRUCT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SELFDESTRUCT] -Name = SELFDESTRUCT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SELFDESTRUCT SetX = 0,0 SetY = 0,0 - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetX = 0,-88 SetY = 0,-18 @@ -40,7 +40,7 @@ Name = SELFDESTRUCT SetX = 16,-24 SetY = 16,86 - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetX = 2,80 SetY = 2,46 @@ -71,7 +71,7 @@ Name = SELFDESTRUCT SetFrame = 15,5 SetVisible = 16,false - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetFrame = 3,1 SetX = 3,80 @@ -79,7 +79,7 @@ Name = SELFDESTRUCT SetZ = 3,29 SetVisible = 4,false - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetFrame = 5,4 SetX = 5,80 @@ -87,21 +87,21 @@ Name = SELFDESTRUCT SetZ = 5,29 SetVisible = 6,false - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetX = 5,-24 SetY = 5,70 SetZ = 5,30 SetVisible = 6,false - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetX = 8,-48 SetY = 8,-26 SetZ = 8,29 SetVisible = 9,false - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetX = 10,64 SetY = 10,22 @@ -116,14 +116,14 @@ Name = SELFDESTRUCT SetY = 14,86 SetVisible = 15,false - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetX = 11,-24 SetY = 11,78 SetZ = 11,30 SetVisible = 12,false - Graphic = 030-Explosion01 + Graphic = Examples/030-Explosion01 Focus = Target SetFrame = 13,2 SetX = 13,-24 diff --git a/PBS/Animations/Converted/Move/SHADOWBALL.txt b/PBS/Animations/Example anims/Move/SHADOWBALL.txt similarity index 90% rename from PBS/Animations/Converted/Move/SHADOWBALL.txt rename to PBS/Animations/Example anims/Move/SHADOWBALL.txt index 7492e9c3d..4e910574f 100644 --- a/PBS/Animations/Converted/Move/SHADOWBALL.txt +++ b/PBS/Animations/Example anims/Move/SHADOWBALL.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SHADOWBALL] -Name = SHADOWBALL +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SHADOWBALL SetX = 0,0 SetY = 0,0 - Graphic = 009-Weapon04 + Graphic = Examples/009-Weapon04 Focus = UserAndTarget SetFrame = 7,12 SetX = 7,105 @@ -19,7 +19,7 @@ Name = SHADOWBALL SetZoomY = 7,25 SetVisible = 8,false - Graphic = 009-Weapon04 + Graphic = Examples/009-Weapon04 Focus = UserAndTarget SetFrame = 8,11 SetX = 8,129 @@ -45,7 +45,7 @@ Name = SHADOWBALL SetFrame = 13,10 SetOpacity = 13,50 - Graphic = 009-Weapon04 + Graphic = Examples/009-Weapon04 Focus = UserAndTarget SetFrame = 1,13 SetX = 1,12 diff --git a/PBS/Animations/Converted/Move/SIGNALBEAM.txt b/PBS/Animations/Example anims/Move/SIGNALBEAM.txt similarity index 94% rename from PBS/Animations/Converted/Move/SIGNALBEAM.txt rename to PBS/Animations/Example anims/Move/SIGNALBEAM.txt index 38275e008..cefcfb09b 100644 --- a/PBS/Animations/Converted/Move/SIGNALBEAM.txt +++ b/PBS/Animations/Example anims/Move/SIGNALBEAM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SIGNALBEAM] -Name = SIGNALBEAM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SIGNALBEAM SetX = 0,0 SetY = 0,0 - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 0,1 SetX = 0,-160 @@ -53,7 +53,7 @@ Name = SIGNALBEAM SetX = 19,56 SetY = 19,78 - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 0,2 SetX = 0,-72 @@ -91,7 +91,7 @@ Name = SIGNALBEAM SetX = 19,-32 SetY = 19,-42 - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 0,3 SetX = 0,-120 @@ -137,7 +137,7 @@ Name = SIGNALBEAM SetX = 19,128 SetY = 19,22 - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 0,3 SetX = 0,-80 @@ -174,7 +174,7 @@ Name = SIGNALBEAM SetY = 18,22 SetVisible = 19,false - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 1,2 SetX = 1,0 @@ -208,7 +208,7 @@ Name = SIGNALBEAM SetY = 17,62 SetVisible = 18,false - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 1,2 SetX = 1,80 @@ -249,7 +249,7 @@ Name = SIGNALBEAM SetX = 19,64 SetY = 19,-66 - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 1,3 SetX = 1,-8 @@ -286,7 +286,7 @@ Name = SIGNALBEAM SetY = 17,94 SetVisible = 18,false - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 1,3 SetX = 1,80 @@ -324,7 +324,7 @@ Name = SIGNALBEAM SetY = 18,-42 SetVisible = 19,false - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 2,2 SetX = 2,144 @@ -364,7 +364,7 @@ Name = SIGNALBEAM SetX = 19,176 SetY = 19,-26 - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 2,3 SetX = 2,160 @@ -404,7 +404,7 @@ Name = SIGNALBEAM SetY = 18,-26 SetVisible = 19,false - Graphic = Ultra Beam + Graphic = Examples/Ultra Beam Focus = Target SetFrame = 19,2 SetX = 19,144 diff --git a/PBS/Animations/Converted/Move/SILVERWIND.txt b/PBS/Animations/Example anims/Move/SILVERWIND.txt similarity index 91% rename from PBS/Animations/Converted/Move/SILVERWIND.txt rename to PBS/Animations/Example anims/Move/SILVERWIND.txt index ca5e99414..e281bc919 100644 --- a/PBS/Animations/Converted/Move/SILVERWIND.txt +++ b/PBS/Animations/Example anims/Move/SILVERWIND.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SILVERWIND] -Name = SILVERWIND +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SILVERWIND SetX = 0,0 SetY = 0,0 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 0,12 SetX = 0,-216 @@ -34,7 +34,7 @@ Name = SILVERWIND SetX = 8,304 SetY = 8,70 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 1,12 SetX = 1,-288 @@ -57,7 +57,7 @@ Name = SILVERWIND SetX = 8,192 SetY = 8,134 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 1,12 SetX = 1,-248 @@ -80,7 +80,7 @@ Name = SILVERWIND SetX = 8,272 SetY = 8,38 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 2,12 SetX = 2,-192 @@ -101,7 +101,7 @@ Name = SILVERWIND SetX = 8,72 SetY = 8,126 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 2,12 SetX = 2,-280 @@ -122,7 +122,7 @@ Name = SILVERWIND SetX = 8,104 SetY = 8,38 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 3,12 SetX = 3,-144 @@ -146,7 +146,7 @@ Name = SILVERWIND SetZoomY = 8,100 SetOpacity = 8,50 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 3,12 SetX = 3,-288 @@ -165,7 +165,7 @@ Name = SILVERWIND SetX = 8,-120 SetY = 8,126 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetX = 3,-168 SetY = 3,-58 @@ -185,7 +185,7 @@ Name = SILVERWIND SetY = 7,-18 SetX = 8,240 - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 4,12 SetX = 4,24 @@ -206,7 +206,7 @@ Name = SILVERWIND SetOpacity = 7,50 SetVisible = 8,false - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 4,1 SetX = 4,-168 @@ -228,7 +228,7 @@ Name = SILVERWIND SetFrame = 7,10 SetVisible = 8,false - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 5,10 SetX = 5,40 @@ -244,7 +244,7 @@ Name = SILVERWIND SetOpacity = 7,255 SetVisible = 8,false - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 5,12 SetX = 5,-200 @@ -258,7 +258,7 @@ Name = SILVERWIND SetY = 7,46 SetVisible = 8,false - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 5,12 SetX = 5,-296 @@ -272,7 +272,7 @@ Name = SILVERWIND SetY = 7,-66 SetVisible = 8,false - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 5,12 SetX = 5,-288 @@ -284,7 +284,7 @@ Name = SILVERWIND SetY = 6,-42 SetVisible = 7,false - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFrame = 5,12 SetX = 5,-8 @@ -296,7 +296,7 @@ Name = SILVERWIND SetY = 6,-98 SetVisible = 7,false - Graphic = Heal5 + Graphic = Examples/Heal5 Focus = Target SetFlip = 5,true SetX = 5,-200 diff --git a/PBS/Animations/Converted/Move/SING.txt b/PBS/Animations/Example anims/Move/SING.txt similarity index 94% rename from PBS/Animations/Converted/Move/SING.txt rename to PBS/Animations/Example anims/Move/SING.txt index 842e0535b..d6f075c84 100644 --- a/PBS/Animations/Converted/Move/SING.txt +++ b/PBS/Animations/Example anims/Move/SING.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SING] -Name = SING +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SING SetX = 0,0 SetY = 0,0 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 0,7 SetX = 0,-184 @@ -152,7 +152,7 @@ Name = SING SetY = 51,-85 SetVisible = 52,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 1,7 SetX = 1,-173 @@ -291,7 +291,7 @@ Name = SING SetY = 50,-89 SetVisible = 51,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 2,8 SetX = 2,-148 @@ -299,7 +299,7 @@ Name = SING SetZ = 2,29 SetVisible = 3,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 4,10 SetX = 4,-127 @@ -433,7 +433,7 @@ Name = SING SetY = 50,-76 SetVisible = 51,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 8,7 SetX = 8,-162 @@ -522,7 +522,7 @@ Name = SING SetY = 38,17 SetVisible = 39,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 13,8 SetX = 13,-102 @@ -598,7 +598,7 @@ Name = SING SetY = 38,-6 SetVisible = 39,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 15,8 SetX = 15,45 @@ -608,7 +608,7 @@ Name = SING SetY = 16,61 SetVisible = 17,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 15,9 SetX = 15,53 @@ -619,7 +619,7 @@ Name = SING SetY = 16,-12 SetVisible = 17,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 16,8 SetX = 16,33 @@ -627,7 +627,7 @@ Name = SING SetZ = 16,34 SetVisible = 17,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 16,10 SetX = 16,33 @@ -635,7 +635,7 @@ Name = SING SetZ = 16,35 SetVisible = 17,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 18,8 SetX = 18,42 @@ -653,7 +653,7 @@ Name = SING SetY = 22,9 SetVisible = 23,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 24,9 SetX = 24,-129 @@ -661,7 +661,7 @@ Name = SING SetZ = 24,32 SetVisible = 25,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 25,10 SetX = 25,29 @@ -669,7 +669,7 @@ Name = SING SetZ = 25,33 SetVisible = 26,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 27,9 SetX = 27,-152 @@ -679,7 +679,7 @@ Name = SING SetY = 28,-8 SetVisible = 29,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 27,11 SetX = 27,-175 @@ -687,7 +687,7 @@ Name = SING SetZ = 27,33 SetVisible = 28,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 31,9 SetX = 31,18 @@ -706,7 +706,7 @@ Name = SING SetY = 35,16 SetVisible = 36,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 31,11 SetX = 31,16 @@ -717,7 +717,7 @@ Name = SING Play = 0,Sing,80 #------------------------------- [OppMove,SING] -Name = SING +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -725,7 +725,7 @@ Name = SING SetX = 0,0 SetY = 0,0 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 0,7 SetX = 0,-20 @@ -837,7 +837,7 @@ Name = SING SetY = 40,23 SetOpacity = 40,255 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 0,8 SetX = 0,-19 @@ -948,7 +948,7 @@ Name = SING SetX = 40,-201 SetY = 40,4 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 4,9 SetX = 4,-84 @@ -1052,7 +1052,7 @@ Name = SING SetX = 40,-215 SetY = 40,43 - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 4,10 SetX = 4,-79 @@ -1065,7 +1065,7 @@ Name = SING SetY = 6,25 SetVisible = 7,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 9,11 SetX = 9,-3 @@ -1084,7 +1084,7 @@ Name = SING SetY = 13,45 SetVisible = 14,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 10,9 SetX = 10,-4 @@ -1099,7 +1099,7 @@ Name = SING SetY = 13,44 SetVisible = 14,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 11,11 SetX = 11,-65 @@ -1107,7 +1107,7 @@ Name = SING SetZ = 11,32 SetVisible = 12,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 13,10 SetX = 13,-23 @@ -1115,7 +1115,7 @@ Name = SING SetZ = 13,32 SetVisible = 14,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 16,11 SetX = 16,-97 @@ -1126,7 +1126,7 @@ Name = SING SetY = 17,155 SetVisible = 18,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 16,10 SetX = 16,-102 @@ -1137,7 +1137,7 @@ Name = SING SetY = 17,149 SetVisible = 18,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 19,11 SetX = 19,-6 @@ -1155,7 +1155,7 @@ Name = SING SetY = 23,55 SetVisible = 24,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 20,8 SetX = 20,-17 @@ -1166,7 +1166,7 @@ Name = SING SetY = 21,108 SetVisible = 22,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 23,10 SetX = 23,-15 @@ -1174,7 +1174,7 @@ Name = SING SetZ = 23,31 SetVisible = 24,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 23,11 SetX = 23,-49 @@ -1182,7 +1182,7 @@ Name = SING SetZ = 23,32 SetVisible = 24,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 26,9 SetX = 26,-112 @@ -1208,7 +1208,7 @@ Name = SING SetY = 33,164 SetVisible = 34,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 26,8 SetX = 26,-134 @@ -1235,7 +1235,7 @@ Name = SING SetY = 33,147 SetVisible = 34,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 27,10 SetX = 27,-143 @@ -1245,7 +1245,7 @@ Name = SING SetY = 28,126 SetVisible = 29,false - Graphic = poi.hear.mus + Graphic = Examples/poi.hear.mus Focus = Target SetFrame = 30,11 SetX = 30,-122 diff --git a/PBS/Animations/Converted/Move/SKETCH.txt b/PBS/Animations/Example anims/Move/SKETCH.txt similarity index 95% rename from PBS/Animations/Converted/Move/SKETCH.txt rename to PBS/Animations/Example anims/Move/SKETCH.txt index c5a3f81e8..3b73e6b1d 100644 --- a/PBS/Animations/Converted/Move/SKETCH.txt +++ b/PBS/Animations/Example anims/Move/SKETCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SKETCH] -Name = SKETCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SKETCH SetX = 0,0 SetY = 0,0 - Graphic = normal2 + Graphic = Examples/normal2 Focus = Target SetFrame = 0,14 SetX = 0,-232 diff --git a/PBS/Animations/Converted/Move/SLAM.txt b/PBS/Animations/Example anims/Move/SLAM.txt similarity index 86% rename from PBS/Animations/Converted/Move/SLAM.txt rename to PBS/Animations/Example anims/Move/SLAM.txt index ad7258b01..0244cf238 100644 --- a/PBS/Animations/Converted/Move/SLAM.txt +++ b/PBS/Animations/Example anims/Move/SLAM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SLAM] -Name = SLAM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SLAM SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/SLASH.txt b/PBS/Animations/Example anims/Move/SLASH.txt similarity index 89% rename from PBS/Animations/Converted/Move/SLASH.txt rename to PBS/Animations/Example anims/Move/SLASH.txt index 0c5b445e0..d5f3cdd0e 100644 --- a/PBS/Animations/Converted/Move/SLASH.txt +++ b/PBS/Animations/Example anims/Move/SLASH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SLASH] -Name = SLASH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SLASH SetX = 0,0 SetY = 0,0 - Graphic = zan03 + Graphic = Examples/zan03 Focus = Target SetX = 0,-104 SetY = 0,-90 @@ -24,7 +24,7 @@ Name = SLASH SetY = 3,-2 SetVisible = 4,false - Graphic = zan03 + Graphic = Examples/zan03 Focus = Target SetX = 0,-80 SetY = 0,-122 @@ -38,7 +38,7 @@ Name = SLASH SetY = 3,22 SetVisible = 4,false - Graphic = zan03 + Graphic = Examples/zan03 Focus = Target SetX = 0,-128 SetY = 0,-58 diff --git a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt b/PBS/Animations/Example anims/Move/SLEEPPOWDER.txt similarity index 91% rename from PBS/Animations/Converted/Move/SLEEPPOWDER.txt rename to PBS/Animations/Example anims/Move/SLEEPPOWDER.txt index 76817330c..541629a64 100644 --- a/PBS/Animations/Converted/Move/SLEEPPOWDER.txt +++ b/PBS/Animations/Example anims/Move/SLEEPPOWDER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SLEEPPOWDER] -Name = SLEEPPOWDER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SLEEPPOWDER SetX = 0,0 SetY = 0,0 - Graphic = Special5 + Graphic = Examples/Special5 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/SLUDGE.txt b/PBS/Animations/Example anims/Move/SLUDGE.txt similarity index 91% rename from PBS/Animations/Converted/Move/SLUDGE.txt rename to PBS/Animations/Example anims/Move/SLUDGE.txt index ca99935a4..1baabd24a 100644 --- a/PBS/Animations/Converted/Move/SLUDGE.txt +++ b/PBS/Animations/Example anims/Move/SLUDGE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SLUDGE] -Name = SLUDGE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SLUDGE SetX = 0,0 SetY = 0,0 - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetFrame = 5,5 SetX = 5,-26 @@ -24,7 +24,7 @@ Name = SLUDGE SetFrame = 12,12 SetFrame = 13,13 - Graphic = State1 + Graphic = Examples/State1 Focus = UserAndTarget SetX = 0,0 SetY = 0,18 diff --git a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt b/PBS/Animations/Example anims/Move/SLUDGEBOMB.txt similarity index 92% rename from PBS/Animations/Converted/Move/SLUDGEBOMB.txt rename to PBS/Animations/Example anims/Move/SLUDGEBOMB.txt index 9c258ae6d..64a222f88 100644 --- a/PBS/Animations/Converted/Move/SLUDGEBOMB.txt +++ b/PBS/Animations/Example anims/Move/SLUDGEBOMB.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SLUDGEBOMB] -Name = SLUDGEBOMB +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SLUDGEBOMB SetX = 0,0 SetY = 0,0 - Graphic = poison4 + Graphic = Examples/poison4 Focus = UserAndTarget SetX = 0,9 SetY = 0,-10 @@ -28,7 +28,7 @@ Name = SLUDGEBOMB SetY = 6,-139 SetVisible = 7,false - Graphic = poison4 + Graphic = Examples/poison4 Focus = UserAndTarget SetFrame = 1,1 SetX = 1,14 @@ -46,7 +46,7 @@ Name = SLUDGEBOMB SetY = 5,-118 SetVisible = 6,false - Graphic = poison4 + Graphic = Examples/poison4 Focus = UserAndTarget SetFrame = 2,2 SetX = 2,29 @@ -60,7 +60,7 @@ Name = SLUDGEBOMB SetY = 4,-109 SetVisible = 5,false - Graphic = poison4 + Graphic = Examples/poison4 Focus = UserAndTarget SetX = 0,4 SetY = 0,-20 diff --git a/PBS/Animations/Converted/Move/SMOG.txt b/PBS/Animations/Example anims/Move/SMOG.txt similarity index 90% rename from PBS/Animations/Converted/Move/SMOG.txt rename to PBS/Animations/Example anims/Move/SMOG.txt index f49de2abd..5ff287bb9 100644 --- a/PBS/Animations/Converted/Move/SMOG.txt +++ b/PBS/Animations/Example anims/Move/SMOG.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SMOG] -Name = SMOG +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SMOG SetX = 0,0 SetY = 0,0 - Graphic = poison + Graphic = Examples/poison Focus = Target SetFrame = 0,8 SetX = 0,8 diff --git a/PBS/Animations/Converted/Move/SMOKESCREEN.txt b/PBS/Animations/Example anims/Move/SMOKESCREEN.txt similarity index 92% rename from PBS/Animations/Converted/Move/SMOKESCREEN.txt rename to PBS/Animations/Example anims/Move/SMOKESCREEN.txt index 0bd0fd8a1..997371657 100644 --- a/PBS/Animations/Converted/Move/SMOKESCREEN.txt +++ b/PBS/Animations/Example anims/Move/SMOKESCREEN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SMOKESCREEN] -Name = SMOKESCREEN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SMOKESCREEN SetX = 0,0 SetY = 0,0 - Graphic = Anima (2) + Graphic = Examples/Anima (2) Focus = Target SetFrame = 0,4 SetX = 0,0 @@ -40,7 +40,7 @@ Name = SMOKESCREEN SetFrame = 14,4 SetOpacity = 14,150 - Graphic = Anima (2) + Graphic = Examples/Anima (2) Focus = Target SetFrame = 2,4 SetX = 2,-48 @@ -64,7 +64,7 @@ Name = SMOKESCREEN SetOpacity = 13,150 SetVisible = 14,false - Graphic = Anima (2) + Graphic = Examples/Anima (2) Focus = Target SetFrame = 3,4 SetX = 3,24 @@ -89,7 +89,7 @@ Name = SMOKESCREEN SetOpacity = 13,150 SetVisible = 14,false - Graphic = Anima (2) + Graphic = Examples/Anima (2) Focus = Target SetFrame = 3,4 SetFlip = 3,true @@ -117,7 +117,7 @@ Name = SMOKESCREEN SetY = 11,30 SetVisible = 12,false - Graphic = Anima (2) + Graphic = Examples/Anima (2) Focus = Target SetFrame = 4,3 SetFlip = 4,true @@ -138,7 +138,7 @@ Name = SMOKESCREEN SetY = 10,30 SetVisible = 11,false - Graphic = Anima (2) + Graphic = Examples/Anima (2) Focus = Target SetFrame = 5,2 SetFlip = 5,true diff --git a/PBS/Animations/Converted/Move/SPIDERWEB.txt b/PBS/Animations/Example anims/Move/SPIDERWEB.txt similarity index 94% rename from PBS/Animations/Converted/Move/SPIDERWEB.txt rename to PBS/Animations/Example anims/Move/SPIDERWEB.txt index bedec3bad..8e06fb50c 100644 --- a/PBS/Animations/Converted/Move/SPIDERWEB.txt +++ b/PBS/Animations/Example anims/Move/SPIDERWEB.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SPIDERWEB] -Name = SPIDERWEB +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SPIDERWEB SetX = 0,0 SetY = 0,0 - Graphic = ghost2 + Graphic = Examples/ghost2 Focus = UserAndTarget SetFrame = 3,12 SetFlip = 3,true @@ -38,7 +38,7 @@ Name = SPIDERWEB SetZoomY = 7,50 SetVisible = 8,false - Graphic = ghost2 + Graphic = Examples/ghost2 Focus = UserAndTarget SetFrame = 0,13 SetX = 0,50 diff --git a/PBS/Animations/Converted/Move/SPIKECANNON.txt b/PBS/Animations/Example anims/Move/SPIKECANNON.txt similarity index 88% rename from PBS/Animations/Converted/Move/SPIKECANNON.txt rename to PBS/Animations/Example anims/Move/SPIKECANNON.txt index b2f42d538..b9e1cf760 100644 --- a/PBS/Animations/Converted/Move/SPIKECANNON.txt +++ b/PBS/Animations/Example anims/Move/SPIKECANNON.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SPIKECANNON] -Name = SPIKECANNON +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SPIKECANNON SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,14 SetY = 0,-20 @@ -24,7 +24,7 @@ Name = SPIKECANNON SetX = 5,184 SetY = 5,-157 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -38,7 +38,7 @@ Name = SPIKECANNON SetX = 5,150 SetY = 5,-187 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,69 SetY = 2,-29 @@ -52,7 +52,7 @@ Name = SPIKECANNON SetY = 5,-178 SetOpacity = 5,50 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-50 @@ -66,7 +66,7 @@ Name = SPIKECANNON SetX = 5,159 SetY = 5,-207 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 3,14 SetX = 3,184 @@ -80,7 +80,7 @@ Name = SPIKECANNON Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,1] -Name = Spike Cannon hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -88,7 +88,7 @@ Name = Spike Cannon hit 2 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 3,14 SetX = 3,184 @@ -97,7 +97,7 @@ Name = Spike Cannon hit 2 SetOpacity = 3,50 SetVisible = 4,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,14 SetY = 0,-20 @@ -112,7 +112,7 @@ Name = Spike Cannon hit 2 SetX = 5,184 SetY = 5,-157 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -126,7 +126,7 @@ Name = Spike Cannon hit 2 SetX = 5,150 SetY = 5,-187 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,69 SetY = 2,-29 @@ -140,7 +140,7 @@ Name = Spike Cannon hit 2 SetY = 5,-178 SetOpacity = 5,50 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-50 @@ -159,7 +159,7 @@ Name = Spike Cannon hit 2 Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,2] -Name = Spike Cannon hit 3 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -167,7 +167,7 @@ Name = Spike Cannon hit 3 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-50 @@ -181,7 +181,7 @@ Name = Spike Cannon hit 3 SetX = 5,159 SetY = 5,-207 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 3,14 SetX = 3,184 @@ -190,7 +190,7 @@ Name = Spike Cannon hit 3 SetOpacity = 3,50 SetVisible = 4,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,14 SetY = 0,-20 @@ -205,7 +205,7 @@ Name = Spike Cannon hit 3 SetX = 5,184 SetY = 5,-157 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -219,7 +219,7 @@ Name = Spike Cannon hit 3 SetX = 5,150 SetY = 5,-187 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,69 SetY = 2,-29 @@ -238,7 +238,7 @@ Name = Spike Cannon hit 3 Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,3] -Name = Spike Cannon hit 4 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -246,7 +246,7 @@ Name = Spike Cannon hit 4 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,69 SetY = 2,-29 @@ -260,7 +260,7 @@ Name = Spike Cannon hit 4 SetY = 5,-178 SetOpacity = 5,50 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-50 @@ -274,7 +274,7 @@ Name = Spike Cannon hit 4 SetX = 5,159 SetY = 5,-207 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 3,14 SetX = 3,184 @@ -283,7 +283,7 @@ Name = Spike Cannon hit 4 SetOpacity = 3,50 SetVisible = 4,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,14 SetY = 0,-20 @@ -298,7 +298,7 @@ Name = Spike Cannon hit 4 SetX = 5,184 SetY = 5,-157 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -317,7 +317,7 @@ Name = Spike Cannon hit 4 Play = 4,Slash10,80 #------------------------------- [Move,SPIKECANNON,4] -Name = Spike Cannon hit 5 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -325,7 +325,7 @@ Name = Spike Cannon hit 5 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 1,25 SetY = 1,-40 @@ -339,7 +339,7 @@ Name = Spike Cannon hit 5 SetX = 5,150 SetY = 5,-187 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,69 SetY = 2,-29 @@ -353,7 +353,7 @@ Name = Spike Cannon hit 5 SetY = 5,-178 SetOpacity = 5,50 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 2,19 SetY = 2,-50 @@ -367,7 +367,7 @@ Name = Spike Cannon hit 5 SetX = 5,159 SetY = 5,-207 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 3,14 SetX = 3,184 @@ -376,7 +376,7 @@ Name = Spike Cannon hit 5 SetOpacity = 3,50 SetVisible = 4,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,14 SetY = 0,-20 diff --git a/PBS/Animations/Converted/Move/SPIKES.txt b/PBS/Animations/Example anims/Move/SPIKES.txt similarity index 93% rename from PBS/Animations/Converted/Move/SPIKES.txt rename to PBS/Animations/Example anims/Move/SPIKES.txt index ae040a250..bea27f60e 100644 --- a/PBS/Animations/Converted/Move/SPIKES.txt +++ b/PBS/Animations/Example anims/Move/SPIKES.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SPIKES] -Name = SPIKES +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SPIKES SetX = 0,0 SetY = 0,0 - Graphic = normal2 + Graphic = Examples/normal2 Focus = UserAndTarget SetFrame = 3,13 SetX = 3,0 @@ -35,7 +35,7 @@ Name = SPIKES SetX = 13,139 SetY = 13,-148 - Graphic = normal2 + Graphic = Examples/normal2 Focus = UserAndTarget SetFrame = 6,13 SetX = 6,89 @@ -51,7 +51,7 @@ Name = SPIKES SetY = 9,-148 SetX = 10,219 - Graphic = normal2 + Graphic = Examples/normal2 Focus = UserAndTarget SetFrame = 0,13 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/SPLASH.txt b/PBS/Animations/Example anims/Move/SPLASH.txt similarity index 89% rename from PBS/Animations/Converted/Move/SPLASH.txt rename to PBS/Animations/Example anims/Move/SPLASH.txt index ba32815f3..2f8687d27 100644 --- a/PBS/Animations/Converted/Move/SPLASH.txt +++ b/PBS/Animations/Example anims/Move/SPLASH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SPLASH] -Name = SPLASH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SPLASH SetX = 0,0 SetY = 0,0 - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFlip = 1,true SetX = 1,-72 @@ -17,7 +17,7 @@ Name = SPLASH SetZ = 1,28 SetVisible = 2,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFrame = 2,1 SetX = 2,72 @@ -25,7 +25,7 @@ Name = SPLASH SetZ = 2,29 SetVisible = 3,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetFrame = 3,1 SetFlip = 3,true @@ -50,7 +50,7 @@ Name = SPLASH SetFrame = 9,2 SetX = 9,-120 - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetX = 4,80 SetY = 4,-2 @@ -61,7 +61,7 @@ Name = SPLASH SetX = 6,-64 SetVisible = 7,false - Graphic = poison2 + Graphic = Examples/poison2 Focus = User SetX = 0,56 SetY = 0,14 diff --git a/PBS/Animations/Converted/Move/SPORE.txt b/PBS/Animations/Example anims/Move/SPORE.txt similarity index 91% rename from PBS/Animations/Converted/Move/SPORE.txt rename to PBS/Animations/Example anims/Move/SPORE.txt index fd46bdff3..167e95ac0 100644 --- a/PBS/Animations/Converted/Move/SPORE.txt +++ b/PBS/Animations/Example anims/Move/SPORE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SPORE] -Name = SPORE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SPORE SetX = 0,0 SetY = 0,0 - Graphic = Special5 + Graphic = Examples/Special5 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/STEALTHROCK.txt b/PBS/Animations/Example anims/Move/STEALTHROCK.txt similarity index 93% rename from PBS/Animations/Converted/Move/STEALTHROCK.txt rename to PBS/Animations/Example anims/Move/STEALTHROCK.txt index 31a5ca617..b80596026 100644 --- a/PBS/Animations/Converted/Move/STEALTHROCK.txt +++ b/PBS/Animations/Example anims/Move/STEALTHROCK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,STEALTHROCK] -Name = STEALTHROCK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = STEALTHROCK SetX = 0,0 SetY = 0,0 - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 0,5 SetX = 0,128 @@ -89,7 +89,7 @@ Name = STEALTHROCK SetOpacity = 28,64 SetVisible = 29,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 4,5 SetX = 4,128 @@ -161,7 +161,7 @@ Name = STEALTHROCK SetOpacity = 28,64 SetVisible = 29,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 7,431 SetY = 7,188 @@ -208,7 +208,7 @@ Name = STEALTHROCK SetOpacity = 21,255 SetVisible = 25,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 7,3 SetX = 7,295 @@ -221,7 +221,7 @@ Name = STEALTHROCK SetOpacity = 8,192 SetVisible = 9,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 8,3 SetX = 8,295 @@ -243,7 +243,7 @@ Name = STEALTHROCK SetY = 21,176 SetVisible = 25,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,1 SetX = 11,352 @@ -265,7 +265,7 @@ Name = STEALTHROCK SetY = 17,190 SetVisible = 21,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,2 SetX = 11,475 @@ -279,7 +279,7 @@ Name = STEALTHROCK SetY = 16,186 SetVisible = 17,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 12,1 SetX = 12,352 @@ -288,7 +288,7 @@ Name = STEALTHROCK SetOpacity = 12,192 SetVisible = 13,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 15,323 SetY = 15,169 @@ -297,7 +297,7 @@ Name = STEALTHROCK SetOpacity = 16,192 SetVisible = 17,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 15,3 SetX = 15,395 @@ -307,7 +307,7 @@ Name = STEALTHROCK SetOpacity = 16,192 SetVisible = 17,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,1 SetX = 19,444 @@ -320,7 +320,7 @@ Name = STEALTHROCK SetOpacity = 20,192 SetVisible = 21,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,2 SetX = 19,288 @@ -336,7 +336,7 @@ Name = STEALTHROCK Play = 0,Slam,80 #------------------------------- [OppMove,STEALTHROCK] -Name = STEALTHROCK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -344,7 +344,7 @@ Name = STEALTHROCK SetX = 0,0 SetY = 0,0 - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 0,5 SetX = 0,376 @@ -424,7 +424,7 @@ Name = STEALTHROCK SetOpacity = 28,64 SetVisible = 29,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 4,5 SetX = 4,376 @@ -496,7 +496,7 @@ Name = STEALTHROCK SetOpacity = 28,64 SetVisible = 29,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 7,207 SetY = 7,284 @@ -543,7 +543,7 @@ Name = STEALTHROCK SetOpacity = 21,255 SetVisible = 25,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 7,3 SetX = 7,71 @@ -556,7 +556,7 @@ Name = STEALTHROCK SetOpacity = 8,192 SetVisible = 9,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 8,3 SetX = 8,71 @@ -578,7 +578,7 @@ Name = STEALTHROCK SetY = 21,272 SetVisible = 25,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,1 SetX = 11,128 @@ -600,7 +600,7 @@ Name = STEALTHROCK SetY = 17,286 SetVisible = 21,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,2 SetX = 11,251 @@ -614,7 +614,7 @@ Name = STEALTHROCK SetY = 16,282 SetVisible = 17,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 12,1 SetX = 12,128 @@ -623,7 +623,7 @@ Name = STEALTHROCK SetOpacity = 12,192 SetVisible = 13,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 15,99 SetY = 15,265 @@ -632,7 +632,7 @@ Name = STEALTHROCK SetOpacity = 16,192 SetVisible = 17,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 15,3 SetX = 15,171 @@ -642,7 +642,7 @@ Name = STEALTHROCK SetOpacity = 16,192 SetVisible = 17,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,1 SetX = 19,220 @@ -655,7 +655,7 @@ Name = STEALTHROCK SetOpacity = 20,192 SetVisible = 21,false - Graphic = Rock Tomb + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,2 SetX = 19,64 diff --git a/PBS/Animations/Converted/Move/STOMP.txt b/PBS/Animations/Example anims/Move/STOMP.txt similarity index 89% rename from PBS/Animations/Converted/Move/STOMP.txt rename to PBS/Animations/Example anims/Move/STOMP.txt index d9eb50ec9..283a0bc10 100644 --- a/PBS/Animations/Converted/Move/STOMP.txt +++ b/PBS/Animations/Example anims/Move/STOMP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,STOMP] -Name = STOMP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = STOMP SetX = 0,0 SetY = 0,0 - Graphic = normal1 + Graphic = Examples/normal1 Focus = Target SetFrame = 0,6 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/STRINGSHOT.txt b/PBS/Animations/Example anims/Move/STRINGSHOT.txt similarity index 92% rename from PBS/Animations/Converted/Move/STRINGSHOT.txt rename to PBS/Animations/Example anims/Move/STRINGSHOT.txt index e8dfcebc7..ccbee4066 100644 --- a/PBS/Animations/Converted/Move/STRINGSHOT.txt +++ b/PBS/Animations/Example anims/Move/STRINGSHOT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,STRINGSHOT] -Name = STRINGSHOT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = STRINGSHOT SetX = 0,0 SetY = 0,0 - Graphic = water3 + Graphic = Examples/water3 Focus = UserAndTarget SetX = 0,0 SetY = 0,18 @@ -26,7 +26,7 @@ Name = STRINGSHOT SetZoomY = 2,75 SetVisible = 3,false - Graphic = water3 + Graphic = Examples/water3 Focus = UserAndTarget SetX = 1,0 SetY = 1,18 @@ -43,7 +43,7 @@ Name = STRINGSHOT SetZoomY = 3,75 SetVisible = 4,false - Graphic = water3 + Graphic = Examples/water3 Focus = UserAndTarget SetX = 2,0 SetY = 2,18 @@ -60,7 +60,7 @@ Name = STRINGSHOT SetZoomY = 4,75 SetVisible = 5,false - Graphic = water3 + Graphic = Examples/water3 Focus = Target SetX = 3,-2 SetY = 3,14 @@ -85,7 +85,7 @@ Name = STRINGSHOT SetZoomY = 14,100 SetOpacity = 15,100 - Graphic = water3 + Graphic = Examples/water3 Focus = Target SetX = 4,-2 SetY = 4,39 @@ -108,7 +108,7 @@ Name = STRINGSHOT SetZoomY = 14,100 SetOpacity = 15,100 - Graphic = water3 + Graphic = Examples/water3 Focus = Target SetX = 5,-2 SetY = 5,65 diff --git a/PBS/Animations/Converted/Move/STRUGGLE.txt b/PBS/Animations/Example anims/Move/STRUGGLE.txt similarity index 92% rename from PBS/Animations/Converted/Move/STRUGGLE.txt rename to PBS/Animations/Example anims/Move/STRUGGLE.txt index c2de19fc4..c55f28116 100644 --- a/PBS/Animations/Converted/Move/STRUGGLE.txt +++ b/PBS/Animations/Example anims/Move/STRUGGLE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,STRUGGLE] -Name = STRUGGLE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = STRUGGLE SetX = 0,0 SetY = 0,0 - Graphic = Struggle + Graphic = Examples/Struggle Focus = User SetFrame = 0,1 SetX = 0,40 @@ -36,7 +36,7 @@ Name = STRUGGLE SetX = 9,-56 SetY = 9,14 - Graphic = Struggle + Graphic = Examples/Struggle Focus = User SetX = 0,-40 SetY = 0,6 diff --git a/PBS/Animations/Converted/Move/STUNSPORE.txt b/PBS/Animations/Example anims/Move/STUNSPORE.txt similarity index 91% rename from PBS/Animations/Converted/Move/STUNSPORE.txt rename to PBS/Animations/Example anims/Move/STUNSPORE.txt index c3c3c32d7..a5a8b6c98 100644 --- a/PBS/Animations/Converted/Move/STUNSPORE.txt +++ b/PBS/Animations/Example anims/Move/STUNSPORE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,STUNSPORE] -Name = STUNSPORE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = STUNSPORE SetX = 0,0 SetY = 0,0 - Graphic = Special5 + Graphic = Examples/Special5 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/SUNNYDAY.txt b/PBS/Animations/Example anims/Move/SUNNYDAY.txt similarity index 93% rename from PBS/Animations/Converted/Move/SUNNYDAY.txt rename to PBS/Animations/Example anims/Move/SUNNYDAY.txt index 7d4debf66..097b77c80 100644 --- a/PBS/Animations/Converted/Move/SUNNYDAY.txt +++ b/PBS/Animations/Example anims/Move/SUNNYDAY.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SUNNYDAY] -Name = SUNNYDAY +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SUNNYDAY SetX = 0,0 SetY = 0,0 - Graphic = weather + Graphic = Examples/weather Focus = Foreground SetX = 0,64 SetY = 0,64 diff --git a/PBS/Animations/Converted/Move/SUPERSONIC.txt b/PBS/Animations/Example anims/Move/SUPERSONIC.txt similarity index 93% rename from PBS/Animations/Converted/Move/SUPERSONIC.txt rename to PBS/Animations/Example anims/Move/SUPERSONIC.txt index f21a81aa3..0576fece5 100644 --- a/PBS/Animations/Converted/Move/SUPERSONIC.txt +++ b/PBS/Animations/Example anims/Move/SUPERSONIC.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SUPERSONIC] -Name = SUPERSONIC +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SUPERSONIC SetX = 0,0 SetY = 0,0 - Graphic = Struggle + Graphic = Examples/Struggle Focus = UserAndTarget SetFrame = 2,1 SetX = 2,14 @@ -45,7 +45,7 @@ Name = SUPERSONIC SetZoomY = 10,130 SetVisible = 11,false - Graphic = Struggle + Graphic = Examples/Struggle Focus = UserAndTarget SetFrame = 4,1 SetX = 4,25 @@ -56,7 +56,7 @@ Name = SUPERSONIC SetY = 5,-29 SetVisible = 6,false - Graphic = Struggle + Graphic = Examples/Struggle Focus = UserAndTarget SetFrame = 7,1 SetX = 7,44 @@ -67,7 +67,7 @@ Name = SUPERSONIC SetY = 8,-40 SetVisible = 9,false - Graphic = Struggle + Graphic = Examples/Struggle Focus = UserAndTarget SetFrame = 0,1 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/SWAGGER.txt b/PBS/Animations/Example anims/Move/SWAGGER.txt similarity index 93% rename from PBS/Animations/Converted/Move/SWAGGER.txt rename to PBS/Animations/Example anims/Move/SWAGGER.txt index 75e791a30..4a6da9df1 100644 --- a/PBS/Animations/Converted/Move/SWAGGER.txt +++ b/PBS/Animations/Example anims/Move/SWAGGER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SWAGGER] -Name = SWAGGER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SWAGGER SetX = 0,0 SetY = 0,0 - Graphic = mixed status + Graphic = Examples/mixed status Focus = Target SetFrame = 4,4 SetX = 4,21 diff --git a/PBS/Animations/Converted/Move/SWEETKISS.txt b/PBS/Animations/Example anims/Move/SWEETKISS.txt similarity index 94% rename from PBS/Animations/Converted/Move/SWEETKISS.txt rename to PBS/Animations/Example anims/Move/SWEETKISS.txt index 549d4aa96..1638522c6 100644 --- a/PBS/Animations/Converted/Move/SWEETKISS.txt +++ b/PBS/Animations/Example anims/Move/SWEETKISS.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SWEETKISS] -Name = SWEETKISS +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SWEETKISS SetX = 0,0 SetY = 0,0 - Graphic = electric2 + Graphic = Examples/electric2 Focus = Target SetFrame = 8,9 SetX = 8,-16 @@ -29,7 +29,7 @@ Name = SWEETKISS SetZoomY = 12,75 SetVisible = 18,false - Graphic = electric2 + Graphic = Examples/electric2 Focus = Target SetFrame = 0,8 SetX = 0,56 diff --git a/PBS/Animations/Converted/Move/SWIFT.txt b/PBS/Animations/Example anims/Move/SWIFT.txt similarity index 91% rename from PBS/Animations/Converted/Move/SWIFT.txt rename to PBS/Animations/Example anims/Move/SWIFT.txt index cb646fce1..8ab32024a 100644 --- a/PBS/Animations/Converted/Move/SWIFT.txt +++ b/PBS/Animations/Example anims/Move/SWIFT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SWIFT] -Name = SWIFT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SWIFT SetX = 0,0 SetY = 0,0 - Graphic = 007-Weapon02 + Graphic = Examples/007-Weapon02 Focus = UserAndTarget SetFrame = 0,11 SetX = 0,0 @@ -40,7 +40,7 @@ Name = SWIFT SetY = 10,-187 SetFrame = 11,12 - Graphic = 007-Weapon02 + Graphic = Examples/007-Weapon02 Focus = UserAndTarget SetFrame = 1,12 SetX = 1,0 @@ -68,7 +68,7 @@ Name = SWIFT SetY = 10,-157 SetVisible = 11,false - Graphic = 007-Weapon02 + Graphic = Examples/007-Weapon02 Focus = UserAndTarget SetFrame = 2,13 SetX = 2,0 @@ -91,7 +91,7 @@ Name = SWIFT SetY = 8,-89 SetVisible = 9,false - Graphic = 007-Weapon02 + Graphic = Examples/007-Weapon02 Focus = UserAndTarget SetFrame = 3,11 SetX = 3,50 @@ -111,7 +111,7 @@ Name = SWIFT SetX = 8,59 SetVisible = 9,false - Graphic = 007-Weapon02 + Graphic = Examples/007-Weapon02 Focus = UserAndTarget SetFrame = 3,11 SetX = 3,-10 @@ -129,7 +129,7 @@ Name = SWIFT SetX = 7,29 SetVisible = 8,false - Graphic = 007-Weapon02 + Graphic = Examples/007-Weapon02 Focus = UserAndTarget SetFrame = 4,12 SetX = 4,0 diff --git a/PBS/Animations/Converted/Move/SWORDSDANCE.txt b/PBS/Animations/Example anims/Move/SWORDSDANCE.txt similarity index 91% rename from PBS/Animations/Converted/Move/SWORDSDANCE.txt rename to PBS/Animations/Example anims/Move/SWORDSDANCE.txt index d4bbee088..d0b7c2de8 100644 --- a/PBS/Animations/Converted/Move/SWORDSDANCE.txt +++ b/PBS/Animations/Example anims/Move/SWORDSDANCE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,SWORDSDANCE] -Name = SWORDSDANCE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = SWORDSDANCE SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,10 SetX = 0,-41 @@ -43,7 +43,7 @@ Name = SWORDSDANCE SetY = 10,-43 SetX = 11,81 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 0,10 SetX = 0,52 @@ -75,7 +75,7 @@ Name = SWORDSDANCE SetX = 11,-52 SetY = 11,-51 - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 1,11 SetX = 1,9 @@ -96,7 +96,7 @@ Name = SWORDSDANCE SetY = 6,17 SetVisible = 7,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 4,13 SetX = 4,74 @@ -104,7 +104,7 @@ Name = SWORDSDANCE SetZ = 4,30 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 4,13 SetX = 4,-81 @@ -112,7 +112,7 @@ Name = SWORDSDANCE SetZ = 4,31 SetVisible = 5,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = Target SetFrame = 8,13 SetX = 8,-23 diff --git a/PBS/Animations/Converted/Move/TACKLE.txt b/PBS/Animations/Example anims/Move/TACKLE.txt similarity index 88% rename from PBS/Animations/Converted/Move/TACKLE.txt rename to PBS/Animations/Example anims/Move/TACKLE.txt index 2b6ef91ca..b8eaface1 100644 --- a/PBS/Animations/Converted/Move/TACKLE.txt +++ b/PBS/Animations/Example anims/Move/TACKLE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TACKLE] -Name = TACKLE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = TACKLE SetX = 0,0 SetY = 0,0 - Graphic = Tackle_B + Graphic = Examples/Tackle_B Focus = Target SetX = 2,0 SetY = 2,3 diff --git a/PBS/Animations/Converted/Move/TAILGLOW.txt b/PBS/Animations/Example anims/Move/TAILGLOW.txt similarity index 94% rename from PBS/Animations/Converted/Move/TAILGLOW.txt rename to PBS/Animations/Example anims/Move/TAILGLOW.txt index be0194df4..1bb30c7ed 100644 --- a/PBS/Animations/Converted/Move/TAILGLOW.txt +++ b/PBS/Animations/Example anims/Move/TAILGLOW.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TAILGLOW] -Name = TAILGLOW +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = TAILGLOW SetX = 0,0 SetY = 0,0 - Graphic = Light1 + Graphic = Examples/Light1 Focus = Target SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/TAILWHIP.txt b/PBS/Animations/Example anims/Move/TAILWHIP.txt similarity index 96% rename from PBS/Animations/Converted/Move/TAILWHIP.txt rename to PBS/Animations/Example anims/Move/TAILWHIP.txt index 3bfe7e0a7..af3ae4238 100644 --- a/PBS/Animations/Converted/Move/TAILWHIP.txt +++ b/PBS/Animations/Example anims/Move/TAILWHIP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TAILWHIP] -Name = TAILWHIP +Name = Example anim SetX = 0,0 SetY = 0,0 diff --git a/PBS/Animations/Converted/Move/TELEPORT.txt b/PBS/Animations/Example anims/Move/TELEPORT.txt similarity index 91% rename from PBS/Animations/Converted/Move/TELEPORT.txt rename to PBS/Animations/Example anims/Move/TELEPORT.txt index 049899193..aa23a6973 100644 --- a/PBS/Animations/Converted/Move/TELEPORT.txt +++ b/PBS/Animations/Example anims/Move/TELEPORT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TELEPORT] -Name = TELEPORT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = TELEPORT SetX = 0,0 SetY = 0,0 - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 0,6 SetX = 0,-5 @@ -28,7 +28,7 @@ Name = TELEPORT SetX = 6,-4 SetY = 6,-40 - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 1,6 SetX = 1,17 @@ -45,7 +45,7 @@ Name = TELEPORT SetX = 6,14 SetY = 6,-89 - Graphic = ! + Graphic = Examples/! Focus = User SetFrame = 0,6 SetX = 0,-54 diff --git a/PBS/Animations/Converted/Move/THUNDER.txt b/PBS/Animations/Example anims/Move/THUNDER.txt similarity index 92% rename from PBS/Animations/Converted/Move/THUNDER.txt rename to PBS/Animations/Example anims/Move/THUNDER.txt index e03991e11..1cff2e36e 100644 --- a/PBS/Animations/Converted/Move/THUNDER.txt +++ b/PBS/Animations/Example anims/Move/THUNDER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,THUNDER] -Name = THUNDER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = THUNDER SetX = 0,0 SetY = 0,0 - Graphic = Trovao + Graphic = Examples/Trovao Focus = Target SetFrame = 1,12 SetFlip = 1,true @@ -29,7 +29,7 @@ Name = THUNDER SetY = 5,-10 SetVisible = 6,false - Graphic = Trovao + Graphic = Examples/Trovao Focus = Target SetFrame = 2,9 SetX = 2,16 @@ -45,7 +45,7 @@ Name = THUNDER SetY = 5,22 SetVisible = 6,false - Graphic = Trovao + Graphic = Examples/Trovao Focus = Target SetFrame = 9,1 SetX = 9,-8 @@ -54,7 +54,7 @@ Name = THUNDER SetOpacity = 9,100 SetVisible = 10,false - Graphic = Trovao + Graphic = Examples/Trovao Focus = Target SetFrame = 0,12 SetFlip = 0,true diff --git a/PBS/Animations/Converted/Move/THUNDERBOLT.txt b/PBS/Animations/Example anims/Move/THUNDERBOLT.txt similarity index 90% rename from PBS/Animations/Converted/Move/THUNDERBOLT.txt rename to PBS/Animations/Example anims/Move/THUNDERBOLT.txt index 28c9d0972..2940c11d8 100644 --- a/PBS/Animations/Converted/Move/THUNDERBOLT.txt +++ b/PBS/Animations/Example anims/Move/THUNDERBOLT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,THUNDERBOLT] -Name = THUNDERBOLT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = THUNDERBOLT SetX = 0,0 SetY = 0,0 - Graphic = 017-Thunder01 + Graphic = Examples/017-Thunder01 Focus = Target SetX = 5,0 SetY = 5,-2 @@ -19,7 +19,7 @@ Name = THUNDERBOLT SetOpacity = 6,100 SetVisible = 7,false - Graphic = 017-Thunder01 + Graphic = Examples/017-Thunder01 Focus = Target SetFrame = 0,2 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/THUNDERFANG.txt b/PBS/Animations/Example anims/Move/THUNDERFANG.txt similarity index 88% rename from PBS/Animations/Converted/Move/THUNDERFANG.txt rename to PBS/Animations/Example anims/Move/THUNDERFANG.txt index 6a35c8345..355d5a1a0 100644 --- a/PBS/Animations/Converted/Move/THUNDERFANG.txt +++ b/PBS/Animations/Example anims/Move/THUNDERFANG.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,THUNDERFANG] -Name = THUNDERFANG +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = THUNDERFANG SetX = 0,0 SetY = 0,0 - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 6,14 SetX = 6,-57 @@ -20,7 +20,7 @@ Name = THUNDERFANG SetY = 8,-26 SetVisible = 9,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 7,17 SetX = 7,87 @@ -30,7 +30,7 @@ Name = THUNDERFANG SetY = 8,28 SetVisible = 9,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 8,14 SetX = 8,97 @@ -38,7 +38,7 @@ Name = THUNDERFANG SetZ = 8,30 SetVisible = 9,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetFrame = 8,17 SetX = 8,87 @@ -46,7 +46,7 @@ Name = THUNDERFANG SetZ = 8,31 SetVisible = 9,false - Graphic = element fangs + Graphic = Examples/element fangs Focus = Target SetX = 0,7 SetY = 0,0 diff --git a/PBS/Animations/Converted/Move/THUNDERPUNCH.txt b/PBS/Animations/Example anims/Move/THUNDERPUNCH.txt similarity index 89% rename from PBS/Animations/Converted/Move/THUNDERPUNCH.txt rename to PBS/Animations/Example anims/Move/THUNDERPUNCH.txt index 6052ed554..883697401 100644 --- a/PBS/Animations/Converted/Move/THUNDERPUNCH.txt +++ b/PBS/Animations/Example anims/Move/THUNDERPUNCH.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,THUNDERPUNCH] -Name = THUNDERPUNCH +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = THUNDERPUNCH SetX = 0,0 SetY = 0,0 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 0,1 SetX = 0,1 @@ -35,7 +35,7 @@ Name = THUNDERPUNCH SetX = 9,103 SetY = 9,-95 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,3 SetX = 2,28 @@ -56,7 +56,7 @@ Name = THUNDERPUNCH SetX = 9,-79 SetY = 9,88 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 2,1 SetX = 2,1 @@ -78,7 +78,7 @@ Name = THUNDERPUNCH SetY = 8,-2 SetX = 9,-1 - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 4,3 SetX = 4,3 @@ -92,7 +92,7 @@ Name = THUNDERPUNCH SetY = 7,67 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 4,1 SetX = 4,5 @@ -106,7 +106,7 @@ Name = THUNDERPUNCH SetY = 7,-36 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,3 SetX = 7,-33 @@ -114,7 +114,7 @@ Name = THUNDERPUNCH SetZ = 7,32 SetVisible = 8,false - Graphic = punches + Graphic = Examples/punches Focus = Target SetFrame = 7,1 SetX = 7,0 diff --git a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt b/PBS/Animations/Example anims/Move/THUNDERSHOCK.txt similarity index 91% rename from PBS/Animations/Converted/Move/THUNDERSHOCK.txt rename to PBS/Animations/Example anims/Move/THUNDERSHOCK.txt index 2eb02ba40..a08afebb5 100644 --- a/PBS/Animations/Converted/Move/THUNDERSHOCK.txt +++ b/PBS/Animations/Example anims/Move/THUNDERSHOCK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,THUNDERSHOCK] -Name = THUNDERSHOCK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = THUNDERSHOCK SetX = 0,0 SetY = 0,0 - Graphic = electric1 + Graphic = Examples/electric1 Focus = Target SetFrame = 0,8 SetX = 0,-8 diff --git a/PBS/Animations/Converted/Move/THUNDERWAVE.txt b/PBS/Animations/Example anims/Move/THUNDERWAVE.txt similarity index 90% rename from PBS/Animations/Converted/Move/THUNDERWAVE.txt rename to PBS/Animations/Example anims/Move/THUNDERWAVE.txt index 64924933a..f60bf33a5 100644 --- a/PBS/Animations/Converted/Move/THUNDERWAVE.txt +++ b/PBS/Animations/Example anims/Move/THUNDERWAVE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,THUNDERWAVE] -Name = THUNDERWAVE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = THUNDERWAVE SetX = 0,0 SetY = 0,0 - Graphic = T. Shock + Graphic = Examples/T. Shock Focus = Target SetX = 6,8 SetY = 6,18 @@ -28,7 +28,7 @@ Name = THUNDERWAVE SetX = 14,-24 SetX = 15,-16 - Graphic = T. Shock + Graphic = Examples/T. Shock Focus = Target SetFrame = 6,5 SetX = 6,-16 @@ -36,7 +36,7 @@ Name = THUNDERWAVE SetZ = 6,29 SetVisible = 7,false - Graphic = T. Shock + Graphic = Examples/T. Shock Focus = Target SetX = 1,8 SetY = 1,-54 diff --git a/PBS/Animations/Converted/Move/TOXIC.txt b/PBS/Animations/Example anims/Move/TOXIC.txt similarity index 92% rename from PBS/Animations/Converted/Move/TOXIC.txt rename to PBS/Animations/Example anims/Move/TOXIC.txt index a6a0cbca8..c91404eb2 100644 --- a/PBS/Animations/Converted/Move/TOXIC.txt +++ b/PBS/Animations/Example anims/Move/TOXIC.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TOXIC] -Name = TOXIC +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = TOXIC SetX = 0,0 SetY = 0,0 - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetX = 2,56 SetY = 2,-10 @@ -33,7 +33,7 @@ Name = TOXIC SetX = 17,-56 SetY = 17,38 - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetX = 3,16 SetY = 3,46 @@ -55,7 +55,7 @@ Name = TOXIC SetFrame = 16,11 SetVisible = 17,false - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetX = 4,-32 SetY = 4,6 @@ -73,7 +73,7 @@ Name = TOXIC SetY = 14,38 SetVisible = 15,false - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetX = 5,-56 SetY = 5,38 @@ -88,7 +88,7 @@ Name = TOXIC SetFrame = 13,8 SetVisible = 14,false - Graphic = State1 + Graphic = Examples/State1 Focus = Target SetX = 0,-80 SetY = 0,22 diff --git a/PBS/Animations/Converted/Move/TRICKROOM.txt b/PBS/Animations/Example anims/Move/TRICKROOM.txt similarity index 91% rename from PBS/Animations/Converted/Move/TRICKROOM.txt rename to PBS/Animations/Example anims/Move/TRICKROOM.txt index 9c802cb94..afb5bb177 100644 --- a/PBS/Animations/Converted/Move/TRICKROOM.txt +++ b/PBS/Animations/Example anims/Move/TRICKROOM.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TRICKROOM] -Name = TRICKROOM +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = TRICKROOM SetX = 0,0 SetY = 0,0 - Graphic = mixed status + Graphic = Examples/mixed status Focus = UserAndTarget SetFrame = 0,5 SetX = 0,142 diff --git a/PBS/Animations/Converted/Move/TWINEEDLE.txt b/PBS/Animations/Example anims/Move/TWINEEDLE.txt similarity index 91% rename from PBS/Animations/Converted/Move/TWINEEDLE.txt rename to PBS/Animations/Example anims/Move/TWINEEDLE.txt index c7edad6a3..050e156ed 100644 --- a/PBS/Animations/Converted/Move/TWINEEDLE.txt +++ b/PBS/Animations/Example anims/Move/TWINEEDLE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TWINEEDLE] -Name = TWINEEDLE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = TWINEEDLE SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 4,14 SetX = 4,184 @@ -20,7 +20,7 @@ Name = TWINEEDLE SetY = 5,-168 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,0 SetY = 0,-50 @@ -43,7 +43,7 @@ Name = TWINEEDLE SetOpacity = 6,50 SetVisible = 7,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 1,44 SetY = 1,-10 @@ -68,7 +68,7 @@ Name = TWINEEDLE Play = 6,Slash10,80 #------------------------------- [Move,TWINEEDLE,1] -Name = Twineedle hit 2 +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -76,7 +76,7 @@ Name = Twineedle hit 2 SetX = 0,0 SetY = 0,0 - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 1,44 SetY = 1,-10 @@ -95,7 +95,7 @@ Name = Twineedle hit 2 SetOpacity = 5,50 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetFrame = 4,14 SetX = 4,184 @@ -106,7 +106,7 @@ Name = Twineedle hit 2 SetY = 5,-168 SetVisible = 6,false - Graphic = poison3 + Graphic = Examples/poison3 Focus = UserAndTarget SetX = 0,0 SetY = 0,-50 diff --git a/PBS/Animations/Converted/Move/TWISTER.txt b/PBS/Animations/Example anims/Move/TWISTER.txt similarity index 93% rename from PBS/Animations/Converted/Move/TWISTER.txt rename to PBS/Animations/Example anims/Move/TWISTER.txt index c659d8980..a8e9f2f0c 100644 --- a/PBS/Animations/Converted/Move/TWISTER.txt +++ b/PBS/Animations/Example anims/Move/TWISTER.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,TWISTER] -Name = TWISTER +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = TWISTER SetX = 0,0 SetY = 0,0 - Graphic = water3 + Graphic = Examples/water3 Focus = Target SetFrame = 0,11 SetX = 0,0 diff --git a/PBS/Animations/Converted/Move/VINEWHIP.txt b/PBS/Animations/Example anims/Move/VINEWHIP.txt similarity index 89% rename from PBS/Animations/Converted/Move/VINEWHIP.txt rename to PBS/Animations/Example anims/Move/VINEWHIP.txt index f954b1173..b58d1680c 100644 --- a/PBS/Animations/Converted/Move/VINEWHIP.txt +++ b/PBS/Animations/Example anims/Move/VINEWHIP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,VINEWHIP] -Name = VINEWHIP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = VINEWHIP SetX = 0,0 SetY = 0,0 - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetX = 2,-16 SetY = 2,22 @@ -23,7 +23,7 @@ Name = VINEWHIP SetY = 4,46 SetVisible = 5,false - Graphic = 003-Attack01 + Graphic = Examples/003-Attack01 Focus = Target SetFrame = 0,5 SetX = 0,64 diff --git a/PBS/Animations/Converted/Move/WATERGUN.txt b/PBS/Animations/Example anims/Move/WATERGUN.txt similarity index 87% rename from PBS/Animations/Converted/Move/WATERGUN.txt rename to PBS/Animations/Example anims/Move/WATERGUN.txt index a9b0b5043..4e2556850 100644 --- a/PBS/Animations/Converted/Move/WATERGUN.txt +++ b/PBS/Animations/Example anims/Move/WATERGUN.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,WATERGUN] -Name = WATERGUN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = WATERGUN SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 0,5 SetX = 0,25 @@ -24,7 +24,7 @@ Name = WATERGUN SetY = 8,-87 SetVisible = 9,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 1,5 SetX = 1,43 @@ -42,7 +42,7 @@ Name = WATERGUN SetY = 8,-117 SetVisible = 10,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 2,5 SetX = 2,62 @@ -58,7 +58,7 @@ Name = WATERGUN SetY = 8,-159 SetVisible = 11,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 3,5 SetX = 3,81 @@ -73,7 +73,7 @@ Name = WATERGUN SetY = 8,-185 SetVisible = 12,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 4,5 SetX = 4,96 @@ -88,7 +88,7 @@ Name = WATERGUN SetY = 8,-193 SetVisible = 13,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 5,5 SetX = 5,118 @@ -103,7 +103,7 @@ Name = WATERGUN SetY = 8,-204 SetVisible = 14,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 6,5 SetX = 6,138 @@ -116,7 +116,7 @@ Name = WATERGUN SetY = 7,-207 SetX = 8,187 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 8,6 SetX = 8,196 @@ -128,7 +128,7 @@ Name = WATERGUN Play = 0,Yawn,88 #------------------------------- [OppMove,WATERGUN] -Name = WATERGUN +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -136,7 +136,7 @@ Name = WATERGUN SetX = 0,0 SetY = 0,0 - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 0,5 SetX = 0,175 @@ -147,7 +147,7 @@ Name = WATERGUN SetOpacity = 0,235 SetVisible = 9,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 1,5 SetX = 1,156 @@ -158,7 +158,7 @@ Name = WATERGUN SetOpacity = 1,235 SetVisible = 10,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 2,5 SetX = 2,137 @@ -169,7 +169,7 @@ Name = WATERGUN SetOpacity = 2,235 SetVisible = 11,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 3,5 SetX = 3,118 @@ -180,7 +180,7 @@ Name = WATERGUN SetOpacity = 3,235 SetVisible = 12,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 4,5 SetX = 4,101 @@ -191,7 +191,7 @@ Name = WATERGUN SetOpacity = 4,235 SetVisible = 13,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 5,5 SetX = 5,81 @@ -202,7 +202,7 @@ Name = WATERGUN SetOpacity = 5,235 SetVisible = 14,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 6,5 SetX = 6,57 @@ -213,7 +213,7 @@ Name = WATERGUN SetOpacity = 6,235 SetVisible = 15,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 7,5 SetX = 7,30 @@ -224,7 +224,7 @@ Name = WATERGUN SetOpacity = 7,235 SetVisible = 9,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = User SetFrame = 8,6 SetX = 8,0 @@ -233,7 +233,7 @@ Name = WATERGUN SetOpacity = 8,240 SetVisible = 9,false - Graphic = fly copy + Graphic = Examples/fly copy Focus = User SetFrame = 9,6 SetX = 9,1 diff --git a/PBS/Animations/Converted/Move/WATERPULSE.txt b/PBS/Animations/Example anims/Move/WATERPULSE.txt similarity index 94% rename from PBS/Animations/Converted/Move/WATERPULSE.txt rename to PBS/Animations/Example anims/Move/WATERPULSE.txt index a5d067afe..c05c59827 100644 --- a/PBS/Animations/Converted/Move/WATERPULSE.txt +++ b/PBS/Animations/Example anims/Move/WATERPULSE.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,WATERPULSE] -Name = WATERPULSE +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -11,7 +11,7 @@ Name = WATERPULSE SetToneBlue = 15,255 SetToneBlue = 18,0 - Graphic = Water pulse + Graphic = Examples/Water pulse Focus = UserAndTarget SetX = 0,2 SetY = 0,7 diff --git a/PBS/Animations/Converted/Move/WHIRLWIND.txt b/PBS/Animations/Example anims/Move/WHIRLWIND.txt similarity index 89% rename from PBS/Animations/Converted/Move/WHIRLWIND.txt rename to PBS/Animations/Example anims/Move/WHIRLWIND.txt index 3a2c035fe..7fa8a6bfd 100644 --- a/PBS/Animations/Converted/Move/WHIRLWIND.txt +++ b/PBS/Animations/Example anims/Move/WHIRLWIND.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,WHIRLWIND] -Name = WHIRLWIND +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = WHIRLWIND SetX = 0,0 SetY = 0,0 - Graphic = Wind1 + Graphic = Examples/Wind1 Focus = Target SetX = 0,8 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/WILLOWISP.txt b/PBS/Animations/Example anims/Move/WILLOWISP.txt similarity index 90% rename from PBS/Animations/Converted/Move/WILLOWISP.txt rename to PBS/Animations/Example anims/Move/WILLOWISP.txt index 9362d3d09..fa269461b 100644 --- a/PBS/Animations/Converted/Move/WILLOWISP.txt +++ b/PBS/Animations/Example anims/Move/WILLOWISP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,WILLOWISP] -Name = WILLOWISP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = WILLOWISP SetX = 0,0 SetY = 0,0 - Graphic = 015-Fire01 + Graphic = Examples/015-Fire01 Focus = UserAndTarget SetFrame = 1,5 SetFlip = 1,true @@ -32,7 +32,7 @@ Name = WILLOWISP SetAngle = 5,0 SetVisible = 6,false - Graphic = 015-Fire01 + Graphic = Examples/015-Fire01 Focus = UserAndTarget SetFrame = 2,5 SetFlip = 2,true @@ -50,14 +50,14 @@ Name = WILLOWISP SetAngle = 4,0 SetVisible = 5,false - Graphic = 015-Fire01 + Graphic = Examples/015-Fire01 Focus = UserAndTarget SetX = 3,179 SetY = 3,-178 SetZ = 3,30 SetVisible = 4,false - Graphic = 015-Fire01 + Graphic = Examples/015-Fire01 Focus = UserAndTarget SetFrame = 0,5 SetFlip = 0,true diff --git a/PBS/Animations/Converted/Move/WINGATTACK.txt b/PBS/Animations/Example anims/Move/WINGATTACK.txt similarity index 92% rename from PBS/Animations/Converted/Move/WINGATTACK.txt rename to PBS/Animations/Example anims/Move/WINGATTACK.txt index bf6ce8c78..8f7ad1dc5 100644 --- a/PBS/Animations/Converted/Move/WINGATTACK.txt +++ b/PBS/Animations/Example anims/Move/WINGATTACK.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,WINGATTACK] -Name = WINGATTACK +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = WINGATTACK SetX = 0,0 SetY = 0,0 - Graphic = Wind1 + Graphic = Examples/Wind1 Focus = Target SetX = 0,8 SetY = 0,-2 diff --git a/PBS/Animations/Converted/Move/WRAP.txt b/PBS/Animations/Example anims/Move/WRAP.txt similarity index 90% rename from PBS/Animations/Converted/Move/WRAP.txt rename to PBS/Animations/Example anims/Move/WRAP.txt index cfaa2230d..e909f2dee 100644 --- a/PBS/Animations/Converted/Move/WRAP.txt +++ b/PBS/Animations/Example anims/Move/WRAP.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,WRAP] -Name = WRAP +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = WRAP SetX = 0,0 SetY = 0,0 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetFrame = 0,1 SetX = 0,56 @@ -27,7 +27,7 @@ Name = WRAP SetY = 6,6 SetX = 7,96 - Graphic = Struggle + Graphic = Examples/Struggle Focus = Target SetX = 0,-64 SetY = 0,6 diff --git a/PBS/Animations/Converted/Move/WRINGOUT.txt b/PBS/Animations/Example anims/Move/WRINGOUT.txt similarity index 94% rename from PBS/Animations/Converted/Move/WRINGOUT.txt rename to PBS/Animations/Example anims/Move/WRINGOUT.txt index 2c5f945bf..9c3b8cc23 100644 --- a/PBS/Animations/Converted/Move/WRINGOUT.txt +++ b/PBS/Animations/Example anims/Move/WRINGOUT.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,WRINGOUT] -Name = WRINGOUT +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = WRINGOUT SetX = 0,0 SetY = 0,0 - Graphic = Fakeout + Graphic = Examples/Fakeout Focus = Target SetFrame = 0,5 SetX = 0,-111 diff --git a/PBS/Animations/Converted/Move/XSCISSOR.txt b/PBS/Animations/Example anims/Move/XSCISSOR.txt similarity index 89% rename from PBS/Animations/Converted/Move/XSCISSOR.txt rename to PBS/Animations/Example anims/Move/XSCISSOR.txt index ebb597a12..3439ae9f6 100644 --- a/PBS/Animations/Converted/Move/XSCISSOR.txt +++ b/PBS/Animations/Example anims/Move/XSCISSOR.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,XSCISSOR] -Name = XSCISSOR +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = XSCISSOR SetX = 0,0 SetY = 0,0 - Graphic = X-Scizzor + Graphic = Examples/X-Scizzor Focus = Target SetFrame = 0,1 SetX = 0,-65 @@ -26,7 +26,7 @@ Name = XSCISSOR SetX = 4,71 SetY = 4,69 - Graphic = X-Scizzor + Graphic = Examples/X-Scizzor Focus = Target SetX = 0,71 SetY = 0,-59 diff --git a/PBS/Animations/Converted/Move/ZAPCANNON.txt b/PBS/Animations/Example anims/Move/ZAPCANNON.txt similarity index 90% rename from PBS/Animations/Converted/Move/ZAPCANNON.txt rename to PBS/Animations/Example anims/Move/ZAPCANNON.txt index 1dfa328f8..107f988f2 100644 --- a/PBS/Animations/Converted/Move/ZAPCANNON.txt +++ b/PBS/Animations/Example anims/Move/ZAPCANNON.txt @@ -1,7 +1,7 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [Move,ZAPCANNON] -Name = ZAPCANNON +Name = Example anim SetX = 0,0 SetY = 0,0 @@ -9,7 +9,7 @@ Name = ZAPCANNON SetX = 0,0 SetY = 0,0 - Graphic = Thunder2 + Graphic = Examples/Thunder2 Focus = Target SetX = 0,0 SetY = 0,-10 From d0e15a893913ac6f2cc3d428ebdd40902a044c26 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 7 Apr 2024 23:49:23 +0100 Subject: [PATCH 30/49] Anim Editor: List control no longer fills in its background --- .../Control elements/009_List.rb | 6 +-- .../Control elements/010_DropdownList.rb | 13 +++++- .../011_TextBoxDropdownList.rb | 13 +++++- .../Anim Editor elements/001_Canvas.rb | 40 +++++++++---------- 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/009_List.rb b/Data/Scripts/801_UI controls/Control elements/009_List.rb index fe5ea0a68..51b1543a2 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_List.rb @@ -138,11 +138,9 @@ class UIControls::List < UIControls::BaseControl end def refresh - self.bitmap.clear - # Draw control outline and background + super + # Draw control outline self.bitmap.outline_rect(0, 0, width, height, Color.black) - self.bitmap.fill_rect(1, 1, width - 2, height - 2, Color.white) - draw_area_highlight # Draw text options @values.each_with_index do |val, i| next if i < @top_row || i >= @top_row + @rows_count diff --git a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb index cf9c75ad8..0c165dd78 100644 --- a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb @@ -56,15 +56,24 @@ class UIControls::DropdownList < UIControls::BaseControl def make_dropdown_menu menu_height = (UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min) + (UIControls::List::BORDER_THICKNESS * 2) + # Draw menu's background + @dropdown_menu_bg = BitmapSprite.new(@button_rect.width, menu_height, self.viewport) + @dropdown_menu_bg.x = self.x + @button_rect.x + @dropdown_menu_bg.y = self.y + @button_rect.y + @button_rect.height + @dropdown_menu_bg.z = self.z + 1 + @dropdown_menu_bg.bitmap.fill_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.white) + # Create menu @dropdown_menu = UIControls::List.new(@button_rect.width, menu_height, self.viewport, @options) - @dropdown_menu.x = self.x + @button_rect.x - @dropdown_menu.y = self.y + @button_rect.y + @button_rect.height + @dropdown_menu.x = @dropdown_menu_bg.x + @dropdown_menu.y = @dropdown_menu_bg.y @dropdown_menu.z = self.z + 2 @dropdown_menu.set_interactive_rects @dropdown_menu.repaint end def remove_dropdown_menu + @dropdown_menu_bg&.dispose + @dropdown_menu_bg = nil @dropdown_menu&.dispose @dropdown_menu = nil @captured_area = nil diff --git a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb index f65bc6ea1..4971d33ce 100644 --- a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb @@ -52,15 +52,24 @@ class UIControls::TextBoxDropdownList < UIControls::TextBox def make_dropdown_menu menu_height = (UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min) + (UIControls::List::BORDER_THICKNESS * 2) + # Draw menu's background + @dropdown_menu_bg = BitmapSprite.new(@text_box_rect.width + @button_rect.width, menu_height, self.viewport) + @dropdown_menu_bg.x = self.x + @text_box_rect.x + @dropdown_menu_bg.y = self.y + @text_box_rect.y + @text_box_rect.height + @dropdown_menu_bg.z = self.z + 1 + @dropdown_menu_bg.bitmap.fill_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.white) + # Create menu @dropdown_menu = UIControls::List.new(@text_box_rect.width + @button_rect.width, menu_height, self.viewport, @options) - @dropdown_menu.x = self.x + @text_box_rect.x - @dropdown_menu.y = self.y + @text_box_rect.y + @text_box_rect.height + @dropdown_menu.x = @dropdown_menu_bg.x + @dropdown_menu.y = @dropdown_menu_bg.y @dropdown_menu.z = self.z + 2 @dropdown_menu.set_interactive_rects @dropdown_menu.repaint end def remove_dropdown_menu + @dropdown_menu_bg&.dispose + @dropdown_menu_bg = nil @dropdown_menu&.dispose @dropdown_menu = nil @captured_area = nil diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 5eb5b0cb4..2c98b175a 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -170,6 +170,14 @@ class AnimationEditor::Canvas < Sprite return ret_x, ret_y end + def mouse_in_sprite?(sprite, mouse_x, mouse_y) + return false if mouse_x < sprite.x - sprite.ox + return false if mouse_x >= sprite.x - sprite.ox + sprite.width + return false if mouse_y < sprite.y - sprite.oy + return false if mouse_y >= sprite.y - sprite.oy + sprite.height + return true + end + #----------------------------------------------------------------------------- def busy? @@ -509,12 +517,10 @@ class AnimationEditor::Canvas < Sprite # Position frame over spr frame.x = spr.x frame.y = spr.y - # TODO: Offset frame.x and frame.y for screen-sized sprites with a - # screen-based focus, and for sprites whose graphic has "[bottom]" in - # its name. case particle[:graphic] when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" + # Offset battler frames because they aren't around the battler's position frame.y -= spr.bitmap.height / 2 end end @@ -543,12 +549,16 @@ class AnimationEditor::Canvas < Sprite ensure_battler_sprites refresh_battler_graphics refresh_battler_positions - @battler_sprites.each { |s| s.visible = false if s && !s.disposed? } - @particle_sprites.each do |s| - if s.is_a?(Array) - s.each { |s2| s2.visible = false if s2 && !s2.disposed? } - else - s.visible = false if s && !s.disposed? + [@battler_sprites, @battler_frame_sprites].each do |sprites| + sprites.each { |s| s.visible = false if s && !s.disposed? } + end + [@particle_sprites, @frame_sprites].each do |sprites| + sprites.each do |s| + if s.is_a?(Array) + s.each { |s2| s2.visible = false if s2 && !s2.disposed? } + else + s.visible = false if s && !s.disposed? + end end end @anim[:particles].each_with_index do |particle, i| @@ -563,14 +573,6 @@ class AnimationEditor::Canvas < Sprite #----------------------------------------------------------------------------- - def mouse_in_sprite?(sprite, mouse_x, mouse_y) - return false if mouse_x < sprite.x - sprite.ox - return false if mouse_x >= sprite.x - sprite.ox + sprite.width - return false if mouse_y < sprite.y - sprite.oy - return false if mouse_y >= sprite.y - sprite.oy + sprite.height - return true - end - def on_mouse_press mouse_x, mouse_y = mouse_pos return if !mouse_x || !mouse_y @@ -726,12 +728,10 @@ class AnimationEditor::Canvas < Sprite @sel_frame_sprite.visible = true @sel_frame_sprite.x = target.x @sel_frame_sprite.y = target.y - # TODO: Offset sel_frame_sprite.x and sel_frame_sprite.y for screen-sized - # sprites with a screen-based focus, and for sprites whose graphic has - # "[bottom]" in its name. case @anim[:particles][@selected_particle][:graphic] when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" + # Offset battler frames because they aren't around the battler's position @sel_frame_sprite.y -= target.bitmap.height / 2 end end From 44cc500fdc3f801c839ce05326055a0e864f2615 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 13 Apr 2024 16:28:52 +0100 Subject: [PATCH 31/49] Anim Editor: added play functionality to battle and editor --- .../Control elements/002_Label.rb | 4 + .../Control elements/007_Button.rb | 31 ++- .../902_Anim GameData/001_Animation.rb | 23 ++ .../904_Anim Editor/001_AnimationEditor.rb | 64 ++++- .../904_Anim Editor/010_AnimationSelector.rb | 8 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 47 +--- .../Anim Editor elements/001_Canvas.rb | 179 +++++--------- .../Anim Editor elements/002_PlayControls.rb | 184 +++++++++++++- .../Anim Editor elements/003_ParticleList.rb | 3 +- .../905_Anim player/001_Anim player.rb | 230 ++++++++++++++++++ .../905_Anim player/002_ParticleSprite.rb | 141 +++++++++++ .../905_Anim player/003_AnimPlayerHelper.rb | 198 +++++++++++++++ .../905_Anim player/010_Battle code.rb | 187 ++++++++++++++ .../905_Anim player/011_Battle z modifiers.rb | 71 ++++++ .../905_Anim player/012_Fake battler.rb | 26 ++ 15 files changed, 1221 insertions(+), 175 deletions(-) create mode 100644 Data/Scripts/905_Anim player/001_Anim player.rb create mode 100644 Data/Scripts/905_Anim player/002_ParticleSprite.rb create mode 100644 Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb create mode 100644 Data/Scripts/905_Anim player/010_Battle code.rb create mode 100644 Data/Scripts/905_Anim player/011_Battle z modifiers.rb create mode 100644 Data/Scripts/905_Anim player/012_Fake battler.rb diff --git a/Data/Scripts/801_UI controls/Control elements/002_Label.rb b/Data/Scripts/801_UI controls/Control elements/002_Label.rb index 122cd9bb2..8d6d429fc 100644 --- a/Data/Scripts/801_UI controls/Control elements/002_Label.rb +++ b/Data/Scripts/801_UI controls/Control elements/002_Label.rb @@ -20,6 +20,10 @@ class UIControls::Label < UIControls::BaseControl refresh end + def text_width + return self.bitmap.text_size(@text).width + end + def refresh super if @header diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index 4a87efbe1..70eea2802 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -8,11 +8,13 @@ class UIControls::Button < UIControls::BaseControl BUTTON_HEIGHT = 28 # Used when @fixed_size is false # TODO: This will also depend on the font size. TEXT_BASE_OFFSET_Y = 18 # Text is centred vertically in the button + HIGHLIGHT_COLOR = Color.green def initialize(width, height, viewport, text = "") super(width, height, viewport) @text = text @fixed_size = false + @highlight = false end def set_fixed_size @@ -37,6 +39,10 @@ class UIControls::Button < UIControls::BaseControl invalidate end + def disabled? + return highlighted? || super + end + def set_changed @value = true super @@ -47,12 +53,33 @@ class UIControls::Button < UIControls::BaseControl super end + def highlighted? + return @highlight + end + + def set_highlighted + return if highlighted? + @highlight = true + invalidate + end + + def set_not_highlighted + return if !highlighted? + @highlight = false + invalidate + end + #----------------------------------------------------------------------------- def refresh super - # Draw disabled colour - if disabled? + if highlighted? + # Draw highligted colour + self.bitmap.fill_rect(@button_rect.x, @button_rect.y, + @button_rect.width, @button_rect.height, + HIGHLIGHT_COLOR) + elsif disabled? + # Draw disabled colour self.bitmap.fill_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, DISABLED_COLOR) diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index e3cba63df..f3dcd6612 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -275,6 +275,29 @@ module GameData return ret end + def inspect + ret = super.chop + ": " + case @type + when :move then ret += _INTL("[Move]") + when :opp_move then ret += _INTL("[Foe Move]") + when :common then ret += _INTL("[Common]") + when :opp_common then ret += _INTL("[Foe Common]") + else + raise _INTL("Unknown animation type.") + end + case @type + when :move, :opp_move + move_data = GameData::Move.try_get(@move) + move_name = (move_data) ? move_data.name : @move + ret += " " + move_name + when :common, :opp_common + ret += " " + @move + end + ret += " (" + @version.to_s + ")" if @version > 0 + ret += " - " + @name if @name + return ret + end + def move_animation? return [:move, :opp_move].include?(@type) end diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index fc1fd3da0..ad6d216ac 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -220,7 +220,7 @@ class AnimationEditor :canvas_bg => "indoor1", # NOTE: These sprite names are also used in Pokemon.play_cry and so should # be a species ID (being a string is fine). - :user_sprite_name => "ARCANINE", + :user_sprite_name => "DRAGONITE", :target_sprite_name => "CHARIZARD" } end @@ -285,7 +285,7 @@ class AnimationEditor ].each_with_index do |tab, i| btn = UIControls::Button.new(100, 28, pane.viewport, tab[2]) btn.set_fixed_size - btn.disable if tab[0] == component + btn.set_highlighted if tab[0] == component pane.add_control_at(tab[1], btn, next_pos_x, next_pos_y) next_pos_x += btn.width end @@ -313,6 +313,7 @@ class AnimationEditor end def set_play_controls_contents + @components[:play_controls].add_play_controls @components[:play_controls].duration = @components[:particle_list].duration end @@ -330,7 +331,6 @@ class AnimationEditor move_ctrl.max_rows = 16 anim_properties.add_labelled_number_text_box(:version, _INTL("Version"), 0, 99, 0) anim_properties.add_labelled_text_box(:name, _INTL("Name"), "") - # TODO: Have two TextBoxes, one for folder and one for filename? anim_properties.add_labelled_text_box(:pbs_path, _INTL("PBS filepath"), "") anim_properties.add_labelled_checkbox(:has_user, _INTL("Involves a user?"), true) anim_properties.add_labelled_checkbox(:has_target, _INTL("Involves a target?"), true) @@ -420,6 +420,53 @@ class AnimationEditor #----------------------------------------------------------------------------- + def play_animation + # TODO: Grey out the rest of the screen. + play_controls = @components[:play_controls] + # Set up canvas as a pseudo-battle screen + @components[:canvas].prepare_to_play_animation + play_controls.prepare_to_play_animation + # Set up fake battlers for the animation player + user_battler = nil + if !@anim[:no_user] + user_battler = AnimationPlayer::FakeBattler.new(@settings[:user_index], @settings[:user_sprite_name]) + end + target_battlers = nil + if !@anim[:no_target] + target_battlers = [] + @settings[:target_indices].each do |idx| + target_battlers.push(AnimationPlayer::FakeBattler.new(idx, @settings[:target_sprite_name])) + end + end + # Create animation player + anim_player = AnimationPlayer.new(@anim, user_battler, target_battlers, @components[:canvas]) + anim_player.looping = @components[:play_controls].looping + anim_player.slowdown = @components[:play_controls].slowdown + anim_player.set_up + # Play animation + anim_player.start + loop do + Graphics.update + Input.update + anim_player.update + # TODO: Maybe get elapsed time from anim_player and pass it to + # play_controls to be drawn? + play_controls.update + if play_controls.changed? + if play_controls.values.keys.include?(:stop) + play_controls.clear_changed + break + end + end + break if anim_player.finished? + end + anim_player.dispose + @components[:canvas].end_playing_animation + play_controls.end_playing_animation + end + + #----------------------------------------------------------------------------- + def refresh_component_visibility(component_sym) # Panes are all mutually exclusive side_pane = AnimationEditor::SidePanes.get_pane(component_sym) @@ -558,8 +605,10 @@ class AnimationEditor refresh end when :play_controls - # TODO: Will the play controls ever signal themselves as changed? I don't - # think so. + case property + when :play + @ready_to_play = true + end when :particle_list case property when :add_particle @@ -739,7 +788,10 @@ class AnimationEditor Graphics.update Input.update update - if @captured.nil? && @quit + if @ready_to_play + play_animation + @ready_to_play = false + elsif @captured.nil? && @quit case message(_INTL("Do you want to save changes to the animation?"), [:yes, _INTL("Yes")], [:no, _INTL("No")], [:cancel, _INTL("Cancel")]) when :yes diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index ff54a2f30..584fdfab7 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -298,13 +298,13 @@ class AnimationEditor::AnimationSelector # Put the correct list into the moves list case @animation_type when 0 - @components.get_control(:moves).disable - @components.get_control(:commons).enable + @components.get_control(:moves).set_highlighted + @components.get_control(:commons).set_not_highlighted @components.get_control(:moves_list).values = @move_list @components.get_control(:moves_label).text = _INTL("Moves") when 1 - @components.get_control(:moves).enable - @components.get_control(:commons).disable + @components.get_control(:moves).set_not_highlighted + @components.get_control(:commons).set_highlighted @components.get_control(:moves_list).values = @common_list @components.get_control(:moves_label).text = _INTL("Common animations") end diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 75cdd3bc4..c2f27855e 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -4,18 +4,6 @@ module AnimationEditor::ParticleDataHelper module_function - def get_duration(particles) - ret = 0 - particles.each do |particle| - particle.each_pair do |property, value| - next if !value.is_a?(Array) || value.length == 0 - max = value.last[0] + value.last[1] # Keyframe + duration - ret = max if ret < max - end - end - return ret - end - def get_keyframe_particle_value(particle, property, frame) if !GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.include?(property) raise _INTL("Couldn't get default value for property {1} for particle {2}.", @@ -34,28 +22,9 @@ module AnimationEditor::ParticleDataHelper next end # In a "MoveXYZ" command; need to interpolate - case (cmd[3] || :linear) - when :linear - ret[0] = lerp(ret[0], cmd[2], cmd[1], cmd[0], frame).to_i - when :ease_in # Quadratic - x = (frame - cmd[0]) / cmd[1].to_f - ret[0] += (cmd[2] - ret[0]) * x * x - ret[0] = ret[0].round - when :ease_out # Quadratic - x = (frame - cmd[0]) / cmd[1].to_f - ret[0] += (cmd[2] - ret[0]) * (1 - ((1 - x) * (1 - x))) - ret[0] = ret[0].round - when :ease_both # Quadratic - x = (frame - cmd[0]) / cmd[1].to_f - if x < 0.5 - ret[0] += (cmd[2] - ret[0]) * x * x * 2 - else - ret[0] += (cmd[2] - ret[0]) * (1 - (((-2 * x) + 2) * ((-2 * x) + 2) / 2)) - end - ret[0] = ret[0].round - else - raise _INTL("Unknown interpolation method {1}.", cmd[3]) - end + ret[0] = AnimationPlayer::Helper.interpolate( + (cmd[3] || :linear), ret[0], cmd[2], cmd[1], cmd[0], frame + ) ret[1] = true # Interpolating break end @@ -68,7 +37,7 @@ module AnimationEditor::ParticleDataHelper first_cmd = (["User", "Target"].include?(particle[:name])) ? 0 : -1 first_visible_cmd = -1 particle.each_pair do |prop, value| - next if !value.is_a?(Array) || value.length == 0 + next if !value.is_a?(Array) || value.empty? first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0] first_visible_cmd = value[0][0] if prop == :visible && (first_visible_cmd < 0 || first_visible_cmd > value[0][0]) end @@ -111,7 +80,7 @@ module AnimationEditor::ParticleDataHelper if !["User", "Target", "SE"].include?(particle[:name]) earliest = duration particle.each_pair do |prop, value| - next if !value.is_a?(Array) || value.length == 0 + next if !value.is_a?(Array) || value.empty? earliest = value[0][0] if earliest > value[0][0] end ret[earliest] = true @@ -152,7 +121,7 @@ module AnimationEditor::ParticleDataHelper # [+/- duration, interpolation type] --- MoveXYZ (duration's sign is whether # it makes the value higher or lower) def get_particle_property_commands_timeline(particle, property, commands) - return nil if !commands || commands.length == 0 + return nil if !commands || commands.empty? if particle[:name] == "SE" ret = [] commands.each { |cmd| ret[cmd[0]] = 0 } @@ -192,7 +161,7 @@ module AnimationEditor::ParticleDataHelper se_particle = particles.select { |particle| particle[:name] == "SE" }[0] if se_particle se_particle.each_pair do |property, values| - next if !values.is_a?(Array) || values.length == 0 + next if !values.is_a?(Array) || values.empty? ret = values.any? { |value| value[0] == frame } break if ret end @@ -310,7 +279,7 @@ module AnimationEditor::ParticleDataHelper first_cmd = (["User", "Target", "SE"].include?(particle[:name])) ? 0 : -1 first_non_visible_cmd = -1 particle.each_pair do |prop, value| - next if !value.is_a?(Array) || value.length == 0 + next if !value.is_a?(Array) || value.empty? next if prop == property && value[0][0] == frame first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0] next if prop == :visible diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 2c98b175a..d0109be0a 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -11,6 +11,7 @@ # 9999+ = UI #=============================================================================== class AnimationEditor::Canvas < Sprite + attr_reader :sprites # Only used while playing the animation attr_reader :values FRAME_SIZE = 48 @@ -25,7 +26,6 @@ class AnimationEditor::Canvas < Sprite @captured = nil @user_coords = [] @target_coords = [] - @playing = false # TODO: What should this affect? Is it needed? initialize_background initialize_battlers initialize_particle_sprites @@ -195,15 +195,40 @@ class AnimationEditor::Canvas < Sprite #----------------------------------------------------------------------------- def prepare_to_play_animation - # TODO: Hide particle sprites, set battler sprites to starting positions so - # that the animation can play properly. Also need a way to end this - # override after the animation finishes playing. This method does not - # literally play the animation; the main editor screen or playback - # control does that. + @sprites = {} + # Populate @sprites with sprites that are present during battle, and reset + # their x/y/z values so the animation player knows where they start + idx = user_index + particle_idx = @anim[:particles].index { |particle| particle[:name] == "User" } + @sprites["pokemon_#{idx}"] = @battler_sprites[idx] + @battler_sprites[idx].x = @user_coords[0] + @battler_sprites[idx].y = @user_coords[1] + offset_xy = AnimationPlayer::Helper.get_xy_offset(@anim[:particles][particle_idx], @battler_sprites[idx]) + @battler_sprites[idx].x += offset_xy[0] + @battler_sprites[idx].y += offset_xy[1] + focus_z = AnimationPlayer::Helper.get_z_focus(@anim[:particles][particle_idx], idx, idx) + AnimationPlayer::Helper.apply_z_focus_to_sprite(@battler_sprites[idx], 0, focus_z) + @battler_sprites[idx].z = 0 + particle_idx = @anim[:particles].index { |particle| particle[:name] == "Target" } + target_indices.each do |idx| + @sprites["pokemon_#{idx}"] = @battler_sprites[idx] + @battler_sprites[idx].x = @target_coords[idx][0] + @battler_sprites[idx].y = @target_coords[idx][1] + offset_xy = AnimationPlayer::Helper.get_xy_offset(@anim[:particles][particle_idx], @battler_sprites[idx]) + @battler_sprites[idx].x += offset_xy[0] + @battler_sprites[idx].y += offset_xy[1] + focus_z = AnimationPlayer::Helper.get_z_focus(@anim[:particles][particle_idx], idx, idx) + AnimationPlayer::Helper.apply_z_focus_to_sprite(@battler_sprites[idx], 0, focus_z) + end + # TODO: Also add background/bases and so on. + hide_all_sprites + @sel_frame_sprite.visible = false @playing = true end def end_playing_animation + @sprites.clear + @sprites = nil @playing = false refresh end @@ -298,17 +323,21 @@ class AnimationEditor::Canvas < Sprite def refresh_battler_graphics if !@user_sprite_name || !@user_sprite_name || @user_sprite_name != @settings[:user_sprite_name] @user_sprite_name = @settings[:user_sprite_name] + @user_bitmap_front_name = GameData::Species.front_sprite_filename(@user_sprite_name) + @user_bitmap_back_name = GameData::Species.back_sprite_filename(@user_sprite_name) @user_bitmap_front&.dispose @user_bitmap_back&.dispose - @user_bitmap_front = RPG::Cache.load_bitmap("Graphics/Pokemon/Front/", @user_sprite_name) - @user_bitmap_back = RPG::Cache.load_bitmap("Graphics/Pokemon/Back/", @user_sprite_name) + @user_bitmap_front = RPG::Cache.load_bitmap("", @user_bitmap_front_name) + @user_bitmap_back = RPG::Cache.load_bitmap("", @user_bitmap_back_name) end if !@target_bitmap_front || !@target_sprite_name || @target_sprite_name != @settings[:target_sprite_name] @target_sprite_name = @settings[:target_sprite_name] + @target_bitmap_front_name = GameData::Species.front_sprite_filename(@target_sprite_name) + @target_bitmap_back_name = GameData::Species.back_sprite_filename(@target_sprite_name) @target_bitmap_front&.dispose @target_bitmap_back&.dispose - @target_bitmap_front = RPG::Cache.load_bitmap("Graphics/Pokemon/Front/", @target_sprite_name) - @target_bitmap_back = RPG::Cache.load_bitmap("Graphics/Pokemon/Back/", @target_sprite_name) + @target_bitmap_front = RPG::Cache.load_bitmap("", @target_bitmap_front_name) + @target_bitmap_back = RPG::Cache.load_bitmap("", @target_bitmap_back_name) end end @@ -403,108 +432,24 @@ class AnimationEditor::Canvas < Sprite # Set opacity spr.opacity = values[:opacity] # Set coordinates - spr.x = values[:x] - spr.y = values[:y] - case particle[:focus] - when :foreground, :midground, :background - when :user - spr.x += @user_coords[0] - spr.y += @user_coords[1] - when :target - spr.x += @target_coords[target_idx][0] - spr.y += @target_coords[target_idx][1] - when :user_and_target - user_pos = @user_coords - target_pos = @target_coords[target_idx] - distance = GameData::Animation::USER_AND_TARGET_SEPARATION - spr.x = user_pos[0] + ((values[:x].to_f / distance[0]) * (target_pos[0] - user_pos[0])).to_i - spr.y = user_pos[1] + ((values[:y].to_f / distance[1]) * (target_pos[1] - user_pos[1])).to_i - when :user_side_foreground, :user_side_background - base_coords = Battle::Scene.pbBattlerPosition(user_index) - spr.x += base_coords[0] - spr.y += base_coords[1] - when :target_side_foreground, :target_side_background - base_coords = Battle::Scene.pbBattlerPosition(target_idx) - spr.x += base_coords[0] - spr.y += base_coords[1] - end + focus_xy = AnimationPlayer::Helper.get_xy_focus(particle, user_index, target_idx, + @user_coords, @target_coords[target_idx]) + AnimationPlayer::Helper.apply_xy_focus_to_sprite(spr, :x, values[:x], focus_xy) + AnimationPlayer::Helper.apply_xy_focus_to_sprite(spr, :y, values[:y], focus_xy) # Set graphic and ox/oy (may also alter y coordinate) - case particle[:graphic] - when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", - "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" - case particle[:graphic] - when "USER" - spr.bitmap = (user_index.even?) ? @user_bitmap_back : @user_bitmap_front - when "USER_OPP" - spr.bitmap = (user_index.even?) ? @user_bitmap_front : @user_bitmap_back - when "USER_FRONT" - spr.bitmap = @user_bitmap_front - when "USER_BACK" - spr.bitmap = @user_bitmap_back - when "TARGET" - spr.bitmap = (target_idx.even?) ? @target_bitmap_back : @target_bitmap_front - when "TARGET_OPP" - spr.bitmap = (target_idx.even?) ? @target_bitmap_front : @target_bitmap_back - when "TARGET_FRONT" - spr.bitmap = @target_bitmap_front - when "TARGET_BACK" - spr.bitmap = @target_bitmap_back - end - spr.ox = spr.bitmap.width / 2 - spr.oy = spr.bitmap.height - spr.y += spr.bitmap.height / 2 - else - spr.bitmap = RPG::Cache.load_bitmap("Graphics/Battle animations/", particle[:graphic]) - if [:foreground, :midground, :background].include?(particle[:focus]) && - spr.bitmap.width == AnimationEditor::CANVAS_WIDTH && - spr.bitmap.height >= AnimationEditor::CANVAS_HEIGHT - @message_bar_sprite.y - spr.ox = 0 - spr.oy = 0 - elsif spr.bitmap.width > spr.bitmap.height * 2 - spr.src_rect.set(values[:frame] * spr.bitmap.height, 0, spr.bitmap.height, spr.bitmap.height) - spr.ox = spr.bitmap.height / 2 - spr.oy = spr.bitmap.height / 2 - else - spr.src_rect.set(0, 0, spr.bitmap.width, spr.bitmap.height) - spr.ox = spr.bitmap.width / 2 - spr.oy = spr.bitmap.height / 2 - end - if particle[:graphic][/\[\s*bottom\s*\]\s*$/i] # [bottom] at end of filename - spr.oy = spr.bitmap.height - end - end + AnimationPlayer::Helper.set_bitmap_and_origin(particle, spr, user_index, target_idx, + [@user_bitmap_front_name, @user_bitmap_back_name], + [@target_bitmap_front_name, @target_bitmap_back_name]) + offset_xy = AnimationPlayer::Helper.get_xy_offset(particle, spr) + spr.x += offset_xy[0] + spr.y += offset_xy[1] + # Set frame + # TODO: Should this always happens or only if the graphic is a spritesheet? + # I don't think there's harm in it always being set. + spr.src_rect.x = values[:frame].floor * spr.src_rect.width # Set z (priority) - spr.z = values[:z] - case particle[:focus] - when :foreground - spr.z += 2000 - when :midground - spr.z += 1000 - when :background - # NOTE: No change. - when :user - spr.z += 1000 + ((100 * ((user_index / 2) + 1)) * (user_index.even? ? 1 : -1)) - when :target - spr.z += 1000 + ((100 * ((target_idx / 2) + 1)) * (target_idx.even? ? 1 : -1)) - when :user_and_target - user_pos = 1000 + ((100 * ((user_index / 2) + 1)) * (user_index.even? ? 1 : -1)) - target_pos = 1000 + ((100 * ((target_idx / 2) + 1)) * (target_idx.even? ? 1 : -1)) - distance = GameData::Animation::USER_AND_TARGET_SEPARATION[2] - if values[:z] >= 0 - spr.z += user_pos - elsif values[:z] <= distance - spr.z += target_pos - else - spr.z = user_pos + ((values[:z].to_f / distance) * (target_pos - user_pos)).to_i - end - when :user_side_foreground, :target_side_foreground - this_idx = (particle[:focus] == :user_side_foreground) ? user_index : target_idx - spr.z += 1000 - spr.z += 1000 if this_idx.even? # On player's side - when :user_side_background, :target_side_background - this_idx = (particle[:focus] == :user_side_background) ? user_index : target_idx - spr.z += 1000 if this_idx.even? # On player's side - end + focus_z = AnimationPlayer::Helper.get_z_focus(particle, user_index, target_idx) + AnimationPlayer::Helper.apply_z_focus_to_sprite(spr, values[:z], focus_z) # Set various other properties spr.zoom_x = values[:zoom_x] / 100.0 spr.zoom_y = values[:zoom_y] / 100.0 @@ -544,11 +489,7 @@ class AnimationEditor::Canvas < Sprite update_selected_particle_frame end - def refresh - refresh_bg_graphics - ensure_battler_sprites - refresh_battler_graphics - refresh_battler_positions + def hide_all_sprites [@battler_sprites, @battler_frame_sprites].each do |sprites| sprites.each { |s| s.visible = false if s && !s.disposed? } end @@ -561,6 +502,14 @@ class AnimationEditor::Canvas < Sprite end end end + end + + def refresh + refresh_bg_graphics + ensure_battler_sprites + refresh_battler_graphics + refresh_battler_positions + hide_all_sprites @anim[:particles].each_with_index do |particle, i| if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) refresh_particle(i) # Because there can be multiple targets diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb index c4c39c772..ccd7358b4 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb @@ -1,25 +1,193 @@ #=============================================================================== -# TODO +# #=============================================================================== -class AnimationEditor::PlayControls < UIControls::BaseControl +class AnimationEditor::PlayControls < UIControls::ControlsContainer + attr_reader :slowdown, :looping + + ROW_HEIGHT = 28 + PLAY_BUTTON_X = 241 + PLAY_BUTTON_Y = 13 + PLAY_BUTTON_SIZE = 22 + LOOP_BUTTON_X = PLAY_BUTTON_X + PLAY_BUTTON_SIZE + 12 + LOOP_BUTTON_Y = 16 + LOOP_BUTTON_SIZE = 16 + # NOTE: Slowdown label is centered horizontally over the buttons. + SLOWDOWN_LABEL_Y = 0 + SLOWDOWN_BUTTON_X = 1 + SLOWDOWN_BUTTON_Y = ROW_HEIGHT - 1 + SLOWDOWN_BUTTON_WIDTH = 32 + SLOWDOWN_BUTTON_SPACING = -3 + # NOTE: Duration label and value are centered horizontally on DURATION_TEXT_X. + DURATION_TEXT_X = 464 + DURATION_LABEL_Y = SLOWDOWN_LABEL_Y + DURATION_VALUE_Y = ROW_HEIGHT + SLOWDOWN_FACTORS = [1, 2, 4, 6, 8] + ICON_COLOR = Color.black + def initialize(x, y, width, height, viewport) - super(width, height, viewport) - self.x = x - self.y = y + super(x, y, width, height) + @viewport.z = viewport.z + 10 + generate_button_bitmaps @duration = 0 + @slowdown = SLOWDOWN_FACTORS[0] + @looping = false end + #----------------------------------------------------------------------------- + + def add_play_controls + # Play button + play_button = UIControls::BitmapButton.new(PLAY_BUTTON_X, PLAY_BUTTON_Y, self.viewport, @play_button_bitmap) + play_button.set_interactive_rects + play_button.disable + @controls.push([:play, play_button]) + # Stop button + stop_button = UIControls::BitmapButton.new(PLAY_BUTTON_X, PLAY_BUTTON_Y, self.viewport, @stop_button_bitmap) + stop_button.set_interactive_rects + stop_button.visible = false + @controls.push([:stop, stop_button]) + # Loop buttons + loop_button = UIControls::BitmapButton.new(LOOP_BUTTON_X, LOOP_BUTTON_Y, self.viewport, @play_once_button_bitmap) + loop_button.set_interactive_rects + loop_button.visible = false if @looping + @controls.push([:loop, loop_button]) + unloop_button = UIControls::BitmapButton.new(LOOP_BUTTON_X, LOOP_BUTTON_Y, self.viewport, @looping_button_bitmap) + unloop_button.set_interactive_rects + unloop_button.visible = false if !@looping + @controls.push([:unloop, unloop_button]) + # Slowdown label + duration_label = UIControls::Label.new(200, ROW_HEIGHT, self.viewport, _INTL("Slowdown factor")) + duration_label.x = SLOWDOWN_BUTTON_X + (SLOWDOWN_FACTORS.length * (SLOWDOWN_BUTTON_WIDTH - SLOWDOWN_BUTTON_SPACING) / 2) + duration_label.x -= (duration_label.text_width / 2) + 5 + duration_label.y = SLOWDOWN_LABEL_Y + @controls.push([:slowdown_label, duration_label]) + # Slowdown factor buttons + SLOWDOWN_FACTORS.each_with_index do |value, i| + button = UIControls::Button.new(SLOWDOWN_BUTTON_WIDTH, ROW_HEIGHT, self.viewport, value.to_s) + button.set_fixed_size + button.x = SLOWDOWN_BUTTON_X + ((SLOWDOWN_BUTTON_WIDTH - SLOWDOWN_BUTTON_SPACING) * i) + button.y = SLOWDOWN_BUTTON_Y + button.set_interactive_rects + button.set_highlighted if value == @slowdown + @controls.push([("slowdown" + value.to_s).to_sym, button]) + end + # Duration label + duration_label = UIControls::Label.new(200, ROW_HEIGHT, self.viewport, _INTL("Duration")) + duration_label.x = DURATION_TEXT_X - (duration_label.text_width / 2) + duration_label.y = DURATION_LABEL_Y + @controls.push([:duration_label, duration_label]) + # Duration value + duration_value = UIControls::Label.new(200, ROW_HEIGHT, self.viewport, _INTL("{1}s", 0.0)) + duration_value.x = DURATION_TEXT_X - (duration_value.text_width / 2) + duration_value.y = DURATION_VALUE_Y + @controls.push([:duration_value, duration_value]) + end + + def generate_button_bitmaps + @play_button_bitmap = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) + (PLAY_BUTTON_SIZE - 2).times do |j| + @play_button_bitmap.fill_rect(PLAY_BUTTON_SIZE / 4, j + 1, (j >= (PLAY_BUTTON_SIZE - 2) / 2) ? PLAY_BUTTON_SIZE - j : j + 3, 1, ICON_COLOR) + end + @stop_button_bitmap = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) + @stop_button_bitmap.fill_rect(4, 4, PLAY_BUTTON_SIZE - 8, PLAY_BUTTON_SIZE - 8, ICON_COLOR) + # Loop button + @play_once_button_bitmap = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) + @play_once_button_bitmap.fill_rect(1, 7, 11, 2, ICON_COLOR) + @play_once_button_bitmap.fill_rect(8, 5, 2, 6, ICON_COLOR) + @play_once_button_bitmap.fill_rect(10, 6, 1, 4, ICON_COLOR) + @play_once_button_bitmap.fill_rect(13, 1, 2, 14, ICON_COLOR) + @looping_button_bitmap = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) + [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, + 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, + 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, + 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0].each_with_index do |val, i| + next if val == 0 + @looping_button_bitmap.fill_rect(1 + (i % 14), 1 + (i / 14), 1, 1, ICON_COLOR) + end + end + + def dispose + @play_button_bitmap.dispose + @stop_button_bitmap.dispose + @play_once_button_bitmap.dispose + @looping_button_bitmap.dispose + super + end + + #----------------------------------------------------------------------------- + def duration=(new_val) return if @duration == new_val @duration = new_val + if @duration == 0 + get_control(:play).disable + else + get_control(:play).enable + end + ctrl = get_control(:duration_value) + ctrl.text = _INTL("{1}s", @duration / 20.0) + ctrl.x = DURATION_TEXT_X - (ctrl.text_width / 2) refresh end #----------------------------------------------------------------------------- - def refresh + def prepare_to_play_animation + get_control(:play).visible = false + get_control(:stop).visible = true + @controls.each { |ctrl| ctrl[1].disable if ctrl[0] != :stop } + end + + def end_playing_animation + get_control(:stop).visible = false + get_control(:play).visible = true + @controls.each { |ctrl| ctrl[1].enable } + end + + #----------------------------------------------------------------------------- + + def update super - draw_text(self.bitmap, 12, TEXT_OFFSET_Y + 14, _INTL("Play controls not added yet!")) - draw_text(self.bitmap, width - 134, TEXT_OFFSET_Y, _INTL("Total length: {1}s", @duration / 20.0)) + if @values + @values.keys.each do |key| + case key + when :loop + get_control(:loop).visible = false + get_control(:unloop).visible = true + @looping = true + @values.delete(key) + when :unloop + get_control(:unloop).visible = false + get_control(:loop).visible = true + @looping = false + @values.delete(key) + else + if key.to_s[/slowdown/] + # A slowdown button was pressed; apply its effect now + @slowdown = key.to_s.sub("slowdown", "").to_i + @controls.each do |ctrl| + next if !ctrl[0].to_s[/slowdown\d+/] + if ctrl[0].to_s.sub("slowdown", "").to_i == @slowdown + ctrl[1].set_highlighted + else + ctrl[1].set_not_highlighted + end + end + @values.delete(key) + end + end + end + @values = nil if @values.empty? + end end end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index a83178690..e64abd464 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -177,6 +177,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @list_viewport.dispose @commands_bg_viewport.dispose @commands_viewport.dispose + super end def dispose_listed_sprites @@ -430,7 +431,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl #----------------------------------------------------------------------------- def calculate_duration - @duration = AnimationEditor::ParticleDataHelper.get_duration(@particles) + @duration = AnimationPlayer::Helper.get_duration(@particles) @duration += DURATION_BUFFER end diff --git a/Data/Scripts/905_Anim player/001_Anim player.rb b/Data/Scripts/905_Anim player/001_Anim player.rb new file mode 100644 index 000000000..ca0858675 --- /dev/null +++ b/Data/Scripts/905_Anim player/001_Anim player.rb @@ -0,0 +1,230 @@ +#=============================================================================== +# +#=============================================================================== +class AnimationPlayer + attr_accessor :looping + attr_accessor :slowdown # 1 = normal speed, 2 = half speed, 3 = one third speed, etc. + + # animation is either a GameData::Animation or a hash made from one. + # user is a Battler, or nil + # targets is an array of Battlers, or nil + def initialize(animation, user, targets, scene) + @animation = animation + @user = user + @targets = targets + @scene = scene + @viewport = @scene.viewport + @sprites = @scene.sprites + initialize_battler_sprite_names + initialize_battler_coordinates + @looping = false + @slowdown = 1 + @timer_start = nil + @anim_sprites = [] # Each is a ParticleSprite + @duration = total_duration + end + + # Doesn't actually create any sprites; just gathers them into a more useful array + def initialize_battler_sprite_names + @battler_sprites = [] + if @user + pkmn = @user.pokemon + @battler_sprites[@user.index] = [] + @battler_sprites[@user.index].push(GameData::Species.front_sprite_filename( + pkmn.species, pkmn.form, pkmn.gender)) + @battler_sprites[@user.index].push(GameData::Species.back_sprite_filename( + pkmn.species, pkmn.form, pkmn.gender)) + end + if @targets + @targets.each do |target| + pkmn = target.pokemon + @battler_sprites[target.index] = [] + @battler_sprites[target.index].push(GameData::Species.front_sprite_filename( + pkmn.species, pkmn.form, pkmn.gender)) + @battler_sprites[target.index].push(GameData::Species.back_sprite_filename( + pkmn.species, pkmn.form, pkmn.gender)) + end + end + end + + def initialize_battler_coordinates + @user_coords = nil + if @user + sprite = @sprites["pokemon_#{@user.index}"] + @user_coords = [sprite.x, sprite.y - (sprite.bitmap.height / 2)] + end + @target_coords = [] + if @targets + @targets.each do |target| + sprite = @sprites["pokemon_#{target.index}"] + @target_coords[target.index] = [sprite.x, sprite.y - (sprite.bitmap.height / 2)] + end + end + end + + def dispose + @anim_sprites.each { |particle| particle.dispose } + @anim_sprites.clear + end + + #----------------------------------------------------------------------------- + + def particles + return (@animation.is_a?(GameData::Animation)) ? @animation.particles : @animation[:particles] + end + + # Return value is in seconds. + def total_duration + ret = AnimationPlayer::Helper.get_duration(particles) / 20.0 + ret *= slowdown + return ret + end + + #----------------------------------------------------------------------------- + + def set_up_particle(particle, target_idx = -1) + particle_sprite = AnimationPlayer::ParticleSprite.new + # Get/create a sprite + sprite = nil + case particle[:name] + when "User" + sprite = @sprites["pokemon_#{@user.index}"] + particle_sprite.set_as_battler_sprite + when "Target" + sprite = @sprites["pokemon_#{target_idx}"] + particle_sprite.set_as_battler_sprite + when "SE" + # Intentionally no sprite created + else + sprite = Sprite.new(@viewport) + end + particle_sprite.sprite = sprite if sprite + # Set sprite's graphic and ox/oy + if sprite + AnimationPlayer::Helper.set_bitmap_and_origin(particle, sprite, @user.index, target_idx, + @battler_sprites[@user.index], @battler_sprites[target_idx]) + end + # Calculate x/y/z focus values and additional x/y modifier and pass them all + # to particle_sprite + focus_xy = AnimationPlayer::Helper.get_xy_focus(particle, @user.index, target_idx, + @user_coords, @target_coords[target_idx]) + offset_xy = AnimationPlayer::Helper.get_xy_offset(particle, sprite) + focus_z = AnimationPlayer::Helper.get_z_focus(particle, @user.index, target_idx) + particle_sprite.focus_xy = focus_xy + particle_sprite.offset_xy = offset_xy + particle_sprite.focus_z = focus_z + # Find earliest command and add a "make visible" command then + if sprite && !particle_sprite.battler_sprite? + first_cmd = -1 + particle.each_pair do |property, cmds| + next if !cmds.is_a?(Array) || cmds.empty? + cmds.each do |cmd| + first_cmd = cmd[0] if first_cmd < 0 || first_cmd > cmd[0] + end + end + particle_sprite.add_set_process(:visible, first_cmd * slowdown, true) if first_cmd >= 0 + end + # Add all commands + particle.each_pair do |property, cmds| + next if !cmds.is_a?(Array) || cmds.empty? + cmds.each do |cmd| + if cmd[1] == 0 + if sprite + particle_sprite.add_set_process(property, cmd[0] * slowdown, cmd[2]) + else + # SE particle + filename = nil + case property + when :user_cry + filename = GameData::Species.cry_filename_from_pokemon(@user.pokemon) if @user + when :target_cry + # NOTE: If there are multiple targets, only the first one's cry + # will be played. + if @targets && !@targets.empty? + filename = GameData::Species.cry_filename_from_pokemon(@targets.first.pokemon) + end + else + filename = "Anim/" + cmd[2] + end + particle_sprite.add_set_process(property, cmd[0] * slowdown, [filename, cmd[3], cmd[4]]) if filename + end + else + particle_sprite.add_move_process(property, cmd[0] * slowdown, cmd[1] * slowdown, cmd[2], cmd[3] || :linear) + end + end + end + # Finish up + @anim_sprites.push(particle_sprite) + end + + # Creates sprites and ParticleSprites, and sets sprite properties that won't + # change during the animation. + def set_up + particles.each do |particle| + if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) && @targets + one_per_side = [:target_side_foreground, :target_side_background].include?(particle[:focus]) + sides_covered = [] + @targets.each do |target| + next if one_per_side && sides_covered.include?(target.index % 2) + set_up_particle(particle, target.index) + sides_covered.push(target.index % 2) + end + else + set_up_particle(particle) + end + end + reset_anim_sprites + end + + # Sets the initial properties of all sprites, and marks all processes as not + # yet started. + def reset_anim_sprites + @anim_sprites.each { |particle| particle.reset_processes } + end + + #----------------------------------------------------------------------------- + + def start + @timer_start = System.uptime + end + + def playing? + return !@timer_start.nil? + end + + def finish + @timer_start = nil + @finished = true + end + + def finished? + return @finished + end + + def can_continue_battle? + return finished? + end + + #----------------------------------------------------------------------------- + + def update + return if !playing? + if @need_reset + reset_anim_sprites + start + @need_reset = false + end + time_now = System.uptime + elapsed = time_now - @timer_start + # Update all particles/sprites + @anim_sprites.each { |particle| particle.update(elapsed) } + # Finish or loop the animation + if elapsed >= @duration + if looping + @need_reset = true + else + finish + end + end + end +end diff --git a/Data/Scripts/905_Anim player/002_ParticleSprite.rb b/Data/Scripts/905_Anim player/002_ParticleSprite.rb new file mode 100644 index 000000000..a1f23377d --- /dev/null +++ b/Data/Scripts/905_Anim player/002_ParticleSprite.rb @@ -0,0 +1,141 @@ +#=============================================================================== +# NOTE: This assumes that processes are added (for a given property) in the +# order they happen. +#=============================================================================== +class AnimationPlayer::ParticleSprite + attr_accessor :sprite + attr_accessor :focus_xy, :offset_xy, :focus_z + + FRAMES_PER_SECOND = 20.0 + + def initialize + @processes = [] + @sprite = nil + @battler_sprite = false + initialize_values + end + + def initialize_values + @values = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES.clone + end + + def dispose + return if battler_sprite? || !@sprite || @sprite.disposed? + @sprite.bitmap&.dispose + @sprite.dispose + end + + #----------------------------------------------------------------------------- + + def set_as_battler_sprite + @battler_sprite = true + @values[:visible] = true + end + + def battler_sprite? + return @battler_sprite + end + + #----------------------------------------------------------------------------- + + def add_set_process(property, frame, value) + add_move_process(property, frame, 0, value, :none) + end + + def add_move_process(property, start_frame, duration, value, interpolation = :linear) + # First nil is progress (nil = not started, true = running, false = finished) + # Second nil is start value (set when the process starts running) + @processes.push([property, start_frame, duration, value, interpolation, nil, nil]) + end + + # Sets sprite's initial For looping purposes. + def reset_processes + initialize_values + set_as_battler_sprite if battler_sprite? # Start battler sprites as visible + @values.each_pair { |property, value| update_sprite_property(property, value) } + @processes.each { |process| process[5] = nil } + end + + #----------------------------------------------------------------------------- + + def start_process(process) + return if !process[5].nil? + process[6] = @values[process[0]] + process[5] = true + end + + def update_process_value(process, elapsed_time) + # SetXYZ + if process[2] == 0 + @values[process[0]] = process[3] + process[5] = false # Mark process as finished + return + end + # MoveXYZ + @values[process[0]] = AnimationPlayer::Helper.interpolate( + process[4], process[6], process[3], process[2] / FRAMES_PER_SECOND, + process[1] / FRAMES_PER_SECOND, elapsed_time + ) + if elapsed_time >= (process[1] + process[2]) / FRAMES_PER_SECOND + process[5] = false # Mark process as finished + end + end + + def update_sprite(changed_properties) + changed_properties.uniq! + changed_properties.each do |property| + update_sprite_property(property, @values[property]) + end + end + + def update_sprite_property(property, value) + if !@sprite + pbSEPlay(*value) if [:se, :user_cry, :target_cry].include?(property) && value + return + end + case property + when :frame then @sprite.src_rect.x = value.floor * @sprite.src_rect.width + when :blending then @sprite.blend_type = value + when :flip then @sprite.mirror = value + when :x + AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :x, value.round, @focus_xy) + @sprite.x += @offset_xy[0] + when :y + AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :y, value.round, @focus_xy) + @sprite.y += @offset_xy[1] + when :z + AnimationPlayer::Helper.apply_z_focus_to_sprite(@sprite, value, @focus_z) + when :zoom_x then @sprite.zoom_x = value / 100.0 + when :zoom_y then @sprite.zoom_y = value / 100.0 + when :angle then @sprite.angle = value + when :visible then @sprite.visible = value + when :opacity then @sprite.opacity = value + when :color_red then @sprite.color.red = value + when :color_green then @sprite.color.green = value + when :color_blue then @sprite.color.blue = value + when :color_alpha then @sprite.color.alpha = value + when :tone_red then @sprite.tone.red = value + when :tone_green then @sprite.tone.green = value + when :tone_blue then @sprite.tone.blue = value + when :tone_gray then @sprite.tone.gray = value + end + end + + def update(elapsed_time) + frame = (elapsed_time * FRAMES_PER_SECOND).floor + changed_properties = [] + @processes.each do |process| + # Skip processes that aren't due to start yet + next if process[1] > frame + # Skip processes that have already fully happened + next if process[5] == false + # Mark process as running if it isn't already + start_process(process) + # Update process's value + update_process_value(process, elapsed_time) + changed_properties.push(process[0]) # Record property as having changed + end + # Apply changed values to sprite + update_sprite(changed_properties) if !changed_properties.empty? + end +end diff --git a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb new file mode 100644 index 000000000..1bae53f30 --- /dev/null +++ b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb @@ -0,0 +1,198 @@ +#=============================================================================== +# Methods used by both AnimationPlayer and AnimationEditor::Canvas. +#=============================================================================== +module AnimationPlayer::Helper + BATTLE_MESSAGE_BAR_HEIGHT = 96 # NOTE: You shouldn't need to change this. + + module_function + + # Returns the duration of the animation in frames (1/20ths of a second). + def get_duration(particles) + ret = 0 + particles.each do |particle| + particle.each_pair do |property, value| + next if !value.is_a?(Array) || value.empty? + max = value.last[0] + value.last[1] # Keyframe + duration + ret = max if ret < max + end + end + return ret + end + + #----------------------------------------------------------------------------- + + def get_xy_focus(particle, user_index, target_index, user_coords, target_coords) + ret = nil + case particle[:focus] + when :foreground, :midground, :background + when :user + ret = [user_coords.clone] + when :target + ret = [target_coords.clone] + when :user_and_target + ret = [user_coords.clone, target_coords.clone] + when :user_side_foreground, :user_side_background + ret = [Battle::Scene.pbBattlerPosition(user_index)] + when :target_side_foreground, :target_side_background + ret = [Battle::Scene.pbBattlerPosition(target_idx)] + end + return ret + end + + def get_xy_offset(particle, sprite) + ret = [0, 0] + case particle[:graphic] + when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" + ret[1] += sprite.bitmap.height / 2 if sprite + end + return ret + end + + # property is :x or :y. + def apply_xy_focus_to_sprite(sprite, property, value, focus) + result = value + coord_idx = (property == :x) ? 0 : 1 + if focus + if focus.length == 2 + distance = GameData::Animation::USER_AND_TARGET_SEPARATION + result = focus[0][coord_idx] + ((value.to_f / distance[coord_idx]) * (focus[1][coord_idx] - focus[0][coord_idx])).to_i + else + result = value + focus[0][coord_idx] + end + end + case property + when :x then sprite.x = result + when :y then sprite.y = result + end + end + + #----------------------------------------------------------------------------- + + # Returns either a number or an array of two numbers. + def get_z_focus(particle, user_index, target_index) + ret = 0 + case particle[:focus] + when :foreground + ret = 2000 + when :midground + ret = 1000 + when :background + # NOTE: No change. + when :user + ret = 1000 + ((100 * ((user_index / 2) + 1)) * (user_index.even? ? 1 : -1)) + when :target + ret = 1000 + ((100 * ((target_index / 2) + 1)) * (target_index.even? ? 1 : -1)) + when :user_and_target + user_pos = 1000 + ((100 * ((user_index / 2) + 1)) * (user_index.even? ? 1 : -1)) + target_pos = 1000 + ((100 * ((target_index / 2) + 1)) * (target_index.even? ? 1 : -1)) + ret = [user_pos, target_pos] + when :user_side_foreground, :target_side_foreground + this_idx = (particle[:focus] == :user_side_foreground) ? user_index : target_index + ret = 1000 + ret += 1000 if this_idx.even? # On player's side + when :user_side_background, :target_side_background + this_idx = (particle[:focus] == :user_side_background) ? user_index : target_index + ret = 1000 if this_idx.even? # On player's side + end + return ret + end + + def apply_z_focus_to_sprite(sprite, z, focus) + if focus.is_a?(Array) + distance = GameData::Animation::USER_AND_TARGET_SEPARATION[2] + if z >= 0 + sprite.z = z + focus[0] + elsif z <= distance + sprite.z = z + focus[1] + else + sprite.z = focus[0] + ((z.to_f / distance) * (focus[1] - focus[0])).to_i + end + elsif focus + sprite.z = z + focus + else + sprite.z = z + end + end + + #----------------------------------------------------------------------------- + + # user_sprites, target_sprites = [front sprite, back sprite] + def set_bitmap_and_origin(particle, sprite, user_index, target_index, user_sprites, target_sprites) + return if sprite&.is_a?(Battle::Scene::BattlerSprite) + case particle[:graphic] + when "USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK" + filename = nil + case particle[:graphic] + when "USER" + filename = (user_index.even?) ? user_sprites[1] : user_sprites[0] + when "USER_OPP" + filename = (user_index.even?) ? user_sprites[0] : user_sprites[1] + when "USER_FRONT" + filename = user_sprites[0] + when "USER_BACK" + filename = user_sprites[1] + when "TARGET" + filename = (target_index.even?) ? target_sprites[1] : target_sprites[0] + when "TARGET_OPP" + filename = (target_index.even?) ? target_sprites[0] : target_sprites[1] + when "TARGET_FRONT" + filename = target_sprites[0] + when "TARGET_BACK" + filename = target_sprites[1] + end + sprite.bitmap = RPG::Cache.load_bitmap("", filename) + sprite.ox = sprite.bitmap.width / 2 + sprite.oy = sprite.bitmap.height + else + sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battle animations/", particle[:graphic]) + sprite.src_rect.set(0, 0, sprite.bitmap.width, sprite.bitmap.height) + if [:foreground, :midground, :background].include?(particle[:focus]) && + sprite.bitmap.width == Settings::SCREEN_WIDTH && + sprite.bitmap.height >= Settings::SCREEN_HEIGHT - BATTLE_MESSAGE_BAR_HEIGHT + sprite.ox = 0 + sprite.oy = 0 + elsif sprite.bitmap.width > sprite.bitmap.height * 2 + sprite.src_rect.set(0, 0, sprite.bitmap.height, sprite.bitmap.height) + sprite.ox = sprite.bitmap.height / 2 + sprite.oy = sprite.bitmap.height / 2 + else + sprite.ox = sprite.bitmap.width / 2 + sprite.oy = sprite.bitmap.height / 2 + end + if particle[:graphic][/\[\s*bottom\s*\]\s*$/i] # [bottom] at end of filename + sprite.oy = sprite.bitmap.height + end + end + end + + #----------------------------------------------------------------------------- + + def interpolate(interpolation, start_val, end_val, duration, start_time, now) + case interpolation + when :linear + return lerp(start_val, end_val, duration, start_time, now).to_i + when :ease_in # Quadratic + ret = start_val + x = (now - start_time) / duration.to_f + ret += (end_val - start_val) * x * x + return ret.round + when :ease_out # Quadratic + ret = start_val + x = (now - start_time) / duration.to_f + ret += (end_val - start_val) * (1 - ((1 - x) * (1 - x))) + return ret.round + when :ease_both # Quadratic + ret = start_val + x = (now - start_time) / duration.to_f + if x < 0.5 + ret += (end_val - start_val) * x * x * 2 + else + ret += (end_val - start_val) * (1 - (((-2 * x) + 2) * ((-2 * x) + 2) / 2)) + end + return ret.round + end + raise _INTL("Unknown interpolation method {1}.", interpolation) + end +end diff --git a/Data/Scripts/905_Anim player/010_Battle code.rb b/Data/Scripts/905_Anim player/010_Battle code.rb new file mode 100644 index 000000000..482dba8bb --- /dev/null +++ b/Data/Scripts/905_Anim player/010_Battle code.rb @@ -0,0 +1,187 @@ +#=============================================================================== +# +#=============================================================================== +class Battle::Scene + BETTER_ANIMATION_DEFAULTS = { + :NORMAL => [:TACKLE, :SONICBOOM, :DEFENSECURL, :EXPLOSION, :SWIFT, :TAILWHIP], + :FIGHTING => [:MACHPUNCH, :AURASPHERE, :BULKUP, nil, nil, nil], + :FLYING => [:WINGATTACK, :GUST, :ROOST, nil, :AIRCUTTER, :FEATHERDANCE], + :POISON => [:POISONSTING, :SLUDGE, :ACIDARMOR, nil, :ACID, :POISONPOWDER], + :GROUND => [:SANDTOMB, :MUDSLAP, :MUDSPORT, :EARTHQUAKE, :EARTHPOWER, :SANDATTACK], + :ROCK => [:ROCKTHROW, :POWERGEM, :ROCKPOLISH, :ROCKSLIDE, nil, :SANDSTORM], + :BUG => [:TWINEEDLE, :BUGBUZZ, :QUIVERDANCE, nil, :STRUGGLEBUG, :STRINGSHOT], + :GHOST => [:ASTONISH, :SHADOWBALL, :GRUDGE, nil, nil, :CONFUSERAY], + :STEEL => [:IRONHEAD, :MIRRORSHOT, :IRONDEFENSE, nil, nil, :METALSOUND], + :FIRE => [:FIREPUNCH, :EMBER, :SUNNYDAY, nil, :INCINERATE, :WILLOWISP], + :WATER => [:CRABHAMMER, :WATERGUN, :AQUARING, nil, :SURF, :WATERSPORT], + :GRASS => [:VINEWHIP, :MAGICALLEAF, :COTTONGUARD, :RAZORLEAF, nil, :SPORE], + :ELECTRIC => [:THUNDERPUNCH, :THUNDERSHOCK, :CHARGE, nil, :DISCHARGE, :THUNDERWAVE], + :PSYCHIC => [:ZENHEADBUTT, :CONFUSION, :CALMMIND, nil, :SYNCHRONOISE, :MIRACLEEYE], + :ICE => [:ICEPUNCH, :ICEBEAM, :MIST, nil, :POWDERSNOW, :HAIL], + :DRAGON => [:DRAGONCLAW, :DRAGONRAGE, :DRAGONDANCE, nil, :TWISTER, nil], + :DARK => [:KNOCKOFF, :DARKPULSE, :HONECLAWS, nil, :SNARL, :EMBARGO], + :FAIRY => [:TACKLE, :FAIRYWIND, :MOONLIGHT, nil, :DAZZLINGGLEAM, :SWEETKISS] + } + + #----------------------------------------------------------------------------- + + def pbAnimation(move_id, user, targets, version = 0) + anims = find_move_animation(move_id, version, user&.index) + return if !anims || anims.empty? + if anims[0].is_a?(GameData::Animation) # New animation + pbSaveShadows do + # NOTE: anims.sample is a random valid animation. + play_better_animation(anims.sample, user, targets) + end + else # Old animation + anim = anims[0] + target = (targets.is_a?(Array)) ? targets[0] : targets + animations = pbLoadBattleAnimations + return if !animations + pbSaveShadows do + if anims[1] # On opposing side and using OppMove animation + pbAnimationCore(animations[anim], target, user, true) + else # On player's side, and/or using Move animation + pbAnimationCore(animations[anim], user, target) + end + end + end + end + + alias __newanims__pbCommonAnimation pbCommonAnimation unless method_defined?(:__newanims__pbCommonAnimation) + def pbCommonAnimation(anim_name, user = nil, target = nil) + return if nil_or_empty?(anim_name) + anims = try_get_better_common_animation(anim_name, user.index) + if anims + # NOTE: anims.sample is a random valid animation. + play_better_animation(anims.sample, user, target) + else + __newanims__pbCommonAnimation(anim_name, user, target) + end + end + + #----------------------------------------------------------------------------- + + # Returns an array of GameData::Animation if a new animation(s) is found. + # Return [animation index, shouldn't be flipped] if an old animation is found. + def find_move_animation(move_id, version, user_index) + # Get animation + anims = find_move_animation_for_move(move_id, version, user_index) + return anims if anims + # Get information to decide which default animation to try + move_data = GameData::Move.get(move_id) + target_data = GameData::Target.get(move_data.target) + move_type = move_data.type + default_idx = move_data.category + default_idx += 3 if target_data.num_targets > 1 || target_data.affects_foe_side + default_idx += 3 if move_data.status? && target_data.num_targets > 0 + # Check for a default animation + wanted_move = BETTER_ANIMATION_DEFAULTS[move_type][default_idx] + anims = find_move_animation_for_move(wanted_move, 0, user_index) + return anims if anims + if default_idx >= 3 + wanted_move = BETTER_ANIMATION_DEFAULTS[move_type][default_idx - 3] + anims = find_move_animation_for_move(wanted_move, 0, user_index) + return anims if anims + return nil if wanted_move == :TACKLE # No need to check for Tackle's animation twice + end + # Use Tackle's animation + return find_move_animation_for_move(:TACKLE, 0, user_index) + end + + # Find an animation(s) for the given move_id. + def find_move_animation_for_move(move_id, version, user_index) + # Find new animation + anims = try_get_better_move_animation(move_id, version, user_index) + return anims if anims + if version > 0 + anims = try_get_better_move_animation(move_id, 0, user_index) + return anims if anims + end + # Find old animation + anim = pbFindMoveAnimDetails(pbLoadMoveToAnim, move_id, user_index, version) + return anim + end + + # Finds a new animation for the given move_id and version. Prefers opposing + # animations if the user is opposing. Can return multiple animations. + def try_get_better_move_animation(move_id, version, user_index) + ret = [] + backup_ret = [] + GameData::Animation.each do |anim| + next if !anim.move_animation? || anim.ignore + next if anim.move != move_id.to_s + next if anim.version != version + if !user_index + ret.push(anim) + next + end + if user_index.even? # User is on player's side + ret.push(anim) if !anim.opposing_animation? + else # User is on opposing side + (anim.opposing_animation?) ? ret.push(anim) : backup_ret.push(anim) + end + end + return ret if !ret.empty? + return backup_ret if !backup_ret.empty? + return nil + end + + def try_get_better_common_animation(anim_name, user_index) + ret = [] + backup_ret = [] + GameData::Animation.each do |anim| + next if !anim.common_animation? || anim.ignore + next if anim.move != anim_name + if !user_index + ret.push(anim) + next + end + if user_index.even? # User is on player's side + ret.push(anim) if !anim.opposing_animation? + else # User is on opposing side + (anim.opposing_animation?) ? ret.push(anim) : backup_ret.push(anim) + end + end + return ret if !ret.empty? + return backup_ret if !backup_ret.empty? + return nil + end + + #----------------------------------------------------------------------------- + + def play_better_animation(anim_data, user, targets) + return if !anim_data + @briefMessage = false + # Memorize old battler coordinates, to be reset after the animation + old_battler_coords = [] + if user + sprite = @sprites["pokemon_#{user.index}"] + old_battler_coords[user.index] = [sprite.x, sprite.y] + end + if targets + targets.each do |target| + sprite = @sprites["pokemon_#{target.index}"] + old_battler_coords[target.index] = [sprite.x, sprite.y] + end + end + # Create animation player + anim_player = AnimationPlayer.new(anim_data, user, targets, self) + anim_player.set_up + # Play animation + anim_player.start + loop do + pbUpdate + anim_player.update + break if anim_player.can_continue_battle? + end + anim_player.dispose + # Restore old battler coordinates + old_battler_coords.each_with_index do |values, i| + next if !values + sprite = @sprites["pokemon_#{i}"] + sprite.x = values[0] + sprite.y = values[1] + end + end +end diff --git a/Data/Scripts/905_Anim player/011_Battle z modifiers.rb b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb new file mode 100644 index 000000000..e10886741 --- /dev/null +++ b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb @@ -0,0 +1,71 @@ +# TODO: Hardcoded animations have incorrect z values because of the change to +# other sprites' z values. + +#=============================================================================== +# +#=============================================================================== +class Battle::Scene + alias __newanims__pbInitSprites pbInitSprites unless method_defined?(:__newanims__pbInitSprites) + def pbInitSprites + __newanims__pbInitSprites + ["battle_bg", "battle_bg2"].each { |spr| @sprites[spr].z = -200 } + 2.times do |side| + @sprites["base_#{side}"].z = -199 + end + @sprites["cmdBar_bg"].z += 9999 + @sprites["messageBox"].z += 9999 + @sprites["messageWindow"].z += 9999 + @sprites["commandWindow"].z += 9999 + @sprites["fightWindow"].z += 9999 + @sprites["targetWindow"].z += 9999 + 2.times do |side| + @sprites["partyBar_#{side}"].z += 9999 + NUM_BALLS.times do |i| + @sprites["partyBall_#{side}_#{i}"].z += 9999 + end + # Ability splash bars + @sprites["abilityBar_#{side}"].z += 9999 if USE_ABILITY_SPLASH + end + @battle.battlers.each_with_index do |b, i| + @sprites["dataBox_#{i}"].z += 9999 if b + end + end +end + +#=============================================================================== +# Pokémon sprite (used in battle) +#=============================================================================== +class Battle::Scene::BattlerSprite < RPG::Sprite + def pbSetPosition + return if !@_iconBitmap + pbSetOrigin + if @index.even? + self.z = 1100 + (100 * @index / 2) + else + self.z = 1000 - (100 * (@index + 1) / 2) + end + # Set original position + p = Battle::Scene.pbBattlerPosition(@index, @sideSize) + @spriteX = p[0] + @spriteY = p[1] + # Apply metrics + @pkmn.species_data.apply_metrics_to_sprite(self, @index) + end +end + +#=============================================================================== +# Shadow sprite for Pokémon (used in battle) +#=============================================================================== +class Battle::Scene::BattlerShadowSprite < RPG::Sprite + def pbSetPosition + return if !@_iconBitmap + pbSetOrigin + self.z = -198 + # Set original position + p = Battle::Scene.pbBattlerPosition(@index, @sideSize) + self.x = p[0] + self.y = p[1] + # Apply metrics + @pkmn.species_data.apply_metrics_to_sprite(self, @index, true) + end +end diff --git a/Data/Scripts/905_Anim player/012_Fake battler.rb b/Data/Scripts/905_Anim player/012_Fake battler.rb new file mode 100644 index 000000000..97991fc35 --- /dev/null +++ b/Data/Scripts/905_Anim player/012_Fake battler.rb @@ -0,0 +1,26 @@ +#=============================================================================== +# +#=============================================================================== +class AnimationPlayer::FakeBattler + attr_reader :index + attr_reader :pokemon + + def initialize(index, species, form = 0, gender = 0) + @index = index + @pokemon = AnimationPlayer::FakePokemon.new(species, form, gender) + end +end + +#=============================================================================== +# +#=============================================================================== +class AnimationPlayer::FakePokemon + attr_reader :species, :form, :gender + + def initialize(species, form = 0, gender = 0) + # NOTE: species will be a string, but it doesn't need to be a symbol. + @species = species + @form = form + @gender = gender + end +end From c14faf3fed0c8d0a84e65408be183bb5d873bde4 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 13 Apr 2024 22:12:11 +0100 Subject: [PATCH 32/49] Anim Editor: Changes to example animations and converter --- .../100_convert old anims to new.rb | 146 ++++-- .../Example anims/Common/Attract.txt | 28 +- PBS/Animations/Example anims/Common/Bind.txt | 12 +- PBS/Animations/Example anims/Common/Burn.txt | 8 +- .../Example anims/Common/Confusion.txt | 8 +- .../Example anims/Common/FireSpin.txt | 84 ++-- .../Example anims/Common/Frozen.txt | 24 +- PBS/Animations/Example anims/Common/Hail.txt | 50 +- .../Example anims/Common/HealthDown.txt | 44 +- .../Example anims/Common/HealthUp.txt | 16 +- .../Example anims/Common/Paralysis.txt | 12 +- .../Example anims/Common/Poison.txt | 10 +- PBS/Animations/Example anims/Common/Rain.txt | 44 +- .../Example anims/Common/Sandstorm.txt | 66 ++- .../Example anims/Common/Shadow.txt | 20 +- .../Example anims/Common/ShadowSky.txt | 30 +- PBS/Animations/Example anims/Common/Shiny.txt | 20 +- PBS/Animations/Example anims/Common/Sleep.txt | 102 ++-- .../Example anims/Common/StatDown.txt | 44 +- .../Example anims/Common/StatUp.txt | 60 ++- PBS/Animations/Example anims/Common/Sun.txt | 45 +- .../Example anims/Common/SuperShiny.txt | 20 +- PBS/Animations/Example anims/Common/Toxic.txt | 29 +- PBS/Animations/Example anims/Common/Wrap.txt | 12 +- .../Example anims/Move/ACIDARMOR.txt | 8 +- .../Example anims/Move/ACROBATICS.txt | 4 +- .../Example anims/Move/ACUPRESSURE.txt | 34 +- .../Example anims/Move/AERIALACE.txt | 4 - PBS/Animations/Example anims/Move/AGILITY.txt | 14 +- .../Example anims/Move/ALLYSWITCH.txt | 6 +- PBS/Animations/Example anims/Move/AMNESIA.txt | 22 +- .../Example anims/Move/AQUARING.txt | 110 ++-- PBS/Animations/Example anims/Move/BARRIER.txt | 12 +- .../Example anims/Move/BLUEFLARE.txt | 6 +- PBS/Animations/Example anims/Move/BULKUP.txt | 52 +- PBS/Animations/Example anims/Move/CHARGE.txt | 18 +- .../Example anims/Move/CLOSECOMBAT.txt | 32 +- .../Example anims/Move/COTTONGUARD.txt | 140 +++--- PBS/Animations/Example anims/Move/CURSE.txt | 8 +- .../Example anims/Move/DEFENSECURL.txt | 6 +- PBS/Animations/Example anims/Move/DETECT.txt | 32 +- .../Example anims/Move/DRAGONDANCE.txt | 12 +- .../Example anims/Move/FINALGAMBIT.txt | 2 +- .../Example anims/Move/FIREPLEDGE.txt | 2 +- PBS/Animations/Example anims/Move/FLAIL.txt | 2 +- .../Example anims/Move/FLAMEWHEEL.txt | 98 ++-- .../Example anims/Move/FOCUSENERGY.txt | 8 +- .../Example anims/Move/FOLLOWME.txt | 32 +- .../Example anims/Move/FURYATTACK.txt | 140 +++--- PBS/Animations/Example anims/Move/GRUDGE.txt | 40 +- PBS/Animations/Example anims/Move/HAIL.txt | 46 +- PBS/Animations/Example anims/Move/HARDEN.txt | 6 +- PBS/Animations/Example anims/Move/KINESIS.txt | 2 +- .../Example anims/Move/LEECHSEED.txt | 92 ++-- PBS/Animations/Example anims/Move/LEER.txt | 18 +- .../Example anims/Move/LIGHTSCREEN.txt | 24 +- .../Example anims/Move/LOVELYKISS.txt | 12 +- .../Example anims/Move/LUCKYCHANT.txt | 470 +++++++++--------- .../Example anims/Move/MAGICCOAT.txt | 48 +- .../Example anims/Move/MEGADRAIN.txt | 238 ++++----- .../Example anims/Move/METRONOME.txt | 20 +- PBS/Animations/Example anims/Move/MIST.txt | 16 +- .../Example anims/Move/MOONLIGHT.txt | 8 +- .../Example anims/Move/MORNINGSUN.txt | 12 +- .../Example anims/Move/POISONSTING.txt | 36 +- .../Example anims/Move/PSYCHOCUT.txt | 80 +-- .../Example anims/Move/RAINDANCE.txt | 40 +- PBS/Animations/Example anims/Move/REFLECT.txt | 48 +- PBS/Animations/Example anims/Move/REST.txt | 8 +- .../Example anims/Move/SANDATTACK.txt | 438 ++++++++-------- .../Example anims/Move/SANDSTORM.txt | 62 ++- PBS/Animations/Example anims/Move/SING.txt | 70 +-- PBS/Animations/Example anims/Move/SPIKES.txt | 112 ++--- PBS/Animations/Example anims/Move/SPLASH.txt | 14 +- .../Example anims/Move/STEALTHROCK.txt | 56 +-- .../Example anims/Move/SUNNYDAY.txt | 6 +- .../Example anims/Move/SWORDSDANCE.txt | 172 ++++--- .../Example anims/Move/TAILGLOW.txt | 8 +- .../Example anims/Move/TELEPORT.txt | 10 +- .../Example anims/Move/THUNDERWAVE.txt | 6 +- .../Example anims/Move/TRICKROOM.txt | 38 +- .../Example anims/Move/WATERGUN.txt | 32 +- 82 files changed, 1961 insertions(+), 2065 deletions(-) diff --git a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb index c2c6e5494..5f319fd4b 100644 --- a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb +++ b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb @@ -2,6 +2,12 @@ # them swapping back. module AnimationConverter + NO_USER_COMMON_ANIMATIONS = [ + "Hail", "HarshSun", "HeavyRain", "Rain", "Sandstorm", "Sun", "ShadowSky", + "Rainbow", "RainbowOpp", "SeaOfFire", "SeaOfFireOpp", "Swamp", "SwampOpp" + ] + HAS_TARGET_COMMON_ANIMATIONS = ["LeechSeed", "ParentalBond"] + module_function def convert_old_animations_to_new @@ -52,6 +58,26 @@ module AnimationConverter :pbs_path => pbs_path } + # Decide whether the animation involves a user or target + has_user = true + has_target = true + if new_anim[:type] == :common + if NO_USER_COMMON_ANIMATIONS.include?(new_anim[:move]) + has_user = false + has_target = false + elsif !HAS_TARGET_COMMON_ANIMATIONS.include?(new_anim[:move]) + has_target = false + end + else + move_data = GameData::Move.try_get(new_anim[:move]) + if move_data + target_data = GameData::Target.get(move_data.target) + has_target = false if target_data.num_targets == 0 && target_data.id != :None + end + end + new_anim[:no_user] = true if !has_user + new_anim[:no_target] = true if !has_target + add_frames_to_new_anim_hash(anim, new_anim) add_bg_fg_commands_to_new_anim_hash(anim, new_anim) add_se_commands_to_new_anim_hash(anim, new_anim) @@ -63,6 +89,8 @@ module AnimationConverter end + #----------------------------------------------------------------------------- + def add_frames_to_new_anim_hash(anim, hash) # Lookup array for particle index using cel index index_lookup = [] @@ -95,6 +123,10 @@ module AnimationConverter default_frame[99] = "Examples/" + anim.graphic last_frame_values = [] + + anim_graphic = anim.graphic + anim_graphic.gsub!(".", " ") + anim_graphic.gsub!(" ", " ") # Go through each frame anim.length.times do |frame_num| frame = anim[frame_num] @@ -102,12 +134,19 @@ module AnimationConverter changed_particles = [] frame.each_with_index do |cel, i| next if !cel + next if i == 0 && hash[:no_user] + next if i == 1 && hash[:no_target] # If the particle from the previous frame for this cel had a different # focus, start a new particle. if i > 1 && frame_num > 0 && index_lookup[i] && index_lookup[i] >= 0 && last_frame_values[index_lookup[i]] - this_graphic = (cel[AnimFrame::PATTERN] == -1) ? "USER" : (cel[AnimFrame::PATTERN] == -2) ? "TARGET" : "Examples/" + anim.graphic - if last_frame_values[index_lookup[i]][AnimFrame::FOCUS] != cel[AnimFrame::FOCUS] || + this_graphic = (cel[AnimFrame::PATTERN] == -1) ? "USER" : (cel[AnimFrame::PATTERN] == -2) ? "TARGET" : "Examples/" + anim_graphic + this_graphic.gsub!(".", " ") + this_graphic.gsub!(" ", "") + focus = cel[AnimFrame::FOCUS] + focus = 2 if (focus == 1 || focus == 3) && hash[:no_target] + focus = 0 if (focus == 2 || focus == 3) && hash[:no_user] + if last_frame_values[index_lookup[i]][AnimFrame::FOCUS] != focus || last_frame_values[index_lookup[i]][99] != this_graphic # Graphic index_lookup[i] = -1 end @@ -124,9 +163,9 @@ module AnimationConverter particle = hash[:particles][idx] last_frame = last_frame_values[idx] || default_frame.clone # User and target particles have specific names - if idx == 0 + if i == 0 particle[:name] = "User" - elsif idx == 1 + elsif i == 1 particle[:name] = "Target" else # Set graphic @@ -138,14 +177,17 @@ module AnimationConverter particle[:graphic] = "TARGET" last_frame[99] = "TARGET" else - particle[:graphic] = "Examples/" + anim.graphic - last_frame[99] = "Examples/" + anim.graphic + particle[:graphic] = "Examples/" + anim_graphic + last_frame[99] = "Examples/" + anim_graphic end end # Set focus for non-User/non-Target - if idx > 1 - particle[:focus] = [:foreground, :target, :user, :user_and_target, :foreground][cel[AnimFrame::FOCUS]] - last_frame[AnimFrame::FOCUS] = cel[AnimFrame::FOCUS] + if i > 1 + focus = cel[AnimFrame::FOCUS] + focus = 2 if (focus == 1 || focus == 3) && hash[:no_target] + focus = 0 if (focus == 2 || focus == 3) && hash[:no_user] + particle[:focus] = [:foreground, :target, :user, :user_and_target, :foreground][focus] + last_frame[AnimFrame::FOCUS] = focus end # Copy commands across @@ -175,23 +217,59 @@ module AnimationConverter val = cel[property[0]].to_i case property[1] when :x - # TODO: What if the animation is an OppMove one? I think this should - # be the other way around. - if particle[:focus] == :user_and_target - fraction = (val - Battle::Scene::FOCUSUSER_X).to_f / (Battle::Scene::FOCUSTARGET_X - Battle::Scene::FOCUSUSER_X) + case cel[AnimFrame::FOCUS] + when 1 # :target + val -= Battle::Scene::FOCUSTARGET_X + when 2 # :user + val -= Battle::Scene::FOCUSUSER_X + when 3 # :user_and_target + # TODO: What if the animation is an OppMove one? I think this should + # be the other way around. + user_x = Battle::Scene::FOCUSUSER_X + target_x = Battle::Scene::FOCUSTARGET_X + if hash[:type] == :opp_move + user_x = Battle::Scene::FOCUSTARGET_X + target_x = Battle::Scene::FOCUSUSER_X + end + fraction = (val - user_x).to_f / (target_x - user_x) val = (fraction * GameData::Animation::USER_AND_TARGET_SEPARATION[0]).to_i end + if cel[AnimFrame::FOCUS] != particle[:focus] + pseudo_focus = cel[AnimFrame::FOCUS] + # Was focused on target, now focused on user + pseudo_focus = 2 if [1, 3].include?(pseudo_focus) && hash[:no_target] + # Was focused on user, now focused on screen + val += Battle::Scene::FOCUSUSER_X if [2, 3].include?(pseudo_focus) && hash[:no_user] + end when :y - # TODO: What if the animation is an OppMove one? I think this should - # be the other way around. - if particle[:focus] == :user_and_target - fraction = (val - Battle::Scene::FOCUSUSER_Y).to_f / (Battle::Scene::FOCUSTARGET_Y - Battle::Scene::FOCUSUSER_Y) + case cel[AnimFrame::FOCUS] + when 1 # :target + val -= Battle::Scene::FOCUSTARGET_Y + when 2 # :user + val -= Battle::Scene::FOCUSUSER_Y + when 3 # :user_and_target + # TODO: What if the animation is an OppMove one? I think this should + # be the other way around. + user_y = Battle::Scene::FOCUSUSER_Y + target_y = Battle::Scene::FOCUSTARGET_Y + if hash[:type] == :opp_move + user_y = Battle::Scene::FOCUSTARGET_Y + target_y = Battle::Scene::FOCUSUSER_Y + end + fraction = (val - user_y).to_f / (target_y - user_y) val = (fraction * GameData::Animation::USER_AND_TARGET_SEPARATION[1]).to_i end + if cel[AnimFrame::FOCUS] != particle[:focus] + pseudo_focus = cel[AnimFrame::FOCUS] + # Was focused on target, now focused on user + pseudo_focus = 2 if [1, 3].include?(pseudo_focus) && hash[:no_target] + # Was focused on user, now focused on screen + val += Battle::Scene::FOCUSUSER_Y if [2, 3].include?(pseudo_focus) && hash[:no_user] + end when :visible, :flip val = (val == 1) # Boolean when :z - next if idx <= 1 # User or target + next if i <= 1 # User or target case val when 0 then val = -50 + i # Back when 1 then val = 25 + i # Front @@ -231,7 +309,7 @@ module AnimationConverter # doesn't have any commands if frame_num == anim.length - 1 && changed_particles.empty? hash[:particles].each_with_index do |particle, idx| - next if !particle || idx <= 1 # User or target + next if !particle || ["User", "Target"].include?(particle[:name]) # TODO: Making all non-user non-target particles invisible in the last # frame isn't a perfect solution, but it's good enough to get # example animation data. @@ -242,30 +320,18 @@ module AnimationConverter end end - hash[:particles][0][:focus] = :user - hash[:particles][1][:focus] = :target - - # Adjust all x/y positions based on particle[:focus] - hash[:particles].each do |particle| - next if !particle - offset_x = 0 - offset_y = 0 - case particle[:focus] - when :user - offset_x = -Battle::Scene::FOCUSUSER_X - offset_y = -Battle::Scene::FOCUSUSER_Y - when :target - offset_x = -Battle::Scene::FOCUSTARGET_X - offset_y = -Battle::Scene::FOCUSTARGET_Y - when :user_and_target - # NOTE: No change, done above. - end - next if offset_x == 0 && offset_y == 0 - particle[:x].each { |cmd| cmd[2] += offset_x } - particle[:y].each { |cmd| cmd[2] += offset_y } + if hash[:particles].any? { |particle| particle[:name] == "User" } + user_particle = hash[:particles].select { |particle| particle[:name] == "User" }[0] + user_particle[:focus] = :user + end + if hash[:particles].any? { |particle| particle[:name] == "Target" } + target_particle = hash[:particles].select { |particle| particle[:name] == "Target" }[0] + target_particle[:focus] = :target end end + #----------------------------------------------------------------------------- + # TODO: Haven't tested this as no Essentials animations use them. def add_bg_fg_commands_to_new_anim_hash(anim, new_anim) bg_particle = { :name => "Background", :focus => :background } diff --git a/PBS/Animations/Example anims/Common/Attract.txt b/PBS/Animations/Example anims/Common/Attract.txt index 9cf78fa57..78b685e1f 100644 --- a/PBS/Animations/Example anims/Common/Attract.txt +++ b/PBS/Animations/Example anims/Common/Attract.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Attract] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/poi.hear.mus - Focus = Target + + Graphic = Examples/poi hear mus + Focus = User SetFrame = 7,2 SetX = 7,-29 SetY = 7,-46 @@ -38,9 +36,9 @@ Name = Example anim SetOpacity = 16,128 SetY = 17,-93 SetOpacity = 17,64 - - Graphic = Examples/poi.hear.mus - Focus = Target + + Graphic = Examples/poi hear mus + Focus = User SetFrame = 8,2 SetX = 8,-35 SetY = 8,-46 @@ -66,9 +64,9 @@ Name = Example anim SetOpacity = 16,128 SetY = 17,-70 SetOpacity = 17,64 - - Graphic = Examples/poi.hear.mus - Focus = Target + + Graphic = Examples/poi hear mus + Focus = User SetFrame = 12,2 SetX = 12,13 SetY = 12,-3 @@ -86,9 +84,9 @@ Name = Example anim SetOpacity = 16,128 SetY = 17,-72 SetOpacity = 17,64 - - Graphic = Examples/poi.hear.mus - Focus = Target + + Graphic = Examples/poi hear mus + Focus = User SetFrame = 0,2 SetX = 0,-10 SetY = 0,-29 diff --git a/PBS/Animations/Example anims/Common/Bind.txt b/PBS/Animations/Example anims/Common/Bind.txt index 49da0b318..ee087466c 100644 --- a/PBS/Animations/Example anims/Common/Bind.txt +++ b/PBS/Animations/Example anims/Common/Bind.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Bind] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Struggle - Focus = Target + Focus = User SetFrame = 0,1 SetX = 0,56 SetY = 0,6 @@ -26,9 +24,9 @@ Name = Example anim SetX = 6,112 SetY = 6,6 SetX = 7,96 - + Graphic = Examples/Struggle - Focus = Target + Focus = User SetX = 0,-64 SetY = 0,6 SetZ = 0,27 diff --git a/PBS/Animations/Example anims/Common/Burn.txt b/PBS/Animations/Example anims/Common/Burn.txt index f255e28c8..96cf3ac9e 100644 --- a/PBS/Animations/Example anims/Common/Burn.txt +++ b/PBS/Animations/Example anims/Common/Burn.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Burn] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 0,2 SetX = 0,0 SetY = 0,0 diff --git a/PBS/Animations/Example anims/Common/Confusion.txt b/PBS/Animations/Example anims/Common/Confusion.txt index 9cf48a078..5f6a36afe 100644 --- a/PBS/Animations/Example anims/Common/Confusion.txt +++ b/PBS/Animations/Example anims/Common/Confusion.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Confusion] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/confused - Focus = Target + Focus = User SetX = 0,0 SetY = 0,-33 SetZ = 0,27 diff --git a/PBS/Animations/Example anims/Common/FireSpin.txt b/PBS/Animations/Example anims/Common/FireSpin.txt index 6f404644a..0e157b921 100644 --- a/PBS/Animations/Example anims/Common/FireSpin.txt +++ b/PBS/Animations/Example anims/Common/FireSpin.txt @@ -2,167 +2,165 @@ #------------------------------- [Common,FireSpin] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 0,16 SetX = 0,-29 SetY = 0,40 SetZ = 0,27 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 0,16 SetX = 0,9 SetY = 0,42 SetZ = 0,28 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 0,16 SetX = 0,44 SetY = 0,41 SetZ = 0,29 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 1,16 SetX = 1,-29 SetY = 1,25 SetZ = 1,30 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 1,16 SetX = 1,10 SetY = 1,27 SetZ = 1,31 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 1,16 SetX = 1,47 SetY = 1,26 SetZ = 1,32 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 2,16 SetX = 2,-25 SetY = 2,12 SetZ = 2,33 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 2,16 SetX = 2,11 SetY = 2,11 SetZ = 2,34 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 2,16 SetX = 2,49 SetY = 2,9 SetZ = 2,35 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 3,16 SetX = 3,-27 SetY = 3,-4 SetZ = 3,36 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 3,16 SetX = 3,12 SetY = 3,-5 SetZ = 3,37 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 3,16 SetX = 3,47 SetY = 3,-7 SetZ = 3,38 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 4,16 SetX = 4,-28 SetY = 4,-19 SetZ = 4,39 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 4,16 SetX = 4,13 SetY = 4,-18 SetZ = 4,40 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 4,16 SetX = 4,51 SetY = 4,-20 SetZ = 4,41 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 5,16 SetX = 5,-29 SetY = 5,-34 SetZ = 5,42 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 5,16 SetX = 5,13 SetY = 5,-33 SetZ = 5,43 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 5,16 SetX = 5,50 SetY = 5,-35 SetZ = 5,44 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 5,16 SetX = 5,-10 SetY = 5,41 SetZ = 5,45 SetVisible = 6,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 5,16 SetX = 5,31 SetY = 5,42 diff --git a/PBS/Animations/Example anims/Common/Frozen.txt b/PBS/Animations/Example anims/Common/Frozen.txt index 0a5ade93b..8f3007feb 100644 --- a/PBS/Animations/Example anims/Common/Frozen.txt +++ b/PBS/Animations/Example anims/Common/Frozen.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Frozen] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/016-Ice01 - Focus = Target + Focus = User SetFrame = 0,6 SetX = 0,-56 SetY = 0,-82 @@ -33,17 +31,17 @@ Name = Example anim SetX = 13,80 SetY = 13,-2 SetVisible = 14,false - + Graphic = Examples/016-Ice01 - Focus = Target + Focus = User SetFrame = 1,9 SetX = 1,0 SetY = 1,-2 SetZ = 1,29 SetVisible = 2,false - + Graphic = Examples/016-Ice01 - Focus = Target + Focus = User SetFrame = 6,11 SetX = 6,0 SetY = 6,-2 @@ -51,9 +49,9 @@ Name = Example anim SetOpacity = 6,192 SetOpacity = 7,255 SetVisible = 8,false - + Graphic = Examples/016-Ice01 - Focus = Target + Focus = User SetFrame = 9,8 SetX = 9,48 SetY = 9,-82 @@ -69,9 +67,9 @@ Name = Example anim SetX = 13,-32 SetY = 13,46 SetVisible = 14,false - + Graphic = Examples/016-Ice01 - Focus = Target + Focus = User SetFrame = 0,9 SetX = 0,0 SetY = 0,-2 diff --git a/PBS/Animations/Example anims/Common/Hail.txt b/PBS/Animations/Example anims/Common/Hail.txt index be0097fed..ef19b317f 100644 --- a/PBS/Animations/Example anims/Common/Hail.txt +++ b/PBS/Animations/Example anims/Common/Hail.txt @@ -2,13 +2,9 @@ #------------------------------- [Common,Hail] Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - +NoUser = true +NoTarget = true + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 @@ -42,7 +38,7 @@ Name = Example anim SetX = 10,136 SetY = 10,107 SetVisible = 11,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 @@ -52,7 +48,7 @@ Name = Example anim SetX = 1,464 SetY = 1,117 SetVisible = 2,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,8 @@ -68,7 +64,7 @@ Name = Example anim SetX = 3,278 SetY = 3,164 SetVisible = 4,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 @@ -87,7 +83,7 @@ Name = Example anim SetX = 4,390 SetY = 4,210 SetVisible = 5,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 @@ -95,7 +91,7 @@ Name = Example anim SetY = 0,252 SetZ = 0,31 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,7 @@ -103,7 +99,7 @@ Name = Example anim SetY = 2,206 SetZ = 2,31 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 3,9 @@ -111,7 +107,7 @@ Name = Example anim SetY = 3,241 SetZ = 3,28 SetVisible = 4,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,9 @@ -138,7 +134,7 @@ Name = Example anim SetFrame = 12,9 SetX = 12,198 SetY = 12,28 - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,8 @@ -146,7 +142,7 @@ Name = Example anim SetY = 4,220 SetZ = 4,32 SetVisible = 5,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 5,9 @@ -154,7 +150,7 @@ Name = Example anim SetY = 5,69 SetZ = 5,28 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 6,8 @@ -162,7 +158,7 @@ Name = Example anim SetY = 6,226 SetZ = 6,29 SetVisible = 7,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 @@ -185,7 +181,7 @@ Name = Example anim SetFrame = 12,8 SetX = 12,230 SetY = 12,142 - + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 @@ -195,7 +191,7 @@ Name = Example anim SetX = 7,296 SetY = 7,172 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 8,8 @@ -205,7 +201,7 @@ Name = Example anim SetX = 9,163 SetY = 9,99 SetVisible = 10,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 8,9 @@ -218,7 +214,7 @@ Name = Example anim SetX = 10,444 SetY = 10,89 SetVisible = 11,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,9 @@ -233,7 +229,7 @@ Name = Example anim SetY = 11,246 SetX = 12,167 SetY = 12,237 - + Graphic = Examples/weather Focus = Foreground SetFrame = 11,8 @@ -241,7 +237,7 @@ Name = Example anim SetY = 11,119 SetZ = 11,28 SetVisible = 12,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 11,7 @@ -251,7 +247,7 @@ Name = Example anim SetFrame = 12,9 SetX = 12,41 SetY = 12,229 - + Graphic = Examples/weather Focus = Foreground SetFrame = 11,9 @@ -259,14 +255,14 @@ Name = Example anim SetY = 11,47 SetZ = 11,34 SetVisible = 12,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 12,8 SetX = 12,474 SetY = 12,59 SetZ = 12,29 - + Graphic = Examples/weather Focus = Foreground SetFrame = 12,9 diff --git a/PBS/Animations/Example anims/Common/HealthDown.txt b/PBS/Animations/Example anims/Common/HealthDown.txt index 9b76daf90..6599a4d9b 100644 --- a/PBS/Animations/Example anims/Common/HealthDown.txt +++ b/PBS/Animations/Example anims/Common/HealthDown.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,HealthDown] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,-50 SetY = 0,-53 @@ -34,9 +32,9 @@ Name = Example anim SetX = 9,25 SetY = 9,92 SetVisible = 10,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,35 SetY = 0,-52 @@ -56,9 +54,9 @@ Name = Example anim SetX = 7,-41 SetY = 7,62 SetVisible = 8,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,22 SetY = 0,-29 @@ -69,9 +67,9 @@ Name = Example anim SetToneBlue = 0,-128 SetX = 1,-16 SetVisible = 2,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 1,5 SetX = 1,35 SetY = 1,-32 @@ -92,9 +90,9 @@ Name = Example anim SetX = 8,-41 SetY = 8,82 SetVisible = 9,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 1,5 SetX = 1,22 SetY = 1,-9 @@ -116,9 +114,9 @@ Name = Example anim SetX = 8,25 SetY = 8,72 SetVisible = 9,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,-16 SetY = 2,-9 @@ -136,9 +134,9 @@ Name = Example anim SetY = 7,52 SetOpacity = 7,126 SetVisible = 8,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,-1 SetY = 2,-57 @@ -152,9 +150,9 @@ Name = Example anim SetY = 5,3 SetY = 6,23 SetVisible = 7,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,-41 SetY = 2,-38 @@ -164,9 +162,9 @@ Name = Example anim SetToneGreen = 2,64 SetToneBlue = 2,-128 SetVisible = 3,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 3,5 SetX = 3,-41 SetY = 3,-18 @@ -179,9 +177,9 @@ Name = Example anim SetY = 5,22 SetY = 6,42 SetVisible = 7,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 3,5 SetX = 3,25 SetY = 3,-28 diff --git a/PBS/Animations/Example anims/Common/HealthUp.txt b/PBS/Animations/Example anims/Common/HealthUp.txt index c39ee7470..0c2746e34 100644 --- a/PBS/Animations/Example anims/Common/HealthUp.txt +++ b/PBS/Animations/Example anims/Common/HealthUp.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,HealthUp] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 1,10 SetX = 1,48 SetY = 1,-42 @@ -23,9 +21,9 @@ Name = Example anim SetX = 10,-40 SetY = 10,-26 SetVisible = 11,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 4,10 SetX = 4,-40 SetY = 4,-26 @@ -33,9 +31,9 @@ Name = Example anim SetFrame = 6,8 SetFrame = 8,7 SetVisible = 10,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 0,10 SetX = 0,8 SetY = 0,-2 diff --git a/PBS/Animations/Example anims/Common/Paralysis.txt b/PBS/Animations/Example anims/Common/Paralysis.txt index bcb0f93bc..d57b7e04c 100644 --- a/PBS/Animations/Example anims/Common/Paralysis.txt +++ b/PBS/Animations/Example anims/Common/Paralysis.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Paralysis] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Struggle - Focus = Target + Focus = User SetFrame = 1,1 SetX = 1,40 SetY = 1,6 @@ -36,9 +34,9 @@ Name = Example anim SetFrame = 11,1 SetX = 11,24 SetY = 11,14 - + Graphic = Examples/Struggle - Focus = Target + Focus = User SetX = 1,-48 SetY = 1,-2 SetZ = 1,27 diff --git a/PBS/Animations/Example anims/Common/Poison.txt b/PBS/Animations/Example anims/Common/Poison.txt index 830d75989..c4583c30a 100644 --- a/PBS/Animations/Example anims/Common/Poison.txt +++ b/PBS/Animations/Example anims/Common/Poison.txt @@ -2,18 +2,18 @@ #------------------------------- [Common,Poison] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/State1 - Focus = Target + Focus = User SetX = 1,0 SetY = 1,-10 SetZ = 1,27 + SetZoomX = 1,200 + SetZoomY = 1,200 SetFrame = 2,1 SetFrame = 3,2 SetFrame = 4,3 diff --git a/PBS/Animations/Example anims/Common/Rain.txt b/PBS/Animations/Example anims/Common/Rain.txt index 16d1592ed..24c12457f 100644 --- a/PBS/Animations/Example anims/Common/Rain.txt +++ b/PBS/Animations/Example anims/Common/Rain.txt @@ -2,13 +2,9 @@ #------------------------------- [Common,Rain] Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - +NoUser = true +NoTarget = true + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -32,7 +28,7 @@ Name = Example anim SetY = 8,218 SetX = 9,99 SetY = 9,55 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -57,7 +53,7 @@ Name = Example anim SetY = 8,251 SetX = 9,253 SetY = 9,148 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -82,7 +78,7 @@ Name = Example anim SetY = 8,110 SetX = 9,254 SetY = 9,274 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -107,7 +103,7 @@ Name = Example anim SetY = 8,59 SetX = 9,418 SetY = 9,243 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -132,7 +128,7 @@ Name = Example anim SetY = 8,204 SetX = 9,181 SetY = 9,238 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -157,7 +153,7 @@ Name = Example anim SetY = 8,63 SetX = 9,108 SetY = 9,245 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -182,7 +178,7 @@ Name = Example anim SetY = 8,173 SetX = 9,25 SetY = 9,205 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -207,7 +203,7 @@ Name = Example anim SetY = 8,144 SetX = 9,148 SetY = 9,25 - + Graphic = Examples/weather Focus = Foreground SetFrame = 1,2 @@ -223,7 +219,7 @@ Name = Example anim SetX = 5,422 SetY = 5,252 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,2 @@ -237,7 +233,7 @@ Name = Example anim SetX = 5,319 SetY = 5,241 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,2 @@ -245,7 +241,7 @@ Name = Example anim SetY = 4,203 SetZ = 4,37 SetVisible = 5,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 @@ -253,7 +249,7 @@ Name = Example anim SetY = 7,126 SetZ = 7,35 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 @@ -261,7 +257,7 @@ Name = Example anim SetY = 7,237 SetZ = 7,36 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 @@ -269,28 +265,28 @@ Name = Example anim SetY = 7,194 SetZ = 7,37 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,247 SetY = 9,72 SetZ = 9,35 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,365 SetY = 9,42 SetZ = 9,36 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,479 SetY = 9,180 SetZ = 9,37 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 diff --git a/PBS/Animations/Example anims/Common/Sandstorm.txt b/PBS/Animations/Example anims/Common/Sandstorm.txt index 37ab031bd..b823be125 100644 --- a/PBS/Animations/Example anims/Common/Sandstorm.txt +++ b/PBS/Animations/Example anims/Common/Sandstorm.txt @@ -2,13 +2,9 @@ #------------------------------- [Common,Sandstorm] Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - +NoUser = true +NoTarget = true + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -33,7 +29,7 @@ Name = Example anim SetY = 8,62 SetX = 9,32 SetY = 9,252 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -58,7 +54,7 @@ Name = Example anim SetY = 8,85 SetX = 9,119 SetY = 9,175 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -83,7 +79,7 @@ Name = Example anim SetY = 8,223 SetX = 9,143 SetY = 9,267 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -108,7 +104,7 @@ Name = Example anim SetY = 8,207 SetX = 9,222 SetY = 9,197 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -133,7 +129,7 @@ Name = Example anim SetY = 8,253 SetX = 9,162 SetY = 9,82 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -158,7 +154,7 @@ Name = Example anim SetY = 8,227 SetX = 9,49 SetY = 9,61 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -183,7 +179,7 @@ Name = Example anim SetY = 8,76 SetX = 9,21 SetY = 9,158 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -208,7 +204,7 @@ Name = Example anim SetY = 8,130 SetX = 9,350 SetY = 9,240 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -233,7 +229,7 @@ Name = Example anim SetY = 8,142 SetX = 9,481 SetY = 9,206 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -258,7 +254,7 @@ Name = Example anim SetY = 8,22 SetX = 9,456 SetY = 9,64 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -266,7 +262,7 @@ Name = Example anim SetY = 0,32 SetZ = 0,37 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -274,7 +270,7 @@ Name = Example anim SetY = 0,135 SetZ = 0,38 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -282,7 +278,7 @@ Name = Example anim SetY = 0,18 SetZ = 0,39 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -290,7 +286,7 @@ Name = Example anim SetY = 0,9 SetZ = 0,40 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -298,7 +294,7 @@ Name = Example anim SetY = 2,32 SetZ = 2,37 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -306,7 +302,7 @@ Name = Example anim SetY = 2,135 SetZ = 2,38 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -314,7 +310,7 @@ Name = Example anim SetY = 2,18 SetZ = 2,39 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -322,7 +318,7 @@ Name = Example anim SetY = 2,9 SetZ = 2,40 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 @@ -332,7 +328,7 @@ Name = Example anim SetX = 5,487 SetY = 5,32 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 @@ -342,7 +338,7 @@ Name = Example anim SetX = 5,492 SetY = 5,135 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 @@ -350,7 +346,7 @@ Name = Example anim SetY = 5,18 SetZ = 5,39 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 @@ -358,7 +354,7 @@ Name = Example anim SetY = 5,9 SetZ = 5,40 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -366,7 +362,7 @@ Name = Example anim SetY = 7,32 SetZ = 7,37 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -374,7 +370,7 @@ Name = Example anim SetY = 7,135 SetZ = 7,38 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -382,7 +378,7 @@ Name = Example anim SetY = 7,18 SetZ = 7,39 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -390,21 +386,21 @@ Name = Example anim SetY = 7,9 SetZ = 7,40 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,311 SetY = 9,55 SetZ = 9,37 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,328 SetY = 9,146 SetZ = 9,38 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 diff --git a/PBS/Animations/Example anims/Common/Shadow.txt b/PBS/Animations/Example anims/Common/Shadow.txt index 08d018e79..d640abfe7 100644 --- a/PBS/Animations/Example anims/Common/Shadow.txt +++ b/PBS/Animations/Example anims/Common/Shadow.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Shadow] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,56 SetY = 2,30 @@ -28,9 +26,9 @@ Name = Example anim SetX = 9,32 SetY = 9,22 SetVisible = 10,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 3,5 SetX = 3,-88 SetY = 3,-10 @@ -45,9 +43,9 @@ Name = Example anim SetX = 8,32 SetY = 8,22 SetVisible = 9,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 5,5 SetX = 5,32 SetY = 5,-42 @@ -57,9 +55,9 @@ Name = Example anim SetX = 7,32 SetY = 7,22 SetVisible = 8,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,-24 SetY = 0,14 diff --git a/PBS/Animations/Example anims/Common/ShadowSky.txt b/PBS/Animations/Example anims/Common/ShadowSky.txt index a323eac69..b5feba8a8 100644 --- a/PBS/Animations/Example anims/Common/ShadowSky.txt +++ b/PBS/Animations/Example anims/Common/ShadowSky.txt @@ -2,23 +2,15 @@ #------------------------------- [Common,ShadowSky] Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/weather +NoUser = true +NoTarget = true + + Graphic = Examples/shadow sky Focus = Foreground - SetFrame = 0,10 - SetX = 0,258 - SetY = 0,132 - SetZ = 0,27 - SetZoomX = 0,327 - SetZoomY = 0,242 - SetOpacity = 0,128 - SetOpacity = 1,192 - SetOpacity = 2,249 - SetOpacity = 8,192 - SetOpacity = 9,128 + SetOpacity = 0,0 + MoveOpacity = 0,5,255, + SetOpacity = 5,255 + SetOpacity = 15,255 + MoveOpacity = 15,5,0, + SetOpacity = 20,0 + diff --git a/PBS/Animations/Example anims/Common/Shiny.txt b/PBS/Animations/Example anims/Common/Shiny.txt index 39b08ade5..91c66bef3 100644 --- a/PBS/Animations/Example anims/Common/Shiny.txt +++ b/PBS/Animations/Example anims/Common/Shiny.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Shiny] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,56 SetY = 2,30 @@ -28,9 +26,9 @@ Name = Example anim SetX = 9,32 SetY = 9,22 SetVisible = 10,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 3,5 SetX = 3,-57 SetY = 3,-18 @@ -45,9 +43,9 @@ Name = Example anim SetX = 8,32 SetY = 8,22 SetVisible = 9,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 5,5 SetX = 5,32 SetY = 5,-42 @@ -57,9 +55,9 @@ Name = Example anim SetX = 7,32 SetY = 7,22 SetVisible = 8,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,-24 SetY = 0,14 diff --git a/PBS/Animations/Example anims/Common/Sleep.txt b/PBS/Animations/Example anims/Common/Sleep.txt index 5cf8d6488..f3f6d956e 100644 --- a/PBS/Animations/Example anims/Common/Sleep.txt +++ b/PBS/Animations/Example anims/Common/Sleep.txt @@ -2,15 +2,55 @@ #------------------------------- [Common,Sleep] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 Graphic = Examples/028-State01 - Focus = Target + Focus = User + SetFrame = 1,8 + SetX = 1,24 + SetY = 1,-18 + SetZ = 1,27 + SetZoomX = 1,50 + SetZoomY = 1,50 + MoveX = 1,4,52 + MoveY = 1,4,-67 + SetX = 5,52 + SetY = 5,-67 + SetVisible = 5,false + SetX = 6,-41 + SetY = 6,-17 + SetVisible = 6,true + MoveX = 6,4,-75 + MoveY = 6,4,-71 + SetX = 10,-75 + SetY = 10,-71 + SetVisible = 11,false + + Graphic = Examples/028-State01 + Focus = User + SetFrame = 5,8 + SetX = 5,-14 + SetY = 5,-32 + SetZ = 5,29 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetVisible = 6,false + + Graphic = Examples/028-State01 + Focus = User + SetFrame = 7,8 + SetX = 7,40 + SetY = 7,-10 + SetZ = 7,29 + SetZoomX = 7,50 + SetZoomY = 7,50 + SetVisible = 8,false + + Graphic = Examples/028-State01 + Focus = User SetFrame = 3,8 SetX = 3,40 SetY = 3,-42 @@ -33,59 +73,5 @@ Name = Example anim SetY = 10,-58 SetX = 11,79 SetY = 11,-76 - - Graphic = Examples/028-State01 - Focus = Target - SetFrame = 4,8 - SetX = 4,47 - SetY = 4,-55 - SetZ = 4,27 - SetZoomX = 4,50 - SetZoomY = 4,50 - SetX = 5,52 - SetY = 5,-67 - SetX = 6,-41 - SetY = 6,-17 - SetX = 7,-50 - SetY = 7,-30 - SetX = 8,-59 - SetY = 8,-43 - SetX = 9,-67 - SetY = 9,-57 - SetX = 10,-75 - SetY = 10,-71 - SetVisible = 11,false - - Graphic = Examples/028-State01 - Focus = Target - SetFrame = 5,8 - SetX = 5,-14 - SetY = 5,-32 - SetZ = 5,29 - SetZoomX = 5,50 - SetZoomY = 5,50 - SetVisible = 6,false - - Graphic = Examples/028-State01 - Focus = Target - SetFrame = 7,8 - SetX = 7,40 - SetY = 7,-10 - SetZ = 7,29 - SetZoomX = 7,50 - SetZoomY = 7,50 - SetVisible = 8,false - - Graphic = Examples/028-State01 - Focus = Target - SetFrame = 1,8 - SetX = 1,24 - SetY = 1,-18 - SetZ = 1,27 - SetZoomX = 1,50 - SetZoomY = 1,50 - SetX = 2,32 - SetY = 2,-29 - SetVisible = 3,false Play = 0,Sleep,80 diff --git a/PBS/Animations/Example anims/Common/StatDown.txt b/PBS/Animations/Example anims/Common/StatDown.txt index 3a5c97b0d..f636b70d8 100644 --- a/PBS/Animations/Example anims/Common/StatDown.txt +++ b/PBS/Animations/Example anims/Common/StatDown.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,StatDown] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,-50 SetY = 0,-53 @@ -31,9 +29,9 @@ Name = Example anim SetX = 9,25 SetY = 9,92 SetVisible = 10,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,35 SetY = 0,-52 @@ -50,9 +48,9 @@ Name = Example anim SetX = 7,-41 SetY = 7,62 SetVisible = 8,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,22 SetY = 0,-29 @@ -60,9 +58,9 @@ Name = Example anim SetOpacity = 0,126 SetX = 1,-16 SetVisible = 2,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 1,5 SetX = 1,35 SetY = 1,-32 @@ -80,9 +78,9 @@ Name = Example anim SetX = 8,-41 SetY = 8,82 SetVisible = 9,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 1,5 SetX = 1,22 SetY = 1,-9 @@ -101,9 +99,9 @@ Name = Example anim SetX = 8,25 SetY = 8,72 SetVisible = 9,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,-16 SetY = 2,-9 @@ -118,9 +116,9 @@ Name = Example anim SetY = 7,52 SetOpacity = 7,126 SetVisible = 8,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,-1 SetY = 2,-57 @@ -131,18 +129,18 @@ Name = Example anim SetY = 5,3 SetY = 6,23 SetVisible = 7,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,-41 SetY = 2,-38 SetZ = 2,35 SetOpacity = 2,126 SetVisible = 3,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 3,5 SetX = 3,-41 SetY = 3,-18 @@ -152,9 +150,9 @@ Name = Example anim SetY = 5,22 SetY = 6,42 SetVisible = 7,false - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 3,5 SetX = 3,25 SetY = 3,-28 diff --git a/PBS/Animations/Example anims/Common/StatUp.txt b/PBS/Animations/Example anims/Common/StatUp.txt index 5628f05fd..722e6df3a 100644 --- a/PBS/Animations/Example anims/Common/StatUp.txt +++ b/PBS/Animations/Example anims/Common/StatUp.txt @@ -2,34 +2,13 @@ #------------------------------- [Common,StatUp] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 Graphic = Examples/! - Focus = Target - SetFrame = 0,6 - SetX = 0,-41 - SetY = 0,138 - SetZ = 0,27 - SetOpacity = 0,126 - SetY = 1,114 - SetY = 2,82 - SetY = 3,50 - SetY = 4,18 - SetY = 5,-14 - SetY = 6,-34 - SetY = 7,-54 - SetY = 8,-74 - SetOpacity = 8,63 - SetY = 9,-94 - SetOpacity = 9,0 - - Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,6 SetX = 0,7 SetY = 0,106 @@ -46,9 +25,9 @@ Name = Example anim SetOpacity = 8,63 SetY = 9,-142 SetOpacity = 9,0 - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 0,6 SetX = 0,55 SetY = 0,138 @@ -67,9 +46,9 @@ Name = Example anim SetOpacity = 8,63 SetY = 9,-94 SetOpacity = 9,0 - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 2,6 SetX = 2,-9 SetY = 2,138 @@ -84,9 +63,9 @@ Name = Example anim SetOpacity = 8,63 SetY = 9,-38 SetOpacity = 9,0 - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 3,6 SetX = 3,39 SetY = 3,138 @@ -100,9 +79,9 @@ Name = Example anim SetOpacity = 8,63 SetY = 9,-6 SetOpacity = 9,0 - + Graphic = Examples/! - Focus = Target + Focus = User SetFrame = 5,6 SetX = 5,-25 SetY = 5,138 @@ -113,5 +92,24 @@ Name = Example anim SetOpacity = 8,63 SetY = 9,58 SetOpacity = 9,0 + + Graphic = Examples/! + Focus = User + SetFrame = 0,6 + SetX = 0,-41 + SetY = 0,138 + SetZ = 0,27 + SetOpacity = 0,126 + SetY = 1,114 + SetY = 2,82 + SetY = 3,50 + SetY = 4,18 + SetY = 5,-14 + SetY = 6,-34 + SetY = 7,-54 + SetY = 8,-74 + SetOpacity = 8,63 + SetY = 9,-94 + SetOpacity = 9,0 Play = 0,increase diff --git a/PBS/Animations/Example anims/Common/Sun.txt b/PBS/Animations/Example anims/Common/Sun.txt index 5436488da..671f69946 100644 --- a/PBS/Animations/Example anims/Common/Sun.txt +++ b/PBS/Animations/Example anims/Common/Sun.txt @@ -2,40 +2,27 @@ #------------------------------- [Common,Sun] Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - +NoUser = true +NoTarget = true + Graphic = Examples/weather Focus = Foreground SetX = 0,64 SetY = 0,64 - SetZ = 0,28 - SetOpacity = 0,64 - SetX = 1,72 - SetY = 1,72 - SetOpacity = 1,128 - SetX = 2,80 - SetY = 2,80 - SetOpacity = 2,192 - SetX = 3,88 - SetY = 3,88 - SetOpacity = 3,224 + SetOpacity = 0,0 + MoveX = 0,4,94 + MoveY = 0,4,94 + MoveOpacity = 0,5,255 SetX = 4,94 SetY = 4,94 - SetOpacity = 4,255 - SetX = 12,88 - SetY = 12,88 - SetOpacity = 12,224 - SetX = 13,80 - SetY = 13,80 - SetOpacity = 13,192 - SetX = 14,72 - SetY = 14,72 - SetOpacity = 14,128 + SetOpacity = 5,255 + SetOpacity = 10,255 + MoveOpacity = 10,5,0 + SetX = 11,94 + SetY = 11,94 + MoveX = 11,4,64 + MoveY = 11,4,64 SetX = 15,64 SetY = 15,64 - SetOpacity = 15,64 + SetOpacity = 15,0 + diff --git a/PBS/Animations/Example anims/Common/SuperShiny.txt b/PBS/Animations/Example anims/Common/SuperShiny.txt index 6d8d76e64..751d2a327 100644 --- a/PBS/Animations/Example anims/Common/SuperShiny.txt +++ b/PBS/Animations/Example anims/Common/SuperShiny.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,SuperShiny] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 2,5 SetX = 2,56 SetY = 2,30 @@ -28,9 +26,9 @@ Name = Example anim SetX = 9,32 SetY = 9,22 SetVisible = 10,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 3,5 SetX = 3,-57 SetY = 3,-18 @@ -45,9 +43,9 @@ Name = Example anim SetX = 8,32 SetY = 8,22 SetVisible = 9,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 5,5 SetX = 5,32 SetY = 5,-42 @@ -57,9 +55,9 @@ Name = Example anim SetX = 7,32 SetY = 7,22 SetVisible = 8,false - + Graphic = Examples/leech-seed - Focus = Target + Focus = User SetFrame = 0,5 SetX = 0,-24 SetY = 0,14 diff --git a/PBS/Animations/Example anims/Common/Toxic.txt b/PBS/Animations/Example anims/Common/Toxic.txt index 1fbba8aa9..ce67b7dee 100644 --- a/PBS/Animations/Example anims/Common/Toxic.txt +++ b/PBS/Animations/Example anims/Common/Toxic.txt @@ -2,30 +2,17 @@ #------------------------------- [Common,Toxic] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/State1 - Focus = Target - SetX = 1,0 - SetY = 1,-10 - SetZ = 1,27 - SetFrame = 2,1 - SetFrame = 3,2 - SetFrame = 4,3 - SetFrame = 5,4 - SetFrame = 6,5 - SetFrame = 7,6 - SetFrame = 8,7 - SetFrame = 9,8 - SetFrame = 10,9 - SetFrame = 11,10 - SetFrame = 12,11 - SetFrame = 13,12 - SetFrame = 14,13 + Focus = User + SetFrame = 1,0 + SetZoomX = 1,200 + SetZoomY = 1,200 + MoveFrame = 1,14,14 + SetFrame = 15,14 Play = 0,Poison,80,80 diff --git a/PBS/Animations/Example anims/Common/Wrap.txt b/PBS/Animations/Example anims/Common/Wrap.txt index a1abc7497..4f2b058ee 100644 --- a/PBS/Animations/Example anims/Common/Wrap.txt +++ b/PBS/Animations/Example anims/Common/Wrap.txt @@ -2,15 +2,13 @@ #------------------------------- [Common,Wrap] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Struggle - Focus = Target + Focus = User SetFrame = 0,1 SetX = 0,56 SetY = 0,6 @@ -26,9 +24,9 @@ Name = Example anim SetX = 6,112 SetY = 6,6 SetX = 7,96 - + Graphic = Examples/Struggle - Focus = Target + Focus = User SetX = 0,-64 SetY = 0,6 SetZ = 0,27 diff --git a/PBS/Animations/Example anims/Move/ACIDARMOR.txt b/PBS/Animations/Example anims/Move/ACIDARMOR.txt index 3db55072f..b598f4b26 100644 --- a/PBS/Animations/Example anims/Move/ACIDARMOR.txt +++ b/PBS/Animations/Example anims/Move/ACIDARMOR.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,ACIDARMOR] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/poison3 - Focus = Target + Focus = User SetFrame = 0,1 SetX = 0,8 SetY = 0,-2 diff --git a/PBS/Animations/Example anims/Move/ACROBATICS.txt b/PBS/Animations/Example anims/Move/ACROBATICS.txt index 2c336a885..64d194e24 100644 --- a/PBS/Animations/Example anims/Move/ACROBATICS.txt +++ b/PBS/Animations/Example anims/Move/ACROBATICS.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 2,12 SetX = 2,-8 @@ -26,7 +26,7 @@ Name = Example anim SetZoomX = 6,84 SetZoomY = 6,84 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 0,13 SetX = 0,8 diff --git a/PBS/Animations/Example anims/Move/ACUPRESSURE.txt b/PBS/Animations/Example anims/Move/ACUPRESSURE.txt index 3b66c323e..85305dbfc 100644 --- a/PBS/Animations/Example anims/Move/ACUPRESSURE.txt +++ b/PBS/Animations/Example anims/Move/ACUPRESSURE.txt @@ -12,23 +12,25 @@ Name = Example anim Graphic = Examples/mixed status Focus = Target SetFrame = 0,13 - SetX = 0,15 - SetY = 0,-3 + SetX = 0,25 + SetY = 0,-60 SetZ = 0,27 - SetX = 1,13 - SetY = 1,-2 - SetX = 2,11 - SetX = 3,10 - SetY = 3,0 - SetY = 4,-3 - SetX = 5,13 - SetY = 5,-2 - SetX = 6,9 - SetY = 6,-4 - SetX = 7,11 - SetY = 7,-1 - SetX = 8,9 - SetY = 8,-4 + SetZoomX = 0,200 + SetZoomY = 0,200 + SetX = 1,23 + SetY = 1,-62 + SetX = 2,21 + SetX = 3,20 + SetY = 3,-60 + SetY = 4,-63 + SetX = 5,23 + SetY = 5,-62 + SetX = 6,19 + SetY = 6,-64 + SetX = 7,21 + SetY = 7,-61 + SetX = 8,19 + SetY = 8,-64 SetVisible = 9,false Graphic = Examples/mixed status diff --git a/PBS/Animations/Example anims/Move/AERIALACE.txt b/PBS/Animations/Example anims/Move/AERIALACE.txt index c09af01f3..952456b1c 100644 --- a/PBS/Animations/Example anims/Move/AERIALACE.txt +++ b/PBS/Animations/Example anims/Move/AERIALACE.txt @@ -273,11 +273,7 @@ Name = Example anim [OppMove,AERIALACE] Name = Example anim - SetX = 0,0 - SetY = 0,0 - SetX = 0,0 - SetY = 0,0 SetOpacity = 1,170 SetOpacity = 2,85 SetOpacity = 3,0 diff --git a/PBS/Animations/Example anims/Move/AGILITY.txt b/PBS/Animations/Example anims/Move/AGILITY.txt index a84b0b1e5..13b74a245 100644 --- a/PBS/Animations/Example anims/Move/AGILITY.txt +++ b/PBS/Animations/Example anims/Move/AGILITY.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,AGILITY] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/! Focus = User SetFrame = 0,5 @@ -25,7 +23,7 @@ Name = Example anim SetX = 7,82 SetX = 8,107 SetX = 9,132 - + Graphic = Examples/! Focus = User SetFrame = 0,5 @@ -41,7 +39,7 @@ Name = Example anim SetX = 6,152 SetX = 7,187 SetVisible = 8,false - + Graphic = Examples/! Focus = User SetFrame = 1,5 @@ -57,7 +55,7 @@ Name = Example anim SetX = 7,62 SetX = 8,87 SetX = 9,112 - + Graphic = Examples/! Focus = User SetFrame = 2,5 @@ -72,7 +70,7 @@ Name = Example anim SetX = 7,77 SetX = 8,112 SetX = 9,147 - + Graphic = Examples/! Focus = User SetFrame = 0,5 diff --git a/PBS/Animations/Example anims/Move/ALLYSWITCH.txt b/PBS/Animations/Example anims/Move/ALLYSWITCH.txt index 8cc0e053f..1c577cf6a 100644 --- a/PBS/Animations/Example anims/Move/ALLYSWITCH.txt +++ b/PBS/Animations/Example anims/Move/ALLYSWITCH.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,ALLYSWITCH] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/anim sheet Focus = User SetFrame = 0,10 diff --git a/PBS/Animations/Example anims/Move/AMNESIA.txt b/PBS/Animations/Example anims/Move/AMNESIA.txt index 8e1185c09..1deb700cd 100644 --- a/PBS/Animations/Example anims/Move/AMNESIA.txt +++ b/PBS/Animations/Example anims/Move/AMNESIA.txt @@ -2,23 +2,23 @@ #------------------------------- [Move,AMNESIA] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/mixed - Focus = Target + Focus = User SetFrame = 0,3 SetX = 0,44 SetY = 0,-16 - SetZ = 0,27 - SetOpacity = 0,200 - SetOpacity = 1,220 - SetOpacity = 2,250 - SetOpacity = 3,255 - SetVisible = 7,false + SetZoomX = 0,200 + SetZoomY = 0,200 + SetOpacity = 0,0 + MoveOpacity = 0,4,255 + SetOpacity = 4,255 + SetOpacity = 10,255 + MoveOpacity = 10,4,0 + SetOpacity = 14,0 Play = 0,Yawn diff --git a/PBS/Animations/Example anims/Move/AQUARING.txt b/PBS/Animations/Example anims/Move/AQUARING.txt index 0f205f408..64b71d41f 100644 --- a/PBS/Animations/Example anims/Move/AQUARING.txt +++ b/PBS/Animations/Example anims/Move/AQUARING.txt @@ -2,75 +2,73 @@ #------------------------------- [Move,AQUARING] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/fly copy - Focus = UserAndTarget - SetX = 2,203 - SetY = 2,-181 - SetZ = 2,28 - SetFrame = 3,9 - SetX = 3,202 - SetY = 3,-193 - SetFrame = 4,8 - SetX = 4,187 - SetY = 4,-200 - SetX = 5,197 - SetY = 5,-204 - - Graphic = Examples/fly copy - Focus = UserAndTarget - SetX = 3,209 - SetY = 3,-176 - SetZ = 3,29 - SetFrame = 4,7 - SetX = 4,192 - SetY = 4,-198 - SetX = 5,201 - SetY = 5,-206 - - Graphic = Examples/fly copy - Focus = UserAndTarget - SetFrame = 4,5 - SetX = 4,196 - SetY = 4,-203 - SetZ = 4,30 - SetVisible = 5,false - - Graphic = Examples/fly copy - Focus = UserAndTarget - SetX = 4,201 - SetY = 4,-187 - SetZ = 4,31 - SetVisible = 5,false Graphic = Examples/fly copy - Focus = UserAndTarget - SetX = 0,207 - SetY = 0,-185 + Focus = User + SetX = 2,5 + SetY = 2,12 + SetZ = 2,28 + SetFrame = 3,9 + SetX = 3,3 + SetY = 3,4 + SetFrame = 4,8 + SetX = 4,-16 + SetY = 4,0 + SetX = 5,-3 + SetY = 5,-3 + + Graphic = Examples/fly copy + Focus = User + SetX = 3,12 + SetY = 3,15 + SetZ = 3,29 + SetFrame = 4,7 + SetX = 4,-10 + SetY = 4,1 + SetX = 5,2 + SetY = 5,-4 + + Graphic = Examples/fly copy + Focus = User + SetFrame = 4,5 + SetX = 4,-4 + SetY = 4,-2 + SetZ = 4,30 + SetVisible = 5,false + + Graphic = Examples/fly copy + Focus = User + SetX = 4,2 + SetY = 4,8 + SetZ = 4,31 + SetVisible = 5,false + + Graphic = Examples/fly copy + Focus = User + SetX = 0,10 + SetY = 0,9 SetZ = 0,27 - SetX = 1,208 - SetY = 1,-182 + SetX = 1,11 + SetY = 1,11 SetFrame = 2,5 - SetX = 2,203 - SetY = 2,-203 + SetX = 2,4 + SetY = 2,-2 SetZoomX = 2,110 SetZoomY = 2,110 SetFrame = 3,8 - SetX = 3,196 - SetY = 3,-196 + SetX = 3,-5 + SetY = 3,2 SetZoomX = 3,100 SetZoomY = 3,100 SetFrame = 4,9 - SetX = 4,198 - SetY = 4,-193 + SetX = 4,-2 + SetY = 4,4 SetFrame = 5,0 - SetX = 5,207 - SetY = 5,-187 + SetX = 5,10 + SetY = 5,8 Play = 0,Weatherball,80 diff --git a/PBS/Animations/Example anims/Move/BARRIER.txt b/PBS/Animations/Example anims/Move/BARRIER.txt index c762f5d0c..7a1ac3a17 100644 --- a/PBS/Animations/Example anims/Move/BARRIER.txt +++ b/PBS/Animations/Example anims/Move/BARRIER.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,BARRIER] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 1,7 SetX = 1,-28 SetY = 1,-31 @@ -37,9 +35,9 @@ Name = Example anim SetY = 8,-7 SetFrame = 9,7 SetX = 9,-17 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 0,15 SetX = 0,8 SetY = 0,-1 diff --git a/PBS/Animations/Example anims/Move/BLUEFLARE.txt b/PBS/Animations/Example anims/Move/BLUEFLARE.txt index 6d5d3df2c..0322f34d3 100644 --- a/PBS/Animations/Example anims/Move/BLUEFLARE.txt +++ b/PBS/Animations/Example anims/Move/BLUEFLARE.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/anim sheet.2 + Graphic = Examples/anim sheet 2 Focus = Target SetFrame = 4,13 SetX = 4,6 @@ -22,7 +22,7 @@ Name = Example anim SetX = 6,8 SetVisible = 7,false - Graphic = Examples/anim sheet.2 + Graphic = Examples/anim sheet 2 Focus = Target SetFrame = 8,16 SetX = 8,0 @@ -37,7 +37,7 @@ Name = Example anim SetX = 11,1 SetY = 11,-4 - Graphic = Examples/anim sheet.2 + Graphic = Examples/anim sheet 2 Focus = Target SetFrame = 0,10 SetX = 0,-2 diff --git a/PBS/Animations/Example anims/Move/BULKUP.txt b/PBS/Animations/Example anims/Move/BULKUP.txt index 4027b4b24..62ed90892 100644 --- a/PBS/Animations/Example anims/Move/BULKUP.txt +++ b/PBS/Animations/Example anims/Move/BULKUP.txt @@ -2,30 +2,13 @@ #------------------------------- [Move,BULKUP] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 Graphic = Examples/animsheet - Focus = Target - SetFrame = 0,15 - SetX = 0,80 - SetY = 0,6 - SetZ = 0,27 - SetOpacity = 0,200 - SetY = 1,-2 - SetOpacity = 1,150 - SetY = 2,-10 - SetOpacity = 2,100 - SetY = 3,-18 - SetOpacity = 3,50 - SetVisible = 4,false - - Graphic = Examples/animsheet - Focus = Target + Focus = User SetFrame = 0,15 SetX = 0,-40 SetY = 0,6 @@ -38,9 +21,9 @@ Name = Example anim SetY = 3,-18 SetOpacity = 3,50 SetVisible = 4,false - + Graphic = Examples/animsheet - Focus = Target + Focus = User SetFrame = 6,15 SetX = 6,80 SetY = 6,6 @@ -53,9 +36,9 @@ Name = Example anim SetY = 9,-18 SetOpacity = 9,50 SetVisible = 10,false - + Graphic = Examples/animsheet - Focus = Target + Focus = User SetFrame = 6,15 SetX = 6,-40 SetY = 6,6 @@ -68,9 +51,9 @@ Name = Example anim SetY = 9,-18 SetOpacity = 9,50 SetVisible = 10,false - + Graphic = Examples/animsheet - Focus = Target + Focus = User SetFrame = 12,15 SetX = 12,80 SetY = 12,6 @@ -83,9 +66,9 @@ Name = Example anim SetY = 15,-18 SetOpacity = 15,50 SetVisible = 16,false - + Graphic = Examples/animsheet - Focus = Target + Focus = User SetFrame = 12,15 SetX = 12,-40 SetY = 12,6 @@ -98,6 +81,21 @@ Name = Example anim SetY = 15,-18 SetOpacity = 15,50 SetVisible = 16,false + + Graphic = Examples/animsheet + Focus = User + SetFrame = 0,15 + SetX = 0,80 + SetY = 0,6 + SetZ = 0,27 + SetOpacity = 0,200 + SetY = 1,-2 + SetOpacity = 1,150 + SetY = 2,-10 + SetOpacity = 2,100 + SetY = 3,-18 + SetOpacity = 3,50 + SetVisible = 4,false Play = 0,fog2,80,150 Play = 6,fog2,80,150 diff --git a/PBS/Animations/Example anims/Move/CHARGE.txt b/PBS/Animations/Example anims/Move/CHARGE.txt index 939970935..90368f69e 100644 --- a/PBS/Animations/Example anims/Move/CHARGE.txt +++ b/PBS/Animations/Example anims/Move/CHARGE.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,CHARGE] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/electric2 Focus = User SetX = 0,200 @@ -40,7 +38,7 @@ Name = Example anim SetY = 10,70 SetFrame = 11,6 SetOpacity = 11,100 - + Graphic = Examples/electric2 Focus = User SetFrame = 1,3 @@ -72,7 +70,7 @@ Name = Example anim SetFrame = 11,3 SetX = 11,104 SetY = 11,-2 - + Graphic = Examples/electric2 Focus = User SetFrame = 3,4 @@ -94,7 +92,7 @@ Name = Example anim SetX = 8,48 SetY = 8,-2 SetVisible = 9,false - + Graphic = Examples/electric2 Focus = User SetX = 4,-200 @@ -111,7 +109,7 @@ Name = Example anim SetX = 8,64 SetY = 8,-50 SetVisible = 9,false - + Graphic = Examples/electric2 Focus = User SetX = 5,216 @@ -126,7 +124,7 @@ Name = Example anim SetX = 8,48 SetY = 8,54 SetVisible = 9,false - + Graphic = Examples/electric2 Focus = User SetFrame = 7,1 @@ -134,7 +132,7 @@ Name = Example anim SetY = 7,62 SetZ = 7,32 SetVisible = 8,false - + Graphic = Examples/electric2 Focus = User SetFrame = 10,4 diff --git a/PBS/Animations/Example anims/Move/CLOSECOMBAT.txt b/PBS/Animations/Example anims/Move/CLOSECOMBAT.txt index a5d4504e6..63860a0cd 100644 --- a/PBS/Animations/Example anims/Move/CLOSECOMBAT.txt +++ b/PBS/Animations/Example anims/Move/CLOSECOMBAT.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 1,7 SetX = 1,-23 @@ -53,7 +53,7 @@ Name = Example anim SetX = 13,18 SetY = 13,1 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 1,9 SetX = 1,-52 @@ -91,7 +91,7 @@ Name = Example anim SetX = 13,4 SetY = 13,7 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 1,11 SetX = 1,-31 @@ -121,7 +121,7 @@ Name = Example anim SetY = 8,27 SetVisible = 9,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 2,9 SetX = 2,33 @@ -148,7 +148,7 @@ Name = Example anim SetY = 7,-9 SetVisible = 8,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 2,9 SetX = 2,-5 @@ -172,7 +172,7 @@ Name = Example anim SetY = 7,-2 SetVisible = 8,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 2,11 SetX = 2,16 @@ -190,7 +190,7 @@ Name = Example anim SetY = 5,14 SetVisible = 6,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 3,7 SetX = 3,29 @@ -203,7 +203,7 @@ Name = Example anim SetY = 5,-1 SetVisible = 6,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 3,7 SetX = 3,-7 @@ -216,7 +216,7 @@ Name = Example anim SetY = 5,7 SetVisible = 6,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 3,11 SetX = 3,15 @@ -224,7 +224,7 @@ Name = Example anim SetZ = 3,36 SetVisible = 4,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 4,10 SetX = 4,-1 @@ -257,7 +257,7 @@ Name = Example anim SetX = 13,-12 SetY = 13,20 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 11,7 SetX = 11,-11 @@ -265,7 +265,7 @@ Name = Example anim SetZ = 11,30 SetVisible = 12,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 11,9 SetX = 11,18 @@ -273,7 +273,7 @@ Name = Example anim SetZ = 11,31 SetVisible = 12,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 11,11 SetX = 11,9 @@ -281,21 +281,21 @@ Name = Example anim SetZ = 11,32 SetVisible = 12,false - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 13,9 SetX = 13,-30 SetY = 13,-27 SetZ = 13,30 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 13,7 SetX = 13,0 SetY = 13,-33 SetZ = 13,31 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 13,11 SetX = 13,-10 diff --git a/PBS/Animations/Example anims/Move/COTTONGUARD.txt b/PBS/Animations/Example anims/Move/COTTONGUARD.txt index b83e4dd50..edfc1d8e3 100644 --- a/PBS/Animations/Example anims/Move/COTTONGUARD.txt +++ b/PBS/Animations/Example anims/Move/COTTONGUARD.txt @@ -2,13 +2,79 @@ #------------------------------- [Move,COTTONGUARD] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 + Graphic = Examples/animsheet + Focus = User + SetFrame = 1,15 + SetX = 1,28 + SetY = 1,34 + SetZ = 1,28 + SetX = 2,38 + SetY = 2,23 + SetX = 3,39 + SetY = 3,19 + SetX = 4,26 + SetY = 4,10 + SetX = 5,37 + SetY = 5,32 + SetX = 6,26 + SetY = 6,-7 + SetVisible = 7,false + + Graphic = Examples/animsheet + Focus = User + SetFrame = 3,15 + SetX = 3,5 + SetY = 3,39 + SetZ = 3,29 + SetX = 4,42 + SetY = 4,35 + SetX = 5,18 + SetY = 5,13 + SetX = 6,13 + SetY = 6,28 + SetVisible = 7,false + + Graphic = Examples/animsheet + Focus = User + SetFrame = 3,15 + SetX = 3,39 + SetY = 3,42 + SetZ = 3,30 + SetX = 4,10 + SetY = 4,45 + SetX = 5,35 + SetY = 5,-10 + SetX = 6,50 + SetY = 6,41 + SetVisible = 7,false + + Graphic = Examples/animsheet + Focus = User + SetFrame = 3,15 + SetX = 3,48 + SetY = 3,-4 + SetZ = 3,31 + SetX = 4,62 + SetY = 4,12 + SetX = 5,52 + SetY = 5,8 + SetX = 6,10 + SetY = 6,45 + SetVisible = 7,false + + Graphic = Examples/animsheet + Focus = User + SetFrame = 4,15 + SetX = 4,1 + SetY = 4,13 + SetZ = 4,32 + SetVisible = 5,false + Graphic = Examples/animsheet Focus = User SetFrame = 0,15 @@ -27,73 +93,5 @@ Name = Example anim SetX = 6,56 SetY = 6,9 SetVisible = 7,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 1,15 - SetX = 1,28 - SetY = 1,34 - SetZ = 1,28 - SetX = 2,38 - SetY = 2,23 - SetX = 3,39 - SetY = 3,19 - SetX = 4,26 - SetY = 4,10 - SetX = 5,37 - SetY = 5,32 - SetX = 6,26 - SetY = 6,-7 - SetVisible = 7,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 3,15 - SetX = 3,5 - SetY = 3,39 - SetZ = 3,29 - SetX = 4,42 - SetY = 4,35 - SetX = 5,18 - SetY = 5,13 - SetX = 6,13 - SetY = 6,28 - SetVisible = 7,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 3,15 - SetX = 3,39 - SetY = 3,42 - SetZ = 3,30 - SetX = 4,10 - SetY = 4,45 - SetX = 5,35 - SetY = 5,-10 - SetX = 6,50 - SetY = 6,41 - SetVisible = 7,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 3,15 - SetX = 3,48 - SetY = 3,-4 - SetZ = 3,31 - SetX = 4,62 - SetY = 4,12 - SetX = 5,52 - SetY = 5,8 - SetX = 6,10 - SetY = 6,45 - SetVisible = 7,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 4,15 - SetX = 4,1 - SetY = 4,13 - SetZ = 4,32 - SetVisible = 5,false Play = 0,Substitute,80 diff --git a/PBS/Animations/Example anims/Move/CURSE.txt b/PBS/Animations/Example anims/Move/CURSE.txt index 71b61f4b0..d0b18ee8c 100644 --- a/PBS/Animations/Example anims/Move/CURSE.txt +++ b/PBS/Animations/Example anims/Move/CURSE.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,CURSE] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetFrame = 0,8 SetX = 0,8 SetY = 0,-82 diff --git a/PBS/Animations/Example anims/Move/DEFENSECURL.txt b/PBS/Animations/Example anims/Move/DEFENSECURL.txt index 35b6d589e..ba564c0dc 100644 --- a/PBS/Animations/Example anims/Move/DEFENSECURL.txt +++ b/PBS/Animations/Example anims/Move/DEFENSECURL.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,DEFENSECURL] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/fly copy Focus = User SetFrame = 0,5 diff --git a/PBS/Animations/Example anims/Move/DETECT.txt b/PBS/Animations/Example anims/Move/DETECT.txt index 2e41ba394..8a31ea93b 100644 --- a/PBS/Animations/Example anims/Move/DETECT.txt +++ b/PBS/Animations/Example anims/Move/DETECT.txt @@ -2,31 +2,29 @@ #------------------------------- [Move,DETECT] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 0,8 - SetX = 0,229 - SetY = 0,-246 + SetX = 0,38 + SetY = 0,-30 SetZ = 0,27 - SetX = 1,230 - SetY = 1,-243 + SetX = 1,39 + SetY = 1,-28 SetFrame = 2,7 - SetX = 2,225 - SetY = 2,-235 - SetX = 3,228 - SetY = 3,-237 + SetX = 2,32 + SetY = 2,-23 + SetX = 3,36 + SetY = 3,-24 SetFrame = 4,6 - SetX = 4,218 - SetY = 4,-234 - SetX = 5,219 - SetY = 5,-228 + SetX = 4,24 + SetY = 4,-22 + SetX = 5,25 + SetY = 5,-18 SetVisible = 6,false Play = 0,Flash2,80,85 diff --git a/PBS/Animations/Example anims/Move/DRAGONDANCE.txt b/PBS/Animations/Example anims/Move/DRAGONDANCE.txt index 6c13c2cc2..93c8b84ab 100644 --- a/PBS/Animations/Example anims/Move/DRAGONDANCE.txt +++ b/PBS/Animations/Example anims/Move/DRAGONDANCE.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,DRAGONDANCE] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/electric1 - Focus = Target + Focus = User SetFrame = 3,9 SetX = 3,8 SetY = 3,-50 @@ -22,9 +20,9 @@ Name = Example anim SetY = 7,-2 SetFrame = 8,10 SetVisible = 9,false - + Graphic = Examples/electric1 - Focus = Target + Focus = User SetFrame = 1,9 SetX = 1,8 SetY = 1,-2 diff --git a/PBS/Animations/Example anims/Move/FINALGAMBIT.txt b/PBS/Animations/Example anims/Move/FINALGAMBIT.txt index 9ae008579..cb6c25af2 100644 --- a/PBS/Animations/Example anims/Move/FINALGAMBIT.txt +++ b/PBS/Animations/Example anims/Move/FINALGAMBIT.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 0,7 SetX = 0,-20 diff --git a/PBS/Animations/Example anims/Move/FIREPLEDGE.txt b/PBS/Animations/Example anims/Move/FIREPLEDGE.txt index 63b7eb266..f7ff5f3ee 100644 --- a/PBS/Animations/Example anims/Move/FIREPLEDGE.txt +++ b/PBS/Animations/Example anims/Move/FIREPLEDGE.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/anim sheet.2 + Graphic = Examples/anim sheet 2 Focus = Target SetFrame = 0,10 SetX = 0,4 diff --git a/PBS/Animations/Example anims/Move/FLAIL.txt b/PBS/Animations/Example anims/Move/FLAIL.txt index ba68ba3bd..655f2c6a7 100644 --- a/PBS/Animations/Example anims/Move/FLAIL.txt +++ b/PBS/Animations/Example anims/Move/FLAIL.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = UserAndTarget SetFrame = 0,7 SetX = 0,176 diff --git a/PBS/Animations/Example anims/Move/FLAMEWHEEL.txt b/PBS/Animations/Example anims/Move/FLAMEWHEEL.txt index 4984e6c76..79ca15b5a 100644 --- a/PBS/Animations/Example anims/Move/FLAMEWHEEL.txt +++ b/PBS/Animations/Example anims/Move/FLAMEWHEEL.txt @@ -204,155 +204,155 @@ Name = Example anim Graphic = Examples/punches Focus = UserAndTarget SetFrame = 0,9 - SetX = 0,210 - SetY = 0,-251 + SetX = 0,-10 + SetY = 0,51 SetZ = 0,27 SetFrame = 8,15 - SetX = 8,8 - SetY = 8,4 + SetX = 8,191 + SetY = 8,-204 SetFrame = 9,14 - SetX = 9,3 - SetY = 9,-12 - SetX = 10,10 - SetY = 10,-10 - SetX = 11,7 - SetY = 11,-1 + SetX = 9,196 + SetY = 9,-187 + SetX = 10,189 + SetY = 10,-189 + SetX = 11,192 + SetY = 11,-198 Graphic = Examples/punches Focus = UserAndTarget SetFrame = 0,9 - SetX = 0,225 - SetY = 0,-232 + SetX = 0,-25 + SetY = 0,32 SetZ = 0,28 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 1,9 - SetX = 1,229 - SetY = 1,-190 + SetX = 1,-29 + SetY = 1,-9 SetZ = 1,29 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 2,9 - SetX = 2,217 - SetY = 2,-162 + SetX = 2,-17 + SetY = 2,-37 SetZ = 2,30 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 3,9 - SetX = 3,196 - SetY = 3,-178 + SetX = 3,3 + SetY = 3,-21 SetZ = 3,31 - SetX = 4,194 - SetY = 4,-175 + SetX = 4,5 + SetY = 4,-25 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 4,9 - SetX = 4,185 - SetY = 4,-206 + SetX = 4,14 + SetY = 4,6 SetZ = 4,32 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 5,9 - SetX = 5,193 - SetY = 5,-239 + SetX = 5,6 + SetY = 5,39 SetZ = 5,33 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 - SetX = 6,203 - SetY = 6,-253 + SetX = 6,-3 + SetY = 6,53 SetZ = 6,34 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 - SetX = 6,218 - SetY = 6,-239 + SetX = 6,-18 + SetY = 6,39 SetZ = 6,35 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 - SetX = 6,229 - SetY = 6,-201 + SetX = 6,-29 + SetY = 6,1 SetZ = 6,36 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 6,10 - SetX = 6,217 - SetY = 6,-173 + SetX = 6,-17 + SetY = 6,-26 SetZ = 6,37 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 - SetX = 7,200 - SetY = 7,-181 + SetX = 7,0 + SetY = 7,-18 SetZ = 7,38 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 - SetX = 7,192 - SetY = 7,-215 + SetX = 7,7 + SetY = 7,15 SetZ = 7,39 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 7,10 - SetX = 7,196 - SetY = 7,-240 + SetX = 7,3 + SetY = 7,40 SetZ = 7,40 SetVisible = 8,false Graphic = Examples/punches Focus = UserAndTarget SetFrame = 10,10 - SetX = 10,37 - SetY = 10,-57 + SetX = 10,162 + SetY = 10,-142 SetZ = 10,28 - SetX = 11,27 + SetX = 11,172 Graphic = Examples/punches Focus = UserAndTarget SetFrame = 10,10 - SetX = 10,-7 - SetY = 10,15 + SetX = 10,207 + SetY = 10,-215 SetZ = 10,29 - SetX = 11,-8 - SetY = 11,31 + SetX = 11,208 + SetY = 11,-231 Graphic = Examples/punches Focus = UserAndTarget SetFrame = 11,10 - SetX = 11,-14 - SetY = 11,-37 + SetX = 11,214 + SetY = 11,-162 SetZ = 11,30 Graphic = Examples/punches Focus = UserAndTarget SetFrame = 11,10 - SetX = 11,34 - SetY = 11,23 + SetX = 11,165 + SetY = 11,-223 SetZ = 11,31 Play = 0,Trump Card,100,110 diff --git a/PBS/Animations/Example anims/Move/FOCUSENERGY.txt b/PBS/Animations/Example anims/Move/FOCUSENERGY.txt index d908b50fe..a883d7783 100644 --- a/PBS/Animations/Example anims/Move/FOCUSENERGY.txt +++ b/PBS/Animations/Example anims/Move/FOCUSENERGY.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,FOCUSENERGY] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Fire3 Focus = User SetFrame = 4,29 @@ -17,7 +15,7 @@ Name = Example anim SetZ = 4,28 SetFrame = 5,28 SetVisible = 6,false - + Graphic = Examples/Fire3 Focus = User SetFrame = 0,29 diff --git a/PBS/Animations/Example anims/Move/FOLLOWME.txt b/PBS/Animations/Example anims/Move/FOLLOWME.txt index 1ff7803c8..931917f38 100644 --- a/PBS/Animations/Example anims/Move/FOLLOWME.txt +++ b/PBS/Animations/Example anims/Move/FOLLOWME.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,FOLLOWME] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/finger.spoon - Focus = Target + + Graphic = Examples/finger spoon + Focus = User SetX = 0,2 SetY = 0,1 SetZ = 0,27 @@ -35,9 +33,9 @@ Name = Example anim SetX = 9,-205 SetY = 9,139 SetVisible = 10,false - - Graphic = Examples/finger.spoon - Focus = Target + + Graphic = Examples/finger spoon + Focus = User SetFrame = 6,1 SetX = 6,-117 SetY = 6,120 @@ -48,22 +46,20 @@ Name = Example anim #------------------------------- [OppMove,FOLLOWME] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/finger.spoon - Focus = Target + + Graphic = Examples/finger spoon + Focus = User SetX = 5,-102 SetY = 5,110 SetZ = 5,28 SetVisible = 6,false - - Graphic = Examples/finger.spoon - Focus = Target + + Graphic = Examples/finger spoon + Focus = User SetFrame = 0,1 SetX = 0,-193 SetY = 0,125 diff --git a/PBS/Animations/Example anims/Move/FURYATTACK.txt b/PBS/Animations/Example anims/Move/FURYATTACK.txt index 02589b9c7..f2871c4ec 100644 --- a/PBS/Animations/Example anims/Move/FURYATTACK.txt +++ b/PBS/Animations/Example anims/Move/FURYATTACK.txt @@ -249,23 +249,23 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 - SetX = 3,159 - SetY = 3,-151 + SetX = 3,40 + SetY = 3,-48 SetZ = 3,28 SetAngle = 3,180 SetFrame = 4,6 - SetX = 4,121 - SetY = 4,-103 + SetX = 4,78 + SetY = 4,-96 SetFrame = 5,7 - SetX = 5,71 - SetY = 5,-42 + SetX = 5,128 + SetY = 5,-157 SetVisible = 6,false Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 - SetX = 4,0 - SetY = 4,28 + SetX = 4,199 + SetY = 4,-228 SetZ = 4,27 SetFrame = 5,2 SetFrame = 6,1 @@ -274,16 +274,16 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 - SetX = 0,164 - SetY = 0,-150 + SetX = 0,35 + SetY = 0,-50 SetZ = 0,27 SetAngle = 0,180 SetFrame = 1,6 - SetX = 1,125 - SetY = 1,-107 + SetX = 1,75 + SetY = 1,-92 SetFrame = 2,7 - SetX = 2,66 - SetY = 2,-32 + SetX = 2,133 + SetY = 2,-167 SetVisible = 3,false Play = 3,normaldamage,80 @@ -301,16 +301,16 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 - SetX = 0,164 - SetY = 0,-150 + SetX = 0,35 + SetY = 0,-50 SetZ = 0,27 SetAngle = 0,180 SetFrame = 1,6 - SetX = 1,125 - SetY = 1,-107 + SetX = 1,75 + SetY = 1,-92 SetFrame = 2,7 - SetX = 2,66 - SetY = 2,-32 + SetX = 2,133 + SetY = 2,-167 SetVisible = 3,false Graphic = Examples/003-Attack01 @@ -323,23 +323,23 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 - SetX = 3,159 - SetY = 3,-151 + SetX = 3,40 + SetY = 3,-48 SetZ = 3,28 SetAngle = 3,180 SetFrame = 4,6 - SetX = 4,121 - SetY = 4,-103 + SetX = 4,78 + SetY = 4,-96 SetFrame = 5,7 - SetX = 5,71 - SetY = 5,-42 + SetX = 5,128 + SetY = 5,-157 SetVisible = 6,false Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 - SetX = 4,0 - SetY = 4,28 + SetX = 4,199 + SetY = 4,-228 SetZ = 4,27 SetFrame = 5,2 SetFrame = 6,1 @@ -360,8 +360,8 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 - SetX = 4,0 - SetY = 4,28 + SetX = 4,199 + SetY = 4,-228 SetZ = 4,27 SetFrame = 5,2 SetFrame = 6,1 @@ -370,16 +370,16 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 - SetX = 0,164 - SetY = 0,-150 + SetX = 0,35 + SetY = 0,-50 SetZ = 0,27 SetAngle = 0,180 SetFrame = 1,6 - SetX = 1,125 - SetY = 1,-107 + SetX = 1,75 + SetY = 1,-92 SetFrame = 2,7 - SetX = 2,66 - SetY = 2,-32 + SetX = 2,133 + SetY = 2,-167 SetVisible = 3,false Graphic = Examples/003-Attack01 @@ -392,16 +392,16 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 - SetX = 3,159 - SetY = 3,-151 + SetX = 3,40 + SetY = 3,-48 SetZ = 3,28 SetAngle = 3,180 SetFrame = 4,6 - SetX = 4,121 - SetY = 4,-103 + SetX = 4,78 + SetY = 4,-96 SetFrame = 5,7 - SetX = 5,71 - SetY = 5,-42 + SetX = 5,128 + SetY = 5,-157 SetVisible = 6,false Play = 3,normaldamage,80 @@ -419,23 +419,23 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 - SetX = 3,159 - SetY = 3,-151 + SetX = 3,40 + SetY = 3,-48 SetZ = 3,28 SetAngle = 3,180 SetFrame = 4,6 - SetX = 4,121 - SetY = 4,-103 + SetX = 4,78 + SetY = 4,-96 SetFrame = 5,7 - SetX = 5,71 - SetY = 5,-42 + SetX = 5,128 + SetY = 5,-157 SetVisible = 6,false Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 - SetX = 4,0 - SetY = 4,28 + SetX = 4,199 + SetY = 4,-228 SetZ = 4,27 SetFrame = 5,2 SetFrame = 6,1 @@ -444,16 +444,16 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 - SetX = 0,164 - SetY = 0,-150 + SetX = 0,35 + SetY = 0,-50 SetZ = 0,27 SetAngle = 0,180 SetFrame = 1,6 - SetX = 1,125 - SetY = 1,-107 + SetX = 1,75 + SetY = 1,-92 SetFrame = 2,7 - SetX = 2,66 - SetY = 2,-32 + SetX = 2,133 + SetY = 2,-167 SetVisible = 3,false Graphic = Examples/003-Attack01 @@ -485,23 +485,23 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 - SetX = 3,159 - SetY = 3,-151 + SetX = 3,40 + SetY = 3,-48 SetZ = 3,28 SetAngle = 3,180 SetFrame = 4,6 - SetX = 4,121 - SetY = 4,-103 + SetX = 4,78 + SetY = 4,-96 SetFrame = 5,7 - SetX = 5,71 - SetY = 5,-42 + SetX = 5,128 + SetY = 5,-157 SetVisible = 6,false Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 4,1 - SetX = 4,0 - SetY = 4,28 + SetX = 4,199 + SetY = 4,-228 SetZ = 4,27 SetFrame = 5,2 SetFrame = 6,1 @@ -510,16 +510,16 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 - SetX = 0,164 - SetY = 0,-150 + SetX = 0,35 + SetY = 0,-50 SetZ = 0,27 SetAngle = 0,180 SetFrame = 1,6 - SetX = 1,125 - SetY = 1,-107 + SetX = 1,75 + SetY = 1,-92 SetFrame = 2,7 - SetX = 2,66 - SetY = 2,-32 + SetX = 2,133 + SetY = 2,-167 SetVisible = 3,false Play = 3,normaldamage,80 diff --git a/PBS/Animations/Example anims/Move/GRUDGE.txt b/PBS/Animations/Example anims/Move/GRUDGE.txt index aebdd9844..9c86e7597 100644 --- a/PBS/Animations/Example anims/Move/GRUDGE.txt +++ b/PBS/Animations/Example anims/Move/GRUDGE.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,GRUDGE] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetX = 0,128 SetY = 0,6 SetZ = 0,27 @@ -45,9 +43,9 @@ Name = Example anim SetFrame = 11,3 SetX = 11,80 SetY = 11,22 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetFrame = 1,3 SetX = 1,128 SetY = 1,6 @@ -78,9 +76,9 @@ Name = Example anim SetFrame = 11,0 SetX = 11,112 SetY = 11,14 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetFrame = 2,2 SetX = 2,128 SetY = 2,6 @@ -109,9 +107,9 @@ Name = Example anim SetY = 10,-34 SetFrame = 11,3 SetX = 11,80 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetX = 3,128 SetY = 3,6 SetZ = 3,30 @@ -139,9 +137,9 @@ Name = Example anim SetFrame = 11,1 SetX = 11,40 SetY = 11,-50 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetFrame = 4,3 SetX = 4,128 SetY = 4,-18 @@ -166,9 +164,9 @@ Name = Example anim SetFrame = 11,2 SetX = 11,-24 SetY = 11,-50 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetX = 6,120 SetY = 6,6 SetZ = 6,32 @@ -187,9 +185,9 @@ Name = Example anim SetFrame = 11,5 SetX = 11,-72 SetY = 11,-42 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetFrame = 7,5 SetX = 7,120 SetY = 7,-10 @@ -206,9 +204,9 @@ Name = Example anim SetFrame = 11,1 SetX = 11,-112 SetY = 11,-2 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetFrame = 8,2 SetX = 8,112 SetY = 8,6 @@ -221,9 +219,9 @@ Name = Example anim SetFrame = 11,5 SetX = 11,-56 SetY = 11,22 - + Graphic = Examples/ghost1 - Focus = Target + Focus = User SetFrame = 10,7 SetX = 10,48 SetY = 10,30 diff --git a/PBS/Animations/Example anims/Move/HAIL.txt b/PBS/Animations/Example anims/Move/HAIL.txt index af14df8f0..a8a823c0e 100644 --- a/PBS/Animations/Example anims/Move/HAIL.txt +++ b/PBS/Animations/Example anims/Move/HAIL.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,HAIL] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 @@ -42,7 +40,7 @@ Name = Example anim SetX = 10,136 SetY = 10,107 SetVisible = 11,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,7 @@ -52,7 +50,7 @@ Name = Example anim SetX = 1,464 SetY = 1,117 SetVisible = 2,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,8 @@ -68,7 +66,7 @@ Name = Example anim SetX = 3,278 SetY = 3,164 SetVisible = 4,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 @@ -87,7 +85,7 @@ Name = Example anim SetX = 4,390 SetY = 4,210 SetVisible = 5,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,9 @@ -95,7 +93,7 @@ Name = Example anim SetY = 0,252 SetZ = 0,31 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,7 @@ -103,7 +101,7 @@ Name = Example anim SetY = 2,206 SetZ = 2,31 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 3,9 @@ -111,7 +109,7 @@ Name = Example anim SetY = 3,241 SetZ = 3,28 SetVisible = 4,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,9 @@ -138,7 +136,7 @@ Name = Example anim SetFrame = 12,9 SetX = 12,198 SetY = 12,28 - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,8 @@ -146,7 +144,7 @@ Name = Example anim SetY = 4,220 SetZ = 4,32 SetVisible = 5,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 5,9 @@ -154,7 +152,7 @@ Name = Example anim SetY = 5,69 SetZ = 5,28 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 6,8 @@ -162,7 +160,7 @@ Name = Example anim SetY = 6,226 SetZ = 6,29 SetVisible = 7,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 @@ -185,7 +183,7 @@ Name = Example anim SetFrame = 12,8 SetX = 12,230 SetY = 12,142 - + Graphic = Examples/weather Focus = Foreground SetFrame = 6,9 @@ -195,7 +193,7 @@ Name = Example anim SetX = 7,296 SetY = 7,172 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 8,8 @@ -205,7 +203,7 @@ Name = Example anim SetX = 9,163 SetY = 9,99 SetVisible = 10,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 8,9 @@ -218,7 +216,7 @@ Name = Example anim SetX = 10,444 SetY = 10,89 SetVisible = 11,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,9 @@ -233,7 +231,7 @@ Name = Example anim SetY = 11,246 SetX = 12,167 SetY = 12,237 - + Graphic = Examples/weather Focus = Foreground SetFrame = 11,8 @@ -241,7 +239,7 @@ Name = Example anim SetY = 11,119 SetZ = 11,28 SetVisible = 12,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 11,7 @@ -251,7 +249,7 @@ Name = Example anim SetFrame = 12,9 SetX = 12,41 SetY = 12,229 - + Graphic = Examples/weather Focus = Foreground SetFrame = 11,9 @@ -259,14 +257,14 @@ Name = Example anim SetY = 11,47 SetZ = 11,34 SetVisible = 12,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 12,8 SetX = 12,474 SetY = 12,59 SetZ = 12,29 - + Graphic = Examples/weather Focus = Foreground SetFrame = 12,9 diff --git a/PBS/Animations/Example anims/Move/HARDEN.txt b/PBS/Animations/Example anims/Move/HARDEN.txt index 805a8d959..47024032c 100644 --- a/PBS/Animations/Example anims/Move/HARDEN.txt +++ b/PBS/Animations/Example anims/Move/HARDEN.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,HARDEN] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/anim sheet Focus = User SetFrame = 0,15 diff --git a/PBS/Animations/Example anims/Move/KINESIS.txt b/PBS/Animations/Example anims/Move/KINESIS.txt index 0aec951a4..c0708ee70 100644 --- a/PBS/Animations/Example anims/Move/KINESIS.txt +++ b/PBS/Animations/Example anims/Move/KINESIS.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/finger.spoon + Graphic = Examples/finger spoon Focus = Target SetFrame = 0,2 SetX = 0,-1 diff --git a/PBS/Animations/Example anims/Move/LEECHSEED.txt b/PBS/Animations/Example anims/Move/LEECHSEED.txt index da40a8b9a..90e8a1620 100644 --- a/PBS/Animations/Example anims/Move/LEECHSEED.txt +++ b/PBS/Animations/Example anims/Move/LEECHSEED.txt @@ -114,22 +114,22 @@ Name = Example anim Graphic = Examples/leech-seed Focus = UserAndTarget - SetX = 2,200 - SetY = 2,-196 + SetX = 2,0 + SetY = 2,-3 SetZ = 2,28 - SetX = 3,175 - SetY = 3,-237 - SetX = 4,139 - SetY = 4,-256 + SetX = 3,25 + SetY = 3,37 + SetX = 4,60 + SetY = 4,56 SetX = 5,100 - SetY = 5,-237 - SetX = 6,44 - SetY = 6,-178 - SetX = 7,-5 - SetY = 7,-79 + SetY = 5,37 + SetX = 6,155 + SetY = 6,-21 + SetX = 7,205 + SetY = 7,-120 SetFrame = 8,3 - SetX = 8,0 - SetY = 8,39 + SetX = 8,200 + SetY = 8,-239 SetFrame = 10,1 SetFrame = 12,2 SetFrame = 14,1 @@ -138,34 +138,34 @@ Name = Example anim Graphic = Examples/leech-seed Focus = UserAndTarget - SetX = 4,200 - SetY = 4,-196 + SetX = 4,0 + SetY = 4,-3 SetZ = 4,29 - SetX = 5,175 - SetY = 5,-226 - SetX = 6,139 - SetY = 6,-237 + SetX = 5,25 + SetY = 5,26 + SetX = 6,60 + SetY = 6,37 SetVisible = 7,false Graphic = Examples/leech-seed Focus = UserAndTarget - SetX = 8,64 - SetY = 8,-128 + SetX = 8,135 + SetY = 8,-71 SetZ = 8,29 SetVisible = 9,false Graphic = Examples/leech-seed Focus = UserAndTarget - SetX = 10,25 - SetY = 10,39 + SetX = 10,175 + SetY = 10,-239 SetZ = 10,29 SetVisible = 11,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 12,3 - SetX = 12,25 - SetY = 12,39 + SetX = 12,175 + SetY = 12,-239 SetZ = 12,29 SetFrame = 14,1 SetFrame = 16,2 @@ -175,30 +175,30 @@ Name = Example anim Graphic = Examples/leech-seed Focus = UserAndTarget - SetX = 0,200 - SetY = 0,-196 + SetX = 0,0 + SetY = 0,-3 SetZ = 0,27 - SetX = 1,175 - SetY = 1,-226 - SetX = 2,144 - SetY = 2,-237 + SetX = 1,25 + SetY = 1,26 + SetX = 2,55 + SetY = 2,37 SetX = 3,100 - SetY = 3,-217 - SetX = 4,64 - SetY = 4,-157 - SetX = 5,25 - SetY = 5,-59 - SetX = 6,0 - SetY = 6,39 - SetX = 7,94 - SetY = 7,-207 - SetX = 8,-30 - SetY = 8,39 - SetX = 9,39 - SetY = 9,-40 + SetY = 3,17 + SetX = 4,135 + SetY = 4,-42 + SetX = 5,175 + SetY = 5,-140 + SetX = 6,200 + SetY = 6,-239 + SetX = 7,105 + SetY = 7,7 + SetX = 8,230 + SetY = 8,-239 + SetX = 9,160 + SetY = 9,-159 SetFrame = 10,3 - SetX = 10,-25 - SetY = 10,39 + SetX = 10,225 + SetY = 10,-239 SetFrame = 12,1 SetFrame = 14,2 SetFrame = 16,1 diff --git a/PBS/Animations/Example anims/Move/LEER.txt b/PBS/Animations/Example anims/Move/LEER.txt index 886858ca9..83e86cee5 100644 --- a/PBS/Animations/Example anims/Move/LEER.txt +++ b/PBS/Animations/Example anims/Move/LEER.txt @@ -39,19 +39,19 @@ Name = Example anim Graphic = Examples/leer Focus = UserAndTarget - SetX = 0,173 - SetY = 0,-226 + SetX = 0,26 + SetY = 0,26 SetZ = 0,27 SetFrame = 1,1 - SetY = 1,-229 + SetY = 1,29 SetFrame = 2,2 - SetX = 2,175 - SetY = 2,-232 + SetX = 2,25 + SetY = 2,32 SetFrame = 3,3 - SetX = 3,171 - SetY = 3,-229 + SetX = 3,28 + SetY = 3,29 SetFrame = 4,4 - SetX = 4,178 - SetY = 4,-232 + SetX = 4,21 + SetY = 4,32 Play = 0,Saint9 diff --git a/PBS/Animations/Example anims/Move/LIGHTSCREEN.txt b/PBS/Animations/Example anims/Move/LIGHTSCREEN.txt index 312e99e38..a26cc5494 100644 --- a/PBS/Animations/Example anims/Move/LIGHTSCREEN.txt +++ b/PBS/Animations/Example anims/Move/LIGHTSCREEN.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,LIGHTSCREEN] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 1,10 SetX = 1,58 SetY = 1,-39 @@ -38,9 +36,9 @@ Name = Example anim SetFrame = 10,6 SetX = 10,46 SetY = 10,-39 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 4,10 SetX = 4,-16 SetY = 4,15 @@ -58,9 +56,9 @@ Name = Example anim SetY = 9,48 SetX = 10,-7 SetY = 10,-38 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 7,6 SetX = 7,56 SetY = 7,64 @@ -71,9 +69,9 @@ Name = Example anim SetY = 9,66 SetX = 10,-37 SetY = 10,39 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 8,10 SetX = 8,0 SetY = 8,-54 @@ -83,9 +81,9 @@ Name = Example anim SetY = 9,-31 SetX = 10,64 SetY = 10,66 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 1,15 SetBlending = 1,1 SetX = 1,6 diff --git a/PBS/Animations/Example anims/Move/LOVELYKISS.txt b/PBS/Animations/Example anims/Move/LOVELYKISS.txt index a94b7e7b1..d73ef1ee6 100644 --- a/PBS/Animations/Example anims/Move/LOVELYKISS.txt +++ b/PBS/Animations/Example anims/Move/LOVELYKISS.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = UserAndTarget SetFrame = 0,4 SetX = 0,208 @@ -34,7 +34,7 @@ Name = Example anim SetX = 9,178 SetY = 9,-184 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = UserAndTarget SetFrame = 1,5 SetX = 1,193 @@ -59,7 +59,7 @@ Name = Example anim SetX = 9,185 SetY = 9,-262 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = UserAndTarget SetFrame = 1,3 SetX = 1,217 @@ -83,7 +83,7 @@ Name = Example anim SetX = 9,189 SetY = 9,-215 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = UserAndTarget SetFrame = 5,5 SetX = 5,189 @@ -97,7 +97,7 @@ Name = Example anim SetX = 9,187 SetY = 9,-237 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = UserAndTarget SetFrame = 6,5 SetX = 6,180 @@ -107,7 +107,7 @@ Name = Example anim SetY = 7,-256 SetVisible = 8,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = UserAndTarget SetFrame = 7,5 SetX = 7,158 diff --git a/PBS/Animations/Example anims/Move/LUCKYCHANT.txt b/PBS/Animations/Example anims/Move/LUCKYCHANT.txt index 3a803d408..96770684e 100644 --- a/PBS/Animations/Example anims/Move/LUCKYCHANT.txt +++ b/PBS/Animations/Example anims/Move/LUCKYCHANT.txt @@ -2,321 +2,319 @@ #------------------------------- [Move,LUCKYCHANT] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 0,14 - SetX = 0,192 - SetY = 0,-193 + SetX = 0,-9 + SetY = 0,4 SetZ = 0,27 SetOpacity = 0,220 SetOpacity = 9,128 + + Graphic = Examples/anim sheet + Focus = User + SetFrame = 0,8 + SetX = 0,-48 + SetY = 0,-9 + SetZ = 0,28 + SetX = 1,42 + SetY = 1,55 + SetX = 2,-32 + SetY = 2,51 + SetX = 3,-22 + SetY = 3,39 + SetX = 4,-33 + SetY = 4,37 + SetX = 5,-39 + SetY = 5,24 + SetX = 6,-29 + SetY = 6,-11 + SetX = 7,-26 + SetY = 7,-14 + SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 0,8 - SetX = 0,162 - SetY = 0,-214 - SetZ = 0,28 - SetX = 1,232 - SetY = 1,-114 - SetX = 2,175 - SetY = 2,-120 - SetX = 3,182 - SetY = 3,-139 - SetX = 4,174 - SetY = 4,-142 - SetX = 5,169 - SetY = 5,-162 - SetX = 6,177 - SetY = 6,-217 - SetX = 7,179 - SetY = 7,-221 + SetX = 0,-48 + SetY = 0,8 + SetZ = 0,29 + SetX = 1,-43 + SetY = 1,34 + SetX = 2,-38 + SetY = 2,38 + SetX = 3,-12 + SetY = 3,48 + SetX = 4,-19 + SetY = 4,38 + SetX = 5,-28 + SetY = 5,31 + SetX = 6,-18 + SetY = 6,-21 + SetX = 7,-14 + SetY = 7,-28 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget - SetFrame = 0,8 - SetX = 0,162 - SetY = 0,-187 - SetZ = 0,29 - SetX = 1,166 - SetY = 1,-146 - SetX = 2,170 - SetY = 2,-140 - SetX = 3,190 - SetY = 3,-125 - SetX = 4,185 - SetY = 4,-140 - SetX = 5,178 - SetY = 5,-151 - SetX = 6,185 - SetY = 6,-232 - SetX = 7,189 - SetY = 7,-243 + Focus = User + SetFrame = 1,8 + SetX = 1,-41 + SetY = 1,47 + SetZ = 1,30 + SetX = 2,-26 + SetY = 2,33 + SetX = 3,-29 + SetY = 3,48 + SetX = 4,-28 + SetY = 4,26 + SetX = 5,-22 + SetY = 5,44 + SetX = 6,-37 + SetY = 6,2 + SetX = 7,-1 + SetY = 7,-32 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 1,8 - SetX = 1,167 - SetY = 1,-126 - SetZ = 1,30 - SetX = 2,179 - SetY = 2,-148 - SetX = 3,177 - SetY = 3,-125 - SetX = 4,178 - SetY = 4,-159 - SetX = 5,182 - SetY = 5,-131 - SetX = 6,171 - SetY = 6,-196 - SetX = 7,199 - SetY = 7,-250 + SetX = 1,-23 + SetY = 1,54 + SetZ = 1,31 + SetX = 2,33 + SetY = 2,39 + SetX = 3,-38 + SetY = 3,31 + SetX = 4,-7 + SetY = 4,50 + SetX = 5,-32 + SetY = 5,12 + SetY = 6,24 + SetX = 7,10 + SetY = 7,-32 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget - SetFrame = 1,8 - SetX = 1,182 - SetY = 1,-115 - SetZ = 1,31 - SetX = 2,225 - SetY = 2,-139 - SetX = 3,170 - SetY = 3,-151 - SetX = 4,194 - SetY = 4,-121 - SetX = 5,175 - SetY = 5,-181 - SetY = 6,-162 - SetX = 7,207 - SetY = 7,-250 + Focus = User + SetFrame = 2,8 + SetX = 2,48 + SetY = 2,33 + SetZ = 2,32 + SetX = 3,-33 + SetY = 3,17 + SetX = 4,8 + SetY = 4,56 + SetX = 5,-40 + SetY = 5,3 + SetX = 6,-18 + SetY = 6,37 + SetX = 7,-12 + SetY = 7,-43 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 2,8 - SetX = 2,237 - SetY = 2,-148 - SetZ = 2,32 - SetX = 3,174 - SetY = 3,-173 - SetX = 4,206 - SetY = 4,-112 - SetX = 5,168 - SetY = 5,-195 - SetX = 6,185 - SetY = 6,-142 - SetX = 7,190 - SetY = 7,-267 + SetX = 2,39 + SetY = 2,48 + SetZ = 2,33 + SetX = 3,-45 + SetY = 3,2 + SetX = 4,13 + SetY = 4,50 + SetX = 5,-10 + SetY = 5,40 + SetX = 6,-5 + SetY = 6,49 + SetX = 7,-41 + SetY = 7,-1 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 2,8 - SetX = 2,230 - SetY = 2,-125 - SetZ = 2,33 - SetX = 3,164 - SetY = 3,-196 - SetX = 4,210 - SetY = 4,-121 - SetX = 5,192 - SetY = 5,-137 - SetX = 6,196 - SetY = 6,-123 - SetX = 7,167 - SetY = 7,-201 + SetX = 2,22 + SetY = 2,49 + SetZ = 2,34 + SetX = 3,41 + SetY = 3,37 + SetX = 4,28 + SetY = 4,47 + SetX = 5,-4 + SetY = 5,54 + SetX = 6,9 + SetY = 6,58 + SetX = 7,-30 + SetY = 7,8 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 2,8 - SetX = 2,217 - SetY = 2,-123 - SetZ = 2,34 - SetX = 3,232 - SetY = 3,-142 - SetX = 4,221 - SetY = 4,-126 - SetX = 5,196 - SetY = 5,-115 - SetX = 6,207 - SetY = 6,-109 - SetX = 7,176 - SetY = 7,-187 + SetX = 2,43 + SetY = 2,15 + SetZ = 2,35 + SetX = 3,51 + SetY = 3,34 + SetX = 4,39 + SetY = 4,47 + SetX = 5,7 + SetY = 5,49 + SetX = 6,27 + SetY = 6,53 + SetX = 7,-38 + SetY = 7,29 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 2,8 - SetX = 2,233 - SetY = 2,-176 - SetZ = 2,35 - SetX = 3,239 - SetY = 3,-146 - SetX = 4,230 - SetY = 4,-126 - SetX = 5,205 - SetY = 5,-123 - SetX = 6,221 - SetY = 6,-117 - SetX = 7,170 - SetY = 7,-154 + SetX = 2,-26 + SetY = 2,13 + SetZ = 2,36 + SetX = 3,48 + SetY = 3,20 + SetX = 4,45 + SetY = 4,33 + SetX = 5,23 + SetY = 5,54 + SetX = 6,44 + SetY = 6,42 + SetX = 7,-19 + SetY = 7,31 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget - SetFrame = 2,8 - SetX = 2,179 - SetY = 2,-179 - SetZ = 2,36 - SetX = 3,237 - SetY = 3,-168 - SetX = 4,235 - SetY = 4,-148 - SetX = 5,217 - SetY = 5,-115 - SetX = 6,234 - SetY = 6,-134 - SetX = 7,185 - SetY = 7,-151 + Focus = User + SetFrame = 3,8 + SetX = 3,55 + SetY = 3,9 + SetZ = 3,37 + SetY = 4,30 + SetX = 5,31 + SetY = 5,43 + SetX = 6,57 + SetY = 6,23 + SetX = 7,-18 + SetY = 7,49 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 3,8 - SetX = 3,242 - SetY = 3,-185 - SetZ = 3,37 - SetY = 4,-153 - SetX = 5,224 - SetY = 5,-132 - SetX = 6,244 - SetY = 6,-164 - SetX = 7,185 - SetY = 7,-123 + SetX = 3,-31 + SetY = 3,0 + SetZ = 3,38 + SetX = 4,51 + SetY = 4,17 + SetX = 5,44 + SetY = 5,38 + SetX = 6,59 + SetY = 6,5 + SetX = 7,1 + SetY = 7,43 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 3,8 - SetX = 3,175 - SetY = 3,-200 - SetZ = 3,38 - SetX = 4,239 - SetY = 4,-173 - SetX = 5,234 - SetY = 5,-140 - SetX = 6,246 - SetY = 6,-192 - SetX = 7,200 - SetY = 7,-132 + SetX = 3,45 + SetY = 3,-2 + SetZ = 3,39 + SetX = 4,60 + SetY = 4,6 + SetX = 5,55 + SetY = 5,26 + SetX = 6,-53 + SetY = 6,14 + SetX = 7,17 + SetY = 7,59 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget - SetFrame = 3,8 - SetX = 3,235 - SetY = 3,-203 - SetZ = 3,39 - SetX = 4,246 - SetY = 4,-190 - SetX = 5,242 - SetY = 5,-159 - SetX = 6,158 - SetY = 6,-178 - SetX = 7,213 - SetY = 7,-107 + Focus = User + SetFrame = 4,8 + SetX = 4,43 + SetY = 4,-5 + SetZ = 4,40 + SetX = 5,50 + SetY = 5,6 + SetX = 6,-60 + SetY = 6,29 + SetX = 7,33 + SetY = 7,41 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 4,8 - SetX = 4,233 - SetY = 4,-207 - SetZ = 4,40 - SetX = 5,239 - SetY = 5,-190 - SetX = 6,153 - SetY = 6,-154 - SetX = 7,225 - SetY = 7,-135 - SetOpacity = 9,128 - - Graphic = Examples/anim sheet - Focus = UserAndTarget - SetFrame = 4,8 - SetX = 4,169 - SetY = 4,-184 + SetX = 4,-39 + SetY = 4,10 SetZ = 4,41 SetVisible = 5,false + + Graphic = Examples/anim sheet + Focus = User + SetFrame = 6,8 + SetX = 6,-58 + SetY = 6,-3 + SetZ = 6,41 + SetX = 7,49 + SetY = 7,22 + SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 6,8 - SetX = 6,154 - SetY = 6,-204 - SetZ = 6,41 - SetX = 7,238 - SetY = 7,-165 + SetX = 6,-44 + SetY = 6,-20 + SetZ = 6,42 + SetX = 7,62 + SetY = 7,9 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget - SetFrame = 6,8 - SetX = 6,165 - SetY = 6,-231 - SetZ = 6,42 - SetX = 7,248 - SetY = 7,-185 + Focus = User + SetFrame = 7,8 + SetX = 7,47 + SetY = 7,-2 + SetZ = 7,43 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 7,8 - SetX = 7,236 - SetY = 7,-203 - SetZ = 7,43 + SetX = 7,58 + SetY = 7,-14 + SetZ = 7,44 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 7,8 - SetX = 7,245 - SetY = 7,-221 - SetZ = 7,44 + SetX = 7,36 + SetY = 7,-32 + SetZ = 7,45 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 7,8 - SetX = 7,228 - SetY = 7,-250 - SetZ = 7,45 + SetX = 7,23 + SetY = 7,-41 + SetZ = 7,46 SetOpacity = 9,128 Graphic = Examples/anim sheet - Focus = UserAndTarget + Focus = User SetFrame = 7,8 - SetX = 7,217 - SetY = 7,-264 - SetZ = 7,46 - SetOpacity = 9,128 - - Graphic = Examples/anim sheet - Focus = UserAndTarget - SetFrame = 7,8 - SetX = 7,222 - SetY = 7,-243 + SetX = 7,29 + SetY = 7,-28 SetZ = 7,47 SetOpacity = 9,128 diff --git a/PBS/Animations/Example anims/Move/MAGICCOAT.txt b/PBS/Animations/Example anims/Move/MAGICCOAT.txt index 4d39ebb6e..fdadd7da7 100644 --- a/PBS/Animations/Example anims/Move/MAGICCOAT.txt +++ b/PBS/Animations/Example anims/Move/MAGICCOAT.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,MAGICCOAT] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 0,15 SetX = 0,1 SetY = 0,2 @@ -19,9 +17,9 @@ Name = Example anim SetOpacity = 1,74 SetOpacity = 9,72 SetOpacity = 10,37 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 2,7 SetX = 2,4 SetY = 2,-69 @@ -43,9 +41,9 @@ Name = Example anim SetY = 9,-7 SetX = 10,6 SetY = 10,50 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 2,7 SetX = 2,19 SetY = 2,-50 @@ -68,9 +66,9 @@ Name = Example anim SetFrame = 10,7 SetX = 10,63 SetY = 10,-41 - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 2,7 SetX = 2,44 SetY = 2,63 @@ -92,9 +90,9 @@ Name = Example anim SetX = 9,61 SetY = 9,14 SetVisible = 10,false - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 2,7 SetX = 2,21 SetY = 2,68 @@ -114,9 +112,9 @@ Name = Example anim SetX = 8,52 SetY = 8,-17 SetVisible = 9,false - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 2,7 SetX = 2,-47 SetY = 2,51 @@ -124,41 +122,41 @@ Name = Example anim SetX = 3,46 SetY = 3,-25 SetVisible = 4,false - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 2,7 SetX = 2,-47 SetY = 2,24 SetZ = 2,33 SetVisible = 3,false - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 6,7 SetX = 6,57 SetY = 6,55 SetZ = 6,32 SetVisible = 7,false - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 6,7 SetX = 6,69 SetY = 6,64 SetZ = 6,33 SetVisible = 7,false - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 8,7 SetX = 8,-27 SetY = 8,-19 SetZ = 8,32 SetVisible = 9,false - + Graphic = Examples/anim sheet - Focus = Target + Focus = User SetFrame = 8,7 SetX = 8,-15 SetY = 8,-7 diff --git a/PBS/Animations/Example anims/Move/MEGADRAIN.txt b/PBS/Animations/Example anims/Move/MEGADRAIN.txt index 9f3aa3c62..5e82ee3be 100644 --- a/PBS/Animations/Example anims/Move/MEGADRAIN.txt +++ b/PBS/Animations/Example anims/Move/MEGADRAIN.txt @@ -145,209 +145,209 @@ Name = Example anim Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 0,11 - SetX = 0,0 - SetY = 0,-7 + SetX = 0,200 + SetY = 0,-192 SetZ = 0,27 - SetX = 1,16 - SetY = 1,14 + SetX = 1,183 + SetY = 1,-214 SetFrame = 2,12 - SetX = 2,72 - SetY = 2,-78 - SetX = 3,59 - SetY = 3,-157 - SetX = 4,14 - SetY = 4,-89 - SetX = 5,190 - SetY = 5,-193 + SetX = 2,127 + SetY = 2,-121 + SetX = 3,140 + SetY = 3,-42 + SetX = 4,185 + SetY = 4,-110 + SetX = 5,9 + SetY = 5,-6 SetVisible = 6,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 1,11 - SetX = 1,0 - SetY = 1,20 + SetX = 1,199 + SetY = 1,-220 SetZ = 1,28 SetFrame = 2,12 - SetX = 2,49 - SetY = 2,-45 - SetX = 3,129 - SetY = 3,-50 - SetX = 4,84 - SetY = 4,-10 - SetX = 5,208 - SetY = 5,-195 + SetX = 2,150 + SetY = 2,-154 + SetX = 3,70 + SetY = 3,-150 + SetX = 4,115 + SetY = 4,-189 + SetX = 5,-8 + SetY = 5,-4 SetVisible = 6,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 2,11 - SetX = 2,0 - SetY = 2,-9 + SetX = 2,199 + SetY = 2,-190 SetZ = 2,29 SetFrame = 3,12 - SetX = 3,64 - SetY = 3,-39 + SetX = 3,135 + SetY = 3,-160 SetX = 4,100 - SetY = 4,-118 - SetX = 5,168 - SetY = 5,-128 - SetX = 6,207 - SetY = 6,-196 - SetX = 7,207 - SetY = 7,-198 + SetY = 4,-81 + SetX = 5,31 + SetY = 5,-71 + SetX = 6,-7 + SetY = 6,-3 + SetX = 7,-7 + SetY = 7,-1 SetVisible = 8,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 3,11 - SetX = 3,3 - SetY = 3,0 + SetX = 3,196 + SetY = 3,-200 SetZ = 3,30 SetFrame = 4,12 - SetX = 4,172 - SetY = 4,-68 - SetX = 5,129 - SetY = 5,-50 - SetX = 6,199 - SetY = 6,-82 - SetX = 7,204 - SetY = 7,-126 - SetX = 8,211 - SetY = 8,-195 + SetX = 4,27 + SetY = 4,-131 + SetX = 5,70 + SetY = 5,-150 + SetX = 6,0 + SetY = 6,-117 + SetX = 7,-4 + SetY = 7,-73 + SetX = 8,-11 + SetY = 8,-4 SetVisible = 9,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 4,12 - SetX = 4,139 - SetY = 4,-198 + SetX = 4,60 + SetY = 4,-1 SetZ = 4,31 - SetX = 5,94 - SetY = 5,-168 - SetX = 6,153 - SetY = 6,-173 + SetX = 5,105 + SetY = 5,-31 + SetX = 6,46 + SetY = 6,-26 SetVisible = 7,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 7,12 - SetX = 7,178 - SetY = 7,-196 + SetX = 7,21 + SetY = 7,-3 SetZ = 7,27 SetVisible = 8,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 9,10 - SetX = 9,208 - SetY = 9,-198 + SetX = 9,-8 + SetY = 9,-1 SetZ = 9,27 SetFrame = 10,8 - SetX = 10,212 - SetY = 10,-200 + SetX = 10,-12 + SetY = 10,0 SetFrame = 11,7 - SetX = 11,205 + SetX = 11,-5 SetFrame = 12,6 - SetX = 12,207 - SetY = 12,-195 + SetX = 12,-7 + SetY = 12,-4 SetFrame = 13,5 - SetX = 13,208 + SetX = 13,-8 SetFrame = 14,10 - SetX = 14,213 - SetY = 14,-193 - SetX = 15,208 - SetY = 15,-195 - SetX = 16,169 - SetY = 16,-221 - SetX = 17,208 - SetY = 17,-260 - SetX = 18,184 - SetY = 18,-181 - SetX = 19,218 - SetY = 19,-225 + SetX = 14,-13 + SetY = 14,-6 + SetX = 15,-8 + SetY = 15,-4 + SetX = 16,30 + SetY = 16,21 + SetX = 17,-8 + SetY = 17,60 + SetX = 18,15 + SetY = 18,-18 + SetX = 19,-18 + SetY = 19,25 Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 10,10 - SetX = 10,188 - SetY = 10,-226 + SetX = 10,11 + SetY = 10,26 SetZ = 10,28 SetFrame = 11,8 - SetX = 11,174 + SetX = 11,25 SetFrame = 12,7 - SetX = 12,170 - SetY = 12,-253 + SetX = 12,29 + SetY = 12,53 SetFrame = 13,6 - SetX = 13,168 - SetY = 13,-259 + SetX = 13,31 + SetY = 13,59 SetFrame = 14,5 - SetX = 14,174 - SetY = 14,-256 + SetX = 14,25 + SetY = 14,56 SetFrame = 15,10 - SetX = 15,171 - SetY = 15,-231 - SetX = 16,202 - SetY = 16,-264 - SetX = 17,178 - SetY = 17,-182 - SetX = 18,227 - SetY = 18,-231 + SetX = 15,28 + SetY = 15,31 + SetX = 16,-2 + SetY = 16,64 + SetX = 17,21 + SetY = 17,-17 + SetX = 18,-27 + SetY = 18,31 SetVisible = 19,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 11,10 - SetX = 11,211 - SetY = 11,-237 + SetX = 11,-11 + SetY = 11,37 SetZ = 11,29 SetFrame = 12,8 - SetX = 12,210 - SetY = 12,-262 + SetX = 12,-10 + SetY = 12,62 SetFrame = 13,7 - SetX = 13,213 - SetY = 13,-264 + SetX = 13,-13 + SetY = 13,64 SetFrame = 14,6 - SetX = 14,223 - SetY = 14,-262 + SetX = 14,-23 + SetY = 14,62 SetFrame = 15,5 - SetX = 15,196 - SetY = 15,-223 - SetX = 16,183 - SetY = 16,-182 - SetX = 17,225 - SetY = 17,-226 + SetX = 15,3 + SetY = 15,23 + SetX = 16,16 + SetY = 16,-17 + SetX = 17,-25 + SetY = 17,26 SetVisible = 18,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 12,10 - SetX = 12,185 - SetY = 12,-151 + SetX = 12,14 + SetY = 12,-48 SetZ = 12,30 SetFrame = 13,8 - SetX = 13,176 - SetY = 13,-142 + SetX = 13,23 + SetY = 13,-57 SetFrame = 14,7 - SetX = 14,185 - SetY = 14,-157 + SetX = 14,14 + SetY = 14,-42 SetFrame = 15,6 - SetX = 15,178 - SetY = 15,-173 - SetX = 16,224 - SetY = 16,-228 + SetX = 15,21 + SetY = 15,-26 + SetX = 16,-24 + SetY = 16,28 SetVisible = 17,false Graphic = Examples/leech-seed Focus = UserAndTarget SetFrame = 13,10 - SetX = 13,211 - SetY = 13,-214 + SetX = 13,-11 + SetY = 13,14 SetZ = 13,31 SetFrame = 14,8 - SetX = 14,213 + SetX = 14,-13 SetFrame = 15,7 - SetX = 15,217 - SetY = 15,-239 + SetX = 15,-17 + SetY = 15,39 SetVisible = 16,false Play = 0,Present - Heal diff --git a/PBS/Animations/Example anims/Move/METRONOME.txt b/PBS/Animations/Example anims/Move/METRONOME.txt index 635cf1aeb..ac25c1ed0 100644 --- a/PBS/Animations/Example anims/Move/METRONOME.txt +++ b/PBS/Animations/Example anims/Move/METRONOME.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,METRONOME] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/finger.spoon - Focus = Target + + Graphic = Examples/finger spoon + Focus = User SetX = 0,-210 SetY = 0,126 SetZ = 0,27 @@ -47,15 +45,13 @@ Name = Example anim #------------------------------- [OppMove,METRONOME] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/finger.spoon - Focus = Target + + Graphic = Examples/finger spoon + Focus = User SetFrame = 0,1 SetX = 0,-2 SetY = 0,4 diff --git a/PBS/Animations/Example anims/Move/MIST.txt b/PBS/Animations/Example anims/Move/MIST.txt index e9a5646de..f72d36316 100644 --- a/PBS/Animations/Example anims/Move/MIST.txt +++ b/PBS/Animations/Example anims/Move/MIST.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,MIST] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 4,6 SetX = 4,30 SetY = 4,5 @@ -20,9 +18,9 @@ Name = Example anim SetX = 6,38 SetY = 6,17 SetVisible = 7,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 5,6 SetX = 5,42 SetY = 5,20 @@ -30,9 +28,9 @@ Name = Example anim SetX = 6,-3 SetY = 6,-32 SetVisible = 7,false - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 0,6 SetX = 0,1 SetY = 0,3 diff --git a/PBS/Animations/Example anims/Move/MOONLIGHT.txt b/PBS/Animations/Example anims/Move/MOONLIGHT.txt index e1dd4af82..74eb377bb 100644 --- a/PBS/Animations/Example anims/Move/MOONLIGHT.txt +++ b/PBS/Animations/Example anims/Move/MOONLIGHT.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,MOONLIGHT] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/normal2 - Focus = Target + Focus = User SetFrame = 0,12 SetX = 0,0 SetY = 0,110 diff --git a/PBS/Animations/Example anims/Move/MORNINGSUN.txt b/PBS/Animations/Example anims/Move/MORNINGSUN.txt index 9de4e1892..5128233be 100644 --- a/PBS/Animations/Example anims/Move/MORNINGSUN.txt +++ b/PBS/Animations/Example anims/Move/MORNINGSUN.txt @@ -2,24 +2,22 @@ #------------------------------- [Move,MORNINGSUN] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Heal3 - Focus = Target + Focus = User SetFrame = 10,15 SetX = 10,0 SetY = 10,-26 SetZ = 10,28 SetOpacity = 10,100 SetVisible = 11,false - + Graphic = Examples/Heal3 - Focus = Target + Focus = User SetX = 0,0 SetY = 0,-26 SetZ = 0,27 diff --git a/PBS/Animations/Example anims/Move/POISONSTING.txt b/PBS/Animations/Example anims/Move/POISONSTING.txt index 7e1e0f5d0..209ff1072 100644 --- a/PBS/Animations/Example anims/Move/POISONSTING.txt +++ b/PBS/Animations/Example anims/Move/POISONSTING.txt @@ -49,31 +49,31 @@ Name = Example anim Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 - SetX = 0,174 - SetY = 0,-132 + SetX = 0,25 + SetY = 0,-67 SetZ = 0,27 SetAngle = 0,180 - SetX = 1,149 - SetY = 1,-109 + SetX = 1,50 + SetY = 1,-90 SetFrame = 2,6 - SetX = 2,124 - SetY = 2,-87 - SetX = 3,99 - SetY = 3,-64 - SetX = 4,74 - SetY = 4,-42 + SetX = 2,75 + SetY = 2,-112 + SetX = 3,100 + SetY = 3,-135 + SetX = 4,125 + SetY = 4,-157 SetFrame = 5,7 - SetX = 5,49 - SetY = 5,-20 - SetX = 6,24 - SetY = 6,3 + SetX = 5,150 + SetY = 5,-179 + SetX = 6,175 + SetY = 6,-203 SetFrame = 7,9 - SetX = 7,-4 - SetY = 7,-4 + SetX = 7,204 + SetY = 7,-195 SetAngle = 7,0 SetFrame = 8,3 - SetX = 8,0 - SetY = 8,18 + SetX = 8,200 + SetY = 8,-218 SetFrame = 9,4 Play = 0,throw,80 diff --git a/PBS/Animations/Example anims/Move/PSYCHOCUT.txt b/PBS/Animations/Example anims/Move/PSYCHOCUT.txt index 6be3b7e1d..537f2b77f 100644 --- a/PBS/Animations/Example anims/Move/PSYCHOCUT.txt +++ b/PBS/Animations/Example anims/Move/PSYCHOCUT.txt @@ -145,86 +145,86 @@ Name = Example anim Graphic = Examples/Psycho Cut Focus = UserAndTarget SetFrame = 0,12 - SetX = 0,209 - SetY = 0,-176 + SetX = 0,-9 + SetY = 0,-23 SetZ = 0,28 SetOpacity = 0,128 SetFrame = 1,11 - SetX = 1,192 - SetY = 1,-154 + SetX = 1,7 + SetY = 1,-45 SetOpacity = 1,255 SetFrame = 2,10 - SetX = 2,189 - SetY = 2,-134 + SetX = 2,10 + SetY = 2,-65 SetFrame = 3,8 - SetX = 3,196 - SetY = 3,-115 + SetX = 3,3 + SetY = 3,-84 SetFrame = 4,7 - SetX = 4,209 - SetY = 4,-104 + SetX = 4,-9 + SetY = 4,-95 SetFrame = 5,6 - SetX = 5,221 - SetY = 5,-121 + SetX = 5,-21 + SetY = 5,-78 SetFrame = 6,5 - SetX = 6,225 - SetY = 6,-145 + SetX = 6,-25 + SetY = 6,-54 SetFrame = 7,13 - SetX = 7,224 - SetY = 7,-157 + SetX = 7,-24 + SetY = 7,-42 SetFrame = 8,12 - SetX = 8,209 - SetY = 8,-176 + SetX = 8,-9 + SetY = 8,-23 SetFrame = 9,11 - SetX = 9,192 - SetY = 9,-154 + SetX = 9,7 + SetY = 9,-45 SetFrame = 10,0 SetFlip = 10,true - SetX = 10,172 - SetY = 10,-126 + SetX = 10,27 + SetY = 10,-73 SetOpacity = 10,128 SetFrame = 11,2 - SetX = 11,149 - SetY = 11,-93 + SetX = 11,50 + SetY = 11,-106 SetOpacity = 11,255 SetFrame = 12,1 - SetX = 12,132 - SetY = 12,-84 + SetX = 12,67 + SetY = 12,-115 SetZoomX = 12,125 SetZoomY = 12,125 SetFrame = 13,2 - SetX = 13,121 - SetY = 13,-64 + SetX = 13,78 + SetY = 13,-135 SetZoomX = 13,150 SetZoomY = 13,150 SetFrame = 14,1 - SetX = 14,96 - SetY = 14,-51 + SetX = 14,103 + SetY = 14,-148 SetZoomX = 14,160 SetZoomY = 14,160 SetFrame = 15,2 - SetX = 15,74 - SetY = 15,-25 + SetX = 15,125 + SetY = 15,-175 SetZoomX = 15,170 SetZoomY = 15,170 SetFrame = 16,1 - SetX = 16,46 - SetY = 16,-14 + SetX = 16,153 + SetY = 16,-185 SetZoomX = 16,180 SetZoomY = 16,180 SetOpacity = 16,192 SetFrame = 17,2 - SetX = 17,17 - SetY = 17,26 + SetX = 17,182 + SetY = 17,-226 SetOpacity = 17,128 - SetX = 18,-10 - SetY = 18,62 + SetX = 18,210 + SetY = 18,-262 SetOpacity = 18,64 Graphic = Examples/Psycho Cut Focus = UserAndTarget SetFrame = 0,15 - SetX = 0,203 - SetY = 0,-153 + SetX = 0,-3 + SetY = 0,-46 SetZ = 0,27 SetOpacity = 0,128 SetAngle = 1,45 diff --git a/PBS/Animations/Example anims/Move/RAINDANCE.txt b/PBS/Animations/Example anims/Move/RAINDANCE.txt index c450fede7..caf99aef1 100644 --- a/PBS/Animations/Example anims/Move/RAINDANCE.txt +++ b/PBS/Animations/Example anims/Move/RAINDANCE.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,RAINDANCE] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -32,7 +30,7 @@ Name = Example anim SetY = 8,218 SetX = 9,99 SetY = 9,55 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -57,7 +55,7 @@ Name = Example anim SetY = 8,251 SetX = 9,253 SetY = 9,148 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -82,7 +80,7 @@ Name = Example anim SetY = 8,110 SetX = 9,254 SetY = 9,274 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -107,7 +105,7 @@ Name = Example anim SetY = 8,59 SetX = 9,418 SetY = 9,243 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -132,7 +130,7 @@ Name = Example anim SetY = 8,204 SetX = 9,181 SetY = 9,238 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -157,7 +155,7 @@ Name = Example anim SetY = 8,63 SetX = 9,108 SetY = 9,245 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -182,7 +180,7 @@ Name = Example anim SetY = 8,173 SetX = 9,25 SetY = 9,205 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,2 @@ -207,7 +205,7 @@ Name = Example anim SetY = 8,144 SetX = 9,148 SetY = 9,25 - + Graphic = Examples/weather Focus = Foreground SetFrame = 1,2 @@ -223,7 +221,7 @@ Name = Example anim SetX = 5,422 SetY = 5,252 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,2 @@ -237,7 +235,7 @@ Name = Example anim SetX = 5,319 SetY = 5,241 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,2 @@ -245,7 +243,7 @@ Name = Example anim SetY = 4,203 SetZ = 4,37 SetVisible = 5,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 @@ -253,7 +251,7 @@ Name = Example anim SetY = 7,126 SetZ = 7,35 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 @@ -261,7 +259,7 @@ Name = Example anim SetY = 7,237 SetZ = 7,36 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,2 @@ -269,28 +267,28 @@ Name = Example anim SetY = 7,194 SetZ = 7,37 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,247 SetY = 9,72 SetZ = 9,35 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,365 SetY = 9,42 SetZ = 9,36 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 SetX = 9,479 SetY = 9,180 SetZ = 9,37 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,2 diff --git a/PBS/Animations/Example anims/Move/REFLECT.txt b/PBS/Animations/Example anims/Move/REFLECT.txt index 44ad29807..f2e98a5d7 100644 --- a/PBS/Animations/Example anims/Move/REFLECT.txt +++ b/PBS/Animations/Example anims/Move/REFLECT.txt @@ -2,28 +2,13 @@ #------------------------------- [Move,REFLECT] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 Graphic = Examples/normal2 - Focus = Target - SetFrame = 0,11 - SetX = 0,-8 - SetY = 0,-10 - SetZ = 0,27 - SetOpacity = 0,75 - SetOpacity = 1,100 - SetOpacity = 2,150 - SetOpacity = 3,255 - SetOpacity = 6,150 - SetOpacity = 7,100 - - Graphic = Examples/normal2 - Focus = Target + Focus = User SetX = 1,-56 SetY = 1,-114 SetZ = 1,28 @@ -41,9 +26,9 @@ Name = Example anim SetY = 6,142 SetX = 7,-72 SetY = 7,126 - + Graphic = Examples/normal2 - Focus = Target + Focus = User SetX = 1,80 SetY = 1,-106 SetZ = 1,29 @@ -59,9 +44,9 @@ Name = Example anim SetY = 6,54 SetX = 7,48 SetY = 7,134 - + Graphic = Examples/normal2 - Focus = Target + Focus = User SetX = 2,8 SetY = 2,-114 SetZ = 2,30 @@ -73,9 +58,9 @@ Name = Example anim SetX = 6,80 SetY = 6,30 SetVisible = 7,false - + Graphic = Examples/normal2 - Focus = Target + Focus = User SetX = 3,-56 SetY = 3,-114 SetZ = 3,31 @@ -84,14 +69,27 @@ Name = Example anim SetX = 5,-64 SetY = 5,-18 SetVisible = 6,false - + Graphic = Examples/normal2 - Focus = Target + Focus = User SetX = 4,48 SetY = 4,-106 SetZ = 4,32 SetX = 5,16 SetY = 5,-42 SetVisible = 6,false + + Graphic = Examples/normal2 + Focus = User + SetFrame = 0,11 + SetX = 0,-8 + SetY = 0,-10 + SetZ = 0,27 + SetOpacity = 0,75 + SetOpacity = 1,100 + SetOpacity = 2,150 + SetOpacity = 3,255 + SetOpacity = 6,150 + SetOpacity = 7,100 Play = 0,Saint7,80 diff --git a/PBS/Animations/Example anims/Move/REST.txt b/PBS/Animations/Example anims/Move/REST.txt index 7315388c1..6ce812696 100644 --- a/PBS/Animations/Example anims/Move/REST.txt +++ b/PBS/Animations/Example anims/Move/REST.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,REST] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/fly copy - Focus = Target + Focus = User SetFrame = 0,20 SetX = 0,-27 SetY = 0,-29 diff --git a/PBS/Animations/Example anims/Move/SANDATTACK.txt b/PBS/Animations/Example anims/Move/SANDATTACK.txt index 31527ff27..58eb9f735 100644 --- a/PBS/Animations/Example anims/Move/SANDATTACK.txt +++ b/PBS/Animations/Example anims/Move/SANDATTACK.txt @@ -328,300 +328,300 @@ Name = Example anim Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 0,2 - SetX = 0,194 - SetY = 0,-153 + SetX = 0,5 + SetY = 0,-46 SetZ = 0,27 - SetX = 1,175 - SetY = 1,-128 - SetX = 2,145 - SetY = 2,-101 - SetX = 3,115 - SetY = 3,-75 - SetX = 4,87 - SetY = 4,-46 - SetX = 5,58 - SetY = 5,-20 - SetX = 6,28 - SetY = 6,6 - SetX = 7,0 - SetY = 7,34 + SetX = 1,25 + SetY = 1,-71 + SetX = 2,54 + SetY = 2,-98 + SetX = 3,84 + SetY = 3,-125 + SetX = 4,112 + SetY = 4,-153 + SetX = 5,141 + SetY = 5,-179 + SetX = 6,171 + SetY = 6,-206 + SetX = 7,200 + SetY = 7,-234 SetFrame = 8,0 - SetX = 8,184 - SetY = 8,-128 + SetX = 8,15 + SetY = 8,-71 SetAngle = 8,270 - SetX = 9,150 - SetY = 9,-109 - SetX = 10,121 - SetY = 10,-89 - SetX = 11,94 - SetY = 11,-70 - SetX = 12,67 - SetY = 12,-50 - SetX = 13,39 - SetY = 13,-29 - SetX = 14,12 - SetY = 14,-10 - SetX = 15,-15 - SetY = 15,9 + SetX = 9,50 + SetY = 9,-90 + SetX = 10,78 + SetY = 10,-110 + SetX = 11,105 + SetY = 11,-129 + SetX = 12,132 + SetY = 12,-150 + SetX = 13,160 + SetY = 13,-170 + SetX = 14,187 + SetY = 14,-189 + SetX = 15,215 + SetY = 15,-209 Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 1,1 - SetX = 1,164 - SetY = 1,-157 + SetX = 1,35 + SetY = 1,-42 SetZ = 1,28 - SetX = 2,134 - SetY = 2,-134 - SetX = 3,104 - SetY = 3,-110 - SetX = 4,75 - SetY = 4,-87 - SetX = 5,44 - SetY = 5,-64 - SetX = 6,14 - SetY = 6,-40 - SetX = 7,-15 - SetY = 7,-15 + SetX = 2,65 + SetY = 2,-65 + SetX = 3,95 + SetY = 3,-89 + SetX = 4,125 + SetY = 4,-112 + SetX = 5,155 + SetY = 5,-135 + SetX = 6,185 + SetY = 6,-159 + SetX = 7,215 + SetY = 7,-184 SetVisible = 8,false Graphic = Examples/Sand-Attack Focus = UserAndTarget - SetX = 1,175 - SetY = 1,-128 + SetX = 1,25 + SetY = 1,-71 SetZ = 1,29 - SetX = 2,144 - SetY = 2,-107 - SetX = 3,114 - SetY = 3,-87 - SetX = 4,84 - SetY = 4,-67 - SetX = 5,54 - SetY = 5,-46 - SetX = 6,25 - SetY = 6,-26 - SetX = 7,-5 - SetY = 7,-6 + SetX = 2,55 + SetY = 2,-92 + SetX = 3,85 + SetY = 3,-112 + SetX = 4,115 + SetY = 4,-132 + SetX = 5,145 + SetY = 5,-153 + SetX = 6,175 + SetY = 6,-173 + SetX = 7,205 + SetY = 7,-193 SetVisible = 8,false Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 2,1 - SetX = 2,189 - SetY = 2,-168 + SetX = 2,10 + SetY = 2,-31 SetZ = 2,30 - SetX = 3,154 - SetY = 3,-148 - SetX = 4,127 - SetY = 4,-126 + SetX = 3,45 + SetY = 3,-51 + SetX = 4,72 + SetY = 4,-73 SetX = 5,100 - SetY = 5,-104 - SetX = 6,71 - SetY = 6,-84 - SetX = 7,44 - SetY = 7,-64 - SetX = 8,17 - SetY = 8,-42 - SetX = 9,-10 - SetY = 9,-20 + SetY = 5,-95 + SetX = 6,128 + SetY = 6,-115 + SetX = 7,155 + SetY = 7,-135 + SetX = 8,182 + SetY = 8,-157 + SetX = 9,210 + SetY = 9,-179 SetVisible = 10,false Graphic = Examples/Sand-Attack Focus = UserAndTarget - SetX = 3,164 - SetY = 3,-118 + SetX = 3,35 + SetY = 3,-81 SetZ = 3,31 - SetX = 4,135 - SetY = 4,-101 - SetX = 5,107 - SetY = 5,-87 - SetX = 6,79 - SetY = 6,-70 - SetX = 7,51 - SetY = 7,-53 - SetX = 8,23 - SetY = 8,-37 - SetX = 9,-5 - SetY = 9,-20 + SetX = 4,64 + SetY = 4,-98 + SetX = 5,92 + SetY = 5,-112 + SetX = 6,120 + SetY = 6,-129 + SetX = 7,148 + SetY = 7,-146 + SetX = 8,176 + SetY = 8,-162 + SetX = 9,205 + SetY = 9,-179 SetVisible = 10,false Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 3,2 - SetX = 3,164 - SetY = 3,-118 + SetX = 3,35 + SetY = 3,-81 SetZ = 3,32 - SetX = 4,137 - SetY = 4,-93 - SetX = 5,110 - SetY = 5,-67 - SetX = 6,84 - SetY = 6,-40 - SetX = 7,58 - SetY = 7,-14 - SetX = 8,31 - SetY = 8,10 - SetX = 9,4 - SetY = 9,39 + SetX = 4,62 + SetY = 4,-106 + SetX = 5,89 + SetY = 5,-132 + SetX = 6,115 + SetY = 6,-159 + SetX = 7,141 + SetY = 7,-185 + SetX = 8,168 + SetY = 8,-210 + SetX = 9,195 + SetY = 9,-239 SetVisible = 10,false Graphic = Examples/Sand-Attack Focus = UserAndTarget - SetX = 4,209 - SetY = 4,-128 + SetX = 4,-9 + SetY = 4,-71 SetZ = 4,33 - SetX = 5,175 - SetY = 5,-89 - SetX = 6,147 - SetY = 6,-67 - SetX = 7,121 - SetY = 7,-43 - SetX = 8,94 - SetY = 8,-20 - SetX = 9,68 - SetY = 9,1 - SetX = 10,41 - SetY = 10,25 - SetX = 11,14 - SetY = 11,48 + SetX = 5,25 + SetY = 5,-110 + SetX = 6,52 + SetY = 6,-132 + SetX = 7,78 + SetY = 7,-156 + SetX = 8,105 + SetY = 8,-179 + SetX = 9,131 + SetY = 9,-201 + SetX = 10,158 + SetY = 10,-225 + SetX = 11,185 + SetY = 11,-248 SetVisible = 12,false Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 5,2 - SetX = 5,159 - SetY = 5,-128 + SetX = 5,40 + SetY = 5,-71 SetZ = 5,34 - SetX = 6,131 - SetY = 6,-109 - SetX = 7,103 - SetY = 7,-89 - SetX = 8,75 - SetY = 8,-70 - SetX = 9,46 - SetY = 9,-50 - SetX = 10,18 - SetY = 10,-29 - SetX = 11,-10 - SetY = 11,-10 + SetX = 6,68 + SetY = 6,-90 + SetX = 7,96 + SetY = 7,-110 + SetX = 8,125 + SetY = 8,-129 + SetX = 9,153 + SetY = 9,-150 + SetX = 10,181 + SetY = 10,-170 + SetX = 11,210 + SetY = 11,-189 SetVisible = 12,false Graphic = Examples/Sand-Attack Focus = UserAndTarget - SetX = 5,164 - SetY = 5,-118 + SetX = 5,35 + SetY = 5,-81 SetZ = 5,35 - SetX = 6,135 - SetY = 6,-101 - SetX = 7,106 - SetY = 7,-87 - SetX = 8,77 - SetY = 8,-70 - SetX = 9,48 - SetY = 9,-53 - SetX = 10,18 - SetY = 10,-37 - SetX = 11,-10 - SetY = 11,-20 + SetX = 6,64 + SetY = 6,-98 + SetX = 7,93 + SetY = 7,-112 + SetX = 8,122 + SetY = 8,-129 + SetX = 9,151 + SetY = 9,-146 + SetX = 10,181 + SetY = 10,-162 + SetX = 11,210 + SetY = 11,-179 SetVisible = 12,false Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFlip = 6,true - SetX = 6,194 - SetY = 6,-128 + SetX = 6,5 + SetY = 6,-71 SetZ = 6,36 - SetX = 7,159 - SetY = 7,-109 - SetX = 8,131 - SetY = 8,-89 - SetX = 9,103 - SetY = 9,-70 - SetX = 10,75 - SetY = 10,-50 - SetX = 11,46 - SetY = 11,-29 - SetX = 12,19 - SetY = 12,-10 - SetX = 13,-10 - SetY = 13,9 + SetX = 7,40 + SetY = 7,-90 + SetX = 8,68 + SetY = 8,-110 + SetX = 9,96 + SetY = 9,-129 + SetX = 10,125 + SetY = 10,-150 + SetX = 11,153 + SetY = 11,-170 + SetX = 12,180 + SetY = 12,-189 + SetX = 13,210 + SetY = 13,-209 SetVisible = 14,false Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 7,2 - SetX = 7,154 - SetY = 7,-148 + SetX = 7,45 + SetY = 7,-51 SetZ = 7,37 - SetX = 8,125 - SetY = 8,-131 - SetX = 9,98 - SetY = 9,-115 - SetX = 10,69 - SetY = 10,-98 - SetX = 11,41 - SetY = 11,-82 - SetX = 12,13 - SetY = 12,-67 - SetX = 13,-15 - SetY = 13,-50 + SetX = 8,74 + SetY = 8,-68 + SetX = 9,101 + SetY = 9,-84 + SetX = 10,130 + SetY = 10,-101 + SetX = 11,158 + SetY = 11,-117 + SetX = 12,186 + SetY = 12,-132 + SetX = 13,215 + SetY = 13,-150 SetVisible = 14,false Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 7,1 SetFlip = 7,true - SetX = 7,179 - SetY = 7,-139 + SetX = 7,20 + SetY = 7,-60 SetZ = 7,38 - SetX = 8,152 - SetY = 8,-114 - SetX = 9,125 - SetY = 9,-89 - SetX = 10,96 - SetY = 10,-64 - SetX = 11,69 - SetY = 11,-40 - SetX = 12,42 - SetY = 12,-15 - SetX = 13,14 - SetY = 13,9 + SetX = 8,47 + SetY = 8,-85 + SetX = 9,75 + SetY = 9,-110 + SetX = 10,103 + SetY = 10,-135 + SetX = 11,130 + SetY = 11,-159 + SetX = 12,157 + SetY = 12,-184 + SetX = 13,185 + SetY = 13,-209 SetVisible = 14,false Graphic = Examples/Sand-Attack Focus = UserAndTarget - SetX = 9,164 - SetY = 9,-109 + SetX = 9,35 + SetY = 9,-90 SetZ = 9,28 - SetX = 10,135 - SetY = 10,-93 - SetX = 11,107 - SetY = 11,-79 - SetX = 12,79 - SetY = 12,-64 - SetX = 13,51 - SetY = 13,-50 - SetX = 14,23 - SetY = 14,-35 - SetX = 15,-5 - SetY = 15,-20 + SetX = 10,64 + SetY = 10,-106 + SetX = 11,92 + SetY = 11,-120 + SetX = 12,120 + SetY = 12,-135 + SetX = 13,148 + SetY = 13,-150 + SetX = 14,176 + SetY = 14,-164 + SetX = 15,205 + SetY = 15,-179 Graphic = Examples/Sand-Attack Focus = UserAndTarget SetFrame = 9,2 - SetX = 9,164 - SetY = 9,-109 + SetX = 9,35 + SetY = 9,-90 SetZ = 9,29 - SetX = 10,137 - SetY = 10,-87 - SetX = 11,109 - SetY = 11,-64 - SetX = 12,82 - SetY = 12,-40 - SetX = 13,54 - SetY = 13,-18 - SetX = 14,27 - SetY = 14,4 - SetX = 15,0 - SetY = 15,28 + SetX = 10,62 + SetY = 10,-112 + SetX = 11,90 + SetY = 11,-135 + SetX = 12,117 + SetY = 12,-159 + SetX = 13,145 + SetY = 13,-181 + SetX = 14,172 + SetY = 14,-204 + SetX = 15,200 + SetY = 15,-228 Play = 0,Sand diff --git a/PBS/Animations/Example anims/Move/SANDSTORM.txt b/PBS/Animations/Example anims/Move/SANDSTORM.txt index 541e5bb20..2d12b1b84 100644 --- a/PBS/Animations/Example anims/Move/SANDSTORM.txt +++ b/PBS/Animations/Example anims/Move/SANDSTORM.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,SANDSTORM] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -33,7 +31,7 @@ Name = Example anim SetY = 8,62 SetX = 9,32 SetY = 9,252 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -58,7 +56,7 @@ Name = Example anim SetY = 8,85 SetX = 9,119 SetY = 9,175 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -83,7 +81,7 @@ Name = Example anim SetY = 8,223 SetX = 9,143 SetY = 9,267 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -108,7 +106,7 @@ Name = Example anim SetY = 8,207 SetX = 9,222 SetY = 9,197 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -133,7 +131,7 @@ Name = Example anim SetY = 8,253 SetX = 9,162 SetY = 9,82 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -158,7 +156,7 @@ Name = Example anim SetY = 8,227 SetX = 9,49 SetY = 9,61 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -183,7 +181,7 @@ Name = Example anim SetY = 8,76 SetX = 9,21 SetY = 9,158 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -208,7 +206,7 @@ Name = Example anim SetY = 8,130 SetX = 9,350 SetY = 9,240 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -233,7 +231,7 @@ Name = Example anim SetY = 8,142 SetX = 9,481 SetY = 9,206 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -258,7 +256,7 @@ Name = Example anim SetY = 8,22 SetX = 9,456 SetY = 9,64 - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -266,7 +264,7 @@ Name = Example anim SetY = 0,32 SetZ = 0,37 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -274,7 +272,7 @@ Name = Example anim SetY = 0,135 SetZ = 0,38 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -282,7 +280,7 @@ Name = Example anim SetY = 0,18 SetZ = 0,39 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 0,3 @@ -290,7 +288,7 @@ Name = Example anim SetY = 0,9 SetZ = 0,40 SetVisible = 1,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -298,7 +296,7 @@ Name = Example anim SetY = 2,32 SetZ = 2,37 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -306,7 +304,7 @@ Name = Example anim SetY = 2,135 SetZ = 2,38 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -314,7 +312,7 @@ Name = Example anim SetY = 2,18 SetZ = 2,39 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 2,3 @@ -322,7 +320,7 @@ Name = Example anim SetY = 2,9 SetZ = 2,40 SetVisible = 3,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 @@ -332,7 +330,7 @@ Name = Example anim SetX = 5,487 SetY = 5,32 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 4,3 @@ -342,7 +340,7 @@ Name = Example anim SetX = 5,492 SetY = 5,135 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 @@ -350,7 +348,7 @@ Name = Example anim SetY = 5,18 SetZ = 5,39 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 5,3 @@ -358,7 +356,7 @@ Name = Example anim SetY = 5,9 SetZ = 5,40 SetVisible = 6,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -366,7 +364,7 @@ Name = Example anim SetY = 7,32 SetZ = 7,37 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -374,7 +372,7 @@ Name = Example anim SetY = 7,135 SetZ = 7,38 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -382,7 +380,7 @@ Name = Example anim SetY = 7,18 SetZ = 7,39 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 7,3 @@ -390,21 +388,21 @@ Name = Example anim SetY = 7,9 SetZ = 7,40 SetVisible = 8,false - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,311 SetY = 9,55 SetZ = 9,37 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 SetX = 9,328 SetY = 9,146 SetZ = 9,38 - + Graphic = Examples/weather Focus = Foreground SetFrame = 9,3 diff --git a/PBS/Animations/Example anims/Move/SING.txt b/PBS/Animations/Example anims/Move/SING.txt index d6f075c84..cddd0ba75 100644 --- a/PBS/Animations/Example anims/Move/SING.txt +++ b/PBS/Animations/Example anims/Move/SING.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 0,7 SetX = 0,-184 @@ -152,7 +152,7 @@ Name = Example anim SetY = 51,-85 SetVisible = 52,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 1,7 SetX = 1,-173 @@ -291,7 +291,7 @@ Name = Example anim SetY = 50,-89 SetVisible = 51,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 2,8 SetX = 2,-148 @@ -299,7 +299,7 @@ Name = Example anim SetZ = 2,29 SetVisible = 3,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 4,10 SetX = 4,-127 @@ -433,7 +433,7 @@ Name = Example anim SetY = 50,-76 SetVisible = 51,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 8,7 SetX = 8,-162 @@ -522,7 +522,7 @@ Name = Example anim SetY = 38,17 SetVisible = 39,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 13,8 SetX = 13,-102 @@ -598,7 +598,7 @@ Name = Example anim SetY = 38,-6 SetVisible = 39,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 15,8 SetX = 15,45 @@ -608,7 +608,7 @@ Name = Example anim SetY = 16,61 SetVisible = 17,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 15,9 SetX = 15,53 @@ -619,7 +619,7 @@ Name = Example anim SetY = 16,-12 SetVisible = 17,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 16,8 SetX = 16,33 @@ -627,7 +627,7 @@ Name = Example anim SetZ = 16,34 SetVisible = 17,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 16,10 SetX = 16,33 @@ -635,7 +635,7 @@ Name = Example anim SetZ = 16,35 SetVisible = 17,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 18,8 SetX = 18,42 @@ -653,7 +653,7 @@ Name = Example anim SetY = 22,9 SetVisible = 23,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 24,9 SetX = 24,-129 @@ -661,7 +661,7 @@ Name = Example anim SetZ = 24,32 SetVisible = 25,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 25,10 SetX = 25,29 @@ -669,7 +669,7 @@ Name = Example anim SetZ = 25,33 SetVisible = 26,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 27,9 SetX = 27,-152 @@ -679,7 +679,7 @@ Name = Example anim SetY = 28,-8 SetVisible = 29,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 27,11 SetX = 27,-175 @@ -687,7 +687,7 @@ Name = Example anim SetZ = 27,33 SetVisible = 28,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 31,9 SetX = 31,18 @@ -706,7 +706,7 @@ Name = Example anim SetY = 35,16 SetVisible = 36,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 31,11 SetX = 31,16 @@ -725,7 +725,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 0,7 SetX = 0,-20 @@ -837,7 +837,7 @@ Name = Example anim SetY = 40,23 SetOpacity = 40,255 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 0,8 SetX = 0,-19 @@ -948,7 +948,7 @@ Name = Example anim SetX = 40,-201 SetY = 40,4 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 4,9 SetX = 4,-84 @@ -1052,7 +1052,7 @@ Name = Example anim SetX = 40,-215 SetY = 40,43 - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 4,10 SetX = 4,-79 @@ -1065,7 +1065,7 @@ Name = Example anim SetY = 6,25 SetVisible = 7,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 9,11 SetX = 9,-3 @@ -1084,7 +1084,7 @@ Name = Example anim SetY = 13,45 SetVisible = 14,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 10,9 SetX = 10,-4 @@ -1099,7 +1099,7 @@ Name = Example anim SetY = 13,44 SetVisible = 14,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 11,11 SetX = 11,-65 @@ -1107,7 +1107,7 @@ Name = Example anim SetZ = 11,32 SetVisible = 12,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 13,10 SetX = 13,-23 @@ -1115,7 +1115,7 @@ Name = Example anim SetZ = 13,32 SetVisible = 14,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 16,11 SetX = 16,-97 @@ -1126,7 +1126,7 @@ Name = Example anim SetY = 17,155 SetVisible = 18,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 16,10 SetX = 16,-102 @@ -1137,7 +1137,7 @@ Name = Example anim SetY = 17,149 SetVisible = 18,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 19,11 SetX = 19,-6 @@ -1155,7 +1155,7 @@ Name = Example anim SetY = 23,55 SetVisible = 24,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 20,8 SetX = 20,-17 @@ -1166,7 +1166,7 @@ Name = Example anim SetY = 21,108 SetVisible = 22,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 23,10 SetX = 23,-15 @@ -1174,7 +1174,7 @@ Name = Example anim SetZ = 23,31 SetVisible = 24,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 23,11 SetX = 23,-49 @@ -1182,7 +1182,7 @@ Name = Example anim SetZ = 23,32 SetVisible = 24,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 26,9 SetX = 26,-112 @@ -1208,7 +1208,7 @@ Name = Example anim SetY = 33,164 SetVisible = 34,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 26,8 SetX = 26,-134 @@ -1235,7 +1235,7 @@ Name = Example anim SetY = 33,147 SetVisible = 34,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 27,10 SetX = 27,-143 @@ -1245,7 +1245,7 @@ Name = Example anim SetY = 28,126 SetVisible = 29,false - Graphic = Examples/poi.hear.mus + Graphic = Examples/poi hear mus Focus = Target SetFrame = 30,11 SetX = 30,-122 diff --git a/PBS/Animations/Example anims/Move/SPIKES.txt b/PBS/Animations/Example anims/Move/SPIKES.txt index bea27f60e..6717254d8 100644 --- a/PBS/Animations/Example anims/Move/SPIKES.txt +++ b/PBS/Animations/Example anims/Move/SPIKES.txt @@ -2,84 +2,82 @@ #------------------------------- [Move,SPIKES] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/normal2 - Focus = UserAndTarget + Focus = User SetFrame = 3,13 SetX = 3,0 - SetY = 3,18 + SetY = 3,12 SetZ = 3,28 SetZoomX = 3,50 SetZoomY = 3,50 - SetX = 4,19 - SetY = 4,-109 - SetX = 5,44 - SetY = 5,-178 + SetX = 4,25 + SetY = 4,-70 + SetX = 5,57 + SetY = 5,-114 SetX = 6,0 - SetY = 6,9 - SetX = 7,14 - SetY = 7,-118 - SetX = 8,189 - SetY = 8,-246 - SetX = 9,219 - SetY = 9,-148 - SetX = 10,139 - SetX = 12,179 - SetY = 12,-178 - SetX = 13,139 - SetY = 13,-148 - + SetY = 6,6 + SetX = 7,19 + SetY = 7,-76 + SetX = 8,243 + SetY = 8,-158 + SetX = 9,281 + SetY = 9,-95 + SetX = 10,179 + SetX = 12,230 + SetY = 12,-114 + SetX = 13,179 + SetY = 13,-95 + Graphic = Examples/normal2 - Focus = UserAndTarget + Focus = User SetFrame = 6,13 - SetX = 6,89 - SetY = 6,-217 + SetX = 6,115 + SetY = 6,-139 SetZ = 6,29 SetZoomX = 6,50 SetZoomY = 6,50 - SetX = 7,139 - SetY = 7,-148 - SetX = 8,59 - SetY = 8,-217 - SetX = 9,139 - SetY = 9,-148 - SetX = 10,219 - + SetX = 7,179 + SetY = 7,-95 + SetX = 8,76 + SetY = 8,-139 + SetX = 9,179 + SetY = 9,-95 + SetX = 10,281 + Graphic = Examples/normal2 - Focus = UserAndTarget + Focus = User SetFrame = 0,13 SetX = 0,0 - SetY = 0,-20 + SetY = 0,-13 SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 - SetX = 1,9 - SetY = 1,-98 - SetX = 2,29 - SetY = 2,-168 - SetX = 3,64 - SetY = 3,-217 - SetX = 4,109 - SetY = 4,-207 - SetX = 5,139 - SetY = 5,-148 - SetX = 7,125 - SetY = 7,-256 - SetX = 8,139 - SetY = 8,-148 - SetY = 9,-276 - SetX = 10,179 - SetY = 10,-178 - SetX = 12,139 - SetY = 12,-148 - SetX = 13,179 - SetY = 13,-178 + SetX = 1,12 + SetY = 1,-63 + SetX = 2,38 + SetY = 2,-108 + SetX = 3,83 + SetY = 3,-139 + SetX = 4,140 + SetY = 4,-133 + SetX = 5,179 + SetY = 5,-95 + SetX = 7,160 + SetY = 7,-164 + SetX = 8,179 + SetY = 8,-95 + SetY = 9,-177 + SetX = 10,230 + SetY = 10,-114 + SetX = 12,179 + SetY = 12,-95 + SetX = 13,230 + SetY = 13,-114 Play = 1,throw,80 Play = 5,Sword1,80 diff --git a/PBS/Animations/Example anims/Move/SPLASH.txt b/PBS/Animations/Example anims/Move/SPLASH.txt index 2f8687d27..a32e7d618 100644 --- a/PBS/Animations/Example anims/Move/SPLASH.txt +++ b/PBS/Animations/Example anims/Move/SPLASH.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,SPLASH] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/poison2 Focus = User SetFlip = 1,true @@ -16,7 +14,7 @@ Name = Example anim SetY = 1,6 SetZ = 1,28 SetVisible = 2,false - + Graphic = Examples/poison2 Focus = User SetFrame = 2,1 @@ -24,7 +22,7 @@ Name = Example anim SetY = 2,-2 SetZ = 2,29 SetVisible = 3,false - + Graphic = Examples/poison2 Focus = User SetFrame = 3,1 @@ -49,7 +47,7 @@ Name = Example anim SetY = 8,-26 SetFrame = 9,2 SetX = 9,-120 - + Graphic = Examples/poison2 Focus = User SetX = 4,80 @@ -60,7 +58,7 @@ Name = Example anim SetFlip = 6,true SetX = 6,-64 SetVisible = 7,false - + Graphic = Examples/poison2 Focus = User SetX = 0,56 diff --git a/PBS/Animations/Example anims/Move/STEALTHROCK.txt b/PBS/Animations/Example anims/Move/STEALTHROCK.txt index b80596026..2a4d0e404 100644 --- a/PBS/Animations/Example anims/Move/STEALTHROCK.txt +++ b/PBS/Animations/Example anims/Move/STEALTHROCK.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,STEALTHROCK] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 0,5 @@ -88,7 +86,7 @@ Name = Example anim SetOpacity = 27,128 SetOpacity = 28,64 SetVisible = 29,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 4,5 @@ -160,7 +158,7 @@ Name = Example anim SetOpacity = 27,128 SetOpacity = 28,64 SetVisible = 29,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 7,431 @@ -207,7 +205,7 @@ Name = Example anim SetY = 21,181 SetOpacity = 21,255 SetVisible = 25,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 7,3 @@ -220,7 +218,7 @@ Name = Example anim SetY = 8,188 SetOpacity = 8,192 SetVisible = 9,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 8,3 @@ -242,7 +240,7 @@ Name = Example anim SetX = 21,444 SetY = 21,176 SetVisible = 25,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,1 @@ -264,7 +262,7 @@ Name = Example anim SetX = 17,395 SetY = 17,190 SetVisible = 21,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,2 @@ -278,7 +276,7 @@ Name = Example anim SetX = 16,352 SetY = 16,186 SetVisible = 17,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 12,1 @@ -287,7 +285,7 @@ Name = Example anim SetZ = 12,33 SetOpacity = 12,192 SetVisible = 13,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 15,323 @@ -296,7 +294,7 @@ Name = Example anim SetOpacity = 15,128 SetOpacity = 16,192 SetVisible = 17,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 15,3 @@ -306,7 +304,7 @@ Name = Example anim SetOpacity = 15,128 SetOpacity = 16,192 SetVisible = 17,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,1 @@ -319,7 +317,7 @@ Name = Example anim SetY = 20,181 SetOpacity = 20,192 SetVisible = 21,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,2 @@ -337,13 +335,11 @@ Name = Example anim #------------------------------- [OppMove,STEALTHROCK] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 0,5 @@ -423,7 +419,7 @@ Name = Example anim SetOpacity = 27,128 SetOpacity = 28,64 SetVisible = 29,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 4,5 @@ -495,7 +491,7 @@ Name = Example anim SetOpacity = 27,128 SetOpacity = 28,64 SetVisible = 29,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 7,207 @@ -542,7 +538,7 @@ Name = Example anim SetY = 21,277 SetOpacity = 21,255 SetVisible = 25,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 7,3 @@ -555,7 +551,7 @@ Name = Example anim SetY = 8,284 SetOpacity = 8,192 SetVisible = 9,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 8,3 @@ -577,7 +573,7 @@ Name = Example anim SetX = 21,220 SetY = 21,272 SetVisible = 25,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,1 @@ -599,7 +595,7 @@ Name = Example anim SetX = 17,171 SetY = 17,286 SetVisible = 21,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 11,2 @@ -613,7 +609,7 @@ Name = Example anim SetX = 16,128 SetY = 16,282 SetVisible = 17,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 12,1 @@ -622,7 +618,7 @@ Name = Example anim SetZ = 12,33 SetOpacity = 12,192 SetVisible = 13,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetX = 15,99 @@ -631,7 +627,7 @@ Name = Example anim SetOpacity = 15,128 SetOpacity = 16,192 SetVisible = 17,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 15,3 @@ -641,7 +637,7 @@ Name = Example anim SetOpacity = 15,128 SetOpacity = 16,192 SetVisible = 17,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,1 @@ -654,7 +650,7 @@ Name = Example anim SetY = 20,277 SetOpacity = 20,192 SetVisible = 21,false - + Graphic = Examples/Rock Tomb Focus = Foreground SetFrame = 19,2 diff --git a/PBS/Animations/Example anims/Move/SUNNYDAY.txt b/PBS/Animations/Example anims/Move/SUNNYDAY.txt index 097b77c80..6b17fee1f 100644 --- a/PBS/Animations/Example anims/Move/SUNNYDAY.txt +++ b/PBS/Animations/Example anims/Move/SUNNYDAY.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,SUNNYDAY] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/weather Focus = Foreground SetX = 0,64 diff --git a/PBS/Animations/Example anims/Move/SWORDSDANCE.txt b/PBS/Animations/Example anims/Move/SWORDSDANCE.txt index d0b7c2de8..42aa2e934 100644 --- a/PBS/Animations/Example anims/Move/SWORDSDANCE.txt +++ b/PBS/Animations/Example anims/Move/SWORDSDANCE.txt @@ -2,15 +2,96 @@ #------------------------------- [Move,SWORDSDANCE] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 Graphic = Examples/fly copy - Focus = Target + Focus = User + SetFrame = 0,10 + SetX = 0,52 + SetY = 0,123 + SetZ = 0,28 + SetX = 1,50 + SetY = 1,81 + SetX = 2,-36 + SetY = 2,54 + SetX = 3,-34 + SetY = 3,-15 + SetX = 4,51 + SetY = 4,-64 + SetFrame = 5,13 + SetX = 5,-43 + SetY = 5,11 + SetX = 6,-15 + SetY = 6,31 + SetFrame = 7,14 + SetX = 7,19 + SetY = 7,-15 + SetFrame = 8,13 + SetX = 8,-1 + SetY = 8,21 + SetX = 9,-67 + SetY = 9,33 + SetX = 10,-53 + SetY = 10,2 + SetX = 11,-52 + SetY = 11,-51 + + Graphic = Examples/fly copy + Focus = User + SetFrame = 1,11 + SetX = 1,9 + SetY = 1,-92 + SetZ = 1,29 + SetFrame = 2,10 + SetX = 2,51 + SetY = 2,59 + SetX = 3,43 + SetY = 3,-21 + SetFrame = 4,11 + SetX = 4,12 + SetY = 4,66 + SetFrame = 5,12 + SetX = 5,-2 + SetY = 5,7 + SetX = 6,9 + SetY = 6,17 + SetVisible = 7,false + + Graphic = Examples/fly copy + Focus = User + SetFrame = 4,13 + SetX = 4,74 + SetY = 4,23 + SetZ = 4,30 + SetVisible = 5,false + + Graphic = Examples/fly copy + Focus = User + SetFrame = 4,13 + SetX = 4,-81 + SetY = 4,15 + SetZ = 4,31 + SetVisible = 5,false + + Graphic = Examples/fly copy + Focus = User + SetFrame = 8,13 + SetX = 8,-23 + SetY = 8,27 + SetZ = 8,29 + SetFrame = 9,12 + SetX = 9,51 + SetY = 9,10 + SetFrame = 10,13 + SetX = 10,-80 + SetY = 10,-14 + SetY = 11,-56 + + Graphic = Examples/fly copy + Focus = User SetFrame = 0,10 SetX = 0,-41 SetY = 0,119 @@ -42,88 +123,5 @@ Name = Example anim SetX = 10,77 SetY = 10,-43 SetX = 11,81 - - Graphic = Examples/fly copy - Focus = Target - SetFrame = 0,10 - SetX = 0,52 - SetY = 0,123 - SetZ = 0,28 - SetX = 1,50 - SetY = 1,81 - SetX = 2,-36 - SetY = 2,54 - SetX = 3,-34 - SetY = 3,-15 - SetX = 4,51 - SetY = 4,-64 - SetFrame = 5,13 - SetX = 5,-43 - SetY = 5,11 - SetX = 6,-15 - SetY = 6,31 - SetFrame = 7,14 - SetX = 7,19 - SetY = 7,-15 - SetFrame = 8,13 - SetX = 8,-1 - SetY = 8,21 - SetX = 9,-67 - SetY = 9,33 - SetX = 10,-53 - SetY = 10,2 - SetX = 11,-52 - SetY = 11,-51 - - Graphic = Examples/fly copy - Focus = Target - SetFrame = 1,11 - SetX = 1,9 - SetY = 1,-92 - SetZ = 1,29 - SetFrame = 2,10 - SetX = 2,51 - SetY = 2,59 - SetX = 3,43 - SetY = 3,-21 - SetFrame = 4,11 - SetX = 4,12 - SetY = 4,66 - SetFrame = 5,12 - SetX = 5,-2 - SetY = 5,7 - SetX = 6,9 - SetY = 6,17 - SetVisible = 7,false - - Graphic = Examples/fly copy - Focus = Target - SetFrame = 4,13 - SetX = 4,74 - SetY = 4,23 - SetZ = 4,30 - SetVisible = 5,false - - Graphic = Examples/fly copy - Focus = Target - SetFrame = 4,13 - SetX = 4,-81 - SetY = 4,15 - SetZ = 4,31 - SetVisible = 5,false - - Graphic = Examples/fly copy - Focus = Target - SetFrame = 8,13 - SetX = 8,-23 - SetY = 8,27 - SetZ = 8,29 - SetFrame = 9,12 - SetX = 9,51 - SetY = 9,10 - SetFrame = 10,13 - SetX = 10,-80 - SetY = 10,-14 - SetY = 11,-56 Play = 0,Swords Dance,90 diff --git a/PBS/Animations/Example anims/Move/TAILGLOW.txt b/PBS/Animations/Example anims/Move/TAILGLOW.txt index 1bb30c7ed..291d84fe1 100644 --- a/PBS/Animations/Example anims/Move/TAILGLOW.txt +++ b/PBS/Animations/Example anims/Move/TAILGLOW.txt @@ -2,15 +2,13 @@ #------------------------------- [Move,TAILGLOW] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/Light1 - Focus = Target + Focus = User SetX = 0,0 SetY = 0,-2 SetZ = 0,27 diff --git a/PBS/Animations/Example anims/Move/TELEPORT.txt b/PBS/Animations/Example anims/Move/TELEPORT.txt index aa23a6973..b96e1355e 100644 --- a/PBS/Animations/Example anims/Move/TELEPORT.txt +++ b/PBS/Animations/Example anims/Move/TELEPORT.txt @@ -2,13 +2,11 @@ #------------------------------- [Move,TELEPORT] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/! Focus = User SetFrame = 0,6 @@ -27,7 +25,7 @@ Name = Example anim SetY = 5,-8 SetX = 6,-4 SetY = 6,-40 - + Graphic = Examples/! Focus = User SetFrame = 1,6 @@ -44,7 +42,7 @@ Name = Example anim SetY = 5,-21 SetX = 6,14 SetY = 6,-89 - + Graphic = Examples/! Focus = User SetFrame = 0,6 diff --git a/PBS/Animations/Example anims/Move/THUNDERWAVE.txt b/PBS/Animations/Example anims/Move/THUNDERWAVE.txt index f60bf33a5..8885029bc 100644 --- a/PBS/Animations/Example anims/Move/THUNDERWAVE.txt +++ b/PBS/Animations/Example anims/Move/THUNDERWAVE.txt @@ -9,7 +9,7 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - Graphic = Examples/T. Shock + Graphic = Examples/T Shock Focus = Target SetX = 6,8 SetY = 6,18 @@ -28,7 +28,7 @@ Name = Example anim SetX = 14,-24 SetX = 15,-16 - Graphic = Examples/T. Shock + Graphic = Examples/T Shock Focus = Target SetFrame = 6,5 SetX = 6,-16 @@ -36,7 +36,7 @@ Name = Example anim SetZ = 6,29 SetVisible = 7,false - Graphic = Examples/T. Shock + Graphic = Examples/T Shock Focus = Target SetX = 1,8 SetY = 1,-54 diff --git a/PBS/Animations/Example anims/Move/TRICKROOM.txt b/PBS/Animations/Example anims/Move/TRICKROOM.txt index afb5bb177..37bed1560 100644 --- a/PBS/Animations/Example anims/Move/TRICKROOM.txt +++ b/PBS/Animations/Example anims/Move/TRICKROOM.txt @@ -2,32 +2,30 @@ #------------------------------- [Move,TRICKROOM] Name = Example anim +NoTarget = true SetX = 0,0 SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - + Graphic = Examples/mixed status - Focus = UserAndTarget + Focus = Foreground SetFrame = 0,5 - SetX = 0,142 - SetY = 0,-21 + SetX = 0,310 + SetY = 0,210 SetZoomX = 0,446 SetZoomY = 0,273 - SetX = 1,142 - SetY = 1,-23 - SetX = 3,144 - SetY = 3,-20 - SetX = 4,142 - SetX = 5,144 - SetY = 5,-18 - SetX = 6,142 - SetY = 7,-20 - SetX = 8,144 - SetY = 8,-17 - SetX = 9,142 - SetY = 9,-20 + SetX = 1,311 + SetY = 1,209 + SetX = 3,313 + SetY = 3,211 + SetX = 4,311 + SetX = 5,313 + SetY = 5,212 + SetX = 6,311 + SetY = 7,211 + SetX = 8,313 + SetY = 8,213 + SetX = 9,310 + SetY = 9,211 Play = 0,MiningPing,100,84 diff --git a/PBS/Animations/Example anims/Move/WATERGUN.txt b/PBS/Animations/Example anims/Move/WATERGUN.txt index 4e2556850..7298923c7 100644 --- a/PBS/Animations/Example anims/Move/WATERGUN.txt +++ b/PBS/Animations/Example anims/Move/WATERGUN.txt @@ -139,8 +139,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 0,5 - SetX = 0,175 - SetY = 0,-223 + SetX = 0,25 + SetY = 0,23 SetZ = 0,27 SetZoomX = 0,50 SetZoomY = 0,50 @@ -150,8 +150,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 1,5 - SetX = 1,156 - SetY = 1,-200 + SetX = 1,43 + SetY = 1,0 SetZ = 1,28 SetZoomX = 1,50 SetZoomY = 1,50 @@ -161,8 +161,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 2,5 - SetX = 2,137 - SetY = 2,-165 + SetX = 2,62 + SetY = 2,-34 SetZ = 2,29 SetZoomX = 2,50 SetZoomY = 2,50 @@ -172,8 +172,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 3,5 - SetX = 3,118 - SetY = 3,-140 + SetX = 3,81 + SetY = 3,-59 SetZ = 3,30 SetZoomX = 3,50 SetZoomY = 3,50 @@ -183,8 +183,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 4,5 - SetX = 4,101 - SetY = 4,-98 + SetX = 4,98 + SetY = 4,-101 SetZ = 4,31 SetZoomX = 4,50 SetZoomY = 4,50 @@ -194,8 +194,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 5,5 - SetX = 5,81 - SetY = 5,-70 + SetX = 5,118 + SetY = 5,-129 SetZ = 5,32 SetZoomX = 5,50 SetZoomY = 5,50 @@ -205,8 +205,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 6,5 - SetX = 6,57 - SetY = 6,-43 + SetX = 6,142 + SetY = 6,-156 SetZ = 6,33 SetZoomX = 6,50 SetZoomY = 6,50 @@ -216,8 +216,8 @@ Name = Example anim Graphic = Examples/fly copy Focus = UserAndTarget SetFrame = 7,5 - SetX = 7,30 - SetY = 7,-10 + SetX = 7,169 + SetY = 7,-189 SetZ = 7,34 SetZoomX = 7,50 SetZoomY = 7,50 From 184ce47b9391b634aac0fe35bf3b1d67d86d109c Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 13 Apr 2024 22:13:21 +0100 Subject: [PATCH 33/49] Anim Editor: colour changes --- .../Control elements/001_BaseControl.rb | 4 ++-- .../Control elements/003_Checkbox.rb | 2 +- .../Control elements/007_Button.rb | 2 +- .../Control elements/009_List.rb | 2 +- .../904_Anim Editor/001_AnimationEditor.rb | 4 ++-- .../Anim Editor elements/001_Canvas.rb | 7 ++++--- .../Anim Editor elements/003_ParticleList.rb | 19 ++++++++++--------- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index 327f86975..f6587a642 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -11,8 +11,8 @@ class UIControls::BaseControl < BitmapSprite TEXT_COLOR = Color.black TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set TEXT_OFFSET_Y = 5 - HOVER_COLOR = Color.cyan # For clickable area when hovering over it - CAPTURE_COLOR = Color.pink # For area you clicked in but aren't hovering over + HOVER_COLOR = Color.new(224, 255, 255) # For clickable area when hovering over it; light blue + CAPTURE_COLOR = Color.new(255, 64, 128) # For area you clicked in but aren't hovering over; hot pink DISABLED_COLOR = Color.gray DISABLED_COLOR_DARK = Color.new(128, 128, 128) diff --git a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb index 449d49148..7d574992d 100644 --- a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb +++ b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb @@ -8,7 +8,7 @@ class UIControls::Checkbox < UIControls::BaseControl CHECKBOX_FILL_SIZE = CHECKBOX_HEIGHT - 4 UNCHECKED_COLOR = Color.gray - CHECKED_COLOR = Color.new(64, 255, 64) # Green + CHECKED_COLOR = Color.new(48, 192, 48) # Darkish green def initialize(width, height, viewport, value = false) super(width, height, viewport) diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index 70eea2802..938dbbf54 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -8,7 +8,7 @@ class UIControls::Button < UIControls::BaseControl BUTTON_HEIGHT = 28 # Used when @fixed_size is false # TODO: This will also depend on the font size. TEXT_BASE_OFFSET_Y = 18 # Text is centred vertically in the button - HIGHLIGHT_COLOR = Color.green + HIGHLIGHT_COLOR = Color.new(224, 192, 32) # Dark yellow def initialize(width, height, viewport, text = "") super(width, height, viewport) diff --git a/Data/Scripts/801_UI controls/Control elements/009_List.rb b/Data/Scripts/801_UI controls/Control elements/009_List.rb index 51b1543a2..6359e2a32 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_List.rb @@ -7,7 +7,7 @@ class UIControls::List < UIControls::BaseControl TEXT_PADDING_X = 4 TEXT_OFFSET_Y = 3 - SELECTED_ROW_COLOR = Color.green + SELECTED_ROW_COLOR = Color.new(216, 192, 32) # Dark yellow def initialize(width, height, viewport, values = []) super(width, height, viewport) diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index ad6d216ac..019af7b48 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -137,8 +137,8 @@ class AnimationEditor when 1, 12 then wid = 4 else wid = 5 end - @delete_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.red) - @delete_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.red) + @delete_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(248, 96, 96)) + @delete_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(248, 96, 96)) @delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(160, 160, 160)) @delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(160, 160, 160)) end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index d0109be0a..7c3b50dcf 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -15,6 +15,7 @@ class AnimationEditor::Canvas < Sprite attr_reader :values FRAME_SIZE = 48 + PARTICLE_FRAME_COLOR = Color.new(0, 0, 0, 64) def initialize(viewport, anim, settings) super(viewport) @@ -58,8 +59,8 @@ class AnimationEditor::Canvas < Sprite def initialize_particle_frames # Frame for selected particle @sel_frame_bitmap = Bitmap.new(FRAME_SIZE, FRAME_SIZE) - @sel_frame_bitmap.outline_rect(0, 0, @sel_frame_bitmap.width, @sel_frame_bitmap.height, Color.new(0, 0, 0, 64)) - @sel_frame_bitmap.outline_rect(2, 2, @sel_frame_bitmap.width - 4, @sel_frame_bitmap.height - 4, Color.new(0, 0, 0, 64)) + @sel_frame_bitmap.outline_rect(0, 0, @sel_frame_bitmap.width, @sel_frame_bitmap.height, PARTICLE_FRAME_COLOR) + @sel_frame_bitmap.outline_rect(2, 2, @sel_frame_bitmap.width - 4, @sel_frame_bitmap.height - 4, PARTICLE_FRAME_COLOR) @sel_frame_sprite = Sprite.new(viewport) @sel_frame_sprite.bitmap = @sel_frame_bitmap @sel_frame_sprite.z = 99999 @@ -67,7 +68,7 @@ class AnimationEditor::Canvas < Sprite @sel_frame_sprite.oy = @sel_frame_bitmap.height / 2 # Frame for other particles @frame_bitmap = Bitmap.new(FRAME_SIZE, FRAME_SIZE) - @frame_bitmap.outline_rect(1, 1, @frame_bitmap.width - 2, @frame_bitmap.height - 2, Color.new(0, 0, 0, 64)) + @frame_bitmap.outline_rect(1, 1, @frame_bitmap.width - 2, @frame_bitmap.height - 2, PARTICLE_FRAME_COLOR) @battler_frame_sprites = [] @frame_sprites = [] end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index e64abd464..ee485ab10 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -28,16 +28,17 @@ class AnimationEditor::ParticleList < UIControls::BaseControl :foreground => Color.new(128, 160, 248), # Blue :midground => Color.new(128, 160, 248), # Blue :background => Color.new(128, 160, 248), # Blue - :user => Color.new(96, 248, 96), # Green - :target => Color.new(248, 96, 96), # Red - :user_and_target => Color.new(248, 248, 96), # Yellow - :user_side_foreground => Color.new(128, 248, 248), # Cyan - :user_side_background => Color.new(128, 248, 248), # Cyan - :target_side_foreground => Color.new(128, 248, 248), # Cyan - :target_side_background => Color.new(128, 248, 248) # Cyan + :user => Color.new(64, 224, 64), # Green + :target => Color.new(224, 64, 64), # Red + :user_and_target => Color.new(224, 224, 64), # Yellow + :user_side_foreground => Color.new(128, 224, 224), # Cyan + :user_side_background => Color.new(128, 224, 224), # Cyan + :target_side_foreground => Color.new(128, 224, 224), # Cyan + :target_side_background => Color.new(128, 224, 224) # Cyan } SE_CONTROL_BG_COLOR = Color.gray TIME_AFTER_ANIMATION_COLOR = Color.new(160, 160, 160) + POSITION_LINE_COLOR = Color.new(248, 96, 96) attr_reader :keyframe # The selected keyframe attr_reader :values @@ -123,12 +124,12 @@ class AnimationEditor::ParticleList < UIControls::BaseControl # Position line sprite @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @position_viewport) @position_sprite.ox = @position_sprite.width / 2 - @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, Color.red) + @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, POSITION_LINE_COLOR) # Selected particle line sprite @particle_line_sprite = BitmapSprite.new(@position_viewport.rect.width, 3, @commands_viewport) @particle_line_sprite.z = -10 @particle_line_sprite.oy = @particle_line_sprite.height / 2 - @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, Color.red) + @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, POSITION_LINE_COLOR) end def initialize_controls From a548a1ae9db0157ae39727aac67caff488c98b6e Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 13 Apr 2024 22:38:23 +0100 Subject: [PATCH 34/49] Anim Editor: Fixes --- .../902_Anim GameData/001_Animation.rb | 1 + .../904_Anim Editor/001_AnimationEditor.rb | 12 +- .../Anim Editor elements/001_Canvas.rb | 38 +- .../Anim Editor elements/002_PlayControls.rb | 4 +- .../905_Anim player/001_Anim player.rb | 8 +- .../905_Anim player/011_Battle z modifiers.rb | 520 ++++++++++++++++++ .../Example anims/Move/AERIALACE.txt | 26 +- 7 files changed, 574 insertions(+), 35 deletions(-) diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index f3dcd6612..d73daed83 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -19,6 +19,7 @@ module GameData # :user_and_target, plus there's :foreground in PARTICLE_DEFAULT_VALUES # below. # TODO: Add :user_ground, :target_ground? + # TODO: Add :opposing_side_foreground and :opposing_side_background? FOCUS_TYPES = { "Foreground" => :foreground, "Midground" => :midground, diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 019af7b48..43abb48a7 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -429,13 +429,21 @@ class AnimationEditor # Set up fake battlers for the animation player user_battler = nil if !@anim[:no_user] - user_battler = AnimationPlayer::FakeBattler.new(@settings[:user_index], @settings[:user_sprite_name]) + idx_user = @settings[:user_index] + if @settings[:user_opposes] || [:opp_move, :opp_common].include?(@anim[:type]) + idx_user += 1 + end + user_battler = AnimationPlayer::FakeBattler.new(idx_user, @settings[:user_sprite_name]) end target_battlers = nil if !@anim[:no_target] target_battlers = [] @settings[:target_indices].each do |idx| - target_battlers.push(AnimationPlayer::FakeBattler.new(idx, @settings[:target_sprite_name])) + idx_target = idx + if @settings[:user_opposes] || [:opp_move, :opp_common].include?(@anim[:type]) + idx_target += (idx_target.even?) ? 1 : -1 + end + target_battlers.push(AnimationPlayer::FakeBattler.new(idx_target, @settings[:target_sprite_name])) end end # Create animation player diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 7c3b50dcf..4dd3b9905 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -4,9 +4,11 @@ # -199 = side bases # -198 = battler shadows. # 0 +/-50 = background focus, foe side background. +# 500, 400, 300... = foe trainers. # 900, 800, 700... +/-50 = foe battlers. # 1000 +/-50 = foe side foreground, player side background. # 1100, 1200, 1300... +/-50 = player battlers. +# 1500, 1600, 1700... = player trainers. # 2000 +/-50 = player side foreground, foreground focus. # 9999+ = UI #=============================================================================== @@ -201,26 +203,34 @@ class AnimationEditor::Canvas < Sprite # their x/y/z values so the animation player knows where they start idx = user_index particle_idx = @anim[:particles].index { |particle| particle[:name] == "User" } - @sprites["pokemon_#{idx}"] = @battler_sprites[idx] - @battler_sprites[idx].x = @user_coords[0] - @battler_sprites[idx].y = @user_coords[1] - offset_xy = AnimationPlayer::Helper.get_xy_offset(@anim[:particles][particle_idx], @battler_sprites[idx]) - @battler_sprites[idx].x += offset_xy[0] - @battler_sprites[idx].y += offset_xy[1] - focus_z = AnimationPlayer::Helper.get_z_focus(@anim[:particles][particle_idx], idx, idx) - AnimationPlayer::Helper.apply_z_focus_to_sprite(@battler_sprites[idx], 0, focus_z) - @battler_sprites[idx].z = 0 - particle_idx = @anim[:particles].index { |particle| particle[:name] == "Target" } - target_indices.each do |idx| + if particle_idx @sprites["pokemon_#{idx}"] = @battler_sprites[idx] - @battler_sprites[idx].x = @target_coords[idx][0] - @battler_sprites[idx].y = @target_coords[idx][1] + @battler_sprites[idx].x = @user_coords[0] + @battler_sprites[idx].y = @user_coords[1] offset_xy = AnimationPlayer::Helper.get_xy_offset(@anim[:particles][particle_idx], @battler_sprites[idx]) + focus_z = AnimationPlayer::Helper.get_z_focus(@anim[:particles][particle_idx], idx, idx) @battler_sprites[idx].x += offset_xy[0] @battler_sprites[idx].y += offset_xy[1] - focus_z = AnimationPlayer::Helper.get_z_focus(@anim[:particles][particle_idx], idx, idx) AnimationPlayer::Helper.apply_z_focus_to_sprite(@battler_sprites[idx], 0, focus_z) end + particle_idx = @anim[:particles].index { |particle| particle[:name] == "Target" } + if particle_idx + target_indices.each do |idx| + @sprites["pokemon_#{idx}"] = @battler_sprites[idx] + @battler_sprites[idx].x = @target_coords[idx][0] + @battler_sprites[idx].y = @target_coords[idx][1] + if particle_idx + offset_xy = AnimationPlayer::Helper.get_xy_offset(@anim[:particles][particle_idx], @battler_sprites[idx]) + focus_z = AnimationPlayer::Helper.get_z_focus(@anim[:particles][particle_idx], idx, idx) + else + offset_xy = [0, @battler_sprites[idx].bitmap.height / 2] + focus_z = 1000 + ((100 * ((idx / 2) + 1)) * (idx.even? ? 1 : -1)) + end + @battler_sprites[idx].x += offset_xy[0] + @battler_sprites[idx].y += offset_xy[1] + AnimationPlayer::Helper.apply_z_focus_to_sprite(@battler_sprites[idx], 0, focus_z) + end + end # TODO: Also add background/bases and so on. hide_all_sprites @sel_frame_sprite.visible = false diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb index ccd7358b4..5f214a495 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb @@ -57,7 +57,7 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer @controls.push([:unloop, unloop_button]) # Slowdown label duration_label = UIControls::Label.new(200, ROW_HEIGHT, self.viewport, _INTL("Slowdown factor")) - duration_label.x = SLOWDOWN_BUTTON_X + (SLOWDOWN_FACTORS.length * (SLOWDOWN_BUTTON_WIDTH - SLOWDOWN_BUTTON_SPACING) / 2) + duration_label.x = SLOWDOWN_BUTTON_X + (SLOWDOWN_FACTORS.length * (SLOWDOWN_BUTTON_WIDTH + SLOWDOWN_BUTTON_SPACING) / 2) duration_label.x -= (duration_label.text_width / 2) + 5 duration_label.y = SLOWDOWN_LABEL_Y @controls.push([:slowdown_label, duration_label]) @@ -65,7 +65,7 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer SLOWDOWN_FACTORS.each_with_index do |value, i| button = UIControls::Button.new(SLOWDOWN_BUTTON_WIDTH, ROW_HEIGHT, self.viewport, value.to_s) button.set_fixed_size - button.x = SLOWDOWN_BUTTON_X + ((SLOWDOWN_BUTTON_WIDTH - SLOWDOWN_BUTTON_SPACING) * i) + button.x = SLOWDOWN_BUTTON_X + ((SLOWDOWN_BUTTON_WIDTH + SLOWDOWN_BUTTON_SPACING) * i) button.y = SLOWDOWN_BUTTON_Y button.set_interactive_rects button.set_highlighted if value == @slowdown diff --git a/Data/Scripts/905_Anim player/001_Anim player.rb b/Data/Scripts/905_Anim player/001_Anim player.rb index ca0858675..a95a78d10 100644 --- a/Data/Scripts/905_Anim player/001_Anim player.rb +++ b/Data/Scripts/905_Anim player/001_Anim player.rb @@ -101,15 +101,15 @@ class AnimationPlayer particle_sprite.sprite = sprite if sprite # Set sprite's graphic and ox/oy if sprite - AnimationPlayer::Helper.set_bitmap_and_origin(particle, sprite, @user.index, target_idx, - @battler_sprites[@user.index], @battler_sprites[target_idx]) + AnimationPlayer::Helper.set_bitmap_and_origin(particle, sprite, @user&.index, target_idx, + @battler_sprites[@user&.index || -1], @battler_sprites[target_idx]) end # Calculate x/y/z focus values and additional x/y modifier and pass them all # to particle_sprite - focus_xy = AnimationPlayer::Helper.get_xy_focus(particle, @user.index, target_idx, + focus_xy = AnimationPlayer::Helper.get_xy_focus(particle, @user&.index, target_idx, @user_coords, @target_coords[target_idx]) offset_xy = AnimationPlayer::Helper.get_xy_offset(particle, sprite) - focus_z = AnimationPlayer::Helper.get_z_focus(particle, @user.index, target_idx) + focus_z = AnimationPlayer::Helper.get_z_focus(particle, @user&.index, target_idx) particle_sprite.focus_xy = focus_xy particle_sprite.offset_xy = offset_xy particle_sprite.focus_z = focus_z diff --git a/Data/Scripts/905_Anim player/011_Battle z modifiers.rb b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb index e10886741..f82bc946e 100644 --- a/Data/Scripts/905_Anim player/011_Battle z modifiers.rb +++ b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb @@ -13,6 +13,7 @@ class Battle::Scene @sprites["base_#{side}"].z = -199 end @sprites["cmdBar_bg"].z += 9999 + @sprites["messageBox"].z += 9999 @sprites["messageWindow"].z += 9999 @sprites["commandWindow"].z += 9999 @@ -29,6 +30,16 @@ class Battle::Scene @battle.battlers.each_with_index do |b, i| @sprites["dataBox_#{i}"].z += 9999 if b end + + @battle.player.each_with_index do |p, i| + @sprites["player_#{i + 1}"].z = 1500 + (i * 100) + end + if @battle.trainerBattle? + @battle.opponent.each_with_index do |p, i| + @sprites["trainer_#{i + 1}"].z = 500 - (i * 100) + end + end + end end @@ -69,3 +80,512 @@ class Battle::Scene::BattlerShadowSprite < RPG::Sprite @pkmn.species_data.apply_metrics_to_sprite(self, @index, true) end end + +#=============================================================================== +# Mixin module for certain hardcoded battle animations that involve Poké Balls. +#=============================================================================== +module Battle::Scene::Animation::BallAnimationMixin + # The regular Poké Ball burst animation, for when a Pokémon appears from a + # Poké Ball. + def ballBurst(delay, ball, ballX, ballY, poke_ball) + num_particles = 15 + num_rays = 10 + glare_fade_duration = 8 # Lifetimes/durations are in 20ths of a second + particle_lifetime = 15 + particle_fade_duration = 8 + ray_lifetime = 13 + ray_fade_duration = 5 + ray_min_radius = 24 # How far out from the center a ray starts + cherish_ball_ray_tones = [Tone.new(-104, -144, -8), # Indigo + Tone.new(-64, -144, -24), # Purple + Tone.new(-8, -144, -64), # Pink + Tone.new(-8, -48, -152), # Orange + Tone.new(-8, -32, -160)] # Yellow + # Get array of things that vary for each kind of Poké Ball + variances = BALL_BURST_VARIANCES[poke_ball] || BALL_BURST_VARIANCES[:POKEBALL] + # Set up glare particles + glare1 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[11]}", PictureOrigin::CENTER) + glare2 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[8]}", PictureOrigin::CENTER) + [glare1, glare2].each_with_index do |particle, num| + particle.setZ(0, 5105 + num) + particle.setZoom(0, 0) + particle.setTone(0, variances[12 - (3 * num)]) + particle.setVisible(0, false) + end + [glare1, glare2].each_with_index do |particle, num| + particle.moveTone(delay + glare_fade_duration + 3, glare_fade_duration / 2, variances[13 - (3 * num)]) + end + # Animate glare particles + [glare1, glare2].each { |p| p.setVisible(delay, true) } + if poke_ball == :MASTERBALL + glare1.moveAngle(delay, 19, -135) + glare1.moveZoom(delay, glare_fade_duration, 250) + elsif poke_ball == :DUSKBALL + glare1.moveAngle(delay, 19, -270) + elsif ["whirl"].include?(variances[11]) + glare1.moveZoom(delay, glare_fade_duration, 200) + else + glare1.moveZoom(delay, glare_fade_duration, (["dazzle", "ring3", "web"].include?(variances[11])) ? 100 : 250) + end + glare1.moveOpacity(delay + glare_fade_duration + 3, glare_fade_duration, 0) + if poke_ball == :MASTERBALL + glare2.moveAngle(delay, 19, -135) + glare2.moveZoom(delay, glare_fade_duration, 200) + else + glare2.moveZoom(delay, glare_fade_duration, (["dazzle", "ring3", "web"].include?(variances[8])) ? 125 : 200) + end + glare2.moveOpacity(delay + glare_fade_duration + 3, glare_fade_duration - 2, 0) + [glare1, glare2].each { |p| p.setVisible(delay + 19, false) } + # Rays + num_rays.times do |i| + # Set up ray + angle = rand(360) + radian = (angle + 90) * Math::PI / 180 + start_zoom = rand(50...100) + ray = addNewSprite(ballX + (ray_min_radius * Math.cos(radian)), + ballY - (ray_min_radius * Math.sin(radian)), + "Graphics/Battle animations/ballBurst_ray", PictureOrigin::BOTTOM) + ray.setZ(0, 5100) + ray.setZoomXY(0, 200, start_zoom) + ray.setTone(0, variances[0]) if poke_ball != :CHERISHBALL + ray.setOpacity(0, 0) + ray.setVisible(0, false) + ray.setAngle(0, angle) + # Animate ray + start = delay + (i / 2) + ray.setVisible(start, true) + ray.moveZoomXY(start, ray_lifetime, 200, start_zoom * 6) + ray.moveOpacity(start, 2, 255) # Quickly fade in + ray.moveOpacity(start + ray_lifetime - ray_fade_duration, ray_fade_duration, 0) # Fade out + if poke_ball == :CHERISHBALL + ray_lifetime.times do |frame| + ray.setTone(start + frame, cherish_ball_ray_tones[frame % cherish_ball_ray_tones.length]) + end + else + ray.moveTone(start + ray_lifetime - ray_fade_duration, ray_fade_duration, variances[1]) + end + ray.setVisible(start + ray_lifetime, false) + end + # Particles + num_particles.times do |i| + # Set up particles + particle1 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[5]}", PictureOrigin::CENTER) + particle2 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[2]}", PictureOrigin::CENTER) + [particle1, particle2].each_with_index do |particle, num| + particle.setZ(0, 5110 + num) + particle.setZoom(0, (80 - (num * 20)) / (["ring2"].include?(variances[5 - (3 * num)]) ? 2 : 1)) + particle.setTone(0, variances[6 - (3 * num)]) + particle.setVisible(0, false) + end + # Animate particles + start = delay + (i / 4) + max_radius = rand(256...384) + angle = rand(360) + radian = angle * Math::PI / 180 + [particle1, particle2].each_with_index do |particle, num| + particle.setVisible(start, true) + particle.moveDelta(start, particle_lifetime, max_radius * Math.cos(radian), max_radius * Math.sin(radian)) + particle.moveZoom(start, particle_lifetime, 10) + particle.moveTone(start + particle_lifetime - particle_fade_duration, + particle_fade_duration / 2, variances[7 - (3 * num)]) + particle.moveOpacity(start + particle_lifetime - particle_fade_duration, + particle_fade_duration, + 0) # Fade out at end + particle.setVisible(start + particle_lifetime, false) + end + end + end + + # The Poké Ball burst animation used when absorbing a wild Pokémon during a + # capture attempt. + def ballBurstCapture(delay, ball, ballX, ballY, poke_ball) + particle_duration = 10 + ring_duration = 5 + num_particles = 9 + base_angle = 270 + base_radius = (poke_ball == :MASTERBALL) ? 192 : 144 # How far out from the Poké Ball the particles go + # Get array of things that vary for each kind of Poké Ball + variances = BALL_BURST_CAPTURE_VARIANCES[poke_ball] || BALL_BURST_CAPTURE_VARIANCES[:POKEBALL] + # Set up glare particles + glare1 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[6]}", PictureOrigin::CENTER) + glare2 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[3]}", PictureOrigin::CENTER) + glare3 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[0]}", PictureOrigin::CENTER) + [glare1, glare2, glare3].each_with_index do |particle, num| + particle.setZ(0, 5100 + num) + particle.setZoom(0, 0) + particle.setTone(0, variances[7 - (3 * num)]) + particle.setVisible(0, false) + end + glare2.setOpacity(0, 160) + glare3.setOpacity(0, 160) if poke_ball != :DUSKBALL + # Animate glare particles + [glare1, glare2, glare3].each { |p| p.setVisible(delay, true) } + case poke_ball + when :MASTERBALL + glare1.moveZoom(delay, particle_duration, 1200) + when :DUSKBALL + glare1.moveZoom(delay, particle_duration, 350) + else + glare1.moveZoom(delay, particle_duration, 600) + end + glare1.moveOpacity(delay + (particle_duration / 2), particle_duration / 2, 0) + [glare1, glare2, glare3].each_with_index do |particle, num| + particle.moveTone(delay, particle_duration, variances[8 - (3 * num)]) + end + if poke_ball == :DUSKBALL + glare2.moveZoom(delay, particle_duration, 350) + glare3.moveZoom(delay, particle_duration, 500) + [glare2, glare3].each_with_index do |particle, num| + particle.moveOpacity(delay + (particle_duration / 2), particle_duration / 2, 0) + end + else + glare2.moveZoom(delay, particle_duration, (poke_ball == :MASTERBALL) ? 400 : 250) + glare2.moveOpacity(delay + (particle_duration / 2), particle_duration / 3, 0) + glare3.moveZoom(delay, particle_duration, (poke_ball == :MASTERBALL) ? 800 : 500) + glare3.moveOpacity(delay + (particle_duration / 2), particle_duration / 3, 0) + end + [glare1, glare2, glare3].each { |p| p.setVisible(delay + particle_duration, false) } + # Burst particles + num_particles.times do |i| + # Set up particle that keeps moving out + particle1 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_particle", PictureOrigin::CENTER) + particle1.setZ(0, 5105) + particle1.setZoom(0, 150) + particle1.setOpacity(0, 160) + particle1.setVisible(0, false) + # Set up particles that curve back in + particle2 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[12]}", PictureOrigin::CENTER) + particle3 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_#{variances[9]}", PictureOrigin::CENTER) + [particle2, particle3].each_with_index do |particle, num| + particle.setZ(0, 5110 + num) + particle.setZoom(0, (poke_ball == :NESTBALL) ? 50 : 0) + particle.setTone(0, variances[13 - (3 * num)]) + particle.setVisible(0, false) + particle.setAngle(0, rand(360)) if poke_ball == :PREMIERBALL + end + particle3.setOpacity(0, 128) if poke_ball == :DIVEBALL + # Particle animations + [particle1, particle2, particle3].each { |p| p.setVisible(delay, true) } + particle2.setVisible(delay, false) if poke_ball == :NESTBALL + start_angle = base_angle + (i * 360 / num_particles) + p1_x_offset = base_radius * Math.cos(start_angle * Math::PI / 180) + p1_y_offset = base_radius * Math.sin(start_angle * Math::PI / 180) + particle_duration.times do |j| + index = j + 1 + angle = start_angle + (index * (360 / num_particles) / particle_duration) + radian = angle * Math::PI / 180 + radius = base_radius + prop = index.to_f / (particle_duration / 2) + prop = 2 - prop if index > particle_duration / 2 + radius *= prop + particle1.moveXY(delay + j, 1, + ballX + (p1_x_offset * index * 2 / particle_duration), + ballY - (p1_y_offset * index * 2 / particle_duration)) + [particle2, particle3].each do |particle| + particle.moveXY(delay + j, 1, + ballX + (radius * Math.cos(radian)), + ballY - (radius * Math.sin(radian))) + end + end + particle1.moveZoom(delay, particle_duration, 0) + particle1.moveOpacity(delay, particle_duration, 0) + [particle2, particle3].each_with_index do |particle, num| + # Zoom in + if num == 0 && poke_ball == :MASTERBALL + particle.moveZoom(delay, particle_duration / 2, 225) + elsif num == 0 && poke_ball == :DIVEBALL + particle.moveZoom(delay, particle_duration / 2, 125) + elsif ["particle"].include?(variances[12 - (3 * num)]) + particle.moveZoom(delay, particle_duration / 2, (poke_ball == :PREMIERBALL) ? 50 : 80) + elsif ["ring3"].include?(variances[12 - (3 * num)]) + particle.moveZoom(delay, particle_duration / 2, 50) + elsif ["dazzle", "ring4", "diamond"].include?(variances[12 - (3 * num)]) + particle.moveZoom(delay, particle_duration / 2, 60) + else + particle.moveZoom(delay, particle_duration / 2, 100) + end + # Zoom out + if ["particle", "dazzle", "ring3", "ring4", "diamond"].include?(variances[12 - (3 * num)]) + particle.moveZoom(delay + (particle_duration * 2 / 3), particle_duration / 3, 10) + else + particle.moveZoom(delay + (particle_duration * 2 / 3), particle_duration / 3, 25) + end + # Rotate (for Premier Ball) + particle.moveAngle(delay, particle_duration, -180) if poke_ball == :PREMIERBALL + # Change tone, fade out + particle.moveTone(delay + (particle_duration / 3), (particle_duration.to_f / 3).ceil, variances[14 - (3 * num)]) + particle.moveOpacity(delay + particle_duration - 3, 3, 128) # Fade out at end + end + [particle1, particle2, particle3].each { |p| p.setVisible(delay + particle_duration, false) } + end + # Web sprite (for Net Ball) + if poke_ball == :NETBALL + web = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_web", PictureOrigin::CENTER) + web.setZ(0, 5123) + web.setZoom(0, 120) + web.setOpacity(0, 0) + web.setTone(0, Tone.new(-32, -32, -128)) + web.setVisible(0, false) + start = particle_duration / 2 + web.setVisible(delay + start, true) + web.moveOpacity(delay + start, 2, 160) + web_duration = particle_duration + ring_duration - (particle_duration / 2) + (web_duration / 4).times do |i| + web.moveZoom(delay + start + (i * 4), 2, 150) + web.moveZoom(delay + start + (i * 4) + 2, 2, 120) + end + now = start + ((web_duration / 4) * 4) + web.moveZoom(delay + now, particle_duration + ring_duration - now, 150) + web.moveOpacity(delay + particle_duration, ring_duration, 0) + web.setVisible(delay + particle_duration + ring_duration, false) + end + # Ring particle + ring = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_ring1", PictureOrigin::CENTER) + ring.setZ(0, 5110) + ring.setZoom(0, 0) + ring.setTone(0, variances[15]) + ring.setVisible(0, false) + # Ring particle animation + ring.setVisible(delay + particle_duration, true) + ring.moveZoom(delay + particle_duration - 2, ring_duration + 2, 125) # Start slightly early + ring.moveTone(delay + particle_duration, ring_duration, variances[16]) + ring.moveOpacity(delay + particle_duration, ring_duration, 0) + ring.setVisible(delay + particle_duration + ring_duration, false) + # Mark the end of the burst animation + ball.setDelta(delay + particle_duration + ring_duration, 0, 0) + end + + # The animation shown over a thrown Poké Ball when it has successfully caught + # a Pokémon. + def ballCaptureSuccess(ball, delay, ballX, ballY) + ball.setSE(delay, "Battle catch click") + ball.moveTone(delay, 4, Tone.new(-128, -128, -128)) # Ball goes darker + delay = ball.totalDuration + star_duration = 12 # In 20ths of a second + y_offsets = [[0, 74, 52], [0, 62, 28], [0, 74, 48]] + 3.times do |i| # Left, middle, right + # Set up particle + star = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_star", PictureOrigin::CENTER) + star.setZ(0, 5110) + star.setZoom(0, [50, 50, 33][i]) + start_angle = [0, 345, 15][i] + star.setAngle(0, start_angle) + star.setOpacity(0, 0) + star.setVisible(0, false) + # Particle animation + star.setVisible(delay, true) + y_pos = y_offsets[i] + star_duration.times do |j| + index = j + 1 + x = 72 * index / star_duration + proportion = index.to_f / star_duration + a = (2 * y_pos[2]) - (4 * y_pos[1]) + b = y_pos[2] - a + y = ((a * proportion) + b) * proportion + star.moveXY(delay + j, 1, ballX + ([-1, 0, 1][i] * x), ballY - y) + end + star.moveAngle(delay, star_duration, start_angle + [144, 0, 45][i]) if i.even? + star.moveOpacity(delay, 4, 255) # Fade in + star.moveTone(delay + 3, 3, Tone.new(0, 0, -96)) # Light yellow + star.moveTone(delay + 6, 3, Tone.new(0, 0, 0)) # White + star.moveOpacity(delay + 8, 4, 0) # Fade out + end + end + + # The Poké Ball burst animation used when recalling a Pokémon. In HGSS, this + # is the same for all types of Poké Ball except for the color that the battler + # turns - see def getBattlerColorFromPokeBall. + def ballBurstRecall(delay, ball, ballX, ballY, poke_ball) + color_duration = 10 # Change color of battler to a solid shade - see def battlerAbsorb + shrink_duration = 5 # Shrink battler into Poké Ball - see def battlerAbsorb + burst_duration = color_duration + shrink_duration + # Burst particles + num_particles = 5 + base_angle = 55 + base_radius = 64 # How far out from the Poké Ball the particles go + num_particles.times do |i| + # Set up particle + particle = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_particle", PictureOrigin::CENTER) + particle.setZ(0, 5110) + particle.setZoom(0, 150) + particle.setOpacity(0, 0) + particle.setVisible(0, false) + # Particle animation + particle.setVisible(delay, true) + particle.moveOpacity(delay, 2, 255) # Fade in quickly + burst_duration.times do |j| + angle = base_angle + (i * 360 / num_particles) + (135.0 * j / burst_duration) + radian = angle * Math::PI / 180 + radius = base_radius + if j < burst_duration / 5 + prop = j.to_f / (color_duration / 3) + radius *= 0.75 + (prop / 4) + elsif j >= burst_duration / 2 + prop = (j.to_f - (burst_duration / 2)) / (burst_duration / 2) + radius *= 1 - prop + end + if j == 0 + particle.setXY(delay + j, ballX + (radius * Math.cos(radian)), ballY - (radius * Math.sin(radian))) + else + particle.moveXY(delay + j, 1, ballX + (radius * Math.cos(radian)), ballY - (radius * Math.sin(radian))) + end + end + particle.moveZoom(delay, burst_duration, 0) + particle.moveTone(delay + (color_duration / 2), color_duration / 2, Tone.new(0, 0, -192)) # Yellow + particle.moveTone(delay + color_duration, shrink_duration, Tone.new(0, -128, -248)) # Dark orange + particle.moveOpacity(delay + color_duration, shrink_duration, 0) # Fade out at end + particle.setVisible(delay + burst_duration, false) + end + # Ring particles + ring1 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_ring1", PictureOrigin::CENTER) + ring1.setZ(0, 5110) + ring1.setZoom(0, 0) + ring1.setVisible(0, false) + ring2 = addNewSprite(ballX, ballY, "Graphics/Battle animations/ballBurst_ring2", PictureOrigin::CENTER) + ring2.setZ(0, 5110) + ring2.setVisible(0, false) + # Ring particle animations + ring1.setVisible(delay + burst_duration - 2, true) + ring1.moveZoom(delay + burst_duration - 2, 4, 100) + ring1.setVisible(delay + burst_duration + 2, false) + ring2.setVisible(delay + burst_duration + 2, true) + ring2.moveZoom(delay + burst_duration + 2, 4, 200) + ring2.moveOpacity(delay + burst_duration + 2, 4, 0) + end +end + +#=============================================================================== +# Shows the battle scene fading in while elements slide around into place +#=============================================================================== +class Battle::Scene::Animation::Intro < Battle::Scene::Animation + def createProcesses + appearTime = 20 # This is in 1/20 seconds + # Background + if @sprites["battle_bg2"] + makeSlideSprite("battle_bg", 0.5, appearTime) + makeSlideSprite("battle_bg2", 0.5, appearTime) + end + # Bases + makeSlideSprite("base_0", 1, appearTime, PictureOrigin::BOTTOM) + makeSlideSprite("base_1", -1, appearTime, PictureOrigin::CENTER) + # Player sprite, partner trainer sprite + @battle.player.each_with_index do |_p, i| + makeSlideSprite("player_#{i + 1}", 1, appearTime, PictureOrigin::BOTTOM) + end + # Opposing trainer sprite(s) or wild Pokémon sprite(s) + if @battle.trainerBattle? + @battle.opponent.each_with_index do |_p, i| + makeSlideSprite("trainer_#{i + 1}", -1, appearTime, PictureOrigin::BOTTOM) + end + else # Wild battle + @battle.pbParty(1).each_with_index do |_pkmn, i| + idxBattler = (2 * i) + 1 + makeSlideSprite("pokemon_#{idxBattler}", -1, appearTime, PictureOrigin::BOTTOM) + end + end + # Shadows + @battle.battlers.length.times do |i| + makeSlideSprite("shadow_#{i}", (i.even?) ? 1 : -1, appearTime, PictureOrigin::CENTER) + end + # Fading blackness over whole screen + blackScreen = addNewSprite(0, 0, "Graphics/Battle animations/black_screen") + blackScreen.setZ(0, 99999) + blackScreen.moveOpacity(0, 8, 0) + # Fading blackness over command bar + blackBar = addNewSprite(@sprites["cmdBar_bg"].x, @sprites["cmdBar_bg"].y, + "Graphics/Battle animations/black_bar") + blackBar.setZ(0, 99998) + blackBar.moveOpacity(appearTime * 3 / 4, appearTime / 4, 0) + end +end + +#=============================================================================== +# Shows a Pokémon being sent out on the player's side (including by a partner). +# Includes the Poké Ball being thrown. +#=============================================================================== +class Battle::Scene::Animation::PokeballPlayerSendOut < Battle::Scene::Animation + def createProcesses + batSprite = @sprites["pokemon_#{@battler.index}"] + shaSprite = @sprites["shadow_#{@battler.index}"] + traSprite = @sprites["player_#{@idxTrainer}"] + # Calculate the Poké Ball graphic to use + poke_ball = (batSprite.pkmn) ? batSprite.pkmn.poke_ball : nil + # Calculate the color to turn the battler sprite + col = getBattlerColorFromPokeBall(poke_ball) + col.alpha = 255 + # Calculate start and end coordinates for battler sprite movement + ballPos = Battle::Scene.pbBattlerPosition(@battler.index, batSprite.sideSize) + battlerStartX = ballPos[0] # Is also where the Ball needs to end + battlerStartY = ballPos[1] # Is also where the Ball needs to end + 18 + battlerEndX = batSprite.x + battlerEndY = batSprite.y + # Calculate start and end coordinates for Poké Ball sprite movement + ballStartX = -6 + ballStartY = 202 + ballMidX = 0 # Unused in trajectory calculation + ballMidY = battlerStartY - 144 + # Set up Poké Ball sprite + ball = addBallSprite(ballStartX, ballStartY, poke_ball) + ball.setZ(0, 1025) + ball.setVisible(0, false) + # Poké Ball tracking the player's hand animation (if trainer is visible) + if @showingTrainer && traSprite && traSprite.x > 0 + ball.setZ(0, traSprite.z - 1) + ballStartX, ballStartY = ballTracksHand(ball, traSprite) + end + delay = ball.totalDuration # 0 or 7 + # Poké Ball trajectory animation + createBallTrajectory(ball, delay, 12, + ballStartX, ballStartY, ballMidX, ballMidY, battlerStartX, battlerStartY - 18) + ball.setZ(9, batSprite.z - 1) + delay = ball.totalDuration + 4 + delay += 10 * @idxOrder # Stagger appearances if multiple Pokémon are sent out at once + ballOpenUp(ball, delay - 2, poke_ball) + ballBurst(delay, ball, battlerStartX, battlerStartY - 18, poke_ball) + ball.moveOpacity(delay + 2, 2, 0) + # Set up battler sprite + battler = addSprite(batSprite, PictureOrigin::BOTTOM) + battler.setXY(0, battlerStartX, battlerStartY) + battler.setZoom(0, 0) + battler.setColor(0, col) + # Battler animation + battlerAppear(battler, delay, battlerEndX, battlerEndY, batSprite, col) + if @shadowVisible + # Set up shadow sprite + shadow = addSprite(shaSprite, PictureOrigin::CENTER) + shadow.setOpacity(0, 0) + # Shadow animation + shadow.setVisible(delay, @shadowVisible) + shadow.moveOpacity(delay + 5, 10, 255) + end + end +end + +#=============================================================================== +# Shows the player throwing a Poké Ball and it being deflected +#=============================================================================== +class Battle::Scene::Animation::PokeballThrowDeflect < Battle::Scene::Animation + def createProcesses + # Calculate start and end coordinates for battler sprite movement + batSprite = @sprites["pokemon_#{@battler.index}"] + ballPos = Battle::Scene.pbBattlerPosition(@battler.index, batSprite.sideSize) + ballStartX = -6 + ballStartY = 246 + ballMidX = 190 # Unused in arc calculation + ballMidY = 78 + ballEndX = ballPos[0] + ballEndY = 112 + # Set up Poké Ball sprite + ball = addBallSprite(ballStartX, ballStartY, @poke_ball) + ball.setZ(0, 5090) + # Poké Ball arc animation + ball.setSE(0, "Battle throw") + createBallTrajectory(ball, 0, 16, + ballStartX, ballStartY, ballMidX, ballMidY, ballEndX, ballEndY) + # Poké Ball knocked back + delay = ball.totalDuration + ball.setSE(delay, "Battle ball drop") + ball.moveXY(delay, 8, -32, Graphics.height - 96 + 32) # Back to player's corner + createBallTumbling(ball, delay, 8) + end +end diff --git a/PBS/Animations/Example anims/Move/AERIALACE.txt b/PBS/Animations/Example anims/Move/AERIALACE.txt index 952456b1c..b124afb13 100644 --- a/PBS/Animations/Example anims/Move/AERIALACE.txt +++ b/PBS/Animations/Example anims/Move/AERIALACE.txt @@ -273,14 +273,14 @@ Name = Example anim [OppMove,AERIALACE] Name = Example anim - SetOpacity = 1,170 SetOpacity = 2,85 SetOpacity = 3,0 SetOpacity = 5,255 + Graphic = Examples/Aerial Ace - Focus = User + Focus = Target SetX = 0,101 SetY = 0,-56 SetZ = 0,27 @@ -295,8 +295,8 @@ Name = Example anim SetY = 3,24 SetVisible = 4,false - Graphic = TARGET - Focus = Target + Graphic = USER + Focus = User SetX = 1,-51 SetY = 1,18 SetZ = 1,28 @@ -309,8 +309,8 @@ Name = Example anim SetOpacity = 6,85 SetVisible = 7,false - Graphic = TARGET - Focus = Target + Graphic = USER + Focus = User SetX = 2,-16 SetY = 2,44 SetZ = 2,29 @@ -319,8 +319,8 @@ Name = Example anim SetOpacity = 4,170 SetVisible = 5,false - Graphic = TARGET - Focus = Target + Graphic = USER + Focus = User SetX = 3,-16 SetY = 3,44 SetZ = 3,30 @@ -331,7 +331,7 @@ Name = Example anim SetVisible = 6,false Graphic = Examples/Aerial Ace - Focus = User + Focus = Target SetFrame = 5,7 SetX = 5,54 SetY = 5,27 @@ -354,7 +354,7 @@ Name = Example anim SetOpacity = 11,85 Graphic = Examples/Aerial Ace - Focus = User + Focus = Target SetFrame = 5,7 SetX = 5,30 SetY = 5,13 @@ -375,7 +375,7 @@ Name = Example anim SetVisible = 11,false Graphic = Examples/Aerial Ace - Focus = User + Focus = Target SetFrame = 5,7 SetX = 5,-3 SetY = 5,3 @@ -397,7 +397,7 @@ Name = Example anim SetVisible = 11,false Graphic = Examples/Aerial Ace - Focus = User + Focus = Target SetFrame = 5,7 SetX = 5,-27 SetY = 5,26 @@ -420,7 +420,7 @@ Name = Example anim SetOpacity = 11,85 Graphic = Examples/Aerial Ace - Focus = User + Focus = Target SetFrame = 5,7 SetX = 5,19 SetY = 5,50 From 15033d611490e19883b2512b560807fc80358a3b Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 15 Apr 2024 22:42:46 +0100 Subject: [PATCH 35/49] Anim Editor: improved NumberTextBox entry, added "FoeInvertX/Y" particle properties, tidied up --- .../Control elements/001_BaseControl.rb | 3 - .../Control elements/004_TextBox.rb | 5 +- .../Control elements/006_NumberTextBox.rb | 57 +++++---- .../Control elements/007_Button.rb | 1 - .../902_Anim GameData/001_Animation.rb | 110 ++++++++---------- .../903_Anim Compiler/001_Anim compiler.rb | 13 +++ .../100_convert old anims to new.rb | 19 +-- .../904_Anim Editor/001_AnimationEditor.rb | 25 +--- .../002_AnimationEditor_popups.rb | 6 - .../003_AnimationEditor_side_panes.rb | 66 +++++------ .../904_Anim Editor/901_ParticleDataHelper.rb | 10 +- .../Anim Editor elements/001_Canvas.rb | 61 +++++++--- .../Anim Editor elements/002_PlayControls.rb | 92 ++++++++------- .../Anim Editor elements/003_ParticleList.rb | 37 +++--- .../905_Anim player/001_Anim player.rb | 12 ++ .../905_Anim player/002_ParticleSprite.rb | 9 +- .../905_Anim player/010_Battle code.rb | 21 ++-- .../905_Anim player/011_Battle z modifiers.rb | 3 - 18 files changed, 271 insertions(+), 279 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index f6587a642..f60962048 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -1,6 +1,3 @@ -# TODO: Add indicator of whether the control's value is "lerping" between frames -# (use yellow somehow?). - #=============================================================================== # #=============================================================================== diff --git a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb index 940e68cfa..fb2e3a227 100644 --- a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb @@ -25,8 +25,8 @@ class UIControls::TextBox < UIControls::BaseControl end def value=(new_value) - return if @value == new_value - @value = new_value.dup + return if @value.to_s == new_value.to_s + @value = new_value.to_s.dup invalidate end @@ -39,6 +39,7 @@ class UIControls::TextBox < UIControls::BaseControl end def delete_at(index) + @value = @value.to_s @value.slice!(index) @cursor_pos -= 1 if @cursor_pos > index @cursor_timer = System.uptime diff --git a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb index a4886bd43..de62d92f6 100644 --- a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb @@ -22,46 +22,28 @@ class UIControls::NumberTextBox < UIControls::TextBox end def value=(new_value) - old_val = @value + old_val = @value.to_i @value = new_value.to_i.clamp(self.min_value, self.max_value) - self.invalidate if @value != old_val + invalidate if @value != old_val end def min_value=(new_min) return if new_min == @min_value @min_value = new_min - @value = @value.clamp(self.min_value, self.max_value) - self.invalidate + @value = @value.to_i.clamp(self.min_value, self.max_value) + invalidate end def max_value=(new_max) return if new_max == @max_value @max_value = new_max - @value = @value.clamp(self.min_value, self.max_value) - self.invalidate - end - - def insert_char(ch, index = -1) - old_val = @value - if @value == 0 - @value = ch.to_i - else - self.value = @value.to_s.insert((index >= 0) ? index : @cursor_pos, ch).to_i - end - return if @value == old_val - @cursor_pos += 1 - @cursor_pos = @cursor_pos.clamp(0, @value.to_s.length) - @cursor_timer = System.uptime - @cursor_shown = true + @value = @value.to_i.clamp(self.min_value, self.max_value) invalidate end - def delete_at(index) - new_val = @value.to_s - new_val.slice!(index) - self.value = new_val.to_i - @cursor_pos -= 1 if @cursor_pos > index - @cursor_pos = @cursor_pos.clamp(0, @value.to_s.length) + def insert_char(ch, index = -1) + @value = @value.to_s.insert((index >= 0) ? index : @cursor_pos, ch) + @cursor_pos += 1 @cursor_timer = System.uptime @cursor_shown = true invalidate @@ -81,6 +63,13 @@ class UIControls::NumberTextBox < UIControls::TextBox #----------------------------------------------------------------------------- + def reset_interaction + super + self.value = @value # Turn value back into a number and clamp it + end + + #----------------------------------------------------------------------------- + def refresh super button_color = (disabled?) ? DISABLED_COLOR : self.bitmap.font.color @@ -104,8 +93,8 @@ class UIControls::NumberTextBox < UIControls::TextBox elsif @captured_area @initial_value = @value else - set_changed if @initial_value && @value != @initial_value reset_interaction + set_changed if @initial_value && @value != @initial_value end end @@ -114,15 +103,21 @@ class UIControls::NumberTextBox < UIControls::TextBox Input.gets.each_char do |ch| case ch when "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" + if (@value.to_s == "-0" && @cursor_pos > 1) || + (@value.to_s == "0" && @cursor_pos > 0) + @value = @value.to_s.chop + @cursor_pos -= 1 + end insert_char(ch) ret = true when "-", "+" - if @value > 0 && @min_value < 0 && ch == "-" - insert_char(ch, 0) # Add a negative sign at the start - ret = true - elsif @value < 0 + @value = @value.to_s + if @value[0] == "-" delete_at(0) # Remove the negative sign ret = true + elsif ch == "-" + insert_char(ch, 0) # Add a negative sign at the start + ret = true end next end diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index 938dbbf54..ffdc8dbfc 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -6,7 +6,6 @@ class UIControls::Button < UIControls::BaseControl BUTTON_Y = 2 BUTTON_PADDING = 10 # Used when @fixed_size is false BUTTON_HEIGHT = 28 # Used when @fixed_size is false - # TODO: This will also depend on the font size. TEXT_BASE_OFFSET_Y = 18 # Text is centred vertically in the button HIGHLIGHT_COLOR = Color.new(224, 192, 32) # Dark yellow diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index d73daed83..de7e4ec70 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -18,8 +18,6 @@ module GameData # NOTE: All mentions of focus types can be found by searching for # :user_and_target, plus there's :foreground in PARTICLE_DEFAULT_VALUES # below. - # TODO: Add :user_ground, :target_ground? - # TODO: Add :opposing_side_foreground and :opposing_side_background? FOCUS_TYPES = { "Foreground" => :foreground, "Midground" => :midground, @@ -29,8 +27,8 @@ module GameData "UserAndTarget" => :user_and_target, "UserSideForeground" => :user_side_foreground, "UserSideBackground" => :user_side_background, - "TargetSide" => :target_side_foreground, - "TargetSideBackground" => :target_side_background, + "TargetSideForeground" => :target_side_foreground, + "TargetSideBackground" => :target_side_background } FOCUS_TYPES_WITH_USER = [ :user, :user_and_target, :user_side_foreground, :user_side_background @@ -56,84 +54,68 @@ module GameData "NoUser" => [:no_user, "b"], "NoTarget" => [:no_target, "b"], "Ignore" => [:ignore, "b"], - # TODO: Boolean for whether the animation will be played if the target is - # on the same side as the user. - # TODO: DamageFrame (keyframe at which the battle continues, i.e. damage - # animations start playing). - "Flags" => [:flags, "*s"], "Particle" => [:particles, "s"] # Is a subheader line like } # For individual particles. Any property whose schema begins with "^" can # change during the animation. - # TODO: If more "SetXYZ"/"MoveXYZ" properties are added, ensure the "SetXYZ" - # ones are given a duration of 0 in def validate_compiled_animation. - # Also add display names to def self.property_display_name. SUB_SCHEMA = { # These properties cannot be changed partway through the animation. # NOTE: "Name" isn't a property here, because the particle's name comes # from the "Particle" property above. - "Graphic" => [:graphic, "s"], - "Focus" => [:focus, "e", FOCUS_TYPES], - # TODO: FlipIfFoe, RotateIfFoe kinds of thing. - + "Graphic" => [:graphic, "s"], + "Focus" => [:focus, "e", FOCUS_TYPES], + "FoeInvertX" => [:foe_invert_x, "b"], + "FoeInvertY" => [:foe_invert_y, "b"], # All properties below are "SetXYZ" or "MoveXYZ". "SetXYZ" has the # keyframe and the value, and "MoveXYZ" has the keyframe, duration and the # value. All have "^" in their schema. "SetXYZ" is turned into "MoveXYZ" # when compiling by inserting a duration (second value) of 0. - "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet - "MoveFrame" => [:frame, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 - "SetFlip" => [:flip, "^ub"], - "SetX" => [:x, "^ui"], - "MoveX" => [:x, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetY" => [:y, "^ui"], - "MoveY" => [:y, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetZ" => [:z, "^ui"], - "MoveZ" => [:z, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetZoomX" => [:zoom_x, "^uu"], - "MoveZoomX" => [:zoom_x, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetZoomY" => [:zoom_y, "^uu"], - "MoveZoomY" => [:zoom_y, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetAngle" => [:angle, "^ui"], - "MoveAngle" => [:angle, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetVisible" => [:visible, "^ub"], - "SetOpacity" => [:opacity, "^uu"], - "MoveOpacity" => [:opacity, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorRed" => [:color_red, "^ui"], - "MoveColorRed" => [:color_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorGreen" => [:color_green, "^ui"], - "MoveColorGreen" => [:color_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorBlue" => [:color_blue, "^ui"], - "MoveColorBlue" => [:color_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorAlpha" => [:color_alpha, "^ui"], - "MoveColorAlpha" => [:color_alpha, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneRed" => [:tone_red, "^ui"], - "MoveToneRed" => [:tone_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneGreen" => [:tone_green, "^ui"], - "MoveToneGreen" => [:tone_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneBlue" => [:tone_blue, "^ui"], - "MoveToneBlue" => [:tone_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneGray" => [:tone_gray, "^ui"], - "MoveToneGray" => [:tone_gray, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - # TODO: Add "SetColor"/"SetTone" as shorthand for the above? They'd be - # converted in the Compiler. - # TODO: Bitmap masking. - # TODO: Sprite cropping. - # TODO: Hue? I don't think so; color/tone do the same job. - + "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet + "MoveFrame" => [:frame, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 + "SetFlip" => [:flip, "^ub"], + "SetX" => [:x, "^ui"], + "MoveX" => [:x, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetY" => [:y, "^ui"], + "MoveY" => [:y, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZ" => [:z, "^ui"], + "MoveZ" => [:z, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZoomX" => [:zoom_x, "^uu"], + "MoveZoomX" => [:zoom_x, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZoomY" => [:zoom_y, "^uu"], + "MoveZoomY" => [:zoom_y, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetAngle" => [:angle, "^ui"], + "MoveAngle" => [:angle, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetVisible" => [:visible, "^ub"], + "SetOpacity" => [:opacity, "^uu"], + "MoveOpacity" => [:opacity, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorRed" => [:color_red, "^ui"], + "MoveColorRed" => [:color_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorGreen" => [:color_green, "^ui"], + "MoveColorGreen" => [:color_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorBlue" => [:color_blue, "^ui"], + "MoveColorBlue" => [:color_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorAlpha" => [:color_alpha, "^ui"], + "MoveColorAlpha" => [:color_alpha, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneRed" => [:tone_red, "^ui"], + "MoveToneRed" => [:tone_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneGreen" => [:tone_green, "^ui"], + "MoveToneGreen" => [:tone_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneBlue" => [:tone_blue, "^ui"], + "MoveToneBlue" => [:tone_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneGray" => [:tone_gray, "^ui"], + "MoveToneGray" => [:tone_gray, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], # These properties are specifically for the "SE" particle. "Play" => [:se, "^usUU"], # Filename, volume, pitch "PlayUserCry" => [:user_cry, "^uUU"], # Volume, pitch "PlayTargetCry" => [:target_cry, "^uUU"] # Volume, pitch - - # TODO: ScreenShake? Not sure how to work this yet. Edit def - # validate_compiled_animation like the "SE" particle does with the - # "Play"-type commands. } PARTICLE_DEFAULT_VALUES = { - :name => "", - :graphic => "", - :focus => :foreground + :name => "", + :graphic => "", + :focus => :foreground, + :foe_invert_x => false, + :foe_invert_y => false } # NOTE: Particles are invisible until their first command, and automatically # become visible then. "User" and "Target" are visible from the start, diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index ab2f6fe5f..e5ba0189b 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -186,6 +186,19 @@ module Compiler raise _INTL("Animation can't play the target's cry if property \"NoTarget\" is set to true.") + "\n" + FileLineData.linereport end end + # Ensure that none of the particle's "alter something if focus is a + # battler on the foe's side" properties are set if the particle doesn't + # have such a focus + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) == GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + if particle[:foe_invert_x] + raise _INTL("Particle \"{1}\" can't set \"FoeInvertX\" if its focus isn't exactly 1 thing.", + particle[:name]) + "\n" + FileLineData.linereport + end + if particle[:foe_invert_y] + raise _INTL("Particle \"{1}\" can't set \"FoeInvertY\" if its focus isn't exactly 1 thing.", + particle[:name]) + "\n" + FileLineData.linereport + end + end # Ensure that the same SE isn't played twice in the same frame if particle[:name] == "SE" [:se, :user_cry, :target_cry].each do |property| diff --git a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb index 5f319fd4b..66439ef25 100644 --- a/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb +++ b/Data/Scripts/903_Anim Compiler/100_convert old anims to new.rb @@ -1,6 +1,3 @@ -# TODO: OppMove animations have their user and target swapped, and will need -# them swapping back. - module AnimationConverter NO_USER_COMMON_ANIMATIONS = [ "Hail", "HarshSun", "HeavyRain", "Rain", "Sandstorm", "Sun", "ShadowSky", @@ -223,8 +220,6 @@ module AnimationConverter when 2 # :user val -= Battle::Scene::FOCUSUSER_X when 3 # :user_and_target - # TODO: What if the animation is an OppMove one? I think this should - # be the other way around. user_x = Battle::Scene::FOCUSUSER_X target_x = Battle::Scene::FOCUSTARGET_X if hash[:type] == :opp_move @@ -248,8 +243,6 @@ module AnimationConverter when 2 # :user val -= Battle::Scene::FOCUSUSER_Y when 3 # :user_and_target - # TODO: What if the animation is an OppMove one? I think this should - # be the other way around. user_y = Battle::Scene::FOCUSUSER_Y target_y = Battle::Scene::FOCUSTARGET_Y if hash[:type] == :opp_move @@ -279,10 +272,6 @@ module AnimationConverter when :frame next if val < 0 # -1 is user, -2 is target end - # TODO: Come up with a better way to set a particle's graphic being - # the user or target. Probably can't, due to overlapping cel - # numbers and user/target being the :graphic property which - # doesn't change. particle[property[1]].push([frame_num, 0, val]) last_frame[property[0]] = cel[property[0]] changed_particles.push(idx) if !changed_particles.include?(idx) @@ -305,14 +294,11 @@ module AnimationConverter lookup_idx = index_lookup.index(idx) index_lookup[lookup_idx] = -1 end - # Add a dummy command to the user particle in the last frame if that frame - # doesn't have any commands + # Add a dummy command in the last frame if that frame doesn't have any + # commands (this makes all visible particles invisible) if frame_num == anim.length - 1 && changed_particles.empty? hash[:particles].each_with_index do |particle, idx| next if !particle || ["User", "Target"].include?(particle[:name]) - # TODO: Making all non-user non-target particles invisible in the last - # frame isn't a perfect solution, but it's good enough to get - # example animation data. next if last_frame_values[idx][AnimFrame::VISIBLE] == 0 particle[:visible] ||= [] particle[:visible].push([frame_num + 1, 0, false]) @@ -332,7 +318,6 @@ module AnimationConverter #----------------------------------------------------------------------------- - # TODO: Haven't tested this as no Essentials animations use them. def add_bg_fg_commands_to_new_anim_hash(anim, new_anim) bg_particle = { :name => "Background", :focus => :background } fg_particle = { :name => "Foreground", :focus => :foreground } diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 43abb48a7..3fd4000b5 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -209,14 +209,11 @@ class AnimationEditor end def load_settings - # TODO: Load these from a saved file. @settings = { - :side_sizes => [1, 1], - :user_index => 0, - :target_indices => [1], + :side_sizes => [1, 1], # Player's side, opposing side + :user_index => 0, # 0, 2, 4 + :target_indices => [1], # There must be at least one valid target :user_opposes => false, - # TODO: Ideally be able to independently choose base graphics, which will - # be a separate setting here. :canvas_bg => "indoor1", # NOTE: These sprite names are also used in Pokemon.play_cry and so should # be a species ID (being a string is fine). @@ -277,11 +274,9 @@ class AnimationEditor def add_side_pane_tab_buttons(component, pane) next_pos_x, next_pos_y = pane.next_control_position - # TODO: Add masking tab and properties. [ [:commands_pane, :general_tab, _INTL("General")], - [:color_tone_pane, :color_tone_tab, _INTL("Color/Tone")], -# [:masking_pane, :masking_tab, _INTL("Masking")] + [:color_tone_pane, :color_tone_tab, _INTL("Color/Tone")] ].each_with_index do |tab, i| btn = UIControls::Button.new(100, 28, pane.viewport, tab[2]) btn.set_fixed_size @@ -334,7 +329,6 @@ class AnimationEditor anim_properties.add_labelled_text_box(:pbs_path, _INTL("PBS filepath"), "") anim_properties.add_labelled_checkbox(:has_user, _INTL("Involves a user?"), true) anim_properties.add_labelled_checkbox(:has_target, _INTL("Involves a target?"), true) - # TODO: Flags control. Includes a List, TextBox and some add/delete Buttons. anim_properties.add_button(:close, _INTL("Close")) anim_properties.visible = false end @@ -421,7 +415,6 @@ class AnimationEditor #----------------------------------------------------------------------------- def play_animation - # TODO: Grey out the rest of the screen. play_controls = @components[:play_controls] # Set up canvas as a pseudo-battle screen @components[:canvas].prepare_to_play_animation @@ -457,8 +450,6 @@ class AnimationEditor Graphics.update Input.update anim_player.update - # TODO: Maybe get elapsed time from anim_player and pass it to - # play_controls to be drawn? play_controls.update if play_controls.changed? if play_controls.values.keys.include?(:stop) @@ -487,7 +478,6 @@ class AnimationEditor ctrl = @components[:animation_properties].get_control(:move) case @anim[:type] when :move, :opp_move - # TODO: Cache this list? move_list = [] GameData::Move.each { |m| move_list.push([m.id.to_s, m.name]) } move_list.push(["STRUGGLE", _INTL("Struggle")]) if move_list.none? { |val| val[0] == "STRUGGLE" } @@ -527,7 +517,6 @@ class AnimationEditor when :common, :opp_common component.get_control(:move_label).text = _INTL("Common animation") end - # TODO: Maybe other things as well? else # Side panes if AnimationEditor::SidePanes.is_side_pane?(component_sym) @@ -543,8 +532,6 @@ class AnimationEditor component.controls.each do |ctrl| next if !new_vals.include?(ctrl[0]) ctrl[1].value = new_vals[ctrl[0]][0] if ctrl[1].respond_to?("value=") - # TODO: new_vals[ctrl[0]][1] is whether the value is being interpolated, - # which should be indicated somehow in ctrl[1]. end end # Additional refreshing of controls @@ -591,7 +578,6 @@ class AnimationEditor when :name edit_animation_properties @components[:menu_bar].anim_name = get_animation_display_name - # TODO: May need to refresh other things. refresh_component(:particle_list) end when :canvas @@ -663,8 +649,6 @@ class AnimationEditor refresh_component(:canvas) end when :animation_properties - # TODO: Will changes here need to refresh any other components (e.g. side - # panes)? Probably. case property when :type, :opp_variant type = @components[component_sym].get_control(:type).value @@ -770,7 +754,6 @@ class AnimationEditor refresh if keyframe != old_keyframe || particle_index != old_particle_index end if component.respond_to?("values") - # TODO: Make undo/redo snapshot. values = component.values if values values.each_pair do |property, value| diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 903e5ea1a..d94e6be61 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -80,9 +80,6 @@ class AnimationEditor # Show pop-up window @pop_up_bg_bitmap.visible = true bg_bitmap = create_pop_up_window(ANIM_PROPERTIES_WIDTH, ANIM_PROPERTIES_HEIGHT) - # TODO: Draw box around list control(s), i.e. flags. Note that an extra +4 - # should be added to its x coordinate because of padding created when - # defining @components[:animation_properties]. anim_properties = @components[:animation_properties] anim_properties.visible = true # Set control values @@ -99,7 +96,6 @@ class AnimationEditor anim_properties.get_control(:has_user).value = !@anim[:no_user] anim_properties.get_control(:has_target).value = !@anim[:no_target] anim_properties.get_control(:usable).value = !(@anim[:ignore] || false) - # TODO: Populate flags. refresh_component(:animation_properties) # This sets the :move control's value # Interaction loop ret = nil @@ -200,8 +196,6 @@ class AnimationEditor fname = (chunks[0] == "USER") ? @settings[:user_sprite_name].to_s : @settings[:target_sprite_name].to_s case chunks[1] || "" when "", "OPP" - # TODO: "TARGET" and "TARGET_OPP" will not be accurate in cases where - # the target is on the same side as the user. if (chunks[0] == "USER") ^ (chunks[1] == "OPP") # xor folder = (@settings[:user_opposes]) ? "Graphics/Pokemon/Front/" : "Graphics/Pokemon/Back/" else diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index 84691d0ce..02cdfb481 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -132,12 +132,6 @@ AnimationEditor::SidePanes.add_pane(:particle_pane, { } }) -# AnimationEditor::SidePanes.add_pane(:keyframe_pane, { -# :set_visible => proc { |editor, anim, keyframe, particle_index| -# next keyframe >= 0 && particle_index < 0 -# } -# }) - #=============================================================================== # #=============================================================================== @@ -183,12 +177,6 @@ AnimationEditor::SidePanes.add_property(:commands_pane, :z, { } }) -# TODO: If the graphic is user's sprite/target's sprite, make :frame instead -# a choice of front/back/same as the main sprite/opposite of the main -# sprite. Will need two controls in the same space, which is doable. -# Will also need to change the graphic chooser to only have "user"/ -# "target" options rather than all the variants that this control -# would manage. AnimationEditor::SidePanes.add_property(:commands_pane, :frame, { :new => proc { |pane, editor| pane.add_labelled_number_text_box(:frame, _INTL("Frame"), 0, 99, 0) @@ -196,7 +184,6 @@ AnimationEditor::SidePanes.add_property(:commands_pane, :frame, { :refresh_value => proc { |control, editor| # Disable the "Frame" control if the particle's graphic is predefined to be # the user's or target's sprite - # TODO: Also disable it if the particle's graphic isn't a spritesheet. graphic = editor.anim[:particles][editor.particle_index][:graphic] if ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(graphic) @@ -253,9 +240,6 @@ AnimationEditor::SidePanes.add_property(:commands_pane, :blending, { } }) -# TODO: Add buttons that shift all commands from the current keyframe and later -# forwards/backwards in time? - #=============================================================================== # #=============================================================================== @@ -534,8 +518,39 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :focus, { } }) -# TODO: FlipIfFoe. -# TODO: RotateIfFoe. +AnimationEditor::SidePanes.add_property(:particle_pane, :opposing_label, { + :new => proc { |pane, editor| + pane.add_label(:opposing_label, _INTL("If on opposing side...")) + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :foe_invert_x, { + :new => proc { |pane, editor| + pane.add_labelled_checkbox(:foe_invert_x, _INTL("Invert X"), false) + }, + :refresh_value => proc { |control, editor| + focus = editor.anim[:particles][editor.particle_index][:focus] + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(focus) == GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(focus) + control.disable + else + control.enable + end + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :foe_invert_y, { + :new => proc { |pane, editor| + pane.add_labelled_checkbox(:foe_invert_y, _INTL("Invert Y"), false) + }, + :refresh_value => proc { |control, editor| + focus = editor.anim[:particles][editor.particle_index][:focus] + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(focus) == GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(focus) + control.disable + else + control.enable + end + } +}) AnimationEditor::SidePanes.add_property(:particle_pane, :duplicate, { :new => proc { |pane, editor| @@ -580,18 +595,3 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :delete, { end } }) - -# TODO: Various ways to bulk shift this particle's commands earlier/later. - -#=============================================================================== -# NOTE: keyframe_pane is currently inaccessible (intentionally). If it will have -# its own commands and should be accessible again, change def -# on_mouse_release in ParticleList. -#=============================================================================== -# AnimationEditor::SidePanes.add_property(:keyframe_pane, :header, { -# :new => proc { |pane, editor| -# pane.add_header_label(:header, _INTL("Edit keyframe")) -# } -# }) - -# TODO: Various command-shifting options (insert/delete keyframe). diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index c2f27855e..4867bbe26 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -63,7 +63,8 @@ module AnimationEditor::ParticleDataHelper return ret end - # TODO: Generalise this to any property? + # Used to determine which keyframes the particle is visible in, which is + # indicated in the timeline by a coloured bar. # NOTE: Particles are assumed to be not visible at the start of the # animation, and automatically become visible when the particle has # its first command. This does not apply to the "User" and "Target" @@ -460,11 +461,8 @@ module AnimationEditor::ParticleDataHelper # the new one, the new particle will inherit its focus; otherwise it gets a # default focus of :foreground. def add_particle(particles, index) - new_particle = { - :name => _INTL("New particle"), - :graphic => GameData::Animation::PARTICLE_DEFAULT_VALUES[:graphic], - :focus => GameData::Animation::PARTICLE_DEFAULT_VALUES[:focus] - } + new_particle = GameData::Animation::PARTICLE_DEFAULT_VALUES.clone + new_particle[:name] = _INTL("New particle") if index > 0 && index <= particles.length && particles[index - 1][:name] != "SE" new_particle[:focus] = particles[index - 1][:focus] end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 4dd3b9905..70bb97c5f 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -39,7 +39,6 @@ class AnimationEditor::Canvas < Sprite def initialize_background self.z = -200 # NOTE: The background graphic is self.bitmap. - # TODO: Add second (flipped) background graphic, for screen shake commands. player_base_pos = Battle::Scene.pbBattlerPosition(0) @player_base = IconSprite.new(*player_base_pos, viewport) @player_base.z = -199 @@ -231,7 +230,6 @@ class AnimationEditor::Canvas < Sprite AnimationPlayer::Helper.apply_z_focus_to_sprite(@battler_sprites[idx], 0, focus_z) end end - # TODO: Also add background/bases and so on. hide_all_sprites @sel_frame_sprite.visible = false @playing = true @@ -249,9 +247,6 @@ class AnimationEditor::Canvas < Sprite def refresh_bg_graphics return if @bg_name && @bg_name == @settings[:canvas_bg] @bg_name = @settings[:canvas_bg] - # TODO: Make the choice of background graphics match the in-battle one in - # def pbCreateBackdropSprites. Ideally make that method a class method - # so the canvas can use it rather than duplicate it. self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_bg") @player_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") @player_base.ox = @player_base.bitmap.width / 2 @@ -292,12 +287,11 @@ class AnimationEditor::Canvas < Sprite end end - # TODO: Create shadow sprites? - # TODO: Make this also refresh if the layout of the battle changes (i.e. which - # battlers are the user/target). def ensure_battler_sprites - if @sides_swapped.nil? || @sides_swapped != sides_swapped? || - !@side_size0 || @side_size0 != side_size(0) + should_ensure = @sides_swapped.nil? || @sides_swapped != sides_swapped? || + @settings_user_index.nil? || @settings_user_index != @settings[:user_index] || + @settings_target_indices.nil? || @settings_target_indices != @settings[:target_indices] + if should_ensure || !@side_size0 || @side_size0 != side_size(0) @battler_sprites.each_with_index { |s, i| s.dispose if i.even? && s && !s.disposed? } @battler_frame_sprites.each_with_index { |s, i| s.dispose if i.even? && s && !s.disposed? } @side_size0 = side_size(0) @@ -312,8 +306,7 @@ class AnimationEditor::Canvas < Sprite @battler_frame_sprites[i * 2] = frame_sprite end end - if @sides_swapped.nil? || @sides_swapped != sides_swapped? || - !@side_size1 || @side_size1 != side_size(1) + if should_ensure || !@side_size1 || @side_size1 != side_size(1) @battler_sprites.each_with_index { |s, i| s.dispose if i.odd? && s && !s.disposed? } @battler_frame_sprites.each_with_index { |s, i| s.dispose if i.odd? && s && !s.disposed? } @side_size1 = side_size(1) @@ -328,7 +321,11 @@ class AnimationEditor::Canvas < Sprite @battler_frame_sprites[(i * 2) + 1] = frame_sprite end end - @sides_swapped = sides_swapped? + if should_ensure + @sides_swapped = sides_swapped? + @settings_user_index = @settings[:user_index] + @settings_target_indices = @settings[:target_indices].clone + end end def refresh_battler_graphics @@ -429,6 +426,14 @@ class AnimationEditor::Canvas < Sprite def refresh_sprite(index, target_idx = -1) particle = @anim[:particles][index] return if !particle || particle[:name] == "SE" + relative_to_index = -1 + if particle[:focus] != :user_and_target + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) + relative_to_index = user_index + elsif GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + relative_to_index = target_idx + end + end # Get sprite spr, frame = get_sprite_and_frame(index, target_idx) # Calculate all values of particle at the current keyframe @@ -443,10 +448,16 @@ class AnimationEditor::Canvas < Sprite # Set opacity spr.opacity = values[:opacity] # Set coordinates + base_x = values[:x] + base_y = values[:y] + if relative_to_index >= 0 && relative_to_index.odd? + base_x *= -1 if particle[:foe_invert_x] + base_y *= -1 if particle[:foe_invert_y] + end focus_xy = AnimationPlayer::Helper.get_xy_focus(particle, user_index, target_idx, @user_coords, @target_coords[target_idx]) - AnimationPlayer::Helper.apply_xy_focus_to_sprite(spr, :x, values[:x], focus_xy) - AnimationPlayer::Helper.apply_xy_focus_to_sprite(spr, :y, values[:y], focus_xy) + AnimationPlayer::Helper.apply_xy_focus_to_sprite(spr, :x, base_x, focus_xy) + AnimationPlayer::Helper.apply_xy_focus_to_sprite(spr, :y, base_y, focus_xy) # Set graphic and ox/oy (may also alter y coordinate) AnimationPlayer::Helper.set_bitmap_and_origin(particle, spr, user_index, target_idx, [@user_bitmap_front_name, @user_bitmap_back_name], @@ -455,8 +466,6 @@ class AnimationEditor::Canvas < Sprite spr.x += offset_xy[0] spr.y += offset_xy[1] # Set frame - # TODO: Should this always happens or only if the graphic is a spritesheet? - # I don't think there's harm in it always being set. spr.src_rect.x = values[:frame].floor * spr.src_rect.width # Set z (priority) focus_z = AnimationPlayer::Helper.get_z_focus(particle, user_index, target_idx) @@ -627,6 +636,15 @@ class AnimationEditor::Canvas < Sprite base_coords = Battle::Scene.pbBattlerPosition(first_target_index) new_pos -= base_coords[0] end + relative_to_index = -1 + if particle[:focus] != :user_and_target + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) + relative_to_index = user_index + elsif GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + relative_to_index = target_idx + end + end + new_pos *= -1 if relative_to_index >= 0 && relative_to_index.odd? && particle[:foe_invert_x] @values ||= {} @values[:x] = new_pos @captured[0] = new_canvas_x @@ -655,6 +673,15 @@ class AnimationEditor::Canvas < Sprite base_coords = Battle::Scene.pbBattlerPosition(first_target_index) new_pos -= base_coords[1] end + relative_to_index = -1 + if particle[:focus] != :user_and_target + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) + relative_to_index = user_index + elsif GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + relative_to_index = target_idx + end + end + new_pos *= -1 if relative_to_index >= 0 && relative_to_index.odd? && particle[:foe_invert_y] @values ||= {} @values[:y] = new_pos @captured[1] = new_canvas_y diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb index 5f214a495..ffef45cd4 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb @@ -33,25 +33,68 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer @looping = false end + def dispose + @bitmaps.each { |b| b&.dispose } + super + end + #----------------------------------------------------------------------------- + def generate_button_bitmaps + @bitmaps = {} + play_button = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) + (PLAY_BUTTON_SIZE - 2).times do |j| + play_button.fill_rect(PLAY_BUTTON_SIZE / 4, j + 1, (j >= (PLAY_BUTTON_SIZE - 2) / 2) ? PLAY_BUTTON_SIZE - j : j + 3, 1, ICON_COLOR) + end + @bitmaps[:play_button] = play_button + stop_button = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) + stop_button.fill_rect(4, 4, PLAY_BUTTON_SIZE - 8, PLAY_BUTTON_SIZE - 8, ICON_COLOR) + @bitmaps[:stop_button] = stop_button + # Loop button + play_once_button = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) + play_once_button.fill_rect(1, 7, 11, 2, ICON_COLOR) + play_once_button.fill_rect(8, 5, 2, 6, ICON_COLOR) + play_once_button.fill_rect(10, 6, 1, 4, ICON_COLOR) + play_once_button.fill_rect(13, 1, 2, 14, ICON_COLOR) + @bitmaps[:play_once_button] = play_once_button + looping_button = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) + [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, + 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, + 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, + 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, + 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, + 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0].each_with_index do |val, i| + next if val == 0 + looping_button.fill_rect(1 + (i % 14), 1 + (i / 14), 1, 1, ICON_COLOR) + end + @bitmaps[:looping_button] = looping_button + end + def add_play_controls # Play button - play_button = UIControls::BitmapButton.new(PLAY_BUTTON_X, PLAY_BUTTON_Y, self.viewport, @play_button_bitmap) + play_button = UIControls::BitmapButton.new(PLAY_BUTTON_X, PLAY_BUTTON_Y, self.viewport, @bitmaps[:play_button]) play_button.set_interactive_rects play_button.disable @controls.push([:play, play_button]) # Stop button - stop_button = UIControls::BitmapButton.new(PLAY_BUTTON_X, PLAY_BUTTON_Y, self.viewport, @stop_button_bitmap) + stop_button = UIControls::BitmapButton.new(PLAY_BUTTON_X, PLAY_BUTTON_Y, self.viewport, @bitmaps[:stop_button]) stop_button.set_interactive_rects stop_button.visible = false @controls.push([:stop, stop_button]) # Loop buttons - loop_button = UIControls::BitmapButton.new(LOOP_BUTTON_X, LOOP_BUTTON_Y, self.viewport, @play_once_button_bitmap) + loop_button = UIControls::BitmapButton.new(LOOP_BUTTON_X, LOOP_BUTTON_Y, self.viewport, @bitmaps[:play_once_button]) loop_button.set_interactive_rects loop_button.visible = false if @looping @controls.push([:loop, loop_button]) - unloop_button = UIControls::BitmapButton.new(LOOP_BUTTON_X, LOOP_BUTTON_Y, self.viewport, @looping_button_bitmap) + unloop_button = UIControls::BitmapButton.new(LOOP_BUTTON_X, LOOP_BUTTON_Y, self.viewport, @bitmaps[:looping_button]) unloop_button.set_interactive_rects unloop_button.visible = false if !@looping @controls.push([:unloop, unloop_button]) @@ -83,47 +126,6 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer @controls.push([:duration_value, duration_value]) end - def generate_button_bitmaps - @play_button_bitmap = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) - (PLAY_BUTTON_SIZE - 2).times do |j| - @play_button_bitmap.fill_rect(PLAY_BUTTON_SIZE / 4, j + 1, (j >= (PLAY_BUTTON_SIZE - 2) / 2) ? PLAY_BUTTON_SIZE - j : j + 3, 1, ICON_COLOR) - end - @stop_button_bitmap = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) - @stop_button_bitmap.fill_rect(4, 4, PLAY_BUTTON_SIZE - 8, PLAY_BUTTON_SIZE - 8, ICON_COLOR) - # Loop button - @play_once_button_bitmap = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) - @play_once_button_bitmap.fill_rect(1, 7, 11, 2, ICON_COLOR) - @play_once_button_bitmap.fill_rect(8, 5, 2, 6, ICON_COLOR) - @play_once_button_bitmap.fill_rect(10, 6, 1, 4, ICON_COLOR) - @play_once_button_bitmap.fill_rect(13, 1, 2, 14, ICON_COLOR) - @looping_button_bitmap = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) - [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, - 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, - 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, - 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, - 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, - 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, - 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0].each_with_index do |val, i| - next if val == 0 - @looping_button_bitmap.fill_rect(1 + (i % 14), 1 + (i / 14), 1, 1, ICON_COLOR) - end - end - - def dispose - @play_button_bitmap.dispose - @stop_button_bitmap.dispose - @play_once_button_bitmap.dispose - @looping_button_bitmap.dispose - super - end - #----------------------------------------------------------------------------- def duration=(new_val) diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index ee485ab10..e38ccd6a3 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -135,31 +135,35 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def initialize_controls generate_button_bitmaps @controls = [] - add_particle_button = UIControls::BitmapButton.new(x + 1, y + 1, viewport, @add_button_bitmap) + add_particle_button = UIControls::BitmapButton.new(x + 1, y + 1, viewport, @bitmaps[:add_button]) add_particle_button.set_interactive_rects @controls.push([:add_particle, add_particle_button]) - up_particle_button = UIControls::BitmapButton.new(x + 22, y + 1, viewport, @up_button_bitmap) + up_particle_button = UIControls::BitmapButton.new(x + 22, y + 1, viewport, @bitmaps[:up_button]) up_particle_button.set_interactive_rects @controls.push([:move_particle_up, up_particle_button]) - down_particle_button = UIControls::BitmapButton.new(x + 43, y + 1, viewport, @down_button_bitmap) + down_particle_button = UIControls::BitmapButton.new(x + 43, y + 1, viewport, @bitmaps[:down_button]) down_particle_button.set_interactive_rects @controls.push([:move_particle_down, down_particle_button]) end def generate_button_bitmaps - @add_button_bitmap = Bitmap.new(12, 12) - @add_button_bitmap.fill_rect(1, 5, 10, 2, TEXT_COLOR) - @add_button_bitmap.fill_rect(5, 1, 2, 10, TEXT_COLOR) - @up_button_bitmap = Bitmap.new(12, 12) + @bitmaps = {} + add_button = Bitmap.new(12, 12) + add_button.fill_rect(1, 5, 10, 2, TEXT_COLOR) + add_button.fill_rect(5, 1, 2, 10, TEXT_COLOR) + @bitmaps[:add_button] = add_button + up_button = Bitmap.new(12, 12) 5.times do |i| - @up_button_bitmap.fill_rect(1 + i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) - @up_button_bitmap.fill_rect(10 - i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) + up_button.fill_rect(1 + i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) + up_button.fill_rect(10 - i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) end - @down_button_bitmap = Bitmap.new(12, 12) + @bitmaps[:up_button] = up_button + down_button = Bitmap.new(12, 12) 5.times do |i| - @down_button_bitmap.fill_rect(1 + i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) - @down_button_bitmap.fill_rect(10 - i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) + down_button.fill_rect(1 + i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) + down_button.fill_rect(10 - i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) end + @bitmaps[:down_button] = down_button end def dispose @@ -171,9 +175,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @particle_line_sprite.dispose @controls.each { |c| c[1].dispose } @controls.clear - @add_button_bitmap.dispose - @up_button_bitmap.dispose - @down_button_bitmap.dispose + @bitmaps.each { |b| b&.dispose } dispose_listed_sprites @list_viewport.dispose @commands_bg_viewport.dispose @@ -436,9 +438,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @duration += DURATION_BUFFER end - # TODO: Call this only from set_particles and when changes are made to - # @particles by the main editor scene. If we can be specific about which - # particle was changed, recalculate only that particle's commands. def calculate_all_commands_and_durations calculate_duration calculate_all_commands @@ -956,8 +955,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end set_changed if @keyframe != @captured_keyframe || @row_index != @captured_row @keyframe = @captured_keyframe || -1 - # TODO: If :keyframe_pane should be accessible by clicking on the - # timeline, change the below line to = @captured_row || -1. @row_index = @captured_row if @captured_row end end diff --git a/Data/Scripts/905_Anim player/001_Anim player.rb b/Data/Scripts/905_Anim player/001_Anim player.rb index a95a78d10..ae9d7b67e 100644 --- a/Data/Scripts/905_Anim player/001_Anim player.rb +++ b/Data/Scripts/905_Anim player/001_Anim player.rb @@ -113,6 +113,18 @@ class AnimationPlayer particle_sprite.focus_xy = focus_xy particle_sprite.offset_xy = offset_xy particle_sprite.focus_z = focus_z + # Set whether properties should be modified if the particle's target is on + # the opposing side + relative_to_index = -1 + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) + relative_to_index = @user.index + elsif GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + relative_to_index = target_idx + end + if relative_to_index >= 0 && relative_to_index.odd? && particle[:focus] != :user_and_target + particle_sprite.foe_invert_x = particle[:foe_invert_x] + particle_sprite.foe_invert_y = particle[:foe_invert_y] + end # Find earliest command and add a "make visible" command then if sprite && !particle_sprite.battler_sprite? first_cmd = -1 diff --git a/Data/Scripts/905_Anim player/002_ParticleSprite.rb b/Data/Scripts/905_Anim player/002_ParticleSprite.rb index a1f23377d..90b7b3160 100644 --- a/Data/Scripts/905_Anim player/002_ParticleSprite.rb +++ b/Data/Scripts/905_Anim player/002_ParticleSprite.rb @@ -5,6 +5,7 @@ class AnimationPlayer::ParticleSprite attr_accessor :sprite attr_accessor :focus_xy, :offset_xy, :focus_z + attr_accessor :foe_invert_x, :foe_invert_y FRAMES_PER_SECOND = 20.0 @@ -98,10 +99,14 @@ class AnimationPlayer::ParticleSprite when :blending then @sprite.blend_type = value when :flip then @sprite.mirror = value when :x - AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :x, value.round, @focus_xy) + value = value.round + value *= -1 if @foe_invert_x + AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :x, value, @focus_xy) @sprite.x += @offset_xy[0] when :y - AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :y, value.round, @focus_xy) + value = value.round + value *= -1 if @foe_invert_y + AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :y, value, @focus_xy) @sprite.y += @offset_xy[1] when :z AnimationPlayer::Helper.apply_z_focus_to_sprite(@sprite, value, @focus_z) diff --git a/Data/Scripts/905_Anim player/010_Battle code.rb b/Data/Scripts/905_Anim player/010_Battle code.rb index 482dba8bb..bfdd765aa 100644 --- a/Data/Scripts/905_Anim player/010_Battle code.rb +++ b/Data/Scripts/905_Anim player/010_Battle code.rb @@ -2,7 +2,8 @@ # #=============================================================================== class Battle::Scene - BETTER_ANIMATION_DEFAULTS = { + ANIMATION_DEFAULTS = [:TACKLE, :DEFENSECURL] # With target, without target + ANIMATION_DEFAULTS_FOR_TYPE_CATEGORY = { :NORMAL => [:TACKLE, :SONICBOOM, :DEFENSECURL, :EXPLOSION, :SWIFT, :TAILWHIP], :FIGHTING => [:MACHPUNCH, :AURASPHERE, :BULKUP, nil, nil, nil], :FLYING => [:WINGATTACK, :GUST, :ROOST, nil, :AIRCUTTER, :FEATHERDANCE], @@ -73,20 +74,24 @@ class Battle::Scene target_data = GameData::Target.get(move_data.target) move_type = move_data.type default_idx = move_data.category - default_idx += 3 if target_data.num_targets > 1 || target_data.affects_foe_side - default_idx += 3 if move_data.status? && target_data.num_targets > 0 + default_idx += 3 if target_data.num_targets > 1 || + (target_data.num_targets > 0 && move_data.status?) || + target_data.affects_foe_side # Check for a default animation - wanted_move = BETTER_ANIMATION_DEFAULTS[move_type][default_idx] + wanted_move = ANIMATION_DEFAULTS_FOR_TYPE_CATEGORY[move_type][default_idx] anims = find_move_animation_for_move(wanted_move, 0, user_index) return anims if anims if default_idx >= 3 - wanted_move = BETTER_ANIMATION_DEFAULTS[move_type][default_idx - 3] + wanted_move = ANIMATION_DEFAULTS_FOR_TYPE_CATEGORY[move_type][default_idx - 3] anims = find_move_animation_for_move(wanted_move, 0, user_index) return anims if anims - return nil if wanted_move == :TACKLE # No need to check for Tackle's animation twice + return nil if ANIMATION_DEFAULTS.include?(wanted_move) # No need to check for these animations twice end - # Use Tackle's animation - return find_move_animation_for_move(:TACKLE, 0, user_index) + # Use Tackle or Defense Curl's animation + if target_data.num_targets == 0 && target.data.id != :None + return find_move_animation_for_move(ANIMATION_DEFAULTS[1], 0, user_index) + end + return find_move_animation_for_move(ANIMATION_DEFAULTS[0], 0, user_index) end # Find an animation(s) for the given move_id. diff --git a/Data/Scripts/905_Anim player/011_Battle z modifiers.rb b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb index f82bc946e..6e036e782 100644 --- a/Data/Scripts/905_Anim player/011_Battle z modifiers.rb +++ b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb @@ -1,6 +1,3 @@ -# TODO: Hardcoded animations have incorrect z values because of the change to -# other sprites' z values. - #=============================================================================== # #=============================================================================== From 4480def33c06090047ab2824ab59eb9f6897694a Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 18 Apr 2024 22:35:15 +0100 Subject: [PATCH 36/49] Anim Editor: added FoeFlip property, Space to play, S to swap sides, P to show/hide property lines for selected particle --- .../Control elements/001_BaseControl.rb | 16 +++-- .../Control elements/002_Label.rb | 4 ++ .../Control elements/003_Checkbox.rb | 9 ++- .../Control elements/004_TextBox.rb | 62 ++++++++++--------- .../Control elements/005_NumberSlider.rb | 15 +++-- .../Control elements/006_NumberTextBox.rb | 7 ++- .../Control elements/007_Button.rb | 28 +++++---- .../Control elements/008_BitmapButton.rb | 2 + .../Control elements/009_List.rb | 45 +++++++------- .../Control elements/010_DropdownList.rb | 24 +++---- .../011_TextBoxDropdownList.rb | 22 ++++--- .../Control elements/101_Scrollbar.rb | 32 +++++----- .../902_Anim GameData/001_Animation.rb | 4 +- .../903_Anim Compiler/001_Anim compiler.rb | 13 ++++ .../904_Anim Editor/001_AnimationEditor.rb | 11 ++++ .../002_AnimationEditor_popups.rb | 19 +++--- .../003_AnimationEditor_side_panes.rb | 20 ++++++ .../904_Anim Editor/010_AnimationSelector.rb | 2 +- .../Anim Editor elements/001_Canvas.rb | 1 + .../Anim Editor elements/002_PlayControls.rb | 47 +++++++------- .../Anim Editor elements/003_ParticleList.rb | 33 +++++++--- .../905_Anim player/001_Anim player.rb | 3 +- .../905_Anim player/002_ParticleSprite.rb | 6 +- 23 files changed, 264 insertions(+), 161 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index f60962048..da56d8662 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -24,6 +24,8 @@ class UIControls::BaseControl < BitmapSprite invalidate end + #----------------------------------------------------------------------------- + def width return self.bitmap.width end @@ -32,6 +34,8 @@ class UIControls::BaseControl < BitmapSprite return self.bitmap.height end + #----------------------------------------------------------------------------- + def mouse_pos mouse_coords = Mouse.getMousePos return nil, nil if !mouse_coords @@ -40,10 +44,6 @@ class UIControls::BaseControl < BitmapSprite return ret_x, ret_y end - def set_interactive_rects - @interactions = {} - end - def mouse_in_control? return false if !@interactions || @interactions.empty? mouse_x, mouse_y = mouse_pos @@ -51,8 +51,6 @@ class UIControls::BaseControl < BitmapSprite return @interactions.any? { |area, rect| rect.contains?(mouse_x, mouse_y) } end - #----------------------------------------------------------------------------- - def disabled? return @disabled end @@ -102,6 +100,12 @@ class UIControls::BaseControl < BitmapSprite #----------------------------------------------------------------------------- + def set_interactive_rects + @interactions = {} + end + + #----------------------------------------------------------------------------- + def draw_text(this_bitmap, text_x, text_y, this_text) text_size = this_bitmap.text_size(this_text) this_bitmap.draw_text(text_x, text_y, text_size.width, text_size.height, this_text, 0) diff --git a/Data/Scripts/801_UI controls/Control elements/002_Label.rb b/Data/Scripts/801_UI controls/Control elements/002_Label.rb index 8d6d429fc..7f5695547 100644 --- a/Data/Scripts/801_UI controls/Control elements/002_Label.rb +++ b/Data/Scripts/801_UI controls/Control elements/002_Label.rb @@ -10,6 +10,8 @@ class UIControls::Label < UIControls::BaseControl @header = false end + #----------------------------------------------------------------------------- + def text=(value) @text = value refresh @@ -24,6 +26,8 @@ class UIControls::Label < UIControls::BaseControl return self.bitmap.text_size(@text).width end + #----------------------------------------------------------------------------- + def refresh super if @header diff --git a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb index 7d574992d..a4252cd75 100644 --- a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb +++ b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb @@ -6,21 +6,24 @@ class UIControls::Checkbox < UIControls::BaseControl CHECKBOX_WIDTH = 40 CHECKBOX_HEIGHT = 24 CHECKBOX_FILL_SIZE = CHECKBOX_HEIGHT - 4 - - UNCHECKED_COLOR = Color.gray - CHECKED_COLOR = Color.new(48, 192, 48) # Darkish green + UNCHECKED_COLOR = Color.gray + CHECKED_COLOR = Color.new(48, 192, 48) # Darkish green def initialize(width, height, viewport, value = false) super(width, height, viewport) @value = value end + #----------------------------------------------------------------------------- + def value=(new_value) return if @value == new_value @value = new_value invalidate end + #----------------------------------------------------------------------------- + def set_interactive_rects @checkbox_rect = Rect.new(CHECKBOX_X, (height - CHECKBOX_HEIGHT) / 2, CHECKBOX_WIDTH, CHECKBOX_HEIGHT) diff --git a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb index fb2e3a227..773e7c15d 100644 --- a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb @@ -20,6 +20,8 @@ class UIControls::TextBox < UIControls::BaseControl @blacklist = [] end + #----------------------------------------------------------------------------- + def value return @value.dup end @@ -60,36 +62,6 @@ class UIControls::TextBox < UIControls::BaseControl invalidate end - def set_interactive_rects - @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, - [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) - @interactions = { - :text_box => @text_box_rect - } - end - - #----------------------------------------------------------------------------- - - def disabled? - val = (@value.respond_to?("strip!")) ? @value.strip : @value - return true if @blacklist.include?(val) - return super - end - - def busy? - return @cursor_pos >= 0 if @captured_area == :text_box - return super - end - - def reset_interaction - @cursor_pos = -1 - @display_pos = 0 - @cursor_timer = nil - @initial_value = nil - Input.text_input = false - invalidate - end - #----------------------------------------------------------------------------- def get_cursor_index_from_mouse_position @@ -107,6 +79,36 @@ class UIControls::TextBox < UIControls::BaseControl return @value.to_s.length end + def disabled? + val = (@value.respond_to?("strip!")) ? @value.strip : @value + return true if @blacklist.include?(val) + return super + end + + def busy? + return @cursor_pos >= 0 if @captured_area == :text_box + return super + end + + #----------------------------------------------------------------------------- + + def set_interactive_rects + @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, + [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) + @interactions = { + :text_box => @text_box_rect + } + end + + def reset_interaction + @cursor_pos = -1 + @display_pos = 0 + @cursor_timer = nil + @initial_value = nil + Input.text_input = false + invalidate + end + def reset_display_pos box_width = @text_box_rect.width - (TEXT_BOX_PADDING * 2) char_widths = [] diff --git a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb index 4201f20a5..595a13d1a 100644 --- a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb +++ b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb @@ -7,12 +7,11 @@ class UIControls::NumberSlider < UIControls::BaseControl PLUS_MINUS_SIZE = 16 SLIDER_PADDING = 6 # Gap between sides of interactive area for slider and drawn slider bar - - MINUS_X = 0 - SLIDER_X = MINUS_X + PLUS_MINUS_SIZE + SLIDER_PADDING - SLIDER_LENGTH = 128 - PLUS_X = SLIDER_X + SLIDER_LENGTH + SLIDER_PADDING - VALUE_X = PLUS_X + PLUS_MINUS_SIZE + 5 + MINUS_X = 0 + SLIDER_X = MINUS_X + PLUS_MINUS_SIZE + SLIDER_PADDING + SLIDER_LENGTH = 128 + PLUS_X = SLIDER_X + SLIDER_LENGTH + SLIDER_PADDING + VALUE_X = PLUS_X + PLUS_MINUS_SIZE + 5 def initialize(width, height, viewport, min_value, max_value, value) super(width, height, viewport) @@ -21,6 +20,8 @@ class UIControls::NumberSlider < UIControls::BaseControl self.value = value end + #----------------------------------------------------------------------------- + def value=(new_value) old_val = @value @value = new_value.to_i.clamp(self.min_value, self.max_value) @@ -41,6 +42,8 @@ class UIControls::NumberSlider < UIControls::BaseControl self.invalidate end + #----------------------------------------------------------------------------- + def set_interactive_rects @slider_rect = Rect.new(SLIDER_X - SLIDER_PADDING, (self.height - PLUS_MINUS_SIZE) / 2, SLIDER_LENGTH + (SLIDER_PADDING * 2), PLUS_MINUS_SIZE) @minus_rect = Rect.new(MINUS_X, (self.height - PLUS_MINUS_SIZE) / 2, PLUS_MINUS_SIZE, PLUS_MINUS_SIZE) diff --git a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb index de62d92f6..4b75c06a1 100644 --- a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb @@ -7,7 +7,6 @@ class UIControls::NumberTextBox < UIControls::TextBox PLUS_MINUS_SIZE = 16 CONTROL_PADDING = 2 # Gap between buttons and text box - MINUS_X = 0 TEXT_BOX_X = MINUS_X + PLUS_MINUS_SIZE + CONTROL_PADDING TEXT_BOX_WIDTH = 64 @@ -21,6 +20,8 @@ class UIControls::NumberTextBox < UIControls::TextBox self.value = value end + #----------------------------------------------------------------------------- + def value=(new_value) old_val = @value.to_i @value = new_value.to_i.clamp(self.min_value, self.max_value) @@ -49,6 +50,8 @@ class UIControls::NumberTextBox < UIControls::TextBox invalidate end + #----------------------------------------------------------------------------- + def set_interactive_rects @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, TEXT_BOX_WIDTH, TEXT_BOX_HEIGHT) @@ -61,8 +64,6 @@ class UIControls::NumberTextBox < UIControls::TextBox } end - #----------------------------------------------------------------------------- - def reset_interaction super self.value = @value # Turn value back into a number and clamp it diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index ffdc8dbfc..847737d32 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -16,21 +16,12 @@ class UIControls::Button < UIControls::BaseControl @highlight = false end + #----------------------------------------------------------------------------- + def set_fixed_size @fixed_size = true end - def set_interactive_rects - @interactions&.clear - button_width = (@fixed_size) ? width - (BUTTON_X * 2) : self.bitmap.text_size(@text).width + (BUTTON_PADDING * 2) - button_height = (@fixed_size) ? height - (2 * BUTTON_Y) : BUTTON_HEIGHT - button_height = [button_height, height - (2 * BUTTON_Y)].min - @button_rect = Rect.new(BUTTON_X, (height - button_height) / 2, button_width, button_height) - @interactions = { - :button => @button_rect - } - end - def set_text(val) return if @text == val @text = val @@ -38,6 +29,8 @@ class UIControls::Button < UIControls::BaseControl invalidate end + #----------------------------------------------------------------------------- + def disabled? return highlighted? || super end @@ -70,6 +63,19 @@ class UIControls::Button < UIControls::BaseControl #----------------------------------------------------------------------------- + def set_interactive_rects + @interactions&.clear + button_width = (@fixed_size) ? width - (BUTTON_X * 2) : self.bitmap.text_size(@text).width + (BUTTON_PADDING * 2) + button_height = (@fixed_size) ? height - (2 * BUTTON_Y) : BUTTON_HEIGHT + button_height = [button_height, height - (2 * BUTTON_Y)].min + @button_rect = Rect.new(BUTTON_X, (height - button_height) / 2, button_width, button_height) + @interactions = { + :button => @button_rect + } + end + + #----------------------------------------------------------------------------- + def refresh super if highlighted? diff --git a/Data/Scripts/801_UI controls/Control elements/008_BitmapButton.rb b/Data/Scripts/801_UI controls/Control elements/008_BitmapButton.rb index 443590016..5f72a3f12 100644 --- a/Data/Scripts/801_UI controls/Control elements/008_BitmapButton.rb +++ b/Data/Scripts/801_UI controls/Control elements/008_BitmapButton.rb @@ -12,6 +12,8 @@ class UIControls::BitmapButton < UIControls::Button @disabled_bitmap = disabled_bitmap end + #----------------------------------------------------------------------------- + def set_interactive_rects @interactions&.clear @button_rect = Rect.new(0, 0, width, height) diff --git a/Data/Scripts/801_UI controls/Control elements/009_List.rb b/Data/Scripts/801_UI controls/Control elements/009_List.rb index 6359e2a32..2662cd511 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_List.rb @@ -2,11 +2,10 @@ # #=============================================================================== class UIControls::List < UIControls::BaseControl - BORDER_THICKNESS = 2 - ROW_HEIGHT = 24 - TEXT_PADDING_X = 4 - TEXT_OFFSET_Y = 3 - + BORDER_THICKNESS = 2 + ROW_HEIGHT = 24 + TEXT_PADDING_X = 4 + TEXT_OFFSET_Y = 3 SELECTED_ROW_COLOR = Color.new(216, 192, 32) # Dark yellow def initialize(width, height, viewport, values = []) @@ -30,6 +29,8 @@ class UIControls::List < UIControls::BaseControl super end + #----------------------------------------------------------------------------- + def x=(new_val) super(new_val) @scrollbar.x = new_val + width - UIControls::Scrollbar::SLIDER_WIDTH - BORDER_THICKNESS @@ -64,6 +65,17 @@ class UIControls::List < UIControls::BaseControl invalidate end + # Returns the ID of the selected row. + def value + return nil if @selected < 0 + if @values.is_a?(Array) + return (@values[@selected].is_a?(Array)) ? @values[@selected][0] : @selected + elsif @values.is_a?(Hash) + return @values.keys[@selected] + end + return nil + end + def top_row=(val) old_val = @top_row @top_row = val @@ -81,16 +93,7 @@ class UIControls::List < UIControls::BaseControl invalidate end - # Returns the ID of the selected row. - def value - return nil if @selected < 0 - if @values.is_a?(Array) - return (@values[@selected].is_a?(Array)) ? @values[@selected][0] : @selected - elsif @values.is_a?(Hash) - return @values.keys[@selected] - end - return nil - end + #----------------------------------------------------------------------------- def mouse_in_control? mouse_x, mouse_y = mouse_pos @@ -100,6 +103,12 @@ class UIControls::List < UIControls::BaseControl return false end + def busy? + return !@captured_area.nil? + end + + #----------------------------------------------------------------------------- + def set_interactive_rects @interactions = {} @values.length.times do |i| @@ -112,12 +121,6 @@ class UIControls::List < UIControls::BaseControl #----------------------------------------------------------------------------- - def busy? - return !@captured_area.nil? - end - - #----------------------------------------------------------------------------- - def draw_area_highlight # If a row is captured, it will automatically be selected and the selection # colour will be drawn over the highlight. There's no point drawing a diff --git a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb index 0c165dd78..d4d7cc983 100644 --- a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb @@ -26,23 +26,17 @@ class UIControls::DropdownList < UIControls::BaseControl super end - def value=(new_value) - return if @value == new_value - @value = new_value - invalidate - end + #----------------------------------------------------------------------------- def values=(new_vals) @options = new_vals @dropdown_menu.values = @options if @dropdown_menu end - def set_interactive_rects - @button_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, - [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) - @interactions = { - :button => @button_rect - } + def value=(new_value) + return if @value == new_value + @value = new_value + invalidate end #----------------------------------------------------------------------------- @@ -54,6 +48,14 @@ class UIControls::DropdownList < UIControls::BaseControl #----------------------------------------------------------------------------- + def set_interactive_rects + @button_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, + [@box_width, width - (TEXT_BOX_X * 2)].min, TEXT_BOX_HEIGHT) + @interactions = { + :button => @button_rect + } + end + def make_dropdown_menu menu_height = (UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min) + (UIControls::List::BORDER_THICKNESS * 2) # Draw menu's background diff --git a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb index 4971d33ce..112a11abd 100644 --- a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb @@ -26,21 +26,13 @@ class UIControls::TextBoxDropdownList < UIControls::TextBox super end + #----------------------------------------------------------------------------- + def values=(new_vals) @options = new_vals @dropdown_menu.values = @options if @dropdown_menu end - def set_interactive_rects - @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, - [@box_width, width - (TEXT_BOX_X * 2) - BUTTON_WIDTH].min, TEXT_BOX_HEIGHT) - @button_rect = Rect.new(BUTTON_X, @text_box_rect.y, BUTTON_WIDTH, BUTTON_HEIGHT) - @interactions = { - :text_box => @text_box_rect, - :button => @button_rect - } - end - #----------------------------------------------------------------------------- def busy? @@ -50,6 +42,16 @@ class UIControls::TextBoxDropdownList < UIControls::TextBox #----------------------------------------------------------------------------- + def set_interactive_rects + @text_box_rect = Rect.new(TEXT_BOX_X, (height - TEXT_BOX_HEIGHT) / 2, + [@box_width, width - (TEXT_BOX_X * 2) - BUTTON_WIDTH].min, TEXT_BOX_HEIGHT) + @button_rect = Rect.new(BUTTON_X, @text_box_rect.y, BUTTON_WIDTH, BUTTON_HEIGHT) + @interactions = { + :text_box => @text_box_rect, + :button => @button_rect + } + end + def make_dropdown_menu menu_height = (UIControls::List::ROW_HEIGHT * [@options.length, @max_rows].min) + (UIControls::List::BORDER_THICKNESS * 2) # Draw menu's background diff --git a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb index b91de8dac..14a954bdd 100644 --- a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb +++ b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb @@ -2,6 +2,8 @@ # #=============================================================================== class UIControls::Scrollbar < UIControls::BaseControl + attr_reader :slider_top + SLIDER_WIDTH = 16 WIDTH_PADDING = 0 SCROLL_DISTANCE = 16 @@ -9,8 +11,6 @@ class UIControls::Scrollbar < UIControls::BaseControl SLIDER_COLOR = Color.black GRAB_COLOR = HOVER_COLOR # Cyan - attr_reader :slider_top - def initialize(x, y, size, viewport, horizontal = false, always_visible = false) if horizontal super(size, SLIDER_WIDTH, viewport) @@ -28,18 +28,7 @@ class UIControls::Scrollbar < UIControls::BaseControl self.visible = @always_visible end - def position - return 0 if @range <= @tray_size - return (@range - @tray_size) * @slider_top / (@tray_size - @slider_size) - end - - def minimum? - return @slider_top <= 0 - end - - def maximum? - return @slider_top >= @tray_size - @slider_size - end + #----------------------------------------------------------------------------- # Range is the total size of the large area that the scrollbar is able to # show part of. @@ -68,6 +57,21 @@ class UIControls::Scrollbar < UIControls::BaseControl invalidate if @slider_top != old_val end + def position + return 0 if @range <= @tray_size + return (@range - @tray_size) * @slider_top / (@tray_size - @slider_size) + end + + def minimum? + return @slider_top <= 0 + end + + def maximum? + return @slider_top >= @tray_size - @slider_size + end + + #----------------------------------------------------------------------------- + def set_interactive_rects @interactions = {} if @horizontal diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index de7e4ec70..7409726f8 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -66,6 +66,7 @@ module GameData "Focus" => [:focus, "e", FOCUS_TYPES], "FoeInvertX" => [:foe_invert_x, "b"], "FoeInvertY" => [:foe_invert_y, "b"], + "FoeFlip" => [:foe_flip, "b"], # All properties below are "SetXYZ" or "MoveXYZ". "SetXYZ" has the # keyframe and the value, and "MoveXYZ" has the keyframe, duration and the # value. All have "^" in their schema. "SetXYZ" is turned into "MoveXYZ" @@ -115,7 +116,8 @@ module GameData :graphic => "", :focus => :foreground, :foe_invert_x => false, - :foe_invert_y => false + :foe_invert_y => false, + :foe_flip => false } # NOTE: Particles are invisible until their first command, and automatically # become visible then. "User" and "Target" are visible from the start, diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index e5ba0189b..5a6a1c053 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -198,6 +198,19 @@ module Compiler raise _INTL("Particle \"{1}\" can't set \"FoeInvertY\" if its focus isn't exactly 1 thing.", particle[:name]) + "\n" + FileLineData.linereport end + if particle[:foe_flip] + raise _INTL("Particle \"{1}\" can't set \"FoeFlip\" if its focus isn't exactly 1 thing.", + particle[:name]) + "\n" + FileLineData.linereport + end + end + # Ensure that a particle with a user's/target's graphic doesn't have any + # :frame commands + if !["User", "Target", "SE"].include?(particle[:name]) && + ["USER", "USER_OPP", "USER_FRONT", "USER_BACK", + "TARGET", "TARGET_OPP", "TARGET_FRONT", "TARGET_BACK"].include?(particle[:graphic]) && + particle[:frame] && !particle[:frame].empty? + raise _INTL("Particle \"{1}\" can't have any \"Frame\" commands if its graphic is a Pokémon's sprite.", + particle[:name]) + "\n" + FileLineData.linereport end # Ensure that the same SE isn't played twice in the same frame if particle[:name] == "SE" diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 3fd4000b5..4c900b1f1 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -457,6 +457,7 @@ class AnimationEditor break end end + break if Input.triggerex?(:SPACE) break if anim_player.finished? end anim_player.dispose @@ -741,6 +742,15 @@ class AnimationEditor end end + def update_input + if Input.triggerex?(:S) + @settings[:user_opposes] = !@settings[:user_opposes] + refresh + elsif Input.triggerex?(:SPACE) + @ready_to_play = true + end + end + def update old_keyframe = keyframe old_particle_index = particle_index @@ -769,6 +779,7 @@ class AnimationEditor break end end + update_input end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index d94e6be61..7c01be061 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -58,7 +58,7 @@ class AnimationEditor ret = btn[0] break end - ret = :cancel if Input.trigger?(Input::BACK) + ret = :cancel if Input.triggerex?(:ESCAPE) break if ret buttons.each { |btn| btn[1].repaint } end @@ -110,7 +110,7 @@ class AnimationEditor end anim_properties.clear_changed end - break if !anim_properties.busy? && Input.trigger?(Input::BACK) + break if !anim_properties.busy? && Input.triggerex?(:ESCAPE) anim_properties.repaint end # Dispose and return @@ -242,10 +242,13 @@ class AnimationEditor end graphic_chooser.clear_changed end - ret = selected if !graphic_chooser.busy? && Input.trigger?(Input::BACK) break if ret graphic_chooser.repaint end + if !graphic_chooser.busy? && Input.triggerex?(:ESCAPE) + ret = selected + break + end end # Dispose and return bg_bitmap.dispose @@ -315,13 +318,14 @@ class AnimationEditor end audio_chooser.clear_changed end - if !audio_chooser.busy? && Input.trigger?(Input::BACK) - ret = selected - cance = true - end break if ret audio_chooser.repaint end + if !audio_chooser.busy? && Input.triggerex?(:ESCAPE) + ret = selected + cancel = true + break + end end vol = (cancel) ? volume : audio_chooser.get_control(:volume).value ptch = (cancel) ? pitch : audio_chooser.get_control(:pitch).value @@ -332,5 +336,4 @@ class AnimationEditor audio_chooser.visible = false return [ret, vol, ptch] end - end diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index 02cdfb481..eff548ee2 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -480,6 +480,12 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :graphic, { new_file = editor.choose_graphic_file(editor.anim[:particles][p_index][:graphic]) if editor.anim[:particles][p_index][:graphic] != new_file editor.anim[:particles][p_index][:graphic] = new_file + if ["USER", "USER_BACK", "USER_FRONT", "USER_OPP", + "TARGET", "TARGET_FRONT", "TARGET_BACK", "TARGET_OPP"].include?(new_file) + editor.anim[:particles][p_index].delete(:frame) + editor.components[:particle_list].set_particles(editor.anim[:particles]) + editor.refresh_component(:particle_list) + end editor.refresh_component(:particle_pane) editor.refresh_component(:canvas) end @@ -552,6 +558,20 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :foe_invert_y, { } }) +AnimationEditor::SidePanes.add_property(:particle_pane, :foe_flip, { + :new => proc { |pane, editor| + pane.add_labelled_checkbox(:foe_flip, _INTL("Flip Sprite"), false) + }, + :refresh_value => proc { |control, editor| + focus = editor.anim[:particles][editor.particle_index][:focus] + if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(focus) == GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(focus) + control.disable + else + control.enable + end + } +}) + AnimationEditor::SidePanes.add_property(:particle_pane, :duplicate, { :new => proc { |pane, editor| pane.add_button(:duplicate, _INTL("Duplicate this particle")) diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 584fdfab7..c794560f1 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -194,7 +194,7 @@ class AnimationEditor::AnimationSelector ret = btn[0] break end - ret = :cancel if Input.trigger?(Input::BACK) + ret = :cancel if Input.triggerex?(:ESCAPE) break if ret buttons.each { |btn| btn[1].repaint } end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 70bb97c5f..280d05b5a 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -475,6 +475,7 @@ class AnimationEditor::Canvas < Sprite spr.zoom_y = values[:zoom_y] / 100.0 spr.angle = values[:angle] spr.mirror = values[:flip] + spr.mirror = !spr.mirror if relative_to_index >= 0 && relative_to_index.odd? && particle[:foe_flip] spr.blend_type = values[:blending] # Set color and tone spr.color.set(values[:color_red], values[:color_green], values[:color_blue], values[:color_alpha]) diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb index ffef45cd4..36ee380eb 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb @@ -5,9 +5,9 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer attr_reader :slowdown, :looping ROW_HEIGHT = 28 - PLAY_BUTTON_X = 241 - PLAY_BUTTON_Y = 13 - PLAY_BUTTON_SIZE = 22 + PLAY_BUTTON_X = 231 + PLAY_BUTTON_Y = 3 + PLAY_BUTTON_SIZE = 42 LOOP_BUTTON_X = PLAY_BUTTON_X + PLAY_BUTTON_SIZE + 12 LOOP_BUTTON_Y = 16 LOOP_BUTTON_SIZE = 16 @@ -34,7 +34,8 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer end def dispose - @bitmaps.each { |b| b&.dispose } + @bitmaps.each_value { |b| b&.dispose } + @bitmaps.clear super end @@ -43,12 +44,12 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer def generate_button_bitmaps @bitmaps = {} play_button = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) - (PLAY_BUTTON_SIZE - 2).times do |j| - play_button.fill_rect(PLAY_BUTTON_SIZE / 4, j + 1, (j >= (PLAY_BUTTON_SIZE - 2) / 2) ? PLAY_BUTTON_SIZE - j : j + 3, 1, ICON_COLOR) + (PLAY_BUTTON_SIZE - 10).times do |j| + play_button.fill_rect(11, j + 5, (j >= (PLAY_BUTTON_SIZE - 10) / 2) ? PLAY_BUTTON_SIZE - j - 4 : j + 7, 1, ICON_COLOR) end @bitmaps[:play_button] = play_button stop_button = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) - stop_button.fill_rect(4, 4, PLAY_BUTTON_SIZE - 8, PLAY_BUTTON_SIZE - 8, ICON_COLOR) + stop_button.fill_rect(8, 8, PLAY_BUTTON_SIZE - 16, PLAY_BUTTON_SIZE - 16, ICON_COLOR) @bitmaps[:stop_button] = stop_button # Loop button play_once_button = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) @@ -79,6 +80,22 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer end def add_play_controls + # Slowdown label + duration_label = UIControls::Label.new(200, ROW_HEIGHT, self.viewport, _INTL("Slowdown factor")) + duration_label.x = SLOWDOWN_BUTTON_X + (SLOWDOWN_FACTORS.length * (SLOWDOWN_BUTTON_WIDTH + SLOWDOWN_BUTTON_SPACING) / 2) + duration_label.x -= (duration_label.text_width / 2) + 5 + duration_label.y = SLOWDOWN_LABEL_Y + @controls.push([:slowdown_label, duration_label]) + # Slowdown factor buttons + SLOWDOWN_FACTORS.each_with_index do |value, i| + button = UIControls::Button.new(SLOWDOWN_BUTTON_WIDTH, ROW_HEIGHT, self.viewport, value.to_s) + button.set_fixed_size + button.x = SLOWDOWN_BUTTON_X + ((SLOWDOWN_BUTTON_WIDTH + SLOWDOWN_BUTTON_SPACING) * i) + button.y = SLOWDOWN_BUTTON_Y + button.set_interactive_rects + button.set_highlighted if value == @slowdown + @controls.push([("slowdown" + value.to_s).to_sym, button]) + end # Play button play_button = UIControls::BitmapButton.new(PLAY_BUTTON_X, PLAY_BUTTON_Y, self.viewport, @bitmaps[:play_button]) play_button.set_interactive_rects @@ -98,22 +115,6 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer unloop_button.set_interactive_rects unloop_button.visible = false if !@looping @controls.push([:unloop, unloop_button]) - # Slowdown label - duration_label = UIControls::Label.new(200, ROW_HEIGHT, self.viewport, _INTL("Slowdown factor")) - duration_label.x = SLOWDOWN_BUTTON_X + (SLOWDOWN_FACTORS.length * (SLOWDOWN_BUTTON_WIDTH + SLOWDOWN_BUTTON_SPACING) / 2) - duration_label.x -= (duration_label.text_width / 2) + 5 - duration_label.y = SLOWDOWN_LABEL_Y - @controls.push([:slowdown_label, duration_label]) - # Slowdown factor buttons - SLOWDOWN_FACTORS.each_with_index do |value, i| - button = UIControls::Button.new(SLOWDOWN_BUTTON_WIDTH, ROW_HEIGHT, self.viewport, value.to_s) - button.set_fixed_size - button.x = SLOWDOWN_BUTTON_X + ((SLOWDOWN_BUTTON_WIDTH + SLOWDOWN_BUTTON_SPACING) * i) - button.y = SLOWDOWN_BUTTON_Y - button.set_interactive_rects - button.set_highlighted if value == @slowdown - @controls.push([("slowdown" + value.to_s).to_sym, button]) - end # Duration label duration_label = UIControls::Label.new(200, ROW_HEIGHT, self.viewport, _INTL("Duration")) duration_label.x = DURATION_TEXT_X - (duration_label.text_width / 2) diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index e38ccd6a3..2dce84454 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -175,7 +175,8 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @particle_line_sprite.dispose @controls.each { |c| c[1].dispose } @controls.clear - @bitmaps.each { |b| b&.dispose } + @bitmaps.each_value { |b| b&.dispose } + @bitmaps.clear dispose_listed_sprites @list_viewport.dispose @commands_bg_viewport.dispose @@ -433,16 +434,16 @@ class AnimationEditor::ParticleList < UIControls::BaseControl #----------------------------------------------------------------------------- - def calculate_duration - @duration = AnimationPlayer::Helper.get_duration(@particles) - @duration += DURATION_BUFFER - end - def calculate_all_commands_and_durations calculate_duration calculate_all_commands end + def calculate_duration + @duration = AnimationPlayer::Helper.get_duration(@particles) + @duration += DURATION_BUFFER + end + def calculate_all_commands @commands = {} @particles.each_with_index do |particle, index| @@ -1024,13 +1025,13 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def update_input # Left/right to change current keyframe - if Input.repeat?(Input::LEFT) + if Input.triggerex?(:LEFT) || Input.repeatex?(:LEFT) if @keyframe > 0 @keyframe -= 1 scroll_to_keyframe(@keyframe) set_changed end - elsif Input.repeat?(Input::RIGHT) + elsif Input.triggerex?(:RIGHT) || Input.repeatex?(:RIGHT) if @keyframe < @duration - 1 @keyframe += 1 scroll_to_keyframe(@keyframe) @@ -1038,7 +1039,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end # Up/down to change selected particle - if Input.repeat?(Input::UP) + if Input.triggerex?(:UP) || Input.repeatex?(:UP) if @row_index > 0 loop do @row_index -= 1 @@ -1047,7 +1048,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl scroll_to_row(@row_index) set_changed end - elsif Input.repeat?(Input::DOWN) + elsif Input.triggerex?(:DOWN) || Input.repeatex?(:DOWN) if @row_index < @particle_list.length - 1 old_row_index = @row_index loop do @@ -1064,6 +1065,18 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end end + if Input.triggerex?(:P) + idx_particle = @particle_list[@row_index] + idx_particle = idx_particle[0] if idx_particle.is_a?(Array) + if @row_index >= 0 && @particles[idx_particle][:name] != "SE" + if @expanded_particles.include?(idx_particle) # Contract + @expanded_particles.delete(idx_particle) + else # Expand + @expanded_particles.push(idx_particle) + end + set_particles(@particles) + end + end # Mouse scroll wheel mouse_x, mouse_y = mouse_pos if mouse_x && mouse_y diff --git a/Data/Scripts/905_Anim player/001_Anim player.rb b/Data/Scripts/905_Anim player/001_Anim player.rb index ae9d7b67e..14b651197 100644 --- a/Data/Scripts/905_Anim player/001_Anim player.rb +++ b/Data/Scripts/905_Anim player/001_Anim player.rb @@ -124,6 +124,7 @@ class AnimationPlayer if relative_to_index >= 0 && relative_to_index.odd? && particle[:focus] != :user_and_target particle_sprite.foe_invert_x = particle[:foe_invert_x] particle_sprite.foe_invert_y = particle[:foe_invert_y] + particle_sprite.foe_flip = particle[:foe_flip] end # Find earliest command and add a "make visible" command then if sprite && !particle_sprite.battler_sprite? @@ -231,7 +232,7 @@ class AnimationPlayer # Update all particles/sprites @anim_sprites.each { |particle| particle.update(elapsed) } # Finish or loop the animation - if elapsed >= @duration + if elapsed >= @duration * @slowdown if looping @need_reset = true else diff --git a/Data/Scripts/905_Anim player/002_ParticleSprite.rb b/Data/Scripts/905_Anim player/002_ParticleSprite.rb index 90b7b3160..e97efce82 100644 --- a/Data/Scripts/905_Anim player/002_ParticleSprite.rb +++ b/Data/Scripts/905_Anim player/002_ParticleSprite.rb @@ -5,7 +5,7 @@ class AnimationPlayer::ParticleSprite attr_accessor :sprite attr_accessor :focus_xy, :offset_xy, :focus_z - attr_accessor :foe_invert_x, :foe_invert_y + attr_accessor :foe_invert_x, :foe_invert_y, :foe_flip FRAMES_PER_SECOND = 20.0 @@ -97,7 +97,9 @@ class AnimationPlayer::ParticleSprite case property when :frame then @sprite.src_rect.x = value.floor * @sprite.src_rect.width when :blending then @sprite.blend_type = value - when :flip then @sprite.mirror = value + when :flip + @sprite.mirror = value + @sprite.mirror = !@sprite.mirror if @foe_flip when :x value = value.round value *= -1 if @foe_invert_x From a80dd5adb215773c580aa68b588bd4d982966d19 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 20 Apr 2024 18:29:48 +0100 Subject: [PATCH 37/49] Anim Editor: added Insert/Delete keyboard shortcuts --- .../901_Anim utilities/001_Anim utilities.rb | 10 +- .../902_Anim GameData/001_Animation.rb | 2 +- .../903_Anim Compiler/002_Anim writer.rb | 11 - .../904_Anim Editor/001_AnimationEditor.rb | 30 ++ .../904_Anim Editor/901_ParticleDataHelper.rb | 49 ++- .../Anim Editor elements/001_Canvas.rb | 4 +- .../Example anims/Common/ShadowSky.txt | 4 +- .../Example anims/Move/FLAMETHROWER.txt | 24 +- .../Example anims/Move/FURYATTACK.txt | 301 +++--------------- PBS/Animations/Example anims/Move/GROWL.txt | 10 +- PBS/Animations/Example anims/Move/GUST.txt | 66 ---- PBS/Animations/Example anims/Move/LEER.txt | 13 +- .../Example anims/Move/MEGADRAIN.txt | 10 +- .../Example anims/Move/POISONSTING.txt | 22 +- PBS/Animations/Example anims/Move/ROAR.txt | 10 +- .../Example anims/Move/WATERGUN.txt | 4 +- 16 files changed, 158 insertions(+), 412 deletions(-) diff --git a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb index 83072c9ef..43ca7e7da 100644 --- a/Data/Scripts/901_Anim utilities/001_Anim utilities.rb +++ b/Data/Scripts/901_Anim utilities/001_Anim utilities.rb @@ -119,7 +119,7 @@ module Compiler next if value.nil? case schema[1][i, 1] when "e", "E" # Enumerable - enumer = schema[2 + i] + enumer = schema[2 + i - start] case enumer when Array file.write(enumer[value]) @@ -136,7 +136,7 @@ module Compiler end end when "y", "Y" # Enumerable or integer - enumer = schema[2 + i] + enumer = schema[2 + i - start] case enumer when Array file.write((enumer[value].nil?) ? value : enumer[value]) @@ -146,14 +146,14 @@ module Compiler when Module file.write(getConstantNameOrValue(enumer, value)) when Hash - hasenum = false + has_enum = false enumer.each_key do |key| next if enumer[key] != value file.write(key) - hasenum = true + has_enum = true break end - file.write(value) unless hasenum + file.write(value) if !has_enum end else if value.is_a?(String) diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 7409726f8..12687a0f3 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -338,7 +338,7 @@ module GameData new_cmd = cmd.clone if @particles[index][:name] != "SE" && new_cmd[1] > 0 new_cmd.pop if new_cmd.last == :linear # This is the default - ret.push([@@cmd_to_pbs_name[key][1]] + new_cmd) # ["MoveXYZ", keyframe, duration, value] + ret.push([@@cmd_to_pbs_name[key][1]] + new_cmd) # ["MoveXYZ", keyframe, duration, value, interpolation] else case key when :se diff --git a/Data/Scripts/903_Anim Compiler/002_Anim writer.rb b/Data/Scripts/903_Anim Compiler/002_Anim writer.rb index 263c616ac..3370529b3 100644 --- a/Data/Scripts/903_Anim Compiler/002_Anim writer.rb +++ b/Data/Scripts/903_Anim Compiler/002_Anim writer.rb @@ -54,17 +54,6 @@ module Compiler f.write("\r\n") end # Write each particle in turn - element.particles.sort! do |a, b| - a_val = 0 - a_val = -2 if a[:name] == "User" - a_val = -1 if a[:name] == "Target" - a_val = 1 if a[:name] == "SE" - b_val = 0 - b_val = -2 if b[:name] == "User" - b_val = -1 if b[:name] == "Target" - b_val = 1 if b[:name] == "SE" - next a_val <=> b_val - end element.particles.each_with_index do |particle, i| # Write header f.write("<" + particle[:name] + ">") diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 4c900b1f1..1cdb760e8 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -744,10 +744,40 @@ class AnimationEditor def update_input if Input.triggerex?(:S) + # Swap battler sides @settings[:user_opposes] = !@settings[:user_opposes] refresh elsif Input.triggerex?(:SPACE) + # Play animation @ready_to_play = true + elsif Input.triggerex?(:INSERT) + # Insert empty keyframe for selected particle or all particles + this_frame = keyframe + if this_frame >= 0 && this_frame < @components[:particle_list].duration + if Input.pressex?(:LSHIFT) || Input.pressex?(:RSHIFT) + @anim[:particles].each do |particle| + AnimationEditor::ParticleDataHelper.insert_frame(particle, this_frame) + end + else + AnimationEditor::ParticleDataHelper.insert_frame(@anim[:particles][particle_index], this_frame) + end + @components[:particle_list].set_particles(@anim[:particles]) + refresh + end + elsif Input.triggerex?(:DELETE) + # Delete keyframe for selected particle or all particles + this_frame = keyframe + if this_frame >= 0 && this_frame < @components[:particle_list].duration + if Input.pressex?(:LSHIFT) || Input.pressex?(:RSHIFT) + @anim[:particles].each do |particle| + AnimationEditor::ParticleDataHelper.remove_frame(particle, this_frame) + end + else + AnimationEditor::ParticleDataHelper.remove_frame(@anim[:particles][particle_index], this_frame) + end + @components[:particle_list].set_particles(@anim[:particles]) + refresh + end end end diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 4867bbe26..674c10aa1 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -103,9 +103,9 @@ module AnimationEditor::ParticleDataHelper def get_particle_commands_timeline(particle) ret = [] durations = [] - particle.each_pair do |property, value| - next if !value.is_a?(Array) - value.each do |cmd| + particle.each_pair do |property, values| + next if !values.is_a?(Array) || values.empty? + values.each do |cmd| ret[cmd[0]] = true if cmd[1] > 0 ret[cmd[0] + cmd[1]] = true @@ -224,7 +224,7 @@ module AnimationEditor::ParticleDataHelper # * SetXYZ and MoveXYZ start - delete SetXYZ (leave MoveXYZ alone) # * SetXYZ and MoveXYZ end - (unlikely) delete both # * SetXYZ and MoveXYZ start and end - (unlikely) delete SetXYZ, merge Moves together - def delete_command(particle, property, frame) + def delete_command(particle, property, frame, full_delete = false) # Find all relevant commands set_now = nil move_ending_now = nil @@ -246,7 +246,7 @@ module AnimationEditor::ParticleDataHelper particle[property].delete(move_starting_now) elsif move_ending_now # Delete MoveXYZ ending now particle[property].delete(move_ending_now) - elsif move_starting_now && !set_now # Turn into SetXYZ at its end point + elsif move_starting_now && (full_delete || !set_now) # Turn into SetXYZ at its end point move_starting_now[0] += move_starting_now[1] move_starting_now[1] = 0 move_starting_now[3] = nil @@ -457,6 +457,45 @@ module AnimationEditor::ParticleDataHelper #----------------------------------------------------------------------------- + # Inserts an empty frame at the given frame. Delays all commands at or after + # the given frame by 1, and increases the duration of all commands that + # overlap the given frame. + def insert_frame(particle, frame) + particle.each_pair do |property, values| + next if !values.is_a?(Array) || values.empty? + values.each do |cmd| + if cmd[0] >= frame + cmd[0] += 1 + elsif cmd[0] < frame && cmd[0] + cmd[1] > frame + cmd[1] += 1 + end + end + end + end + + # Removes a frame at the given frame. Deletes all commands in that frame, then + # brings all commands after the given frame earlier by 1, and reduces the + # duration of all commands that overlap the given frame. + def remove_frame(particle, frame) + particle.keys.each do |property| + next if !particle[property].is_a?(Array) || particle[property].empty? + delete_command(particle, property, frame, true) + end + particle.delete_if { |property, values| values.is_a?(Array) && values.empty? } + particle.each_pair do |key, values| + next if !values.is_a?(Array) || values.empty? + values.each do |cmd| + if cmd[0] > frame + cmd[0] -= 1 + elsif cmd[0] < frame && cmd[0] + cmd[1] > frame + cmd[1] -= 1 + end + end + end + end + + #----------------------------------------------------------------------------- + # Creates a new particle and inserts it at index. If there is a particle above # the new one, the new particle will inherit its focus; otherwise it gets a # default focus of :foreground. diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 280d05b5a..d42d41aa6 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -642,7 +642,7 @@ class AnimationEditor::Canvas < Sprite if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) relative_to_index = user_index elsif GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) - relative_to_index = target_idx + relative_to_index = first_target_index end end new_pos *= -1 if relative_to_index >= 0 && relative_to_index.odd? && particle[:foe_invert_x] @@ -679,7 +679,7 @@ class AnimationEditor::Canvas < Sprite if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) relative_to_index = user_index elsif GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) - relative_to_index = target_idx + relative_to_index = first_target_index end end new_pos *= -1 if relative_to_index >= 0 && relative_to_index.odd? && particle[:foe_invert_y] diff --git a/PBS/Animations/Example anims/Common/ShadowSky.txt b/PBS/Animations/Example anims/Common/ShadowSky.txt index b5feba8a8..aaba06e98 100644 --- a/PBS/Animations/Example anims/Common/ShadowSky.txt +++ b/PBS/Animations/Example anims/Common/ShadowSky.txt @@ -8,9 +8,9 @@ NoTarget = true Graphic = Examples/shadow sky Focus = Foreground SetOpacity = 0,0 - MoveOpacity = 0,5,255, + MoveOpacity = 0,5,255 SetOpacity = 5,255 SetOpacity = 15,255 - MoveOpacity = 15,5,0, + MoveOpacity = 15,5,0 SetOpacity = 20,0 diff --git a/PBS/Animations/Example anims/Move/FLAMETHROWER.txt b/PBS/Animations/Example anims/Move/FLAMETHROWER.txt index 4033a72a6..37e26bd4b 100644 --- a/PBS/Animations/Example anims/Move/FLAMETHROWER.txt +++ b/PBS/Animations/Example anims/Move/FLAMETHROWER.txt @@ -81,14 +81,10 @@ Name = Example anim [OppMove,FLAMETHROWER] Name = Example anim - SetX = 0,0 - SetY = 0,0 - SetX = 0,0 - SetY = 0,0 Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 0,2 SetX = 0,-3 SetY = 0,2 @@ -132,7 +128,7 @@ Name = Example anim SetVisible = 19,false Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 1,2 SetX = 1,-23 SetY = 1,9 @@ -169,7 +165,7 @@ Name = Example anim SetVisible = 18,false Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 2,2 SetX = 2,-42 SetY = 2,16 @@ -207,7 +203,7 @@ Name = Example anim SetVisible = 17,false Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 3,1 SetX = 3,-71 SetY = 3,24 @@ -242,7 +238,7 @@ Name = Example anim SetVisible = 16,false Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 4,1 SetX = 4,-85 SetY = 4,41 @@ -269,7 +265,7 @@ Name = Example anim SetVisible = 15,false Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 5,1 SetX = 5,-117 SetY = 5,38 @@ -291,7 +287,7 @@ Name = Example anim SetVisible = 14,false Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 6,1 SetX = 6,-146 SetY = 6,56 @@ -313,7 +309,7 @@ Name = Example anim SetVisible = 13,false Graphic = Examples/Flames - Focus = Target + Focus = User SetFrame = 8,1 SetX = 8,-195 SetY = 8,68 @@ -330,7 +326,7 @@ Name = Example anim SetVisible = 13,false Graphic = Examples/Flames - Focus = Target + Focus = User SetX = 9,-248 SetY = 9,98 SetZ = 9,35 @@ -339,7 +335,7 @@ Name = Example anim SetVisible = 11,false Graphic = Examples/Flames - Focus = Target + Focus = User SetX = 10,-262 SetY = 10,131 SetZ = 10,36 diff --git a/PBS/Animations/Example anims/Move/FURYATTACK.txt b/PBS/Animations/Example anims/Move/FURYATTACK.txt index f2871c4ec..4c5dd909f 100644 --- a/PBS/Animations/Example anims/Move/FURYATTACK.txt +++ b/PBS/Animations/Example anims/Move/FURYATTACK.txt @@ -238,289 +238,66 @@ Name = Example anim SetX = 0,0 SetY = 0,0 - - Graphic = Examples/003-Attack01 - Focus = User - SetX = 3,1 - SetY = 3,18 - SetZ = 3,27 - SetVisible = 4,false - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 3,5 - SetX = 3,40 - SetY = 3,-48 - SetZ = 3,28 - SetAngle = 3,180 - SetFrame = 4,6 - SetX = 4,78 - SetY = 4,-96 - SetFrame = 5,7 - SetX = 5,128 - SetY = 5,-157 - SetVisible = 6,false - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 4,1 - SetX = 4,199 - SetY = 4,-228 - SetZ = 4,27 - SetFrame = 5,2 - SetFrame = 6,1 - SetFrame = 7,2 Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,35 SetY = 0,-50 - SetZ = 0,27 SetAngle = 0,180 + MoveX = 0,3,182 + MoveY = 0,3,-207 SetFrame = 1,6 - SetX = 1,75 - SetY = 1,-92 SetFrame = 2,7 - SetX = 2,133 - SetY = 2,-167 - SetVisible = 3,false - - Play = 3,normaldamage,80 - Play = 5,normaldamage,80 -#------------------------------- -[OppMove,FURYATTACK,1] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 0,5 - SetX = 0,35 - SetY = 0,-50 - SetZ = 0,27 - SetAngle = 0,180 - SetFrame = 1,6 - SetX = 1,75 - SetY = 1,-92 - SetFrame = 2,7 - SetX = 2,133 - SetY = 2,-167 + SetX = 3,182 + SetY = 3,-207 SetVisible = 3,false Graphic = Examples/003-Attack01 - Focus = User - SetX = 3,1 - SetY = 3,18 - SetZ = 3,27 - SetVisible = 4,false + Focus = Target + SetFrame = 3,0 + SetFrame = 4,1 + SetFrame = 5,2 + SetZoomX = 5,100 + SetZoomY = 5,100 + SetOpacity = 5,255 + MoveZoomX = 5,2,125 + MoveZoomY = 5,2,125 + MoveOpacity = 5,2,0 + SetZoomX = 7,125 + SetZoomY = 7,125 + SetVisible = 7,false + SetOpacity = 7,0 Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 3,5 - SetX = 3,40 - SetY = 3,-48 - SetZ = 3,28 + SetX = 3,35 + SetY = 3,-50 SetAngle = 3,180 + MoveX = 3,3,182 + MoveY = 3,3,-207 SetFrame = 4,6 - SetX = 4,78 - SetY = 4,-96 SetFrame = 5,7 - SetX = 5,128 - SetY = 5,-157 + SetX = 6,182 + SetY = 6,-207 SetVisible = 6,false Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 4,1 - SetX = 4,199 - SetY = 4,-228 - SetZ = 4,27 - SetFrame = 5,2 - SetFrame = 6,1 - SetFrame = 7,2 + Focus = Target + SetFrame = 6,0 + SetFrame = 7,1 + SetFrame = 8,2 + SetZoomX = 8,100 + SetZoomY = 8,100 + SetOpacity = 8,255 + MoveZoomX = 8,2,125 + MoveZoomY = 8,2,125 + MoveOpacity = 8,2,0 + SetZoomX = 10,125 + SetZoomY = 10,125 + SetVisible = 10,false + SetOpacity = 10,0 Play = 3,normaldamage,80 - Play = 5,normaldamage,80 -#------------------------------- -[OppMove,FURYATTACK,2] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 4,1 - SetX = 4,199 - SetY = 4,-228 - SetZ = 4,27 - SetFrame = 5,2 - SetFrame = 6,1 - SetFrame = 7,2 - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 0,5 - SetX = 0,35 - SetY = 0,-50 - SetZ = 0,27 - SetAngle = 0,180 - SetFrame = 1,6 - SetX = 1,75 - SetY = 1,-92 - SetFrame = 2,7 - SetX = 2,133 - SetY = 2,-167 - SetVisible = 3,false - - Graphic = Examples/003-Attack01 - Focus = User - SetX = 3,1 - SetY = 3,18 - SetZ = 3,27 - SetVisible = 4,false - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 3,5 - SetX = 3,40 - SetY = 3,-48 - SetZ = 3,28 - SetAngle = 3,180 - SetFrame = 4,6 - SetX = 4,78 - SetY = 4,-96 - SetFrame = 5,7 - SetX = 5,128 - SetY = 5,-157 - SetVisible = 6,false - - Play = 3,normaldamage,80 - Play = 5,normaldamage,80 -#------------------------------- -[OppMove,FURYATTACK,3] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 3,5 - SetX = 3,40 - SetY = 3,-48 - SetZ = 3,28 - SetAngle = 3,180 - SetFrame = 4,6 - SetX = 4,78 - SetY = 4,-96 - SetFrame = 5,7 - SetX = 5,128 - SetY = 5,-157 - SetVisible = 6,false - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 4,1 - SetX = 4,199 - SetY = 4,-228 - SetZ = 4,27 - SetFrame = 5,2 - SetFrame = 6,1 - SetFrame = 7,2 - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 0,5 - SetX = 0,35 - SetY = 0,-50 - SetZ = 0,27 - SetAngle = 0,180 - SetFrame = 1,6 - SetX = 1,75 - SetY = 1,-92 - SetFrame = 2,7 - SetX = 2,133 - SetY = 2,-167 - SetVisible = 3,false - - Graphic = Examples/003-Attack01 - Focus = User - SetX = 3,1 - SetY = 3,18 - SetZ = 3,27 - SetVisible = 4,false - - Play = 3,normaldamage,80 - Play = 5,normaldamage,80 -#------------------------------- -[OppMove,FURYATTACK,4] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/003-Attack01 - Focus = User - SetX = 3,1 - SetY = 3,18 - SetZ = 3,27 - SetVisible = 4,false - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 3,5 - SetX = 3,40 - SetY = 3,-48 - SetZ = 3,28 - SetAngle = 3,180 - SetFrame = 4,6 - SetX = 4,78 - SetY = 4,-96 - SetFrame = 5,7 - SetX = 5,128 - SetY = 5,-157 - SetVisible = 6,false - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 4,1 - SetX = 4,199 - SetY = 4,-228 - SetZ = 4,27 - SetFrame = 5,2 - SetFrame = 6,1 - SetFrame = 7,2 - - Graphic = Examples/003-Attack01 - Focus = UserAndTarget - SetFrame = 0,5 - SetX = 0,35 - SetY = 0,-50 - SetZ = 0,27 - SetAngle = 0,180 - SetFrame = 1,6 - SetX = 1,75 - SetY = 1,-92 - SetFrame = 2,7 - SetX = 2,133 - SetY = 2,-167 - SetVisible = 3,false - - Play = 3,normaldamage,80 - Play = 5,normaldamage,80 + Play = 6,normaldamage,80 diff --git a/PBS/Animations/Example anims/Move/GROWL.txt b/PBS/Animations/Example anims/Move/GROWL.txt index 545daedc2..2f5b88c14 100644 --- a/PBS/Animations/Example anims/Move/GROWL.txt +++ b/PBS/Animations/Example anims/Move/GROWL.txt @@ -70,14 +70,10 @@ Name = Example anim [OppMove,GROWL] Name = Example anim - SetX = 0,0 - SetY = 0,0 - SetX = 0,0 - SetY = 0,0 Graphic = Examples/Growl - Focus = Target + Focus = User SetFrame = 0,1 SetFlip = 0,true SetX = 0,-58 @@ -99,7 +95,7 @@ Name = Example anim SetY = 7,-36 Graphic = Examples/Growl - Focus = Target + Focus = User SetFrame = 0,1 SetX = 0,-58 SetY = 0,39 @@ -120,7 +116,7 @@ Name = Example anim SetY = 7,77 Graphic = Examples/Growl - Focus = Target + Focus = User SetFlip = 0,true SetX = 0,-58 SetY = 0,14 diff --git a/PBS/Animations/Example anims/Move/GUST.txt b/PBS/Animations/Example anims/Move/GUST.txt index 006d8754d..5e87b6350 100644 --- a/PBS/Animations/Example anims/Move/GUST.txt +++ b/PBS/Animations/Example anims/Move/GUST.txt @@ -63,69 +63,3 @@ Name = Example anim Play = 0,gust,80,82 Play = 21,hit,80 -#------------------------------- -[OppMove,GUST] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/Gust - Focus = Target - SetX = 0,-256 - SetY = 0,133 - SetZ = 0,27 - SetZoomX = 0,200 - SetZoomY = 0,200 - SetX = 1,-240 - SetX = 2,-224 - SetY = 2,131 - SetX = 3,-208 - SetX = 4,-200 - SetY = 4,123 - SetFlip = 5,true - SetX = 5,-195 - SetY = 5,119 - SetX = 6,-200 - SetY = 6,111 - SetX = 7,-212 - SetY = 7,103 - SetX = 8,-220 - SetY = 8,99 - SetX = 9,-240 - SetY = 9,97 - SetFlip = 10,false - SetX = 10,-255 - SetX = 11,-266 - SetY = 11,99 - SetX = 12,-280 - SetY = 12,101 - SetX = 13,-288 - SetY = 13,103 - SetX = 14,-308 - SetY = 14,107 - SetFlip = 15,true - SetX = 15,-320 - SetY = 15,115 - SetX = 16,-312 - SetY = 16,123 - SetX = 17,-306 - SetY = 17,127 - SetX = 18,-296 - SetY = 18,131 - SetX = 19,-282 - SetFlip = 20,false - SetX = 20,-255 - SetY = 20,130 - SetFrame = 21,1 - SetX = 21,-256 - SetY = 21,126 - SetOpacity = 21,150 - SetOpacity = 22,255 - SetOpacity = 25,150 - - Play = 0,gust,80,82 - Play = 21,hit,80 diff --git a/PBS/Animations/Example anims/Move/LEER.txt b/PBS/Animations/Example anims/Move/LEER.txt index 83e86cee5..3ea45e950 100644 --- a/PBS/Animations/Example anims/Move/LEER.txt +++ b/PBS/Animations/Example anims/Move/LEER.txt @@ -38,20 +38,13 @@ Name = Example anim SetY = 0,0 Graphic = Examples/leer - Focus = UserAndTarget - SetX = 0,26 - SetY = 0,26 + Focus = User + SetX = 0,-39 + SetY = 0,-26 SetZ = 0,27 SetFrame = 1,1 - SetY = 1,29 SetFrame = 2,2 - SetX = 2,25 - SetY = 2,32 SetFrame = 3,3 - SetX = 3,28 - SetY = 3,29 SetFrame = 4,4 - SetX = 4,21 - SetY = 4,32 Play = 0,Saint9 diff --git a/PBS/Animations/Example anims/Move/MEGADRAIN.txt b/PBS/Animations/Example anims/Move/MEGADRAIN.txt index 5e82ee3be..35acf3c6e 100644 --- a/PBS/Animations/Example anims/Move/MEGADRAIN.txt +++ b/PBS/Animations/Example anims/Move/MEGADRAIN.txt @@ -237,7 +237,7 @@ Name = Example anim SetVisible = 8,false Graphic = Examples/leech-seed - Focus = UserAndTarget + Focus = User SetFrame = 9,10 SetX = 9,-8 SetY = 9,-1 @@ -267,7 +267,7 @@ Name = Example anim SetY = 19,25 Graphic = Examples/leech-seed - Focus = UserAndTarget + Focus = User SetFrame = 10,10 SetX = 10,11 SetY = 10,26 @@ -295,7 +295,7 @@ Name = Example anim SetVisible = 19,false Graphic = Examples/leech-seed - Focus = UserAndTarget + Focus = User SetFrame = 11,10 SetX = 11,-11 SetY = 11,37 @@ -319,7 +319,7 @@ Name = Example anim SetVisible = 18,false Graphic = Examples/leech-seed - Focus = UserAndTarget + Focus = User SetFrame = 12,10 SetX = 12,14 SetY = 12,-48 @@ -338,7 +338,7 @@ Name = Example anim SetVisible = 17,false Graphic = Examples/leech-seed - Focus = UserAndTarget + Focus = User SetFrame = 13,10 SetX = 13,-11 SetY = 13,14 diff --git a/PBS/Animations/Example anims/Move/POISONSTING.txt b/PBS/Animations/Example anims/Move/POISONSTING.txt index 209ff1072..7076f226c 100644 --- a/PBS/Animations/Example anims/Move/POISONSTING.txt +++ b/PBS/Animations/Example anims/Move/POISONSTING.txt @@ -40,18 +40,13 @@ Name = Example anim [OppMove,POISONSTING] Name = Example anim - SetX = 0,0 - SetY = 0,0 - SetX = 0,0 - SetY = 0,0 Graphic = Examples/003-Attack01 Focus = UserAndTarget SetFrame = 0,5 SetX = 0,25 SetY = 0,-67 - SetZ = 0,27 SetAngle = 0,180 SetX = 1,50 SetY = 1,-90 @@ -67,14 +62,15 @@ Name = Example anim SetY = 5,-179 SetX = 6,175 SetY = 6,-203 - SetFrame = 7,9 - SetX = 7,204 - SetY = 7,-195 - SetAngle = 7,0 - SetFrame = 8,3 - SetX = 8,200 - SetY = 8,-218 - SetFrame = 9,4 + SetVisible = 6,false + + Graphic = Examples/003-Attack01 + Focus = Target + SetFrame = 6,3 + SetVisible = 6,true + SetFrame = 7,4 + SetFrame = 8,2 + SetFrame = 9,2 Play = 0,throw,80 Play = 6,Slash10,80 diff --git a/PBS/Animations/Example anims/Move/ROAR.txt b/PBS/Animations/Example anims/Move/ROAR.txt index ccd10004f..6cf93c9e6 100644 --- a/PBS/Animations/Example anims/Move/ROAR.txt +++ b/PBS/Animations/Example anims/Move/ROAR.txt @@ -60,14 +60,10 @@ Name = Example anim [OppMove,ROAR] Name = Example anim - SetX = 0,0 - SetY = 0,0 - SetX = 0,0 - SetY = 0,0 Graphic = Examples/Growl - Focus = Target + Focus = User SetFrame = 0,1 SetFlip = 0,true SetX = 0,-32 @@ -81,7 +77,7 @@ Name = Example anim SetY = 3,-61 Graphic = Examples/Growl - Focus = Target + Focus = User SetFrame = 0,1 SetX = 0,-32 SetY = 0,36 @@ -94,7 +90,7 @@ Name = Example anim SetY = 3,104 Graphic = Examples/Growl - Focus = Target + Focus = User SetFlip = 0,true SetX = 0,-40 SetY = 0,4 diff --git a/PBS/Animations/Example anims/Move/WATERGUN.txt b/PBS/Animations/Example anims/Move/WATERGUN.txt index 7298923c7..608706d27 100644 --- a/PBS/Animations/Example anims/Move/WATERGUN.txt +++ b/PBS/Animations/Example anims/Move/WATERGUN.txt @@ -225,7 +225,7 @@ Name = Example anim SetVisible = 9,false Graphic = Examples/fly copy - Focus = User + Focus = Target SetFrame = 8,6 SetX = 8,0 SetY = 8,-4 @@ -234,7 +234,7 @@ Name = Example anim SetVisible = 9,false Graphic = Examples/fly copy - Focus = User + Focus = Target SetFrame = 9,6 SetX = 9,1 SetY = 9,-4 From 53eff70d63f2257e1765110367ceae378bb21223 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 21 Apr 2024 00:53:01 +0100 Subject: [PATCH 38/49] Anim Editor: added changing of editor settings --- .../Control elements/001_BaseControl.rb | 8 +- .../Control elements/009_List.rb | 2 +- .../904_Anim Editor/001_AnimationEditor.rb | 180 ++++++++++++++++-- .../002_AnimationEditor_popups.rb | 43 ++++- .../Anim Editor elements/001_Canvas.rb | 25 ++- .../Anim Editor elements/004_Menu bar.rb | 27 ++- 6 files changed, 250 insertions(+), 35 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index da56d8662..3c5926510 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -107,13 +107,13 @@ class UIControls::BaseControl < BitmapSprite #----------------------------------------------------------------------------- def draw_text(this_bitmap, text_x, text_y, this_text) - text_size = this_bitmap.text_size(this_text) - this_bitmap.draw_text(text_x, text_y, text_size.width, text_size.height, this_text, 0) + text_size = this_bitmap.text_size(this_text.to_s) + this_bitmap.draw_text(text_x, text_y, text_size.width, text_size.height, this_text.to_s, 0) end def draw_text_centered(this_bitmap, text_x, text_y, wid, this_text) - text_size = this_bitmap.text_size(this_text) - this_bitmap.draw_text(text_x, text_y, wid, text_size.height, this_text, 1) + text_size = this_bitmap.text_size(this_text.to_s) + this_bitmap.draw_text(text_x, text_y, wid, text_size.height, this_text.to_s, 1) end # Redraws the control only if it is invalid. diff --git a/Data/Scripts/801_UI controls/Control elements/009_List.rb b/Data/Scripts/801_UI controls/Control elements/009_List.rb index 2662cd511..0a3333d58 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_List.rb @@ -155,7 +155,7 @@ class UIControls::List < UIControls::BaseControl SELECTED_ROW_COLOR ) end - txt = (val.is_a?(Array)) ? val[1] : val + txt = (val.is_a?(Array)) ? val[1] : val.to_s text_color = TEXT_COLOR if txt[/^\\c\[([0-9]+)\]/i] text_colors = [ diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 1cdb760e8..43a287e16 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -94,6 +94,12 @@ class AnimationEditor :tone_red, :tone_green, :tone_blue, :tone_gray ] + DEBUG_SETTINGS_FILE_PATH = if File.directory?(System.data_directory) + System.data_directory + "debug_settings.rxdata" + else + "./debug_settings.rxdata" + end + #----------------------------------------------------------------------------- def initialize(anim_id, anim) @@ -142,6 +148,26 @@ class AnimationEditor @delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(160, 160, 160)) @delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(160, 160, 160)) end + # Editor settings button bitmap + @editor_settings_bitmap = Bitmap.new(18, 18) + settings_array = [ + 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 1, 1, + 0, 0, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 1, 1, 0, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 1, 1, 1, 1, 0, + 0, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 1, 1, 1, 0, 0, 0 + ] + settings_array.length.times do |i| + next if settings_array[i] == 0 + @editor_settings_bitmap.fill_rect(i % 9, i / 9, 1, 1, Color.black) + @editor_settings_bitmap.fill_rect(17 - (i % 9), i / 9, 1, 1, Color.black) + @editor_settings_bitmap.fill_rect(i % 9, 17 - (i / 9), 1, 1, Color.black) + @editor_settings_bitmap.fill_rect(17 - (i % 9), 17 - (i / 9), 1, 1, Color.black) + end # Draw in these bitmaps draw_editor_background end @@ -174,6 +200,12 @@ class AnimationEditor ) @components[:animation_properties].viewport.z = @pop_up_viewport.z + 1 @components[:animation_properties].label_offset_x = 170 + # Editor settings pop-up window + @components[:editor_settings] = UIControls::ControlsContainer.new( + ANIM_PROPERTIES_X + 4, ANIM_PROPERTIES_Y, ANIM_PROPERTIES_WIDTH - 8, ANIM_PROPERTIES_HEIGHT + ) + @components[:editor_settings].viewport.z = @pop_up_viewport.z + 1 + @components[:editor_settings].label_offset_x = 170 # Graphic chooser pop-up window @components[:graphic_chooser] = UIControls::ControlsContainer.new( GRAPHIC_CHOOSER_X, GRAPHIC_CHOOSER_Y, GRAPHIC_CHOOSER_WINDOW_WIDTH, GRAPHIC_CHOOSER_WINDOW_HEIGHT @@ -191,6 +223,7 @@ class AnimationEditor @pop_up_bg_bitmap.dispose @delete_bitmap.dispose @delete_disabled_bitmap.dispose + @editor_settings_bitmap.dispose @components.each_value { |c| c.dispose } @components.clear @viewport.dispose @@ -209,17 +242,26 @@ class AnimationEditor end def load_settings - @settings = { - :side_sizes => [1, 1], # Player's side, opposing side - :user_index => 0, # 0, 2, 4 - :target_indices => [1], # There must be at least one valid target - :user_opposes => false, - :canvas_bg => "indoor1", - # NOTE: These sprite names are also used in Pokemon.play_cry and so should - # be a species ID (being a string is fine). - :user_sprite_name => "DRAGONITE", - :target_sprite_name => "CHARIZARD" - } + if File.file?(DEBUG_SETTINGS_FILE_PATH) + @settings = SaveData.get_data_from_file(DEBUG_SETTINGS_FILE_PATH)[:anim_editor] + else + @settings = { + :side_sizes => [1, 1], # Player's side, opposing side + :user_index => 0, # 0, 2, 4 + :target_indices => [1], # There must be at least one valid target + :user_opposes => false, + :canvas_bg => "indoor1", + # NOTE: These sprite names are also used in Pokemon.play_cry and so + # should be a species ID (being a string is fine). + :user_sprite_name => "DRAGONITE", + :target_sprite_name => "CHARIZARD" + } + end + end + + def save_settings + data = { :anim_editor => @settings } + File.open(DEBUG_SETTINGS_FILE_PATH, "wb") { |file| Marshal.dump(data, file) } end def save @@ -233,6 +275,7 @@ class AnimationEditor end @pbs_path = @anim[:pbs_path] end + save_settings end #----------------------------------------------------------------------------- @@ -266,6 +309,7 @@ class AnimationEditor def set_menu_bar_contents @components[:menu_bar].add_button(:quit, _INTL("Quit")) @components[:menu_bar].add_button(:save, _INTL("Save")) + @components[:menu_bar].add_settings_button(:settings, @editor_settings_bitmap) @components[:menu_bar].add_name_button(:name, get_animation_display_name) end @@ -333,6 +377,51 @@ class AnimationEditor anim_properties.visible = false end + def set_editor_settings_contents + editor_settings = @components[:editor_settings] + editor_settings.add_header_label(:header, _INTL("Editor settings")) + editor_settings.add_labelled_dropdown_list(:side_size_1, _INTL("Side sizes"), { + 1 => "1", + 2 => "2", + 3 => "3" + }, 1) + size_ctrl = editor_settings.get_control(:side_size_1) + size_ctrl.box_width = 50 + size_ctrl.set_interactive_rects + size_ctrl.invalidate + ctrl = UIControls::Label.new(50, UIControls::ControlsContainer::LINE_SPACING, editor_settings.viewport, _INTL("vs.")) + editor_settings.add_control_at(:side_size_vs_label, ctrl, size_ctrl.x + 60, size_ctrl.y) + ctrl = UIControls::DropdownList.new(54, UIControls::ControlsContainer::LINE_SPACING, editor_settings.viewport, { + 1 => "1", + 2 => "2", + 3 => "3" + }, 1) + ctrl.box_width = 50 + ctrl.invalidate + editor_settings.add_control_at(:side_size_2, ctrl, size_ctrl.x + 93, size_ctrl.y) + editor_settings.add_labelled_dropdown_list(:user_index, _INTL("User index"), { + 0 => "0", + 2 => "2", + 4 => "4" + }, 0) + ctrl = editor_settings.get_control(:user_index) + ctrl.box_width = 50 + ctrl.set_interactive_rects + ctrl.invalidate + # TODO: I want a better control than this for choosing the target indices. + editor_settings.add_labelled_text_box(:target_indices, _INTL("Target indices"), "") + editor_settings.add_labelled_checkbox(:user_opposes, _INTL("User is opposing?"), false) + editor_settings.add_labelled_dropdown_list(:canvas_bg, _INTL("Background graphic"), {}, "") + editor_settings.add_labelled_dropdown_list(:user_sprite_name, _INTL("User graphic"), {}, "") + ctrl = editor_settings.get_control(:user_sprite_name) + ctrl.max_rows = 14 + editor_settings.add_labelled_dropdown_list(:target_sprite_name, _INTL("Target graphic"), {}, "") + ctrl = editor_settings.get_control(:target_sprite_name) + ctrl.max_rows = 14 + editor_settings.add_button(:close, _INTL("Close")) + editor_settings.visible = false + end + def set_graphic_chooser_contents graphic_chooser = @components[:graphic_chooser] graphic_chooser.add_header_label(:header, _INTL("Choose a file")) @@ -390,6 +479,7 @@ class AnimationEditor set_particle_list_contents set_play_controls_contents # Intentionally after set_particle_list_contents set_animation_properties_contents + set_editor_settings_contents set_graphic_chooser_contents set_audio_chooser_contents end @@ -475,6 +565,28 @@ class AnimationEditor end end + def refresh_editor_settings_options + user_indices = { 0 => "0" } + user_indices[2] = "2" if @settings[:side_sizes][0] >= 2 + user_indices[4] = "4" if @settings[:side_sizes][0] >= 3 + @components[:editor_settings].get_control(:user_index).values = user_indices + # Canvas background graphic + files = get_all_files_in_folder("Graphics/Battlebacks", [".png", ".jpg", ".jpeg"]) + files.map! { |file| file[0] } + files.delete_if { |file| !file[/_bg$/] } + files.map! { |file| file.gsub(/_bg$/, "") } + files.delete_if { |file| !pbResolveBitmap("Graphics/Battlebacks/" + file.sub(/_eve$/, "").sub(/_night$/, "") + "_message") } + files.map! { |file| [file, file] } + @components[:editor_settings].get_control(:canvas_bg).values = files.to_h + # User and target sprite graphics + files = get_all_files_in_folder("Graphics/Pokemon/Front", [".png", ".jpg", ".jpeg"]) + files.map! { |file| file[0] } + files.delete_if { |file| !GameData::Species.exists?(file) } + files.map! { |file| [file, file] } + @components[:editor_settings].get_control(:user_sprite_name).values = files.to_h + @components[:editor_settings].get_control(:target_sprite_name).values = files.to_h + end + def refresh_move_property_options ctrl = @components[:animation_properties].get_control(:move) case @anim[:type] @@ -492,6 +604,8 @@ class AnimationEditor def refresh_component_values(component_sym) component = @components[component_sym] case component_sym + when :editor_settings + refresh_editor_settings_options when :canvas component.keyframe = keyframe component.selected_particle = particle_index @@ -580,7 +694,51 @@ class AnimationEditor edit_animation_properties @components[:menu_bar].anim_name = get_animation_display_name refresh_component(:particle_list) + when :settings + edit_editor_settings end + when :editor_settings + case property + when :side_size_1 + old_val = @settings[:side_sizes][0] + @settings[:side_sizes][0] = value + if @settings[:user_index] >= value * 2 + @settings[:user_index] = (value - 1) * 2 + @components[:editor_settings].get_control(:user_index).value = @settings[:user_index] + @settings[:target_indices].delete_if { |val| val == @settings[:user_index] } + end + @settings[:target_indices].delete_if { |val| val.even? && val >= value * 2 } + @settings[:target_indices].push(1) if @settings[:target_indices].empty? + @components[:editor_settings].get_control(:target_indices).value = @settings[:target_indices].join(",") + refresh_editor_settings_options if value != old_val + when :side_size_2 + old_val = @settings[:side_sizes][1] + @settings[:side_sizes][1] = value + @settings[:target_indices].delete_if { |val| val == @settings[:user_index] } + @settings[:target_indices].delete_if { |val| val.odd? && val >= value * 2 } + @settings[:target_indices].push(1) if @settings[:target_indices].empty? + @components[:editor_settings].get_control(:target_indices).value = @settings[:target_indices].join(",") + refresh_editor_settings_options if value != old_val + when :user_index + @settings[:user_index] = value + @settings[:target_indices].delete_if { |val| val == @settings[:user_index] } + @settings[:target_indices].push(1) if @settings[:target_indices].empty? + @components[:editor_settings].get_control(:target_indices).value = @settings[:target_indices].join(",") + when :target_indices + @settings[:target_indices] = value.split(",") + @settings[:target_indices].map! { |val| val.to_i } + @settings[:target_indices].sort! + @settings[:target_indices].uniq! + @settings[:target_indices].delete_if { |val| val == @settings[:user_index] } + @settings[:target_indices].delete_if { |val| val.even? && val >= @settings[:side_sizes][0] * 2 } + @settings[:target_indices].delete_if { |val| val.odd? && val >= @settings[:side_sizes][1] * 2 } + @settings[:target_indices].push(1) if @settings[:target_indices].empty? + @components[:editor_settings].get_control(:target_indices).value = @settings[:target_indices].join(",") + else + @settings[property] = value + end + save_settings + refresh_component(:canvas) when :canvas case property when :particle_index diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 7c01be061..2b399fe1c 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -122,10 +122,51 @@ class AnimationEditor #----------------------------------------------------------------------------- + def edit_editor_settings + # Show pop-up window + @pop_up_bg_bitmap.visible = true + bg_bitmap = create_pop_up_window(ANIM_PROPERTIES_WIDTH, ANIM_PROPERTIES_HEIGHT) + editor_settings = @components[:editor_settings] + editor_settings.visible = true + # Set control values + refresh_component(:editor_settings) + editor_settings.get_control(:side_size_1).value = @settings[:side_sizes][0] + editor_settings.get_control(:side_size_2).value = @settings[:side_sizes][1] + editor_settings.get_control(:user_index).value = @settings[:user_index] + editor_settings.get_control(:target_indices).value = @settings[:target_indices].join(",") + editor_settings.get_control(:user_opposes).value = @settings[:user_opposes] + editor_settings.get_control(:canvas_bg).value = @settings[:canvas_bg] + editor_settings.get_control(:user_sprite_name).value = @settings[:user_sprite_name] + editor_settings.get_control(:target_sprite_name).value = @settings[:target_sprite_name] + # Interaction loop + ret = nil + loop do + Graphics.update + Input.update + editor_settings.update + if editor_settings.changed? + break if editor_settings.values.keys.include?(:close) + editor_settings.values.each_pair do |property, value| + apply_changed_value(:editor_settings, property, value) + end + editor_settings.clear_changed + end + break if !editor_settings.busy? && Input.triggerex?(:ESCAPE) + editor_settings.repaint + end + # Dispose and return + bg_bitmap.dispose + @pop_up_bg_bitmap.visible = false + editor_settings.clear_changed + editor_settings.visible = false + end + + #----------------------------------------------------------------------------- + # Generates a list of all files in the given folder and its subfolders which # have a file extension that matches one in exts. Removes any files from the # list whose filename is the same as one in blacklist (case insensitive). - def get_all_files_in_folder(folder, exts, blacklist) + def get_all_files_in_folder(folder, exts, blacklist = []) ret = [] Dir.all(folder).each do |f| next if !exts.include?(File.extname(f)) diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index d42d41aa6..405f93eae 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -247,14 +247,31 @@ class AnimationEditor::Canvas < Sprite def refresh_bg_graphics return if @bg_name && @bg_name == @settings[:canvas_bg] @bg_name = @settings[:canvas_bg] - self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_bg") - @player_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") + core_name = @bg_name.sub(/_eve$/, "").sub(/_night$/, "") + if pbResolveBitmap("Graphics/Battlebacks/" + @bg_name + "_bg") + self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_bg") + else + self.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", core_name + "_bg") + end + if pbResolveBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") + @player_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base0") + else + @player_base.setBitmap("Graphics/Battlebacks/" + core_name + "_base0") + end @player_base.ox = @player_base.bitmap.width / 2 @player_base.oy = @player_base.bitmap.height - @foe_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base1") + if pbResolveBitmap("Graphics/Battlebacks/" + @bg_name + "_base1") + @foe_base.setBitmap("Graphics/Battlebacks/" + @bg_name + "_base1") + else + @foe_base.setBitmap("Graphics/Battlebacks/" + core_name + "_base1") + end @foe_base.ox = @foe_base.bitmap.width / 2 @foe_base.oy = @foe_base.bitmap.height / 2 - @message_bar_sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_message") + if pbResolveBitmap("Graphics/Battlebacks/" + @bg_name + "_message") + @message_bar_sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", @bg_name + "_message") + else + @message_bar_sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battlebacks/", core_name + "_message") + end @message_bar_sprite.y = Settings::SCREEN_HEIGHT - @message_bar_sprite.height end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb index c489365b9..e80feae5f 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/004_Menu bar.rb @@ -2,8 +2,9 @@ # #=============================================================================== class AnimationEditor::MenuBar < UIControls::ControlsContainer - MENU_BUTTON_WIDTH = 80 - NAME_BUTTON_WIDTH = 400 # The animation's name + MENU_BUTTON_WIDTH = 80 + SETTINGS_BUTTON_WIDTH = 30 + NAME_BUTTON_WIDTH = 400 # The animation's name def initialize(x, y, width, height, viewport) super(x, y, width, height) @@ -18,10 +19,15 @@ class AnimationEditor::MenuBar < UIControls::ControlsContainer add_control(id, ctrl) end + def add_settings_button(id, bitmap) + ctrl = UIControls::BitmapButton.new(0, 0, @viewport, bitmap) + add_control_at(id, ctrl, @width - SETTINGS_BUTTON_WIDTH + 2, 2) + end + def add_name_button(id, button_text) ctrl = UIControls::Button.new(NAME_BUTTON_WIDTH, @height, @viewport, button_text) ctrl.set_fixed_size - add_control(id, ctrl) + add_control_at(id, ctrl, @width - ctrl.width - SETTINGS_BUTTON_WIDTH, 0) end def anim_name=(val) @@ -33,16 +39,9 @@ class AnimationEditor::MenuBar < UIControls::ControlsContainer private - def add_control(id, control, add_offset = false) - i = @controls.length - control_x = (add_offset ? @row_count - 1 : @row_count) * MENU_BUTTON_WIDTH - control_x = @width - control.width if control.width == NAME_BUTTON_WIDTH - control_y = 0 - control.x = control_x + (add_offset ? OFFSET_FROM_LABEL_X : 0) - control.y = control_y + (add_offset ? OFFSET_FROM_LABEL_Y : 0) - control.set_interactive_rects - @controls[i] = [id, control] - @row_count += 1 if !add_offset - repaint + def next_control_position(add_offset = false) + row_x = @row_count * MENU_BUTTON_WIDTH + row_y = 0 + return row_x, row_y end end From 032ad25adc4ce84c1786f4a879d940944e61da0d Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 21 Apr 2024 19:13:54 +0100 Subject: [PATCH 39/49] Anim Editor: z-related bug fix, full-screen graphic size is now more lenient --- .../905_Anim player/003_AnimPlayerHelper.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb index 1bae53f30..815773f2b 100644 --- a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb +++ b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb @@ -102,9 +102,17 @@ module AnimationPlayer::Helper if focus.is_a?(Array) distance = GameData::Animation::USER_AND_TARGET_SEPARATION[2] if z >= 0 - sprite.z = z + focus[0] + if focus[0] > focus[1] + sprite.z = focus[0] + z + else + sprite.z = focus[0] - z + end elsif z <= distance - sprite.z = z + focus[1] + if focus[0] > focus[1] + sprite.z = focus[1] + z + distance + else + sprite.z = focus[1] - z + distance + end else sprite.z = focus[0] + ((z.to_f / distance) * (focus[1] - focus[0])).to_i end @@ -149,7 +157,7 @@ module AnimationPlayer::Helper sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Battle animations/", particle[:graphic]) sprite.src_rect.set(0, 0, sprite.bitmap.width, sprite.bitmap.height) if [:foreground, :midground, :background].include?(particle[:focus]) && - sprite.bitmap.width == Settings::SCREEN_WIDTH && + sprite.bitmap.width >= Settings::SCREEN_WIDTH && sprite.bitmap.height >= Settings::SCREEN_HEIGHT - BATTLE_MESSAGE_BAR_HEIGHT sprite.ox = 0 sprite.oy = 0 From 23a8c552d611726eb983119a475c97dbb6b2ccaa Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 21 Apr 2024 23:08:48 +0100 Subject: [PATCH 40/49] Anim Editor: bug fixes --- .../904_Anim Editor/001_AnimationEditor.rb | 3 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 28 ++- .../905_Anim player/011_Battle z modifiers.rb | 12 +- PBS/Animations/Example anims/Move/TACKLE.txt | 22 -- PBS/Animations/Normal/Tackle.txt | 192 ++++++++++++++++++ 5 files changed, 224 insertions(+), 33 deletions(-) delete mode 100644 PBS/Animations/Example anims/Move/TACKLE.txt create mode 100644 PBS/Animations/Normal/Tackle.txt diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 43a287e16..49359cfa0 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -265,6 +265,7 @@ class AnimationEditor end def save + AnimationEditor::ParticleDataHelper.optimize_all_particles(@anim[:particles]) GameData::Animation.register(@anim, @anim_id) Compiler.write_battle_animation_file(@anim[:pbs_path]) if @anim[:pbs_path] != @pbs_path @@ -967,7 +968,7 @@ class AnimationEditor break end end - update_input + update_input if !@captured end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index 674c10aa1..c5c59c026 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -229,6 +229,7 @@ module AnimationEditor::ParticleDataHelper set_now = nil move_ending_now = nil move_starting_now = nil + set_at_end_of_move_starting_now = nil particle[property].each do |cmd| if cmd[1] == 0 set_now = cmd if cmd[0] == frame @@ -237,6 +238,11 @@ module AnimationEditor::ParticleDataHelper move_ending_now = cmd if cmd[0] + cmd[1] == frame end end + if move_starting_now + particle[property].each do |cmd| + set_at_end_of_move_starting_now = cmd if cmd[1] == 0 && cmd[0] == move_starting_now[0] + move_starting_now[1] + end + end # Delete SetXYZ if it is at frame particle[property].delete(set_now) if set_now # Edit/delete MoveXYZ commands starting/ending at frame @@ -247,14 +253,27 @@ module AnimationEditor::ParticleDataHelper elsif move_ending_now # Delete MoveXYZ ending now particle[property].delete(move_ending_now) elsif move_starting_now && (full_delete || !set_now) # Turn into SetXYZ at its end point - move_starting_now[0] += move_starting_now[1] - move_starting_now[1] = 0 - move_starting_now[3] = nil - move_starting_now.compact! + if set_at_end_of_move_starting_now + particle[property].delete(move_starting_now) + else + move_starting_now[0] += move_starting_now[1] + move_starting_now[1] = 0 + move_starting_now[3] = nil + move_starting_now.compact! + end end return (particle[property].empty?) ? nil : particle[property] end + def optimize_all_particles(particles) + particles.each do |particle| + particle.each_pair do |key, cmds| + next if !cmds.is_a?(Array) || cmds.empty? + particle[key] = optimize_commands(particle, key) + end + end + end + # Removes commands for the particle's given property if they don't make a # difference. Returns the resulting set of commands. def optimize_commands(particle, property) @@ -281,7 +300,6 @@ module AnimationEditor::ParticleDataHelper first_non_visible_cmd = -1 particle.each_pair do |prop, value| next if !value.is_a?(Array) || value.empty? - next if prop == property && value[0][0] == frame first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0] next if prop == :visible first_non_visible_cmd = value[0][0] if first_non_visible_cmd < 0 || first_non_visible_cmd > value[0][0] diff --git a/Data/Scripts/905_Anim player/011_Battle z modifiers.rb b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb index 6e036e782..e1da105c7 100644 --- a/Data/Scripts/905_Anim player/011_Battle z modifiers.rb +++ b/Data/Scripts/905_Anim player/011_Battle z modifiers.rb @@ -2,15 +2,19 @@ # #=============================================================================== class Battle::Scene - alias __newanims__pbInitSprites pbInitSprites unless method_defined?(:__newanims__pbInitSprites) - def pbInitSprites - __newanims__pbInitSprites + alias __newanims__pbCreateBackdropSprites pbCreateBackdropSprites unless method_defined?(:__newanims__pbCreateBackdropSprites) + def pbCreateBackdropSprites + __newanims__pbCreateBackdropSprites ["battle_bg", "battle_bg2"].each { |spr| @sprites[spr].z = -200 } 2.times do |side| @sprites["base_#{side}"].z = -199 end @sprites["cmdBar_bg"].z += 9999 + end + alias __newanims__pbInitSprites pbInitSprites unless method_defined?(:__newanims__pbInitSprites) + def pbInitSprites + __newanims__pbInitSprites @sprites["messageBox"].z += 9999 @sprites["messageWindow"].z += 9999 @sprites["commandWindow"].z += 9999 @@ -27,7 +31,6 @@ class Battle::Scene @battle.battlers.each_with_index do |b, i| @sprites["dataBox_#{i}"].z += 9999 if b end - @battle.player.each_with_index do |p, i| @sprites["player_#{i + 1}"].z = 1500 + (i * 100) end @@ -36,7 +39,6 @@ class Battle::Scene @sprites["trainer_#{i + 1}"].z = 500 - (i * 100) end end - end end diff --git a/PBS/Animations/Example anims/Move/TACKLE.txt b/PBS/Animations/Example anims/Move/TACKLE.txt deleted file mode 100644 index b8eaface1..000000000 --- a/PBS/Animations/Example anims/Move/TACKLE.txt +++ /dev/null @@ -1,22 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,TACKLE] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/Tackle_B - Focus = Target - SetX = 2,0 - SetY = 2,3 - SetZ = 2,27 - SetOpacity = 2,150 - SetOpacity = 3,255 - SetOpacity = 8,150 - SetOpacity = 9,100 - - Play = 0,Blow1,80 diff --git a/PBS/Animations/Normal/Tackle.txt b/PBS/Animations/Normal/Tackle.txt new file mode 100644 index 000000000..cbf20ffeb --- /dev/null +++ b/PBS/Animations/Normal/Tackle.txt @@ -0,0 +1,192 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TACKLE] +Name = Essentials + + FoeInvertX = true + FoeInvertY = true + MoveX = 0,1,28 + MoveY = 0,1,-16 + MoveX = 3,1,0 + MoveY = 3,1,0 + + FoeInvertX = true + MoveX = 4,1,-2 + MoveX = 5,2,2 + MoveX = 7,2,-2 + MoveX = 9,2,2 + MoveX = 11,1,0 + + Graphic = Normal/Tackle hit 1 + Focus = Target + SetZ = 4,10 + SetZoomX = 4,75 + SetZoomY = 4,75 + SetColorRed = 4,248 + SetColorGreen = 4,248 + SetColorBlue = 4,192 + SetColorAlpha = 4,255 + MoveZoomX = 4,1,100 + MoveZoomY = 4,1,100 + SetVisible = 5,false + + Graphic = Normal/Tackle hit 2 + Focus = Target + SetZ = 5,10 + SetZoomX = 5,60 + SetZoomY = 5,60 + SetColorRed = 5,248 + SetColorGreen = 5,192 + SetColorAlpha = 5,255 + MoveZoomX = 5,4,100 + MoveZoomY = 5,4,100 + MoveOpacity = 5,4,0 + SetVisible = 9,false + + Graphic = Normal/Tackle spark + Focus = Target + SetX = 4,-11 + SetY = 4,-17 + SetZ = 4,5 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetOpacity = 4,0 + SetColorRed = 4,248 + SetColorGreen = 4,248 + SetColorBlue = 4,128 + SetColorAlpha = 4,255 + MoveOpacity = 4,1,255 + MoveX = 4,13,-102 + MoveY = 4,13,-68,EaseOut + MoveZoomX = 8,9,0 + MoveZoomY = 8,9,0 + MoveOpacity = 8,9,0 + MoveColorGreen = 8,9,96,EaseOut + MoveColorBlue = 8,9,32,EaseOut + + Graphic = Normal/Tackle spark + Focus = Target + SetX = 5,-3 + SetY = 5,-24 + SetZ = 5,5 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetOpacity = 5,0 + SetColorRed = 5,248 + SetColorGreen = 5,248 + SetColorBlue = 5,128 + SetColorAlpha = 5,255 + MoveOpacity = 5,1,255 + MoveX = 5,13,-40 + MoveY = 5,13,-116,EaseOut + MoveZoomX = 9,9,0 + MoveZoomY = 9,9,0 + MoveOpacity = 9,9,0 + MoveColorGreen = 9,9,96,EaseOut + MoveColorBlue = 9,9,32,EaseOut + + Graphic = Normal/Tackle spark + Focus = Target + SetX = 4,8 + SetY = 4,-7 + SetZ = 4,5 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetOpacity = 4,0 + SetColorRed = 4,248 + SetColorGreen = 4,248 + SetColorBlue = 4,128 + SetColorAlpha = 4,255 + MoveOpacity = 4,1,255 + MoveX = 4,13,-1 + MoveY = 4,13,-94,EaseOut + MoveZoomX = 8,9,0 + MoveZoomY = 8,9,0 + MoveOpacity = 8,9,0 + MoveColorGreen = 8,9,96,EaseOut + MoveColorBlue = 8,9,32,EaseOut + + Graphic = Normal/Tackle spark + Focus = Target + SetX = 5,7 + SetY = 5,-6 + SetZ = 5,5 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetOpacity = 5,0 + SetColorRed = 5,248 + SetColorGreen = 5,248 + SetColorBlue = 5,128 + SetColorAlpha = 5,255 + MoveOpacity = 5,1,255 + MoveX = 5,13,50 + MoveY = 5,13,-106,EaseOut + MoveZoomX = 9,9,0 + MoveZoomY = 9,9,0 + MoveOpacity = 9,9,0 + MoveColorGreen = 9,9,96,EaseOut + MoveColorBlue = 9,9,32,EaseOut + + Graphic = Normal/Tackle spark + Focus = Target + SetX = 4,25 + SetY = 4,-4 + SetZ = 4,5 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetOpacity = 4,0 + SetColorRed = 4,248 + SetColorGreen = 4,248 + SetColorBlue = 4,128 + SetColorAlpha = 4,255 + MoveOpacity = 4,1,255 + MoveX = 4,13,78 + MoveY = 4,13,-28,EaseOut + MoveZoomX = 8,9,0 + MoveZoomY = 8,9,0 + MoveOpacity = 8,9,0 + MoveColorGreen = 8,9,96,EaseOut + MoveColorBlue = 8,9,32,EaseOut + + Graphic = Normal/Tackle spark + Focus = Target + SetX = 4,18 + SetY = 4,-9 + SetZ = 4,5 + SetZoomX = 4,50 + SetZoomY = 4,50 + SetOpacity = 4,0 + SetColorRed = 4,248 + SetColorGreen = 4,248 + SetColorBlue = 4,128 + SetColorAlpha = 4,255 + MoveOpacity = 4,1,255 + MoveX = 4,13,117 + MoveY = 4,13,-77,EaseOut + MoveZoomX = 8,9,0 + MoveZoomY = 8,9,0 + MoveOpacity = 8,9,0 + MoveColorGreen = 8,9,96,EaseOut + MoveColorBlue = 8,9,32,EaseOut + + Graphic = Normal/Tackle spark + Focus = Target + SetX = 5,-3 + SetY = 5,-5 + SetZ = 5,5 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetOpacity = 5,0 + SetColorRed = 5,248 + SetColorGreen = 5,248 + SetColorBlue = 5,128 + SetColorAlpha = 5,255 + MoveOpacity = 5,1,255 + MoveX = 5,13,-112 + MoveY = 5,13,-26,EaseOut + MoveZoomX = 9,9,0 + MoveZoomY = 9,9,0 + MoveOpacity = 9,9,0 + MoveColorGreen = 9,9,96,EaseOut + MoveColorBlue = 9,9,32,EaseOut + From 99aec45c5c2dbc096a079fb9de56cadfc3fcbdee Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 22 Apr 2024 23:50:54 +0100 Subject: [PATCH 41/49] Anim Editor: bug fixes relating to deleting particles, added some animations --- .../003_AnimationEditor_side_panes.rb | 3 +- .../Anim Editor elements/003_ParticleList.rb | 3 +- .../905_Anim player/010_Battle code.rb | 3 +- .../Example anims/Move/DEFENSECURL.txt | 33 -- PBS/Animations/Example anims/Move/SCRATCH.txt | 30 -- .../Example anims/Move/TAILWHIP.txt | 36 -- PBS/Animations/Normal/Defense Curl.txt | 40 +++ PBS/Animations/Normal/Scratch.txt | 319 ++++++++++++++++++ PBS/Animations/Normal/Tackle.txt | 1 + PBS/Animations/Normal/Tail Whip.txt | 24 ++ 10 files changed, 389 insertions(+), 103 deletions(-) delete mode 100644 PBS/Animations/Example anims/Move/DEFENSECURL.txt delete mode 100644 PBS/Animations/Example anims/Move/SCRATCH.txt delete mode 100644 PBS/Animations/Example anims/Move/TAILWHIP.txt create mode 100644 PBS/Animations/Normal/Defense Curl.txt create mode 100644 PBS/Animations/Normal/Scratch.txt create mode 100644 PBS/Animations/Normal/Tail Whip.txt diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index eff548ee2..b9c4cbbbc 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -560,7 +560,7 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :foe_invert_y, { AnimationEditor::SidePanes.add_property(:particle_pane, :foe_flip, { :new => proc { |pane, editor| - pane.add_labelled_checkbox(:foe_flip, _INTL("Flip Sprite"), false) + pane.add_labelled_checkbox(:foe_flip, _INTL("Flip sprite"), false) }, :refresh_value => proc { |control, editor| focus = editor.anim[:particles][editor.particle_index][:focus] @@ -610,6 +610,7 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :delete, { AnimationEditor::ParticleDataHelper.delete_particle(editor.anim[:particles], p_index) editor.components[:particle_list].delete_particle(p_index) editor.components[:particle_list].set_particles(editor.anim[:particles]) + p_index = editor.particle_index editor.components[:particle_list].keyframe = 0 if editor.anim[:particles][p_index][:name] == "SE" editor.refresh end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 2dce84454..958f13c74 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -200,7 +200,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end def particle_index - return -1 if @row_index < 0 + return -1 if @row_index < 0 || @row_index >= @particle_list.length ret = @particle_list[@row_index] return (ret.is_a?(Array)) ? ret[0] : ret end @@ -335,6 +335,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @particle_list.push([i, property]) if value.is_a?(Array) end end + @row_index = @particle_list.length - 1 if @row_index >= @particle_list.length # Dispose of and clear all existing list/commands sprites dispose_listed_sprites # Create new sprites for each particle (1x list and 2x commands) diff --git a/Data/Scripts/905_Anim player/010_Battle code.rb b/Data/Scripts/905_Anim player/010_Battle code.rb index bfdd765aa..548512951 100644 --- a/Data/Scripts/905_Anim player/010_Battle code.rb +++ b/Data/Scripts/905_Anim player/010_Battle code.rb @@ -75,8 +75,7 @@ class Battle::Scene move_type = move_data.type default_idx = move_data.category default_idx += 3 if target_data.num_targets > 1 || - (target_data.num_targets > 0 && move_data.status?) || - target_data.affects_foe_side + (target_data.num_targets > 0 && move_data.status?) # Check for a default animation wanted_move = ANIMATION_DEFAULTS_FOR_TYPE_CATEGORY[move_type][default_idx] anims = find_move_animation_for_move(wanted_move, 0, user_index) diff --git a/PBS/Animations/Example anims/Move/DEFENSECURL.txt b/PBS/Animations/Example anims/Move/DEFENSECURL.txt deleted file mode 100644 index ba564c0dc..000000000 --- a/PBS/Animations/Example anims/Move/DEFENSECURL.txt +++ /dev/null @@ -1,33 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,DEFENSECURL] -Name = Example anim -NoTarget = true - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/fly copy - Focus = User - SetFrame = 0,5 - SetX = 0,5 - SetY = 0,0 - SetZ = 0,27 - SetOpacity = 0,100 - SetX = 1,3 - SetY = 1,-1 - SetOpacity = 1,110 - SetX = 2,6 - SetY = 2,-3 - SetOpacity = 2,140 - SetX = 3,3 - SetOpacity = 3,170 - SetY = 4,-2 - SetOpacity = 4,230 - SetX = 5,-1 - SetY = 5,-5 - SetOpacity = 5,255 - SetX = 6,4 - SetOpacity = 6,233 - - Play = 0,Defense Curl diff --git a/PBS/Animations/Example anims/Move/SCRATCH.txt b/PBS/Animations/Example anims/Move/SCRATCH.txt deleted file mode 100644 index c4cbd7c88..000000000 --- a/PBS/Animations/Example anims/Move/SCRATCH.txt +++ /dev/null @@ -1,30 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,SCRATCH] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/scratchbattle - Focus = Target - SetX = 1,15 - SetY = 1,-22 - SetZ = 1,27 - SetFrame = 2,1 - SetX = 2,-1 - SetY = 2,-6 - SetFrame = 3,2 - SetX = 3,-17 - SetY = 3,10 - SetFrame = 4,3 - SetX = 4,-33 - SetY = 4,26 - SetFrame = 5,4 - SetY = 5,42 - SetVisible = 6,false - - Play = 0,Slash10,80 diff --git a/PBS/Animations/Example anims/Move/TAILWHIP.txt b/PBS/Animations/Example anims/Move/TAILWHIP.txt deleted file mode 100644 index af3ae4238..000000000 --- a/PBS/Animations/Example anims/Move/TAILWHIP.txt +++ /dev/null @@ -1,36 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,TAILWHIP] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - SetX = 1,21 - SetY = 1,3 - SetX = 2,40 - SetY = 2,11 - SetX = 3,15 - SetY = 3,14 - SetX = 4,-21 - SetX = 5,-44 - SetY = 5,6 - SetX = 6,-22 - SetY = 6,4 - SetX = 7,0 - SetY = 7,0 - SetX = 9,21 - SetY = 9,3 - SetX = 10,40 - SetY = 10,11 - SetX = 11,15 - SetY = 11,14 - SetX = 12,-21 - SetX = 13,-44 - SetY = 13,6 - SetX = 14,-22 - SetY = 14,4 - SetX = 15,0 - SetY = 15,0 - - SetX = 0,0 - SetY = 0,0 diff --git a/PBS/Animations/Normal/Defense Curl.txt b/PBS/Animations/Normal/Defense Curl.txt new file mode 100644 index 000000000..71e49be55 --- /dev/null +++ b/PBS/Animations/Normal/Defense Curl.txt @@ -0,0 +1,40 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,DEFENSECURL] +Name = Essentials +NoTarget = true + + + Graphic = Normal/Defense Curl ball + Focus = User + SetY = 0,32 + SetZ = 0,10 + SetZoomX = 0,250 + SetZoomY = 0,250 + SetOpacity = 0,128 + MoveZoomX = 0,3,150 + MoveZoomY = 0,3,150 + SetOpacity = 5,255 + MoveZoomX = 9,4,300 + MoveZoomY = 9,4,300 + MoveOpacity = 9,4,0 + SetVisible = 13,false + + Graphic = Normal/Defense Curl swish + Focus = User + SetY = 7,32 + SetZ = 7,5 + SetZoomX = 7,90 + SetZoomY = 7,90 + SetAngle = 7,90 + SetOpacity = 7,160 + MoveAngle = 7,10,810 + SetColorRed = 12,160 + SetColorGreen = 12,160 + SetColorBlue = 12,248 + SetColorAlpha = 12,255 + MoveZoomX = 12,5,130 + MoveZoomY = 12,5,130 + MoveOpacity = 16,1,0 + + Play = 0,Normal/Defense Curl diff --git a/PBS/Animations/Normal/Scratch.txt b/PBS/Animations/Normal/Scratch.txt new file mode 100644 index 000000000..673538367 --- /dev/null +++ b/PBS/Animations/Normal/Scratch.txt @@ -0,0 +1,319 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,SCRATCH] +Name = Essentials + + + FoeInvertX = true + MoveX = 0,1,-2 + MoveX = 1,2,2 + MoveX = 3,2,-2 + MoveX = 5,2,2 + MoveX = 7,1,0 + + Graphic = Normal/Scratch marks + Focus = Target + SetX = 0,51 + SetY = 0,-102 + SetZ = 0,30 + SetZoomX = 0,75 + SetAngle = 0,150 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,3,-44 + MoveY = 0,3,60 + MoveColorGreen = 2,1,144 + MoveOpacity = 2,5,0 + SetVisible = 7,false + + Graphic = Normal/Scratch marks + Focus = Target + SetX = 1,19 + SetY = 1,-50 + SetZ = 1,25 + SetZoomX = 1,75 + SetAngle = 1,150 + SetOpacity = 1,128 + SetColorRed = 1,248 + SetColorGreen = 1,248 + SetColorAlpha = 1,255 + MoveOpacity = 1,7,0 + SetVisible = 8,false + + Graphic = Normal/Scratch marks + Focus = Target + SetX = 2,-12 + SetY = 2,6 + SetZ = 2,25 + SetZoomX = 2,75 + SetAngle = 2,150 + SetOpacity = 2,128 + SetColorRed = 2,248 + SetColorGreen = 2,248 + SetColorAlpha = 2,255 + MoveOpacity = 2,7,0 + SetVisible = 9,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 0,-11 + SetY = 0,-17 + SetZ = 0,5 + SetZoomX = 0,40 + SetZoomY = 0,40 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,-57 + MoveY = 0,13,-54,EaseOut + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 1,-3 + SetY = 1,-24 + SetZ = 1,5 + SetZoomX = 1,40 + SetZoomY = 1,40 + SetOpacity = 1,0 + SetColorRed = 1,248 + SetColorGreen = 1,248 + SetColorBlue = 1,128 + SetColorAlpha = 1,255 + MoveOpacity = 1,1,255 + MoveX = 1,13,-40 + MoveY = 1,13,-116,EaseOut + MoveZoomX = 5,9,0 + MoveZoomY = 5,9,0 + MoveOpacity = 5,9,0 + MoveColorGreen = 5,9,96,EaseOut + MoveColorBlue = 5,9,32,EaseOut + SetVisible = 14,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 2,8 + SetY = 2,-7 + SetZ = 2,5 + SetZoomX = 2,40 + SetZoomY = 2,40 + SetOpacity = 2,0 + SetColorRed = 2,248 + SetColorGreen = 2,248 + SetColorBlue = 2,128 + SetColorAlpha = 2,255 + MoveOpacity = 2,1,255 + MoveX = 2,13,-1 + MoveY = 2,13,-94,EaseOut + MoveZoomX = 6,9,0 + MoveZoomY = 6,9,0 + MoveOpacity = 6,9,0 + MoveColorGreen = 6,9,96,EaseOut + MoveColorBlue = 6,9,32,EaseOut + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 1,7 + SetY = 1,-6 + SetZ = 1,5 + SetZoomX = 1,40 + SetZoomY = 1,40 + SetOpacity = 1,0 + SetColorRed = 1,248 + SetColorGreen = 1,248 + SetColorBlue = 1,128 + SetColorAlpha = 1,255 + MoveOpacity = 1,1,255 + MoveX = 1,13,50 + MoveY = 1,13,-106,EaseOut + MoveZoomX = 5,9,0 + MoveZoomY = 5,9,0 + MoveOpacity = 5,9,0 + MoveColorGreen = 5,9,96,EaseOut + MoveColorBlue = 5,9,32,EaseOut + SetVisible = 14,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 2,25 + SetY = 2,-4 + SetZ = 2,5 + SetZoomX = 2,40 + SetZoomY = 2,40 + SetOpacity = 2,0 + SetColorRed = 2,248 + SetColorGreen = 2,248 + SetColorBlue = 2,128 + SetColorAlpha = 2,255 + MoveOpacity = 2,1,255 + MoveX = 2,13,78 + MoveY = 2,13,-28,EaseOut + MoveZoomX = 6,9,0 + MoveZoomY = 6,9,0 + MoveOpacity = 6,9,0 + MoveColorGreen = 6,9,96,EaseOut + MoveColorBlue = 6,9,32,EaseOut + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 0,18 + SetY = 0,-9 + SetZ = 0,5 + SetZoomX = 0,40 + SetZoomY = 0,40 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,117 + MoveY = 0,13,-77,EaseOut + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 2,-3 + SetY = 2,-5 + SetZ = 2,5 + SetZoomX = 2,40 + SetZoomY = 2,40 + SetOpacity = 2,0 + SetColorRed = 2,248 + SetColorGreen = 2,248 + SetColorBlue = 2,128 + SetColorAlpha = 2,255 + MoveOpacity = 2,1,255 + MoveX = 2,13,-112 + MoveY = 2,13,-26,EaseOut + MoveZoomX = 6,9,0 + MoveZoomY = 6,9,0 + MoveOpacity = 6,9,0 + MoveColorGreen = 6,9,96,EaseOut + MoveColorBlue = 6,9,32,EaseOut + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 0,21 + SetY = 0,4 + SetZ = 0,5 + SetZoomX = 0,40 + SetZoomY = 0,40 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,93 + MoveY = 0,13,40,EaseIn + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 2,-7 + SetY = 2,4 + SetZ = 2,5 + SetZoomX = 2,40 + SetZoomY = 2,40 + SetOpacity = 2,0 + SetColorRed = 2,248 + SetColorGreen = 2,248 + SetColorBlue = 2,128 + SetColorAlpha = 2,255 + MoveOpacity = 2,1,255 + MoveX = 2,13,-63 + MoveY = 2,13,43,EaseIn + MoveZoomX = 6,9,0 + MoveZoomY = 6,9,0 + MoveOpacity = 6,9,0 + MoveColorGreen = 6,9,96,EaseOut + MoveColorBlue = 6,9,32,EaseOut + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 1,-1 + SetY = 1,3 + SetZ = 1,5 + SetZoomX = 1,40 + SetZoomY = 1,40 + SetOpacity = 1,0 + SetColorRed = 1,248 + SetColorGreen = 1,248 + SetColorBlue = 1,128 + SetColorAlpha = 1,255 + MoveOpacity = 1,1,255 + MoveX = 1,13,47 + MoveY = 1,13,58,EaseIn + MoveZoomX = 5,9,0 + MoveZoomY = 5,9,0 + MoveOpacity = 5,9,0 + MoveColorGreen = 5,9,96,EaseOut + MoveColorBlue = 5,9,32,EaseOut + SetVisible = 14,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 0,10 + SetY = 0,-4 + SetZ = 0,5 + SetZoomX = 0,40 + SetZoomY = 0,40 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,66 + MoveY = 0,13,11,EaseIn + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Scratch spark + Focus = Target + SetX = 2,4 + SetY = 2,-2 + SetZ = 2,5 + SetZoomX = 2,40 + SetZoomY = 2,40 + SetOpacity = 2,0 + SetColorRed = 2,248 + SetColorGreen = 2,248 + SetColorBlue = 2,128 + SetColorAlpha = 2,255 + MoveOpacity = 2,1,255 + MoveX = 2,13,8 + MoveY = 2,13,80,EaseIn + MoveZoomX = 6,9,0 + MoveZoomY = 6,9,0 + MoveOpacity = 6,9,0 + MoveColorGreen = 6,9,96,EaseOut + MoveColorBlue = 6,9,32,EaseOut + + Play = 0,Normal/Scratch diff --git a/PBS/Animations/Normal/Tackle.txt b/PBS/Animations/Normal/Tackle.txt index cbf20ffeb..d69447b50 100644 --- a/PBS/Animations/Normal/Tackle.txt +++ b/PBS/Animations/Normal/Tackle.txt @@ -190,3 +190,4 @@ Name = Essentials MoveColorGreen = 9,9,96,EaseOut MoveColorBlue = 9,9,32,EaseOut + Play = 4,Normal/Tackle diff --git a/PBS/Animations/Normal/Tail Whip.txt b/PBS/Animations/Normal/Tail Whip.txt new file mode 100644 index 000000000..fccf6fa2b --- /dev/null +++ b/PBS/Animations/Normal/Tail Whip.txt @@ -0,0 +1,24 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TAILWHIP] +Name = Essentials +NoTarget = true + + MoveX = 0,2,32,EaseOut + MoveY = 0,2,16,EaseIn + MoveX = 2,2,0,EaseIn + MoveY = 2,2,24,EaseOut + MoveX = 4,2,-32,EaseOut + MoveY = 4,2,16,EaseIn + MoveX = 6,2,0,EaseIn + MoveY = 6,2,0,EaseOut + MoveX = 10,2,32,EaseOut + MoveY = 10,2,16,EaseIn + MoveX = 12,2,0,EaseIn + MoveY = 12,2,24,EaseOut + MoveX = 14,2,-32,EaseOut + MoveY = 14,2,16,EaseIn + MoveX = 16,2,0,EaseIn + MoveY = 16,2,0,EaseOut + + Play = 0,Normal/Tail Whip From 81ce6e515cb21ca9147045070ca993a8bd21a194 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Wed, 24 Apr 2024 22:49:19 +0100 Subject: [PATCH 42/49] More new battle animations --- .../904_Anim Editor/001_AnimationEditor.rb | 7 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 1 + PBS/Animations/Dark/Bite.txt | 118 +++++++ PBS/Animations/Example anims/Move/BITE.txt | 34 --- PBS/Animations/Example anims/Move/BULKUP.txt | 102 ------- PBS/Animations/Example anims/Move/GROWL.txt | 132 -------- PBS/Animations/Example anims/Move/POUND.txt | 40 --- PBS/Animations/Fighting/Bulk Up.txt | 19 ++ PBS/Animations/Ghost/Astonish.txt | 161 ++++++++++ PBS/Animations/Normal/Growl.txt | 288 ++++++++++++++++++ PBS/Animations/Normal/Growth.txt | 23 ++ PBS/Animations/Normal/Pound.txt | 180 +++++++++++ PBS/Animations/Normal/Tackle.txt | 5 +- 13 files changed, 798 insertions(+), 312 deletions(-) create mode 100644 PBS/Animations/Dark/Bite.txt delete mode 100644 PBS/Animations/Example anims/Move/BITE.txt delete mode 100644 PBS/Animations/Example anims/Move/BULKUP.txt delete mode 100644 PBS/Animations/Example anims/Move/GROWL.txt delete mode 100644 PBS/Animations/Example anims/Move/POUND.txt create mode 100644 PBS/Animations/Fighting/Bulk Up.txt create mode 100644 PBS/Animations/Ghost/Astonish.txt create mode 100644 PBS/Animations/Normal/Growl.txt create mode 100644 PBS/Animations/Normal/Growth.txt create mode 100644 PBS/Animations/Normal/Pound.txt diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 49359cfa0..dfa097f42 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -8,7 +8,7 @@ class AnimationEditor BORDER_THICKNESS = 4 WINDOW_WIDTH = Settings::SCREEN_WIDTH + 352 + (BORDER_THICKNESS * 4) - WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + 352 + (BORDER_THICKNESS * 4) + WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + 424 + (BORDER_THICKNESS * 4) # Components MENU_BAR_WIDTH = WINDOW_WIDTH @@ -548,7 +548,10 @@ class AnimationEditor break end end - break if Input.triggerex?(:SPACE) + if Input.triggerex?(:SPACE) + pbSEStop + break + end break if anim_player.finished? end anim_player.dispose diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index c5c59c026..ac20db455 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -267,6 +267,7 @@ module AnimationEditor::ParticleDataHelper def optimize_all_particles(particles) particles.each do |particle| + next if particle[:name] == "SE" particle.each_pair do |key, cmds| next if !cmds.is_a?(Array) || cmds.empty? particle[key] = optimize_commands(particle, key) diff --git a/PBS/Animations/Dark/Bite.txt b/PBS/Animations/Dark/Bite.txt new file mode 100644 index 000000000..bc068fbfc --- /dev/null +++ b/PBS/Animations/Dark/Bite.txt @@ -0,0 +1,118 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BITE] +Name = Essentials +NoUser = true + + FoeInvertX = true + MoveX = 7,1,-2 + MoveX = 8,2,2 + MoveX = 10,2,-2 + MoveX = 12,2,2 + MoveX = 14,1,0 + + Graphic = Dark/Bite teeth + Focus = Target + SetY = 0,-18 + SetZ = 0,10 + SetZoomX = 0,125 + SetZoomY = 0,125 + SetAngle = 0,180 + SetOpacity = 0,0 + MoveOpacity = 0,1,255 + MoveY = 0,3,-72 + MoveZoomY = 0,3,200 + MoveY = 4,3,-10,EaseOut + MoveZoomY = 4,3,100 + MoveY = 7,8,-48 + MoveZoomY = 7,8,150 + MoveOpacity = 11,4,0 + + Graphic = Dark/Bite teeth + Focus = Target + SetY = 0,18 + SetZ = 0,5 + SetZoomX = 0,125 + SetZoomY = 0,125 + SetOpacity = 0,0 + MoveOpacity = 0,1,255 + MoveY = 0,3,72 + MoveZoomY = 0,3,200 + MoveY = 4,3,10,EaseOut + MoveZoomY = 4,3,100 + MoveY = 7,8,48 + MoveZoomY = 7,8,150 + MoveOpacity = 11,4,0 + + Graphic = Dark/Bite teeth + Focus = Target + SetY = 4,-72 + SetZ = 4,20 + SetZoomX = 4,125 + SetZoomY = 4,200 + SetAngle = 4,180 + MoveOpacity = 4,2,0 + SetVisible = 6,false + + Graphic = Dark/Bite teeth + Focus = Target + SetY = 4,72 + SetZ = 4,15 + SetZoomX = 4,125 + SetZoomY = 4,200 + MoveOpacity = 4,2,0 + SetVisible = 6,false + + Graphic = Dark/Bite hit + Focus = Target + SetX = 4,-64 + SetZ = 4,30 + SetZoomX = 4,0 + SetZoomY = 4,0 + SetAngle = 4,-20 + SetColorRed = 4,248 + SetColorGreen = 4,248 + SetColorAlpha = 4,255 + MoveZoomX = 4,5,150 + MoveZoomY = 4,5,150 + MoveOpacity = 7,2,0 + SetVisible = 9,false + + Graphic = Dark/Bite hit + Focus = Target + SetX = 4,-64 + SetZ = 4,35 + SetZoomX = 4,0 + SetZoomY = 4,0 + SetAngle = 4,-20 + MoveZoomX = 4,5,130 + MoveZoomY = 4,5,130 + MoveOpacity = 7,2,0 + SetVisible = 9,false + + Graphic = Dark/Bite hit + Focus = Target + SetX = 4,64 + SetZ = 4,30 + SetZoomX = 4,0 + SetZoomY = 4,0 + SetColorRed = 4,248 + SetColorGreen = 4,248 + SetColorAlpha = 4,255 + MoveZoomX = 4,5,150 + MoveZoomY = 4,5,150 + MoveOpacity = 7,2,0 + SetVisible = 9,false + + Graphic = Dark/Bite hit + Focus = Target + SetX = 4,64 + SetZ = 4,35 + SetZoomX = 4,0 + SetZoomY = 4,0 + MoveZoomX = 4,5,130 + MoveZoomY = 4,5,130 + MoveOpacity = 7,2,0 + SetVisible = 9,false + + Play = 4,Dark/Bite diff --git a/PBS/Animations/Example anims/Move/BITE.txt b/PBS/Animations/Example anims/Move/BITE.txt deleted file mode 100644 index 8749acec7..000000000 --- a/PBS/Animations/Example anims/Move/BITE.txt +++ /dev/null @@ -1,34 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,BITE] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/Crunch - Focus = Target - SetX = 0,2 - SetY = 0,0 - SetZ = 0,27 - SetOpacity = 0,128 - SetOpacity = 2,192 - SetFrame = 3,1 - SetX = 3,1 - SetY = 3,1 - SetOpacity = 3,255 - SetFrame = 4,2 - SetFrame = 5,3 - SetFrame = 6,5 - SetFrame = 7,6 - SetFrame = 8,7 - SetFrame = 9,10 - SetFrame = 10,11 - SetFrame = 11,12 - SetFrame = 12,13 - SetOpacity = 13,128 - - Play = 9,Sword2,80 diff --git a/PBS/Animations/Example anims/Move/BULKUP.txt b/PBS/Animations/Example anims/Move/BULKUP.txt deleted file mode 100644 index 62ed90892..000000000 --- a/PBS/Animations/Example anims/Move/BULKUP.txt +++ /dev/null @@ -1,102 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,BULKUP] -Name = Example anim -NoTarget = true - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/animsheet - Focus = User - SetFrame = 0,15 - SetX = 0,-40 - SetY = 0,6 - SetZ = 0,28 - SetOpacity = 0,200 - SetY = 1,-2 - SetOpacity = 1,150 - SetY = 2,-10 - SetOpacity = 2,100 - SetY = 3,-18 - SetOpacity = 3,50 - SetVisible = 4,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 6,15 - SetX = 6,80 - SetY = 6,6 - SetZ = 6,27 - SetOpacity = 6,200 - SetY = 7,-2 - SetOpacity = 7,150 - SetY = 8,-10 - SetOpacity = 8,100 - SetY = 9,-18 - SetOpacity = 9,50 - SetVisible = 10,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 6,15 - SetX = 6,-40 - SetY = 6,6 - SetZ = 6,28 - SetOpacity = 6,200 - SetY = 7,-2 - SetOpacity = 7,150 - SetY = 8,-10 - SetOpacity = 8,100 - SetY = 9,-18 - SetOpacity = 9,50 - SetVisible = 10,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 12,15 - SetX = 12,80 - SetY = 12,6 - SetZ = 12,27 - SetOpacity = 12,200 - SetY = 13,-2 - SetOpacity = 13,150 - SetY = 14,-10 - SetOpacity = 14,100 - SetY = 15,-18 - SetOpacity = 15,50 - SetVisible = 16,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 12,15 - SetX = 12,-40 - SetY = 12,6 - SetZ = 12,28 - SetOpacity = 12,200 - SetY = 13,-2 - SetOpacity = 13,150 - SetY = 14,-10 - SetOpacity = 14,100 - SetY = 15,-18 - SetOpacity = 15,50 - SetVisible = 16,false - - Graphic = Examples/animsheet - Focus = User - SetFrame = 0,15 - SetX = 0,80 - SetY = 0,6 - SetZ = 0,27 - SetOpacity = 0,200 - SetY = 1,-2 - SetOpacity = 1,150 - SetY = 2,-10 - SetOpacity = 2,100 - SetY = 3,-18 - SetOpacity = 3,50 - SetVisible = 4,false - - Play = 0,fog2,80,150 - Play = 6,fog2,80,150 - Play = 12,fog2,80,150 diff --git a/PBS/Animations/Example anims/Move/GROWL.txt b/PBS/Animations/Example anims/Move/GROWL.txt deleted file mode 100644 index 2f5b88c14..000000000 --- a/PBS/Animations/Example anims/Move/GROWL.txt +++ /dev/null @@ -1,132 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,GROWL] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/Growl - Focus = User - SetFrame = 0,1 - SetFlip = 0,true - SetX = 0,57 - SetY = 0,6 - SetZ = 0,29 - SetX = 1,72 - SetY = 1,16 - SetX = 2,88 - SetY = 2,26 - SetX = 3,102 - SetY = 3,37 - SetX = 4,57 - SetY = 4,6 - SetX = 5,72 - SetY = 5,16 - SetX = 6,88 - SetY = 6,26 - SetX = 7,102 - SetY = 7,37 - - Graphic = Examples/Growl - Focus = User - SetX = 0,64 - SetY = 0,-13 - SetZ = 0,27 - SetX = 1,81 - SetX = 2,98 - SetX = 3,115 - SetX = 4,64 - SetX = 5,81 - SetX = 6,98 - SetX = 7,115 - - Graphic = Examples/Growl - Focus = User - SetFrame = 0,1 - SetX = 0,57 - SetY = 0,-19 - SetZ = 0,28 - SetX = 1,72 - SetY = 1,-32 - SetX = 2,88 - SetY = 2,-45 - SetX = 3,102 - SetY = 3,-57 - SetX = 4,57 - SetY = 4,-19 - SetX = 5,72 - SetY = 5,-32 - SetX = 6,88 - SetY = 6,-45 - SetX = 7,102 - SetY = 7,-57 - - PlayUserCry = 0 -#------------------------------- -[OppMove,GROWL] -Name = Example anim - - - - Graphic = Examples/Growl - Focus = User - SetFrame = 0,1 - SetFlip = 0,true - SetX = 0,-58 - SetY = 0,2 - SetZ = 0,28 - SetX = 1,-71 - SetY = 1,-11 - SetX = 2,-84 - SetY = 2,-24 - SetX = 3,-96 - SetY = 3,-36 - SetX = 4,-58 - SetY = 4,2 - SetX = 5,-71 - SetY = 5,-11 - SetX = 6,-84 - SetY = 6,-24 - SetX = 7,-96 - SetY = 7,-36 - - Graphic = Examples/Growl - Focus = User - SetFrame = 0,1 - SetX = 0,-58 - SetY = 0,39 - SetZ = 0,29 - SetX = 1,-71 - SetY = 1,52 - SetX = 2,-84 - SetY = 2,65 - SetX = 3,-96 - SetY = 3,77 - SetX = 4,-58 - SetY = 4,39 - SetX = 5,-71 - SetY = 5,52 - SetX = 6,-84 - SetY = 6,65 - SetX = 7,-96 - SetY = 7,77 - - Graphic = Examples/Growl - Focus = User - SetFlip = 0,true - SetX = 0,-58 - SetY = 0,14 - SetZ = 0,27 - SetX = 1,-73 - SetX = 2,-88 - SetX = 3,-103 - SetX = 4,-58 - SetX = 5,-73 - SetX = 6,-88 - SetX = 7,-103 - - PlayUserCry = 0 diff --git a/PBS/Animations/Example anims/Move/POUND.txt b/PBS/Animations/Example anims/Move/POUND.txt deleted file mode 100644 index 1b8710a74..000000000 --- a/PBS/Animations/Example anims/Move/POUND.txt +++ /dev/null @@ -1,40 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,POUND] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/many - Focus = Target - SetFrame = 3,20 - SetX = 3,8 - SetY = 3,-2 - SetZ = 3,28 - SetOpacity = 4,100 - SetVisible = 5,false - - Graphic = Examples/many - Focus = Target - SetFrame = 0,17 - SetX = 0,0 - SetY = 0,-2 - SetZ = 0,27 - SetOpacity = 0,100 - SetOpacity = 1,255 - SetZoomX = 2,120 - SetZoomY = 2,120 - SetZoomX = 3,130 - SetZoomY = 3,130 - SetZoomX = 4,110 - SetZoomY = 4,110 - SetFrame = 5,19 - SetZoomX = 5,100 - SetZoomY = 5,100 - SetOpacity = 5,100 - - Play = 0,Blow1,80 diff --git a/PBS/Animations/Fighting/Bulk Up.txt b/PBS/Animations/Fighting/Bulk Up.txt new file mode 100644 index 000000000..da9c956e7 --- /dev/null +++ b/PBS/Animations/Fighting/Bulk Up.txt @@ -0,0 +1,19 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,BULKUP] +Name = Essentials +NoTarget = true + + MoveZoomX = 0,7,150 + MoveZoomY = 0,7,50 + SetZoomX = 8,175 + MoveZoomX = 8,7,50 + MoveZoomY = 8,7,150 + MoveZoomX = 16,3,100 + MoveZoomY = 16,3,100 + MoveZoomX = 20,3,150 + MoveZoomY = 20,3,150 + MoveZoomX = 24,3,100 + MoveZoomY = 24,3,100 + + Play = 0,Fighting/Bulk Up diff --git a/PBS/Animations/Ghost/Astonish.txt b/PBS/Animations/Ghost/Astonish.txt new file mode 100644 index 000000000..5a87af4d8 --- /dev/null +++ b/PBS/Animations/Ghost/Astonish.txt @@ -0,0 +1,161 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,ASTONISH] +Name = Essentials + + FoeInvertX = true + FoeInvertY = true + MoveX = 0,2,48 + MoveX = 6,2,0 + + FoeInvertX = true + MoveZoomY = 4,3,125 + MoveZoomY = 8,3,100 + + Graphic = Ghost/Astonish hit + Focus = Target + SetY = 7,-32 + SetZ = 7,10 + SetZoomX = 7,0 + SetZoomY = 7,0 + SetOpacity = 7,0 + SetColorRed = 7,248 + SetColorGreen = 7,248 + SetColorBlue = 7,32 + MoveOpacity = 7,3,255 + MoveColorAlpha = 7,3,255 + MoveZoomX = 7,5,160 + MoveZoomY = 7,5,160 + MoveOpacity = 10,2,0 + SetVisible = 12,false + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,-28 + SetY = 7,-36 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveY = 7,6,-69,EaseOut + MoveX = 7,9,-102 + MoveY = 13,3,-54,EaseIn + MoveOpacity = 13,3,0 + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,-12 + SetY = 7,-29 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveY = 7,6,-124,EaseOut + MoveX = 7,9,-52 + MoveY = 13,3,-101,EaseIn + MoveOpacity = 13,3,0 + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,-5 + SetY = 7,-31 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveY = 7,6,-108,EaseOut + MoveX = 7,9,21 + MoveY = 13,3,-90,EaseIn + MoveOpacity = 13,3,0 + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,-5 + SetY = 7,-31 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveY = 7,7,-97,EaseOut + MoveX = 7,10,81 + MoveY = 14,3,-85,EaseIn + MoveOpacity = 14,3,0 + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,-5 + SetY = 7,-31 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveY = 7,7,-142,EaseOut + MoveX = 7,10,-18 + MoveY = 14,3,-122,EaseIn + MoveOpacity = 14,3,0 + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,-4 + SetY = 7,-24 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveY = 7,6,-130,EaseOut + MoveX = 7,9,85 + MoveY = 13,3,-104,EaseIn + MoveOpacity = 13,3,0 + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,-5 + SetY = 7,-31 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveY = 7,6,-95,EaseOut + MoveX = 7,10,-124 + MoveY = 13,4,-79,EaseIn + MoveOpacity = 14,3,0 + + Graphic = Ghost/Astonish spark + Focus = Target + SetX = 7,3 + SetY = 7,-33 + SetZ = 7,5 + SetZoomX = 7,15 + SetZoomY = 7,15 + SetOpacity = 7,0 + MoveOpacity = 7,1,255 + MoveZoomX = 7,4,30 + MoveZoomY = 7,4,30 + MoveX = 7,6,68 + MoveY = 7,6,-63,EaseOut + MoveX = 13,3,105 + MoveY = 13,3,-56,EaseIn + MoveOpacity = 13,3,0 + + Play = 2,Ghost/Astonish diff --git a/PBS/Animations/Normal/Growl.txt b/PBS/Animations/Normal/Growl.txt new file mode 100644 index 000000000..70c02ddd0 --- /dev/null +++ b/PBS/Animations/Normal/Growl.txt @@ -0,0 +1,288 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GROWL] +Name = Essentials + + + FoeInvertX = true + MoveX = 28,1,-2 + MoveX = 29,2,2 + MoveX = 31,2,-2 + MoveX = 33,2,2 + MoveX = 35,1,0 + + Graphic = Normal/Growl ring + Focus = User + SetZ = 0,10 + SetZoomX = 0,0 + SetZoomY = 0,0 + SetOpacity = 0,0 + MoveOpacity = 0,9,248 + MoveColorRed = 0,9,248 + MoveColorGreen = 0,9,64 + MoveColorAlpha = 0,9,255 + MoveZoomX = 0,18,300 + MoveZoomY = 0,18,300 + MoveOpacity = 9,9,0 + SetVisible = 18,false + + Graphic = Normal/Growl ring + Focus = User + SetZ = 0,10 + SetZoomX = 0,0 + SetZoomY = 0,0 + SetOpacity = 0,0 + MoveColorRed = 0,9,248 + MoveColorGreen = 0,9,64 + MoveColorAlpha = 0,9,255 + MoveZoomX = 0,18,270 + MoveZoomY = 0,18,270 + MoveOpacity = 2,7,160 + MoveOpacity = 9,9,0 + SetVisible = 18,false + + Graphic = Normal/Growl ring + Focus = User + SetZ = 0,10 + SetZoomX = 0,0 + SetZoomY = 0,0 + SetOpacity = 0,0 + MoveColorRed = 0,9,248 + MoveColorGreen = 0,9,64 + MoveColorAlpha = 0,9,255 + MoveZoomX = 0,18,240 + MoveZoomY = 0,18,240 + MoveOpacity = 4,5,96 + MoveOpacity = 9,9,0 + SetVisible = 18,false + + Graphic = Normal/Growl zap + Focus = User + SetY = 0,-8 + SetZ = 0,19 + SetZoomX = 0,40 + SetZoomY = 0,50 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorAlpha = 0,248 + MoveOpacity = 0,8,255 + MoveY = 0,12,-138 + MoveZoomX = 0,12,120 + MoveZoomY = 0,12,150 + MoveOpacity = 8,4,0 + SetVisible = 12,false + + Graphic = Normal/Growl zap + Focus = User + SetY = 8,-52 + SetZ = 8,20 + SetZoomX = 8,60 + SetZoomY = 8,75 + SetOpacity = 8,0 + SetColorRed = 8,248 + SetColorGreen = 8,248 + SetColorAlpha = 8,248 + MoveOpacity = 8,4,255 + MoveY = 8,10,-141 + MoveZoomX = 8,10,120 + MoveZoomY = 8,10,150 + MoveOpacity = 12,6,0 + SetVisible = 18,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 0,-3 + SetY = 0,-4 + SetZ = 0,20 + SetZoomX = 0,40 + SetZoomY = 0,50 + SetAngle = 0,60 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorAlpha = 0,248 + MoveOpacity = 0,8,255 + MoveX = 0,12,-124 + MoveY = 0,12,-68 + MoveZoomX = 0,12,120 + MoveZoomY = 0,12,150 + MoveOpacity = 8,4,0 + SetVisible = 12,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 8,-39 + SetY = 8,-26 + SetZ = 8,20 + SetZoomX = 8,60 + SetZoomY = 8,75 + SetAngle = 8,60 + SetOpacity = 8,0 + SetColorRed = 8,248 + SetColorGreen = 8,248 + SetColorAlpha = 8,248 + MoveOpacity = 8,4,255 + MoveX = 8,10,-125 + MoveY = 8,10,-78 + MoveZoomX = 8,10,120 + MoveZoomY = 8,10,150 + MoveOpacity = 12,6,0 + SetVisible = 18,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 0,-3 + SetY = 0,4 + SetZ = 0,20 + SetZoomX = 0,40 + SetZoomY = 0,50 + SetAngle = 0,120 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorAlpha = 0,248 + MoveOpacity = 0,8,255 + MoveX = 0,12,-124 + MoveY = 0,12,68 + MoveZoomX = 0,12,120 + MoveZoomY = 0,12,150 + MoveOpacity = 8,4,0 + SetVisible = 12,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 8,-39 + SetY = 8,26 + SetZ = 8,20 + SetZoomX = 8,60 + SetZoomY = 8,75 + SetAngle = 8,120 + SetOpacity = 8,0 + SetColorRed = 8,248 + SetColorGreen = 8,248 + SetColorAlpha = 8,248 + MoveOpacity = 8,4,255 + MoveX = 8,10,-125 + MoveY = 8,10,78 + MoveZoomX = 8,10,120 + MoveZoomY = 8,10,150 + MoveOpacity = 12,6,0 + SetVisible = 18,false + + Graphic = Normal/Growl zap + Focus = User + SetY = 0,8 + SetZ = 0,20 + SetZoomX = 0,40 + SetZoomY = 0,50 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorAlpha = 0,248 + MoveOpacity = 0,8,255 + MoveY = 0,12,139 + MoveZoomX = 0,12,120 + MoveZoomY = 0,12,150 + MoveOpacity = 8,4,0 + SetVisible = 12,false + + Graphic = Normal/Growl zap + Focus = User + SetY = 8,50 + SetZ = 8,20 + SetZoomX = 8,60 + SetZoomY = 8,75 + SetAngle = 8,180 + SetOpacity = 8,0 + SetColorRed = 8,248 + SetColorGreen = 8,248 + SetColorAlpha = 8,248 + MoveOpacity = 8,4,255 + MoveY = 8,10,141 + MoveZoomX = 8,10,120 + MoveZoomY = 8,10,150 + MoveOpacity = 12,6,0 + SetVisible = 18,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 0,3 + SetY = 0,4 + SetZ = 0,20 + SetZoomX = 0,40 + SetZoomY = 0,50 + SetAngle = 0,240 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorAlpha = 0,248 + MoveOpacity = 0,8,255 + MoveX = 0,12,124 + MoveY = 0,12,68 + MoveZoomX = 0,12,120 + MoveZoomY = 0,12,150 + MoveOpacity = 8,4,0 + SetVisible = 12,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 8,39 + SetY = 8,26 + SetZ = 8,20 + SetZoomX = 8,60 + SetZoomY = 8,75 + SetAngle = 8,240 + SetOpacity = 8,0 + SetColorRed = 8,248 + SetColorGreen = 8,248 + SetColorAlpha = 8,248 + MoveOpacity = 8,4,255 + MoveX = 8,10,125 + MoveY = 8,10,78 + MoveZoomX = 8,10,120 + MoveZoomY = 8,10,150 + MoveOpacity = 12,6,0 + SetVisible = 18,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 0,3 + SetY = 0,-4 + SetZ = 0,20 + SetZoomX = 0,40 + SetZoomY = 0,50 + SetAngle = 0,300 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorAlpha = 0,248 + MoveOpacity = 0,8,255 + MoveX = 0,12,124 + MoveY = 0,12,-68 + MoveZoomX = 0,12,120 + MoveZoomY = 0,12,150 + MoveOpacity = 8,4,0 + SetVisible = 12,false + + Graphic = Normal/Growl zap + Focus = User + SetX = 8,39 + SetY = 8,-26 + SetZ = 8,20 + SetZoomX = 8,60 + SetZoomY = 8,75 + SetAngle = 8,300 + SetOpacity = 8,0 + SetColorRed = 8,248 + SetColorGreen = 8,248 + SetColorAlpha = 8,248 + MoveOpacity = 8,4,255 + MoveX = 8,10,125 + MoveY = 8,10,-78 + MoveZoomX = 8,10,120 + MoveZoomY = 8,10,150 + MoveOpacity = 12,6,0 + SetVisible = 18,false + + PlayUserCry = 0 diff --git a/PBS/Animations/Normal/Growth.txt b/PBS/Animations/Normal/Growth.txt new file mode 100644 index 000000000..0622fc0d7 --- /dev/null +++ b/PBS/Animations/Normal/Growth.txt @@ -0,0 +1,23 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,GROWTH] +Name = Essentials +NoTarget = true + + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,248 + MoveZoomX = 0,4,115 + MoveZoomY = 0,4,115 + MoveColorAlpha = 0,4,96 + MoveZoomX = 5,4,100 + MoveZoomY = 5,4,100 + MoveColorAlpha = 5,4,0 + MoveZoomX = 12,4,115 + MoveZoomY = 12,4,115 + MoveColorAlpha = 12,4,96 + MoveZoomX = 17,4,100 + MoveZoomY = 17,4,100 + MoveColorAlpha = 17,4,0 + + Play = 0,Normal/Growth diff --git a/PBS/Animations/Normal/Pound.txt b/PBS/Animations/Normal/Pound.txt new file mode 100644 index 000000000..b619f72dc --- /dev/null +++ b/PBS/Animations/Normal/Pound.txt @@ -0,0 +1,180 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,POUND] +Name = Essentials + + + FoeInvertX = true + MoveX = 0,1,-2 + MoveX = 1,2,2 + MoveX = 3,2,-2 + MoveX = 5,2,2 + MoveX = 7,1,0 + + Graphic = Normal/Pound hit + Focus = Target + SetZ = 0,10 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,192 + SetColorAlpha = 0,255 + MoveZoomX = 0,5,150 + MoveZoomY = 0,5,150 + MoveColorBlue = 1,1,0 + MoveOpacity = 1,4,0 + SetVisible = 5,false + + Graphic = Normal/Pound spark + Focus = Target + SetX = 0,-11 + SetY = 0,-17 + SetZ = 0,5 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,-94 + MoveY = 0,13,-68,EaseOut + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Pound spark + Focus = Target + SetX = 1,-3 + SetY = 1,-24 + SetZ = 1,5 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetOpacity = 1,0 + SetColorRed = 1,248 + SetColorGreen = 1,248 + SetColorBlue = 1,128 + SetColorAlpha = 1,255 + MoveOpacity = 1,1,255 + MoveX = 1,13,-40 + MoveY = 1,13,-116,EaseOut + MoveZoomX = 5,9,0 + MoveZoomY = 5,9,0 + MoveOpacity = 5,9,0 + MoveColorGreen = 5,9,96,EaseOut + MoveColorBlue = 5,9,32,EaseOut + + Graphic = Normal/Pound spark + Focus = Target + SetX = 0,8 + SetY = 0,-7 + SetZ = 0,5 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,14 + MoveY = 0,13,-89,EaseOut + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Pound spark + Focus = Target + SetX = 1,7 + SetY = 1,-6 + SetZ = 1,5 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetOpacity = 1,0 + SetColorRed = 1,248 + SetColorGreen = 1,248 + SetColorBlue = 1,128 + SetColorAlpha = 1,255 + MoveOpacity = 1,1,255 + MoveX = 1,13,58 + MoveY = 1,13,-108,EaseOut + MoveZoomX = 5,9,0 + MoveZoomY = 5,9,0 + MoveOpacity = 5,9,0 + MoveColorGreen = 5,9,96,EaseOut + MoveColorBlue = 5,9,32,EaseOut + + Graphic = Normal/Pound spark + Focus = Target + SetX = 0,25 + SetY = 0,-4 + SetZ = 0,5 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,87 + MoveY = 0,13,-9,EaseOut + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Pound spark + Focus = Target + SetX = 0,18 + SetY = 0,-9 + SetZ = 0,5 + SetZoomX = 0,50 + SetZoomY = 0,50 + SetOpacity = 0,0 + SetColorRed = 0,248 + SetColorGreen = 0,248 + SetColorBlue = 0,128 + SetColorAlpha = 0,255 + MoveOpacity = 0,1,255 + MoveX = 0,13,115 + MoveY = 0,13,-47,EaseOut + MoveZoomX = 4,9,0 + MoveZoomY = 4,9,0 + MoveOpacity = 4,9,0 + MoveColorGreen = 4,9,96,EaseOut + MoveColorBlue = 4,9,32,EaseOut + SetVisible = 13,false + + Graphic = Normal/Pound spark + Focus = Target + SetX = 1,-3 + SetY = 1,-5 + SetZ = 1,5 + SetZoomX = 1,50 + SetZoomY = 1,50 + SetOpacity = 1,0 + SetColorRed = 1,248 + SetColorGreen = 1,248 + SetColorBlue = 1,128 + SetColorAlpha = 1,255 + MoveOpacity = 1,1,255 + MoveX = 1,13,-112 + MoveY = 1,13,-26,EaseOut + MoveZoomX = 5,9,0 + MoveZoomY = 5,9,0 + MoveOpacity = 5,9,0 + MoveColorGreen = 5,9,96,EaseOut + MoveColorBlue = 5,9,32,EaseOut + + Play = 0,Normal/Pound diff --git a/PBS/Animations/Normal/Tackle.txt b/PBS/Animations/Normal/Tackle.txt index d69447b50..2bd3a66c1 100644 --- a/PBS/Animations/Normal/Tackle.txt +++ b/PBS/Animations/Normal/Tackle.txt @@ -17,7 +17,7 @@ Name = Essentials MoveX = 9,2,2 MoveX = 11,1,0 - Graphic = Normal/Tackle hit 1 + Graphic = Normal/Tackle hit Focus = Target SetZ = 4,10 SetZoomX = 4,75 @@ -30,8 +30,9 @@ Name = Essentials MoveZoomY = 4,1,100 SetVisible = 5,false - Graphic = Normal/Tackle hit 2 + Graphic = Normal/Tackle hit Focus = Target + SetFrame = 5,1 SetZ = 5,10 SetZoomX = 5,60 SetZoomY = 5,60 From aef67341d205cacb71b332b8a1a3f76299f456aa Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 27 Apr 2024 00:18:16 +0100 Subject: [PATCH 43/49] Minor tweaks and fixes --- .../904_Anim Editor/001_AnimationEditor.rb | 35 +++++++++--------- .../904_Anim Editor/010_AnimationSelector.rb | 2 +- .../905_Anim player/010_Battle code.rb | 6 +-- animmaker.exe | Bin 10240 -> 0 bytes animmaker.txt | 26 ------------- 5 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 animmaker.exe delete mode 100644 animmaker.txt diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index dfa097f42..ad151aeb8 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -71,20 +71,20 @@ class AnimationEditor # This list of animations was gathered manually by looking at all instances of # pbCommonAnimation. COMMON_ANIMATIONS = [ - "Attract", "BanefulBunker", "BeakBlast", "Bind", "Burn", - "Clamp", "Confusion", "CraftyShield", "EatBerry", "ElectricTerrain", - "FireSpin", "FocusPunch", "Frozen", "GrassyTerrain", "Hail", - "HarshSun", "HealingWish", "HealthDown", "HealthUp", "HeavyRain", - "Infestation", "KingsShield", "LeechSeed", "LevelUp", "LunarDance", - "MagmaStorm", "MegaEvolution", "MegaEvolution2", "MistyTerrain", "Obstruct", - "Octolock", "Paralysis", "ParentalBond", "Poison", "Powder", - "PrimalGroudon", "PrimalGroudon2", "PrimalKyogre", "PrimalKyogre2", "Protect", - "PsychicTerrain", "QuickGuard", "Rain", "Rainbow", "RainbowOpp", - "Sandstorm", "SandTomb", "SeaOfFire", "SeaOfFireOpp", "Shadow", - "ShadowSky", "ShellTrap", "Shiny", "Sleep", "SpikyShield", - "StatDown", "StatUp", "StrongWinds", "Sun", "SuperShiny", - "Swamp", "SwampOpp", "Toxic", "UseItem", "WideGuard", - "Wrap" + "AquaRing", "Attract", "BanefulBunker", "BeakBlast", "Bind", + "Burn", "Clamp", "Confusion", "CraftyShield", "Curse", + "EatBerry", "ElectricTerrain", "FireSpin", "FocusPunch", "Frozen", + "GrassyTerrain", "Hail", "HarshSun", "HealingWish", "HealthDown", + "HealthUp", "HeavyRain", "Infestation", "Ingrain", "KingsShield", + "LeechSeed", "LevelUp", "LunarDance", "MagmaStorm", "MegaEvolution", + "MegaEvolution2", "MistyTerrain", "Nightmare", "Obstruct", "Octolock", + "Paralysis", "ParentalBond", "Poison", "Powder", "PrimalGroudon", + "PrimalGroudon2", "PrimalKyogre", "PrimalKyogre2", "Protect", "PsychicTerrain", + "QuickGuard", "Rain", "Rainbow", "RainbowOpp", "Sandstorm", + "SandTomb", "SeaOfFire", "SeaOfFireOpp", "Shadow", "ShadowSky", + "ShellTrap", "Shiny", "Sleep", "SpikyShield", "StatDown", + "StatUp", "StrongWinds", "Sun", "SuperShiny", "Swamp", + "SwampOpp", "Toxic", "UseItem", "WideGuard", "Wrap" ] DELETABLE_COMMAND_PANE_PROPERTIES = [ :x, :y, :z, :frame, :visible, :opacity, :zoom_x, :zoom_y, :angle, :flip, :blending @@ -368,7 +368,7 @@ class AnimationEditor anim_properties.add_labelled_checkbox(:opp_variant, _INTL("User is opposing?"), false) anim_properties.add_labelled_text_box_dropdown_list(:move, "", [], "") move_ctrl = anim_properties.get_control(:move) - move_ctrl.max_rows = 16 + move_ctrl.max_rows = 18 anim_properties.add_labelled_number_text_box(:version, _INTL("Version"), 0, 99, 0) anim_properties.add_labelled_text_box(:name, _INTL("Name"), "") anim_properties.add_labelled_text_box(:pbs_path, _INTL("PBS filepath"), "") @@ -415,10 +415,10 @@ class AnimationEditor editor_settings.add_labelled_dropdown_list(:canvas_bg, _INTL("Background graphic"), {}, "") editor_settings.add_labelled_dropdown_list(:user_sprite_name, _INTL("User graphic"), {}, "") ctrl = editor_settings.get_control(:user_sprite_name) - ctrl.max_rows = 14 + ctrl.max_rows = 16 editor_settings.add_labelled_dropdown_list(:target_sprite_name, _INTL("Target graphic"), {}, "") ctrl = editor_settings.get_control(:target_sprite_name) - ctrl.max_rows = 14 + ctrl.max_rows = 16 editor_settings.add_button(:close, _INTL("Close")) editor_settings.visible = false end @@ -658,6 +658,7 @@ class AnimationEditor next if !hash[:refresh_value] hash[:refresh_value].call(component.get_control(property), self) end + component.repaint # Enable/disable property delete buttons deletable_properties = AnimationEditor::SidePanes.get_pane(component_sym)[:deletable_properties] if deletable_properties diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index c794560f1..ca5cb1233 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -17,7 +17,7 @@ class AnimationEditor::AnimationSelector MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 2 MOVES_LIST_Y = TYPE_BUTTONS_Y + 2 MOVES_LIST_WIDTH = 200 + (UIControls::List::BORDER_THICKNESS * 2) - MOVES_LIST_HEIGHT = (26 * UIControls::List::ROW_HEIGHT) + (UIControls::List::BORDER_THICKNESS * 2) + MOVES_LIST_HEIGHT = (29 * UIControls::List::ROW_HEIGHT) + (UIControls::List::BORDER_THICKNESS * 2) ANIMATIONS_LIST_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 4 ANIMATIONS_LIST_Y = MOVES_LIST_Y diff --git a/Data/Scripts/905_Anim player/010_Battle code.rb b/Data/Scripts/905_Anim player/010_Battle code.rb index 548512951..31d67971e 100644 --- a/Data/Scripts/905_Anim player/010_Battle code.rb +++ b/Data/Scripts/905_Anim player/010_Battle code.rb @@ -4,7 +4,7 @@ class Battle::Scene ANIMATION_DEFAULTS = [:TACKLE, :DEFENSECURL] # With target, without target ANIMATION_DEFAULTS_FOR_TYPE_CATEGORY = { - :NORMAL => [:TACKLE, :SONICBOOM, :DEFENSECURL, :EXPLOSION, :SWIFT, :TAILWHIP], + :NORMAL => [:TACKLE, :SONICBOOM, :DEFENSECURL, :BODYSLAM, nil, :TAILWHIP], :FIGHTING => [:MACHPUNCH, :AURASPHERE, :BULKUP, nil, nil, nil], :FLYING => [:WINGATTACK, :GUST, :ROOST, nil, :AIRCUTTER, :FEATHERDANCE], :POISON => [:POISONSTING, :SLUDGE, :ACIDARMOR, nil, :ACID, :POISONPOWDER], @@ -15,10 +15,10 @@ class Battle::Scene :STEEL => [:IRONHEAD, :MIRRORSHOT, :IRONDEFENSE, nil, nil, :METALSOUND], :FIRE => [:FIREPUNCH, :EMBER, :SUNNYDAY, nil, :INCINERATE, :WILLOWISP], :WATER => [:CRABHAMMER, :WATERGUN, :AQUARING, nil, :SURF, :WATERSPORT], - :GRASS => [:VINEWHIP, :MAGICALLEAF, :COTTONGUARD, :RAZORLEAF, nil, :SPORE], + :GRASS => [:VINEWHIP, :RAZORLEAF, :COTTONGUARD, nil, nil, :SPORE], :ELECTRIC => [:THUNDERPUNCH, :THUNDERSHOCK, :CHARGE, nil, :DISCHARGE, :THUNDERWAVE], :PSYCHIC => [:ZENHEADBUTT, :CONFUSION, :CALMMIND, nil, :SYNCHRONOISE, :MIRACLEEYE], - :ICE => [:ICEPUNCH, :ICEBEAM, :MIST, nil, :POWDERSNOW, :HAIL], + :ICE => [:ICEPUNCH, :ICEBEAM, :MIST, :AVALANCHE, :POWDERSNOW, :HAIL], :DRAGON => [:DRAGONCLAW, :DRAGONRAGE, :DRAGONDANCE, nil, :TWISTER, nil], :DARK => [:KNOCKOFF, :DARKPULSE, :HONECLAWS, nil, :SNARL, :EMBARGO], :FAIRY => [:TACKLE, :FAIRYWIND, :MOONLIGHT, nil, :DAZZLINGGLEAM, :SWEETKISS] diff --git a/animmaker.exe b/animmaker.exe deleted file mode 100644 index 6977937ac7604ff237dea02d89c88f89b8f71830..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10240 zcmeHNeQX@Zb$_$Fcei)PJ8|zMiZmsADeB`SnJ0>ttdB|#DUzZXkrE?P5+&D>mgI`O z>h6}_T~ee4wNwGucH;(ikf5mgkvMUYCTR-;H4>*EfP)$+iZpEsqy?P1s(~6t+dpa) zO^di6Qh#rD_wFbPj$6P$3S>?@``(*3?|Wu;mm0nJ0;xo#;ktX5=r!EA^~(N(yA=#) zANu_)y_)<^$7^EbI~@~qCC{99omtnanA29Z>iFiAZMq9pvs5()PLG=vXT~mOGO4Yh z=&?bf5uwu5wZ#*WwznxO(n2RPL5T;{Pksz{#(QybXX2&=b_0_3^PN_3fzC~(-WXA{ z{8zt+Xuv``4kOY~deyl^PET_$Q;Mfi}2NdymSO$T0c5Y(b?FZsC7JcJHokw1WH z%_O>9bUk+(6lq&808Z2vTn()k))!s7?0`|)dKrW4%XVB1t(WLn11iB@jw>45rcjLL z3PfLMAripX)uPWFAFlnPQb0MSAWXdh8JeQSvRXFg!R*ux*rd@e%6AKCC&mp@t}|O| zH^p~Fbg(gbWoMQ=q? zGmNo~0%fRBp7srKK@y#-`Q&B6bAxSQ#(cL%&tM!l+stG&M-EbvYPlownxS=VUSpRe z$0(86{RvVFke^B?9JrP$rIo<$10iwb0H2HWoJVjc#LddN(C@ z$vE)JG}hBr%oi;CDr6(ZYh}kN626F!%YL&u+joy&rVb!M6w>wkhrUl01jtN4cqmc``*28Bw&AI0Vp4vqZA|4`- z`r8T$ipwAs4&q-r(S;Of&K8JB?UrDt1hFpKyAxDFgb_%#4HXtoc@U6FQ{3GT{mwQZ zTpn2?d-%UtSxeJF=m(>FlE*n+nItd5cwS2wnuDDoMJ@T*!Cw!!&PH7Mc-)5K+VVViMV^Uj_GmNsbk5wizOX#rl1UU6F1^U!qAPRk@Db4+`%>jcXmHO zwec3T#xXKt8z=LzxDj)ogS-NkQd~MXdKU+kzHzcCuDidoY9zxWbh{^?Cii#P1|!{& z7`ok-ZweD;G_4xIBwp=1rBQEDB9Fp1GFXn(H^KqJIfrW_EZ>F;bxSA+Ky~_KA)WJ! zjZ5;6fOZiV9F?uTTc_tSh!7%=pDqQN&#yDqbv;Gyd+Z8SqNWy=8hEP?{#qUU>pIxL zFreOVTD4AXPeu#{6lQAsK{i!sxs{3+;9orLq59(}uY~h3hV#t_zXI!X&4n&t8I+5L zib=|JIz?uPo3CSU%_ofb!_7u~S2y1qz9J8 z1fqCRaC{%2T(+gf$T<5z#BD!r1uO@o#z?n65g3h)GTr`o2*(WY85-m~3bqRmU7j>z zKn{dRNN>Fu(poRdBM#U>aNu?*xbftWMKZKHhe2VjDDJe8HsW_Qw(#)#ckbRbl1T?U ze%$#f$#Z+Xk;1tm9ng(bbhLn+tdo-wnG7eRcX5CBfgS{uPrGt(qt2ftDkBDyxH`vuw^W_=c<2qp%twwp&yLeU z7{^;`=g`^V0o+djpMC#cJ3#iK#Lg&9p~ic-Ej59BYRq2Cuu&8`?`ZmAB~-ag3g%uPN`~;9>Y- z`eWq@+856HzLFA$=v^g`KBu;!-=aP!Uc~5D^vBd)=ufJ9#a>Vji1qZidPKZLpHj!f zSLpNVSJ{;qbVps3li8gAAy#wD{V;9*Y^lcJu3*jzFc?7)>$7BBqp0U_b8jw*cqB4p~5qUnK z+@jy0uhI`_KwK5`;#u)I@nxYa3NoYONAwLuljwEA*%rboR=+vAzr@Rj*L1p3uXH;vZ|#@ z#ky*{MSIDn<9I8#Y0UO*_cZlk$nr~0m4++Utle)-&tWWhb*G9q?YQOA6pb%?zFncy zQ$J%*`!qaI^5z}Snkw6LrBt@7EH7Xw4!G7eY}RxJj8=7)Iar;`^NQ2H7jytr(A|GSnL&t?5gdSrfH<)`Iq+wn!LJ9FL2dkgXIj%UB28y z=WXli8T$%ss!rQ<4VY_R@hEW04&p!~jx{4A5;-;G0XLAkcO*% z4IXp6l3!Z1nbz;xmd^|gb9m}0i0Gdym1m@qS^@?v-=a~gRE;#AS*ZG@ie2n?D)We! zJ8rv+rD@xvfFQGW#x7e+67u?d9FtQEzD?moX2Z}_sa*1x>!Y<|pe0(SYo!@~j^^yr z>>LtX4=%#VxjAQ*7oc%?u)2UGa>g+bVaO)1A=?i}qwMxCxQMMU1x#2j)Ook$+dN8x z)y0zQR4W|V!KIQAt8GSP|6g;D0$DfN!+>@G?g6|5a0xO@a5&`SZb^87Dl{dfisg?^&pdQ` z(C_0~lonR0LGzBl2a{&NhnO~4X=B@9yRn@U?HtCF;AxBwHbkKiMqsD(H}IS`Sn#t1 z-z=%q0fq0*derGS#W|5&|LqtFF`pMwp7XRK!#*u5d; zMZn91!_7rqhM(8qh1fX=U7Y%PnRFBMEBBd?m*l6vcI3VRd5ki6(>OvM)P-N)nvgZ- zH864-A+{llL&mwTS3|H4r!mIHve8lC>eX6=sZ|7ar_>i|U(3hqIjHHQc*|Tn9?984 zfef?e1Fv>JOepUoQD|pS{Sg)=;C^yVa0R8vE1Op+mtqjuXkM@axjc4Ylq1Nqf?re; zk^QDj&VrN@&F2VCLo(~1U6s0sWA&Ph?B?a-BmS10eXm~LKP#{zl2Nyk^Ry&0vMl@h zUcgyu+zohX6tIWQOF6vU4$-5S%YC#nb6lQ+2RrZad>peHmn-kv96wt|p0%*wCQ6t0 zs4^ff=3sYR0L=Rq=P0PCNK1rAUaid;S8lxu?v32N`QUn*#|BhE?61J0GBR)pny=s& zWW~cK5LD?FShIxptu1)>?nZB7c{0YE$6krob5M_I!2hTmZ;UO|AH|l#a`uE49|5%1 zqyPK5=xMP1|7%R@YuUs%AqUlHqTV@5{4BtGPjJ@q2%q?kmCalEG-AMOF;P z`niUBccdJyEZ)+29sloZXm!Oj#{I))_kNl8P#0p)m|Q8I+%pF06iwjC;7rY{$L89fE@QMdqXCVYC}XDOmrzW3Fx>znh(zwqDga>>bjo%C-!_0#9t z_Pza_63^!QHQ^ZV>+ni01s^>bgS$qb=4VaSa(6dPra%vOP#b#&`LQj~QkZKbmt0jby z36<%IfLTw3(xu`qkr!atD{^fT-;eKd!1n`(&3S?en{X-V4Y@9{!8pohWfEGhEw?$~ zQXsC6sk*5sd1}rJwvlZiV-TQ%9%kh>$4$i;)pbUUQMPnb!c?FwkH0m=SYB>8w^_kJ zHmi})v(Tz1NE6vjn>K+UbS7m5BTt^TqJ)3LNWnyy6xhDe}3lv#=J(1ZkZpa|umcw)f(M-Ulm7DAXj9+;gGV`Q2 zA<((a_$Z$-R-W6IFtUNHTr=czgFh=b^_VI{0m)j63f= zyaxsC745g7QotsDHsM`q_CAuHl|1~=9sKs;#OJSk597O=sPPYAKl8AIvz+-=dQ9+k zqX6r?=fKPFk9AwRvGdn2e7eI|Xn_dvZW+AYSg`*TJdkfo(jz_t>JRqOD+%E#i0vA| zyjk#- - - - - - - - - - - - - From dba28332f22038a8a32527a68ef49674e3c98aa1 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 4 May 2024 19:17:23 +0100 Subject: [PATCH 44/49] Anim Editor: added basic particle spawner functionality and graphic frame randomiser --- .../Control elements/001_BaseControl.rb | 7 +- .../902_Anim GameData/001_Animation.rb | 117 ++++++++++-------- .../003_AnimationEditor_side_panes.rb | 31 +++++ .../Anim Editor elements/001_Canvas.rb | 21 ++-- .../905_Anim player/001_Anim player.rb | 88 ++++++++++--- .../905_Anim player/003_AnimPlayerHelper.rb | 44 +++++++ 6 files changed, 230 insertions(+), 78 deletions(-) diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index 3c5926510..aef513672 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -34,6 +34,11 @@ class UIControls::BaseControl < BitmapSprite return self.bitmap.height end + def visible=(value) + super + @captured_area = nil if !self.visible + end + #----------------------------------------------------------------------------- def mouse_pos @@ -83,7 +88,7 @@ class UIControls::BaseControl < BitmapSprite end def busy? - return !@captured_area.nil? + return self.visible && !@captured_area.nil? end def changed? diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index 12687a0f3..d358ea3d6 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -44,6 +44,11 @@ module GameData "EaseOut" => :ease_out } USER_AND_TARGET_SEPARATION = [200, -200, -100] # x, y, z (from user to target) + SPAWNER_TYPES = { + "None" => :none, + "RandomDirection" => :random_direction, + "RandomDirectionGravity" => :random_direction_gravity + } # Properties that apply to the animation in general, not to individual # particles. They don't change during the animation. @@ -62,62 +67,69 @@ module GameData # These properties cannot be changed partway through the animation. # NOTE: "Name" isn't a property here, because the particle's name comes # from the "Particle" property above. - "Graphic" => [:graphic, "s"], - "Focus" => [:focus, "e", FOCUS_TYPES], - "FoeInvertX" => [:foe_invert_x, "b"], - "FoeInvertY" => [:foe_invert_y, "b"], - "FoeFlip" => [:foe_flip, "b"], + "Graphic" => [:graphic, "s"], + "Focus" => [:focus, "e", FOCUS_TYPES], + "FoeInvertX" => [:foe_invert_x, "b"], + "FoeInvertY" => [:foe_invert_y, "b"], + "FoeFlip" => [:foe_flip, "b"], + "Spawner" => [:spawner, "e", SPAWNER_TYPES], + "SpawnQuantity" => [:spawn_quantity, "v"], + "RandomFrameMax" => [:random_frame_max, "u"], # All properties below are "SetXYZ" or "MoveXYZ". "SetXYZ" has the # keyframe and the value, and "MoveXYZ" has the keyframe, duration and the # value. All have "^" in their schema. "SetXYZ" is turned into "MoveXYZ" # when compiling by inserting a duration (second value) of 0. - "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet - "MoveFrame" => [:frame, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 - "SetFlip" => [:flip, "^ub"], - "SetX" => [:x, "^ui"], - "MoveX" => [:x, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetY" => [:y, "^ui"], - "MoveY" => [:y, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetZ" => [:z, "^ui"], - "MoveZ" => [:z, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetZoomX" => [:zoom_x, "^uu"], - "MoveZoomX" => [:zoom_x, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetZoomY" => [:zoom_y, "^uu"], - "MoveZoomY" => [:zoom_y, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetAngle" => [:angle, "^ui"], - "MoveAngle" => [:angle, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetVisible" => [:visible, "^ub"], - "SetOpacity" => [:opacity, "^uu"], - "MoveOpacity" => [:opacity, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorRed" => [:color_red, "^ui"], - "MoveColorRed" => [:color_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorGreen" => [:color_green, "^ui"], - "MoveColorGreen" => [:color_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorBlue" => [:color_blue, "^ui"], - "MoveColorBlue" => [:color_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetColorAlpha" => [:color_alpha, "^ui"], - "MoveColorAlpha" => [:color_alpha, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneRed" => [:tone_red, "^ui"], - "MoveToneRed" => [:tone_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneGreen" => [:tone_green, "^ui"], - "MoveToneGreen" => [:tone_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneBlue" => [:tone_blue, "^ui"], - "MoveToneBlue" => [:tone_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], - "SetToneGray" => [:tone_gray, "^ui"], - "MoveToneGray" => [:tone_gray, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetFrame" => [:frame, "^uu"], # Frame within the graphic if it's a spritesheet + "MoveFrame" => [:frame, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetBlending" => [:blending, "^uu"], # 0, 1 or 2 + "SetFlip" => [:flip, "^ub"], + "SetX" => [:x, "^ui"], + "MoveX" => [:x, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetY" => [:y, "^ui"], + "MoveY" => [:y, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZ" => [:z, "^ui"], + "MoveZ" => [:z, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZoomX" => [:zoom_x, "^uu"], + "MoveZoomX" => [:zoom_x, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetZoomY" => [:zoom_y, "^uu"], + "MoveZoomY" => [:zoom_y, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetAngle" => [:angle, "^ui"], + "MoveAngle" => [:angle, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetVisible" => [:visible, "^ub"], + "SetOpacity" => [:opacity, "^uu"], + "MoveOpacity" => [:opacity, "^uuuE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorRed" => [:color_red, "^ui"], + "MoveColorRed" => [:color_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorGreen" => [:color_green, "^ui"], + "MoveColorGreen" => [:color_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorBlue" => [:color_blue, "^ui"], + "MoveColorBlue" => [:color_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetColorAlpha" => [:color_alpha, "^ui"], + "MoveColorAlpha" => [:color_alpha, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneRed" => [:tone_red, "^ui"], + "MoveToneRed" => [:tone_red, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneGreen" => [:tone_green, "^ui"], + "MoveToneGreen" => [:tone_green, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneBlue" => [:tone_blue, "^ui"], + "MoveToneBlue" => [:tone_blue, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], + "SetToneGray" => [:tone_gray, "^ui"], + "MoveToneGray" => [:tone_gray, "^uuiE", nil, nil, nil, INTERPOLATION_TYPES], # These properties are specifically for the "SE" particle. - "Play" => [:se, "^usUU"], # Filename, volume, pitch - "PlayUserCry" => [:user_cry, "^uUU"], # Volume, pitch - "PlayTargetCry" => [:target_cry, "^uUU"] # Volume, pitch + "Play" => [:se, "^usUU"], # Filename, volume, pitch + "PlayUserCry" => [:user_cry, "^uUU"], # Volume, pitch + "PlayTargetCry" => [:target_cry, "^uUU"] # Volume, pitch } PARTICLE_DEFAULT_VALUES = { - :name => "", - :graphic => "", - :focus => :foreground, - :foe_invert_x => false, - :foe_invert_y => false, - :foe_flip => false + :name => "", + :graphic => "", + :focus => :foreground, + :foe_invert_x => false, + :foe_invert_y => false, + :foe_flip => false, + :spawner => :none, + :spawn_quantity => 1, + :random_frame_max => 0 + } # NOTE: Particles are invisible until their first command, and automatically # become visible then. "User" and "Target" are visible from the start, @@ -315,6 +327,13 @@ module GameData # The User and Target particles have hardcoded graphics/foci, so they # don't need writing to PBS ret = nil if ["User", "Target"].include?(@particles[index][:name]) + when "Spawner" + ret = nil if ret == :none + when "SpawnQuantity" + ret = nil if @particles[index][:spawner].nil? || @particles[index][:spawner] == :none + ret = nil if ret && ret <= 1 + when "RandomFrameMax" + ret = nil if ret == 0 when "AllCommands" # Get translations of all properties to their names as seen in PBS # animation files diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index b9c4cbbbc..37f3af55d 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -524,6 +524,37 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :focus, { } }) +AnimationEditor::SidePanes.add_property(:particle_pane, :random_frame_max, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:random_frame_max, _INTL("Rand. frame"), 0, 99, 0) + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :spawner, { + :new => proc { |pane, editor| + values = { + :none => _INTL("None"), + :random_direction => _INTL("Random direction"), + :random_direction_gravity => _INTL("Random direction gravity") + } + pane.add_labelled_dropdown_list(:spawner, _INTL("Spawner"), values, :none) + } +}) + +AnimationEditor::SidePanes.add_property(:particle_pane, :spawn_quantity, { + :new => proc { |pane, editor| + pane.add_labelled_number_text_box(:spawn_quantity, _INTL("Spawn qty"), 1, 99, 1) + }, + :refresh_value => proc { |control, editor| + spawner = editor.anim[:particles][editor.particle_index][:spawner] + if !spawner || spawner == :none + control.disable + else + control.enable + end + } +}) + AnimationEditor::SidePanes.add_property(:particle_pane, :opposing_label, { :new => proc { |pane, editor| pane.add_label(:opposing_label, _INTL("If on opposing side...")) diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 405f93eae..921043987 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -148,6 +148,14 @@ class AnimationEditor::Canvas < Sprite return true end + def show_particle_sprite?(index) + return false if index < 0 || index >= @anim[:particles].length + particle = @anim[:particles][index] + return false if !particle || particle[:name] == "SE" + return false if particle[:spawner] && particle[:spawner] != :none + return true + end + def selected_particle=(val) return if @selected_particle == val @selected_particle = val @@ -411,12 +419,11 @@ class AnimationEditor::Canvas < Sprite end def get_sprite_and_frame(index, target_idx = -1) + return if !show_particle_sprite?(index) spr = nil frame = nil particle = @anim[:particles][index] case particle[:name] - when "SE" - return when "User" spr = @battler_sprites[user_index] raise _INTL("Sprite for particle {1} not found somehow (battler index {2}).", @@ -442,7 +449,7 @@ class AnimationEditor::Canvas < Sprite def refresh_sprite(index, target_idx = -1) particle = @anim[:particles][index] - return if !particle || particle[:name] == "SE" + return if !show_particle_sprite?(index) relative_to_index = -1 if particle[:focus] != :user_and_target if GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) @@ -519,8 +526,7 @@ class AnimationEditor::Canvas < Sprite end def refresh_particle_frame - return if @selected_particle < 0 || @selected_particle >= @anim[:particles].length || - @anim[:particles][@selected_particle][:name] == "SE" + return if !show_particle_sprite?(@selected_particle) focus = @anim[:particles][@selected_particle][:focus] frame_color = AnimationEditor::ParticleList::CONTROL_BG_COLORS[focus] || Color.magenta @sel_frame_bitmap.outline_rect(1, 1, @sel_frame_bitmap.width - 2, @sel_frame_bitmap.height - 2, frame_color) @@ -552,7 +558,7 @@ class AnimationEditor::Canvas < Sprite if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) refresh_particle(i) # Because there can be multiple targets else - refresh_sprite(i) if particle[:name] != "SE" + refresh_sprite(i) if show_particle_sprite?(i) end end refresh_particle_frame # Intentionally after refreshing particles @@ -708,8 +714,7 @@ class AnimationEditor::Canvas < Sprite end def update_selected_particle_frame - if @selected_particle < 0 || @selected_particle >= @anim[:particles].length || - @anim[:particles][@selected_particle][:name] == "SE" + if !show_particle_sprite?(@selected_particle) @sel_frame_sprite.visible = false return end diff --git a/Data/Scripts/905_Anim player/001_Anim player.rb b/Data/Scripts/905_Anim player/001_Anim player.rb index 14b651197..54d18221a 100644 --- a/Data/Scripts/905_Anim player/001_Anim player.rb +++ b/Data/Scripts/905_Anim player/001_Anim player.rb @@ -82,7 +82,7 @@ class AnimationPlayer #----------------------------------------------------------------------------- - def set_up_particle(particle, target_idx = -1) + def set_up_particle(particle, target_idx = -1, instance = 0) particle_sprite = AnimationPlayer::ParticleSprite.new # Get/create a sprite sprite = nil @@ -127,23 +127,25 @@ class AnimationPlayer particle_sprite.foe_flip = particle[:foe_flip] end # Find earliest command and add a "make visible" command then + delay = AnimationPlayer::Helper.get_particle_delay(particle, instance) if sprite && !particle_sprite.battler_sprite? - first_cmd = -1 - particle.each_pair do |property, cmds| - next if !cmds.is_a?(Array) || cmds.empty? - cmds.each do |cmd| - first_cmd = cmd[0] if first_cmd < 0 || first_cmd > cmd[0] - end + first_cmd = AnimationPlayer::Helper.get_first_command_frame(particle) + particle_sprite.add_set_process(:visible, (first_cmd + delay) * slowdown, true) if first_cmd >= 0 + # Apply random frame + if particle[:random_frame_max] && particle[:random_frame_max] > 0 + particle_sprite.add_set_process(:frame, (first_cmd + delay) * slowdown, rand(particle[:random_frame_max] + 1)) end - particle_sprite.add_set_process(:visible, first_cmd * slowdown, true) if first_cmd >= 0 end # Add all commands + spawner_type = particle[:spawner] || :none + regular_properties_skipped = AnimationPlayer::Helper::PROPERTIES_SET_BY_SPAWNER[spawner_type] || [] particle.each_pair do |property, cmds| next if !cmds.is_a?(Array) || cmds.empty? + next if regular_properties_skipped.include?(property) cmds.each do |cmd| if cmd[1] == 0 if sprite - particle_sprite.add_set_process(property, cmd[0] * slowdown, cmd[2]) + particle_sprite.add_set_process(property, (cmd[0] + delay) * slowdown, cmd[2]) else # SE particle filename = nil @@ -159,31 +161,77 @@ class AnimationPlayer else filename = "Anim/" + cmd[2] end - particle_sprite.add_set_process(property, cmd[0] * slowdown, [filename, cmd[3], cmd[4]]) if filename + particle_sprite.add_set_process(property, (cmd[0] + delay) * slowdown, [filename, cmd[3], cmd[4]]) if filename end else - particle_sprite.add_move_process(property, cmd[0] * slowdown, cmd[1] * slowdown, cmd[2], cmd[3] || :linear) + particle_sprite.add_move_process(property, (cmd[0] + delay) * slowdown, cmd[1] * slowdown, cmd[2], cmd[3] || :linear) end end end + # Add spawner commands + add_spawner_commands(particle_sprite, particle, instance, delay) # Finish up @anim_sprites.push(particle_sprite) end + def add_spawner_commands(particle_sprite, particle, instance, delay) + life_start = AnimationPlayer::Helper.get_first_command_frame(particle) + life_end = AnimationPlayer::Helper.get_last_command_frame(particle) + life_end = AnimationPlayer::Helper.get_duration(particles) if life_end < 0 + lifetime = life_end - life_start + spawner_type = particle[:spawner] || :none + case spawner_type + when :random_direction, :random_direction_gravity + angle = rand(360) + angle = rand(360) if angle >= 180 && spawner_type == :random_direction_gravity # Prefer upwards angles + speed = rand(150, 250) + start_x_speed = speed * Math.cos(angle * Math::PI / 180) + start_y_speed = -speed * Math.sin(angle * Math::PI / 180) + start_x = (start_x_speed * 0.05) + rand(-8, 8) + start_y = (start_y_speed * 0.05) + rand(-8, 8) + # Set initial positions + [:x, :y].each do |property| + offset = (property == :x) ? start_x : start_y + particle[property].each do |cmd| + next if cmd[1] > 0 + particle_sprite.add_set_process(property, (cmd[0] + delay) * slowdown, cmd[2] + offset) + break + end + end + # Set movements + particle_sprite.add_move_process(:x, + (life_start + delay) * slowdown, lifetime * slowdown, + start_x + (start_x_speed * lifetime / 20.0), :linear) + if spawner_type == :random_direction_gravity + particle_sprite.add_move_process(:y, + (life_start + delay) * slowdown, lifetime * slowdown, + [start_y_speed / slowdown, AnimationPlayer::Helper::GRAVITY_STRENGTH.to_f / (slowdown * slowdown)], :gravity) + else + particle_sprite.add_move_process(:y, + (life_start + delay) * slowdown, lifetime * slowdown, + start_y + (start_y_speed * lifetime / 20.0), :linear) + end + end + end + # Creates sprites and ParticleSprites, and sets sprite properties that won't # change during the animation. def set_up particles.each do |particle| - if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) && @targets - one_per_side = [:target_side_foreground, :target_side_background].include?(particle[:focus]) - sides_covered = [] - @targets.each do |target| - next if one_per_side && sides_covered.include?(target.index % 2) - set_up_particle(particle, target.index) - sides_covered.push(target.index % 2) + qty = 1 + qty = particle[:spawn_quantity] || 1 if particle[:spawner] && particle[:spawner] != :none + qty.times do |i| + if GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) && @targets + one_per_side = [:target_side_foreground, :target_side_background].include?(particle[:focus]) + sides_covered = [] + @targets.each do |target| + next if one_per_side && sides_covered.include?(target.index % 2) + set_up_particle(particle, target.index, i) + sides_covered.push(target.index % 2) + end + else + set_up_particle(particle, -1, i) end - else - set_up_particle(particle) end end reset_anim_sprites diff --git a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb index 815773f2b..eab3bd2e1 100644 --- a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb +++ b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb @@ -2,6 +2,11 @@ # Methods used by both AnimationPlayer and AnimationEditor::Canvas. #=============================================================================== module AnimationPlayer::Helper + PROPERTIES_SET_BY_SPAWNER = { + :random_direction => [:x, :y], + :random_direction_gravity => [:x, :y] + } + GRAVITY_STRENGTH = 300 BATTLE_MESSAGE_BAR_HEIGHT = 96 # NOTE: You shouldn't need to change this. module_function @@ -19,6 +24,39 @@ module AnimationPlayer::Helper return ret end + # Returns the frame that the particle has its earliest command. + def get_first_command_frame(particle) + ret = -1 + particle.each_pair do |property, cmds| + next if !cmds.is_a?(Array) || cmds.empty? + cmds.each do |cmd| + ret = cmd[0] if ret < 0 || ret > cmd[0] + end + end + return (ret >= 0) ? ret : 0 + end + + # Returns the frame that the particle has (the end of) its latest command. + def get_last_command_frame(particle) + ret = -1 + particle.each_pair do |property, cmds| + next if !cmds.is_a?(Array) || cmds.empty? + cmds.each do |cmd| + ret = cmd[0] + cmd[1] if ret < cmd[0] + cmd[1] + end + end + return ret + end + + # For spawner particles + def get_particle_delay(particle, instance) + case particle[:spawner] || :none + when :random_direction, :random_direction_gravity + return instance / 4 + end + return 0 + end + #----------------------------------------------------------------------------- def get_xy_focus(particle, user_index, target_index, user_coords, target_coords) @@ -200,6 +238,12 @@ module AnimationPlayer::Helper ret += (end_val - start_val) * (1 - (((-2 * x) + 2) * ((-2 * x) + 2) / 2)) end return ret.round + when :gravity # Used by particle spawner + # end_val is [initial speed, gravity] + # s = ut + 1/2 at^2 + t = now - start_time + ret = start_val + (end_val[0] * t) + (end_val[1] * t * t / 2) + return ret.round end raise _INTL("Unknown interpolation method {1}.", interpolation) end From 8aacfe491f0c8452fe0886bd60296afa9a6c0718 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 4 May 2024 22:20:05 +0100 Subject: [PATCH 45/49] Anim Editor: Particle spawner tweaks --- .../902_Anim GameData/001_Animation.rb | 7 +- .../003_AnimationEditor_side_panes.rb | 13 +- .../904_Anim Editor/901_ParticleDataHelper.rb | 27 +- .../Anim Editor elements/003_ParticleList.rb | 50 ++-- .../905_Anim player/001_Anim player.rb | 39 ++- .../905_Anim player/002_ParticleSprite.rb | 4 + .../905_Anim player/003_AnimPlayerHelper.rb | 13 +- PBS/Animations/Normal/Pound.txt | 137 +--------- PBS/Animations/Normal/Scratch.txt | 245 +----------------- PBS/Animations/Normal/Tackle.txt | 135 +--------- 10 files changed, 119 insertions(+), 551 deletions(-) diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index d358ea3d6..d0cc4320b 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -45,9 +45,10 @@ module GameData } USER_AND_TARGET_SEPARATION = [200, -200, -100] # x, y, z (from user to target) SPAWNER_TYPES = { - "None" => :none, - "RandomDirection" => :random_direction, - "RandomDirectionGravity" => :random_direction_gravity + "None" => :none, + "RandomDirection" => :random_direction, + "RandomDirectionGravity" => :random_direction_gravity, + "RandomUpDirectionGravity" => :random_up_direction_gravity } # Properties that apply to the animation in general, not to individual diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index 37f3af55d..43baad314 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -533,9 +533,10 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :random_frame_max, { AnimationEditor::SidePanes.add_property(:particle_pane, :spawner, { :new => proc { |pane, editor| values = { - :none => _INTL("None"), - :random_direction => _INTL("Random direction"), - :random_direction_gravity => _INTL("Random direction gravity") + :none => _INTL("None"), + :random_direction => _INTL("Random direction"), + :random_direction_gravity => _INTL("Random dir. with gravity"), + :random_up_direction_gravity => _INTL("Random up dir. gravity") } pane.add_labelled_dropdown_list(:spawner, _INTL("Spawner"), values, :none) } @@ -552,6 +553,12 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :spawn_quantity, { else control.enable end + }, + :apply_value => proc { |value, editor| + AnimationEditor::SidePanes.get_pane(:particle_pane)[:apply_value].call(:spawn_quantity, value, editor) + editor.components[:particle_list].change_particle_commands(editor.particle_index) + editor.components[:play_controls].duration = editor.components[:particle_list].duration + editor.refresh } }) diff --git a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb index ac20db455..2e67bbfff 100644 --- a/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb +++ b/Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb @@ -64,7 +64,8 @@ module AnimationEditor::ParticleDataHelper end # Used to determine which keyframes the particle is visible in, which is - # indicated in the timeline by a coloured bar. + # indicated in the timeline by a coloured bar. 0=not visible, 1=visible, + # 2=visible because of spawner delay. # NOTE: Particles are assumed to be not visible at the start of the # animation, and automatically become visible when the particle has # its first command. This does not apply to the "User" and "Target" @@ -75,8 +76,8 @@ module AnimationEditor::ParticleDataHelper raise _INTL("Couldn't get default value for property {1} for particle {2}.", property, particle[:name]) end - value = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[:visible] - value = true if ["User", "Target", "SE"].include?(particle[:name]) + value = GameData::Animation::PARTICLE_KEYFRAME_DEFAULT_VALUES[:visible] ? 1 : 0 + value = 1 if ["User", "Target", "SE"].include?(particle[:name]) ret = [] if !["User", "Target", "SE"].include?(particle[:name]) earliest = duration @@ -84,15 +85,31 @@ module AnimationEditor::ParticleDataHelper next if !value.is_a?(Array) || value.empty? earliest = value[0][0] if earliest > value[0][0] end - ret[earliest] = true + ret[earliest] = 1 end if particle[:visible] - particle[:visible].each { |cmd| ret[cmd[0]] = cmd[2] } + particle[:visible].each { |cmd| ret[cmd[0]] = (cmd[2]) ? 1 : 0 } end duration.times do |i| value = ret[i] if !ret[i].nil? ret[i] = value end + qty = particle[:spawn_quantity] || 1 if particle[:spawner] && particle[:spawner] != :none + if (particle[:spawner] || :none) != :none + qty = particle[:spawn_quantity] || 1 + delay = AnimationPlayer::Helper.get_particle_delay(particle, qty - 1) + if delay > 0 + count = -1 + duration.times do |i| + if ret[i] == 1 # Visible + count = 0 + elsif ret[i] == 0 && count >= 0 && count < delay # Not visible and within delay + ret[i] = 2 + count += 1 + end + end + end + end return ret end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 958f13c74..988d9a4a8 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -518,7 +518,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end sprites_need_changing = ensure_sprites if @duration != old_duration || sprites_need_changing - @keyframe = @keyframe.clamp(0, @duration - 1) + @keyframe = @keyframe.clamp(-1, @duration - 1) @row_index = @row_index.clamp(0, @particle_list.length - 1) create_sprites end @@ -737,7 +737,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl each_visible_keyframe do |i| draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos # Draw bg - if i < @duration - DURATION_BUFFER && visible_cmds[i] + if i < @duration - DURATION_BUFFER && visible_cmds[i] == 1 bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, KEYFRAME_SPACING, ROW_HEIGHT - ROW_SPACING, bg_color) end # Draw hover highlight @@ -772,19 +772,39 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end end next if i >= @duration - DURATION_BUFFER - next if !visible_cmds[i] - # Draw outline outline_color = Color.black - if is_property - outline_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta - end - bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, KEYFRAME_SPACING, 1, outline_color) # Top - bg_spr.bitmap.fill_rect(draw_x, ROW_HEIGHT - 1, KEYFRAME_SPACING, 1, outline_color) # Bottom - if i <= 0 || !visible_cmds[i - 1] - bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, 1, ROW_HEIGHT - ROW_SPACING, outline_color) # Left - end - if i == @duration - DURATION_BUFFER - 1 || (i < @duration - 1 && !visible_cmds[i + 1]) - bg_spr.bitmap.fill_rect(draw_x + KEYFRAME_SPACING, ROW_SPACING, 1, ROW_HEIGHT - ROW_SPACING, outline_color) # Right + case visible_cmds[i] + when 1 # Particle is visible + # Draw outline + if is_property + outline_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta + end + bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, KEYFRAME_SPACING, 1, outline_color) # Top + bg_spr.bitmap.fill_rect(draw_x, ROW_HEIGHT - 1, KEYFRAME_SPACING, 1, outline_color) # Bottom + if i <= 0 || visible_cmds[i - 1] != 1 + bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, 1, ROW_HEIGHT - ROW_SPACING, outline_color) # Left + end + if i == @duration - DURATION_BUFFER - 1 || (i < @duration - 1 && visible_cmds[i + 1] != 1) + bg_spr.bitmap.fill_rect(draw_x + KEYFRAME_SPACING, ROW_SPACING, 1, ROW_HEIGHT - ROW_SPACING, outline_color) # Right + end + when 2 # Particle is a spawner and delays its particles into this frame + if !is_property + # Draw dotted outline + KEYFRAME_SPACING.times do |j| + next if j.odd? + bg_spr.bitmap.fill_rect(draw_x + j, ROW_SPACING, 1, 1, outline_color) # Top + bg_spr.bitmap.fill_rect(draw_x + j, ROW_HEIGHT - 1, 1, 1, outline_color) # Bottom + end + (ROW_HEIGHT - ROW_SPACING).times do |j| + next if j.odd? + if i <= 0 || visible_cmds[i - 1] != 2 + bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING + j, 1, 1, outline_color) # Left + end + if i == @duration - DURATION_BUFFER - 1 || (i < @duration - 1 && visible_cmds[i + 1] != 2) + bg_spr.bitmap.fill_rect(draw_x + KEYFRAME_SPACING, ROW_SPACING + j, 1, 1, outline_color) # Right + end + end + end end end end @@ -1027,7 +1047,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def update_input # Left/right to change current keyframe if Input.triggerex?(:LEFT) || Input.repeatex?(:LEFT) - if @keyframe > 0 + if @keyframe >= 0 @keyframe -= 1 scroll_to_keyframe(@keyframe) set_changed diff --git a/Data/Scripts/905_Anim player/001_Anim player.rb b/Data/Scripts/905_Anim player/001_Anim player.rb index 54d18221a..04e65b005 100644 --- a/Data/Scripts/905_Anim player/001_Anim player.rb +++ b/Data/Scripts/905_Anim player/001_Anim player.rb @@ -21,6 +21,7 @@ class AnimationPlayer @slowdown = 1 @timer_start = nil @anim_sprites = [] # Each is a ParticleSprite + @spawner_sprites = [] @duration = total_duration end @@ -168,41 +169,49 @@ class AnimationPlayer end end end - # Add spawner commands - add_spawner_commands(particle_sprite, particle, instance, delay) # Finish up @anim_sprites.push(particle_sprite) + @spawner_sprites.push([particle_sprite, particle, target_idx, instance, delay]) if spawner_type != :none end - def add_spawner_commands(particle_sprite, particle, instance, delay) + def add_spawner_commands(particle_sprite, particle, target_idx, instance, delay, add_as_spawner = true) + spawner_type = particle[:spawner] || :none + return if spawner_type == :none + @spawner_sprites.push([particle_sprite, particle, target_idx, instance, delay]) if add_as_spawner life_start = AnimationPlayer::Helper.get_first_command_frame(particle) life_end = AnimationPlayer::Helper.get_last_command_frame(particle) life_end = AnimationPlayer::Helper.get_duration(particles) if life_end < 0 lifetime = life_end - life_start - spawner_type = particle[:spawner] || :none case spawner_type - when :random_direction, :random_direction_gravity - angle = rand(360) - angle = rand(360) if angle >= 180 && spawner_type == :random_direction_gravity # Prefer upwards angles - speed = rand(150, 250) + when :random_direction, :random_direction_gravity, :random_up_direction_gravity + if spawner_type == :random_up_direction_gravity + angle = 30 + rand(120) + else + angle = rand(360) + angle = rand(360) if angle >= 180 && spawner_type == :random_direction_gravity # Prefer upwards angles + end + speed = rand(200, 400) start_x_speed = speed * Math.cos(angle * Math::PI / 180) start_y_speed = -speed * Math.sin(angle * Math::PI / 180) start_x = (start_x_speed * 0.05) + rand(-8, 8) start_y = (start_y_speed * 0.05) + rand(-8, 8) # Set initial positions [:x, :y].each do |property| - offset = (property == :x) ? start_x : start_y - particle[property].each do |cmd| - next if cmd[1] > 0 - particle_sprite.add_set_process(property, (cmd[0] + delay) * slowdown, cmd[2] + offset) - break + particle_sprite.delete_processes(property) + if particle[property] && !particle[property].empty? + offset = (property == :x) ? start_x : start_y + particle[property].each do |cmd| + next if cmd[1] > 0 + particle_sprite.add_set_process(property, (cmd[0] + delay) * slowdown, cmd[2] + offset) + break + end end end # Set movements particle_sprite.add_move_process(:x, (life_start + delay) * slowdown, lifetime * slowdown, start_x + (start_x_speed * lifetime / 20.0), :linear) - if spawner_type == :random_direction_gravity + if [:random_direction_gravity, :random_up_direction_gravity].include?(spawner_type) particle_sprite.add_move_process(:y, (life_start + delay) * slowdown, lifetime * slowdown, [start_y_speed / slowdown, AnimationPlayer::Helper::GRAVITY_STRENGTH.to_f / (slowdown * slowdown)], :gravity) @@ -241,6 +250,8 @@ class AnimationPlayer # yet started. def reset_anim_sprites @anim_sprites.each { |particle| particle.reset_processes } + # Randomise spawner particle properties + @spawner_sprites.each { |spawner| add_spawner_commands(*spawner, false) } end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/905_Anim player/002_ParticleSprite.rb b/Data/Scripts/905_Anim player/002_ParticleSprite.rb index e97efce82..486b0847d 100644 --- a/Data/Scripts/905_Anim player/002_ParticleSprite.rb +++ b/Data/Scripts/905_Anim player/002_ParticleSprite.rb @@ -49,6 +49,10 @@ class AnimationPlayer::ParticleSprite @processes.push([property, start_frame, duration, value, interpolation, nil, nil]) end + def delete_processes(property) + @processes.delete_if { |process| process[0] == property } + end + # Sets sprite's initial For looping purposes. def reset_processes initialize_values diff --git a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb index eab3bd2e1..74283bc5f 100644 --- a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb +++ b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb @@ -3,10 +3,11 @@ #=============================================================================== module AnimationPlayer::Helper PROPERTIES_SET_BY_SPAWNER = { - :random_direction => [:x, :y], - :random_direction_gravity => [:x, :y] + :random_direction => [:x, :y], + :random_direction_gravity => [:x, :y], + :random_up_direction_gravity => [:x, :y] } - GRAVITY_STRENGTH = 300 + GRAVITY_STRENGTH = 500 BATTLE_MESSAGE_BAR_HEIGHT = 96 # NOTE: You shouldn't need to change this. module_function @@ -18,6 +19,10 @@ module AnimationPlayer::Helper particle.each_pair do |property, value| next if !value.is_a?(Array) || value.empty? max = value.last[0] + value.last[1] # Keyframe + duration + # Particle spawners can delay their particles; account for this + if (particle[:spawner] || :none) != :none + max += get_particle_delay(particle, (particle[:spawn_quantity] || 1) - 1) + end ret = max if ret < max end end @@ -51,7 +56,7 @@ module AnimationPlayer::Helper # For spawner particles def get_particle_delay(particle, instance) case particle[:spawner] || :none - when :random_direction, :random_direction_gravity + when :random_direction, :random_direction_gravity, :random_up_direction_gravity return instance / 4 end return 0 diff --git a/PBS/Animations/Normal/Pound.txt b/PBS/Animations/Normal/Pound.txt index b619f72dc..a99c85538 100644 --- a/PBS/Animations/Normal/Pound.txt +++ b/PBS/Animations/Normal/Pound.txt @@ -25,11 +25,11 @@ Name = Essentials MoveColorBlue = 1,1,0 MoveOpacity = 1,4,0 SetVisible = 5,false - + Graphic = Normal/Pound spark Focus = Target - SetX = 0,-11 - SetY = 0,-17 + Spawner = RandomDirectionGravity + SpawnQuantity = 7 SetZ = 0,5 SetZoomX = 0,50 SetZoomY = 0,50 @@ -39,142 +39,11 @@ Name = Essentials SetColorBlue = 0,128 SetColorAlpha = 0,255 MoveOpacity = 0,1,255 - MoveX = 0,13,-94 - MoveY = 0,13,-68,EaseOut MoveZoomX = 4,9,0 MoveZoomY = 4,9,0 MoveOpacity = 4,9,0 MoveColorGreen = 4,9,96,EaseOut MoveColorBlue = 4,9,32,EaseOut SetVisible = 13,false - - Graphic = Normal/Pound spark - Focus = Target - SetX = 1,-3 - SetY = 1,-24 - SetZ = 1,5 - SetZoomX = 1,50 - SetZoomY = 1,50 - SetOpacity = 1,0 - SetColorRed = 1,248 - SetColorGreen = 1,248 - SetColorBlue = 1,128 - SetColorAlpha = 1,255 - MoveOpacity = 1,1,255 - MoveX = 1,13,-40 - MoveY = 1,13,-116,EaseOut - MoveZoomX = 5,9,0 - MoveZoomY = 5,9,0 - MoveOpacity = 5,9,0 - MoveColorGreen = 5,9,96,EaseOut - MoveColorBlue = 5,9,32,EaseOut - - Graphic = Normal/Pound spark - Focus = Target - SetX = 0,8 - SetY = 0,-7 - SetZ = 0,5 - SetZoomX = 0,50 - SetZoomY = 0,50 - SetOpacity = 0,0 - SetColorRed = 0,248 - SetColorGreen = 0,248 - SetColorBlue = 0,128 - SetColorAlpha = 0,255 - MoveOpacity = 0,1,255 - MoveX = 0,13,14 - MoveY = 0,13,-89,EaseOut - MoveZoomX = 4,9,0 - MoveZoomY = 4,9,0 - MoveOpacity = 4,9,0 - MoveColorGreen = 4,9,96,EaseOut - MoveColorBlue = 4,9,32,EaseOut - SetVisible = 13,false - - Graphic = Normal/Pound spark - Focus = Target - SetX = 1,7 - SetY = 1,-6 - SetZ = 1,5 - SetZoomX = 1,50 - SetZoomY = 1,50 - SetOpacity = 1,0 - SetColorRed = 1,248 - SetColorGreen = 1,248 - SetColorBlue = 1,128 - SetColorAlpha = 1,255 - MoveOpacity = 1,1,255 - MoveX = 1,13,58 - MoveY = 1,13,-108,EaseOut - MoveZoomX = 5,9,0 - MoveZoomY = 5,9,0 - MoveOpacity = 5,9,0 - MoveColorGreen = 5,9,96,EaseOut - MoveColorBlue = 5,9,32,EaseOut - - Graphic = Normal/Pound spark - Focus = Target - SetX = 0,25 - SetY = 0,-4 - SetZ = 0,5 - SetZoomX = 0,50 - SetZoomY = 0,50 - SetOpacity = 0,0 - SetColorRed = 0,248 - SetColorGreen = 0,248 - SetColorBlue = 0,128 - SetColorAlpha = 0,255 - MoveOpacity = 0,1,255 - MoveX = 0,13,87 - MoveY = 0,13,-9,EaseOut - MoveZoomX = 4,9,0 - MoveZoomY = 4,9,0 - MoveOpacity = 4,9,0 - MoveColorGreen = 4,9,96,EaseOut - MoveColorBlue = 4,9,32,EaseOut - SetVisible = 13,false - - Graphic = Normal/Pound spark - Focus = Target - SetX = 0,18 - SetY = 0,-9 - SetZ = 0,5 - SetZoomX = 0,50 - SetZoomY = 0,50 - SetOpacity = 0,0 - SetColorRed = 0,248 - SetColorGreen = 0,248 - SetColorBlue = 0,128 - SetColorAlpha = 0,255 - MoveOpacity = 0,1,255 - MoveX = 0,13,115 - MoveY = 0,13,-47,EaseOut - MoveZoomX = 4,9,0 - MoveZoomY = 4,9,0 - MoveOpacity = 4,9,0 - MoveColorGreen = 4,9,96,EaseOut - MoveColorBlue = 4,9,32,EaseOut - SetVisible = 13,false - - Graphic = Normal/Pound spark - Focus = Target - SetX = 1,-3 - SetY = 1,-5 - SetZ = 1,5 - SetZoomX = 1,50 - SetZoomY = 1,50 - SetOpacity = 1,0 - SetColorRed = 1,248 - SetColorGreen = 1,248 - SetColorBlue = 1,128 - SetColorAlpha = 1,255 - MoveOpacity = 1,1,255 - MoveX = 1,13,-112 - MoveY = 1,13,-26,EaseOut - MoveZoomX = 5,9,0 - MoveZoomY = 5,9,0 - MoveOpacity = 5,9,0 - MoveColorGreen = 5,9,96,EaseOut - MoveColorBlue = 5,9,32,EaseOut Play = 0,Normal/Pound diff --git a/PBS/Animations/Normal/Scratch.txt b/PBS/Animations/Normal/Scratch.txt index 673538367..68b637381 100644 --- a/PBS/Animations/Normal/Scratch.txt +++ b/PBS/Animations/Normal/Scratch.txt @@ -56,11 +56,11 @@ Name = Essentials SetColorAlpha = 2,255 MoveOpacity = 2,7,0 SetVisible = 9,false - + Graphic = Normal/Scratch spark Focus = Target - SetX = 0,-11 - SetY = 0,-17 + Spawner = RandomDirectionGravity + SpawnQuantity = 12 SetZ = 0,5 SetZoomX = 0,40 SetZoomY = 0,40 @@ -70,250 +70,11 @@ Name = Essentials SetColorBlue = 0,128 SetColorAlpha = 0,255 MoveOpacity = 0,1,255 - MoveX = 0,13,-57 - MoveY = 0,13,-54,EaseOut MoveZoomX = 4,9,0 MoveZoomY = 4,9,0 MoveOpacity = 4,9,0 MoveColorGreen = 4,9,96,EaseOut MoveColorBlue = 4,9,32,EaseOut SetVisible = 13,false - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 1,-3 - SetY = 1,-24 - SetZ = 1,5 - SetZoomX = 1,40 - SetZoomY = 1,40 - SetOpacity = 1,0 - SetColorRed = 1,248 - SetColorGreen = 1,248 - SetColorBlue = 1,128 - SetColorAlpha = 1,255 - MoveOpacity = 1,1,255 - MoveX = 1,13,-40 - MoveY = 1,13,-116,EaseOut - MoveZoomX = 5,9,0 - MoveZoomY = 5,9,0 - MoveOpacity = 5,9,0 - MoveColorGreen = 5,9,96,EaseOut - MoveColorBlue = 5,9,32,EaseOut - SetVisible = 14,false - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 2,8 - SetY = 2,-7 - SetZ = 2,5 - SetZoomX = 2,40 - SetZoomY = 2,40 - SetOpacity = 2,0 - SetColorRed = 2,248 - SetColorGreen = 2,248 - SetColorBlue = 2,128 - SetColorAlpha = 2,255 - MoveOpacity = 2,1,255 - MoveX = 2,13,-1 - MoveY = 2,13,-94,EaseOut - MoveZoomX = 6,9,0 - MoveZoomY = 6,9,0 - MoveOpacity = 6,9,0 - MoveColorGreen = 6,9,96,EaseOut - MoveColorBlue = 6,9,32,EaseOut - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 1,7 - SetY = 1,-6 - SetZ = 1,5 - SetZoomX = 1,40 - SetZoomY = 1,40 - SetOpacity = 1,0 - SetColorRed = 1,248 - SetColorGreen = 1,248 - SetColorBlue = 1,128 - SetColorAlpha = 1,255 - MoveOpacity = 1,1,255 - MoveX = 1,13,50 - MoveY = 1,13,-106,EaseOut - MoveZoomX = 5,9,0 - MoveZoomY = 5,9,0 - MoveOpacity = 5,9,0 - MoveColorGreen = 5,9,96,EaseOut - MoveColorBlue = 5,9,32,EaseOut - SetVisible = 14,false - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 2,25 - SetY = 2,-4 - SetZ = 2,5 - SetZoomX = 2,40 - SetZoomY = 2,40 - SetOpacity = 2,0 - SetColorRed = 2,248 - SetColorGreen = 2,248 - SetColorBlue = 2,128 - SetColorAlpha = 2,255 - MoveOpacity = 2,1,255 - MoveX = 2,13,78 - MoveY = 2,13,-28,EaseOut - MoveZoomX = 6,9,0 - MoveZoomY = 6,9,0 - MoveOpacity = 6,9,0 - MoveColorGreen = 6,9,96,EaseOut - MoveColorBlue = 6,9,32,EaseOut - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 0,18 - SetY = 0,-9 - SetZ = 0,5 - SetZoomX = 0,40 - SetZoomY = 0,40 - SetOpacity = 0,0 - SetColorRed = 0,248 - SetColorGreen = 0,248 - SetColorBlue = 0,128 - SetColorAlpha = 0,255 - MoveOpacity = 0,1,255 - MoveX = 0,13,117 - MoveY = 0,13,-77,EaseOut - MoveZoomX = 4,9,0 - MoveZoomY = 4,9,0 - MoveOpacity = 4,9,0 - MoveColorGreen = 4,9,96,EaseOut - MoveColorBlue = 4,9,32,EaseOut - SetVisible = 13,false - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 2,-3 - SetY = 2,-5 - SetZ = 2,5 - SetZoomX = 2,40 - SetZoomY = 2,40 - SetOpacity = 2,0 - SetColorRed = 2,248 - SetColorGreen = 2,248 - SetColorBlue = 2,128 - SetColorAlpha = 2,255 - MoveOpacity = 2,1,255 - MoveX = 2,13,-112 - MoveY = 2,13,-26,EaseOut - MoveZoomX = 6,9,0 - MoveZoomY = 6,9,0 - MoveOpacity = 6,9,0 - MoveColorGreen = 6,9,96,EaseOut - MoveColorBlue = 6,9,32,EaseOut - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 0,21 - SetY = 0,4 - SetZ = 0,5 - SetZoomX = 0,40 - SetZoomY = 0,40 - SetOpacity = 0,0 - SetColorRed = 0,248 - SetColorGreen = 0,248 - SetColorBlue = 0,128 - SetColorAlpha = 0,255 - MoveOpacity = 0,1,255 - MoveX = 0,13,93 - MoveY = 0,13,40,EaseIn - MoveZoomX = 4,9,0 - MoveZoomY = 4,9,0 - MoveOpacity = 4,9,0 - MoveColorGreen = 4,9,96,EaseOut - MoveColorBlue = 4,9,32,EaseOut - SetVisible = 13,false - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 2,-7 - SetY = 2,4 - SetZ = 2,5 - SetZoomX = 2,40 - SetZoomY = 2,40 - SetOpacity = 2,0 - SetColorRed = 2,248 - SetColorGreen = 2,248 - SetColorBlue = 2,128 - SetColorAlpha = 2,255 - MoveOpacity = 2,1,255 - MoveX = 2,13,-63 - MoveY = 2,13,43,EaseIn - MoveZoomX = 6,9,0 - MoveZoomY = 6,9,0 - MoveOpacity = 6,9,0 - MoveColorGreen = 6,9,96,EaseOut - MoveColorBlue = 6,9,32,EaseOut - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 1,-1 - SetY = 1,3 - SetZ = 1,5 - SetZoomX = 1,40 - SetZoomY = 1,40 - SetOpacity = 1,0 - SetColorRed = 1,248 - SetColorGreen = 1,248 - SetColorBlue = 1,128 - SetColorAlpha = 1,255 - MoveOpacity = 1,1,255 - MoveX = 1,13,47 - MoveY = 1,13,58,EaseIn - MoveZoomX = 5,9,0 - MoveZoomY = 5,9,0 - MoveOpacity = 5,9,0 - MoveColorGreen = 5,9,96,EaseOut - MoveColorBlue = 5,9,32,EaseOut - SetVisible = 14,false - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 0,10 - SetY = 0,-4 - SetZ = 0,5 - SetZoomX = 0,40 - SetZoomY = 0,40 - SetOpacity = 0,0 - SetColorRed = 0,248 - SetColorGreen = 0,248 - SetColorBlue = 0,128 - SetColorAlpha = 0,255 - MoveOpacity = 0,1,255 - MoveX = 0,13,66 - MoveY = 0,13,11,EaseIn - MoveZoomX = 4,9,0 - MoveZoomY = 4,9,0 - MoveOpacity = 4,9,0 - MoveColorGreen = 4,9,96,EaseOut - MoveColorBlue = 4,9,32,EaseOut - SetVisible = 13,false - - Graphic = Normal/Scratch spark - Focus = Target - SetX = 2,4 - SetY = 2,-2 - SetZ = 2,5 - SetZoomX = 2,40 - SetZoomY = 2,40 - SetOpacity = 2,0 - SetColorRed = 2,248 - SetColorGreen = 2,248 - SetColorBlue = 2,128 - SetColorAlpha = 2,255 - MoveOpacity = 2,1,255 - MoveX = 2,13,8 - MoveY = 2,13,80,EaseIn - MoveZoomX = 6,9,0 - MoveZoomY = 6,9,0 - MoveOpacity = 6,9,0 - MoveColorGreen = 6,9,96,EaseOut - MoveColorBlue = 6,9,32,EaseOut Play = 0,Normal/Scratch diff --git a/PBS/Animations/Normal/Tackle.txt b/PBS/Animations/Normal/Tackle.txt index 2bd3a66c1..168c1e3f0 100644 --- a/PBS/Animations/Normal/Tackle.txt +++ b/PBS/Animations/Normal/Tackle.txt @@ -43,11 +43,11 @@ Name = Essentials MoveZoomY = 5,4,100 MoveOpacity = 5,4,0 SetVisible = 9,false - + Graphic = Normal/Tackle spark Focus = Target - SetX = 4,-11 - SetY = 4,-17 + Spawner = RandomDirectionGravity + SpawnQuantity = 7 SetZ = 4,5 SetZoomX = 4,50 SetZoomY = 4,50 @@ -57,138 +57,11 @@ Name = Essentials SetColorBlue = 4,128 SetColorAlpha = 4,255 MoveOpacity = 4,1,255 - MoveX = 4,13,-102 - MoveY = 4,13,-68,EaseOut MoveZoomX = 8,9,0 MoveZoomY = 8,9,0 MoveOpacity = 8,9,0 MoveColorGreen = 8,9,96,EaseOut MoveColorBlue = 8,9,32,EaseOut - - Graphic = Normal/Tackle spark - Focus = Target - SetX = 5,-3 - SetY = 5,-24 - SetZ = 5,5 - SetZoomX = 5,50 - SetZoomY = 5,50 - SetOpacity = 5,0 - SetColorRed = 5,248 - SetColorGreen = 5,248 - SetColorBlue = 5,128 - SetColorAlpha = 5,255 - MoveOpacity = 5,1,255 - MoveX = 5,13,-40 - MoveY = 5,13,-116,EaseOut - MoveZoomX = 9,9,0 - MoveZoomY = 9,9,0 - MoveOpacity = 9,9,0 - MoveColorGreen = 9,9,96,EaseOut - MoveColorBlue = 9,9,32,EaseOut - - Graphic = Normal/Tackle spark - Focus = Target - SetX = 4,8 - SetY = 4,-7 - SetZ = 4,5 - SetZoomX = 4,50 - SetZoomY = 4,50 - SetOpacity = 4,0 - SetColorRed = 4,248 - SetColorGreen = 4,248 - SetColorBlue = 4,128 - SetColorAlpha = 4,255 - MoveOpacity = 4,1,255 - MoveX = 4,13,-1 - MoveY = 4,13,-94,EaseOut - MoveZoomX = 8,9,0 - MoveZoomY = 8,9,0 - MoveOpacity = 8,9,0 - MoveColorGreen = 8,9,96,EaseOut - MoveColorBlue = 8,9,32,EaseOut - - Graphic = Normal/Tackle spark - Focus = Target - SetX = 5,7 - SetY = 5,-6 - SetZ = 5,5 - SetZoomX = 5,50 - SetZoomY = 5,50 - SetOpacity = 5,0 - SetColorRed = 5,248 - SetColorGreen = 5,248 - SetColorBlue = 5,128 - SetColorAlpha = 5,255 - MoveOpacity = 5,1,255 - MoveX = 5,13,50 - MoveY = 5,13,-106,EaseOut - MoveZoomX = 9,9,0 - MoveZoomY = 9,9,0 - MoveOpacity = 9,9,0 - MoveColorGreen = 9,9,96,EaseOut - MoveColorBlue = 9,9,32,EaseOut - - Graphic = Normal/Tackle spark - Focus = Target - SetX = 4,25 - SetY = 4,-4 - SetZ = 4,5 - SetZoomX = 4,50 - SetZoomY = 4,50 - SetOpacity = 4,0 - SetColorRed = 4,248 - SetColorGreen = 4,248 - SetColorBlue = 4,128 - SetColorAlpha = 4,255 - MoveOpacity = 4,1,255 - MoveX = 4,13,78 - MoveY = 4,13,-28,EaseOut - MoveZoomX = 8,9,0 - MoveZoomY = 8,9,0 - MoveOpacity = 8,9,0 - MoveColorGreen = 8,9,96,EaseOut - MoveColorBlue = 8,9,32,EaseOut - - Graphic = Normal/Tackle spark - Focus = Target - SetX = 4,18 - SetY = 4,-9 - SetZ = 4,5 - SetZoomX = 4,50 - SetZoomY = 4,50 - SetOpacity = 4,0 - SetColorRed = 4,248 - SetColorGreen = 4,248 - SetColorBlue = 4,128 - SetColorAlpha = 4,255 - MoveOpacity = 4,1,255 - MoveX = 4,13,117 - MoveY = 4,13,-77,EaseOut - MoveZoomX = 8,9,0 - MoveZoomY = 8,9,0 - MoveOpacity = 8,9,0 - MoveColorGreen = 8,9,96,EaseOut - MoveColorBlue = 8,9,32,EaseOut - - Graphic = Normal/Tackle spark - Focus = Target - SetX = 5,-3 - SetY = 5,-5 - SetZ = 5,5 - SetZoomX = 5,50 - SetZoomY = 5,50 - SetOpacity = 5,0 - SetColorRed = 5,248 - SetColorGreen = 5,248 - SetColorBlue = 5,128 - SetColorAlpha = 5,255 - MoveOpacity = 5,1,255 - MoveX = 5,13,-112 - MoveY = 5,13,-26,EaseOut - MoveZoomX = 9,9,0 - MoveZoomY = 9,9,0 - MoveOpacity = 9,9,0 - MoveColorGreen = 9,9,96,EaseOut - MoveColorBlue = 9,9,32,EaseOut + SetVisible = 17,false Play = 4,Normal/Tackle From 34741ea840386be499fcc180367ca002b993cbc2 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 6 May 2024 00:46:02 +0100 Subject: [PATCH 46/49] Anim Editor: made the window height depend on the monitor's height --- Data/Scripts/904_Anim Editor/001_AnimationEditor.rb | 2 ++ Data/Scripts/904_Anim Editor/010_AnimationSelector.rb | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index ad151aeb8..1ea43b702 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -9,6 +9,8 @@ class AnimationEditor BORDER_THICKNESS = 4 WINDOW_WIDTH = Settings::SCREEN_WIDTH + 352 + (BORDER_THICKNESS * 4) WINDOW_HEIGHT = Settings::SCREEN_HEIGHT + 424 + (BORDER_THICKNESS * 4) + WINDOW_HEIGHT = [WINDOW_HEIGHT, Graphics.display_height - 100].min + WINDOW_HEIGHT = [WINDOW_HEIGHT, Settings::SCREEN_HEIGHT + 266 + (BORDER_THICKNESS * 4)].max # Components MENU_BAR_WIDTH = WINDOW_WIDTH diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index ca5cb1233..4f2107b7c 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -14,14 +14,17 @@ class AnimationEditor::AnimationSelector TYPE_BUTTON_WIDTH = 100 TYPE_BUTTON_HEIGHT = 48 + LIST_BORDER_PADDING = (UIControls::List::BORDER_THICKNESS * 2) MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 2 MOVES_LIST_Y = TYPE_BUTTONS_Y + 2 - MOVES_LIST_WIDTH = 200 + (UIControls::List::BORDER_THICKNESS * 2) - MOVES_LIST_HEIGHT = (29 * UIControls::List::ROW_HEIGHT) + (UIControls::List::BORDER_THICKNESS * 2) + MOVES_LIST_WIDTH = 200 + LIST_BORDER_PADDING + MOVES_LIST_HEIGHT = AnimationEditor::WINDOW_HEIGHT - MOVES_LIST_Y - LIST_BORDER_PADDING + MOVES_LIST_HEIGHT = (((MOVES_LIST_HEIGHT - LIST_BORDER_PADDING) / UIControls::List::ROW_HEIGHT) * UIControls::List::ROW_HEIGHT) + MOVES_LIST_HEIGHT += LIST_BORDER_PADDING ANIMATIONS_LIST_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 4 ANIMATIONS_LIST_Y = MOVES_LIST_Y - ANIMATIONS_LIST_WIDTH = 300 + (UIControls::List::BORDER_THICKNESS * 2) + ANIMATIONS_LIST_WIDTH = 300 + LIST_BORDER_PADDING ANIMATIONS_LIST_HEIGHT = MOVES_LIST_HEIGHT ACTION_BUTTON_WIDTH = 200 From 5495bf565c6ac68f42908b0d620017c8c0409ad0 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 11 May 2024 00:33:56 +0100 Subject: [PATCH 47/49] Anim Editor: Added smart angle property to particles --- .../902_Anim GameData/001_Animation.rb | 13 +- .../903_Anim Compiler/001_Anim compiler.rb | 8 ++ .../003_AnimationEditor_side_panes.rb | 22 +++ .../Anim Editor elements/001_Canvas.rb | 18 ++- .../905_Anim player/001_Anim player.rb | 11 ++ .../905_Anim player/002_ParticleSprite.rb | 26 +++- .../905_Anim player/003_AnimPlayerHelper.rb | 44 +++++- PBS/Animations/Bug/Twineedle.txt | 84 +++++++++++ .../Example anims/Move/MACHPUNCH.txt | 80 ----------- .../Example anims/Move/TWINEEDLE.txt | 135 ------------------ PBS/Animations/Fighting/Mach Punch.txt | 107 ++++++++++++++ 11 files changed, 329 insertions(+), 219 deletions(-) create mode 100644 PBS/Animations/Bug/Twineedle.txt delete mode 100644 PBS/Animations/Example anims/Move/MACHPUNCH.txt delete mode 100644 PBS/Animations/Example anims/Move/TWINEEDLE.txt create mode 100644 PBS/Animations/Fighting/Mach Punch.txt diff --git a/Data/Scripts/902_Anim GameData/001_Animation.rb b/Data/Scripts/902_Anim GameData/001_Animation.rb index d0cc4320b..47bd02983 100644 --- a/Data/Scripts/902_Anim GameData/001_Animation.rb +++ b/Data/Scripts/902_Anim GameData/001_Animation.rb @@ -50,6 +50,11 @@ module GameData "RandomDirectionGravity" => :random_direction_gravity, "RandomUpDirectionGravity" => :random_up_direction_gravity } + ANGLE_OVERRIDES = { + "None" => :none, + "InitialAngleToFocus" => :initial_angle_to_focus, + "AlwaysPointAtFocus" => :always_point_at_focus + } # Properties that apply to the animation in general, not to individual # particles. They don't change during the animation. @@ -76,6 +81,7 @@ module GameData "Spawner" => [:spawner, "e", SPAWNER_TYPES], "SpawnQuantity" => [:spawn_quantity, "v"], "RandomFrameMax" => [:random_frame_max, "u"], + "AngleOverride" => [:angle_override, "e", ANGLE_OVERRIDES], # All properties below are "SetXYZ" or "MoveXYZ". "SetXYZ" has the # keyframe and the value, and "MoveXYZ" has the keyframe, duration and the # value. All have "^" in their schema. "SetXYZ" is turned into "MoveXYZ" @@ -129,7 +135,8 @@ module GameData :foe_flip => false, :spawner => :none, :spawn_quantity => 1, - :random_frame_max => 0 + :random_frame_max => 0, + :angle_override => :none } # NOTE: Particles are invisible until their first command, and automatically @@ -335,6 +342,10 @@ module GameData ret = nil if ret && ret <= 1 when "RandomFrameMax" ret = nil if ret == 0 + when "AngleOverride" + ret = nil if ret == :none + ret = nil if !FOCUS_TYPES_WITH_USER.include?(@particles[index][:focus]) && + !FOCUS_TYPES_WITH_TARGET.include?(@particles[index][:focus]) when "AllCommands" # Get translations of all properties to their names as seen in PBS # animation files diff --git a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb index 5a6a1c053..efbe5f5a6 100644 --- a/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb +++ b/Data/Scripts/903_Anim Compiler/001_Anim compiler.rb @@ -203,6 +203,14 @@ module Compiler particle[:name]) + "\n" + FileLineData.linereport end end + # Ensure that only particles that have an entity as a focus can have a + # smart angle + if (particle[:angle_override] || :none) != :none && + !GameData::Animation::FOCUS_TYPES_WITH_USER.include?(particle[:focus]) && + !GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(particle[:focus]) + raise _INTL("Particle \"{1}\" can't set \"AngleOverride\" if its focus isn't a specific thing(s).", + particle[:name]) + "\n" + FileLineData.linereport + end # Ensure that a particle with a user's/target's graphic doesn't have any # :frame commands if !["User", "Target", "SE"].include?(particle[:name]) && diff --git a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb index 43baad314..74814ba43 100644 --- a/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb +++ b/Data/Scripts/904_Anim Editor/003_AnimationEditor_side_panes.rb @@ -562,6 +562,28 @@ AnimationEditor::SidePanes.add_property(:particle_pane, :spawn_quantity, { } }) +AnimationEditor::SidePanes.add_property(:particle_pane, :angle_override, { + :new => proc { |pane, editor| + values = { + :none => _INTL("None"), + :initial_angle_to_focus => _INTL("Initial angle to focus"), + :always_point_at_focus => _INTL("Always point at focus") + } + pane.add_labelled_dropdown_list(:angle_override, _INTL("Smart angle"), values, :none) + }, + :refresh_value => proc { |control, editor| + focus = editor.anim[:particles][editor.particle_index][:focus] + if !GameData::Animation::FOCUS_TYPES_WITH_USER.include?(focus) && + !GameData::Animation::FOCUS_TYPES_WITH_TARGET.include?(focus) + editor.anim[:particles][editor.particle_index][:angle_override] = :none + control.value = :none + control.disable + else + control.enable + end + } +}) + AnimationEditor::SidePanes.add_property(:particle_pane, :opposing_label, { :new => proc { |pane, editor| pane.add_label(:opposing_label, _INTL("If on opposing side...")) diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index 921043987..d38645e59 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -497,7 +497,23 @@ class AnimationEditor::Canvas < Sprite # Set various other properties spr.zoom_x = values[:zoom_x] / 100.0 spr.zoom_y = values[:zoom_y] / 100.0 - spr.angle = values[:angle] + case particle[:angle_override] + when :initial_angle_to_focus + target_x = (focus_xy.length == 2) ? focus_xy[1][0] : focus_xy[0][0] + target_x += offset_xy[0] + target_y = (focus_xy.length == 2) ? focus_xy[1][1] : focus_xy[0][1] + target_y += offset_xy[1] + spr.angle = AnimationPlayer::Helper.initial_angle_between(particle, focus_xy, offset_xy) + when :always_point_at_focus + target_x = (focus_xy.length == 2) ? focus_xy[1][0] : focus_xy[0][0] + target_x += offset_xy[0] + target_y = (focus_xy.length == 2) ? focus_xy[1][1] : focus_xy[0][1] + target_y += offset_xy[1] + spr.angle = AnimationPlayer::Helper.angle_between(spr.x, spr.y, target_x, target_y) + else + spr.angle = 0 + end + spr.angle += values[:angle] spr.mirror = values[:flip] spr.mirror = !spr.mirror if relative_to_index >= 0 && relative_to_index.odd? && particle[:foe_flip] spr.blend_type = values[:blending] diff --git a/Data/Scripts/905_Anim player/001_Anim player.rb b/Data/Scripts/905_Anim player/001_Anim player.rb index 04e65b005..8d55a0e9e 100644 --- a/Data/Scripts/905_Anim player/001_Anim player.rb +++ b/Data/Scripts/905_Anim player/001_Anim player.rb @@ -127,6 +127,17 @@ class AnimationPlayer particle_sprite.foe_invert_y = particle[:foe_invert_y] particle_sprite.foe_flip = particle[:foe_flip] end + particle_sprite.base_angle = 0 + case particle[:angle_override] + when :initial_angle_to_focus + target_x = (focus_xy.length == 2) ? focus_xy[1][0] : focus_xy[0][0] + target_x += offset_xy[0] + target_y = (focus_xy.length == 2) ? focus_xy[1][1] : focus_xy[0][1] + target_y += offset_xy[1] + particle_sprite.base_angle = AnimationPlayer::Helper.initial_angle_between(particle, focus_xy, offset_xy) + when :always_point_at_focus + particle_sprite.angle_override = particle[:angle_override] if relative_to_index >= 0 + end # Find earliest command and add a "make visible" command then delay = AnimationPlayer::Helper.get_particle_delay(particle, instance) if sprite && !particle_sprite.battler_sprite? diff --git a/Data/Scripts/905_Anim player/002_ParticleSprite.rb b/Data/Scripts/905_Anim player/002_ParticleSprite.rb index 486b0847d..4dd90206f 100644 --- a/Data/Scripts/905_Anim player/002_ParticleSprite.rb +++ b/Data/Scripts/905_Anim player/002_ParticleSprite.rb @@ -5,6 +5,7 @@ class AnimationPlayer::ParticleSprite attr_accessor :sprite attr_accessor :focus_xy, :offset_xy, :focus_z + attr_accessor :base_angle, :angle_override attr_accessor :foe_invert_x, :foe_invert_y, :foe_flip FRAMES_PER_SECOND = 20.0 @@ -109,16 +110,24 @@ class AnimationPlayer::ParticleSprite value *= -1 if @foe_invert_x AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :x, value, @focus_xy) @sprite.x += @offset_xy[0] + update_angle_pointing_at_focus when :y value = value.round value *= -1 if @foe_invert_y AnimationPlayer::Helper.apply_xy_focus_to_sprite(@sprite, :y, value, @focus_xy) @sprite.y += @offset_xy[1] + update_angle_pointing_at_focus when :z AnimationPlayer::Helper.apply_z_focus_to_sprite(@sprite, value, @focus_z) when :zoom_x then @sprite.zoom_x = value / 100.0 when :zoom_y then @sprite.zoom_y = value / 100.0 - when :angle then @sprite.angle = value + when :angle + if @angle_override == :always_point_at_focus + update_angle_pointing_at_focus + @sprite.angle += value + else + @sprite.angle = value + (@base_angle || 0) + end when :visible then @sprite.visible = value when :opacity then @sprite.opacity = value when :color_red then @sprite.color.red = value @@ -132,6 +141,21 @@ class AnimationPlayer::ParticleSprite end end + # This assumes vertically up is an angle of 0, and the angle increases + # anticlockwise. + def update_angle_pointing_at_focus + return if @angle_override != :always_point_at_focus + # Get coordinates + sprite_x = @sprite.x + sprite_y = @sprite.y + target_x = (@focus_xy.length == 2) ? @focus_xy[1][0] : @focus_xy[0][0] + target_x += @offset_xy[0] + target_y = (@focus_xy.length == 2) ? @focus_xy[1][1] : @focus_xy[0][1] + target_y += @offset_xy[1] + @sprite.angle = AnimationPlayer::Helper.angle_between(sprite_x, sprite_y, target_x, target_y) + @sprite.angle += (@base_angle || 0) + end + def update(elapsed_time) frame = (elapsed_time * FRAMES_PER_SECOND).floor changed_properties = [] diff --git a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb index 74283bc5f..3c2f2854b 100644 --- a/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb +++ b/Data/Scripts/905_Anim player/003_AnimPlayerHelper.rb @@ -77,7 +77,7 @@ module AnimationPlayer::Helper when :user_side_foreground, :user_side_background ret = [Battle::Scene.pbBattlerPosition(user_index)] when :target_side_foreground, :target_side_background - ret = [Battle::Scene.pbBattlerPosition(target_idx)] + ret = [Battle::Scene.pbBattlerPosition(target_index)] end return ret end @@ -168,6 +168,48 @@ module AnimationPlayer::Helper #----------------------------------------------------------------------------- + def angle_between(x1, y1, x2, y2) + diff_x = x1 - x2 + diff_y = y1 - y2 + ret = Math.atan(diff_x.to_f / diff_y) * 180 / Math::PI + ret += 180 if diff_y < 0 + return ret + end + + def initial_angle_between(particle, focus, offset) + x1 = 0 + y1 = 0 + x2 = (focus.length == 2) ? focus[1][0] : focus[0][0] + y2 = (focus.length == 2) ? focus[1][1] : focus[0][1] + [:x, :y].each do |property| + next if !particle[property] + particle[property].each do |cmd| + break if cmd[1] > 0 + if property == :x + x1 = cmd[2] + else + y1 = cmd[2] + end + break + end + end + if focus + if focus.length == 2 + distance = GameData::Animation::USER_AND_TARGET_SEPARATION + x1 = focus[0][0] + ((x1.to_f / distance[0]) * (focus[1][0] - focus[0][0])).to_i + y1 = focus[0][1] + ((y1.to_f / distance[1]) * (focus[1][1] - focus[0][1])).to_i + else + x1 += focus[0][0] + y1 += focus[0][1] + end + end + x1 += offset[0] + y1 += offset[1] + return angle_between(x1, y1, x2, y2) + end + + #----------------------------------------------------------------------------- + # user_sprites, target_sprites = [front sprite, back sprite] def set_bitmap_and_origin(particle, sprite, user_index, target_index, user_sprites, target_sprites) return if sprite&.is_a?(Battle::Scene::BattlerSprite) diff --git a/PBS/Animations/Bug/Twineedle.txt b/PBS/Animations/Bug/Twineedle.txt new file mode 100644 index 000000000..9222b44bc --- /dev/null +++ b/PBS/Animations/Bug/Twineedle.txt @@ -0,0 +1,84 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,TWINEEDLE] +Name = Essentials + + FoeInvertX = true + FoeInvertY = true + MoveX = 0,1,28 + MoveY = 0,1,-16 + MoveX = 3,1,0 + MoveY = 3,1,0 + + FoeInvertX = true + MoveX = 9,1,-2 + MoveColorRed = 9,8,160 + MoveColorGreen = 9,8,32 + MoveColorBlue = 9,8,248 + MoveColorAlpha = 9,8,160 + MoveX = 10,2,2 + MoveX = 12,2,-2 + MoveX = 14,2,2 + MoveX = 16,1,0 + MoveColorRed = 19,6,0 + MoveColorGreen = 19,6,0 + MoveColorBlue = 19,6,0 + MoveColorAlpha = 19,6,0 + + Graphic = Bug/Twineedle needle + Focus = UserAndTarget + AngleOverride = InitialAngleToFocus + SetZ = 4,-50 + SetZoomX = 4,50 + SetZoomY = 4,80 + SetColorRed = 4,160 + SetColorGreen = 4,32 + SetColorBlue = 4,192 + SetColorAlpha = 4,128 + MoveX = 4,7,200 + MoveY = 4,7,-180 + SetVisible = 11,false + + Graphic = Bug/Twineedle hit + Focus = Target + SetY = 11,16 + SetZ = 11,10 + SetZoomX = 11,0 + SetZoomY = 11,0 + MoveZoomX = 11,3,50 + MoveZoomY = 11,3,50 + SetColorRed = 13,248 + SetColorBlue = 13,248 + SetColorAlpha = 13,255 + MoveOpacity = 13,3,0 + SetVisible = 16,false + + Graphic = Bug/Twineedle needle + Focus = UserAndTarget + AngleOverride = InitialAngleToFocus + SetZ = 7,-50 + SetZoomX = 7,50 + SetZoomY = 7,80 + SetColorRed = 7,160 + SetColorGreen = 7,32 + SetColorBlue = 7,192 + SetColorAlpha = 7,128 + MoveX = 7,6,200 + MoveY = 7,6,-200 + SetVisible = 13,false + + Graphic = Bug/Twineedle hit + Focus = Target + SetX = 13,-8 + SetZ = 13,10 + SetZoomX = 13,0 + SetZoomY = 13,0 + MoveZoomX = 13,3,50 + MoveZoomY = 13,3,50 + SetColorRed = 15,248 + SetColorBlue = 15,248 + SetColorAlpha = 15,255 + MoveOpacity = 15,3,0 + SetVisible = 18,false + + Play = 0,Bug/Twineedle diff --git a/PBS/Animations/Example anims/Move/MACHPUNCH.txt b/PBS/Animations/Example anims/Move/MACHPUNCH.txt deleted file mode 100644 index fd434ee84..000000000 --- a/PBS/Animations/Example anims/Move/MACHPUNCH.txt +++ /dev/null @@ -1,80 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,MACHPUNCH] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/punches - Focus = Target - SetFrame = 2,5 - SetX = 2,15 - SetY = 2,-1 - SetZ = 2,28 - SetVisible = 3,false - - Graphic = Examples/punches - Focus = Target - SetFrame = 0,5 - SetX = 0,19 - SetY = 0,1 - SetZ = 0,27 - SetZoomX = 0,80 - SetZoomY = 0,80 - SetX = 1,16 - SetY = 1,0 - SetZoomX = 1,90 - SetZoomY = 1,90 - SetFrame = 2,7 - SetX = 2,4 - SetY = 2,-6 - SetZoomX = 2,100 - SetZoomY = 2,100 - SetFrame = 3,5 - SetX = 3,19 - SetY = 3,-1 - SetZoomX = 3,110 - SetZoomY = 3,110 - SetY = 4,-4 - SetZoomX = 4,120 - SetZoomY = 4,120 - SetX = 5,18 - SetZoomX = 5,130 - SetZoomY = 5,130 - SetX = 6,20 - SetY = 6,-6 - SetZoomX = 6,140 - SetZoomY = 6,140 - SetX = 7,17 - SetY = 7,-8 - SetZoomX = 7,160 - SetZoomY = 7,160 - SetX = 8,15 - SetZoomX = 8,170 - SetZoomY = 8,170 - SetX = 9,17 - SetY = 9,-11 - SetZoomX = 9,180 - SetZoomY = 9,180 - SetOpacity = 9,220 - SetY = 10,-7 - SetZoomX = 10,190 - SetZoomY = 10,190 - SetOpacity = 10,200 - SetX = 11,22 - SetY = 11,-6 - SetZoomX = 11,220 - SetZoomY = 11,220 - SetOpacity = 11,130 - SetX = 12,31 - SetY = 12,0 - SetZoomX = 12,250 - SetZoomY = 12,250 - SetOpacity = 12,100 - SetVisible = 13,false - - Play = 0,Mega Punch,100,94 diff --git a/PBS/Animations/Example anims/Move/TWINEEDLE.txt b/PBS/Animations/Example anims/Move/TWINEEDLE.txt deleted file mode 100644 index 050e156ed..000000000 --- a/PBS/Animations/Example anims/Move/TWINEEDLE.txt +++ /dev/null @@ -1,135 +0,0 @@ -# See the documentation on the wiki to learn how to edit this file. -#------------------------------- -[Move,TWINEEDLE] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/poison3 - Focus = UserAndTarget - SetFrame = 4,14 - SetX = 4,184 - SetY = 4,-187 - SetZ = 4,29 - SetOpacity = 4,50 - SetX = 5,209 - SetY = 5,-168 - SetVisible = 6,false - - Graphic = Examples/poison3 - Focus = UserAndTarget - SetX = 0,0 - SetY = 0,-50 - SetZ = 0,27 - SetX = 1,44 - SetY = 1,-79 - SetX = 2,100 - SetY = 2,-109 - SetX = 3,134 - SetY = 3,-148 - SetX = 4,179 - SetY = 4,-168 - SetX = 5,204 - SetY = 5,-148 - SetFrame = 6,14 - SetX = 6,209 - SetY = 6,-168 - SetZoomX = 6,125 - SetZoomY = 6,125 - SetOpacity = 6,50 - SetVisible = 7,false - - Graphic = Examples/poison3 - Focus = UserAndTarget - SetX = 1,44 - SetY = 1,-10 - SetZ = 1,28 - SetX = 2,100 - SetY = 2,-40 - SetX = 3,139 - SetY = 3,-79 - SetX = 4,184 - SetY = 4,-109 - SetFrame = 5,14 - SetX = 5,189 - SetY = 5,-187 - SetZoomX = 5,125 - SetZoomY = 5,125 - SetOpacity = 5,50 - SetVisible = 6,false - - Play = 0,throw,80 - Play = 2,throw,80 - Play = 4,Slash10,80 - Play = 6,Slash10,80 -#------------------------------- -[Move,TWINEEDLE,1] -Name = Example anim - - SetX = 0,0 - SetY = 0,0 - - SetX = 0,0 - SetY = 0,0 - - Graphic = Examples/poison3 - Focus = UserAndTarget - SetX = 1,44 - SetY = 1,-10 - SetZ = 1,28 - SetX = 2,100 - SetY = 2,-40 - SetX = 3,139 - SetY = 3,-79 - SetX = 4,184 - SetY = 4,-109 - SetFrame = 5,14 - SetX = 5,189 - SetY = 5,-187 - SetZoomX = 5,125 - SetZoomY = 5,125 - SetOpacity = 5,50 - SetVisible = 6,false - - Graphic = Examples/poison3 - Focus = UserAndTarget - SetFrame = 4,14 - SetX = 4,184 - SetY = 4,-187 - SetZ = 4,29 - SetOpacity = 4,50 - SetX = 5,209 - SetY = 5,-168 - SetVisible = 6,false - - Graphic = Examples/poison3 - Focus = UserAndTarget - SetX = 0,0 - SetY = 0,-50 - SetZ = 0,27 - SetX = 1,44 - SetY = 1,-79 - SetX = 2,100 - SetY = 2,-109 - SetX = 3,134 - SetY = 3,-148 - SetX = 4,179 - SetY = 4,-168 - SetX = 5,204 - SetY = 5,-148 - SetFrame = 6,14 - SetX = 6,209 - SetY = 6,-168 - SetZoomX = 6,125 - SetZoomY = 6,125 - SetOpacity = 6,50 - SetVisible = 7,false - - Play = 0,throw,80 - Play = 2,throw,80 - Play = 4,Slash10,80 - Play = 6,Slash10,80 diff --git a/PBS/Animations/Fighting/Mach Punch.txt b/PBS/Animations/Fighting/Mach Punch.txt new file mode 100644 index 000000000..ce0bcdb6e --- /dev/null +++ b/PBS/Animations/Fighting/Mach Punch.txt @@ -0,0 +1,107 @@ +# See the documentation on the wiki to learn how to edit this file. +#------------------------------- +[Move,MACHPUNCH] +Name = Essentials +NoUser = true + + FoeInvertX = true + MoveX = 14,1,-2 + MoveX = 15,2,2 + MoveX = 17,2,-2 + MoveX = 19,2,2 + MoveX = 21,1,0 + + Graphic = Fighting/Mach Punch fist + Focus = Target + SetZ = 0,30 + SetZoomX = 0,600 + SetZoomY = 0,600 + MoveZoomX = 0,4,150 + MoveZoomY = 0,4,150 + MoveAngle = 0,4,30 + SetVisible = 4,false + + Graphic = Fighting/Mach Punch fist + Focus = Target + SetZ = 0,15 + SetZoomX = 0,600 + SetZoomY = 0,600 + SetColorRed = 0,192 + SetColorBlue = 0,128 + SetColorAlpha = 0,128 + MoveZoomX = 0,5,500 + MoveZoomY = 0,5,500 + MoveOpacity = 0,5,0 + MoveColorRed = 0,5,0 + MoveColorBlue = 0,5,0 + SetVisible = 5,false + + Graphic = Fighting/Mach Punch fist + Focus = Target + SetZ = 0,20 + SetZoomX = 0,450 + SetZoomY = 0,450 + SetColorRed = 0,144 + SetColorBlue = 0,96 + SetColorAlpha = 0,128 + MoveZoomX = 0,7,325 + MoveZoomY = 0,7,325 + MoveOpacity = 0,7,0 + MoveColorRed = 1,6,0 + MoveColorBlue = 1,6,0 + SetVisible = 7,false + + Graphic = Fighting/Mach Punch fist + Focus = Target + SetZ = 0,25 + SetZoomX = 0,300 + SetZoomY = 0,300 + SetColorRed = 0,96 + SetColorBlue = 0,64 + SetColorAlpha = 0,128 + MoveZoomX = 0,8,150 + MoveZoomY = 0,8,150 + MoveOpacity = 0,8,0 + MoveColorRed = 2,6,0 + MoveColorBlue = 2,6,0 + SetVisible = 8,false + + Graphic = Fighting/Mach Punch hit + Focus = Target + SetZ = 4,5 + SetZoomX = 4,60 + SetZoomY = 4,60 + SetColorRed = 4,128 + SetColorGreen = 4,128 + SetColorBlue = 4,248 + SetColorAlpha = 4,128 + MoveZoomX = 4,4,150 + MoveZoomY = 4,4,150 + MoveOpacity = 6,2,0 + SetVisible = 8,false + + Graphic = Fighting/Mach Punch hit + Focus = Target + SetZ = 4,10 + SetZoomX = 4,50 + SetZoomY = 4,50 + MoveZoomX = 4,4,130 + MoveZoomY = 4,4,130 + MoveOpacity = 6,2,0 + SetVisible = 8,false + + Graphic = Fighting/Mach Punch spark + Focus = Target + Spawner = RandomDirection + SpawnQuantity = 12 + SetZ = 5,4 + SetZoomX = 5,50 + SetZoomY = 5,50 + SetOpacity = 5,0 + MoveOpacity = 5,1,255 + SetFrame = 7,1 + MoveZoomX = 9,6,0 + MoveZoomY = 9,6,0 + SetVisible = 15,false + + Play = 0,Fighting/Mach Punch From 63309a2ae93eb63383e560df27303728a9fb110a Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 13 May 2024 20:32:20 +0100 Subject: [PATCH 48/49] Anim Editor: added dark colour scheme --- .../Scripts/801_UI controls/001_UIControls.rb | 138 +++++++++++++ .../801_UI controls/002_ControlsContainer.rb | 13 ++ .../Control elements/001_BaseControl.rb | 17 +- .../Control elements/002_Label.rb | 2 +- .../Control elements/003_Checkbox.rb | 31 +-- .../Control elements/004_TextBox.rb | 15 +- .../Control elements/005_NumberSlider.rb | 8 +- .../Control elements/006_NumberTextBox.rb | 2 +- .../Control elements/007_Button.rb | 11 +- .../Control elements/009_List.rb | 21 +- .../Control elements/010_DropdownList.rb | 14 +- .../011_TextBoxDropdownList.rb | 16 +- .../Control elements/101_Scrollbar.rb | 13 +- .../904_Anim Editor/001_AnimationEditor.rb | 138 +++++++++---- .../002_AnimationEditor_popups.rb | 30 +-- .../904_Anim Editor/010_AnimationSelector.rb | 42 +++- .../Anim Editor elements/001_Canvas.rb | 13 +- .../Anim Editor elements/002_PlayControls.rb | 44 ++-- .../Anim Editor elements/003_ParticleList.rb | 194 ++++++++++-------- 19 files changed, 526 insertions(+), 236 deletions(-) diff --git a/Data/Scripts/801_UI controls/001_UIControls.rb b/Data/Scripts/801_UI controls/001_UIControls.rb index e3bed3025..43108441c 100644 --- a/Data/Scripts/801_UI controls/001_UIControls.rb +++ b/Data/Scripts/801_UI controls/001_UIControls.rb @@ -1,2 +1,140 @@ +#=============================================================================== # Container module for control classes. +#=============================================================================== module UIControls; end + +#=============================================================================== +# +#=============================================================================== +module UIControls::StyleMixin + COLOR_SCHEMES = { + :dark => { + :background_color => Color.new(32, 32, 32), + :text_color => Color.white, + :disabled_text_color => Color.new(96, 96, 96), + :line_color => Color.white, + :disabled_fill_color => Color.new(128, 128, 128), + :hover_color => Color.new(64, 80, 80), + :capture_color => Color.new(224, 32, 96), + :highlight_color => Color.new(160, 128, 16), + # Sidebars +# :delete_icon_color => Color.new(248, 96, 96), # Unchanged + # Checkbox + :checked_color => Color.new(32, 160, 32), + :unchecked_color => Color.new(160, 160, 160), + # ParticleList +# :position_line_color => Color.new(248, 96, 96), # Unchanged + :after_end_bg_color => Color.new(80, 80, 80), + :se_background_color => Color.new(160, 160, 160), + :property_background_color => Color.new(96, 96, 96), + # ParticleList and Canvas + :focus_colors => { + :foreground => Color.new(80, 112, 248), # Blue + :midground => Color.new(80, 112, 248), # Blue + :background => Color.new(80, 112, 248), # Blue + :user => Color.new(32, 192, 32), # Green + :target => Color.new(192, 32, 32), # Red + :user_and_target => Color.new(192, 192, 32), # Yellow + :user_side_foreground => Color.new(80, 208, 208), # Cyan + :user_side_background => Color.new(80, 208, 208), # Cyan + :target_side_foreground => Color.new(80, 208, 208), # Cyan + :target_side_background => Color.new(80, 208, 208) # Cyan + } + } + } + FOCUS_COLORS = { + :foreground => Color.new(128, 160, 248), # Blue + :midground => Color.new(128, 160, 248), # Blue + :background => Color.new(128, 160, 248), # Blue + :user => Color.new(64, 224, 64), # Green + :target => Color.new(224, 64, 64), # Red + :user_and_target => Color.new(224, 224, 64), # Yellow + :user_side_foreground => Color.new(128, 224, 224), # Cyan + :user_side_background => Color.new(128, 224, 224), # Cyan + :target_side_foreground => Color.new(128, 224, 224), # Cyan + :target_side_background => Color.new(128, 224, 224) # Cyan + } + + def color_scheme_options + return { + :light => _INTL("Light"), + :dark => _INTL("Dark") + } + end + + #----------------------------------------------------------------------------- + + def background_color + return get_color_scheme_color_for_element(:background_color, Color.white) + end + + def semi_transparent_color + return get_color_scheme_color_for_element(:semi_transparent_color, Color.new(0, 0, 0, 128)) + end + + #----------------------------------------------------------------------------- + + def text_color + return get_color_scheme_color_for_element(:text_color, Color.black) + end + + def disabled_text_color + return get_color_scheme_color_for_element(:disabled_text_color, Color.new(160, 160, 160)) + end + + def text_size + return 18 # Default is 22 if size isn't explicitly set + end + + def line_color + return get_color_scheme_color_for_element(:line_color, Color.black) + end + + def delete_icon_color + return get_color_scheme_color_for_element(:delete_icon_color, Color.new(248, 96, 96)) + end + + #----------------------------------------------------------------------------- + + def disabled_fill_color + return get_color_scheme_color_for_element(:disabled_fill_color, Color.gray) + end + + def hover_color + return get_color_scheme_color_for_element(:hover_color, Color.new(224, 255, 255)) + end + + def capture_color + return get_color_scheme_color_for_element(:capture_color, Color.new(255, 64, 128)) + end + + def highlight_color + return get_color_scheme_color_for_element(:highlight_color, Color.new(224, 192, 32)) + end + + #----------------------------------------------------------------------------- + + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + self.bitmap.font.color = text_color + self.bitmap.font.size = text_size + invalidate if self.respond_to?(:invalidate) + end + + def get_color_scheme_color_for_element(element, default) + if COLOR_SCHEMES[@color_scheme] && COLOR_SCHEMES[@color_scheme][element] + return COLOR_SCHEMES[@color_scheme][element] + end + return default + end + + def focus_color(focus) + if COLOR_SCHEMES[@color_scheme] && COLOR_SCHEMES[@color_scheme][:focus_colors] && + COLOR_SCHEMES[@color_scheme][:focus_colors][focus] + return COLOR_SCHEMES[@color_scheme][:focus_colors][focus] + end + return FOCUS_COLORS[focus] || Color.magenta + end + +end diff --git a/Data/Scripts/801_UI controls/002_ControlsContainer.rb b/Data/Scripts/801_UI controls/002_ControlsContainer.rb index c6d79a592..27019cf12 100644 --- a/Data/Scripts/801_UI controls/002_ControlsContainer.rb +++ b/Data/Scripts/801_UI controls/002_ControlsContainer.rb @@ -14,7 +14,10 @@ class UIControls::ControlsContainer OFFSET_FROM_LABEL_X = 100 OFFSET_FROM_LABEL_Y = 0 + include UIControls::StyleMixin + def initialize(x, y, width, height, right_margin = 0) + self.color_scheme = :light @viewport = Viewport.new(x, y, width, height) @viewport.z = 99999 @x = x @@ -45,6 +48,15 @@ class UIControls::ControlsContainer repaint if @visible end + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + if @controls + @controls.each { |c| c[1].color_scheme = value } + repaint + end + end + #----------------------------------------------------------------------------- def busy? @@ -215,6 +227,7 @@ class UIControls::ControlsContainer def add_control_at(id, control, x, y) control.x = x control.y = y + control.color_scheme = @color_scheme control.set_interactive_rects @controls.push([id, control]) repaint diff --git a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb index aef513672..40518718a 100644 --- a/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb +++ b/Data/Scripts/801_UI controls/Control elements/001_BaseControl.rb @@ -5,18 +5,13 @@ class UIControls::BaseControl < BitmapSprite attr_reader :value attr_accessor :disabled - TEXT_COLOR = Color.black - TEXT_SIZE = 18 # Default is 22 if size isn't explicitly set - TEXT_OFFSET_Y = 5 - HOVER_COLOR = Color.new(224, 255, 255) # For clickable area when hovering over it; light blue - CAPTURE_COLOR = Color.new(255, 64, 128) # For area you clicked in but aren't hovering over; hot pink - DISABLED_COLOR = Color.gray - DISABLED_COLOR_DARK = Color.new(128, 128, 128) + TEXT_OFFSET_Y = 5 + + include UIControls::StyleMixin def initialize(width, height, viewport) super(width, height, viewport) - self.bitmap.font.color = TEXT_COLOR - self.bitmap.font.size = TEXT_SIZE + self.color_scheme = :light @disabled = false @hover_area = nil # Is a symbol from the keys for @interactions if the mouse is hovering over that interaction @captured_area = nil # Is a symbol from the keys for @interactions (or :none) if this control is clicked in @@ -138,11 +133,11 @@ class UIControls::BaseControl < BitmapSprite if !@captured_area || @hover_area == @captured_area # Draw mouse hover over area highlight rect = @interactions[@hover_area] - self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, HOVER_COLOR) if rect + self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, hover_color) if rect elsif @captured_area # Draw captured area highlight rect = @interactions[@captured_area] - self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, CAPTURE_COLOR) if rect + self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, capture_color) if rect end end diff --git a/Data/Scripts/801_UI controls/Control elements/002_Label.rb b/Data/Scripts/801_UI controls/Control elements/002_Label.rb index 7f5695547..89ef4abc3 100644 --- a/Data/Scripts/801_UI controls/Control elements/002_Label.rb +++ b/Data/Scripts/801_UI controls/Control elements/002_Label.rb @@ -35,7 +35,7 @@ class UIControls::Label < UIControls::BaseControl # Draw underline text_size = self.bitmap.text_size(@text) self.bitmap.fill_rect((width - text_size.width) / 2, TEXT_OFFSET_Y + text_size.height, - text_size.width, 1, TEXT_COLOR) + text_size.width, 1, line_color) else draw_text(self.bitmap, 4, TEXT_OFFSET_Y, @text) end diff --git a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb index a4252cd75..e8aed50df 100644 --- a/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb +++ b/Data/Scripts/801_UI controls/Control elements/003_Checkbox.rb @@ -6,8 +6,6 @@ class UIControls::Checkbox < UIControls::BaseControl CHECKBOX_WIDTH = 40 CHECKBOX_HEIGHT = 24 CHECKBOX_FILL_SIZE = CHECKBOX_HEIGHT - 4 - UNCHECKED_COLOR = Color.gray - CHECKED_COLOR = Color.new(48, 192, 48) # Darkish green def initialize(width, height, viewport, value = false) super(width, height, viewport) @@ -22,6 +20,14 @@ class UIControls::Checkbox < UIControls::BaseControl invalidate end + def checked_color + return get_color_scheme_color_for_element(:checked_color, Color.new(48, 192, 48)) + end + + def unchecked_color + return get_color_scheme_color_for_element(:unchecked_color, Color.gray) + end + #----------------------------------------------------------------------------- def set_interactive_rects @@ -40,24 +46,23 @@ class UIControls::Checkbox < UIControls::BaseControl if disabled? self.bitmap.fill_rect(@checkbox_rect.x, @checkbox_rect.y, @checkbox_rect.width, @checkbox_rect.height, - DISABLED_COLOR) + disabled_fill_color) end # Draw checkbox outline self.bitmap.outline_rect(@checkbox_rect.x, @checkbox_rect.y, @checkbox_rect.width, @checkbox_rect.height, - self.bitmap.font.color) + line_color) # Draw checkbox fill - if @value # If checked - self.bitmap.fill_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 2, @checkbox_rect.y + 2, - CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, (disabled?) ? DISABLED_COLOR_DARK : CHECKED_COLOR) - self.bitmap.outline_rect(@checkbox_rect.x + @checkbox_rect.width - CHECKBOX_FILL_SIZE - 2, @checkbox_rect.y + 2, - CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) + box_x = (@value) ? @checkbox_rect.width - CHECKBOX_FILL_SIZE - 2 : 2 + if disabled? + box_color = disabled_text_color else - self.bitmap.fill_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, - CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, (disabled?) ? DISABLED_COLOR_DARK : UNCHECKED_COLOR) - self.bitmap.outline_rect(@checkbox_rect.x + 2, @checkbox_rect.y + 2, - CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, self.bitmap.font.color) + box_color = (@value) ? checked_color : unchecked_color end + self.bitmap.fill_rect(@checkbox_rect.x + box_x, @checkbox_rect.y + 2, + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, box_color) + self.bitmap.outline_rect(@checkbox_rect.x + box_x, @checkbox_rect.y + 2, + CHECKBOX_FILL_SIZE, CHECKBOX_FILL_SIZE, line_color) end #----------------------------------------------------------------------------- diff --git a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb index 773e7c15d..9cec69402 100644 --- a/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/004_TextBox.rb @@ -167,7 +167,7 @@ class UIControls::TextBox < UIControls::BaseControl return if !@cursor_shown || @cursor_pos < 0 cursor_y_offset = ((height - TEXT_BOX_HEIGHT) / 2) + 2 cursor_height = height - (cursor_y_offset * 2) - bitmap.fill_rect(cursor_x, cursor_y_offset, 2, cursor_height, self.bitmap.font.color) + bitmap.fill_rect(cursor_x, cursor_y_offset, 2, cursor_height, text_color) end def refresh @@ -176,12 +176,12 @@ class UIControls::TextBox < UIControls::BaseControl if disabled? self.bitmap.fill_rect(@text_box_rect.x, @text_box_rect.y, @text_box_rect.width, @text_box_rect.height, - DISABLED_COLOR) + disabled_fill_color) end # Draw text box outline self.bitmap.outline_rect(@text_box_rect.x, @text_box_rect.y, @text_box_rect.width, @text_box_rect.height, - self.bitmap.font.color) + line_color) # Draw value char_x = @text_box_rect.x + TEXT_BOX_PADDING last_char_index = @display_pos @@ -199,16 +199,17 @@ class UIControls::TextBox < UIControls::BaseControl # Draw cursor at end draw_cursor(char_x - 1) if @cursor_pos == @value.to_s.length # Draw left/right arrows to indicate more text beyond the text box sides + arrow_color = (disabled?) ? disabled_text_color : text_color if @display_pos > 0 - bitmap.fill_rect(@text_box_rect.x, (height / 2) - 4, 1, 8, Color.white) + bitmap.fill_rect(@text_box_rect.x, (height / 2) - 4, 1, 8, background_color) 5.times do |i| - bitmap.fill_rect(@text_box_rect.x - 2 + i, (height / 2) - (i + 1), 1, 2 * (i + 1), self.bitmap.font.color) + bitmap.fill_rect(@text_box_rect.x - 2 + i, (height / 2) - (i + 1), 1, 2 * (i + 1), arrow_color) end end if last_char_index < @value.to_s.length - 1 - bitmap.fill_rect(@text_box_rect.x + @text_box_rect.width - 1, (height / 2) - 4, 1, 8, Color.white) + bitmap.fill_rect(@text_box_rect.x + @text_box_rect.width - 1, (height / 2) - 4, 1, 8, background_color) 5.times do |i| - bitmap.fill_rect(@text_box_rect.x + @text_box_rect.width + 1 - i, (height / 2) - (i + 1), 1, 2 * (i + 1), self.bitmap.font.color) + bitmap.fill_rect(@text_box_rect.x + @text_box_rect.width + 1 - i, (height / 2) - (i + 1), 1, 2 * (i + 1), arrow_color) end end end diff --git a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb index 595a13d1a..3a80d1f3c 100644 --- a/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb +++ b/Data/Scripts/801_UI controls/Control elements/005_NumberSlider.rb @@ -62,7 +62,7 @@ class UIControls::NumberSlider < UIControls::BaseControl # the mouse doesn't need to be on the slider to change this control's value if @captured_area == :slider rect = @interactions[@captured_area] - self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, HOVER_COLOR) if rect + self.bitmap.fill_rect(rect.x, rect.y, rect.width, rect.height, hover_color) if rect else super end @@ -70,14 +70,14 @@ class UIControls::NumberSlider < UIControls::BaseControl def refresh super - button_color = (disabled?) ? DISABLED_COLOR : self.bitmap.font.color + button_color = (disabled?) ? disabled_text_color : text_color # Draw minus button self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, button_color) # Draw slider bar - self.bitmap.fill_rect(SLIDER_X, (self.height / 2) - 1, SLIDER_LENGTH, 2, self.bitmap.font.color) + self.bitmap.fill_rect(SLIDER_X, (self.height / 2) - 1, SLIDER_LENGTH, 2, text_color) # Draw notches on slider bar 5.times do |i| - self.bitmap.fill_rect(SLIDER_X - 1 + (i * SLIDER_LENGTH / 4), (self.height / 2) - 2, 2, 4, self.bitmap.font.color) + self.bitmap.fill_rect(SLIDER_X - 1 + (i * SLIDER_LENGTH / 4), (self.height / 2) - 2, 2, 4, text_color) end # Draw slider knob fraction = (self.value - self.min_value) / (self.max_value.to_f - self.min_value) diff --git a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb index 4b75c06a1..d0b8ecf1b 100644 --- a/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb +++ b/Data/Scripts/801_UI controls/Control elements/006_NumberTextBox.rb @@ -73,7 +73,7 @@ class UIControls::NumberTextBox < UIControls::TextBox def refresh super - button_color = (disabled?) ? DISABLED_COLOR : self.bitmap.font.color + button_color = (disabled?) ? disabled_text_color : text_color # Draw minus button self.bitmap.fill_rect(@minus_rect.x + 2, @minus_rect.y + (@minus_rect.height / 2) - 2, @minus_rect.width - 4, 4, button_color) # Draw plus button diff --git a/Data/Scripts/801_UI controls/Control elements/007_Button.rb b/Data/Scripts/801_UI controls/Control elements/007_Button.rb index 847737d32..c6d04a09d 100644 --- a/Data/Scripts/801_UI controls/Control elements/007_Button.rb +++ b/Data/Scripts/801_UI controls/Control elements/007_Button.rb @@ -7,7 +7,6 @@ class UIControls::Button < UIControls::BaseControl BUTTON_PADDING = 10 # Used when @fixed_size is false BUTTON_HEIGHT = 28 # Used when @fixed_size is false TEXT_BASE_OFFSET_Y = 18 # Text is centred vertically in the button - HIGHLIGHT_COLOR = Color.new(224, 192, 32) # Dark yellow def initialize(width, height, viewport, text = "") super(width, height, viewport) @@ -82,21 +81,21 @@ class UIControls::Button < UIControls::BaseControl # Draw highligted colour self.bitmap.fill_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - HIGHLIGHT_COLOR) + highlight_color) elsif disabled? # Draw disabled colour self.bitmap.fill_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - DISABLED_COLOR) + disabled_fill_color) end # Draw button outline self.bitmap.outline_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - self.bitmap.font.color) + line_color) # Draw inner grey ring that shows this is a button rather than a text box if !disabled? - shade = self.bitmap.font.color.clone - shade.alpha = 64 + shade = line_color.clone + shade.alpha = (shade.red > 128) ? 160 : 64 self.bitmap.outline_rect(@button_rect.x + 2, @button_rect.y + 2, @button_rect.width - 4, @button_rect.height - 4, shade, 1) diff --git a/Data/Scripts/801_UI controls/Control elements/009_List.rb b/Data/Scripts/801_UI controls/Control elements/009_List.rb index 0a3333d58..059602b12 100644 --- a/Data/Scripts/801_UI controls/Control elements/009_List.rb +++ b/Data/Scripts/801_UI controls/Control elements/009_List.rb @@ -6,7 +6,6 @@ class UIControls::List < UIControls::BaseControl ROW_HEIGHT = 24 TEXT_PADDING_X = 4 TEXT_OFFSET_Y = 3 - SELECTED_ROW_COLOR = Color.new(216, 192, 32) # Dark yellow def initialize(width, height, viewport, values = []) super(width, height, viewport) @@ -14,6 +13,7 @@ class UIControls::List < UIControls::BaseControl width - UIControls::Scrollbar::SLIDER_WIDTH - BORDER_THICKNESS, BORDER_THICKNESS, height - (BORDER_THICKNESS * 2), viewport ) + @scrollbar.color_scheme = @color_scheme @scrollbar.set_interactive_rects @scrollbar.range = ROW_HEIGHT @scrollbar.z = self.z + 1 @@ -51,6 +51,15 @@ class UIControls::List < UIControls::BaseControl @scrollbar.visible = new_val end + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + self.bitmap.font.color = text_color + self.bitmap.font.size = text_size + @scrollbar&.color_scheme = value + invalidate if self.respond_to?(:invalidate) + end + # Each value in @values is an array: [id, text]. def values=(new_vals) @values = new_vals @@ -131,7 +140,7 @@ class UIControls::List < UIControls::BaseControl if rect rect_y = rect.y rect_y -= @top_row * ROW_HEIGHT if @hover_area.is_a?(Integer) - self.bitmap.fill_rect(rect.x, rect_y, rect.width, rect.height, HOVER_COLOR) + self.bitmap.fill_rect(rect.x, rect_y, rect.width, rect.height, hover_color) end end @@ -143,7 +152,7 @@ class UIControls::List < UIControls::BaseControl def refresh super # Draw control outline - self.bitmap.outline_rect(0, 0, width, height, Color.black) + self.bitmap.outline_rect(0, 0, width, height, line_color) # Draw text options @values.each_with_index do |val, i| next if i < @top_row || i >= @top_row + @rows_count @@ -152,11 +161,11 @@ class UIControls::List < UIControls::BaseControl @interactions[i].x, @interactions[i].y - (@top_row * ROW_HEIGHT), @interactions[i].width, @interactions[i].height, - SELECTED_ROW_COLOR + highlight_color ) end txt = (val.is_a?(Array)) ? val[1] : val.to_s - text_color = TEXT_COLOR + old_text_color = self.bitmap.font.color if txt[/^\\c\[([0-9]+)\]/i] text_colors = [ [ 0, 112, 248], [120, 184, 232], # 1 Blue @@ -181,7 +190,7 @@ class UIControls::List < UIControls::BaseControl @interactions[i].x + TEXT_PADDING_X, @interactions[i].y + TEXT_OFFSET_Y - (@top_row * ROW_HEIGHT), txt) - self.bitmap.font.color = TEXT_COLOR + self.bitmap.font.color = old_text_color end end diff --git a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb index d4d7cc983..6587aae18 100644 --- a/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/010_DropdownList.rb @@ -63,12 +63,15 @@ class UIControls::DropdownList < UIControls::BaseControl @dropdown_menu_bg.x = self.x + @button_rect.x @dropdown_menu_bg.y = self.y + @button_rect.y + @button_rect.height @dropdown_menu_bg.z = self.z + 1 - @dropdown_menu_bg.bitmap.fill_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.white) + @dropdown_menu_bg.bitmap.font.color = text_color + @dropdown_menu_bg.bitmap.font.size = text_size + @dropdown_menu_bg.bitmap.fill_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, background_color) # Create menu @dropdown_menu = UIControls::List.new(@button_rect.width, menu_height, self.viewport, @options) @dropdown_menu.x = @dropdown_menu_bg.x @dropdown_menu.y = @dropdown_menu_bg.y @dropdown_menu.z = self.z + 2 + @dropdown_menu.color_scheme = @color_scheme @dropdown_menu.set_interactive_rects @dropdown_menu.repaint end @@ -95,23 +98,24 @@ class UIControls::DropdownList < UIControls::BaseControl if disabled? self.bitmap.fill_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - DISABLED_COLOR) + disabled_fill_color) end # Draw button outline self.bitmap.outline_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - self.bitmap.font.color) + line_color) # Draw value draw_text(self.bitmap, @button_rect.x + TEXT_BOX_PADDING, TEXT_OFFSET_Y, @options[@value] || "???") # Draw down arrow arrow_area_x = @button_rect.x + @button_rect.width - @button_rect.height + 1 arrow_area_width = @button_rect.height - 2 + arrow_color = (disabled?) ? disabled_text_color : text_color self.bitmap.fill_rect(arrow_area_x, @button_rect.y + 1, arrow_area_width, arrow_area_width, - (@hover_area && @captured_area != :button) ? HOVER_COLOR : Color.white) + (@hover_area && @captured_area != :button) ? hover_color : background_color) 6.times do |i| self.bitmap.fill_rect(arrow_area_x + (arrow_area_width / 2) - 5 + i, @button_rect.y + (arrow_area_width / 2) - 1 + i, - 11 - (2 * i), 1, (disabled?) ? DISABLED_COLOR_DARK : self.bitmap.font.color) + 11 - (2 * i), 1, arrow_color) end end diff --git a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb index 112a11abd..6da01e451 100644 --- a/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb +++ b/Data/Scripts/801_UI controls/Control elements/011_TextBoxDropdownList.rb @@ -59,12 +59,13 @@ class UIControls::TextBoxDropdownList < UIControls::TextBox @dropdown_menu_bg.x = self.x + @text_box_rect.x @dropdown_menu_bg.y = self.y + @text_box_rect.y + @text_box_rect.height @dropdown_menu_bg.z = self.z + 1 - @dropdown_menu_bg.bitmap.fill_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, Color.white) + @dropdown_menu_bg.bitmap.fill_rect(0, 0, @dropdown_menu_bg.width, @dropdown_menu_bg.height, background_color) # Create menu @dropdown_menu = UIControls::List.new(@text_box_rect.width + @button_rect.width, menu_height, self.viewport, @options) @dropdown_menu.x = @dropdown_menu_bg.x @dropdown_menu.y = @dropdown_menu_bg.y @dropdown_menu.z = self.z + 2 + @dropdown_menu.color_scheme = @color_scheme @dropdown_menu.set_interactive_rects @dropdown_menu.repaint end @@ -83,10 +84,10 @@ class UIControls::TextBoxDropdownList < UIControls::TextBox def draw_area_highlight highlight_color = nil if @captured_area == :text_box && !@hover_area && Input.press?(Input::MOUSELEFT) - highlight_color = CAPTURE_COLOR + highlight_color = capture_color elsif !@captured_area && [:text_box, :button].include?(@hover_area) # Draw mouse hover over area highlight - highlight_color = HOVER_COLOR + highlight_color = hover_color end return if !highlight_color [:text_box, :button].each do |area| @@ -102,21 +103,22 @@ class UIControls::TextBoxDropdownList < UIControls::TextBox if disabled? self.bitmap.fill_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - DISABLED_COLOR) + disabled_fill_color) end # Draw button outline self.bitmap.outline_rect(@button_rect.x, @button_rect.y, @button_rect.width, @button_rect.height, - self.bitmap.font.color) + line_color) # Draw down arrow arrow_area_x = @button_rect.x + @button_rect.width - @button_rect.height + 1 arrow_area_width = @button_rect.height - 2 + arrow_color = (disabled?) ? disabled_text_color : text_color # self.bitmap.fill_rect(arrow_area_x, @button_rect.y + 1, arrow_area_width, arrow_area_width, - # (@hover_area && @captured_area != :button) ? HOVER_COLOR : Color.white) + # (@hover_area && @captured_area != :button) ? hover_color : background_color) 6.times do |i| self.bitmap.fill_rect(arrow_area_x + (arrow_area_width / 2) - 5 + i, @button_rect.y + (arrow_area_width / 2) - 1 + i, - 11 - (2 * i), 1, (disabled?) ? DISABLED_COLOR_DARK : self.bitmap.font.color) + 11 - (2 * i), 1, arrow_color) end end diff --git a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb index 14a954bdd..e57bf4f84 100644 --- a/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb +++ b/Data/Scripts/801_UI controls/Control elements/101_Scrollbar.rb @@ -7,9 +7,6 @@ class UIControls::Scrollbar < UIControls::BaseControl SLIDER_WIDTH = 16 WIDTH_PADDING = 0 SCROLL_DISTANCE = 16 - TRAY_COLOR = Color.white - SLIDER_COLOR = Color.black - GRAB_COLOR = HOVER_COLOR # Cyan def initialize(x, y, size, viewport, horizontal = false, always_visible = false) if horizontal @@ -90,14 +87,14 @@ class UIControls::Scrollbar < UIControls::BaseControl super return if !self.visible # Draw the tray - self.bitmap.fill_rect(@slider_tray.x, @slider_tray.y, @slider_tray.width, @slider_tray.height, TRAY_COLOR) + self.bitmap.fill_rect(@slider_tray.x, @slider_tray.y, @slider_tray.width, @slider_tray.height, background_color) # Draw the slider - if @slider_size < @tray_size - bar_color = SLIDER_COLOR + if @slider_size < @tray_size && !disabled? if @captured_area == :slider || (!@captured_area && @hover_area == :slider) - bar_color = GRAB_COLOR + bar_color = hover_color + else + bar_color = text_color end - bar_color = DISABLED_COLOR if disabled? self.bitmap.fill_rect(@slider.x, @slider.y, @slider.width, @slider.height, bar_color) end end diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 1ea43b702..9e3e8ae68 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -1,3 +1,34 @@ +#=============================================================================== +# +#=============================================================================== +class AnimationEditor + module AnimationEditor::SettingsMixin + def load_settings + if File.file?(DEBUG_SETTINGS_FILE_PATH) + @settings = SaveData.get_data_from_file(DEBUG_SETTINGS_FILE_PATH)[:anim_editor] + else + @settings = { + :color_scheme => :light, + :side_sizes => [1, 1], # Player's side, opposing side + :user_index => 0, # 0, 2, 4 + :target_indices => [1], # There must be at least one valid target + :user_opposes => false, + :canvas_bg => "indoor1", + # NOTE: These sprite names are also used in Pokemon.play_cry and so + # should be a species ID (being a string is fine). + :user_sprite_name => "DRAGONITE", + :target_sprite_name => "CHARIZARD" + } + end + end + + def save_settings + data = { :anim_editor => @settings } + File.open(DEBUG_SETTINGS_FILE_PATH, "wb") { |file| Marshal.dump(data, file) } + end + end +end + #=============================================================================== # #=============================================================================== @@ -102,6 +133,9 @@ class AnimationEditor "./debug_settings.rxdata" end + include AnimationEditor::SettingsMixin + include UIControls::StyleMixin + #----------------------------------------------------------------------------- def initialize(anim_id, anim) @@ -116,6 +150,7 @@ class AnimationEditor initialize_components @captured = nil set_components_contents + self.color_scheme = @settings[:color_scheme] refresh end @@ -130,28 +165,39 @@ class AnimationEditor def initialize_bitmaps # Background for main editor - @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) - @screen_bitmap.z = -100 + if !@screen_bitmap + @screen_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @viewport) + @screen_bitmap.z = -100 + end # Semi-transparent black overlay to dim the screen while a pop-up window is open - @pop_up_bg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @pop_up_viewport) - @pop_up_bg_bitmap.z = -100 - @pop_up_bg_bitmap.visible = false + if !@pop_up_bg_bitmap + @pop_up_bg_bitmap = BitmapSprite.new(WINDOW_WIDTH, WINDOW_HEIGHT, @pop_up_viewport) + @pop_up_bg_bitmap.z = -100 + @pop_up_bg_bitmap.visible = false + end # Bitmaps for "delete this property change" buttons in the side pane - @delete_bitmap = Bitmap.new(16, 16) - @delete_disabled_bitmap = Bitmap.new(16, 16) + if !@delete_bitmap + @delete_bitmap = Bitmap.new(16, 16) + @delete_disabled_bitmap = Bitmap.new(16, 16) + end + @delete_bitmap.clear + @delete_disabled_bitmap.clear + icon_color = delete_icon_color + disabled_icon_color = disabled_text_color 14.times do |i| case i when 0, 13 then wid = 3 when 1, 12 then wid = 4 else wid = 5 end - @delete_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(248, 96, 96)) - @delete_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(248, 96, 96)) - @delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, Color.new(160, 160, 160)) - @delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, Color.new(160, 160, 160)) + @delete_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, icon_color) + @delete_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, icon_color) + @delete_disabled_bitmap.fill_rect([i - 1, 1].max, i + 1, wid, 1, disabled_icon_color) + @delete_disabled_bitmap.fill_rect([i - 1, 1].max, 14 - i, wid, 1, disabled_icon_color) end # Editor settings button bitmap - @editor_settings_bitmap = Bitmap.new(18, 18) + @editor_settings_bitmap = Bitmap.new(18, 18) if !@editor_settings_bitmap + @editor_settings_bitmap.clear settings_array = [ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, @@ -163,12 +209,13 @@ class AnimationEditor 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0 ] + icon_color = text_color settings_array.length.times do |i| next if settings_array[i] == 0 - @editor_settings_bitmap.fill_rect(i % 9, i / 9, 1, 1, Color.black) - @editor_settings_bitmap.fill_rect(17 - (i % 9), i / 9, 1, 1, Color.black) - @editor_settings_bitmap.fill_rect(i % 9, 17 - (i / 9), 1, 1, Color.black) - @editor_settings_bitmap.fill_rect(17 - (i % 9), 17 - (i / 9), 1, 1, Color.black) + @editor_settings_bitmap.fill_rect(i % 9, i / 9, 1, 1, icon_color) + @editor_settings_bitmap.fill_rect(17 - (i % 9), i / 9, 1, 1, icon_color) + @editor_settings_bitmap.fill_rect(i % 9, 17 - (i / 9), 1, 1, icon_color) + @editor_settings_bitmap.fill_rect(17 - (i % 9), 17 - (i / 9), 1, 1, icon_color) end # Draw in these bitmaps draw_editor_background @@ -243,29 +290,6 @@ class AnimationEditor return @components[:particle_list].particle_index end - def load_settings - if File.file?(DEBUG_SETTINGS_FILE_PATH) - @settings = SaveData.get_data_from_file(DEBUG_SETTINGS_FILE_PATH)[:anim_editor] - else - @settings = { - :side_sizes => [1, 1], # Player's side, opposing side - :user_index => 0, # 0, 2, 4 - :target_indices => [1], # There must be at least one valid target - :user_opposes => false, - :canvas_bg => "indoor1", - # NOTE: These sprite names are also used in Pokemon.play_cry and so - # should be a species ID (being a string is fine). - :user_sprite_name => "DRAGONITE", - :target_sprite_name => "CHARIZARD" - } - end - end - - def save_settings - data = { :anim_editor => @settings } - File.open(DEBUG_SETTINGS_FILE_PATH, "wb") { |file| Marshal.dump(data, file) } - end - def save AnimationEditor::ParticleDataHelper.optimize_all_particles(@anim[:particles]) GameData::Animation.register(@anim, @anim_id) @@ -281,6 +305,17 @@ class AnimationEditor save_settings end + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + return if !@components + initialize_bitmaps + @components.each do |component| + component[1].color_scheme = value if component[1].respond_to?("color_scheme=") + end + refresh + end + #----------------------------------------------------------------------------- # Returns the animation's name for display in the menu bar and elsewhere. @@ -383,6 +418,7 @@ class AnimationEditor def set_editor_settings_contents editor_settings = @components[:editor_settings] editor_settings.add_header_label(:header, _INTL("Editor settings")) + editor_settings.add_labelled_dropdown_list(:color_scheme, _INTL("Color scheme"), color_scheme_options, :light) editor_settings.add_labelled_dropdown_list(:side_size_1, _INTL("Side sizes"), { 1 => "1", 2 => "2", @@ -490,19 +526,21 @@ class AnimationEditor #----------------------------------------------------------------------------- def draw_editor_background + bg_color = background_color + contrast_color = line_color # Fill the whole screen with white - @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.white) + @screen_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, bg_color) # Outline around elements @screen_bitmap.bitmap.border_rect(CANVAS_X, CANVAS_Y, CANVAS_WIDTH, CANVAS_HEIGHT, - BORDER_THICKNESS, Color.white, Color.black) + BORDER_THICKNESS, bg_color, contrast_color) @screen_bitmap.bitmap.border_rect(PLAY_CONTROLS_X, PLAY_CONTROLS_Y, PLAY_CONTROLS_WIDTH, PLAY_CONTROLS_HEIGHT, - BORDER_THICKNESS, Color.white, Color.black) + BORDER_THICKNESS, bg_color, contrast_color) @screen_bitmap.bitmap.border_rect(SIDE_PANE_X, SIDE_PANE_Y, SIDE_PANE_WIDTH, SIDE_PANE_HEIGHT, - BORDER_THICKNESS, Color.white, Color.black) + BORDER_THICKNESS, bg_color, contrast_color) @screen_bitmap.bitmap.border_rect(PARTICLE_LIST_X, PARTICLE_LIST_Y, PARTICLE_LIST_WIDTH, PARTICLE_LIST_HEIGHT, - BORDER_THICKNESS, Color.white, Color.black) + BORDER_THICKNESS, bg_color, contrast_color) # Make the pop-up background semi-transparent - @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) + @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, semi_transparent_color) end #----------------------------------------------------------------------------- @@ -706,6 +744,9 @@ class AnimationEditor end when :editor_settings case property + when :color_scheme + @settings[:color_scheme] = value + self.color_scheme = value when :side_size_1 old_val = @settings[:side_sizes][0] @settings[:side_sizes][0] = value @@ -943,6 +984,13 @@ class AnimationEditor @components[:particle_list].set_particles(@anim[:particles]) refresh end + elsif Input.triggerex?(:C) + options = color_scheme_options.keys + this_index = options.index(@color_scheme || :light) || 0 + new_index = (this_index + 1) % options.length + @settings[:color_scheme] = options[new_index] + self.color_scheme = @settings[:color_scheme] + save_settings end end diff --git a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb index 2b399fe1c..55bef5498 100644 --- a/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb +++ b/Data/Scripts/904_Anim Editor/002_AnimationEditor_popups.rb @@ -2,19 +2,22 @@ # #=============================================================================== class AnimationEditor - def create_pop_up_window(width, height) - ret = BitmapSprite.new(width + (BORDER_THICKNESS * 2), - height + (BORDER_THICKNESS * 2), @pop_up_viewport) - ret.x = (WINDOW_WIDTH - ret.width) / 2 - ret.y = (WINDOW_HEIGHT - ret.height) / 2 - ret.z = -1 - ret.bitmap.font.color = Color.black - ret.bitmap.font.size = 18 + def create_pop_up_window(width, height, ret = nil) + if !ret + ret = BitmapSprite.new(width + (BORDER_THICKNESS * 2), + height + (BORDER_THICKNESS * 2), @pop_up_viewport) + ret.x = (WINDOW_WIDTH - ret.width) / 2 + ret.y = (WINDOW_HEIGHT - ret.height) / 2 + ret.z = -1 + end + ret.bitmap.clear + ret.bitmap.font.color = text_color + ret.bitmap.font.size = text_size # Draw pop-up box border ret.bitmap.border_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, - BORDER_THICKNESS, Color.white, Color.black) + BORDER_THICKNESS, background_color, line_color) # Fill pop-up box with white - ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, Color.white) + ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, background_color) return ret end @@ -35,6 +38,7 @@ class AnimationEditor btn.x += MESSAGE_BOX_BUTTON_WIDTH * i btn.y = msg_bitmap.y + msg_bitmap.height - MESSAGE_BOX_BUTTON_HEIGHT - MESSAGE_BOX_SPACING btn.set_fixed_size + btn.color_scheme = @color_scheme btn.set_interactive_rects buttons.push([option[0], btn]) end @@ -130,6 +134,7 @@ class AnimationEditor editor_settings.visible = true # Set control values refresh_component(:editor_settings) + editor_settings.get_control(:color_scheme).value = @settings[:color_scheme] || :light editor_settings.get_control(:side_size_1).value = @settings[:side_sizes][0] editor_settings.get_control(:side_size_2).value = @settings[:side_sizes][1] editor_settings.get_control(:user_index).value = @settings[:user_index] @@ -148,6 +153,7 @@ class AnimationEditor break if editor_settings.values.keys.include?(:close) editor_settings.values.each_pair do |property, value| apply_changed_value(:editor_settings, property, value) + create_pop_up_window(ANIM_PROPERTIES_WIDTH, ANIM_PROPERTIES_HEIGHT, bg_bitmap) end editor_settings.clear_changed end @@ -222,7 +228,7 @@ class AnimationEditor bg_bitmap.bitmap.outline_rect(BORDER_THICKNESS + list.x + list.width + 6, BORDER_THICKNESS + list.y, GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, GRAPHIC_CHOOSER_PREVIEW_SIZE + 4, - Color.black) + line_color) preview_sprite = Sprite.new(@pop_up_viewport) preview_sprite.x = graphic_chooser.x + list.x + list.width + 8 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) preview_sprite.y = graphic_chooser.y + list.y + 2 + (GRAPHIC_CHOOSER_PREVIEW_SIZE / 2) @@ -251,7 +257,7 @@ class AnimationEditor preview_bitmap = AnimatedBitmap.new(folder + fname) bg_bitmap.bitmap.fill_rect(BORDER_THICKNESS + list.x + list.width + 8, BORDER_THICKNESS + list.y + 2, GRAPHIC_CHOOSER_PREVIEW_SIZE, GRAPHIC_CHOOSER_PREVIEW_SIZE, - Color.white) + background_color) next if !preview_bitmap sprite.bitmap = preview_bitmap.bitmap zoom = [[GRAPHIC_CHOOSER_PREVIEW_SIZE.to_f / preview_bitmap.width, diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index 4f2107b7c..cbb66a67c 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -44,7 +44,11 @@ class AnimationEditor::AnimationSelector MESSAGE_BOX_BUTTON_HEIGHT = 32 MESSAGE_BOX_SPACING = 16 + include AnimationEditor::SettingsMixin + include UIControls::StyleMixin + def initialize + load_settings @animation_type = 0 # 0=move, 1=common @filter_text = "" @quit = false @@ -52,6 +56,7 @@ class AnimationEditor::AnimationSelector initialize_viewports initialize_bitmaps initialize_controls + self.color_scheme = @settings[:color_scheme] refresh end @@ -132,11 +137,21 @@ class AnimationEditor::AnimationSelector #----------------------------------------------------------------------------- + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + draw_editor_background + @components.color_scheme = value + refresh + end + + #----------------------------------------------------------------------------- + def draw_editor_background # Fill the whole screen with white - @screen_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.white) + @screen_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, background_color) # Make the pop-up background semi-transparent - @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, Color.new(0, 0, 0, 128)) + @pop_up_bg_bitmap.bitmap.fill_rect(0, 0, AnimationEditor::WINDOW_WIDTH, AnimationEditor::WINDOW_HEIGHT, semi_transparent_color) end #----------------------------------------------------------------------------- @@ -147,13 +162,13 @@ class AnimationEditor::AnimationSelector ret.x = (AnimationEditor::WINDOW_WIDTH - ret.width) / 2 ret.y = (AnimationEditor::WINDOW_HEIGHT - ret.height) / 2 ret.z = -1 - ret.bitmap.font.color = Color.black - ret.bitmap.font.size = 18 + ret.bitmap.font.color = text_color + ret.bitmap.font.size = text_size # Draw pop-up box border ret.bitmap.border_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, - BORDER_THICKNESS, Color.white, Color.black) + BORDER_THICKNESS, background_color, line_color) # Fill pop-up box with white - ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, Color.white) + ret.bitmap.fill_rect(BORDER_THICKNESS, BORDER_THICKNESS, width, height, background_color) return ret end @@ -174,6 +189,7 @@ class AnimationEditor::AnimationSelector btn.x += MESSAGE_BOX_BUTTON_WIDTH * i btn.y = msg_bitmap.y + msg_bitmap.height - MESSAGE_BOX_BUTTON_HEIGHT - MESSAGE_BOX_SPACING btn.set_fixed_size + btn.color_scheme = @color_scheme btn.set_interactive_rects buttons.push([option[0], btn]) end @@ -351,6 +367,8 @@ class AnimationEditor::AnimationSelector if anim_id screen = AnimationEditor.new(anim_id, GameData::Animation.get(anim_id).clone_as_hash) screen.run + load_settings + self.color_scheme = @settings[:color_scheme] generate_full_lists end when :copy @@ -379,6 +397,17 @@ class AnimationEditor::AnimationSelector refresh end + def update_input + if Input.triggerex?(:C) + options = color_scheme_options.keys + this_index = options.index(@color_scheme || :light) || 0 + new_index = (this_index + 1) % options.length + @settings[:color_scheme] = options[new_index] + self.color_scheme = @settings[:color_scheme] + save_settings + end + end + def update @components.update if @components.changed? @@ -394,6 +423,7 @@ class AnimationEditor::AnimationSelector apply_list_filter refresh end + update_input if !@components.busy? end def run diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb index d38645e59..6079e506c 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/001_Canvas.rb @@ -19,6 +19,8 @@ class AnimationEditor::Canvas < Sprite FRAME_SIZE = 48 PARTICLE_FRAME_COLOR = Color.new(0, 0, 0, 64) + include UIControls::StyleMixin + def initialize(viewport, anim, settings) super(viewport) @anim = anim @@ -156,6 +158,14 @@ class AnimationEditor::Canvas < Sprite return true end + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + self.bitmap.font.color = text_color + self.bitmap.font.size = text_size + refresh + end + def selected_particle=(val) return if @selected_particle == val @selected_particle = val @@ -543,8 +553,7 @@ class AnimationEditor::Canvas < Sprite def refresh_particle_frame return if !show_particle_sprite?(@selected_particle) - focus = @anim[:particles][@selected_particle][:focus] - frame_color = AnimationEditor::ParticleList::CONTROL_BG_COLORS[focus] || Color.magenta + frame_color = focus_color(@anim[:particles][@selected_particle][:focus]) @sel_frame_bitmap.outline_rect(1, 1, @sel_frame_bitmap.width - 2, @sel_frame_bitmap.height - 2, frame_color) update_selected_particle_frame end diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb index 36ee380eb..f3bacac5d 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/002_PlayControls.rb @@ -22,7 +22,6 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer DURATION_LABEL_Y = SLOWDOWN_LABEL_Y DURATION_VALUE_Y = ROW_HEIGHT SLOWDOWN_FACTORS = [1, 2, 4, 6, 8] - ICON_COLOR = Color.black def initialize(x, y, width, height, viewport) super(x, y, width, height) @@ -42,23 +41,25 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer #----------------------------------------------------------------------------- def generate_button_bitmaps - @bitmaps = {} - play_button = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) + @bitmaps = {} if !@bitmaps + icon_color = text_color + @bitmaps[:play_button] = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) if !@bitmaps[:play_button] + @bitmaps[:play_button].clear (PLAY_BUTTON_SIZE - 10).times do |j| - play_button.fill_rect(11, j + 5, (j >= (PLAY_BUTTON_SIZE - 10) / 2) ? PLAY_BUTTON_SIZE - j - 4 : j + 7, 1, ICON_COLOR) + @bitmaps[:play_button].fill_rect(11, j + 5, (j >= (PLAY_BUTTON_SIZE - 10) / 2) ? PLAY_BUTTON_SIZE - j - 4 : j + 7, 1, icon_color) end - @bitmaps[:play_button] = play_button - stop_button = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) - stop_button.fill_rect(8, 8, PLAY_BUTTON_SIZE - 16, PLAY_BUTTON_SIZE - 16, ICON_COLOR) - @bitmaps[:stop_button] = stop_button + @bitmaps[:stop_button] = Bitmap.new(PLAY_BUTTON_SIZE, PLAY_BUTTON_SIZE) if !@bitmaps[:stop_button] + @bitmaps[:stop_button].clear + @bitmaps[:stop_button].fill_rect(8, 8, PLAY_BUTTON_SIZE - 16, PLAY_BUTTON_SIZE - 16, icon_color) # Loop button - play_once_button = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) - play_once_button.fill_rect(1, 7, 11, 2, ICON_COLOR) - play_once_button.fill_rect(8, 5, 2, 6, ICON_COLOR) - play_once_button.fill_rect(10, 6, 1, 4, ICON_COLOR) - play_once_button.fill_rect(13, 1, 2, 14, ICON_COLOR) - @bitmaps[:play_once_button] = play_once_button - looping_button = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) + @bitmaps[:play_once_button] = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) if !@bitmaps[:play_once_button] + @bitmaps[:play_once_button].clear + @bitmaps[:play_once_button].fill_rect(1, 7, 11, 2, icon_color) + @bitmaps[:play_once_button].fill_rect(8, 5, 2, 6, icon_color) + @bitmaps[:play_once_button].fill_rect(10, 6, 1, 4, icon_color) + @bitmaps[:play_once_button].fill_rect(13, 1, 2, 14, icon_color) + @bitmaps[:looping_button] = Bitmap.new(LOOP_BUTTON_SIZE, LOOP_BUTTON_SIZE) if !@bitmaps[:looping_button] + @bitmaps[:looping_button].clear [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, @@ -74,9 +75,8 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0].each_with_index do |val, i| next if val == 0 - looping_button.fill_rect(1 + (i % 14), 1 + (i / 14), 1, 1, ICON_COLOR) + @bitmaps[:looping_button].fill_rect(1 + (i % 14), 1 + (i / 14), 1, 1, icon_color) end - @bitmaps[:looping_button] = looping_button end def add_play_controls @@ -143,6 +143,16 @@ class AnimationEditor::PlayControls < UIControls::ControlsContainer refresh end + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + generate_button_bitmaps + if @controls + @controls.each { |c| c[1].color_scheme = value } + repaint + end + end + #----------------------------------------------------------------------------- def prepare_to_play_animation diff --git a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb index 988d9a4a8..f81b0866e 100644 --- a/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb +++ b/Data/Scripts/904_Anim Editor/Anim Editor elements/003_ParticleList.rb @@ -23,22 +23,6 @@ class AnimationEditor::ParticleList < UIControls::BaseControl INTERP_LINE_HEIGHT = KEYFRAME_SPACING - ((DIAMOND_SIZE * 2) + 3) INTERP_LINE_Y = (ROW_HEIGHT / 2) - (INTERP_LINE_HEIGHT / 2) DURATION_BUFFER = 20 # Extra keyframes shown after the animation's end - PROPERTY_BG_COLOR = Color.new(224, 224, 224) - CONTROL_BG_COLORS = { - :foreground => Color.new(128, 160, 248), # Blue - :midground => Color.new(128, 160, 248), # Blue - :background => Color.new(128, 160, 248), # Blue - :user => Color.new(64, 224, 64), # Green - :target => Color.new(224, 64, 64), # Red - :user_and_target => Color.new(224, 224, 64), # Yellow - :user_side_foreground => Color.new(128, 224, 224), # Cyan - :user_side_background => Color.new(128, 224, 224), # Cyan - :target_side_foreground => Color.new(128, 224, 224), # Cyan - :target_side_background => Color.new(128, 224, 224) # Cyan - } - SE_CONTROL_BG_COLOR = Color.gray - TIME_AFTER_ANIMATION_COLOR = Color.new(160, 160, 160) - POSITION_LINE_COLOR = Color.new(248, 96, 96) attr_reader :keyframe # The selected keyframe attr_reader :values @@ -116,20 +100,26 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @timeline_sprite = BitmapSprite.new(@commands_viewport.rect.width, TIMELINE_HEIGHT, self.viewport) @timeline_sprite.x = @commands_viewport.rect.x @timeline_sprite.y = self.y - @timeline_sprite.bitmap.font.color = TEXT_COLOR + @timeline_sprite.bitmap.font.color = text_color @timeline_sprite.bitmap.font.size = TIMELINE_TEXT_SIZE end def initialize_selection_bitmaps # Position line sprite - @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @position_viewport) - @position_sprite.ox = @position_sprite.width / 2 - @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, POSITION_LINE_COLOR) + if !@position_sprite + @position_sprite = BitmapSprite.new(3, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, @position_viewport) + @position_sprite.ox = @position_sprite.width / 2 + end + @position_sprite.bitmap.clear + @position_sprite.bitmap.fill_rect(0, 0, @position_sprite.bitmap.width, @position_sprite.bitmap.height, position_line_color) # Selected particle line sprite - @particle_line_sprite = BitmapSprite.new(@position_viewport.rect.width, 3, @commands_viewport) - @particle_line_sprite.z = -10 - @particle_line_sprite.oy = @particle_line_sprite.height / 2 - @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, POSITION_LINE_COLOR) + if !@particle_line_sprite + @particle_line_sprite = BitmapSprite.new(@position_viewport.rect.width, 3, @commands_viewport) + @particle_line_sprite.z = -10 + @particle_line_sprite.oy = @particle_line_sprite.height / 2 + end + @particle_line_sprite.bitmap.clear + @particle_line_sprite.bitmap.fill_rect(0, 0, @particle_line_sprite.bitmap.width, @particle_line_sprite.bitmap.height, position_line_color) end def initialize_controls @@ -147,23 +137,22 @@ class AnimationEditor::ParticleList < UIControls::BaseControl end def generate_button_bitmaps - @bitmaps = {} - add_button = Bitmap.new(12, 12) - add_button.fill_rect(1, 5, 10, 2, TEXT_COLOR) - add_button.fill_rect(5, 1, 2, 10, TEXT_COLOR) - @bitmaps[:add_button] = add_button - up_button = Bitmap.new(12, 12) + @bitmaps = {} if !@bitmaps + @bitmaps[:add_button] = Bitmap.new(12, 12) if !@bitmaps[:add_button] + @bitmaps[:add_button].clear + @bitmaps[:add_button].fill_rect(1, 5, 10, 2, text_color) + @bitmaps[:add_button].fill_rect(5, 1, 2, 10, text_color) + @bitmaps[:up_button] = Bitmap.new(12, 12) if !@bitmaps[:up_button] + @bitmaps[:up_button].clear 5.times do |i| - up_button.fill_rect(1 + i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) - up_button.fill_rect(10 - i, 7 - i, 1, (i == 0) ? 2 : 3, TEXT_COLOR) + @bitmaps[:up_button].fill_rect(1 + i, 7 - i, 1, (i == 0) ? 2 : 3, text_color) + @bitmaps[:up_button].fill_rect(10 - i, 7 - i, 1, (i == 0) ? 2 : 3, text_color) end - @bitmaps[:up_button] = up_button - down_button = Bitmap.new(12, 12) + @bitmaps[:down_button] = Bitmap.new(12, 12) if !@bitmaps[:down_button] 5.times do |i| - down_button.fill_rect(1 + i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) - down_button.fill_rect(10 - i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, TEXT_COLOR) + @bitmaps[:down_button].fill_rect(1 + i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, text_color) + @bitmaps[:down_button].fill_rect(10 - i, 2 + i + (i == 0 ? 1 : 0), 1, (i == 0) ? 2 : 3, text_color) end - @bitmaps[:down_button] = down_button end def dispose @@ -195,6 +184,39 @@ class AnimationEditor::ParticleList < UIControls::BaseControl #----------------------------------------------------------------------------- + def position_line_color + return get_color_scheme_color_for_element(:position_line_color, Color.new(248, 96, 96)) + end + + def after_end_bg_color + return get_color_scheme_color_for_element(:after_end_bg_color, Color.new(160, 160, 160)) + end + + def se_background_color + return get_color_scheme_color_for_element(:se_background_color, Color.gray) + end + + def property_background_color + return get_color_scheme_color_for_element(:property_background_color, Color.new(224, 224, 224)) + end + + def color_scheme=(value) + return if @color_scheme == value + @color_scheme = value + return if !@bitmaps + draw_control_background + initialize_selection_bitmaps + generate_button_bitmaps + self.bitmap.font.color = text_color + self.bitmap.font.size = text_size + @list_scrollbar.color_scheme = value + @time_scrollbar.color_scheme = value + @timeline_sprite.bitmap.font.color = text_color + @controls.each { |c| c[1].color_scheme = value } + @list_sprites.each { |spr| spr.bitmap.font.color = text_color } + invalidate + end + def duration return [@duration - DURATION_BUFFER, 0].max end @@ -342,18 +364,18 @@ class AnimationEditor::ParticleList < UIControls::BaseControl @particle_list.length.times do list_sprite = BitmapSprite.new(@list_viewport.rect.width, ROW_HEIGHT, @list_viewport) list_sprite.y = @list_sprites.length * ROW_HEIGHT - list_sprite.bitmap.font.color = TEXT_COLOR - list_sprite.bitmap.font.size = TEXT_SIZE + list_sprite.bitmap.font.color = text_color + list_sprite.bitmap.font.size = text_size @list_sprites.push(list_sprite) commands_bg_sprite = BitmapSprite.new(@commands_viewport.rect.width, ROW_HEIGHT, @commands_bg_viewport) commands_bg_sprite.y = @commands_bg_sprites.length * ROW_HEIGHT - commands_bg_sprite.bitmap.font.color = TEXT_COLOR - commands_bg_sprite.bitmap.font.size = TEXT_SIZE + commands_bg_sprite.bitmap.font.color = text_color + commands_bg_sprite.bitmap.font.size = text_size @commands_bg_sprites.push(commands_bg_sprite) commands_sprite = BitmapSprite.new(@commands_viewport.rect.width, ROW_HEIGHT, @commands_viewport) commands_sprite.y = @commands_sprites.length * ROW_HEIGHT - commands_sprite.bitmap.font.color = TEXT_COLOR - commands_sprite.bitmap.font.size = TEXT_SIZE + commands_sprite.bitmap.font.color = text_color + commands_sprite.bitmap.font.size = text_size @commands_sprites.push(commands_sprite) end # Set scrollbars to the correct lengths @@ -559,10 +581,10 @@ class AnimationEditor::ParticleList < UIControls::BaseControl def draw_control_background self.bitmap.clear # Separator lines - self.bitmap.fill_rect(0, TIMELINE_HEIGHT, width, VIEWPORT_SPACING, Color.black) - self.bitmap.fill_rect(LIST_WIDTH, 0, VIEWPORT_SPACING, height, Color.black) - self.bitmap.fill_rect(0, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, width, VIEWPORT_SPACING, Color.black) - self.bitmap.fill_rect(width - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, 0, VIEWPORT_SPACING, height, Color.black) + self.bitmap.fill_rect(0, TIMELINE_HEIGHT, width, VIEWPORT_SPACING, line_color) + self.bitmap.fill_rect(LIST_WIDTH, 0, VIEWPORT_SPACING, height, line_color) + self.bitmap.fill_rect(0, height - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, width, VIEWPORT_SPACING, line_color) + self.bitmap.fill_rect(width - UIControls::Scrollbar::SLIDER_WIDTH - VIEWPORT_SPACING, 0, VIEWPORT_SPACING, height, line_color) end #----------------------------------------------------------------------------- @@ -582,26 +604,26 @@ class AnimationEditor::ParticleList < UIControls::BaseControl draw_x = TIMELINE_LEFT_BUFFER + (dur * KEYFRAME_SPACING) - @left_pos greyed_width = @time_bg_sprite.width - draw_x if greyed_width > 0 - @time_bg_sprite.bitmap.fill_rect(draw_x, 0, greyed_width, @time_bg_sprite.height, TIME_AFTER_ANIMATION_COLOR) - @time_bg_sprite.bitmap.fill_rect(draw_x, TIMELINE_HEIGHT, greyed_width, VIEWPORT_SPACING, Color.black) + @time_bg_sprite.bitmap.fill_rect(draw_x, 0, greyed_width, @time_bg_sprite.height, after_end_bg_color) + @time_bg_sprite.bitmap.fill_rect(draw_x, TIMELINE_HEIGHT, greyed_width, VIEWPORT_SPACING, line_color) end # Draw hover highlight if !controls_busy? - hover_color = nil + this_hover_color = nil if @captured_keyframe && !@captured_row if @hover_keyframe && @hover_keyframe == @captured_keyframe && !@hover_row - hover_color = HOVER_COLOR + this_hover_color = hover_color else - hover_color = CAPTURE_COLOR + this_hover_color = capture_color end draw_x = TIMELINE_LEFT_BUFFER + (@captured_keyframe * KEYFRAME_SPACING) - @left_pos @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, - KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) + KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, this_hover_color) elsif !@captured_keyframe && !@captured_row && @hover_keyframe && !@hover_row - hover_color = HOVER_COLOR + this_hover_color = hover_color draw_x = TIMELINE_LEFT_BUFFER + (@hover_keyframe * KEYFRAME_SPACING) - @left_pos @timeline_sprite.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 0, - KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, hover_color) + KEYFRAME_SPACING, TIMELINE_HEIGHT - 1, this_hover_color) end end # Draw timeline markings @@ -613,7 +635,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl elsif (i % 5) == 0 line_height = TIMELINE_HEIGHT / 2 end - @timeline_sprite.bitmap.fill_rect(draw_x, TIMELINE_HEIGHT - line_height, 1, line_height, TEXT_COLOR) + @timeline_sprite.bitmap.fill_rect(draw_x, TIMELINE_HEIGHT - line_height, 1, line_height, text_color) draw_text(@timeline_sprite.bitmap, draw_x + 1, 0, (i / 20.0).to_s) if (i % 5) == 0 end end @@ -644,11 +666,11 @@ class AnimationEditor::ParticleList < UIControls::BaseControl box_x += LIST_INDENT if is_property # Get the background color if particle_data[:name] == "SE" - bg_color = SE_CONTROL_BG_COLOR + bg_color = se_background_color elsif is_property - bg_color = PROPERTY_BG_COLOR + bg_color = property_background_color else - bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta + bg_color = focus_color(@particles[p_index][:focus]) end # Draw hover highlight if !controls_busy? && !@captured_keyframe @@ -657,21 +679,21 @@ class AnimationEditor::ParticleList < UIControls::BaseControl if @captured_row == index if !@hover_keyframe && @hover_row && @hover_row == index && @captured_row_button && @hover_row_button == @captured_row_button - hover_color = HOVER_COLOR + this_hover_color = hover_color else - hover_color = CAPTURE_COLOR + this_hover_color = capture_color end end elsif @hover_row && @hover_row == index && !@hover_keyframe - hover_color = HOVER_COLOR + this_hover_color = hover_color end - if hover_color + if this_hover_color case @captured_row_button || @hover_row_button when :expand spr.bitmap.fill_rect(EXPAND_BUTTON_X, (ROW_HEIGHT - EXPAND_BUTTON_WIDTH + 1) / 2, - EXPAND_BUTTON_WIDTH, EXPAND_BUTTON_WIDTH, hover_color) + EXPAND_BUTTON_WIDTH, EXPAND_BUTTON_WIDTH, this_hover_color) when :row - spr.bitmap.fill_rect(box_x, ROW_SPACING, spr.width - box_x, spr.height - ROW_SPACING, hover_color) + spr.bitmap.fill_rect(box_x, ROW_SPACING, spr.width - box_x, spr.height - ROW_SPACING, this_hover_color) end end end @@ -684,12 +706,14 @@ class AnimationEditor::ParticleList < UIControls::BaseControl draw_text(spr.bitmap, box_x + 4, 3, @particles[p_index][:name] || "Unnamed") end # Draw expand/collapse arrow or dotted lines + icon_color = text_color + dotted_color = line_color if is_property 6.times do |j| - spr.bitmap.fill_rect(10, j * 2, 1, 1, Color.black) + spr.bitmap.fill_rect(10, j * 2, 1, 1, dotted_color) end 9.times do |i| - spr.bitmap.fill_rect(10 + (i * 2), 12, 1, 1, Color.black) + spr.bitmap.fill_rect(10 + (i * 2), 12, 1, 1, dotted_color) end elsif @expanded_particles.include?(p_index) # Draw down-pointing arrow @@ -697,7 +721,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl j = (i == 0 || i == 10) ? 1 : 0 h = [2, 4, 5, 6, 7, 8, 7, 6, 5, 4, 2][i] h = ((i > 5) ? 10 - i : i) + 3 - j - spr.bitmap.fill_rect(5 + i, 9 + j, 1, h, Color.black) + spr.bitmap.fill_rect(5 + i, 9 + j, 1, h, icon_color) end elsif particle_data[:name] != "SE" # Draw right-pointing arrow @@ -705,13 +729,13 @@ class AnimationEditor::ParticleList < UIControls::BaseControl i = (j == 0 || j == 10) ? 1 : 0 w = [2, 4, 5, 6, 7, 8, 7, 6, 5, 4, 2][j] w = ((j > 5) ? 10 - j : j) + 3 - i - spr.bitmap.fill_rect(7 + i, 7 + j, w, 1, Color.black) + spr.bitmap.fill_rect(7 + i, 7 + j, w, 1, icon_color) end end # Draw dotted line leading to the next property line if @particle_list[index + 1]&.is_a?(Array) 5.times do |j| - spr.bitmap.fill_rect(10, 14 + (j * 2), 1, 1, Color.black) + spr.bitmap.fill_rect(10, 14 + (j * 2), 1, 1, dotted_color) end end end @@ -725,11 +749,11 @@ class AnimationEditor::ParticleList < UIControls::BaseControl particle_data = @particles[p_index] # Get the background color if particle_data[:name] == "SE" - bg_color = SE_CONTROL_BG_COLOR + bg_color = se_background_color elsif is_property - bg_color = PROPERTY_BG_COLOR + bg_color = property_background_color else - bg_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta + bg_color = focus_color(@particles[p_index][:focus]) end # Get visibilities of particle for each keyframe visible_cmds = @visibilities[p_index] @@ -741,7 +765,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, KEYFRAME_SPACING, ROW_HEIGHT - ROW_SPACING, bg_color) end # Draw hover highlight - hover_color = nil + this_hover_color = nil if !controls_busy? earlier_captured_keyframe = @captured_keyframe later_captured_keyframe = (earlier_captured_keyframe || -1) + 1 @@ -754,30 +778,30 @@ class AnimationEditor::ParticleList < UIControls::BaseControl if @captured_row && @captured_keyframe if @captured_row == index && i >= earlier_captured_keyframe && i < later_captured_keyframe if @hover_row && @hover_row == index && @hover_keyframe && i >= earlier_hovered_keyframe && i < later_hovered_keyframe - hover_color = HOVER_COLOR + this_hover_color = hover_color else - hover_color = CAPTURE_COLOR + this_hover_color = capture_color end end elsif !@captured_row && !@captured_keyframe && @hover_row && @hover_keyframe && @hover_row == index && i >= earlier_hovered_keyframe && i < later_hovered_keyframe - hover_color = HOVER_COLOR + this_hover_color = hover_color end end - if hover_color + if this_hover_color if is_property - bg_spr.bitmap.fill_rect(draw_x, 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, hover_color) + bg_spr.bitmap.fill_rect(draw_x, 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, this_hover_color) else - bg_spr.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, hover_color) + bg_spr.bitmap.fill_rect(draw_x - (KEYFRAME_SPACING / 2), 2, KEYFRAME_SPACING, ROW_HEIGHT - 3, this_hover_color) end end next if i >= @duration - DURATION_BUFFER - outline_color = Color.black + outline_color = line_color case visible_cmds[i] when 1 # Particle is visible # Draw outline if is_property - outline_color = CONTROL_BG_COLORS[@particles[p_index][:focus]] || Color.magenta + outline_color = focus_color(@particles[p_index][:focus]) end bg_spr.bitmap.fill_rect(draw_x, ROW_SPACING, KEYFRAME_SPACING, 1, outline_color) # Top bg_spr.bitmap.fill_rect(draw_x, ROW_HEIGHT - 1, KEYFRAME_SPACING, 1, outline_color) # Bottom @@ -822,7 +846,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl next if !cmds[i] draw_x = TIMELINE_LEFT_BUFFER + (i * KEYFRAME_SPACING) - @left_pos # Draw command diamond - spr.bitmap.fill_diamond(draw_x, ROW_HEIGHT / 2, DIAMOND_SIZE, TEXT_COLOR) + spr.bitmap.fill_diamond(draw_x, ROW_HEIGHT / 2, DIAMOND_SIZE, text_color) # Draw interpolation line if cmds[i].is_a?(Array) spr.bitmap.draw_interpolation_line( @@ -832,7 +856,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl INTERP_LINE_HEIGHT, cmds[i][0] > 0, # Increases or decreases cmds[i][1], # Interpolation type - TEXT_COLOR + text_color ) end end @@ -849,7 +873,7 @@ class AnimationEditor::ParticleList < UIControls::BaseControl INTERP_LINE_HEIGHT, cmds[i][0] > 0, # Increases or decreases cmds[i][1], # Interpolation type - TEXT_COLOR + text_color ) end end From bfadd7ff9fbd58fdba7186f9072a5dafc9ad5a53 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 16 Jan 2025 22:55:45 +0000 Subject: [PATCH 49/49] C key no longer toggles Animation Editor's colour theme --- Data/Scripts/904_Anim Editor/001_AnimationEditor.rb | 7 ------- .../Scripts/904_Anim Editor/010_AnimationSelector.rb | 12 ------------ 2 files changed, 19 deletions(-) diff --git a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb index 9e3e8ae68..39edb0587 100644 --- a/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb +++ b/Data/Scripts/904_Anim Editor/001_AnimationEditor.rb @@ -984,13 +984,6 @@ class AnimationEditor @components[:particle_list].set_particles(@anim[:particles]) refresh end - elsif Input.triggerex?(:C) - options = color_scheme_options.keys - this_index = options.index(@color_scheme || :light) || 0 - new_index = (this_index + 1) % options.length - @settings[:color_scheme] = options[new_index] - self.color_scheme = @settings[:color_scheme] - save_settings end end diff --git a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb index cbb66a67c..d675842bb 100644 --- a/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb +++ b/Data/Scripts/904_Anim Editor/010_AnimationSelector.rb @@ -397,17 +397,6 @@ class AnimationEditor::AnimationSelector refresh end - def update_input - if Input.triggerex?(:C) - options = color_scheme_options.keys - this_index = options.index(@color_scheme || :light) || 0 - new_index = (this_index + 1) % options.length - @settings[:color_scheme] = options[new_index] - self.color_scheme = @settings[:color_scheme] - save_settings - end - end - def update @components.update if @components.changed? @@ -423,7 +412,6 @@ class AnimationEditor::AnimationSelector apply_list_filter refresh end - update_input if !@components.busy? end def run