mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 21:54:58 +00:00
Moved battle music filenames to Settings, improved PluginManager's version comparer, removed player bump animation, fixed No Guard not applying to OHKO moves, can reuse the same Repel item quicker
This commit is contained in:
@@ -77,7 +77,6 @@ class Game_Character
|
||||
@always_on_top = false
|
||||
@anime_count = 0 # Time since pattern was last changed
|
||||
@stop_count = 0 # Time since character last finished moving
|
||||
@bumping = false # Used by the player only when walking into something
|
||||
@jump_peak = 0 # Max height while jumping
|
||||
@jump_distance = 0 # Total distance of jump
|
||||
@jump_fraction = 0 # How far through a jump we currently are (0-1)
|
||||
@@ -996,7 +995,6 @@ class Game_Character
|
||||
if moving? && @move_timer >= @move_time &&
|
||||
@real_x == @x * Game_Map::REAL_RES_X && @real_y == @y * Game_Map::REAL_RES_Y
|
||||
@move_timer = nil
|
||||
@bumping = false
|
||||
end
|
||||
# End of jump
|
||||
if jumping? && @jump_fraction >= 1
|
||||
|
||||
@@ -51,7 +51,6 @@ class Game_Player < Game_Character
|
||||
|
||||
def can_run?
|
||||
return @move_speed > 3 if @move_route_forcing
|
||||
return false if @bumping
|
||||
return false if $game_temp.in_menu || $game_temp.in_battle ||
|
||||
$game_temp.message_window_showing || pbMapInterpreterRunning?
|
||||
return false if !$player.has_running_shoes && !$PokemonGlobal.diving &&
|
||||
@@ -95,7 +94,6 @@ class Game_Player < Game_Character
|
||||
self.move_speed = 3 if !@move_route_forcing
|
||||
new_charset = pbGetPlayerCharset(meta.walk_charset)
|
||||
end
|
||||
self.move_speed = 3 if @bumping
|
||||
@character_name = new_charset if new_charset
|
||||
end
|
||||
|
||||
@@ -119,12 +117,10 @@ class Game_Player < Game_Character
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def bump_into_object
|
||||
return if @bump_time_start && (System.uptime - @bump_time_start < @move_time)
|
||||
pbSEPlay("Player bump") if !@move_route_forcing
|
||||
$stats.bump_count += 1
|
||||
@move_initial_x = @x
|
||||
@move_initial_y = @y
|
||||
@move_timer = 0.0
|
||||
@bumping = true
|
||||
@bump_time_start = System.uptime
|
||||
end
|
||||
|
||||
def add_move_distance_to_stats(distance = 1)
|
||||
@@ -421,7 +417,7 @@ class Game_Player < Game_Character
|
||||
update_stop if $game_temp.in_menu && @stopped_last_frame
|
||||
update_screen_position(last_real_x, last_real_y)
|
||||
# Update dependent events
|
||||
if (!@moved_last_frame || @stopped_last_frame) && (moving? || jumping?) && !@bumping
|
||||
if (!@moved_last_frame || @stopped_last_frame) && (moving? || jumping?)
|
||||
$game_temp.followers.move_followers
|
||||
end
|
||||
$game_temp.followers.update
|
||||
@@ -432,28 +428,32 @@ class Game_Player < Game_Character
|
||||
dir = Input.dir4
|
||||
if $PokemonGlobal.forced_movement?
|
||||
move_forward
|
||||
elsif !pbMapInterpreterRunning? && !$game_temp.message_window_showing &&
|
||||
!$game_temp.in_mini_update && !$game_temp.in_menu
|
||||
# Move player in the direction the directional button is being pressed
|
||||
if @moved_last_frame ||
|
||||
(dir > 0 && dir == @lastdir && System.uptime - @lastdirframe >= 0.075)
|
||||
case dir
|
||||
when 2 then move_down
|
||||
when 4 then move_left
|
||||
when 6 then move_right
|
||||
when 8 then move_up
|
||||
end
|
||||
elsif dir != @lastdir
|
||||
case dir
|
||||
when 2 then turn_down
|
||||
when 4 then turn_left
|
||||
when 6 then turn_right
|
||||
when 8 then turn_up
|
||||
end
|
||||
@last_input_time = nil
|
||||
return
|
||||
elsif dir <= 0
|
||||
@last_input_time = nil
|
||||
return
|
||||
end
|
||||
return if pbMapInterpreterRunning? || $game_temp.message_window_showing ||
|
||||
$game_temp.in_mini_update || $game_temp.in_menu
|
||||
# Move player in the direction the directional button is being pressed
|
||||
if @moved_last_frame ||
|
||||
(dir == direction && (!@last_input_time || System.uptime - @last_input_time >= 0.075))
|
||||
case dir
|
||||
when 2 then move_down
|
||||
when 4 then move_left
|
||||
when 6 then move_right
|
||||
when 8 then move_up
|
||||
end
|
||||
# Record last direction input
|
||||
@lastdirframe = System.uptime if dir != @lastdir
|
||||
@lastdir = dir
|
||||
@last_input_time = nil
|
||||
elsif dir != direction
|
||||
case dir
|
||||
when 2 then turn_down
|
||||
when 4 then turn_left
|
||||
when 6 then turn_right
|
||||
when 8 then turn_up
|
||||
end
|
||||
@last_input_time = System.uptime
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user