mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 13:44:59 +00:00
Anim Editor: bug fixes relating to deleting particles, added some animations
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user