mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-12 20:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[jak2] add some missing lambdas (#2799)

Browse Source 
Should fix the eye problem in
https://github.com/open-goal/jak-project/issues/2797
This commit is contained in:
water111
2023-07-04 18:19:51 -04:00
committed by GitHub
parent 34f49469ec
commit 6c77f51653
8 changed files with 348 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak2/engine/gfx/foreground/eye.gc
+1 -1
View File
@@ -1312,7 +1312,7 @@
(none)
)
(defun set-eye-draw-flag ((arg0 symbol) (arg1 int) (arg2 int))
(defun set-eye-draw-flag ((arg0 symbol) (arg1 int))
(let ((s5-0 (-> *eye-control-arrays* data (/ arg1 20) data (mod arg1 20)))
)
(format 0 "flag: ~a eye-slot: ~d ~%" arg0 arg1)
goal_src/jak2/levels/common/warp-gate.gc
+160 -146
View File
@@ -1964,153 +1964,167 @@ This commonly includes things such as:
)
)
(scene-method-16 (new 'static 'scene
:name "caspad-air-train-out"
:extra #f
:info #f
:mask-to-clear (process-mask movie enemy platform projectile)
:entity "air-train-3"
:art-group "scenecamera"
:anim "caspad-air-train-out"
:parts 3
:command-list '((0
(kill "air-train-3")
(fadein (frame-time-30 (new 'static 'bfloat :data 10.0)))
(part-tracker
"group-airtrain-thruster"
entity
"air-train"
joint
"thruster_l"
track
#t
duration
(frame-range 0 195)
)
(part-tracker
"group-airtrain-thruster"
entity
"air-train"
joint
"thruster_r"
track
#t
duration
(frame-range 0 195)
)
)
(80 (part-tracker
"group-airtrain-dust-plume"
entity
"particleman"
joint
"particleA"
track
#t
duration
(frame-range 80 190)
)
)
(180
(part-tracker
"group-airtrain-thruster-off"
entity
"air-train"
joint
"thruster_l"
track
#t
duration
(frame-range 180 295)
)
(part-tracker
"group-airtrain-thruster-off"
entity
"air-train"
joint
"thruster_r"
track
#t
duration
(frame-range 180 295)
)
)
(285 (fadeout (frame-time-30 (new 'static 'bfloat :data 10.0))))
(10000 (apply <lambda at L1>))
)
:cut-list '(180)
:wait-ground-time (seconds 1)
:draw-target #f
:abort #t
:actor (new 'static 'boxed-array :type scene-actor
(new 'static 'scene-actor
:name "scenecamera"
:level #f
:art-group "skel-scenecamera"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:camera 4
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "sidekick-highres"
:level 'caspad
:art-group "skel-sidekick-highres"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "jak-highres"
:level 'caspad
:art-group "skel-jak-highres"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "air-train"
:level 'caspad
:art-group "skel-air-train"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "particleman"
:level 'caspad
:art-group "skel-particleman"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
)
:load-point-obj "caspad-warp"
:end-point-obj "caspad-warp"
:borrow '()
:sfx-volume -1.0
:ambient-volume -1.0
:music-volume -1.0
:blackout-end #t
:peaceful #t
:music-delay 1500.0
:save #t
(scene-method-16
(new 'static 'scene
:name "caspad-air-train-out"
:extra #f
:info #f
:mask-to-clear (process-mask movie enemy platform projectile)
:entity "air-train-3"
:art-group "scenecamera"
:anim "caspad-air-train-out"
:parts 3
:command-list '((0
(kill "air-train-3")
(fadein (frame-time-30 (new 'static 'bfloat :data 10.0)))
(part-tracker
"group-airtrain-thruster"
entity
"air-train"
joint
"thruster_l"
track
#t
duration
(frame-range 0 195)
)
(part-tracker
"group-airtrain-thruster"
entity
"air-train"
joint
"thruster_r"
track
#t
duration
(frame-range 0 195)
)
)
(80
(part-tracker
"group-airtrain-dust-plume"
entity
"particleman"
joint
"particleA"
track
#t
duration
(frame-range 80 190)
)
)
(180
(part-tracker
"group-airtrain-thruster-off"
entity
"air-train"
joint
"thruster_l"
track
#t
duration
(frame-range 180 295)
)
(part-tracker
"group-airtrain-thruster-off"
entity
"air-train"
joint
"thruster_r"
track
#t
duration
(frame-range 180 295)
)
)
(285 (fadeout (frame-time-30 (new 'static 'bfloat :data 10.0))))
(10000
(apply
,(lambda :behavior scene-player
()
(set! (-> self scene end-point-obj) (if (task-node-closed? (game-task-node castle-break-in-introduction))
"caspad-face-castle"
"caspad-warp"
)
)
)
(none)
)
)
)
)
:cut-list '(180)
:wait-ground-time (seconds 1)
:draw-target #f
:abort #t
:actor (new 'static 'boxed-array :type scene-actor
(new 'static 'scene-actor
:name "scenecamera"
:level #f
:art-group "skel-scenecamera"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:camera 4
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "sidekick-highres"
:level 'caspad
:art-group "skel-sidekick-highres"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "jak-highres"
:level 'caspad
:art-group "skel-jak-highres"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "air-train"
:level 'caspad
:art-group "skel-air-train"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
(new 'static 'scene-actor
:name "particleman"
:level 'caspad
:art-group "skel-particleman"
:prefix ""
:draw-frames '((min max))
:scissor-frames '()
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
)
)
:load-point-obj "caspad-warp"
:end-point-obj "caspad-warp"
:borrow '()
:sfx-volume -1.0
:ambient-volume -1.0
:music-volume -1.0
:blackout-end #t
:peaceful #t
:music-delay 1500.0
:save #t
)
)
(scene-method-16 (new 'static 'scene
:name "nest-air-train-in"
goal_src/jak2/levels/fortress/prison/prison-obs.gc
+2 -2
View File
@@ -665,8 +665,8 @@ This commonly includes things such as:
(75 (send-event "prsn-cell-door-2" 'open))
(75 (send-event "prsn-cell-door-1" 'open))
(75 (send-event "prsn-cell-door-4" 'open))
(1143 (apply <lambda at L2>))
(1189 (apply <lambda at L1>))
(1143 (apply ,(lambda () (set-eye-draw-flag #f 100) (none))))
(1189 (apply ,(lambda () (set-eye-draw-flag #t 100) (none))))
(2427 (send-event "warp-gate-b-1" 'effect) (sound-play "warpgate-mov"))
(2445 (send-event "warp-gate-b-1" 'effect) (sound-play "warpgate-mov"))
(2463 (send-event "warp-gate-b-1" 'effect) (sound-play "warpgate-mov"))