DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor

Browse Source
This commit is contained in:
Maruno17
2020-10-18 21:40:04 +01:00
parent 2be698497a e6b6bdc0b8
commit 3c2b97c21a
49 changed files with 2885 additions and 2861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/003_Game classes/008_Game_Player_Visuals.rb
View File

@@ -25,7 +25,7 @@ class Game_Player < Game_Character
pbMapInterpreterRunning?
terrain = pbGetTerrainTag
input = ($PokemonSystem.runstyle==1) ? $PokemonGlobal.runtoggle : Input.press?(Input::A)
return input && $PokemonGlobal.runningShoes &&
return input && $PokemonGlobal.runningShoes && !jumping? &&
!$PokemonGlobal.diving && !$PokemonGlobal.surfing &&
!$PokemonGlobal.bicycle && !PBTerrain.onlyWalk?(terrain)
end
@@ -54,14 +54,14 @@ class Game_Player < Game_Character
def update_command
if PBTerrain.isIce?(pbGetTerrainTag)
self.move_speed = 5 # Sliding on ice
self.move_speed = 4 # Sliding on ice
elsif !moving? && !@move_route_forcing && $PokemonGlobal
if $PokemonGlobal.bicycle
self.move_speed = 6 # Cycling
self.move_speed = 5 # Cycling
elsif pbCanRun? || $PokemonGlobal.surfing
self.move_speed = 5 # Running, surfing
self.move_speed = 4 # Running, surfing
else
self.move_speed = 4 # Walking, diving
self.move_speed = 3 # Walking, diving
end
end
super