mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
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>
233 lines
6.1 KiB
Common Lisp
233 lines
6.1 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: caspad-part.gc
|
|
;; name in dgo: caspad-part
|
|
;; dgos: CAP
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype caspad-part (part-spawner)
|
|
()
|
|
)
|
|
|
|
|
|
(defpartgroup group-caspad-hanging-light
|
|
:id 1164
|
|
:bounds (static-bspherem 0 0 0 5)
|
|
:parts ((sp-item 5061 :fade-after (meters 120) :flags (bit6)) (sp-item 5062 :fade-after (meters 120) :flags (bit6)))
|
|
)
|
|
|
|
(defpart 5061
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:scale-x (meters 2) (meters 0.1))
|
|
(:rot-x (degrees 2.25))
|
|
(:rot-z (degrees -17))
|
|
(:scale-y :copy scale-x)
|
|
(:r 255.0)
|
|
(:g 255.0)
|
|
(:b 255.0)
|
|
(:a 32.0)
|
|
(:omega (degrees 2715.75))
|
|
(:timer (seconds 0.017))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow))
|
|
(:userdata 2048.0)
|
|
)
|
|
)
|
|
|
|
(defpart 5062
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:scale-x (meters 10) (meters 0.1))
|
|
(:rot-x (degrees 4.5))
|
|
(:rot-z (degrees -17))
|
|
(:scale-y :copy scale-x)
|
|
(:r 255.0)
|
|
(:g 255.0 255.0)
|
|
(:b 255.0)
|
|
(:a 16.0)
|
|
(:omega (degrees 2715.75))
|
|
(:timer (seconds 0.017))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow))
|
|
(:userdata 2048.0)
|
|
)
|
|
)
|
|
|
|
(defpartgroup group-caspad-red-flashing-light
|
|
:id 1165
|
|
:flags (use-local-clock)
|
|
:bounds (static-bspherem 0 0 0 5)
|
|
:parts ((sp-item 5065 :fade-after (meters 220) :flags (bit6))
|
|
(sp-item 5066 :fade-after (meters 220) :period (seconds 0.5) :length (seconds 0.017) :binding 5063)
|
|
(sp-item 5063 :flags (bit1 start-dead launch-asap) :binding 5064)
|
|
(sp-item 5063 :flags (bit1 start-dead launch-asap) :binding 5064)
|
|
(sp-item 5063 :flags (bit1 start-dead launch-asap) :binding 5064)
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
(sp-item 5064 :flags (bit1 start-dead))
|
|
)
|
|
)
|
|
|
|
(defpart 5065
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:scale-x (meters 2.5) (meters 0.1))
|
|
(:rot-x (degrees 11.25))
|
|
(:rot-z (degrees -19) (degrees 4))
|
|
(:scale-y :copy scale-x)
|
|
(:r 255.0)
|
|
(:g 0.0)
|
|
(:b 0.0)
|
|
(:a 16.0 4.0)
|
|
(:omega (degrees 4511.25))
|
|
(:timer (seconds 0.017))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow))
|
|
(:userdata 2048.0)
|
|
)
|
|
)
|
|
|
|
(defpart 5066
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xc9 :page #xc))
|
|
(:num 1.0)
|
|
(:y (meters -0.1))
|
|
(:scale-x (meters 0.1))
|
|
(:scale-y :copy scale-x)
|
|
(:r 0.0)
|
|
(:g 0.0)
|
|
(:b 0.0)
|
|
(:a 128.0)
|
|
(:timer (seconds 0.5))
|
|
(:flags (sp-cpuinfo-flag-3))
|
|
)
|
|
)
|
|
|
|
(defpart 5063
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:x (meters 0))
|
|
(:y (meters 0))
|
|
(:z (meters 0.35))
|
|
(:scale-x (meters 3) (meters 0.1))
|
|
(:rot-x (degrees 1.125))
|
|
(:rot-z (degrees -17))
|
|
(:scale-y :copy scale-x)
|
|
(:r 255.0)
|
|
(:g 96.0)
|
|
(:b 96.0)
|
|
(:a 64.0)
|
|
(:omega (degrees 4511.25))
|
|
(:vel-x (meters 0.10666667))
|
|
(:vel-y (meters 0))
|
|
(:vel-z (meters 0))
|
|
(:timer (seconds 0.5))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 ready-to-launch glow))
|
|
(:userdata 0.0)
|
|
)
|
|
)
|
|
|
|
(defpart 5064
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:scale-x (meters 12) (meters 0.1))
|
|
(:rot-x (degrees 4.5))
|
|
(:rot-z (degrees -19) (degrees 4))
|
|
(:scale-y :copy scale-x)
|
|
(:r 255.0)
|
|
(:g 0.0)
|
|
(:b 0.0)
|
|
(:a 16.0 4.0)
|
|
(:omega (degrees 2715.75))
|
|
(:timer (seconds 0.017))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow))
|
|
(:userdata 2048.0)
|
|
)
|
|
)
|
|
|
|
(defpartgroup group-caspad-electrical-thing
|
|
:id 1166
|
|
:bounds (static-bspherem 0 -12 0 32)
|
|
:parts ((sp-item 5067 :fade-after (meters 800) :flags (bit6) :period (seconds 0.2) :length (seconds 0.1))
|
|
(sp-item 5068 :fade-after (meters 800) :flags (bit6))
|
|
(sp-item 5069 :fade-after (meters 800) :flags (bit6))
|
|
(sp-item 5070 :fade-after (meters 800) :flags (bit6))
|
|
)
|
|
)
|
|
|
|
(defpart 5068
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xca :page #xc))
|
|
(:num 8.0)
|
|
(:x (meters 12))
|
|
(:y (meters -11))
|
|
(:scale-x (meters 20) (meters 1))
|
|
(:scale-y (meters 12) (meters 1))
|
|
(:r 0.0)
|
|
(:g 0.0 192.0)
|
|
(:b 255.0)
|
|
(:a 4.0 16.0)
|
|
(:timer (seconds 0.067))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-14))
|
|
(:rotate-y (degrees -110) (degrees 220))
|
|
)
|
|
)
|
|
|
|
(defpart 5069
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xca :page #xc))
|
|
(:num 8.0)
|
|
(:x (meters 12))
|
|
(:y (meters -20))
|
|
(:scale-x (meters 20) (meters 1))
|
|
(:scale-y (meters 12) (meters 1))
|
|
(:r 0.0)
|
|
(:g 0.0 192.0)
|
|
(:b 255.0)
|
|
(:a 4.0 16.0)
|
|
(:timer (seconds 0.067))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-14))
|
|
(:rotate-y (degrees -110) (degrees 220))
|
|
)
|
|
)
|
|
|
|
(defpart 5070
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xca :page #xc))
|
|
(:num 8.0)
|
|
(:x (meters 12))
|
|
(:y (meters -27))
|
|
(:scale-x (meters 20) (meters 1))
|
|
(:scale-y (meters 12) (meters 1))
|
|
(:r 0.0)
|
|
(:g 0.0 192.0)
|
|
(:b 255.0)
|
|
(:a 4.0 16.0)
|
|
(:timer (seconds 0.067))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-14))
|
|
(:rotate-y (degrees -110) (degrees 220))
|
|
)
|
|
)
|
|
|
|
(defpart 5067
|
|
:init-specs ((:texture (new 'static 'texture-id :index #xbb :page #xc))
|
|
(:num 1.0)
|
|
(:scale-x (meters 8) (meters 0.1))
|
|
(:rot-x (degrees 45))
|
|
(:scale-y :copy scale-x)
|
|
(:r 255.0)
|
|
(:g 0.0 64.0)
|
|
(:b 0.0)
|
|
(:a 64.0 4.0)
|
|
(:omega (degrees 18015.75))
|
|
(:timer (seconds 0.017))
|
|
(:flags (sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow))
|
|
(:userdata 1024.0)
|
|
)
|
|
)
|