Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 00:57:44 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[jak1] Enforce certain pc-settings in speedrunner mode (#3553)

Browse source 
Currently PS2 Actor Vis and FPS are only enforced when starting a run -
this enforces them on every frame similar to cheats.
In the progress menu, FPS is already disabled in speedrunner mode - this
adds the same restriction for PS2 Actor Vis.

Jak 2 already does this properly, no change needed there
This commit is contained in:
Matt Dallmeyer 2024-06-15 11:54:53 -07:00 committed by GitHub
parent 29849a4fbb
commit 86979e3d06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
goal_src/jak1/pc/features/speedruns.gc
View file

@ -133,6 +133,18 @@
(and (-> *pc-settings* speedrunner-mode?)
(name= category (enum->string speedrun-category (-> *speedrun-info* category)))))
(defun enforce-speedrun-pc-settings ()
;; Disable any active cheats
(set! (-> *pc-settings* cheats) (the-as pc-cheats #x0))
;; ensure PS2 actor vis is enabled
(set! (-> *pc-settings* ps2-actor-vis?) #t)
;; ensure FPS set to `60`
(when (!= (-> *pc-settings* target-fps) 60)
(set-frame-rate! *pc-settings* 60 #t)
)
(none)
)
(defun start-speedrun ((category speedrun-category))
;; randomize game id so the autosplitter knows to restart
(update-autosplit-jak1-new-game)
@ -216,10 +228,7 @@
(initialize! *game-info* 'game (the-as game-save #f) "intro-start"))
(else
(format 0 "start-speedrun: unrecognized category ~S~%" (enum->string speedrun-category (-> *speedrun-info* category)))))
;; ensure actor vis is enabled
(set! (-> *pc-settings* ps2-actor-vis?) #t)
;; force FPS to `60`
(set-frame-rate! *pc-settings* 60 #t)
(enforce-speedrun-pc-settings)
;; enable auto saving by default
(set! (-> *setting-control* default auto-save) #t)
(none))
@ -384,8 +393,7 @@
(update-autosplit-info-jak1)
;; Draw info to the screen
(speedrun-draw-settings)
;;Disable any active cheats
(set! (-> *pc-settings* cheats) (the-as pc-cheats #x0))
(enforce-speedrun-pc-settings)
;; Run after-blackout speedrun setup (if needed)
(setup-speedrun-post-blackout))
(none))

5
goal_src/jak1/pc/progress-pc.gc
View file

@ -631,7 +631,10 @@
(new 'static 'game-option :option-type (game-option-type lod-fg) :name (text-id lod-fg) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id ps2-parts) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id force-envmap) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id force-actors) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (text-id force-actors) :scale #t
:option-disabled-func
(lambda ()
(-> *pc-settings* speedrunner-mode?)))
(new 'static 'game-option :option-type (game-option-type button) :name (text-id back) :scale #t)))
;; TODO - aspect ratios are hard-coded