From e35d2e766c9230d7595e1b0b929a88882154c9cd Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 3 Jan 2021 13:44:54 +0000
Subject: [PATCH] Improved dependent event movement (ledge jumping speed,
 looking where they're going)

---
 .../003_Game classes/005_Game_Character.rb    |  8 ++++-
 .../014_PField_DependentEvents.rb             | 32 ++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Data/Scripts/003_Game classes/005_Game_Character.rb b/Data/Scripts/003_Game classes/005_Game_Character.rb
index 6221b5b61..2b42b4b95 100644
--- a/Data/Scripts/003_Game classes/005_Game_Character.rb	
+++ b/Data/Scripts/003_Game classes/005_Game_Character.rb	
@@ -98,7 +98,12 @@ class Game_Character
   end
 
   def jump_speed_real
-    return (2 ** (3 + 1)) * 0.8 * 40.0 / Graphics.frame_rate   # Walking speed
+    self.jump_speed_real = (2 ** (3 + 1)) * 0.8 if !@jump_speed_real   # 3 is walking speed
+    return @jump_speed_real
+  end
+
+  def jump_speed_real=(val)
+    @jump_speed_real = val * 40.0 / Graphics.frame_rate
   end
 
   def move_frequency=(val)
@@ -654,6 +659,7 @@ class Game_Character
       if real_distance > 0   # Jumping to somewhere else
         @jump_count = 0
       else   # Jumping on the spot
+        @jump_speed_real = nil   # Reset jump speed
         @jump_count = Game_Map::REAL_RES_X / jump_speed_real   # Number of frames to jump one tile
       end
       @stop_count = 0
diff --git a/Data/Scripts/013_Overworld/014_PField_DependentEvents.rb b/Data/Scripts/013_Overworld/014_PField_DependentEvents.rb
index 3081ef66c..ca60e3dd8 100644
--- a/Data/Scripts/013_Overworld/014_PField_DependentEvents.rb
+++ b/Data/Scripts/013_Overworld/014_PField_DependentEvents.rb
@@ -97,7 +97,7 @@ def moveFancy(follower,direction)
 end
 
 # Same map only
-def jumpFancy(follower,direction)
+def jumpFancy(follower,direction,leader)
   deltaX=(direction == 6 ? 2 : (direction == 4 ? -2 : 0))
   deltaY=(direction == 2 ? 2 : (direction == 8 ? -2 : 0))
   halfDeltaX=(direction == 6 ? 1 : (direction == 4 ? -1 : 0))
@@ -109,6 +109,11 @@ def jumpFancy(follower,direction)
     moveFancy(follower,direction)
   elsif ending
     if pbTestPass(follower,follower.x,follower.y,0)
+      if leader.jumping?
+        follower.jump_speed_real = leader.jump_speed_real * Graphics.frame_rate / 40.0
+      else
+        follower.jump_speed_real = leader.move_speed_real * Graphics.frame_rate / 20.0
+      end
       follower.jump(deltaX,deltaY)
     else
       moveThrough(follower,direction)
@@ -117,7 +122,7 @@ def jumpFancy(follower,direction)
   end
 end
 
-def pbFancyMoveTo(follower,newX,newY)
+def pbFancyMoveTo(follower,newX,newY,leader)
   if follower.x-newX==-1 && follower.y==newY
     moveFancy(follower,6)
   elsif follower.x-newX==1 && follower.y==newY
@@ -127,13 +132,13 @@ def pbFancyMoveTo(follower,newX,newY)
   elsif follower.y-newY==1 && follower.x==newX
     moveFancy(follower,8)
   elsif follower.x-newX==-2 && follower.y==newY
-    jumpFancy(follower,6)
+    jumpFancy(follower,6,leader)
   elsif follower.x-newX==2 && follower.y==newY
-    jumpFancy(follower,4)
+    jumpFancy(follower,4,leader)
   elsif follower.y-newY==-2 && follower.x==newX
-    jumpFancy(follower,2)
+    jumpFancy(follower,2,leader)
   elsif follower.y-newY==2 && follower.x==newX
-    jumpFancy(follower,8)
+    jumpFancy(follower,8,leader)
   elsif follower.x!=newX || follower.y!=newY
     follower.moveto(newX,newY)
   end
@@ -209,8 +214,8 @@ class DependentEvents
       end
     end
     facings=[facingDirection] # Get facing from behind
-    facings.push([0,0,4,0,8,0,2,0,6][d]) # Get right facing
-    facings.push([0,0,6,0,2,0,8,0,4][d]) # Get left facing
+#    facings.push([0,0,4,0,8,0,2,0,6][d])   # Get right facing
+#    facings.push([0,0,6,0,2,0,8,0,4][d])   # Get left facing
     if !leaderIsTrueLeader
       facings.push(d) # Get forward facing
     end
@@ -265,7 +270,7 @@ class DependentEvents
         if instant
           follower.moveto(newX,newY)
         else
-          pbFancyMoveTo(follower,newX,newY)
+          pbFancyMoveTo(follower,newX,newY,leader)
         end
       elsif (follower.x-newX==-2 && follower.y==newY) ||
             (follower.x-newX==2 && follower.y==newY) ||
@@ -274,17 +279,16 @@ class DependentEvents
         if instant
           follower.moveto(newX,newY)
         else
-          pbFancyMoveTo(follower,newX,newY)
+          pbFancyMoveTo(follower,newX,newY,leader)
         end
       elsif follower.x!=posX || follower.y!=posY
         if instant
           follower.moveto(newX,newY)
         else
-          pbFancyMoveTo(follower,posX,posY)
-          pbFancyMoveTo(follower,newX,newY)
+          pbFancyMoveTo(follower,posX,posY,leader)
+          pbFancyMoveTo(follower,newX,newY,leader)
         end
       end
-      pbTurnTowardEvent(follower,leader)
     else
       if !mapTile
         # Make current position into leader's position
@@ -293,7 +297,6 @@ class DependentEvents
       if follower.map.map_id==mapTile[0]
         # Follower is on same map as leader
         follower.moveto(leader.x,leader.y)
-        pbTurnTowardEvent(follower,leader)
       else
         # Follower will move to different map
         events=$PokemonGlobal.dependentEvents
@@ -305,7 +308,6 @@ class DependentEvents
           newEventData[3]=mapTile[1]
           newEventData[4]=mapTile[2]
           if mapTile[0]==leader.map.map_id
-            pbTurnTowardEvent(follower,leader)
           end
         end
       end