diff --git a/decompiler/config/jak1/all-types.gc b/decompiler/config/jak1/all-types.gc index e57b4f38b4..de42446f80 100644 --- a/decompiler/config/jak1/all-types.gc +++ b/decompiler/config/jak1/all-types.gc @@ -11871,23 +11871,23 @@ (defenum collide-action :type uint32 :bitfield #t - (solid 0) - (ca-1 1) ;; sticky? - (ca-2 2) ;; target? - (ca-3 3) ;; edge grab related? if set, we can't initiate collision. - (ca-4 4) - (ca-5 5) ;; unused? - (ca-6 6) ;; swing pole, manipy - (ca-7 7) ;; camera - (ca-8 8) ;; swingpole - (ca-9 9) ;; eco vents? - (ca-10 10) - (ca-11 11) - (ca-12 12) - (ca-13 13) - (ca-14 14) - (ca-15 15) ;; manipy - (ca-16 16) + (solid 0) ;; used for solid things + (rider-plat-sticky 1) ;; used for platforms in rider/platform interactions + (rider-target 2) ;; used for target in rider/platform interactions + (edgegrab-active 3) ;; set/cleared when entering/exiting edgegrab states + (rider-plat 4) ;; used for platforms in rider/platform interactions + (unused 5) ;; totally unused? + (edgegrab-possible 6) ;; used when edge grab checks should be done + (edgegrab-cam 7) ;; set/cleared when entering/exiting edgegrab states + (swingpole-active 8) ;; set/cleared when entering/exiting swingpole states + (racer 9) ;; set/cleared when entering/exiting racer states + (attackable 10) ;; used for something to do with attacking/damaging + (attackable-unused 11) ;; seems to relate to attacking - set in several places but never tested for? + (snowball 12) ;; set/cleared when entering/exiting snowball states + (tube 13) ;; set/cleared when entering/exiting tube states + (flut 14) ;; set/cleared when entering/exiting flutflut states + (racer-grounded 15) ;; set/cleared when entering/exiting certain racer states w/ extra conditions + (racer-unused 16) ;; seems to relate to racer - never set, only cleared in one place? ) (defenum collide-offense diff --git a/goal_src/jak1/engine/camera/cam-master.gc b/goal_src/jak1/engine/camera/cam-master.gc index f39dd81016..f952251c06 100644 --- a/goal_src/jak1/engine/camera/cam-master.gc +++ b/goal_src/jak1/engine/camera/cam-master.gc @@ -360,7 +360,7 @@ (set! (-> self tpos-curr quad) (-> (target-cam-pos) quad)) ) ) - (when (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7)) + (when (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam)) (if *display-cam-los-debug* (format *stdcon* "ride edge~%") ) diff --git a/goal_src/jak1/engine/collide/collide-cache.gc b/goal_src/jak1/engine/collide/collide-cache.gc index 04e22c8b30..d6ec472d0c 100644 --- a/goal_src/jak1/engine/collide/collide-cache.gc +++ b/goal_src/jak1/engine/collide/collide-cache.gc @@ -218,7 +218,7 @@ (return #f) ) (let ((v1-28 (cond - ((logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)) + ((logtest? (-> *target* control root-prim prim-core action) (collide-action racer)) (+ -819.2 (-> arg0 height)) ) ((logtest? (-> arg0 flags) 16) diff --git a/goal_src/jak1/engine/collide/collide-shape-h.gc b/goal_src/jak1/engine/collide/collide-shape-h.gc index 12492a94e9..d7004415ca 100644 --- a/goal_src/jak1/engine/collide/collide-shape-h.gc +++ b/goal_src/jak1/engine/collide/collide-shape-h.gc @@ -307,23 +307,23 @@ (defenum collide-action :type uint32 :bitfield #t - (solid 0) - (ca-1 1) ;; sticky? - (ca-2 2) ;; target? - (ca-3 3) ;; edge grab related - (ca-4 4) - (ca-5 5) ;; unused? - (ca-6 6) ;; swing pole, manipy - (ca-7 7) ;; camera - (ca-8 8) ;; swingpole - (ca-9 9) ;; eco vents? - (ca-10 10) - (ca-11 11) - (ca-12 12) - (ca-13 13) - (ca-14 14) - (ca-15 15) ;; manipy - (ca-16 16) + (solid 0) ;; used for solid things + (rider-plat-sticky 1) ;; used for platforms in rider/platform interactions + (rider-target 2) ;; used for target in rider/platform interactions + (edgegrab-active 3) ;; set/cleared when entering/exiting edgegrab states + (rider-plat 4) ;; used for platforms in rider/platform interactions + (unused 5) ;; totally unused? + (edgegrab-possible 6) ;; used when edge grab checks should be done + (edgegrab-cam 7) ;; set/cleared when entering/exiting edgegrab states + (swingpole-active 8) ;; set/cleared when entering/exiting swingpole states + (racer 9) ;; set/cleared when entering/exiting racer states + (attackable 10) ;; used for something to do with attacking/damaging + (attackable-unused 11) ;; seems to relate to attacking - set in several places but never tested for? + (snowball 12) ;; set/cleared when entering/exiting snowball states + (tube 13) ;; set/cleared when entering/exiting tube states + (flut 14) ;; set/cleared when entering/exiting flutflut states + (racer-grounded 15) ;; set/cleared when entering/exiting certain racer states w/ extra conditions + (racer-unused 16) ;; seems to relate to racer - never set, only cleared in one place? ) ;; this field is a bit confusing. you have to have a higher offense to win against an object. diff --git a/goal_src/jak1/engine/collide/collide-shape-rider.gc b/goal_src/jak1/engine/collide/collide-shape-rider.gc index e436f152e4..32e660c290 100644 --- a/goal_src/jak1/engine/collide/collide-shape-rider.gc +++ b/goal_src/jak1/engine/collide/collide-shape-rider.gc @@ -17,8 +17,8 @@ (s4-0 (-> arg0 root-prim)) ) (when (and (logtest? (-> s5-0 collide-with) (-> s4-0 prim-core collide-as)) - (logtest? (-> s5-0 prim-core action) (collide-action ca-1)) - (logtest? (-> s4-0 prim-core action) (collide-action ca-2)) + (logtest? (-> s5-0 prim-core action) (collide-action rider-plat-sticky)) + (logtest? (-> s4-0 prim-core action) (collide-action rider-target)) ) (let ((f0-4 (- (- (vector-vector-distance (the-as vector (-> s5-0 prim-core)) (the-as vector (-> s4-0 prim-core))) (-> s5-0 prim-core world-sphere w) @@ -48,7 +48,9 @@ (dotimes (s2-0 (-> obj num-prims)) (let ((s1-0 (-> obj prims s2-0))) ;; check collide kind - (when (and (logtest? (-> s1-0 collide-with) s3-0) (logtest? (-> s1-0 prim-core action) (collide-action ca-1))) + (when (and (logtest? (-> s1-0 collide-with) s3-0) + (logtest? (-> s1-0 prim-core action) (collide-action rider-plat-sticky)) + ) ;; check dist (let ((f0-2 (- (- (vector-vector-distance (the-as vector (-> s1-0 prim-core)) (the-as vector (-> arg0 prim-core))) (-> s1-0 prim-core world-sphere w) @@ -78,7 +80,7 @@ (dotimes (s2-0 (-> (the-as collide-shape-prim-group arg0) num-prims)) (let ((s1-0 (-> (the-as collide-shape-prim-group arg0) prims s2-0))) (when (and (logtest? s3-0 (-> s1-0 prim-core collide-as)) - (logtest? (-> s1-0 prim-core action) (collide-action ca-2)) + (logtest? (-> s1-0 prim-core action) (collide-action rider-target)) ) (let ((f0-2 (- (- (vector-vector-distance (the-as vector (-> obj prim-core)) (the-as vector (-> s1-0 prim-core))) (-> obj prim-core world-sphere w) @@ -195,7 +197,7 @@ (v1-8 (-> (the-as collide-shape s2-0) root-prim)) ) (when (logtest? s4-0 (-> v1-8 prim-core collide-as)) - (when (and (logtest? (-> v1-8 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-8 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-0) process)) ) (let ((s1-0 (new 'stack-no-clear 'collide-overlap-result))) @@ -242,7 +244,7 @@ (v1-38 (-> (the-as collide-shape s2-1) root-prim)) ) (when (logtest? s4-0 (-> v1-38 prim-core collide-as)) - (when (and (logtest? (-> v1-38 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-38 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-1) process)) ) (let ((s1-2 (new 'stack-no-clear 'collide-overlap-result))) @@ -285,7 +287,7 @@ (v1-67 (-> (the-as collide-shape s2-2) root-prim)) ) (when (logtest? s4-0 (-> v1-67 prim-core collide-as)) - (when (and (logtest? (-> v1-67 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-67 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-2) process)) ) (let ((s1-4 (new 'stack-no-clear 'collide-overlap-result))) @@ -328,7 +330,7 @@ (v1-95 (-> (the-as collide-shape s2-3) root-prim)) ) (when (logtest? s4-0 (-> v1-95 prim-core collide-as)) - (when (and (logtest? (-> v1-95 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-95 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-3) process)) ) (let ((s1-6 (new 'stack-no-clear 'collide-overlap-result))) @@ -419,7 +421,7 @@ (set! (-> s4-0 quad) (-> gp-0 trans quad)) (vector-! s3-0 (-> arg0 rider-dest) s4-0) (cond - ((logtest? (-> obj root-prim prim-core action) (collide-action ca-4)) + ((logtest? (-> obj root-prim prim-core action) (collide-action rider-plat)) (let ((s1-0 (-> obj root-prim prim-core collide-as))) (set! (-> obj root-prim prim-core collide-as) (collide-kind)) (let ((s0-0 gp-0)) diff --git a/goal_src/jak1/engine/collide/collide-shape.gc b/goal_src/jak1/engine/collide/collide-shape.gc index db825e58ea..a8f721dd75 100644 --- a/goal_src/jak1/engine/collide/collide-shape.gc +++ b/goal_src/jak1/engine/collide/collide-shape.gc @@ -59,7 +59,7 @@ ;; reject if non-solid (b! (zero? a3-2) cfg-8 :delay (set! a2-2 (logand a2-1 8))) ) - ;; reject if ca-3 on us fails (not sure what this means yet) + ;; reject if edgegrab-active on us fails (not sure what this means yet) (b! (nonzero? a2-2) cfg-8 :delay (set! v1-3 (logand v1-2 1))) ) ;; reject if non-solid @@ -913,8 +913,8 @@ ) ) - ;; ca-9 gets set whenever you get on the zoomer. If we are on the zoomer, just go to "race-track" - (if (logtest? (-> obj root-prim prim-core action) (collide-action ca-9)) + ;; racer gets set whenever you get on the zoomer. If we are on the zoomer, just go to "race-track" + (if (logtest? (-> obj root-prim prim-core action) (collide-action racer)) (set! (-> obj surf) *race-track-surface*) ) @@ -934,8 +934,8 @@ ) (((pat-event burnup)) ;; burnup (like fire canyon lava). - ;; only send if we don't have ca-9 (on zoomer) - (if (zero? (logand (-> (the-as target (-> obj process)) control root-prim prim-core action) (collide-action ca-9))) + ;; only send if we don't have racer (on zoomer) + (if (zero? (logand (-> (the-as target (-> obj process)) control root-prim prim-core action) (collide-action racer))) (target-attack-up (the-as target (-> obj process)) 'attack-or-shove 'burnup) ) ) diff --git a/goal_src/jak1/engine/common-obs/basebutton.gc b/goal_src/jak1/engine/common-obs/basebutton.gc index d1346a6741..3e6b318fce 100644 --- a/goal_src/jak1/engine/common-obs/basebutton.gc +++ b/goal_src/jak1/engine/common-obs/basebutton.gc @@ -359,13 +359,13 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -374,7 +374,7 @@ (let ((s3-1 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s3-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-1 collide-with) (collide-kind target)) - (set! (-> s3-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-1 prim-core offense) (collide-offense indestructible)) (set! (-> s3-1 transform-index) 3) (set-vector! (-> s3-1 local-sphere) 0.0 0.0 0.0 12288.0) diff --git a/goal_src/jak1/engine/common-obs/collectables.gc b/goal_src/jak1/engine/common-obs/collectables.gc index af5941f2de..9328a20969 100644 --- a/goal_src/jak1/engine/common-obs/collectables.gc +++ b/goal_src/jak1/engine/common-obs/collectables.gc @@ -1329,10 +1329,10 @@ ) (when *target* (cond - ((logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)) + ((logtest? (-> *target* control root-prim prim-core action) (collide-action racer)) (set! v1-7 16) ) - ((logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)) + ((logtest? (-> *target* control root-prim prim-core action) (collide-action flut)) (set! v1-7 32) ) ) @@ -1582,7 +1582,7 @@ (if (not (or (logtest? (res-lump-value (-> self entity) 'options fact-options :time (the-as float -1000000000.0)) (fact-options powerup) ) - (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) ) ) (send-event *camera* 'teleport-to-other-start-string) @@ -2240,7 +2240,9 @@ (and (-> self entity) (not (task-complete? *game-info* (the-as game-task s5-2)))) ) (if (and *target* - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9 ca-12 ca-13 ca-14)) + (logtest? (-> *target* control root-prim prim-core action) + (collide-action racer snowball tube flut) + ) (not arg0) ) (logior! (-> self fact options) (fact-options instant-collect skip-jump-anim)) @@ -2745,7 +2747,7 @@ (backup-collide-with-as s5-0) (set! (-> self root-override) s5-0) ) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (clear-collide-with-as (-> self root-override)) ) (set! (-> self block-func) arg0) diff --git a/goal_src/jak1/engine/common-obs/crates.gc b/goal_src/jak1/engine/common-obs/crates.gc index b4ac339e7a..83b255d29c 100644 --- a/goal_src/jak1/engine/common-obs/crates.gc +++ b/goal_src/jak1/engine/common-obs/crates.gc @@ -486,7 +486,7 @@ (('flop 'uppercut 'explode 'darkeco 'eco-yellow 'bonk 'racer 'tube 'flut-bonk 'flut-attack) (if (and (logtest? (-> self fact options) (fact-options require-zoomer)) *target* - (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (not (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) ) (return #f) ) @@ -807,11 +807,12 @@ (if (nonzero? (-> self sound)) (stop! (-> self sound)) ) - (if (and *target* - (and (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9 ca-12 ca-13 ca-14)) - (!= (-> self fact pickup-type) 6) - (not arg0) - ) + (if (and *target* (and (logtest? (-> *target* control root-prim prim-core action) + (collide-action racer snowball tube flut) + ) + (!= (-> self fact pickup-type) 6) + (not arg0) + ) ) (logior! (-> self fact options) (fact-options instant-collect)) ) @@ -1017,7 +1018,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind crate blue-eco-suck)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense touch)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 3072.0 0.0 6963.2) diff --git a/goal_src/jak1/engine/common-obs/generic-obs.gc b/goal_src/jak1/engine/common-obs/generic-obs.gc index 7a9ab7a693..bf938d87a5 100644 --- a/goal_src/jak1/engine/common-obs/generic-obs.gc +++ b/goal_src/jak1/engine/common-obs/generic-obs.gc @@ -111,7 +111,7 @@ (loop (when (and *target* (< (vector-vector-distance (-> self root trans) (-> *target* control unknown-vector90)) (-> self range)) - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-6)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-possible)) (< (-> *target* control unknown-vector90 y) (+ (-> self root trans y) (* 0.5 (-> self range)))) ) (if (send-event *target* 'pole-grab self) diff --git a/goal_src/jak1/engine/common-obs/orb-cache.gc b/goal_src/jak1/engine/common-obs/orb-cache.gc index daacacd323..220b0a0e3d 100644 --- a/goal_src/jak1/engine/common-obs/orb-cache.gc +++ b/goal_src/jak1/engine/common-obs/orb-cache.gc @@ -308,7 +308,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object blue-eco-suck)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 11468.8) diff --git a/goal_src/jak1/engine/common-obs/plat-button.gc b/goal_src/jak1/engine/common-obs/plat-button.gc index c0b352f49b..d9c65f8cd4 100644 --- a/goal_src/jak1/engine/common-obs/plat-button.gc +++ b/goal_src/jak1/engine/common-obs/plat-button.gc @@ -344,14 +344,14 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -4096.0 0.0 27033.6) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 -3072.0 0.0 7372.8) @@ -360,7 +360,7 @@ (let ((s3-1 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s3-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-1 collide-with) (collide-kind target)) - (set! (-> s3-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-1 prim-core offense) (collide-offense indestructible)) (set! (-> s3-1 transform-index) 3) (set-vector! (-> s3-1 local-sphere) 0.0 -4096.0 0.0 27033.6) diff --git a/goal_src/jak1/engine/common-obs/plat-eco.gc b/goal_src/jak1/engine/common-obs/plat-eco.gc index 7d0765be31..213bb016ab 100644 --- a/goal_src/jak1/engine/common-obs/plat-eco.gc +++ b/goal_src/jak1/engine/common-obs/plat-eco.gc @@ -235,7 +235,7 @@ (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-kind ground-object blue-eco-suck)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -1228.8 0.0 13926.4) diff --git a/goal_src/jak1/engine/common-obs/plat.gc b/goal_src/jak1/engine/common-obs/plat.gc index 60a964ec50..cd525d516b 100644 --- a/goal_src/jak1/engine/common-obs/plat.gc +++ b/goal_src/jak1/engine/common-obs/plat.gc @@ -141,7 +141,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 13107.2) diff --git a/goal_src/jak1/engine/common-obs/rigid-body.gc b/goal_src/jak1/engine/common-obs/rigid-body.gc index fcd0b49a8c..4494614d1a 100644 --- a/goal_src/jak1/engine/common-obs/rigid-body.gc +++ b/goal_src/jak1/engine/common-obs/rigid-body.gc @@ -703,7 +703,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) diff --git a/goal_src/jak1/engine/common-obs/ropebridge.gc b/goal_src/jak1/engine/common-obs/ropebridge.gc index 5eeb3401cf..c7ef288f92 100644 --- a/goal_src/jak1/engine/common-obs/ropebridge.gc +++ b/goal_src/jak1/engine/common-obs/ropebridge.gc @@ -961,14 +961,14 @@ (set! (-> s4-0 collide-with) (collide-kind target)) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 (-> s3-0 root-prim-radius)) (set! (-> s4-0 transform-index) (+ (/ (-> s3-0 num-springs) 2) 4)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-root-prim! s5-0 s4-0) (let ((s3-1 (-> obj tuning col-mesh-indexes))) (dotimes (s2-0 (-> obj tuning num-springs)) (let* ((a3-1 (-> s3-1 s2-0)) (a1-3 (new 'process 'collide-shape-prim-mesh s5-0 a3-1 (the-as uint s2-0))) ) - (set! (-> a1-3 prim-core action) (collide-action solid ca-1)) + (set! (-> a1-3 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> a1-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> a1-3 collide-with) (collide-kind target)) (set! (-> a1-3 prim-core offense) (collide-offense indestructible)) diff --git a/goal_src/jak1/engine/common-obs/voicebox.gc b/goal_src/jak1/engine/common-obs/voicebox.gc index 7d63e1ad7a..2eb45a20bb 100644 --- a/goal_src/jak1/engine/common-obs/voicebox.gc +++ b/goal_src/jak1/engine/common-obs/voicebox.gc @@ -129,7 +129,7 @@ ) :code (behavior () (set-setting! 'sound-flava #f 20.0 (music-flava assistant)) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (send-event (ppointer->process (-> self parent-override)) 'set-dist diff --git a/goal_src/jak1/engine/common-obs/water.gc b/goal_src/jak1/engine/common-obs/water.gc index 736fa3106e..ae4231adc3 100644 --- a/goal_src/jak1/engine/common-obs/water.gc +++ b/goal_src/jak1/engine/common-obs/water.gc @@ -644,7 +644,7 @@ (cond ((and (logtest? (-> obj flags) (water-flags wt08)) (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-9) + (collide-action racer) ) ) ) @@ -675,7 +675,7 @@ ) ) (if (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-9) + (collide-action racer) ) (set! (-> obj bob-offset) 0.0) ) @@ -808,7 +808,7 @@ (let ((s4-4 (-> obj process root))) (when (and (not (logtest? (-> (the-as collide-shape-moving s4-4) status) (cshape-moving-flags csmf12))) (logtest? (-> obj flags) (water-flags wt11)) - (not (logtest? (-> (the-as collide-shape-moving s4-4) root-prim prim-core action) (collide-action ca-9))) + (not (logtest? (-> (the-as collide-shape-moving s4-4) root-prim prim-core action) (collide-action racer))) ) (let ((a1-27 (vector-! (new 'stack-no-clear 'vector) v1-200 (-> s4-4 trans)))) (vector-float*! a1-27 a1-27 (-> *display* frames-per-second)) @@ -849,7 +849,7 @@ (set! (-> a1-30 quad) (-> obj bottom 0 quad)) (let ((s5-1 (-> obj process root))) (set! (-> a1-30 y) f30-3) - (when (not (logtest? (-> (the-as collide-shape-moving s5-1) root-prim prim-core action) (collide-action ca-9))) + (when (not (logtest? (-> (the-as collide-shape-moving s5-1) root-prim prim-core action) (collide-action racer))) (let ((f30-4 (-> (the-as collide-shape-moving s5-1) ground-impact-vel))) (move-to-ground-point! (the-as collide-shape-moving s5-1) a1-30 (-> s5-1 transv) *up-vector*) (logior! (-> (the-as collide-shape-moving s5-1) status) (cshape-moving-flags on-water)) @@ -865,14 +865,14 @@ (cshape-moving-flags onsurf on-water) ) (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-9) + (collide-action racer) ) ) ) (when (< (-> obj process root trans y) -409.6) (send-event (-> obj process) 'no-look-around (seconds 1.5)) (when (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-14) + (collide-action flut) ) ) (cond diff --git a/goal_src/jak1/engine/game/effect-control.gc b/goal_src/jak1/engine/game/effect-control.gc index 876c4e0de0..5ddfc0ea87 100644 --- a/goal_src/jak1/engine/game/effect-control.gc +++ b/goal_src/jak1/engine/game/effect-control.gc @@ -1125,11 +1125,11 @@ (defbehavior target-land-effect target () (cond - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-14)) + ((logtest? (-> self control root-prim prim-core action) (collide-action flut)) (effect-control-method-10 (-> self skel effect) 'effect-land-poof -1.0 -1) (effect-control-method-10 (-> self skel effect) 'effect-flut-land -1.0 -1) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9)) + ((logtest? (-> self control root-prim prim-core action) (collide-action racer)) (sound-play-by-name (sound-name-with-material 'zoom-land (-> self control ground-pat) "") (new-sound-id) diff --git a/goal_src/jak1/engine/game/game-info.gc b/goal_src/jak1/engine/game/game-info.gc index e2b9440a93..c6ef862a23 100644 --- a/goal_src/jak1/engine/game/game-info.gc +++ b/goal_src/jak1/engine/game/game-info.gc @@ -566,7 +566,9 @@ ;; some sort of hack for eco vents. (b! - (and (logtest? (-> (the-as collide-shape (-> obj process root)) root-prim prim-core action) (collide-action ca-9)) + (and (logtest? (-> (the-as collide-shape (-> obj process root)) root-prim prim-core action) + (collide-action racer) + ) (type-type? (-> (handle->process source-handle) type) vent) ) cfg-80 diff --git a/goal_src/jak1/engine/target/logic-target.gc b/goal_src/jak1/engine/target/logic-target.gc index 71558af622..0598dc8347 100644 --- a/goal_src/jak1/engine/target/logic-target.gc +++ b/goal_src/jak1/engine/target/logic-target.gc @@ -1033,7 +1033,9 @@ ) (if (and (= (-> self cam-user-mode) 'normal) (logtest? (-> self control unknown-surface00 flags) (surface-flags allow-look-around)) - (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + (not (logtest? (-> self control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) ) (-> *setting-control* current allow-look-around) (>= (- (-> *display* base-frame-counter) (-> self no-look-around-wait)) (seconds 0.05)) @@ -1108,12 +1110,12 @@ ) 9420.8 ) - (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-9 ca-14))) + (not (logtest? (-> self control root-prim prim-core action) (collide-action racer flut))) #t ) ) - (logior! (-> self control root-prim prim-core action) (collide-action ca-6)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-6)) + (logior! (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) ) ) (let ((v1-146 (-> self current-level))) @@ -1435,10 +1437,10 @@ ) (set! (-> self control unknown-float30) (-> self water base-height)) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9)) + ((logtest? (-> self control root-prim prim-core action) (collide-action racer)) (set! (-> (&-> (-> self control) unknown-qword00) 0) (-> self control trans quad)) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-13)) + ((logtest? (-> self control root-prim prim-core action) (collide-action tube)) (set! (-> (&-> (-> self control) unknown-qword00) 0) (-> self control shadow-pos quad)) ) ((logtest? (-> self draw status) (draw-status hidden no-anim)) @@ -1464,7 +1466,7 @@ (set! (-> v1-0 blend) 0.0) ) (cond - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9 ca-13)) + ((logtest? (-> self control root-prim prim-core action) (collide-action racer tube)) ) ((logtest? (-> self water flags) (water-flags wt10)) (let ((f30-0 (- (- (-> self control trans y) (- (-> self water height) (-> self water wade-height)))))) @@ -1502,10 +1504,10 @@ ) (vector-! (-> self control unknown-vector91) (-> self control unknown-vector90) (-> self control trans)) (cond - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-7)) + ((logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-cam)) (target-compute-edge) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-8)) + ((logtest? (-> self control root-prim prim-core action) (collide-action swingpole-active)) (target-compute-pole) ) ) @@ -1586,7 +1588,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -1655,7 +1657,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -1718,7 +1720,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -1841,7 +1843,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -1946,10 +1948,10 @@ (collide-kind background cak-1 cak-2 cak-3 water powerup crate enemy wall-object ground-object mother-spider) ) (set! (-> s4-0 prim-core offense) (collide-offense touch)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-2)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-target)) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-sphere s5-0 (the-as uint 6)))) - (set! (-> s3-0 prim-core action) (collide-action solid ca-2)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-target)) (set! (-> s3-0 prim-core collide-as) (collide-kind target)) (set! (-> s3-0 collide-with) (collide-kind background cak-1 cak-2 cak-3 water powerup crate enemy wall-object ground-object mother-spider) diff --git a/goal_src/jak1/engine/target/target-death.gc b/goal_src/jak1/engine/target/target-death.gc index 8e598060cc..2074a1bb3f 100644 --- a/goal_src/jak1/engine/target/target-death.gc +++ b/goal_src/jak1/engine/target/target-death.gc @@ -614,7 +614,7 @@ (defbehavior target-hit-push target ((arg0 vector) (arg1 matrix) (arg2 float) (arg3 float) (arg4 attack-info)) (case (-> arg4 angle) (('jump 'up 'up-forward) - (when (and (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-9 ca-14))) + (when (and (not (logtest? (-> self control root-prim prim-core action) (collide-action racer flut))) (not (and (= (-> self game mode) 'play) (>= 0.0 (-> self fact-info-target health)))) ) (if (and (cpad-pressed? (-> self control unknown-cpad-info00 number) circle) (can-feet?)) diff --git a/goal_src/jak1/engine/target/target-handler.gc b/goal_src/jak1/engine/target/target-handler.gc index 19d715f94d..92a8f5ac27 100644 --- a/goal_src/jak1/engine/target/target-handler.gc +++ b/goal_src/jak1/engine/target/target-handler.gc @@ -771,7 +771,9 @@ ) (or (logtest? (-> self water flags) (water-flags wt09)) (logtest? (-> self state-flags) (state-flags dangerous sf02 being-attacked grabbed first-person-mode dying)) - (logtest? (-> self control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + (logtest? (-> self control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) (>= (-> self no-load-wait) (-> *display* base-frame-counter)) ) ) @@ -836,7 +838,7 @@ (go target-edge-grab) ) (('pole-grab) - (if (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-8))) + (if (not (logtest? (-> self control root-prim prim-core action) (collide-action swingpole-active))) (go target-pole-cycle (process->handle (the-as process (-> arg3 param 0)))) ) ) diff --git a/goal_src/jak1/engine/target/target.gc b/goal_src/jak1/engine/target/target.gc index e0557d7f57..8f899e5de3 100644 --- a/goal_src/jak1/engine/target/target.gc +++ b/goal_src/jak1/engine/target/target.gc @@ -2097,7 +2097,7 @@ ) ) (if (and v1-11 (or (logtest? (-> v1-11 root-prim prim-core collide-as) (collide-kind enemy)) - (logtest? (-> v1-11 root-prim prim-core action) (collide-action ca-10)) + (logtest? (-> v1-11 root-prim prim-core action) (collide-action attackable)) ) ) (set! (-> self control unknown-uint31) (the-as uint 1)) diff --git a/goal_src/jak1/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc index 8b9911fa04..3157481627 100644 --- a/goal_src/jak1/engine/target/target2.gc +++ b/goal_src/jak1/engine/target/target2.gc @@ -922,7 +922,7 @@ (set! (-> self control unknown-handle10) arg0) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self control unknown-surface00) *pole-mods*) - (logior! (-> self control root-prim prim-core action) (collide-action ca-8)) + (logior! (-> self control root-prim prim-core action) (collide-action swingpole-active)) (target-collide-set! 'pole (the-as float 0.0)) (set! (-> self control unknown-vector102 quad) (-> self control transv quad)) (set! (-> self control transv quad) (the-as uint128 0)) @@ -932,7 +932,7 @@ ) :exit (behavior () (target-collide-set! 'normal (the-as float 0.0)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-8)) + (logclear! (-> self control root-prim prim-core action) (collide-action swingpole-active)) (set! (-> self control unknown-handle10) (the-as handle #f)) (none) ) @@ -1142,15 +1142,15 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self control unknown-surface00) *edge-grab-mods*) (set! (-> self control unknown-dword41) (-> *display* base-frame-counter)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (logior! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (set! (-> self control unknown-vector102 quad) (-> self control transv quad)) (set! (-> self control transv quad) (the-as uint128 0)) (send-event *camera* 'ease-in) (none) ) :exit (behavior () - (when (logtest? (-> self control root-prim prim-core action) (collide-action ca-7)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (when (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-cam)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (send-event *camera* 'damp-up) ) (none) @@ -1261,7 +1261,7 @@ :code (behavior ((arg0 float) (arg1 float)) (ja-channel-set! 1) (set-quaternion! (-> self control) (-> self control dir-targ)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (set! (-> self control transv quad) (the-as uint128 0)) (let ((s4-0 (new 'stack-no-clear 'vector))) (ja-no-eval :group! eichar-edge-grab-to-jump-ja :num! (seek!) :frame-num 0.0) @@ -1306,7 +1306,7 @@ ) ) (set! (-> self control transv quad) (the-as uint128 0)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (vector-float*! (-> self control transv) (-> self control unknown-vector101) -40960.0) (when (and (< (- (-> *display* base-frame-counter) (-> self control rider-time)) (seconds 0.2)) (or (logtest? (-> self control unknown-surface01 flags) (surface-flags moving-ground)) diff --git a/goal_src/jak1/levels/beach/beach-obs.gc b/goal_src/jak1/levels/beach/beach-obs.gc index 1ba8a8e435..ca99882a86 100644 --- a/goal_src/jak1/levels/beach/beach-obs.gc +++ b/goal_src/jak1/levels/beach/beach-obs.gc @@ -83,14 +83,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) -40960.0 -40960.0 32768.0 69632.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 8) (set-vector! (-> s2-0 local-sphere) 4915.2 0.0 -4915.2 13516.8) @@ -99,7 +99,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 9) (set-vector! (-> s2-1 local-sphere) 4915.2 0.0 -4915.2 13516.8) diff --git a/goal_src/jak1/levels/citadel/citadel-obs.gc b/goal_src/jak1/levels/citadel/citadel-obs.gc index 16f6873ba8..c9e885ec4b 100644 --- a/goal_src/jak1/levels/citadel/citadel-obs.gc +++ b/goal_src/jak1/levels/citadel/citadel-obs.gc @@ -179,7 +179,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 40960.0) @@ -402,7 +402,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 49152.0) diff --git a/goal_src/jak1/levels/citadel/citadel-sages.gc b/goal_src/jak1/levels/citadel/citadel-sages.gc index 8516c8572d..e8fb57b6f9 100644 --- a/goal_src/jak1/levels/citadel/citadel-sages.gc +++ b/goal_src/jak1/levels/citadel/citadel-sages.gc @@ -168,7 +168,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 20480.0 0.0 28672.0) diff --git a/goal_src/jak1/levels/citadel/citb-drop-plat.gc b/goal_src/jak1/levels/citadel/citb-drop-plat.gc index 38abb34b11..9c7767e424 100644 --- a/goal_src/jak1/levels/citadel/citb-drop-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-drop-plat.gc @@ -251,7 +251,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) diff --git a/goal_src/jak1/levels/citadel/citb-plat.gc b/goal_src/jak1/levels/citadel/citb-plat.gc index 11b7a34c84..7f031462f4 100644 --- a/goal_src/jak1/levels/citadel/citb-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-plat.gc @@ -102,7 +102,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) @@ -158,7 +158,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -229,7 +229,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -571,7 +571,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) @@ -660,7 +660,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 -20480.0 0.0 40960.0) @@ -722,7 +722,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 40960.0) @@ -789,7 +789,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -8192.0 0.0 22528.0) @@ -1128,14 +1128,14 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 122880.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 -2867.2 0.0 7372.8) @@ -1144,7 +1144,7 @@ (let ((s3-1 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s3-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-1 collide-with) (collide-kind target)) - (set! (-> s3-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-1 prim-core offense) (collide-offense indestructible)) (set! (-> s3-1 transform-index) 3) (set-vector! (-> s3-1 local-sphere) 0.0 0.0 0.0 122880.0) diff --git a/goal_src/jak1/levels/finalboss/robotboss-misc.gc b/goal_src/jak1/levels/finalboss/robotboss-misc.gc index ab8bab5087..57191d6c6e 100644 --- a/goal_src/jak1/levels/finalboss/robotboss-misc.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-misc.gc @@ -381,14 +381,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 4) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 102400.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 5) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 102400.0) @@ -397,7 +397,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 4) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 102400.0) @@ -406,7 +406,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 7) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 102400.0) @@ -415,7 +415,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 0)))) (set! (-> s2-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-3 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 6) (set-vector! (-> s2-3 local-sphere) 0.0 0.0 0.0 102400.0) diff --git a/goal_src/jak1/levels/flut_common/flutflut.gc b/goal_src/jak1/levels/flut_common/flutflut.gc index e6357d8ccc..13936855e2 100644 --- a/goal_src/jak1/levels/flut_common/flutflut.gc +++ b/goal_src/jak1/levels/flut_common/flutflut.gc @@ -113,13 +113,13 @@ ) ) (and *cheat-mode* (cpad-hold? 0 l3)) - (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) ) (goto cfg-75) ) ) ((= v1-0 4) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (goto cfg-75) ) ) @@ -135,7 +135,7 @@ (goto cfg-75) ) (if (and *target* - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)) (< (- (-> *display* base-frame-counter) (-> self touch-time)) (seconds 0.05)) ) (go-virtual pickup (method-of-object self idle)) @@ -166,7 +166,7 @@ (suspend) ) (label cfg-75) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (go-virtual wait-for-return) (go-virtual idle) ) @@ -186,10 +186,10 @@ :code (behavior () (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (loop - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (go-virtual wait-for-return) ) (when (logtest? (-> self draw status) (draw-status was-drawn)) @@ -246,7 +246,7 @@ (('draw) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (transform-post) ) @@ -274,7 +274,7 @@ (flutflut-effect) (suspend) ) - (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (flutflut-effect) (suspend) ) @@ -311,7 +311,7 @@ (ja-channel-set! 0) (ja-post) (loop - (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)))) + (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)))) (go-virtual idle) ) (flutflut-effect) @@ -367,7 +367,7 @@ (blocking-plane-spawn (the-as curve-control - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (-> obj path-flut) (-> obj path-target) ) diff --git a/goal_src/jak1/levels/flut_common/target-flut.gc b/goal_src/jak1/levels/flut_common/target-flut.gc index 5024149496..8653457e75 100644 --- a/goal_src/jak1/levels/flut_common/target-flut.gc +++ b/goal_src/jak1/levels/flut_common/target-flut.gc @@ -410,7 +410,7 @@ (set! (-> self manipy) (the-as (pointer manipy) #f)) ) ) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-14)) + (logclear! (-> self control root-prim prim-core action) (collide-action flut)) (set! (-> self control unknown-surface00) *walk-mods*) (logclear! (-> self state-flags) (state-flags use-alt-cam-pos)) (set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max)) @@ -442,7 +442,7 @@ (target-collide-set! 'flut (the-as float 0.0)) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) - (logior! (-> self control root-prim prim-core action) (collide-action ca-14)) + (logior! (-> self control root-prim prim-core action) (collide-action flut)) (let ((s5-0 (-> self entity))) (set! (-> self entity) (-> self flut entity)) (set! (-> self manipy) @@ -1182,7 +1182,7 @@ ) (if (and v1-11 (or (logtest? (-> (the-as collide-shape v1-11) root-prim prim-core collide-as) (collide-kind enemy)) - (logtest? (-> (the-as collide-shape v1-11) root-prim prim-core action) (collide-action ca-10)) + (logtest? (-> (the-as collide-shape v1-11) root-prim prim-core action) (collide-action attackable)) ) ) (set! (-> self control unknown-uint31) (the-as uint 1)) diff --git a/goal_src/jak1/levels/jungle/darkvine.gc b/goal_src/jak1/levels/jungle/darkvine.gc index 6adc503ce3..54141811d2 100644 --- a/goal_src/jak1/levels/jungle/darkvine.gc +++ b/goal_src/jak1/levels/jungle/darkvine.gc @@ -281,13 +281,13 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 4) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action attackable attackable-unused)) (set-vector! (-> s3-0 local-sphere) 0.0 8192.0 0.0 16384.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 5) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 3276.8) @@ -296,7 +296,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-1 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 6) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 2867.2) @@ -305,7 +305,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-2 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-2 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 7) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 2457.6) @@ -314,7 +314,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-3 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-3 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 8) (set-vector! (-> s2-3 local-sphere) 0.0 0.0 0.0 2048.0) diff --git a/goal_src/jak1/levels/jungle/jungle-obs.gc b/goal_src/jak1/levels/jungle/jungle-obs.gc index f8a2ff113a..76a617e8b1 100644 --- a/goal_src/jak1/levels/jungle/jungle-obs.gc +++ b/goal_src/jak1/levels/jungle/jungle-obs.gc @@ -218,14 +218,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 1) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 36044.8 0.0 47104.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 3) (set-vector! (-> s2-0 local-sphere) 39321.6 0.0 0.0 43417.6) @@ -310,13 +310,13 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 40960.0 0.0 49152.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 4) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 36864.0) @@ -325,7 +325,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 3) (set-vector! (-> s2-1 local-sphere) 40960.0 0.0 0.0 24576.0) @@ -334,7 +334,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 3) (set-vector! (-> s2-2 local-sphere) 40960.0 0.0 0.0 24576.0) @@ -423,7 +423,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 24576.0 0.0 0.0 20480.0) @@ -760,14 +760,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 16) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 81920.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 5) (set-vector! (-> s2-0 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -776,7 +776,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 7) (set-vector! (-> s2-1 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -785,7 +785,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 1)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 9) (set-vector! (-> s2-2 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -794,7 +794,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-3 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 11) (set-vector! (-> s2-3 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -803,7 +803,7 @@ (let ((s2-4 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 1)))) (set! (-> s2-4 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-4 collide-with) (collide-kind target)) - (set! (-> s2-4 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-4 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-4 prim-core offense) (collide-offense indestructible)) (set! (-> s2-4 transform-index) 13) (set-vector! (-> s2-4 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -812,7 +812,7 @@ (let ((s2-5 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-5 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-5 collide-with) (collide-kind target)) - (set! (-> s2-5 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-5 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-5 prim-core offense) (collide-offense indestructible)) (set! (-> s2-5 transform-index) 15) (set-vector! (-> s2-5 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -821,7 +821,7 @@ (let ((s2-6 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 1)))) (set! (-> s2-6 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-6 collide-with) (collide-kind target)) - (set! (-> s2-6 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-6 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-6 prim-core offense) (collide-offense indestructible)) (set! (-> s2-6 transform-index) 17) (set-vector! (-> s2-6 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -830,7 +830,7 @@ (let ((s2-7 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-7 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-7 collide-with) (collide-kind target)) - (set! (-> s2-7 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-7 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-7 prim-core offense) (collide-offense indestructible)) (set! (-> s2-7 transform-index) 19) (set-vector! (-> s2-7 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -839,7 +839,7 @@ (let ((s2-8 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-8 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-8 collide-with) (collide-kind target)) - (set! (-> s2-8 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-8 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-8 prim-core offense) (collide-offense indestructible)) (set! (-> s2-8 transform-index) 4) (set-vector! (-> s2-8 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -848,7 +848,7 @@ (let ((s2-9 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-9 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-9 collide-with) (collide-kind target)) - (set! (-> s2-9 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-9 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-9 prim-core offense) (collide-offense indestructible)) (set! (-> s2-9 transform-index) 6) (set-vector! (-> s2-9 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -857,7 +857,7 @@ (let ((s2-10 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-10 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-10 collide-with) (collide-kind target)) - (set! (-> s2-10 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-10 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-10 prim-core offense) (collide-offense indestructible)) (set! (-> s2-10 transform-index) 8) (set-vector! (-> s2-10 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -866,7 +866,7 @@ (let ((s2-11 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-11 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-11 collide-with) (collide-kind target)) - (set! (-> s2-11 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-11 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-11 prim-core offense) (collide-offense indestructible)) (set! (-> s2-11 transform-index) 10) (set-vector! (-> s2-11 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -875,7 +875,7 @@ (let ((s2-12 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-12 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-12 collide-with) (collide-kind target)) - (set! (-> s2-12 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-12 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-12 prim-core offense) (collide-offense indestructible)) (set! (-> s2-12 transform-index) 12) (set-vector! (-> s2-12 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -884,7 +884,7 @@ (let ((s2-13 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-13 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-13 collide-with) (collide-kind target)) - (set! (-> s2-13 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-13 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-13 prim-core offense) (collide-offense indestructible)) (set! (-> s2-13 transform-index) 14) (set-vector! (-> s2-13 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -893,7 +893,7 @@ (let ((s2-14 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-14 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-14 collide-with) (collide-kind target)) - (set! (-> s2-14 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-14 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-14 prim-core offense) (collide-offense indestructible)) (set! (-> s2-14 transform-index) 16) (set-vector! (-> s2-14 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -902,7 +902,7 @@ (let ((s2-15 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-15 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-15 collide-with) (collide-kind target)) - (set! (-> s2-15 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-15 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-15 prim-core offense) (collide-offense indestructible)) (set! (-> s2-15 transform-index) 18) (set-vector! (-> s2-15 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -1160,14 +1160,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) -32768.0 -8192.0 0.0 32768.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 4) (set-vector! (-> s2-0 local-sphere) 8192.0 0.0 0.0 20480.0) @@ -1176,7 +1176,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 4) (set-vector! (-> s2-1 local-sphere) 36864.0 0.0 0.0 20480.0) diff --git a/goal_src/jak1/levels/jungleb/jungleb-obs.gc b/goal_src/jak1/levels/jungleb/jungleb-obs.gc index 83343b1da8..3035b47d03 100644 --- a/goal_src/jak1/levels/jungleb/jungleb-obs.gc +++ b/goal_src/jak1/levels/jungleb/jungleb-obs.gc @@ -309,7 +309,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 -7372.8 16384.0) diff --git a/goal_src/jak1/levels/jungleb/plat-flip.gc b/goal_src/jak1/levels/jungleb/plat-flip.gc index e7db686207..78091f7f59 100644 --- a/goal_src/jak1/levels/jungleb/plat-flip.gc +++ b/goal_src/jak1/levels/jungleb/plat-flip.gc @@ -120,7 +120,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 11468.8) diff --git a/goal_src/jak1/levels/maincave/driller-lurker.gc b/goal_src/jak1/levels/maincave/driller-lurker.gc index 034dc338bc..e2afdc7962 100644 --- a/goal_src/jak1/levels/maincave/driller-lurker.gc +++ b/goal_src/jak1/levels/maincave/driller-lurker.gc @@ -1017,14 +1017,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 6) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s3-0 local-sphere) 0.0 11264.0 0.0 22528.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-0 prim-core offense) (collide-offense touch)) (set-vector! (-> s2-0 local-sphere) 0.0 3276.8 0.0 4505.6) (append-prim s3-0 s2-0) @@ -1032,7 +1032,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-1 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-1 prim-core offense) (collide-offense touch)) (set-vector! (-> s2-1 local-sphere) 0.0 7372.8 0.0 4505.6) (append-prim s3-0 s2-1) @@ -1040,7 +1040,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-2 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-2 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-2 prim-core offense) (collide-offense touch)) (set-vector! (-> s2-2 local-sphere) 0.0 11468.8 0.0 4505.6) (append-prim s3-0 s2-2) diff --git a/goal_src/jak1/levels/maincave/maincave-obs.gc b/goal_src/jak1/levels/maincave/maincave-obs.gc index 20a0c24f27..ffa3326087 100644 --- a/goal_src/jak1/levels/maincave/maincave-obs.gc +++ b/goal_src/jak1/levels/maincave/maincave-obs.gc @@ -280,7 +280,7 @@ (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) ) - (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7))) + (not (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam))) ) ) (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) @@ -296,7 +296,7 @@ (or (and (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump)) (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam)) ) ) (while (not (ja-min? 0)) @@ -326,7 +326,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 9830.4 10240.0 0.0 17203.2) @@ -712,7 +712,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 -8192.0 0.0 67584.0) @@ -824,7 +824,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 75776.0) @@ -1172,7 +1172,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 17408.0) diff --git a/goal_src/jak1/levels/misty/misty-obs.gc b/goal_src/jak1/levels/misty/misty-obs.gc index 5bda68d652..4afeb6d8bd 100644 --- a/goal_src/jak1/levels/misty/misty-obs.gc +++ b/goal_src/jak1/levels/misty/misty-obs.gc @@ -1288,7 +1288,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 98304.0) @@ -1667,7 +1667,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) diff --git a/goal_src/jak1/levels/misty/misty-teetertotter.gc b/goal_src/jak1/levels/misty/misty-teetertotter.gc index 39ab2da160..10698879e4 100644 --- a/goal_src/jak1/levels/misty/misty-teetertotter.gc +++ b/goal_src/jak1/levels/misty/misty-teetertotter.gc @@ -175,7 +175,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 7) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 32768.0) @@ -202,7 +202,7 @@ (let ((s2-4 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 2)))) (set! (-> s2-4 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-4 collide-with) (collide-kind target)) - (set! (-> s2-4 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-4 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-4 prim-core offense) (collide-offense indestructible)) (set! (-> s2-4 transform-index) 3) (set-vector! (-> s2-4 local-sphere) 0.0 0.0 0.0 32768.0) diff --git a/goal_src/jak1/levels/misty/mistycannon.gc b/goal_src/jak1/levels/misty/mistycannon.gc index 36c719fd26..0bbae53c70 100644 --- a/goal_src/jak1/levels/misty/mistycannon.gc +++ b/goal_src/jak1/levels/misty/mistycannon.gc @@ -1698,14 +1698,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 20480.0 0.0 40960.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 3) (set-vector! (-> s2-0 local-sphere) 0.0 20480.0 0.0 40960.0) diff --git a/goal_src/jak1/levels/ogre/ogre-obs.gc b/goal_src/jak1/levels/ogre/ogre-obs.gc index cde97e80ba..aad6ed4ad6 100644 --- a/goal_src/jak1/levels/ogre/ogre-obs.gc +++ b/goal_src/jak1/levels/ogre/ogre-obs.gc @@ -548,7 +548,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 8192.0 0.0 32768.0) @@ -999,14 +999,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 17) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 143360.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 4) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1015,7 +1015,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 5) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1024,7 +1024,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 6) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1033,7 +1033,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-3 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 7) (set-vector! (-> s2-3 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1042,7 +1042,7 @@ (let ((s2-4 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-4 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-4 collide-with) (collide-kind target)) - (set! (-> s2-4 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-4 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-4 prim-core offense) (collide-offense indestructible)) (set! (-> s2-4 transform-index) 8) (set-vector! (-> s2-4 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1051,7 +1051,7 @@ (let ((s2-5 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-5 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-5 collide-with) (collide-kind target)) - (set! (-> s2-5 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-5 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-5 prim-core offense) (collide-offense indestructible)) (set! (-> s2-5 transform-index) 9) (set-vector! (-> s2-5 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1060,7 +1060,7 @@ (let ((s2-6 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-6 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-6 collide-with) (collide-kind target)) - (set! (-> s2-6 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-6 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-6 prim-core offense) (collide-offense indestructible)) (set! (-> s2-6 transform-index) 10) (set-vector! (-> s2-6 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1069,7 +1069,7 @@ (let ((s2-7 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-7 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-7 collide-with) (collide-kind target)) - (set! (-> s2-7 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-7 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-7 prim-core offense) (collide-offense indestructible)) (set! (-> s2-7 transform-index) 11) (set-vector! (-> s2-7 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1078,7 +1078,7 @@ (let ((s2-8 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-8 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-8 collide-with) (collide-kind target)) - (set! (-> s2-8 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-8 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-8 prim-core offense) (collide-offense indestructible)) (set! (-> s2-8 transform-index) 12) (set-vector! (-> s2-8 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1087,7 +1087,7 @@ (let ((s2-9 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-9 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-9 collide-with) (collide-kind target)) - (set! (-> s2-9 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-9 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-9 prim-core offense) (collide-offense indestructible)) (set! (-> s2-9 transform-index) 13) (set-vector! (-> s2-9 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1096,7 +1096,7 @@ (let ((s2-10 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-10 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-10 collide-with) (collide-kind target)) - (set! (-> s2-10 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-10 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-10 prim-core offense) (collide-offense indestructible)) (set! (-> s2-10 transform-index) 14) (set-vector! (-> s2-10 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1105,7 +1105,7 @@ (let ((s2-11 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-11 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-11 collide-with) (collide-kind target)) - (set! (-> s2-11 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-11 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-11 prim-core offense) (collide-offense indestructible)) (set! (-> s2-11 transform-index) 15) (set-vector! (-> s2-11 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1114,7 +1114,7 @@ (let ((s2-12 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-12 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-12 collide-with) (collide-kind target)) - (set! (-> s2-12 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-12 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-12 prim-core offense) (collide-offense indestructible)) (set! (-> s2-12 transform-index) 16) (set-vector! (-> s2-12 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1123,7 +1123,7 @@ (let ((s2-13 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-13 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-13 collide-with) (collide-kind target)) - (set! (-> s2-13 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-13 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-13 prim-core offense) (collide-offense indestructible)) (set! (-> s2-13 transform-index) 17) (set-vector! (-> s2-13 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1132,7 +1132,7 @@ (let ((s2-14 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-14 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-14 collide-with) (collide-kind target)) - (set! (-> s2-14 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-14 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-14 prim-core offense) (collide-offense indestructible)) (set! (-> s2-14 transform-index) 18) (set-vector! (-> s2-14 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1141,7 +1141,7 @@ (let ((s2-15 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-15 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-15 collide-with) (collide-kind target)) - (set! (-> s2-15 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-15 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-15 prim-core offense) (collide-offense indestructible)) (set! (-> s2-15 transform-index) 19) (set-vector! (-> s2-15 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1150,7 +1150,7 @@ (let ((s2-16 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 1)))) (set! (-> s2-16 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-16 collide-with) (collide-kind target)) - (set! (-> s2-16 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-16 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-16 prim-core offense) (collide-offense indestructible)) (set! (-> s2-16 transform-index) 20) (set-vector! (-> s2-16 local-sphere) 0.0 0.0 0.0 45056.0) diff --git a/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc b/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc index 6928e81e34..59cf0e58ee 100644 --- a/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc +++ b/goal_src/jak1/levels/racer_common/collide-reaction-racer.gc @@ -103,7 +103,7 @@ (set! sv-96 (logior sv-96 4096)) ) ) - (if (and s3-1 (logtest? (collide-action ca-16) (-> arg0 root-prim prim-core action))) + (if (and s3-1 (logtest? (collide-action racer-unused) (-> arg0 root-prim prim-core action))) (set! s3-1 #f) ) (cond diff --git a/goal_src/jak1/levels/racer_common/racer-states.gc b/goal_src/jak1/levels/racer_common/racer-states.gc index b4e5c16e74..6e5b26841c 100644 --- a/goal_src/jak1/levels/racer_common/racer-states.gc +++ b/goal_src/jak1/levels/racer_common/racer-states.gc @@ -123,7 +123,7 @@ (set! (-> *hud-parts* power 0 next-y-offset) 0) (set! (-> *hud-parts* buzzers 0 y-sgn) 1) (set! (-> *hud-parts* power 0 y-sgn) 1) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-9 ca-16)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer racer-unused)) (set! (-> self control unknown-surface00) *walk-mods*) (logclear! (-> self state-flags) (state-flags use-alt-cam-pos)) (send-event *camera* 'clear-slave-option #x6000) @@ -184,7 +184,7 @@ (target-collide-set! 'racer 0.0) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) - (logior! (-> self control root-prim prim-core action) (collide-action ca-9)) + (logior! (-> self control root-prim prim-core action) (collide-action racer)) (set! (-> self control unknown-surface00) *racer-mods*) (set! (-> self racer lean-rotx) 0.0) (vector-reset! (-> self racer rotv)) @@ -533,7 +533,7 @@ (none) ) :exit (behavior () - (logclear! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer-grounded)) (set! (-> self racer hop?) #f) ((-> target-racing-start exit)) (none) @@ -599,7 +599,7 @@ ) (target-racing-smack-check) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logior! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ) (mod-var-jump #t #t (cpad-hold? (-> self control unknown-cpad-info00 number) l1 r1) (-> self control transv)) (set! (-> self racer shock-offset) (* 0.8 (-> self racer shock-offset))) @@ -622,7 +622,7 @@ (defstate target-racing-bounce (target) :event (-> target-racing-start event) :enter (behavior ((arg0 float) (arg1 float) (arg2 symbol)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logior! (-> self control root-prim prim-core action) (collide-action racer-grounded)) (sound-play "zoomer-jump") (set! (-> self state-time) (-> *display* base-frame-counter)) (racer-calc-gravity) @@ -634,7 +634,7 @@ (none) ) :exit (behavior () - (logclear! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ((-> target-racing-start exit)) (none) ) @@ -748,7 +748,7 @@ (none) ) :exit (behavior () - (logclear! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ((-> target-racing-start exit)) (none) ) @@ -759,7 +759,7 @@ (target-racing-smack-check) (racer-buzz 0.3) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logior! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ) (none) ) diff --git a/goal_src/jak1/levels/racer_common/racer.gc b/goal_src/jak1/levels/racer_common/racer.gc index 10ba08ef1b..daee58fe54 100644 --- a/goal_src/jak1/levels/racer_common/racer.gc +++ b/goal_src/jak1/levels/racer_common/racer.gc @@ -131,7 +131,7 @@ (((task-status need-reward-speech)) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (ja-post) ) @@ -144,7 +144,7 @@ ((6) (if (or (task-closed? (game-task village2-levitator) (task-status need-hint)) (and *cheat-mode* (cpad-hold? 0 l3)) - (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) ) (goto cfg-77) ) @@ -186,7 +186,7 @@ ) ) ((4) - (if (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)))) + (if (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action racer)))) (goto cfg-77) ) ) @@ -198,7 +198,7 @@ (suspend) (b! #t cfg-0 :delay (nop!)) (label cfg-77) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (go-virtual wait-for-return) (go-virtual idle) ) @@ -218,7 +218,7 @@ :code (behavior () (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) 0.0 (let ((f30-0 (if (= (-> self condition) 4) @@ -228,7 +228,7 @@ ) ) (loop - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (go-virtual wait-for-return) ) (when (and (and *target* (>= f30-0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) @@ -272,7 +272,7 @@ (('draw) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (transform-post) ) @@ -309,7 +309,7 @@ (when (or (not *target*) (< 24576.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans))) ) - (when (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (when (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (case (-> (level-get-target-inside *level*) name) (('misty) (close-specific-task! (game-task misty-bike) (task-status need-reminder-a)) @@ -322,7 +322,7 @@ (racer-effect) (suspend) ) - (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (racer-effect) (suspend) ) @@ -377,7 +377,7 @@ (ja-channel-set! 0) (ja-post) (loop - (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)))) + (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer)))) (go-virtual idle) ) (racer-effect) @@ -435,7 +435,7 @@ (blocking-plane-spawn (the-as curve-control - (if (or (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (or (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (= (-> obj condition) 3) ) (-> obj path-racer) diff --git a/goal_src/jak1/levels/racer_common/target-racer.gc b/goal_src/jak1/levels/racer_common/target-racer.gc index e49c48353a..c21dd5e709 100644 --- a/goal_src/jak1/levels/racer_common/target-racer.gc +++ b/goal_src/jak1/levels/racer_common/target-racer.gc @@ -1396,7 +1396,7 @@ (vector-! (new 'stack-no-clear 'vector) (-> self control trans) (-> self control last-known-safe-ground)) ) ) - (logtest? (-> self control root-prim prim-core action) (collide-action ca-15)) + (logtest? (-> self control root-prim prim-core action) (collide-action racer-grounded)) ) (+! (-> self racer stuck-count) 1) (go target-racing-smack 122880.0 #f) diff --git a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc index e041b745e7..a4bb84dfc7 100644 --- a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc +++ b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc @@ -973,7 +973,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set-vector! (-> s3-0 local-sphere) 0.0 10240.0 0.0 10240.0) (set-root-prim! s4-0 s3-0) diff --git a/goal_src/jak1/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc index b5a7ba1c20..9c91c34334 100644 --- a/goal_src/jak1/levels/rolling/rolling-obs.gc +++ b/goal_src/jak1/levels/rolling/rolling-obs.gc @@ -90,14 +90,14 @@ (let ((s5-0 (new 'process 'collide-shape-prim-group gp-0 (the-as uint 1) 0))) (set! (-> s5-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s5-0 collide-with) (collide-kind target)) - (set! (-> s5-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s5-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s5-0 transform-index) 0) (set-vector! (-> s5-0 local-sphere) -8192.0 0.0 0.0 40960.0) (set-root-prim! gp-0 s5-0) (let ((s4-0 (new 'process 'collide-shape-prim-mesh gp-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 4) (set-vector! (-> s4-0 local-sphere) 8192.0 0.0 0.0 28672.0) diff --git a/goal_src/jak1/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc index a884794fd5..6e6b8dc52b 100644 --- a/goal_src/jak1/levels/rolling/rolling-robber.gc +++ b/goal_src/jak1/levels/rolling/rolling-robber.gc @@ -683,7 +683,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 10240.0) diff --git a/goal_src/jak1/levels/snow/snow-bumper.gc b/goal_src/jak1/levels/snow/snow-bumper.gc index 3363fd8b0c..542034ae26 100644 --- a/goal_src/jak1/levels/snow/snow-bumper.gc +++ b/goal_src/jak1/levels/snow/snow-bumper.gc @@ -327,13 +327,13 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 9011.2 0.0 13926.4) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 6) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 4915.2) diff --git a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc index 94e7134f0e..cae836a9f0 100644 --- a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc +++ b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc @@ -234,7 +234,7 @@ (case event-type (('touch 'attack 'bonk) (when (and (= (-> proc type) target) - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)) (>= 10649.6 (vector-vector-xz-distance (-> self root-override trans) (target-pos 0))) ) (close-specific-task! (game-task snow-ball) (task-status need-hint)) @@ -370,7 +370,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 17612.8) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 1)))) @@ -384,7 +384,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 4) (set-vector! (-> s2-1 local-sphere) 0.0 2048.0 0.0 11468.8) @@ -393,7 +393,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 3) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 17612.8) @@ -732,7 +732,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logclear! (-> self mask) (process-mask actor-pause)) - (logclear! (-> self root-override root-prim prim-core action) (collide-action ca-1)) + (logclear! (-> self root-override root-prim prim-core action) (collide-action rider-plat-sticky)) (set! (-> self start-trans quad) (-> self root-override trans quad)) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (new 'stack-no-clear 'quaternion)) @@ -748,7 +748,7 @@ ) :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) - (logior! (-> self root-override root-prim prim-core action) (collide-action ca-1)) + (logior! (-> self root-override root-prim prim-core action) (collide-action rider-plat-sticky)) (none) ) :trans (behavior () @@ -792,7 +792,7 @@ ) ) (('ridden) - (if (or (not *target*) (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)))) + (if (or (not *target*) (not (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)))) (go elevator-travel-to-fort) ) ) @@ -962,7 +962,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -2048.0 0.0 16384.0) @@ -998,7 +998,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -4096.0 0.0 27648.0) @@ -1051,7 +1051,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 36864.0) diff --git a/goal_src/jak1/levels/snow/snow-obs.gc b/goal_src/jak1/levels/snow/snow-obs.gc index 3a4e26d40a..6b84331d0e 100644 --- a/goal_src/jak1/levels/snow/snow-obs.gc +++ b/goal_src/jak1/levels/snow/snow-obs.gc @@ -452,7 +452,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 -7372.8 18022.4) @@ -591,7 +591,7 @@ (let ((s4-1 (new 'process 'collide-shape-prim-mesh s3-1 (the-as uint s4-0) (the-as uint 0)))) (set! (-> s4-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-1 collide-with) (collide-kind target)) - (set! (-> s4-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-1 prim-core offense) (collide-offense indestructible)) (set! (-> s4-1 transform-index) 3) (set-vector! (-> s4-1 local-sphere) 0.0 20480.0 -12288.0 25600.0) @@ -701,7 +701,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 49152.0 -16384.0 16384.0) @@ -1445,7 +1445,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 8192.0) @@ -1663,7 +1663,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 20480.0 0.0 36864.0) @@ -1815,7 +1815,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 8192.0) diff --git a/goal_src/jak1/levels/snow/snow-ram.gc b/goal_src/jak1/levels/snow/snow-ram.gc index 5be4846dcc..ff59af5bc6 100644 --- a/goal_src/jak1/levels/snow/snow-ram.gc +++ b/goal_src/jak1/levels/snow/snow-ram.gc @@ -362,7 +362,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 20480.0 0.0 34816.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) @@ -377,7 +377,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 3) (set-vector! (-> s2-1 local-sphere) 0.0 20480.0 0.0 34816.0) diff --git a/goal_src/jak1/levels/snow/target-snowball.gc b/goal_src/jak1/levels/snow/target-snowball.gc index dd3e4e9259..fa2f9d7184 100644 --- a/goal_src/jak1/levels/snow/target-snowball.gc +++ b/goal_src/jak1/levels/snow/target-snowball.gc @@ -77,7 +77,7 @@ (set! (-> self manipy) (the-as (pointer manipy) #f)) ) ) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-12)) + (logclear! (-> self control root-prim prim-core action) (collide-action snowball)) (set! (-> self control unknown-surface00) *walk-mods*) (set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max)) (set! (-> self control dynam gravity-length) (-> self control unknown-dynamics00 gravity-length)) @@ -104,7 +104,7 @@ (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) (move-by-vector! (-> self control) (new 'static 'vector :y 4096.0 :w 1.0)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-12)) + (logior! (-> self control root-prim prim-core action) (collide-action snowball)) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 5) :num! min) (remove-exit) diff --git a/goal_src/jak1/levels/sunken/bully.gc b/goal_src/jak1/levels/sunken/bully.gc index dc96a4fb41..184c2e0ccd 100644 --- a/goal_src/jak1/levels/sunken/bully.gc +++ b/goal_src/jak1/levels/sunken/bully.gc @@ -778,14 +778,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind cak-2 target crate enemy)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s3-0 local-sphere) 0.0 6144.0 0.0 10240.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 3)))) (set! (-> s2-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-0 collide-with) (collide-kind cak-2 target crate enemy)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-0 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s2-0 local-sphere) 0.0 4096.0 0.0 6963.2) (append-prim s3-0 s2-0) @@ -793,7 +793,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 3)))) (set! (-> s2-1 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-1 collide-with) (collide-kind cak-2 target crate enemy)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-1 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-1 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s2-1 local-sphere) 0.0 9420.8 0.0 4096.0) (append-prim s3-0 s2-1) diff --git a/goal_src/jak1/levels/sunken/floating-launcher.gc b/goal_src/jak1/levels/sunken/floating-launcher.gc index 7c29a790e2..3837b26df9 100644 --- a/goal_src/jak1/levels/sunken/floating-launcher.gc +++ b/goal_src/jak1/levels/sunken/floating-launcher.gc @@ -104,7 +104,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 11468.8) diff --git a/goal_src/jak1/levels/sunken/helix-water.gc b/goal_src/jak1/levels/sunken/helix-water.gc index 9192dcfe75..5f3e3ac69a 100644 --- a/goal_src/jak1/levels/sunken/helix-water.gc +++ b/goal_src/jak1/levels/sunken/helix-water.gc @@ -188,7 +188,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind wall-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 22528.0 0.0 53248.0) @@ -534,7 +534,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 14336.0 0.0 22118.4) diff --git a/goal_src/jak1/levels/sunken/orbit-plat.gc b/goal_src/jak1/levels/sunken/orbit-plat.gc index 8ab7b7d8ef..a45cbd53bc 100644 --- a/goal_src/jak1/levels/sunken/orbit-plat.gc +++ b/goal_src/jak1/levels/sunken/orbit-plat.gc @@ -786,7 +786,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 13926.4) diff --git a/goal_src/jak1/levels/sunken/qbert-plat.gc b/goal_src/jak1/levels/sunken/qbert-plat.gc index 98dee4f3f3..e345c5d642 100644 --- a/goal_src/jak1/levels/sunken/qbert-plat.gc +++ b/goal_src/jak1/levels/sunken/qbert-plat.gc @@ -307,7 +307,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -8192.0 0.0 18432.0) diff --git a/goal_src/jak1/levels/sunken/square-platform.gc b/goal_src/jak1/levels/sunken/square-platform.gc index 46e5d58d14..96f8cb0de5 100644 --- a/goal_src/jak1/levels/sunken/square-platform.gc +++ b/goal_src/jak1/levels/sunken/square-platform.gc @@ -436,7 +436,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 -24576.0 0.0 32768.0) diff --git a/goal_src/jak1/levels/sunken/steam-cap.gc b/goal_src/jak1/levels/sunken/steam-cap.gc index 41b14c222f..69f6a38bc9 100644 --- a/goal_src/jak1/levels/sunken/steam-cap.gc +++ b/goal_src/jak1/levels/sunken/steam-cap.gc @@ -683,7 +683,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 12288.0) diff --git a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc index 1125d1f2e5..6f641d64cd 100644 --- a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc +++ b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc @@ -1100,7 +1100,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 16384.0 0.0 67584.0) diff --git a/goal_src/jak1/levels/sunken/sunken-obs.gc b/goal_src/jak1/levels/sunken/sunken-obs.gc index 733184f180..6d2f7962f0 100644 --- a/goal_src/jak1/levels/sunken/sunken-obs.gc +++ b/goal_src/jak1/levels/sunken/sunken-obs.gc @@ -104,7 +104,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 57344.0) diff --git a/goal_src/jak1/levels/sunken/target-tube.gc b/goal_src/jak1/levels/sunken/target-tube.gc index 29b9ae8c5e..d18f419d40 100644 --- a/goal_src/jak1/levels/sunken/target-tube.gc +++ b/goal_src/jak1/levels/sunken/target-tube.gc @@ -387,7 +387,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -472,7 +472,7 @@ (set! (-> self manipy) (the-as (pointer manipy) #f)) ) ) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-13)) + (logclear! (-> self control root-prim prim-core action) (collide-action tube)) (set! (-> self control unknown-surface00) *walk-mods*) (set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max)) (set! (-> self control dynam gravity-length) (-> self control unknown-dynamics00 gravity-length)) @@ -508,7 +508,7 @@ (target-collide-set! 'tube 0.0) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) - (logior! (-> self control root-prim prim-core action) (collide-action ca-13)) + (logior! (-> self control root-prim prim-core action) (collide-action tube)) (remove-exit) (cond ((< (the-as diff --git a/goal_src/jak1/levels/sunken/wall-plat.gc b/goal_src/jak1/levels/sunken/wall-plat.gc index 93eecfe22c..d7077813f7 100644 --- a/goal_src/jak1/levels/sunken/wall-plat.gc +++ b/goal_src/jak1/levels/sunken/wall-plat.gc @@ -212,7 +212,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 2) (set-vector! (-> s3-0 local-sphere) 0.0 -6144.0 -12288.0 19456.0) diff --git a/goal_src/jak1/levels/sunken/wedge-plats.gc b/goal_src/jak1/levels/sunken/wedge-plats.gc index 5be5fe6f43..7df82f02e0 100644 --- a/goal_src/jak1/levels/sunken/wedge-plats.gc +++ b/goal_src/jak1/levels/sunken/wedge-plats.gc @@ -208,7 +208,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 24576.0) @@ -371,7 +371,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 32768.0) diff --git a/goal_src/jak1/levels/swamp/billy.gc b/goal_src/jak1/levels/swamp/billy.gc index a841bcc8a6..c56356e3d3 100644 --- a/goal_src/jak1/levels/swamp/billy.gc +++ b/goal_src/jak1/levels/swamp/billy.gc @@ -1092,7 +1092,7 @@ (defmethod target-above-threshold? billy ((obj billy)) (the-as symbol - (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)))) + (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)))) ) ) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index a8090157e4..e9320111ce 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -493,7 +493,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 40960.0) @@ -831,7 +831,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) diff --git a/goal_src/jak1/levels/training/training-obs.gc b/goal_src/jak1/levels/training/training-obs.gc index 829f26c66a..b302450220 100644 --- a/goal_src/jak1/levels/training/training-obs.gc +++ b/goal_src/jak1/levels/training/training-obs.gc @@ -297,7 +297,7 @@ (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-kind enemy)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 18432.0) diff --git a/goal_src/jak1/levels/village1/fishermans-boat.gc b/goal_src/jak1/levels/village1/fishermans-boat.gc index ea0bd26789..2224506b6b 100644 --- a/goal_src/jak1/levels/village1/fishermans-boat.gc +++ b/goal_src/jak1/levels/village1/fishermans-boat.gc @@ -1268,14 +1268,14 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 1) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set-vector! (-> s4-0 local-sphere) 0.0 8192.0 0.0 61440.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 8192.0 0.0 61440.0) diff --git a/goal_src/jak1/levels/village1/yakow.gc b/goal_src/jak1/levels/village1/yakow.gc index 4e72846cdd..1d890f8978 100644 --- a/goal_src/jak1/levels/village1/yakow.gc +++ b/goal_src/jak1/levels/village1/yakow.gc @@ -780,7 +780,7 @@ yakow-default-event-handler (let ((s3-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set-vector! (-> s3-0 local-sphere) 0.0 4096.0 0.0 10240.0) (set-root-prim! s4-0 s3-0) diff --git a/goal_src/jak1/levels/village2/village2-obs.gc b/goal_src/jak1/levels/village2/village2-obs.gc index 25dda1d75e..b9aabf1589 100644 --- a/goal_src/jak1/levels/village2/village2-obs.gc +++ b/goal_src/jak1/levels/village2/village2-obs.gc @@ -304,7 +304,7 @@ (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-kind enemy)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 18432.0) @@ -364,7 +364,7 @@ (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-kind enemy)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 25395.2) diff --git a/goal_src/jak1/levels/village3/minecart.gc b/goal_src/jak1/levels/village3/minecart.gc index 3471984d50..ebad12de7b 100644 --- a/goal_src/jak1/levels/village3/minecart.gc +++ b/goal_src/jak1/levels/village3/minecart.gc @@ -80,7 +80,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 4915.2 0.0 13107.2) diff --git a/goal_src/jak1/levels/village3/village3-obs.gc b/goal_src/jak1/levels/village3/village3-obs.gc index b556c067a2..74be8f2882 100644 --- a/goal_src/jak1/levels/village3/village3-obs.gc +++ b/goal_src/jak1/levels/village3/village3-obs.gc @@ -357,7 +357,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 -24576.0 0.0 26624.0) diff --git a/goal_src/jak1/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc index e0a3b88630..9115b17e6a 100644 --- a/goal_src/jak1/levels/village_common/villagep-obs.gc +++ b/goal_src/jak1/levels/village_common/villagep-obs.gc @@ -110,7 +110,9 @@ (and (>= (-> self level-slot) 0) (not (movie?)) (not (level-hint-displayed?)) - (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + (not (logtest? (-> *target* control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) ) (let* ((v1-16 (-> self root)) (a1-2 (-> *target* control trans)) @@ -479,13 +481,13 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 1) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -502,7 +504,9 @@ (defmethod pressable? warp-gate-switch ((obj warp-gate-switch)) (let ((v1-2 (-> obj entity extra perm task))) (cond - ((logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + ((logtest? (-> *target* control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) #f ) ((= v1-2 (game-task training-door)) diff --git a/goal_src/jak1/pc/pckernel.gc b/goal_src/jak1/pc/pckernel.gc index 124c893167..d6e081a3e7 100644 --- a/goal_src/jak1/pc/pckernel.gc +++ b/goal_src/jak1/pc/pckernel.gc @@ -113,7 +113,7 @@ (define-extern vent type) (protect ((-> pp type) (-> *target* control root-prim prim-core action)) (set! (-> pp type) vent) - (logior! (-> *target* control root-prim prim-core action) (collide-action ca-9)) + (logior! (-> *target* control root-prim prim-core action) (collide-action racer)) (send-event *target* 'get-pickup (pickup-type eco-green) (-> *FACT-bank* eco-full-inc))) ) ) @@ -360,7 +360,7 @@ (when (and (-> obj controller-heat-led?) (nonzero? (-> *target* racer)) - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action racer)) (or (= (-> *target* current-level name) 'lavatube) (= (-> *target* current-level name) 'firecanyon) (= (-> *target* current-level name) 'citadel))) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc index 891c054f75..9359e2a453 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc @@ -377,7 +377,7 @@ (set! (-> self tpos-curr quad) (-> (target-cam-pos) quad)) ) ) - (when (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7)) + (when (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam)) (if *display-cam-los-debug* (format *stdcon* "ride edge~%") ) diff --git a/test/decompiler/reference/jak1/engine/collide/collide-shape-rider_REF.gc b/test/decompiler/reference/jak1/engine/collide/collide-shape-rider_REF.gc index 3ef9e56c22..5b01e8810a 100644 --- a/test/decompiler/reference/jak1/engine/collide/collide-shape-rider_REF.gc +++ b/test/decompiler/reference/jak1/engine/collide/collide-shape-rider_REF.gc @@ -13,8 +13,8 @@ (s4-0 (-> arg0 root-prim)) ) (when (and (logtest? (-> s5-0 collide-with) (-> s4-0 prim-core collide-as)) - (logtest? (-> s5-0 prim-core action) (collide-action ca-1)) - (logtest? (-> s4-0 prim-core action) (collide-action ca-2)) + (logtest? (-> s5-0 prim-core action) (collide-action rider-plat-sticky)) + (logtest? (-> s4-0 prim-core action) (collide-action rider-target)) ) (let ((f0-4 (- (- (vector-vector-distance (the-as vector (-> s5-0 prim-core)) (the-as vector (-> s4-0 prim-core))) (-> s5-0 prim-core world-sphere w) @@ -45,7 +45,9 @@ (let ((s3-0 (-> arg0 prim-core collide-as))) (dotimes (s2-0 (-> obj num-prims)) (let ((s1-0 (-> obj prims s2-0))) - (when (and (logtest? (-> s1-0 collide-with) s3-0) (logtest? (-> s1-0 prim-core action) (collide-action ca-1))) + (when (and (logtest? (-> s1-0 collide-with) s3-0) + (logtest? (-> s1-0 prim-core action) (collide-action rider-plat-sticky)) + ) (let ((f0-2 (- (- (vector-vector-distance (the-as vector (-> s1-0 prim-core)) (the-as vector (-> arg0 prim-core))) (-> s1-0 prim-core world-sphere w) ) @@ -75,7 +77,7 @@ (dotimes (s2-0 (-> (the-as collide-shape-prim-group arg0) num-prims)) (let ((s1-0 (-> (the-as collide-shape-prim-group arg0) prims s2-0))) (when (and (logtest? s3-0 (-> s1-0 prim-core collide-as)) - (logtest? (-> s1-0 prim-core action) (collide-action ca-2)) + (logtest? (-> s1-0 prim-core action) (collide-action rider-target)) ) (let ((f0-2 (- (- (vector-vector-distance (the-as vector (-> obj prim-core)) (the-as vector (-> s1-0 prim-core))) (-> obj prim-core world-sphere w) @@ -191,7 +193,7 @@ (v1-8 (-> (the-as collide-shape s2-0) root-prim)) ) (when (logtest? s4-0 (-> v1-8 prim-core collide-as)) - (when (and (logtest? (-> v1-8 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-8 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-0) process)) ) (let ((s1-0 (new 'stack-no-clear 'collide-overlap-result))) @@ -238,7 +240,7 @@ (v1-38 (-> (the-as collide-shape s2-1) root-prim)) ) (when (logtest? s4-0 (-> v1-38 prim-core collide-as)) - (when (and (logtest? (-> v1-38 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-38 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-1) process)) ) (let ((s1-2 (new 'stack-no-clear 'collide-overlap-result))) @@ -281,7 +283,7 @@ (v1-67 (-> (the-as collide-shape s2-2) root-prim)) ) (when (logtest? s4-0 (-> v1-67 prim-core collide-as)) - (when (and (logtest? (-> v1-67 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-67 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-2) process)) ) (let ((s1-4 (new 'stack-no-clear 'collide-overlap-result))) @@ -324,7 +326,7 @@ (v1-95 (-> (the-as collide-shape s2-3) root-prim)) ) (when (logtest? s4-0 (-> v1-95 prim-core collide-as)) - (when (and (logtest? (-> v1-95 prim-core action) (collide-action ca-2)) + (when (and (logtest? (-> v1-95 prim-core action) (collide-action rider-target)) (!= (-> obj process) (-> (the-as collide-shape s2-3) process)) ) (let ((s1-6 (new 'stack-no-clear 'collide-overlap-result))) @@ -417,7 +419,7 @@ (set! (-> s4-0 quad) (-> gp-0 trans quad)) (vector-! s3-0 (-> arg0 rider-dest) s4-0) (cond - ((logtest? (-> obj root-prim prim-core action) (collide-action ca-4)) + ((logtest? (-> obj root-prim prim-core action) (collide-action rider-plat)) (let ((s1-0 (-> obj root-prim prim-core collide-as))) (set! (-> obj root-prim prim-core collide-as) (collide-kind)) (let ((s0-0 gp-0)) diff --git a/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc index f0ed646ee9..b8698bf574 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc @@ -387,13 +387,13 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -402,7 +402,7 @@ (let ((s3-1 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s3-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-1 collide-with) (collide-kind target)) - (set! (-> s3-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-1 prim-core offense) (collide-offense indestructible)) (set! (-> s3-1 transform-index) 3) (set-vector! (-> s3-1 local-sphere) 0.0 0.0 0.0 12288.0) diff --git a/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc index 56f1efa68f..2d72c6255c 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc @@ -1460,10 +1460,10 @@ ) (when *target* (cond - ((logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)) + ((logtest? (-> *target* control root-prim prim-core action) (collide-action racer)) (set! v1-7 16) ) - ((logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)) + ((logtest? (-> *target* control root-prim prim-core action) (collide-action flut)) (set! v1-7 32) ) ) @@ -1718,7 +1718,7 @@ (if (not (or (logtest? (res-lump-value (-> self entity) 'options fact-options :time (the-as float -1000000000.0)) (fact-options powerup) ) - (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) ) ) (send-event *camera* 'teleport-to-other-start-string) @@ -2382,7 +2382,7 @@ (and (-> self entity) (not (task-complete? *game-info* (the-as game-task s5-2)))) ) (if (and *target* - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9 ca-12 ca-13 ca-14)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action racer snowball tube flut)) (not arg0) ) (logior! (-> self fact options) (fact-options instant-collect skip-jump-anim)) @@ -2908,7 +2908,7 @@ (backup-collide-with-as s5-0) (set! (-> self root-override) s5-0) ) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (clear-collide-with-as (-> self root-override)) ) (set! (-> self block-func) arg0) diff --git a/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc index 1e41ddc1e5..d9f4b85b4e 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/crates_REF.gc @@ -533,7 +533,7 @@ (('flop 'uppercut 'explode 'darkeco 'eco-yellow 'bonk 'racer 'tube 'flut-bonk 'flut-attack) (if (and (logtest? (-> self fact options) (fact-options require-zoomer)) *target* - (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (not (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) ) (return #f) ) @@ -859,7 +859,7 @@ (stop! (-> self sound)) ) (if (and *target* - (and (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9 ca-12 ca-13 ca-14)) + (and (logtest? (-> *target* control root-prim prim-core action) (collide-action racer snowball tube flut)) (!= (-> self fact pickup-type) 6) (not arg0) ) @@ -1074,7 +1074,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind crate blue-eco-suck)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense touch)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 3072.0 0.0 6963.2) diff --git a/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc index 82f8e58cdb..ee01683e06 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc @@ -96,7 +96,7 @@ (loop (when (and *target* (< (vector-vector-distance (-> self root trans) (-> *target* control unknown-vector90)) (-> self range)) - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-6)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-possible)) (< (-> *target* control unknown-vector90 y) (+ (-> self root trans y) (* 0.5 (-> self range)))) ) (if (send-event *target* 'pole-grab self) diff --git a/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc index d5950ae247..7d1137dc18 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc @@ -331,7 +331,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object blue-eco-suck)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 11468.8) diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc index 6f8bbc9762..4dfb00b859 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat-button_REF.gc @@ -369,14 +369,14 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -4096.0 0.0 27033.6) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 -3072.0 0.0 7372.8) @@ -385,7 +385,7 @@ (let ((s3-1 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s3-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-1 collide-with) (collide-kind target)) - (set! (-> s3-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-1 prim-core offense) (collide-offense indestructible)) (set! (-> s3-1 transform-index) 3) (set-vector! (-> s3-1 local-sphere) 0.0 -4096.0 0.0 27033.6) diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc index af1bdbdb59..c98fd01c52 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc @@ -251,7 +251,7 @@ (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-kind ground-object blue-eco-suck)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -1228.8 0.0 13926.4) diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc index 70cef1d647..6613db4e26 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc @@ -155,7 +155,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 13107.2) diff --git a/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc index a323c9b49c..015c27e657 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc @@ -816,7 +816,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) diff --git a/test/decompiler/reference/jak1/engine/common-obs/ropebridge_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/ropebridge_REF.gc index ff9fdf948f..f54db225e2 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/ropebridge_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/ropebridge_REF.gc @@ -1028,14 +1028,14 @@ (set! (-> s4-0 collide-with) (collide-kind target)) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 (-> s3-0 root-prim-radius)) (set! (-> s4-0 transform-index) (+ (/ (-> s3-0 num-springs) 2) 4)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-root-prim! s5-0 s4-0) (let ((s3-1 (-> obj tuning col-mesh-indexes))) (dotimes (s2-0 (-> obj tuning num-springs)) (let* ((a3-1 (-> s3-1 s2-0)) (a1-3 (new 'process 'collide-shape-prim-mesh s5-0 a3-1 (the-as uint s2-0))) ) - (set! (-> a1-3 prim-core action) (collide-action solid ca-1)) + (set! (-> a1-3 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> a1-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> a1-3 collide-with) (collide-kind target)) (set! (-> a1-3 prim-core offense) (collide-offense indestructible)) diff --git a/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc index ffd5b4fa03..ace93f5635 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/voicebox_REF.gc @@ -150,7 +150,7 @@ ) :code (behavior () (set-setting! 'sound-flava #f 20.0 (music-flava assistant)) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (send-event (ppointer->process (-> self parent-override)) 'set-dist diff --git a/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc index ad638f4137..a9b3762535 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc @@ -698,7 +698,7 @@ (cond ((and (logtest? (-> obj flags) (water-flags wt08)) (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-9) + (collide-action racer) ) ) ) @@ -729,7 +729,7 @@ ) ) (if (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-9) + (collide-action racer) ) (set! (-> obj bob-offset) 0.0) ) @@ -904,7 +904,7 @@ (let ((s4-4 (-> obj process root))) (when (and (not (logtest? (-> (the-as collide-shape-moving s4-4) status) (cshape-moving-flags csmf12))) (logtest? (-> obj flags) (water-flags wt11)) - (not (logtest? (-> (the-as collide-shape-moving s4-4) root-prim prim-core action) (collide-action ca-9))) + (not (logtest? (-> (the-as collide-shape-moving s4-4) root-prim prim-core action) (collide-action racer))) ) (let ((a1-27 (vector-! (new 'stack-no-clear 'vector) v1-200 (-> s4-4 trans)))) (vector-float*! a1-27 a1-27 (-> *display* frames-per-second)) @@ -945,7 +945,7 @@ (set! (-> a1-30 quad) (-> obj bottom 0 quad)) (let ((s5-1 (-> obj process root))) (set! (-> a1-30 y) f30-3) - (when (not (logtest? (-> (the-as collide-shape-moving s5-1) root-prim prim-core action) (collide-action ca-9))) + (when (not (logtest? (-> (the-as collide-shape-moving s5-1) root-prim prim-core action) (collide-action racer))) (let ((f30-4 (-> (the-as collide-shape-moving s5-1) ground-impact-vel))) (move-to-ground-point! (the-as collide-shape-moving s5-1) a1-30 (-> s5-1 transv) *up-vector*) (logior! (-> (the-as collide-shape-moving s5-1) status) (cshape-moving-flags on-water)) @@ -961,14 +961,14 @@ (cshape-moving-flags onsurf on-water) ) (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-9) + (collide-action racer) ) ) ) (when (< (-> obj process root trans y) -409.6) (send-event (-> obj process) 'no-look-around (seconds 1.5)) (when (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) - (collide-action ca-14) + (collide-action flut) ) ) (cond diff --git a/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc b/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc index b58a5cbacb..50acb72ee3 100644 --- a/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc @@ -1138,11 +1138,11 @@ ;; INFO: Return type mismatch int vs none. (defbehavior target-land-effect target () (cond - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-14)) + ((logtest? (-> self control root-prim prim-core action) (collide-action flut)) (effect-control-method-10 (-> self skel effect) 'effect-land-poof -1.0 -1) (effect-control-method-10 (-> self skel effect) 'effect-flut-land -1.0 -1) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9)) + ((logtest? (-> self control root-prim prim-core action) (collide-action racer)) (sound-play-by-name (sound-name-with-material 'zoom-land (-> self control ground-pat) "") (new-sound-id) diff --git a/test/decompiler/reference/jak1/engine/game/game-info_REF.gc b/test/decompiler/reference/jak1/engine/game/game-info_REF.gc index bb29b7a35c..ff42058c5a 100644 --- a/test/decompiler/reference/jak1/engine/game/game-info_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/game-info_REF.gc @@ -476,7 +476,7 @@ ) ) (b! - (and (logtest? (-> (the-as collide-shape (-> obj process root)) root-prim prim-core action) (collide-action ca-9)) + (and (logtest? (-> (the-as collide-shape (-> obj process root)) root-prim prim-core action) (collide-action racer)) (type-type? (-> (handle->process source-handle) type) vent) ) cfg-80 diff --git a/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc b/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc index db5c8ae2f6..fac60516f0 100644 --- a/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc @@ -1063,7 +1063,9 @@ ) (if (and (= (-> self cam-user-mode) 'normal) (logtest? (-> self control unknown-surface00 flags) (surface-flags allow-look-around)) - (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + (not (logtest? (-> self control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) ) (-> *setting-control* current allow-look-around) (>= (- (-> *display* base-frame-counter) (-> self no-look-around-wait)) (seconds 0.05)) @@ -1138,12 +1140,12 @@ ) 9420.8 ) - (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-9 ca-14))) + (not (logtest? (-> self control root-prim prim-core action) (collide-action racer flut))) #t ) ) - (logior! (-> self control root-prim prim-core action) (collide-action ca-6)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-6)) + (logior! (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) ) ) (let ((v1-146 (-> self current-level))) @@ -1478,10 +1480,10 @@ ) (set! (-> self control unknown-float30) (-> self water base-height)) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9)) + ((logtest? (-> self control root-prim prim-core action) (collide-action racer)) (set! (-> (&-> (-> self control) unknown-qword00) 0) (-> self control trans quad)) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-13)) + ((logtest? (-> self control root-prim prim-core action) (collide-action tube)) (set! (-> (&-> (-> self control) unknown-qword00) 0) (-> self control shadow-pos quad)) ) ((logtest? (-> self draw status) (draw-status hidden no-anim)) @@ -1510,7 +1512,7 @@ (set! (-> v1-0 blend) 0.0) ) (cond - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9 ca-13)) + ((logtest? (-> self control root-prim prim-core action) (collide-action racer tube)) ) ((logtest? (-> self water flags) (water-flags wt10)) (let ((f30-0 (- (- (-> self control trans y) (- (-> self water height) (-> self water wade-height)))))) @@ -1548,10 +1550,10 @@ ) (vector-! (-> self control unknown-vector91) (-> self control unknown-vector90) (-> self control trans)) (cond - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-7)) + ((logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-cam)) (target-compute-edge) ) - ((logtest? (-> self control root-prim prim-core action) (collide-action ca-8)) + ((logtest? (-> self control root-prim prim-core action) (collide-action swingpole-active)) (target-compute-pole) ) ) @@ -1634,7 +1636,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -1706,7 +1708,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -1771,7 +1773,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -1897,7 +1899,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -2008,10 +2010,10 @@ (collide-kind background cak-1 cak-2 cak-3 water powerup crate enemy wall-object ground-object mother-spider) ) (set! (-> s4-0 prim-core offense) (collide-offense touch)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-2)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-target)) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-sphere s5-0 (the-as uint 6)))) - (set! (-> s3-0 prim-core action) (collide-action solid ca-2)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-target)) (set! (-> s3-0 prim-core collide-as) (collide-kind target)) (set! (-> s3-0 collide-with) (collide-kind background cak-1 cak-2 cak-3 water powerup crate enemy wall-object ground-object mother-spider) diff --git a/test/decompiler/reference/jak1/engine/target/target-death_REF.gc b/test/decompiler/reference/jak1/engine/target/target-death_REF.gc index 8abf5a3f2d..f3b7902f7b 100644 --- a/test/decompiler/reference/jak1/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-death_REF.gc @@ -615,7 +615,7 @@ (defbehavior target-hit-push target ((arg0 vector) (arg1 matrix) (arg2 float) (arg3 float) (arg4 attack-info)) (case (-> arg4 angle) (('jump 'up 'up-forward) - (when (and (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-9 ca-14))) + (when (and (not (logtest? (-> self control root-prim prim-core action) (collide-action racer flut))) (not (and (= (-> self game mode) 'play) (>= 0.0 (-> self fact-info-target health)))) ) (if (and (cpad-pressed? (-> self control unknown-cpad-info00 number) circle) (can-feet?)) diff --git a/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc b/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc index a1e483b322..992e0458d6 100644 --- a/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc @@ -775,7 +775,9 @@ ) (or (logtest? (-> self water flags) (water-flags wt09)) (logtest? (-> self state-flags) (state-flags dangerous sf02 being-attacked grabbed first-person-mode dying)) - (logtest? (-> self control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + (logtest? (-> self control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) (>= (-> self no-load-wait) (-> *display* base-frame-counter)) ) ) @@ -840,7 +842,7 @@ (go target-edge-grab) ) (('pole-grab) - (if (not (logtest? (-> self control root-prim prim-core action) (collide-action ca-8))) + (if (not (logtest? (-> self control root-prim prim-core action) (collide-action swingpole-active))) (go target-pole-cycle (process->handle (the-as process (-> arg3 param 0)))) ) ) diff --git a/test/decompiler/reference/jak1/engine/target/target2_REF.gc b/test/decompiler/reference/jak1/engine/target/target2_REF.gc index 9e715c9893..8964d0eecd 100644 --- a/test/decompiler/reference/jak1/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target2_REF.gc @@ -953,7 +953,7 @@ (set! (-> self control unknown-handle10) arg0) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self control unknown-surface00) *pole-mods*) - (logior! (-> self control root-prim prim-core action) (collide-action ca-8)) + (logior! (-> self control root-prim prim-core action) (collide-action swingpole-active)) (target-collide-set! 'pole (the-as float 0.0)) (set! (-> self control unknown-vector102 quad) (-> self control transv quad)) (set! (-> self control transv quad) (the-as uint128 0)) @@ -963,7 +963,7 @@ ) :exit (behavior () (target-collide-set! 'normal (the-as float 0.0)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-8)) + (logclear! (-> self control root-prim prim-core action) (collide-action swingpole-active)) (set! (-> self control unknown-handle10) (the-as handle #f)) (none) ) @@ -1178,15 +1178,15 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self control unknown-surface00) *edge-grab-mods*) (set! (-> self control unknown-dword41) (-> *display* base-frame-counter)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (logior! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (set! (-> self control unknown-vector102 quad) (-> self control transv quad)) (set! (-> self control transv quad) (the-as uint128 0)) (send-event *camera* 'ease-in) (none) ) :exit (behavior () - (when (logtest? (-> self control root-prim prim-core action) (collide-action ca-7)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (when (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-cam)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (send-event *camera* 'damp-up) ) (none) @@ -1298,7 +1298,7 @@ :code (behavior ((arg0 float) (arg1 float)) (ja-channel-set! 1) (set-quaternion! (-> self control) (-> self control dir-targ)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (set! (-> self control transv quad) (the-as uint128 0)) (let ((s4-0 (new 'stack-no-clear 'vector))) (ja-no-eval :group! eichar-edge-grab-to-jump-ja :num! (seek!) :frame-num 0.0) @@ -1344,7 +1344,7 @@ ) ) (set! (-> self control transv quad) (the-as uint128 0)) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-3 ca-7)) + (logclear! (-> self control root-prim prim-core action) (collide-action edgegrab-active edgegrab-cam)) (vector-float*! (-> self control transv) (-> self control unknown-vector101) -40960.0) (when (and (< (- (-> *display* base-frame-counter) (-> self control rider-time)) (seconds 0.2)) (or (logtest? (-> self control unknown-surface01 flags) (surface-flags moving-ground)) diff --git a/test/decompiler/reference/jak1/engine/target/target_REF.gc b/test/decompiler/reference/jak1/engine/target/target_REF.gc index 173fc2303f..90ee5e5a2f 100644 --- a/test/decompiler/reference/jak1/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target_REF.gc @@ -2031,7 +2031,7 @@ ) ) (if (and v1-11 (or (logtest? (-> v1-11 root-prim prim-core collide-as) (collide-kind enemy)) - (logtest? (-> v1-11 root-prim prim-core action) (collide-action ca-10)) + (logtest? (-> v1-11 root-prim prim-core action) (collide-action attackable)) ) ) (set! (-> self control unknown-uint31) (the-as uint 1)) diff --git a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc index de9bfbb72a..5be7d2ced9 100644 --- a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc @@ -89,14 +89,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) -40960.0 -40960.0 32768.0 69632.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 8) (set-vector! (-> s2-0 local-sphere) 4915.2 0.0 -4915.2 13516.8) @@ -105,7 +105,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 9) (set-vector! (-> s2-1 local-sphere) 4915.2 0.0 -4915.2 13516.8) diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc index 1e665455b3..37a4921d1c 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc @@ -210,7 +210,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 40960.0) @@ -522,7 +522,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 49152.0) diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc index 49f71be06b..c51f59c76a 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc @@ -184,7 +184,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 20480.0 0.0 28672.0) diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc index 1ae98d0c94..2df6ff7002 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc @@ -274,7 +274,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc index 881b792b3b..b9bb04e48d 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc @@ -113,7 +113,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) @@ -184,7 +184,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -272,7 +272,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -659,7 +659,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) @@ -763,7 +763,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 -20480.0 0.0 40960.0) @@ -840,7 +840,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 40960.0) @@ -922,7 +922,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -8192.0 0.0 22528.0) @@ -1312,14 +1312,14 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 122880.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 -2867.2 0.0 7372.8) @@ -1328,7 +1328,7 @@ (let ((s3-1 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s3-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-1 collide-with) (collide-kind target)) - (set! (-> s3-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-1 prim-core offense) (collide-offense indestructible)) (set! (-> s3-1 transform-index) 3) (set-vector! (-> s3-1 local-sphere) 0.0 0.0 0.0 122880.0) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc index 7455d85433..eb36169cb7 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc @@ -415,14 +415,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 4) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 102400.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 5) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 102400.0) @@ -431,7 +431,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 4) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 102400.0) @@ -440,7 +440,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 7) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 102400.0) @@ -449,7 +449,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 0)))) (set! (-> s2-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s2-3 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 6) (set-vector! (-> s2-3 local-sphere) 0.0 0.0 0.0 102400.0) diff --git a/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc b/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc index a4c5565a1a..90f52ad5e6 100644 --- a/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc +++ b/test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc @@ -129,13 +129,13 @@ ) ) (and *cheat-mode* (cpad-hold? 0 l3)) - (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) ) (goto cfg-75) ) ) ((= v1-0 4) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (goto cfg-75) ) ) @@ -151,7 +151,7 @@ (goto cfg-75) ) (if (and *target* - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)) (< (- (-> *display* base-frame-counter) (-> self touch-time)) (seconds 0.05)) ) (go-virtual pickup (method-of-object self idle)) @@ -182,7 +182,7 @@ (suspend) ) (label cfg-75) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (go-virtual wait-for-return) (go-virtual idle) ) @@ -203,10 +203,10 @@ :code (behavior () (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (loop - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (go-virtual wait-for-return) ) (when (logtest? (-> self draw status) (draw-status was-drawn)) @@ -258,7 +258,7 @@ (('draw) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (transform-post) ) @@ -286,7 +286,7 @@ (flutflut-effect) (suspend) ) - (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (flutflut-effect) (suspend) ) @@ -324,7 +324,7 @@ (ja-channel-set! 0) (ja-post) (loop - (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)))) + (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)))) (go-virtual idle) ) (flutflut-effect) @@ -382,7 +382,7 @@ (blocking-plane-spawn (the-as curve-control - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action flut))) (-> obj path-flut) (-> obj path-target) ) diff --git a/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc b/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc index ac7f453a98..a205f99f18 100644 --- a/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc +++ b/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc @@ -446,7 +446,7 @@ (set! (-> self manipy) (the-as (pointer manipy) #f)) ) ) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-14)) + (logclear! (-> self control root-prim prim-core action) (collide-action flut)) (set! (-> self control unknown-surface00) *walk-mods*) (logclear! (-> self state-flags) (state-flags use-alt-cam-pos)) (set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max)) @@ -478,7 +478,7 @@ (target-collide-set! 'flut (the-as float 0.0)) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) - (logior! (-> self control root-prim prim-core action) (collide-action ca-14)) + (logior! (-> self control root-prim prim-core action) (collide-action flut)) (let ((s5-0 (-> self entity))) (set! (-> self entity) (-> self flut entity)) (set! (-> self manipy) @@ -1225,7 +1225,7 @@ ) (if (and v1-11 (or (logtest? (-> (the-as collide-shape v1-11) root-prim prim-core collide-as) (collide-kind enemy)) - (logtest? (-> (the-as collide-shape v1-11) root-prim prim-core action) (collide-action ca-10)) + (logtest? (-> (the-as collide-shape v1-11) root-prim prim-core action) (collide-action attackable)) ) ) (set! (-> self control unknown-uint31) (the-as uint 1)) diff --git a/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc b/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc index b5f2614fca..25c5da41f3 100644 --- a/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc @@ -305,13 +305,13 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 4) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action attackable attackable-unused)) (set-vector! (-> s3-0 local-sphere) 0.0 8192.0 0.0 16384.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 5) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 3276.8) @@ -320,7 +320,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-1 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 6) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 2867.2) @@ -329,7 +329,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-2 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-2 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 7) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 2457.6) @@ -338,7 +338,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-3 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-3 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 8) (set-vector! (-> s2-3 local-sphere) 0.0 0.0 0.0 2048.0) diff --git a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc index a05c2e6300..94196749d7 100644 --- a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc @@ -252,14 +252,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 1) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 36044.8 0.0 47104.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 3) (set-vector! (-> s2-0 local-sphere) 39321.6 0.0 0.0 43417.6) @@ -358,13 +358,13 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 40960.0 0.0 49152.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 4) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 36864.0) @@ -373,7 +373,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 3) (set-vector! (-> s2-1 local-sphere) 40960.0 0.0 0.0 24576.0) @@ -382,7 +382,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 3) (set-vector! (-> s2-2 local-sphere) 40960.0 0.0 0.0 24576.0) @@ -489,7 +489,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 24576.0 0.0 0.0 20480.0) @@ -907,14 +907,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 16) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 81920.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 5) (set-vector! (-> s2-0 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -923,7 +923,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 7) (set-vector! (-> s2-1 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -932,7 +932,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 1)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 9) (set-vector! (-> s2-2 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -941,7 +941,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-3 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 11) (set-vector! (-> s2-3 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -950,7 +950,7 @@ (let ((s2-4 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 1)))) (set! (-> s2-4 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-4 collide-with) (collide-kind target)) - (set! (-> s2-4 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-4 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-4 prim-core offense) (collide-offense indestructible)) (set! (-> s2-4 transform-index) 13) (set-vector! (-> s2-4 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -959,7 +959,7 @@ (let ((s2-5 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-5 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-5 collide-with) (collide-kind target)) - (set! (-> s2-5 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-5 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-5 prim-core offense) (collide-offense indestructible)) (set! (-> s2-5 transform-index) 15) (set-vector! (-> s2-5 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -968,7 +968,7 @@ (let ((s2-6 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 1)))) (set! (-> s2-6 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-6 collide-with) (collide-kind target)) - (set! (-> s2-6 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-6 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-6 prim-core offense) (collide-offense indestructible)) (set! (-> s2-6 transform-index) 17) (set-vector! (-> s2-6 local-sphere) -6144.0 0.0 0.0 17203.2) @@ -977,7 +977,7 @@ (let ((s2-7 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-7 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-7 collide-with) (collide-kind target)) - (set! (-> s2-7 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-7 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-7 prim-core offense) (collide-offense indestructible)) (set! (-> s2-7 transform-index) 19) (set-vector! (-> s2-7 local-sphere) 6144.0 0.0 0.0 17203.2) @@ -986,7 +986,7 @@ (let ((s2-8 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-8 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-8 collide-with) (collide-kind target)) - (set! (-> s2-8 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-8 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-8 prim-core offense) (collide-offense indestructible)) (set! (-> s2-8 transform-index) 4) (set-vector! (-> s2-8 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -995,7 +995,7 @@ (let ((s2-9 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-9 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-9 collide-with) (collide-kind target)) - (set! (-> s2-9 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-9 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-9 prim-core offense) (collide-offense indestructible)) (set! (-> s2-9 transform-index) 6) (set-vector! (-> s2-9 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -1004,7 +1004,7 @@ (let ((s2-10 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-10 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-10 collide-with) (collide-kind target)) - (set! (-> s2-10 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-10 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-10 prim-core offense) (collide-offense indestructible)) (set! (-> s2-10 transform-index) 8) (set-vector! (-> s2-10 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -1013,7 +1013,7 @@ (let ((s2-11 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-11 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-11 collide-with) (collide-kind target)) - (set! (-> s2-11 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-11 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-11 prim-core offense) (collide-offense indestructible)) (set! (-> s2-11 transform-index) 10) (set-vector! (-> s2-11 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -1022,7 +1022,7 @@ (let ((s2-12 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-12 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-12 collide-with) (collide-kind target)) - (set! (-> s2-12 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-12 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-12 prim-core offense) (collide-offense indestructible)) (set! (-> s2-12 transform-index) 12) (set-vector! (-> s2-12 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -1031,7 +1031,7 @@ (let ((s2-13 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-13 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-13 collide-with) (collide-kind target)) - (set! (-> s2-13 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-13 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-13 prim-core offense) (collide-offense indestructible)) (set! (-> s2-13 transform-index) 14) (set-vector! (-> s2-13 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -1040,7 +1040,7 @@ (let ((s2-14 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 0)))) (set! (-> s2-14 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-14 collide-with) (collide-kind target)) - (set! (-> s2-14 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-14 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-14 prim-core offense) (collide-offense indestructible)) (set! (-> s2-14 transform-index) 16) (set-vector! (-> s2-14 local-sphere) -4096.0 0.0 0.0 9011.2) @@ -1049,7 +1049,7 @@ (let ((s2-15 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-15 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-15 collide-with) (collide-kind target)) - (set! (-> s2-15 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-15 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-15 prim-core offense) (collide-offense indestructible)) (set! (-> s2-15 transform-index) 18) (set-vector! (-> s2-15 local-sphere) 4096.0 0.0 0.0 9011.2) @@ -1350,14 +1350,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) -32768.0 -8192.0 0.0 32768.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 4) (set-vector! (-> s2-0 local-sphere) 8192.0 0.0 0.0 20480.0) @@ -1366,7 +1366,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 0)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 4) (set-vector! (-> s2-1 local-sphere) 36864.0 0.0 0.0 20480.0) diff --git a/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc index 86f7b8c470..62072e26d9 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc @@ -328,7 +328,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 -7372.8 16384.0) diff --git a/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc index 82daae994c..d956db13c7 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc @@ -134,7 +134,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 11468.8) diff --git a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc index c32cec00dd..04ac230f2d 100644 --- a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc @@ -1062,14 +1062,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 6) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s3-0 local-sphere) 0.0 11264.0 0.0 22528.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-0 prim-core offense) (collide-offense touch)) (set-vector! (-> s2-0 local-sphere) 0.0 3276.8 0.0 4505.6) (append-prim s3-0 s2-0) @@ -1077,7 +1077,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-1 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-1 prim-core offense) (collide-offense touch)) (set-vector! (-> s2-1 local-sphere) 0.0 7372.8 0.0 4505.6) (append-prim s3-0 s2-1) @@ -1085,7 +1085,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 2)))) (set! (-> s2-2 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-2 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-2 prim-core offense) (collide-offense touch)) (set-vector! (-> s2-2 local-sphere) 0.0 11468.8 0.0 4505.6) (append-prim s3-0 s2-2) diff --git a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc index 35f06113b9..c42f07826c 100644 --- a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc @@ -321,7 +321,7 @@ (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) ) - (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7))) + (not (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam))) ) ) (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0) @@ -337,7 +337,7 @@ (or (and (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump)) (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam)) ) ) (while (not (ja-min? 0)) @@ -369,7 +369,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 9830.4 10240.0 0.0 17203.2) @@ -804,7 +804,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 -8192.0 0.0 67584.0) @@ -929,7 +929,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 75776.0) @@ -1311,7 +1311,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 17408.0) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc index a98e2ac83d..56322fb629 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc @@ -1376,7 +1376,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 98304.0) @@ -1826,7 +1826,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc index 4eadc2c381..2c8b50d6cd 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc @@ -180,7 +180,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 7) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 32768.0) @@ -207,7 +207,7 @@ (let ((s2-4 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 3) (the-as uint 2)))) (set! (-> s2-4 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-4 collide-with) (collide-kind target)) - (set! (-> s2-4 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-4 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-4 prim-core offense) (collide-offense indestructible)) (set! (-> s2-4 transform-index) 3) (set-vector! (-> s2-4 local-sphere) 0.0 0.0 0.0 32768.0) diff --git a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc index de85b0aacf..1aa47ad05b 100644 --- a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc @@ -1854,14 +1854,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 20480.0 0.0 40960.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 3) (set-vector! (-> s2-0 local-sphere) 0.0 20480.0 0.0 40960.0) diff --git a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc index 509b67eb22..13adf5d829 100644 --- a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc @@ -601,7 +601,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 8192.0 0.0 32768.0) @@ -1171,14 +1171,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 17) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 143360.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 4) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1187,7 +1187,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 5) (set-vector! (-> s2-1 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1196,7 +1196,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 6) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1205,7 +1205,7 @@ (let ((s2-3 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-3 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-3 collide-with) (collide-kind target)) - (set! (-> s2-3 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-3 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-3 prim-core offense) (collide-offense indestructible)) (set! (-> s2-3 transform-index) 7) (set-vector! (-> s2-3 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1214,7 +1214,7 @@ (let ((s2-4 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-4 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-4 collide-with) (collide-kind target)) - (set! (-> s2-4 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-4 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-4 prim-core offense) (collide-offense indestructible)) (set! (-> s2-4 transform-index) 8) (set-vector! (-> s2-4 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1223,7 +1223,7 @@ (let ((s2-5 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-5 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-5 collide-with) (collide-kind target)) - (set! (-> s2-5 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-5 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-5 prim-core offense) (collide-offense indestructible)) (set! (-> s2-5 transform-index) 9) (set-vector! (-> s2-5 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1232,7 +1232,7 @@ (let ((s2-6 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-6 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-6 collide-with) (collide-kind target)) - (set! (-> s2-6 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-6 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-6 prim-core offense) (collide-offense indestructible)) (set! (-> s2-6 transform-index) 10) (set-vector! (-> s2-6 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1241,7 +1241,7 @@ (let ((s2-7 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-7 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-7 collide-with) (collide-kind target)) - (set! (-> s2-7 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-7 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-7 prim-core offense) (collide-offense indestructible)) (set! (-> s2-7 transform-index) 11) (set-vector! (-> s2-7 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1250,7 +1250,7 @@ (let ((s2-8 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s2-8 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-8 collide-with) (collide-kind target)) - (set! (-> s2-8 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-8 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-8 prim-core offense) (collide-offense indestructible)) (set! (-> s2-8 transform-index) 12) (set-vector! (-> s2-8 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1259,7 +1259,7 @@ (let ((s2-9 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-9 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-9 collide-with) (collide-kind target)) - (set! (-> s2-9 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-9 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-9 prim-core offense) (collide-offense indestructible)) (set! (-> s2-9 transform-index) 13) (set-vector! (-> s2-9 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1268,7 +1268,7 @@ (let ((s2-10 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-10 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-10 collide-with) (collide-kind target)) - (set! (-> s2-10 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-10 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-10 prim-core offense) (collide-offense indestructible)) (set! (-> s2-10 transform-index) 14) (set-vector! (-> s2-10 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1277,7 +1277,7 @@ (let ((s2-11 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-11 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-11 collide-with) (collide-kind target)) - (set! (-> s2-11 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-11 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-11 prim-core offense) (collide-offense indestructible)) (set! (-> s2-11 transform-index) 15) (set-vector! (-> s2-11 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1286,7 +1286,7 @@ (let ((s2-12 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-12 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-12 collide-with) (collide-kind target)) - (set! (-> s2-12 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-12 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-12 prim-core offense) (collide-offense indestructible)) (set! (-> s2-12 transform-index) 16) (set-vector! (-> s2-12 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1295,7 +1295,7 @@ (let ((s2-13 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-13 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-13 collide-with) (collide-kind target)) - (set! (-> s2-13 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-13 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-13 prim-core offense) (collide-offense indestructible)) (set! (-> s2-13 transform-index) 17) (set-vector! (-> s2-13 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1304,7 +1304,7 @@ (let ((s2-14 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-14 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-14 collide-with) (collide-kind target)) - (set! (-> s2-14 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-14 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-14 prim-core offense) (collide-offense indestructible)) (set! (-> s2-14 transform-index) 18) (set-vector! (-> s2-14 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1313,7 +1313,7 @@ (let ((s2-15 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 1)))) (set! (-> s2-15 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-15 collide-with) (collide-kind target)) - (set! (-> s2-15 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-15 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-15 prim-core offense) (collide-offense indestructible)) (set! (-> s2-15 transform-index) 19) (set-vector! (-> s2-15 local-sphere) 0.0 0.0 0.0 20480.0) @@ -1322,7 +1322,7 @@ (let ((s2-16 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 2) (the-as uint 1)))) (set! (-> s2-16 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-16 collide-with) (collide-kind target)) - (set! (-> s2-16 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-16 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-16 prim-core offense) (collide-offense indestructible)) (set! (-> s2-16 transform-index) 20) (set-vector! (-> s2-16 local-sphere) 0.0 0.0 0.0 45056.0) diff --git a/test/decompiler/reference/jak1/levels/racer_common/collide-reaction-racer_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/collide-reaction-racer_REF.gc index 624520be52..e451189bac 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/collide-reaction-racer_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/collide-reaction-racer_REF.gc @@ -100,7 +100,7 @@ (set! sv-96 (logior sv-96 4096)) ) ) - (if (and s3-1 (logtest? (collide-action ca-16) (-> arg0 root-prim prim-core action))) + (if (and s3-1 (logtest? (collide-action racer-unused) (-> arg0 root-prim prim-core action))) (set! s3-1 #f) ) (cond diff --git a/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc index 5f6a7cf0fa..eb589c78b1 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc @@ -116,7 +116,7 @@ (set! (-> *hud-parts* power 0 next-y-offset) 0) (set! (-> *hud-parts* buzzers 0 y-sgn) 1) (set! (-> *hud-parts* power 0 y-sgn) 1) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-9 ca-16)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer racer-unused)) (set! (-> self control unknown-surface00) *walk-mods*) (logclear! (-> self state-flags) (state-flags use-alt-cam-pos)) (send-event *camera* 'clear-slave-option #x6000) @@ -177,7 +177,7 @@ (target-collide-set! 'racer 0.0) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) - (logior! (-> self control root-prim prim-core action) (collide-action ca-9)) + (logior! (-> self control root-prim prim-core action) (collide-action racer)) (set! (-> self control unknown-surface00) *racer-mods*) (set! (-> self racer lean-rotx) 0.0) (vector-reset! (-> self racer rotv)) @@ -538,7 +538,7 @@ (none) ) :exit (behavior () - (logclear! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer-grounded)) (set! (-> self racer hop?) #f) ((-> target-racing-start exit)) (none) @@ -604,7 +604,7 @@ ) (target-racing-smack-check) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logior! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ) (mod-var-jump #t #t (cpad-hold? (-> self control unknown-cpad-info00 number) l1 r1) (-> self control transv)) (set! (-> self racer shock-offset) (* 0.8 (-> self racer shock-offset))) @@ -628,7 +628,7 @@ (defstate target-racing-bounce (target) :event (-> target-racing-start event) :enter (behavior ((arg0 float) (arg1 float) (arg2 symbol)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logior! (-> self control root-prim prim-core action) (collide-action racer-grounded)) (sound-play "zoomer-jump") (set! (-> self state-time) (-> *display* base-frame-counter)) (racer-calc-gravity) @@ -640,7 +640,7 @@ (none) ) :exit (behavior () - (logclear! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ((-> target-racing-start exit)) (none) ) @@ -756,7 +756,7 @@ (none) ) :exit (behavior () - (logclear! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logclear! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ((-> target-racing-start exit)) (none) ) @@ -767,7 +767,7 @@ (target-racing-smack-check) (racer-buzz 0.3) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-15)) + (logior! (-> self control root-prim prim-core action) (collide-action racer-grounded)) ) (none) ) diff --git a/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc index 360979decb..b8e2594c17 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc @@ -147,7 +147,7 @@ (((task-status need-reward-speech)) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (ja-post) ) @@ -160,7 +160,7 @@ ((6) (if (or (task-closed? (game-task village2-levitator) (task-status need-hint)) (and *cheat-mode* (cpad-hold? 0 l3)) - (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) ) (goto cfg-77) ) @@ -202,7 +202,7 @@ ) ) ((4) - (if (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)))) + (if (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action racer)))) (goto cfg-77) ) ) @@ -214,7 +214,7 @@ (suspend) (b! #t cfg-0 :delay (nop!)) (label cfg-77) - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (go-virtual wait-for-return) (go-virtual idle) ) @@ -235,7 +235,7 @@ :code (behavior () (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) 0.0 (let ((f30-0 (if (= (-> self condition) 4) @@ -245,7 +245,7 @@ ) ) (loop - (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (go-virtual wait-for-return) ) (when (and (and *target* (>= f30-0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) @@ -290,7 +290,7 @@ (('draw) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 3)) - (set! (-> self root-override root-prim prim-core action) (collide-action solid ca-11)) + (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused)) (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible)) (transform-post) ) @@ -327,7 +327,7 @@ (when (or (not *target*) (< 24576.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans))) ) - (when (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (when (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (case (-> (level-get-target-inside *level*) name) (('misty) (close-specific-task! (game-task misty-bike) (task-status need-reminder-a)) @@ -340,7 +340,7 @@ (racer-effect) (suspend) ) - (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (while (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (racer-effect) (suspend) ) @@ -396,7 +396,7 @@ (ja-channel-set! 0) (ja-post) (loop - (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)))) + (if (not (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer)))) (go-virtual idle) ) (racer-effect) @@ -456,7 +456,7 @@ (blocking-plane-spawn (the-as curve-control - (if (or (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (if (or (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action racer))) (= (-> obj condition) 3) ) (-> obj path-racer) diff --git a/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc index 7c5f80432f..457cabc494 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc @@ -1484,7 +1484,7 @@ (vector-! (new 'stack-no-clear 'vector) (-> self control trans) (-> self control last-known-safe-ground)) ) ) - (logtest? (-> self control root-prim prim-core action) (collide-action ca-15)) + (logtest? (-> self control root-prim prim-core action) (collide-action racer-grounded)) ) (+! (-> self racer stuck-count) 1) (go target-racing-smack 122880.0 #f) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc index e3b78ac23a..76600c2c9d 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc @@ -1049,7 +1049,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set-vector! (-> s3-0 local-sphere) 0.0 10240.0 0.0 10240.0) (set-root-prim! s4-0 s3-0) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc index b26bd32741..2e193414f4 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc @@ -155,14 +155,14 @@ (let ((s5-0 (new 'process 'collide-shape-prim-group gp-0 (the-as uint 1) 0))) (set! (-> s5-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s5-0 collide-with) (collide-kind target)) - (set! (-> s5-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s5-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s5-0 transform-index) 0) (set-vector! (-> s5-0 local-sphere) -8192.0 0.0 0.0 40960.0) (set-root-prim! gp-0 s5-0) (let ((s4-0 (new 'process 'collide-shape-prim-mesh gp-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 4) (set-vector! (-> s4-0 local-sphere) 8192.0 0.0 0.0 28672.0) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc index 0d79163173..a6dc532b16 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc @@ -719,7 +719,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 10240.0) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc index 7f6d08f232..222a7cfcaf 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc @@ -352,13 +352,13 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 9011.2 0.0 13926.4) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-0 collide-with) (collide-kind target)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-0 prim-core offense) (collide-offense indestructible)) (set! (-> s2-0 transform-index) 6) (set-vector! (-> s2-0 local-sphere) 0.0 0.0 0.0 4915.2) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc index ebc3eae276..93daebe791 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc @@ -274,7 +274,7 @@ (case event-type (('touch 'attack 'bonk) (when (and (= (-> proc type) target) - (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)) + (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)) (>= 10649.6 (vector-vector-xz-distance (-> self root-override trans) (target-pos 0))) ) (close-specific-task! (game-task snow-ball) (task-status need-hint)) @@ -407,7 +407,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 17612.8) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 1)))) @@ -421,7 +421,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 4) (set-vector! (-> s2-1 local-sphere) 0.0 2048.0 0.0 11468.8) @@ -430,7 +430,7 @@ (let ((s2-2 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s2-2 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-2 collide-with) (collide-kind target)) - (set! (-> s2-2 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-2 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-2 prim-core offense) (collide-offense indestructible)) (set! (-> s2-2 transform-index) 3) (set-vector! (-> s2-2 local-sphere) 0.0 0.0 0.0 17612.8) @@ -778,7 +778,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logclear! (-> self mask) (process-mask actor-pause)) - (logclear! (-> self root-override root-prim prim-core action) (collide-action ca-1)) + (logclear! (-> self root-override root-prim prim-core action) (collide-action rider-plat-sticky)) (set! (-> self start-trans quad) (-> self root-override trans quad)) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (new 'stack-no-clear 'quaternion)) @@ -794,7 +794,7 @@ ) :exit (behavior () (logior! (-> self mask) (process-mask actor-pause)) - (logior! (-> self root-override root-prim prim-core action) (collide-action ca-1)) + (logior! (-> self root-override root-prim prim-core action) (collide-action rider-plat-sticky)) (none) ) :trans (behavior () @@ -839,7 +839,7 @@ ) ) (('ridden) - (if (or (not *target*) (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)))) + (if (or (not *target*) (not (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)))) (go elevator-travel-to-fort) ) ) @@ -1043,7 +1043,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -2048.0 0.0 16384.0) @@ -1084,7 +1084,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -4096.0 0.0 27648.0) @@ -1146,7 +1146,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 36864.0) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc index c2a02f9924..6f4cd4f67a 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc @@ -486,7 +486,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 -7372.8 18022.4) @@ -643,7 +643,7 @@ (let ((s4-1 (new 'process 'collide-shape-prim-mesh s3-1 (the-as uint s4-0) (the-as uint 0)))) (set! (-> s4-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-1 collide-with) (collide-kind target)) - (set! (-> s4-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-1 prim-core offense) (collide-offense indestructible)) (set! (-> s4-1 transform-index) 3) (set-vector! (-> s4-1 local-sphere) 0.0 20480.0 -12288.0 25600.0) @@ -767,7 +767,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 49152.0 -16384.0 16384.0) @@ -1586,7 +1586,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 8192.0) @@ -1820,7 +1820,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 20480.0 0.0 36864.0) @@ -1990,7 +1990,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 8192.0) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc index 341a1e33ae..4ba10d9d03 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc @@ -374,7 +374,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s3-0 local-sphere) 0.0 20480.0 0.0 34816.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 1)))) @@ -389,7 +389,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 1) (the-as uint 2)))) (set! (-> s2-1 prim-core collide-as) (collide-kind ground-object)) (set! (-> s2-1 collide-with) (collide-kind target)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-1)) + (set! (-> s2-1 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s2-1 prim-core offense) (collide-offense indestructible)) (set! (-> s2-1 transform-index) 3) (set-vector! (-> s2-1 local-sphere) 0.0 20480.0 0.0 34816.0) diff --git a/test/decompiler/reference/jak1/levels/snow/target-snowball_REF.gc b/test/decompiler/reference/jak1/levels/snow/target-snowball_REF.gc index a6faaf1e03..194eed2030 100644 --- a/test/decompiler/reference/jak1/levels/snow/target-snowball_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/target-snowball_REF.gc @@ -87,7 +87,7 @@ (set! (-> self manipy) (the-as (pointer manipy) #f)) ) ) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-12)) + (logclear! (-> self control root-prim prim-core action) (collide-action snowball)) (set! (-> self control unknown-surface00) *walk-mods*) (set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max)) (set! (-> self control dynam gravity-length) (-> self control unknown-dynamics00 gravity-length)) @@ -114,7 +114,7 @@ (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) (move-by-vector! (-> self control) (new 'static 'vector :y 4096.0 :w 1.0)) - (logior! (-> self control root-prim prim-core action) (collide-action ca-12)) + (logior! (-> self control root-prim prim-core action) (collide-action snowball)) (ja-channel-set! 1) (ja :group! (-> self draw art-group data 5) :num! min) (remove-exit) diff --git a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc index b835445d9f..ef5306cff5 100644 --- a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc @@ -831,14 +831,14 @@ (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 2) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind cak-2 target crate enemy)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s3-0 local-sphere) 0.0 6144.0 0.0 10240.0) (set-root-prim! s4-0 s3-0) (let ((s2-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 3)))) (set! (-> s2-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-0 collide-with) (collide-kind cak-2 target crate enemy)) - (set! (-> s2-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-0 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s2-0 local-sphere) 0.0 4096.0 0.0 6963.2) (append-prim s3-0 s2-0) @@ -846,7 +846,7 @@ (let ((s2-1 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 3)))) (set! (-> s2-1 prim-core collide-as) (collide-kind enemy)) (set! (-> s2-1 collide-with) (collide-kind cak-2 target crate enemy)) - (set! (-> s2-1 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s2-1 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s2-1 prim-core offense) (collide-offense normal-attack)) (set-vector! (-> s2-1 local-sphere) 0.0 9420.8 0.0 4096.0) (append-prim s3-0 s2-1) diff --git a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc index dc6f331283..71bee4430e 100644 --- a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc @@ -114,7 +114,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 11468.8) diff --git a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc index 51bfc2246e..a5ed34b8e0 100644 --- a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc @@ -226,7 +226,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind wall-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 22528.0 0.0 53248.0) @@ -574,7 +574,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 0) (set-vector! (-> s3-0 local-sphere) 0.0 14336.0 0.0 22118.4) diff --git a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc index 7fa5b89e76..57b55fd7f3 100644 --- a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc @@ -840,7 +840,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 13926.4) diff --git a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc index 6fe1402031..eeae1c81aa 100644 --- a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc @@ -357,7 +357,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 -8192.0 0.0 18432.0) diff --git a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc index 085c0b4a72..463bf7178c 100644 --- a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc @@ -492,7 +492,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 -24576.0 0.0 32768.0) diff --git a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc index 8a8726dedf..9744d085e5 100644 --- a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc @@ -735,7 +735,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 12288.0) diff --git a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc index 8c35532751..47a2fa52b3 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc @@ -1194,7 +1194,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 16384.0 0.0 67584.0) diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc index ce62fa468f..c0d19ecfea 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc @@ -143,7 +143,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 57344.0) diff --git a/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc b/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc index 9f5a4f7766..6de1157a14 100644 --- a/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc @@ -417,7 +417,7 @@ (-> self control transv) (-> self control root-prim collide-with) ) - (if (logtest? (-> self control root-prim prim-core action) (collide-action ca-6)) + (if (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-possible)) (find-edge-grabs! *target* *collide-cache*) ) (if *debug-segment* @@ -503,7 +503,7 @@ (set! (-> self manipy) (the-as (pointer manipy) #f)) ) ) - (logclear! (-> self control root-prim prim-core action) (collide-action ca-13)) + (logclear! (-> self control root-prim prim-core action) (collide-action tube)) (set! (-> self control unknown-surface00) *walk-mods*) (set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max)) (set! (-> self control dynam gravity-length) (-> self control unknown-dynamics00 gravity-length)) @@ -539,7 +539,7 @@ (target-collide-set! 'tube 0.0) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) - (logior! (-> self control root-prim prim-core action) (collide-action ca-13)) + (logior! (-> self control root-prim prim-core action) (collide-action tube)) (remove-exit) (cond ((< (the-as diff --git a/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc index a11b1b71a7..43a5b3fa44 100644 --- a/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc @@ -225,7 +225,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 2) (set-vector! (-> s3-0 local-sphere) 0.0 -6144.0 -12288.0 19456.0) diff --git a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc index 6c4bbf9ec0..c4ce554fc2 100644 --- a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc @@ -231,7 +231,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 24576.0) @@ -408,7 +408,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 32768.0) diff --git a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc index 821d511e85..c5b5955231 100644 --- a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc @@ -1166,7 +1166,7 @@ (defmethod target-above-threshold? billy ((obj billy)) (the-as symbol - (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-14)))) + (and *target* (not (logtest? (-> *target* control root-prim prim-core action) (collide-action flut)))) ) ) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc index 7ef829fa33..f3fa9c31ca 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc @@ -530,7 +530,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 40960.0) @@ -908,7 +908,7 @@ (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-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1 ca-4)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky rider-plat)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 3) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 20480.0) diff --git a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc index d12d27d02c..9ee4af6b2f 100644 --- a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc @@ -338,7 +338,7 @@ (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-kind enemy)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 18432.0) diff --git a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc index bb44d89c6d..c23daff26f 100644 --- a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc @@ -1412,14 +1412,14 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 1) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set-vector! (-> s4-0 local-sphere) 0.0 8192.0 0.0 61440.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 8192.0 0.0 61440.0) diff --git a/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc b/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc index f739076902..67ab079a6d 100644 --- a/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc @@ -846,7 +846,7 @@ yakow-default-event-handler (let ((s3-0 (new 'process 'collide-shape-prim-sphere s4-0 (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-10 ca-11)) + (set! (-> s3-0 prim-core action) (collide-action solid attackable attackable-unused)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set-vector! (-> s3-0 local-sphere) 0.0 4096.0 0.0 10240.0) (set-root-prim! s4-0 s3-0) diff --git a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc index bedd85869c..8b0cd72165 100644 --- a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc @@ -353,7 +353,7 @@ (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-kind enemy)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 18432.0) @@ -418,7 +418,7 @@ (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-kind enemy)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s4-0 prim-core offense) (collide-offense indestructible)) (set! (-> s4-0 transform-index) 0) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 25395.2) diff --git a/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc b/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc index ee735cca95..1b24f711fe 100644 --- a/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/minecart_REF.gc @@ -88,7 +88,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 4915.2 0.0 13107.2) diff --git a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc index a93b5c1535..7a4fbc0e90 100644 --- a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc @@ -362,7 +362,7 @@ (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 3) (set-vector! (-> s3-0 local-sphere) 0.0 -24576.0 0.0 26624.0) diff --git a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc index 28313bbdec..a4ab2119b8 100644 --- a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc @@ -137,7 +137,9 @@ (and (>= (-> self level-slot) 0) (not (movie?)) (not (level-hint-displayed?)) - (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + (not (logtest? (-> *target* control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) ) (let* ((v1-16 (-> self root)) (a1-2 (-> *target* control trans)) @@ -525,13 +527,13 @@ (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 1) 0))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s4-0 collide-with) (collide-kind target)) - (set! (-> s4-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s4-0 prim-core action) (collide-action solid rider-plat-sticky)) (set-vector! (-> s4-0 local-sphere) 0.0 0.0 0.0 12288.0) (set-root-prim! s5-0 s4-0) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind ground-object)) (set! (-> s3-0 collide-with) (collide-kind target)) - (set! (-> s3-0 prim-core action) (collide-action solid ca-1)) + (set! (-> s3-0 prim-core action) (collide-action solid rider-plat-sticky)) (set! (-> s3-0 prim-core offense) (collide-offense indestructible)) (set! (-> s3-0 transform-index) 4) (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 12288.0) @@ -549,7 +551,9 @@ (defmethod pressable? warp-gate-switch ((obj warp-gate-switch)) (let ((v1-2 (-> obj entity extra perm task))) (cond - ((logtest? (-> *target* control root-prim prim-core action) (collide-action ca-7 ca-8 ca-9 ca-12 ca-13 ca-14)) + ((logtest? (-> *target* control root-prim prim-core action) + (collide-action edgegrab-cam swingpole-active racer snowball tube flut) + ) #f ) ((= v1-2 (game-task training-door))