mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-06-10 04:54:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

snow-flutflut-obs PAL patch

Browse Source
This commit is contained in:
ManDude
2022-06-19 14:08:40 +01:00
parent 597788dd05
commit c9d8617ddd
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/all-types.gc
+1
View File
@@ -34012,6 +34012,7 @@
(deftype snow-button (process-drawable)
((root-override collide-shape-moving :score 100 :offset 112)
(wiggled? symbol :offset-assert 176)
(trying-for-fuel-cell? symbol :offset-assert 180) ;; PAL patch here
(timeout time-frame :offset-assert 184)
(delay-til-wiggle time-frame :offset-assert 192)
(prev-button entity-actor :offset-assert 200)
decompiler/config/jak1_pal.jsonc
+1 -1
View File
@@ -6,7 +6,7 @@
// if you want to filter to only some object names.
// it will make the decompiler much faster.
"allowed_objects": ["main", "eichar-ag", "deathcam-ag", "balloon-ag"],
"allowed_objects": ["snow-flutflut-obs", "snow-button-ag", "flutflut-plat-med-ag", "flutflut-plat-small-ag", "flutflut-plat-large-ag"],
"banned_objects": [],
////////////////////////////
goal_src/levels/snow/snow-flutflut-obs.gc
+19 -8
View File
@@ -44,12 +44,13 @@
(deftype snow-button (process-drawable)
((root-override collide-shape-moving :offset 112)
(wiggled? symbol :offset-assert 176)
(timeout time-frame :offset-assert 184)
(delay-til-wiggle time-frame :offset-assert 192)
(prev-button entity-actor :offset-assert 200)
(ticker ticky :inline :offset-assert 208)
((root-override collide-shape-moving :offset 112)
(wiggled? symbol :offset-assert 176)
(trying-for-fuel-cell? symbol :offset-assert 180)
(timeout time-frame :offset-assert 184)
(delay-til-wiggle time-frame :offset-assert 192)
(prev-button entity-actor :offset-assert 200)
(ticker ticky :inline :offset-assert 208)
)
:heap-base #x80
:method-count-assert 20
@@ -274,6 +275,8 @@
:enter (behavior ()
(set! (-> self state-time) (-> *display* base-frame-counter))
(set! (-> self wiggled?) #f)
;; PAL patch here
(set! (-> self trying-for-fuel-cell?) (not (task-complete? *game-info* (game-task snow-ball))))
(sleep (-> self ticker) (-> self timeout))
(when (-> self prev-button)
(let* ((v1-6 (-> self prev-button))
@@ -294,6 +297,11 @@
(if (completed? (-> self ticker))
(go snow-button-deactivate)
)
(when (and (-> self trying-for-fuel-cell?) (task-complete? *game-info* (game-task snow-ball)))
(set! (-> self trying-for-fuel-cell?) #f)
(go snow-button-deactivate)
)
;; PAL patch here
(when (reached-delay? (-> self ticker) (-> self delay-til-wiggle))
(when (not (-> self wiggled?))
(set! (-> self wiggled?) #t)
@@ -406,6 +414,7 @@
(set! (-> obj prev-button) (entity-actor-lookup arg0 'alt-actor 0))
(set! (-> obj prev-button) #f)
)
(set! (-> obj trying-for-fuel-cell?) (not (task-complete? *game-info* (game-task snow-ball))))
(ja-channel-set! 1)
(let ((s5-1 (-> obj skel root-channel 0)))
(joint-control-channel-group-eval!
@@ -823,7 +832,8 @@
(dummy-22 self)
(go elevator-idle-at-fort)
)
(seek! (-> self path-pos) 1.0 (* 0.06666667 (-> *display* seconds-per-frame)))
;; PAL patch here
(seek! (-> self path-pos) 1.0 (* 0.16 (-> *display* seconds-per-frame)))
(eval-path-curve! (-> self path) (-> self basetrans) (-> self path-pos) 'interp)
(plat-trans)
(dummy-20 self)
@@ -880,7 +890,8 @@
(dummy-22 self)
(go elevator-idle-at-cave)
)
(seek! (-> self path-pos) 0.0 (* 0.06666667 (-> *display* seconds-per-frame)))
;; PAL patch here
(seek! (-> self path-pos) 0.0 (* 0.16 (-> *display* seconds-per-frame)))
(eval-path-curve! (-> self path) (-> self basetrans) (-> self path-pos) 'interp)
(plat-trans)
(dummy-20 self)