From 853b55d887e8ae0630493ff9b09a45d70252bc80 Mon Sep 17 00:00:00 2001 From: Grateful Forest <168700820+gratefulforest@users.noreply.github.com> Date: Thu, 6 Nov 2025 02:49:36 +1030 Subject: [PATCH 1/5] Updated spawn-obs.gc --- goal_src/jak1/levels/swamp/swamp-obs.gc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index de81a8a4ef9..ae9d9ec589a 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -341,30 +341,34 @@ (let ((f30-0 (* -0.025 (+ (-> self y-offset) (-> self y-travel)))) (f28-0 (* -0.025 (- (-> self y-offset) (-> self y-travel))))) (cond - ((and (-> self root riders) (nonzero? (-> self root riders num-riders))) + ((and (-> self root riders) + (nonzero? (-> self root riders num-riders)) + (time-elapsed? (-> self state-time) (seconds 0.01666666))) ;; changed for high fps + (set-state-time) ;; changed for high fps ;; has rider, accelerate downwards (send-event *target* 'no-look-around (seconds 0.25)) - (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ (* DISPLAY_FPS_RATIO -0.2048) (-> self y-accel))))) + (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ (* 1.0 -0.2048) (-> self y-accel))))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) ;; tell linked platforms to go up (send-to-all-after (-> self link) 'grow) (send-to-all-before (-> self link) 'grow)) ((-> self got-grow) ;; got 'grow' signal, accelerate upwards + (set-state-time) ;; changed for high fps (set! (-> self got-grow) #f) - (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ (* DISPLAY_FPS_RATIO 0.2048) (-> self y-accel))))) + (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ (* 1.0 0.2048) (-> self y-accel))))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel))))))) - ((< (-> self y-offset) 0.0) + ((and (< (-> self y-offset) 0.0) (time-elapsed? (-> self state-time) (seconds 0.01666666))) ;; changed for high fps ;; accelerate towards neutral position (from below) (set! (-> self y-accel) - (fmin (fmin 4.096 (fmax -4.096 (+ (* DISPLAY_FPS_RATIO 0.1024) (-> self y-accel)))) (* -0.0001 (-> self y-offset)))) + (fmin (fmin 4.096 (fmax -4.096 (+ (* 1.0 0.1024) (-> self y-accel)))) (* -0.0001 (-> self y-offset)))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) ;; slow down (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))) - (else + ((time-elapsed? (-> self state-time) (seconds 0.01666666)) ;; changed for high fps ;; accelerate towards neutral position (from above) (set! (-> self y-accel) - (fmin 4.096 (fmax (fmax -4.096 (+ (* DISPLAY_FPS_RATIO -0.1024) (-> self y-accel))) (* -0.0001 (-> self y-offset))))) + (fmin 4.096 (fmax (fmax -4.096 (+ (* 1.0 -0.1024) (-> self y-accel))) (* -0.0001 (-> self y-offset))))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) ;; slow down (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))))) From f588fda51f728e6e8aed78372e712b73f8803961 Mon Sep 17 00:00:00 2001 From: Grateful Forest <168700820+gratefulforest@users.noreply.github.com> Date: Thu, 6 Nov 2025 03:11:09 +1030 Subject: [PATCH 2/5] Updated swamp-obs.gc --- goal_src/jak1/levels/swamp/swamp-obs.gc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index ae9d9ec589a..1cbbec667c4 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -347,7 +347,7 @@ (set-state-time) ;; changed for high fps ;; has rider, accelerate downwards (send-event *target* 'no-look-around (seconds 0.25)) - (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ (* 1.0 -0.2048) (-> self y-accel))))) + (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ -0.2048 (-> self y-accel))))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) ;; tell linked platforms to go up (send-to-all-after (-> self link) 'grow) @@ -356,12 +356,12 @@ ;; got 'grow' signal, accelerate upwards (set-state-time) ;; changed for high fps (set! (-> self got-grow) #f) - (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ (* 1.0 0.2048) (-> self y-accel))))) + (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ 0.2048 (-> self y-accel))))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel))))))) ((and (< (-> self y-offset) 0.0) (time-elapsed? (-> self state-time) (seconds 0.01666666))) ;; changed for high fps ;; accelerate towards neutral position (from below) (set! (-> self y-accel) - (fmin (fmin 4.096 (fmax -4.096 (+ (* 1.0 0.1024) (-> self y-accel)))) (* -0.0001 (-> self y-offset)))) + (fmin (fmin 4.096 (fmax -4.096 (+ 0.1024 (-> self y-accel)))) (* -0.0001 (-> self y-offset)))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) ;; slow down (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))) From 79f65454b584a7471d186701a5e63437f30c369a Mon Sep 17 00:00:00 2001 From: Grateful Forest <168700820+gratefulforest@users.noreply.github.com> Date: Thu, 6 Nov 2025 03:26:48 +1030 Subject: [PATCH 3/5] Updated swamp-obs.gc --- goal_src/jak1/levels/swamp/swamp-obs.gc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index 1cbbec667c4..68b78bb30db 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -347,7 +347,7 @@ (set-state-time) ;; changed for high fps ;; has rider, accelerate downwards (send-event *target* 'no-look-around (seconds 0.25)) - (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ -0.2048 (-> self y-accel))))) + (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ -0.2048 (-> self y-accel))))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) ;; tell linked platforms to go up (send-to-all-after (-> self link) 'grow) From 52bd4564875b7837cd1f22be30172df64fe707fc Mon Sep 17 00:00:00 2001 From: Grateful Forest <168700820+gratefulforest@users.noreply.github.com> Date: Thu, 6 Nov 2025 03:54:25 +1030 Subject: [PATCH 4/5] Updated swamp-obs.gc --- goal_src/jak1/levels/swamp/swamp-obs.gc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index 68b78bb30db..bb030a64a24 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -368,7 +368,7 @@ ((time-elapsed? (-> self state-time) (seconds 0.01666666)) ;; changed for high fps ;; accelerate towards neutral position (from above) (set! (-> self y-accel) - (fmin 4.096 (fmax (fmax -4.096 (+ (* 1.0 -0.1024) (-> self y-accel))) (* -0.0001 (-> self y-offset))))) + (fmin 4.096 (fmax (fmax -4.096 (+ -0.1024 (-> self y-accel))) (* -0.0001 (-> self y-offset))))) (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) ;; slow down (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))))) From 0c8c3115578ccc27e9c1be6b0cab05061c05df69 Mon Sep 17 00:00:00 2001 From: Grateful Forest <168700820+gratefulforest@users.noreply.github.com> Date: Thu, 6 Nov 2025 21:56:08 +1030 Subject: [PATCH 5/5] Updated swamp-obs.gc --- goal_src/jak1/levels/swamp/swamp-obs.gc | 69 +++++++++++++------------ 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index bb030a64a24..ad52568eb97 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -340,40 +340,41 @@ ;; og:preserve-this modified for high fps (let ((f30-0 (* -0.025 (+ (-> self y-offset) (-> self y-travel)))) (f28-0 (* -0.025 (- (-> self y-offset) (-> self y-travel))))) - (cond - ((and (-> self root riders) - (nonzero? (-> self root riders num-riders)) - (time-elapsed? (-> self state-time) (seconds 0.01666666))) ;; changed for high fps - (set-state-time) ;; changed for high fps - ;; has rider, accelerate downwards - (send-event *target* 'no-look-around (seconds 0.25)) - (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ -0.2048 (-> self y-accel))))) - (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) - ;; tell linked platforms to go up - (send-to-all-after (-> self link) 'grow) - (send-to-all-before (-> self link) 'grow)) - ((-> self got-grow) - ;; got 'grow' signal, accelerate upwards - (set-state-time) ;; changed for high fps - (set! (-> self got-grow) #f) - (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ 0.2048 (-> self y-accel))))) - (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel))))))) - ((and (< (-> self y-offset) 0.0) (time-elapsed? (-> self state-time) (seconds 0.01666666))) ;; changed for high fps - ;; accelerate towards neutral position (from below) - (set! (-> self y-accel) - (fmin (fmin 4.096 (fmax -4.096 (+ 0.1024 (-> self y-accel)))) (* -0.0001 (-> self y-offset)))) - (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) - ;; slow down - (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))) - ((time-elapsed? (-> self state-time) (seconds 0.01666666)) ;; changed for high fps - ;; accelerate towards neutral position (from above) - (set! (-> self y-accel) - (fmin 4.096 (fmax (fmax -4.096 (+ -0.1024 (-> self y-accel))) (* -0.0001 (-> self y-offset))))) - (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) - ;; slow down - (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))))) - (+! (-> self y-offset) (* DISPLAY_FPS_RATIO (-> self y-vel))) - (set! (-> self root trans y) (+ (-> self y-init) (-> self y-offset))) + (when (or (= (-> *pc-settings* target-fps) 60) + (time-elapsed? (-> self state-time) (seconds 0.01666666)) + (-> self got-grow)) + (cond + ((and (-> self root riders) (nonzero? (-> self root riders num-riders))) + (set-state-time) ;; changed for high fps + ;; has rider, accelerate downwards + (send-event *target* 'no-look-around (seconds 0.25)) + (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ -0.2048 (-> self y-accel))))) + (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) + ;; tell linked platforms to go up + (send-to-all-after (-> self link) 'grow) + (send-to-all-before (-> self link) 'grow)) + ((-> self got-grow) + (set-state-time) ;; changed for high fps + ;; got 'grow' signal, accelerate upwards + (set! (-> self got-grow) #f) + (set! (-> self y-accel) (fmin 4.096 (fmax -4.096 (+ 0.2048 (-> self y-accel))))) + (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel))))))) + ((< (-> self y-offset) 0.0) + ;; accelerate towards neutral position (from below) + (set! (-> self y-accel) + (fmin (fmin 4.096 (fmax -4.096 (+ 0.1024 (-> self y-accel)))) (* -0.0001 (-> self y-offset)))) + (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) + ;; slow down + (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))) + (else + ;; accelerate towards neutral position (from above) + (set! (-> self y-accel) + (fmin 4.096 (fmax (fmax -4.096 (+ -0.1024 (-> self y-accel))) (* -0.0001 (-> self y-offset))))) + (set! (-> self y-vel) (fmin f28-0 (fmax f30-0 (+ (-> self y-vel) (* DISPLAY_FPS_RATIO (-> self y-accel)))))) + ;; slow down + (set! (-> self y-vel) (* (- 1.0 (* DISPLAY_FPS_RATIO (- 1.0 0.99))) (-> self y-vel)))))) + (+! (-> self y-offset) (* DISPLAY_FPS_RATIO (-> self y-vel))) + (set! (-> self root trans y) (+ (-> self y-init) (-> self y-offset)))) (suspend))) :post rider-post)