Skip to content

jak1: fix balance-plats at high-fps #4069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

jak1: fix balance-plats at high-fps #4069

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
853b55d
Updated spawn-obs.gc
gratefulforest Nov 5, 2025
f588fda
Updated swamp-obs.gc
gratefulforest Nov 5, 2025
79f6545
Updated swamp-obs.gc
gratefulforest Nov 5, 2025
52bd456
Updated swamp-obs.gc
gratefulforest Nov 5, 2025
0c8c311
Updated swamp-obs.gc
gratefulforest Nov 6, 2025
57add2c
Merge branch 'open-goal:master' into balance-plat-fps
gratefulforest Nov 11, 2025
037e918
Merge branch 'open-goal:master' into balance-plat-fps
gratefulforest Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 35 additions & 30 deletions goal_src/jak1/levels/swamp/swamp-obs.gc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,36 +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)))
;; 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-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! (-> 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-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 (+ (* DISPLAY_FPS_RATIO 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 (+ (* DISPLAY_FPS_RATIO -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)

Expand Down
Loading