diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index a311b9b5e..ece08c031 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 74144c7c3..6b8163164 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map086.rxdata b/Data/Map086.rxdata index 187587c5b..d8706834c 100644 Binary files a/Data/Map086.rxdata and b/Data/Map086.rxdata differ diff --git a/Data/Map090.rxdata b/Data/Map090.rxdata index 4cdf14272..83127332d 100644 Binary files a/Data/Map090.rxdata and b/Data/Map090.rxdata differ diff --git a/Data/Map248.rxdata b/Data/Map248.rxdata index a4770745e..16c817ae9 100644 Binary files a/Data/Map248.rxdata and b/Data/Map248.rxdata differ diff --git a/Data/Map532.rxdata b/Data/Map532.rxdata index 45083e58c..764e37fb2 100644 Binary files a/Data/Map532.rxdata and b/Data/Map532.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 3e974a4cc..91a68e9a9 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/005_Sprites/013_Sprite_Player_Offsets.rb b/Data/Scripts/005_Sprites/013_Sprite_Player_Offsets.rb index 3996a8b27..b9aec0615 100644 --- a/Data/Scripts/005_Sprites/013_Sprite_Player_Offsets.rb +++ b/Data/Scripts/005_Sprites/013_Sprite_Player_Offsets.rb @@ -1,5 +1,8 @@ #[FRAME1 [x,y]],[FRAME2 [x,y], etc.] +# +# exact number of pixels that the sprite needs to be moved for each frame +# add 2 pixels on even frames module Outfit_Offsets BASE_OFFSET = [[0, 0], [0, 0], [0, 0], [0, 0]] @@ -24,4 +27,8 @@ module Outfit_Offsets BIKE_OFFSETS_RIGHT = [[4, -4], [2, -2], [4, -4], [6, -2]] BIKE_OFFSETS_UP = [[0, -2], [-2, 0], [0, -2], [2, 0]] + FISH_OFFSETS_DOWN = [[0, -6], [0, -2], [0, -8], [2, -6]] + FISH_OFFSETS_LEFT = [[0, -8], [-6, -6], [0, -8], [2, -8]] + FISH_OFFSETS_RIGHT = [[0, -8], [6, -6], [0, -8], [-2, -8]] + FISH_OFFSETS_UP = [[0, -6], [0, -6], [0, -6], [2, -4]] end diff --git a/Data/Scripts/005_Sprites/013_Sprite_Wearable.rb b/Data/Scripts/005_Sprites/013_Sprite_Wearable.rb index 9d25e5f3f..ec38ea994 100644 --- a/Data/Scripts/005_Sprites/013_Sprite_Wearable.rb +++ b/Data/Scripts/005_Sprites/013_Sprite_Wearable.rb @@ -72,6 +72,16 @@ class Sprite_Wearable < RPG::Sprite elsif direction == DIRECTION_UP apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame) end + when "fish" + if direction == DIRECTION_DOWN + apply_sprite_offset(Outfit_Offsets::FISH_OFFSETS_DOWN,current_frame) + elsif direction == DIRECTION_LEFT + apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_LEFT,current_frame) + elsif direction == DIRECTION_RIGHT + apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_RIGHT,current_frame) + elsif direction == DIRECTION_UP + apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_UP,current_frame) + end else @sprite.x = @player_sprite.x - @player_sprite.ox @sprite.y = @player_sprite.y - @player_sprite.oy @@ -79,9 +89,10 @@ class Sprite_Wearable < RPG::Sprite @sprite.y -= 2 if current_frame % 2 == 1 end - def animate(action) + + def animate(action, frame=nil) @action = action - current_frame = @player_sprite.character.pattern + current_frame = @player_sprite.character.pattern if !frame direction = @player_sprite.character.direction crop_spritesheet(direction) set_sprite_position(@action, direction, current_frame) diff --git a/Data/Scripts/005_Sprites/014_Sprite_Hat.rb b/Data/Scripts/005_Sprites/014_Sprite_Hat.rb index d37886669..591f2016d 100644 --- a/Data/Scripts/005_Sprites/014_Sprite_Hat.rb +++ b/Data/Scripts/005_Sprites/014_Sprite_Hat.rb @@ -6,56 +6,56 @@ class Sprite_Hat < Sprite_Wearable end - def set_sprite_position(action, direction, current_frame) - @sprite.x = @player_sprite.x - @player_sprite.ox - @sprite.y = @player_sprite.y - @player_sprite.oy - case action - when "run" - if direction == DIRECTION_DOWN - apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_DOWN, current_frame) - elsif direction == DIRECTION_LEFT - apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_LEFT, current_frame) - elsif direction == DIRECTION_RIGHT - apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_RIGHT, current_frame) - elsif direction == DIRECTION_UP - apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_UP, current_frame) - end - when "surf" - if direction == DIRECTION_DOWN - apply_sprite_offset(Outfit_Offsets::SURF_OFFSETS_DOWN,current_frame) - elsif direction == DIRECTION_LEFT - apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_LEFT,current_frame) - elsif direction == DIRECTION_RIGHT - apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_RIGHT,current_frame) - elsif direction == DIRECTION_UP - apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_UP,current_frame) - end - when "dive" - if direction == DIRECTION_DOWN - apply_sprite_offset(Outfit_Offsets::DIVE_OFFSETS_DOWN,current_frame) - elsif direction == DIRECTION_LEFT - apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_LEFT,current_frame) - elsif direction == DIRECTION_RIGHT - apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_RIGHT,current_frame) - elsif direction == DIRECTION_UP - apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_UP,current_frame) - end - when "bike" - if direction == DIRECTION_DOWN - apply_sprite_offset(Outfit_Offsets::BIKE_OFFSETS_DOWN,current_frame) - elsif direction == DIRECTION_LEFT - apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_LEFT,current_frame) - elsif direction == DIRECTION_RIGHT - apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_RIGHT,current_frame) - elsif direction == DIRECTION_UP - apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame) - end - else - @sprite.x = @player_sprite.x - @player_sprite.ox - @sprite.y = @player_sprite.y - @player_sprite.oy - end - @sprite.y -= 2 if current_frame % 2 == 1 - end + # def set_sprite_position(action, direction, current_frame) + # @sprite.x = @player_sprite.x - @player_sprite.ox + # @sprite.y = @player_sprite.y - @player_sprite.oy + # case action + # when "run" + # if direction == DIRECTION_DOWN + # apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_DOWN, current_frame) + # elsif direction == DIRECTION_LEFT + # apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_LEFT, current_frame) + # elsif direction == DIRECTION_RIGHT + # apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_RIGHT, current_frame) + # elsif direction == DIRECTION_UP + # apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_UP, current_frame) + # end + # when "surf" + # if direction == DIRECTION_DOWN + # apply_sprite_offset(Outfit_Offsets::SURF_OFFSETS_DOWN,current_frame) + # elsif direction == DIRECTION_LEFT + # apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_LEFT,current_frame) + # elsif direction == DIRECTION_RIGHT + # apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_RIGHT,current_frame) + # elsif direction == DIRECTION_UP + # apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_UP,current_frame) + # end + # when "dive" + # if direction == DIRECTION_DOWN + # apply_sprite_offset(Outfit_Offsets::DIVE_OFFSETS_DOWN,current_frame) + # elsif direction == DIRECTION_LEFT + # apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_LEFT,current_frame) + # elsif direction == DIRECTION_RIGHT + # apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_RIGHT,current_frame) + # elsif direction == DIRECTION_UP + # apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_UP,current_frame) + # end + # when "bike" + # if direction == DIRECTION_DOWN + # apply_sprite_offset(Outfit_Offsets::BIKE_OFFSETS_DOWN,current_frame) + # elsif direction == DIRECTION_LEFT + # apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_LEFT,current_frame) + # elsif direction == DIRECTION_RIGHT + # apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_RIGHT,current_frame) + # elsif direction == DIRECTION_UP + # apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame) + # end + # else + # @sprite.x = @player_sprite.x - @player_sprite.ox + # @sprite.y = @player_sprite.y - @player_sprite.oy + # end + # @sprite.y -= 2 if current_frame % 2 == 1 + # end end diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index deb50423a..5e3ed5303 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 4079ff9d6..ce46c9ae3 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/Data/messages.dat b/Data/messages.dat index a7de94e31..ab41c1be9 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ