mirror of
https://github.com/open-goal/jak-project
synced 2026-08-07 10:16:45 -04:00
ManDude
cd68cb671e
Major change to how `deftype` shows up in our code: - the decompiler will no longer emit the `offset-assert`, `method-count-assert`, `size-assert` and `flag-assert` parameters. There are extremely few cases where having this in the decompiled code is helpful, as the types there come from `all-types` which already has those parameters. This also doesn't break type consistency because: - the asserts aren't compared. - the first step of the test uses `all-types`, which has the asserts, which will throw an error if they're bad. - the decompiler won't emit the `heap-base` parameter unless necessary now. - the decompiler will try its hardest to turn a fixed-offset field into an `overlay-at` field. It falls back to the old offset if all else fails. - `overlay-at` now supports field "dereferencing" to specify the offset that's within a field that's a structure, e.g.: ```lisp (deftype foobar (structure) ((vec vector :inline) (flags int32 :overlay-at (-> vec w)) ) ) ``` in this structure, the offset of `flags` will be 12 because that is the final offset of `vec`'s `w` field within this structure. - **removed ID from all method declarations.** IDs are only ever automatically assigned now. Fixes #3068. - added an `:overlay` parameter to method declarations, in order to declare a new method that goes on top of a previously-defined method. Syntax is `:overlay <method-name>`. Please do not ever use this. - added `state-methods` list parameter. This lets you quickly specify a list of states to be put in the method table. Same syntax as the `states` list parameter. The decompiler will try to put as many states in this as it can without messing with the method ID order. Also changes `defmethod` to make the first type definition (before the arguments) optional. The type can now be inferred from the first argument. Fixes #3093. --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
317 lines
12 KiB
Common Lisp
317 lines
12 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: drillmid-obs.gc
|
|
;; name in dgo: drillmid-obs
|
|
;; dgos: DMI
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defskelgroup skel-drill-elevator-doors drill-elevator-doors drill-elevator-doors-lod0-jg drill-elevator-doors-idle-ja
|
|
((drill-elevator-doors-lod0-mg (meters 999999)))
|
|
:bounds (static-spherem 0 4 0 10.5)
|
|
)
|
|
|
|
(deftype drill-elevator-doors (com-airlock)
|
|
()
|
|
)
|
|
|
|
|
|
;; WARN: Return type mismatch object vs none.
|
|
(defmethod init-from-entity! ((this drill-elevator-doors) (arg0 entity-actor))
|
|
"Typically the method that does the initial setup on the process, potentially using the [[entity-actor]] provided as part of that.
|
|
This commonly includes things such as:
|
|
- stack size
|
|
- collision information
|
|
- loading the skeleton group / bones
|
|
- sounds"
|
|
;; og:preserve-this added
|
|
(stack-size-set! (-> this main-thread) 1024)
|
|
(let ((s5-0 (new 'process 'collide-shape this (collide-list-enum usually-hit-by-player))))
|
|
(set! (-> s5-0 penetrated-by) (penetrate))
|
|
(let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0)))
|
|
(set! (-> s5-0 total-prims) (the-as uint 3))
|
|
(set! (-> s4-0 prim-core collide-as) (collide-spec obstacle))
|
|
(set! (-> s4-0 prim-core collide-with) (collide-spec jak bot player-list))
|
|
(set! (-> s4-0 prim-core action) (collide-action solid))
|
|
(set-vector! (-> s4-0 local-sphere) 0.0 16384.0 0.0 24576.0)
|
|
(set! (-> s5-0 root-prim) s4-0)
|
|
)
|
|
(let ((v1-8 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0))))
|
|
(set! (-> v1-8 prim-core collide-as) (collide-spec obstacle))
|
|
(set! (-> v1-8 prim-core collide-with) (collide-spec jak bot player-list))
|
|
(set! (-> v1-8 prim-core action) (collide-action solid))
|
|
(set! (-> v1-8 transform-index) 4)
|
|
(set-vector! (-> v1-8 local-sphere) 0.0 16384.0 0.0 20480.0)
|
|
)
|
|
(let ((v1-10 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 0))))
|
|
(set! (-> v1-10 prim-core collide-as) (collide-spec obstacle))
|
|
(set! (-> v1-10 prim-core collide-with) (collide-spec jak bot player-list))
|
|
(set! (-> v1-10 prim-core action) (collide-action solid))
|
|
(set! (-> v1-10 transform-index) 5)
|
|
(set-vector! (-> v1-10 local-sphere) 0.0 16384.0 0.0 20480.0)
|
|
)
|
|
(set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w)))
|
|
(let ((v1-13 (-> s5-0 root-prim)))
|
|
(set! (-> s5-0 backup-collide-as) (-> v1-13 prim-core collide-as))
|
|
(set! (-> s5-0 backup-collide-with) (-> v1-13 prim-core collide-with))
|
|
)
|
|
(set! (-> this root) s5-0)
|
|
)
|
|
(initialize-skeleton
|
|
this
|
|
(the-as
|
|
skeleton-group
|
|
(art-group-get-by-name *level* "skel-drill-elevator-doors" (the-as (pointer uint32) #f))
|
|
)
|
|
(the-as pair 0)
|
|
)
|
|
(init-airlock! this)
|
|
(set! (-> this inner?) #t)
|
|
(set! (-> this sound-behind?) #t)
|
|
(set! (-> this sound-open-loop) (static-sound-spec "drl-elev-door-l"))
|
|
(set! (-> this sound-open-stop) (static-sound-spec "drl-elev-door-e"))
|
|
(set! (-> this sound-close-loop) (static-sound-spec "drl-elev-door-l"))
|
|
(set! (-> this sound-close-stop) (static-sound-spec "drl-elev-door-e"))
|
|
(go (method-of-object this close) #t)
|
|
(none)
|
|
)
|
|
|
|
(deftype drill-lift (elevator)
|
|
((sound-id sound-id)
|
|
)
|
|
(:methods
|
|
(set-collide-spec! (_type_ symbol) none)
|
|
)
|
|
)
|
|
|
|
|
|
(defskelgroup skel-drill-lift drill-lift drill-lift-lod0-jg drill-lift-idle-ja
|
|
((drill-lift-lod0-mg (meters 999999)))
|
|
:bounds (static-spherem 0 0 6 10)
|
|
)
|
|
|
|
(defmethod get-art-group ((this drill-lift))
|
|
"@returns The associated [[art-group]]"
|
|
(art-group-get-by-name *level* "skel-drill-lift" (the-as (pointer uint32) #f))
|
|
)
|
|
|
|
(defmethod move-between-points ((this drill-lift) (arg0 vector) (arg1 float) (arg2 float))
|
|
"Move between two points on the elevator's path
|
|
@param vec TODO not sure
|
|
@param point-a The first point fetched from the elevator's path
|
|
@param point-b The second point fetched from the path
|
|
@see [[path-control]] and [[elevator]]"
|
|
(let ((s4-0 (get-point-in-path! (-> this path) (new 'stack-no-clear 'vector) arg1 'interp))
|
|
(a0-3 (get-point-in-path! (-> this path) (new 'stack-no-clear 'vector) arg2 'interp))
|
|
(v1-3 (-> this root trans))
|
|
)
|
|
(when (and (< (-> a0-3 y) (-> s4-0 y)) (< (-> arg0 y) (+ -8192.0 (-> v1-3 y))))
|
|
(let ((s4-2 (vector-! (new 'stack-no-clear 'vector) arg0 v1-3)))
|
|
(vector-inv-orient-by-quat! s4-2 s4-2 (-> this root quat))
|
|
(and (< (fabs (-> s4-2 x)) 24576.0) (< 0.0 (-> s4-2 z)) (< (-> s4-2 z) 49152.0))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod commited-to-ride? ((this drill-lift))
|
|
"@returns if the target is considered within the elevator area enough to begin descending/ascending"
|
|
(let* ((gp-0 *target*)
|
|
(a0-2 (if (type? gp-0 process-focusable)
|
|
gp-0
|
|
)
|
|
)
|
|
)
|
|
(when a0-2
|
|
(let* ((v1-1 (get-trans a0-2 0))
|
|
(gp-2 (vector-! (new 'stack-no-clear 'vector) v1-1 (-> this root trans)))
|
|
)
|
|
(vector-inv-orient-by-quat! gp-2 gp-2 (-> this root quat))
|
|
(and (< (fabs (-> gp-2 x)) 20480.0) (< 0.0 (-> gp-2 z)) (< (-> gp-2 z) 40960.0))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod set-collide-spec! ((this drill-lift) (arg0 symbol))
|
|
(let ((v1-3 (-> (the-as collide-shape-prim-group (-> this root root-prim)) child 1)))
|
|
(cond
|
|
(arg0
|
|
(set! (-> v1-3 prim-core collide-as) (collide-spec obstacle pusher))
|
|
(set! (-> v1-3 prim-core collide-with) (collide-spec jak player-list))
|
|
)
|
|
(else
|
|
(set! (-> v1-3 prim-core collide-as) (collide-spec))
|
|
(set! (-> v1-3 prim-core collide-with) (collide-spec))
|
|
0
|
|
)
|
|
)
|
|
)
|
|
(none)
|
|
)
|
|
|
|
(defstate running (drill-lift)
|
|
:virtual #t
|
|
:enter (behavior ()
|
|
(let ((t9-0 (-> (method-of-type elevator running) enter)))
|
|
(if t9-0
|
|
(t9-0)
|
|
)
|
|
)
|
|
(set! (-> self sound-id) (sound-play "drl-elevator-lp"))
|
|
(when (logtest? (-> self elevator-status) (elevator-status waiting-to-descend))
|
|
(set-collide-spec! self #t)
|
|
(set-setting! 'jump #f 0.0 0)
|
|
)
|
|
)
|
|
:exit (behavior ()
|
|
(sound-stop (-> self sound-id))
|
|
(sound-play "drl-elev-stop")
|
|
(let ((t9-4 (-> (find-parent-state) exit)))
|
|
(if t9-4
|
|
(t9-4)
|
|
)
|
|
)
|
|
)
|
|
:post (behavior ()
|
|
(sound-play "drl-elevator-lp" :id (-> self sound-id) :position (-> self root trans))
|
|
(let ((t9-2 (-> (the-as state (find-parent-state)) post)))
|
|
(if t9-2
|
|
((the-as (function none) t9-2))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defstate arrived (drill-lift)
|
|
:virtual #t
|
|
:enter (behavior ()
|
|
(let ((t9-0 (-> (method-of-type elevator arrived) enter)))
|
|
(if t9-0
|
|
(t9-0)
|
|
)
|
|
)
|
|
(when (logtest? (-> self elevator-status) (elevator-status waiting-to-descend))
|
|
(set-collide-spec! self #f)
|
|
(remove-setting! 'jump)
|
|
)
|
|
)
|
|
)
|
|
|
|
(defmethod init-plat-collision! ((this drill-lift))
|
|
"TODO - collision stuff for setting up the platform"
|
|
(let ((s5-0 (new 'process 'collide-shape-moving this (collide-list-enum usually-hit-by-player))))
|
|
(set! (-> s5-0 dynam) (copy *standard-dynamics* 'process))
|
|
(set! (-> s5-0 reaction) cshape-reaction-default)
|
|
(set! (-> s5-0 no-reaction)
|
|
(the-as (function collide-shape-moving collide-query vector vector object) nothing)
|
|
)
|
|
(let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0)))
|
|
(set! (-> s5-0 total-prims) (the-as uint 3))
|
|
(set! (-> s4-0 prim-core collide-as) (collide-spec obstacle camera-blocker pusher))
|
|
(set! (-> s4-0 prim-core collide-with) (collide-spec jak bot player-list))
|
|
(set! (-> s4-0 prim-core action) (collide-action solid rideable))
|
|
(set! (-> s4-0 transform-index) 3)
|
|
(set-vector! (-> s4-0 local-sphere) 0.0 0.0 22937.6 37683.2)
|
|
(set! (-> s5-0 root-prim) s4-0)
|
|
)
|
|
(pusher-init s5-0)
|
|
(let ((v1-15 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0))))
|
|
(set! (-> v1-15 prim-core collide-as) (collide-spec obstacle camera-blocker pusher))
|
|
(set! (-> v1-15 prim-core collide-with) (collide-spec jak bot player-list))
|
|
(set! (-> v1-15 prim-core action) (collide-action solid rideable))
|
|
(set! (-> v1-15 transform-index) 3)
|
|
(set-vector! (-> v1-15 local-sphere) 0.0 0.0 22937.6 37683.2)
|
|
)
|
|
(let ((v1-17 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 0))))
|
|
(set! (-> v1-17 prim-core action) (collide-action solid))
|
|
(set! (-> v1-17 transform-index) 3)
|
|
(set-vector! (-> v1-17 local-sphere) 0.0 0.0 22937.6 39321.6)
|
|
)
|
|
(set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w)))
|
|
(let ((v1-20 (-> s5-0 root-prim)))
|
|
(set! (-> s5-0 backup-collide-as) (-> v1-20 prim-core collide-as))
|
|
(set! (-> s5-0 backup-collide-with) (-> v1-20 prim-core collide-with))
|
|
)
|
|
(set! (-> this root) s5-0)
|
|
)
|
|
(set-collide-spec! this #f)
|
|
(none)
|
|
)
|
|
|
|
(deftype drill-moving-staircase (conveyor)
|
|
()
|
|
)
|
|
|
|
|
|
(defskelgroup skel-drill-moving-staircase drill-moving-staircase drill-moving-staircase-lod0-jg drill-moving-staircase-idle-ja
|
|
((drill-moving-staircase-lod0-mg (meters 999999)))
|
|
:bounds (static-spherem 7 -2 -3.8 11)
|
|
)
|
|
|
|
(defmethod get-art-group ((this drill-moving-staircase))
|
|
"@returns The respective [[art-group]] for the [[conveyor]]"
|
|
(art-group-get-by-name *level* "skel-drill-moving-staircase" (the-as (pointer uint32) #f))
|
|
)
|
|
|
|
;; WARN: Return type mismatch float vs none.
|
|
(defmethod init! ((this drill-moving-staircase))
|
|
"Initializes defaults for things like the `speed` and `belt-radius`"
|
|
(set! (-> this speed) 38912.0)
|
|
(set! (-> this belt-radius) 11878.4)
|
|
(set! (-> this pull-y-threshold) 409.6)
|
|
(none)
|
|
)
|
|
|
|
;; WARN: Return type mismatch collide-shape-moving vs none.
|
|
(defmethod reset-root! ((this drill-moving-staircase))
|
|
"Re-initializes the `root` [[trsqv]]"
|
|
(let ((s5-0 (new 'process 'collide-shape-moving this (collide-list-enum hit-by-player))))
|
|
(set! (-> s5-0 dynam) (copy *standard-dynamics* 'process))
|
|
(set! (-> s5-0 reaction) cshape-reaction-default)
|
|
(set! (-> s5-0 no-reaction)
|
|
(the-as (function collide-shape-moving collide-query vector vector object) nothing)
|
|
)
|
|
(let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0))))
|
|
(set! (-> s4-0 prim-core collide-as) (collide-spec pusher))
|
|
(set! (-> s4-0 prim-core collide-with) (collide-spec jak player-list))
|
|
(set! (-> s4-0 prim-core action) (collide-action solid rideable))
|
|
(set! (-> s4-0 transform-index) 0)
|
|
(set-vector! (-> s4-0 local-sphere) 28672.0 -8192.0 -15564.8 45056.0)
|
|
(set! (-> s5-0 total-prims) (the-as uint 1))
|
|
(set! (-> s5-0 root-prim) s4-0)
|
|
)
|
|
(pusher-init s5-0)
|
|
(set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w)))
|
|
(let ((v1-15 (-> s5-0 root-prim)))
|
|
(set! (-> s5-0 backup-collide-as) (-> v1-15 prim-core collide-as))
|
|
(set! (-> s5-0 backup-collide-with) (-> v1-15 prim-core collide-with))
|
|
)
|
|
(set! (-> this root) s5-0)
|
|
)
|
|
(none)
|
|
)
|
|
|
|
(defstate idle (drill-moving-staircase)
|
|
:virtual #t
|
|
:code (behavior ()
|
|
(until #f
|
|
(ja-no-eval :group! drill-moving-staircase-idle-ja :num! (seek!) :frame-num 0.0)
|
|
(until (ja-done? 0)
|
|
(suspend)
|
|
(ja :num! (seek!))
|
|
)
|
|
)
|
|
#f
|
|
)
|
|
:post (behavior ()
|
|
(let ((t9-0 (-> (method-of-type conveyor idle) post)))
|
|
(if t9-0
|
|
((the-as (function none) t9-0))
|
|
)
|
|
)
|
|
(ja-post)
|
|
)
|
|
)
|