mirror of
https://github.com/open-goal/jak-project
synced 2026-07-07 14:13:45 -04:00
[jak1] Restore Klaww cutscene skip for Mountain Pass IL speedruns (#4124)
Originally added in [this PR](https://github.com/open-goal/jak-project/pull/2162/changes#diff-fcd36d04955bffd72ece8b8bf9b7a137d7b58f712660536bb6889b7850e07bea) but I forgot to use `og:preserve-this` so it got wiped out in [a later PR](https://github.com/open-goal/jak-project/commit/da3caf7b2850c37eb7801221461bb8ff918fa101#diff-fcd36d04955bffd72ece8b8bf9b7a137d7b58f712660536bb6889b7850e07beaL1154). Updated a couple spots to use `og:preserve-this`.
This commit is contained in:
@@ -440,8 +440,8 @@
|
||||
(((pickup-type money))
|
||||
;; get money.
|
||||
(when (< 0.0 amount)
|
||||
;; og:preserve-this make sure any speedrun display is hidden
|
||||
(#when PC_PORT
|
||||
;; make sure any speedrun display is hidden
|
||||
(hide-speedrun-display))
|
||||
;; play sound.
|
||||
(if (time-elapsed? (-> this money-pickup-time) (seconds 0.05)) (sound-play "money-pickup"))
|
||||
@@ -452,9 +452,8 @@
|
||||
(let ((s4-2 (the int amount)))
|
||||
(when (not (or (task-complete? (-> (the-as target (-> this process)) game) (the-as game-task s4-2))
|
||||
(>= (the-as uint 1) (the-as uint s4-2))))
|
||||
;; og:preserve-this
|
||||
;; og:preserve-this make sure any speedrun display is hidden
|
||||
(#when PC_PORT
|
||||
;; make sure any speedrun display is hidden
|
||||
(hide-speedrun-display))
|
||||
(set-time! (-> this fuel-cell-pickup-time))))
|
||||
(adjust (-> (the-as target (-> this process)) game) 'fuel-cell amount source-handle))
|
||||
@@ -462,9 +461,8 @@
|
||||
;; buzzer
|
||||
(let ((buzz-count (adjust (-> (the-as target (-> this process)) game) 'buzzer amount source-handle)))
|
||||
(when (!= buzz-count (-> this buzzer))
|
||||
;; og:preserve-this
|
||||
;; og:preserve-this make sure any speedrun display is hidden
|
||||
(#when PC_PORT
|
||||
;; make sure any speedrun display is hidden
|
||||
(hide-speedrun-display))
|
||||
(set-time! (-> this buzzer-pickup-time)))
|
||||
(set! (-> this buzzer) buzz-count))
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
(or (= (get-task-status (game-task beach-ecorocks)) (task-status need-hint))
|
||||
(= (get-task-status (game-task beach-ecorocks)) (task-status need-introduction)))
|
||||
(#when PC_PORT
|
||||
(not (is-speedrun-category? 'il-village1))) ;; modified for PC port - skip green sage cutscene in Sandover IL speedrun
|
||||
(not (is-speedrun-category? 'il-village1))) ;; og:preserve-this skip green sage cutscene in Sandover IL speedrun
|
||||
)
|
||||
(let ((s5-4 (entity-by-name "sage-23")))
|
||||
(when s5-4
|
||||
|
||||
@@ -818,7 +818,10 @@
|
||||
(defstate ogreboss-intro (ogreboss)
|
||||
:code
|
||||
(behavior ()
|
||||
(when (zero? (-> self try-count))
|
||||
(when (#if PC_PORT
|
||||
;; og:preserve-this skip intro cutscene for Mountain Pass IL speedruns
|
||||
(and (zero? (-> self try-count)) (not (and PC_PORT (is-speedrun-category? 'il-ogre))))
|
||||
(zero? (-> self try-count)))
|
||||
(process-drawable-delay-player (seconds 1))
|
||||
(let ((gp-0 (get-process *default-dead-pool* pov-camera #x4000)))
|
||||
(ppointer->handle (when gp-0
|
||||
|
||||
Reference in New Issue
Block a user