DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-24 23:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks and fixes

Browse Source
This commit is contained in:
Maruno17
2024-04-27 00:18:16 +01:00
parent 81ce6e515c
commit aef67341d2
5 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Data/Scripts/904_Anim Editor/001_AnimationEditor.rb
View File

@@ -71,20 +71,20 @@ class AnimationEditor
# This list of animations was gathered manually by looking at all instances of # This list of animations was gathered manually by looking at all instances of
# pbCommonAnimation. # pbCommonAnimation.
COMMON_ANIMATIONS = [ COMMON_ANIMATIONS = [
"Attract", "BanefulBunker", "BeakBlast", "Bind", "Burn", "AquaRing", "Attract", "BanefulBunker", "BeakBlast", "Bind",
"Clamp", "Confusion", "CraftyShield", "EatBerry", "ElectricTerrain", "Burn", "Clamp", "Confusion", "CraftyShield", "Curse",
"FireSpin", "FocusPunch", "Frozen", "GrassyTerrain", "Hail", "EatBerry", "ElectricTerrain", "FireSpin", "FocusPunch", "Frozen",
"HarshSun", "HealingWish", "HealthDown", "HealthUp", "HeavyRain", "GrassyTerrain", "Hail", "HarshSun", "HealingWish", "HealthDown",
"Infestation", "KingsShield", "LeechSeed", "LevelUp", "LunarDance", "HealthUp", "HeavyRain", "Infestation", "Ingrain", "KingsShield",
"MagmaStorm", "MegaEvolution", "MegaEvolution2", "MistyTerrain", "Obstruct", "LeechSeed", "LevelUp", "LunarDance", "MagmaStorm", "MegaEvolution",
"Octolock", "Paralysis", "ParentalBond", "Poison", "Powder", "MegaEvolution2", "MistyTerrain", "Nightmare", "Obstruct", "Octolock",
"PrimalGroudon", "PrimalGroudon2", "PrimalKyogre", "PrimalKyogre2", "Protect", "Paralysis", "ParentalBond", "Poison", "Powder", "PrimalGroudon",
"PsychicTerrain", "QuickGuard", "Rain", "Rainbow", "RainbowOpp", "PrimalGroudon2", "PrimalKyogre", "PrimalKyogre2", "Protect", "PsychicTerrain",
"Sandstorm", "SandTomb", "SeaOfFire", "SeaOfFireOpp", "Shadow", "QuickGuard", "Rain", "Rainbow", "RainbowOpp", "Sandstorm",
"ShadowSky", "ShellTrap", "Shiny", "Sleep", "SpikyShield", "SandTomb", "SeaOfFire", "SeaOfFireOpp", "Shadow", "ShadowSky",
"StatDown", "StatUp", "StrongWinds", "Sun", "SuperShiny", "ShellTrap", "Shiny", "Sleep", "SpikyShield", "StatDown",
"Swamp", "SwampOpp", "Toxic", "UseItem", "WideGuard", "StatUp", "StrongWinds", "Sun", "SuperShiny", "Swamp",
"Wrap" "SwampOpp", "Toxic", "UseItem", "WideGuard", "Wrap"
] ]
DELETABLE_COMMAND_PANE_PROPERTIES = [ DELETABLE_COMMAND_PANE_PROPERTIES = [
:x, :y, :z, :frame, :visible, :opacity, :zoom_x, :zoom_y, :angle, :flip, :blending :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_checkbox(:opp_variant, _INTL("User is opposing?"), false)
anim_properties.add_labelled_text_box_dropdown_list(:move, "", [], "") anim_properties.add_labelled_text_box_dropdown_list(:move, "", [], "")
move_ctrl = anim_properties.get_control(: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_number_text_box(:version, _INTL("Version"), 0, 99, 0)
anim_properties.add_labelled_text_box(:name, _INTL("Name"), "") anim_properties.add_labelled_text_box(:name, _INTL("Name"), "")
anim_properties.add_labelled_text_box(:pbs_path, _INTL("PBS filepath"), "") 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(:canvas_bg, _INTL("Background graphic"), {}, "")
editor_settings.add_labelled_dropdown_list(:user_sprite_name, _INTL("User graphic"), {}, "") editor_settings.add_labelled_dropdown_list(:user_sprite_name, _INTL("User graphic"), {}, "")
ctrl = editor_settings.get_control(:user_sprite_name) 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"), {}, "") editor_settings.add_labelled_dropdown_list(:target_sprite_name, _INTL("Target graphic"), {}, "")
ctrl = editor_settings.get_control(:target_sprite_name) 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.add_button(:close, _INTL("Close"))
editor_settings.visible = false editor_settings.visible = false
end end
@@ -658,6 +658,7 @@ class AnimationEditor
next if !hash[:refresh_value] next if !hash[:refresh_value]
hash[:refresh_value].call(component.get_control(property), self) hash[:refresh_value].call(component.get_control(property), self)
end end
component.repaint
# Enable/disable property delete buttons # Enable/disable property delete buttons
deletable_properties = AnimationEditor::SidePanes.get_pane(component_sym)[:deletable_properties] deletable_properties = AnimationEditor::SidePanes.get_pane(component_sym)[:deletable_properties]
if deletable_properties if deletable_properties

2
Data/Scripts/904_Anim Editor/010_AnimationSelector.rb
View File

@@ -17,7 +17,7 @@ class AnimationEditor::AnimationSelector
MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 2 MOVES_LIST_X = TYPE_BUTTONS_X + TYPE_BUTTON_WIDTH + 2
MOVES_LIST_Y = TYPE_BUTTONS_Y + 2 MOVES_LIST_Y = TYPE_BUTTONS_Y + 2
MOVES_LIST_WIDTH = 200 + (UIControls::List::BORDER_THICKNESS * 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_X = MOVES_LIST_X + MOVES_LIST_WIDTH + 4
ANIMATIONS_LIST_Y = MOVES_LIST_Y ANIMATIONS_LIST_Y = MOVES_LIST_Y

6
Data/Scripts/905_Anim player/010_Battle code.rb
View File

@@ -4,7 +4,7 @@
class Battle::Scene class Battle::Scene
ANIMATION_DEFAULTS = [:TACKLE, :DEFENSECURL] # With target, without target ANIMATION_DEFAULTS = [:TACKLE, :DEFENSECURL] # With target, without target
ANIMATION_DEFAULTS_FOR_TYPE_CATEGORY = { 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], :FIGHTING => [:MACHPUNCH, :AURASPHERE, :BULKUP, nil, nil, nil],
:FLYING => [:WINGATTACK, :GUST, :ROOST, nil, :AIRCUTTER, :FEATHERDANCE], :FLYING => [:WINGATTACK, :GUST, :ROOST, nil, :AIRCUTTER, :FEATHERDANCE],
:POISON => [:POISONSTING, :SLUDGE, :ACIDARMOR, nil, :ACID, :POISONPOWDER], :POISON => [:POISONSTING, :SLUDGE, :ACIDARMOR, nil, :ACID, :POISONPOWDER],
@@ -15,10 +15,10 @@ class Battle::Scene
:STEEL => [:IRONHEAD, :MIRRORSHOT, :IRONDEFENSE, nil, nil, :METALSOUND], :STEEL => [:IRONHEAD, :MIRRORSHOT, :IRONDEFENSE, nil, nil, :METALSOUND],
:FIRE => [:FIREPUNCH, :EMBER, :SUNNYDAY, nil, :INCINERATE, :WILLOWISP], :FIRE => [:FIREPUNCH, :EMBER, :SUNNYDAY, nil, :INCINERATE, :WILLOWISP],
:WATER => [:CRABHAMMER, :WATERGUN, :AQUARING, nil, :SURF, :WATERSPORT], :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], :ELECTRIC => [:THUNDERPUNCH, :THUNDERSHOCK, :CHARGE, nil, :DISCHARGE, :THUNDERWAVE],
:PSYCHIC => [:ZENHEADBUTT, :CONFUSION, :CALMMIND, nil, :SYNCHRONOISE, :MIRACLEEYE], :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], :DRAGON => [:DRAGONCLAW, :DRAGONRAGE, :DRAGONDANCE, nil, :TWISTER, nil],
:DARK => [:KNOCKOFF, :DARKPULSE, :HONECLAWS, nil, :SNARL, :EMBARGO], :DARK => [:KNOCKOFF, :DARKPULSE, :HONECLAWS, nil, :SNARL, :EMBARGO],
:FAIRY => [:TACKLE, :FAIRYWIND, :MOONLIGHT, nil, :DAZZLINGGLEAM, :SWEETKISS] :FAIRY => [:TACKLE, :FAIRYWIND, :MOONLIGHT, nil, :DAZZLINGGLEAM, :SWEETKISS]

BIN
animmaker.exe
View File

Binary file not shown.

26
animmaker.txt
View File

@@ -1,26 +0,0 @@
animmaker.exe - Converts sprites to RPG Maker XP format animations
(C) 2008 Peter O.
Usage: animmaker xmlfile.xml
('xmlfile.xml' is the path to any XML file, see below)
Example of XML file:
<animations>
<!--Animation file to create (in this case, animation.png)-->
<animation name="animation.png">
<!--Pattern to add to the animation. Consists of the image's
filename plus the rectangle of the pattern to extract
from the image (x, y, width, height) (up to 96x96 in size)
Sprites listed here will be doubled in size in the animation-->
<pattern filename="pkmnfrlg_effects.png" x="50" y="201"
width="56" height="68" />
</animation>
<!--Another animation file, animation2.png)-->
<animation name="animation2.png">
<pattern filename="pkmnfrlg_effects.png" x="50" y="201"
width="56" height="68" />
<!-- You can leave out x, y, etc. to use the whole image-->
<pattern filename="effects2.png" />
</animation>
</animations>