diff --git a/goal_src/jak3/dgos/facc.gd b/goal_src/jak3/dgos/facc.gd index aa42608fab..5fe1dec542 100644 --- a/goal_src/jak3/dgos/facc.gd +++ b/goal_src/jak3/dgos/facc.gd @@ -15,9 +15,9 @@ "hover-nav-factoryc.o" "factoryc-obs.o" "factoryc-obs2.o" - "target-indax.o" - "target-indax-hang.o" - "jak-indax+0-ag.go" + ;; "target-indax.o" + ;; "target-indax-hang.o" + ;; "jak-indax+0-ag.go" "tpage-2233.go" "tpage-2305.go" "tpage-2235.go" diff --git a/goal_src/jak3/dgos/game.gd b/goal_src/jak3/dgos/game.gd index c590b9117e..084b92cf4b 100644 --- a/goal_src/jak3/dgos/game.gd +++ b/goal_src/jak3/dgos/game.gd @@ -470,4 +470,8 @@ "ragdoll-test.o" "debris.o" "shield-sphere.o" + ;; keep indax loaded + "target-indax.o" + "target-indax-hang.o" + "jak-indax+0-ag.go" )) diff --git a/goal_src/jak3/dgos/halfpipe.gd b/goal_src/jak3/dgos/halfpipe.gd index c0c276ea19..6409d4cee7 100644 --- a/goal_src/jak3/dgos/halfpipe.gd +++ b/goal_src/jak3/dgos/halfpipe.gd @@ -3,9 +3,9 @@ "ladder.o" "jak-ladder+0-ag.go" "jak-pole+0-ag.go" - "target-indax.o" - "target-indax-hang.o" - "jak-indax+0-ag.go" + ;; "target-indax.o" + ;; "target-indax-hang.o" + ;; "jak-indax+0-ag.go" "tpage-13.go" "tpage-15.go" "tpage-510.go" diff --git a/goal_src/jak3/dgos/vin.gd b/goal_src/jak3/dgos/vin.gd index 5e145bc940..a74031d9d1 100644 --- a/goal_src/jak3/dgos/vin.gd +++ b/goal_src/jak3/dgos/vin.gd @@ -3,7 +3,7 @@ "vinroom-part.o" "power-game.o" "ljkdxvin-texture.o" - "jak-indax+0-ag.go" + ;; "jak-indax+0-ag.go" "tpage-1026.go" "tpage-1024.go" "tpage-1023.go" diff --git a/goal_src/jak3/dgos/voca.gd b/goal_src/jak3/dgos/voca.gd index dfd000b9c3..ba5ad235ab 100644 --- a/goal_src/jak3/dgos/voca.gd +++ b/goal_src/jak3/dgos/voca.gd @@ -8,9 +8,9 @@ "target-ladder.o" "ladder.o" "jak-ladder+0-ag.go" - "target-indax.o" - "target-indax-hang.o" - "jak-indax+0-ag.go" + ;; "target-indax.o" + ;; "target-indax-hang.o" + ;; "jak-indax+0-ag.go" "chain-physics.o" "hover-formation-h.o" "hover-nav-control-h.o" diff --git a/goal_src/jak3/engine/game/main.gc b/goal_src/jak3/engine/game/main.gc index 839d39bde7..d95aedd42b 100644 --- a/goal_src/jak3/engine/game/main.gc +++ b/goal_src/jak3/engine/game/main.gc @@ -1435,6 +1435,139 @@ (load-continue (-> *level* loading-level)) ) + ;; MOD STUFF + ;; switch in/out of daxter states + (when *target* + (case (-> *target* state name) + ((#f + 'target-indax-attack + 'target-indax-attack-air + 'target-indax-death + 'target-indax-double-jump + 'target-indax-falling + 'target-indax-grab + 'target-indax-hang + 'target-indax-hang-attack + 'target-indax-hang-dodge + 'target-indax-hang-stance + 'target-indax-hang-turn-around + 'target-indax-hang-walk + 'target-indax-hit + 'target-indax-hit-ground + 'target-indax-jump + 'target-indax-running-attack + 'target-indax-stance + 'target-indax-start + 'target-indax-trip + 'target-indax-walk + ;; poles, no dax animation for them + 'target-pole-cycle + 'target-pole-flip-forward + 'target-pole-flip-forward-jump + 'target-pole-flip-up + 'target-pole-flip-up-jump + ;; give daxter a ground pound attack + 'target-flop + 'target-flop-hit-ground + 'target-hit-ground + 'target-duck-high-jump + 'target-duck-high-jump-jump + ;; misc + 'target-slide-down + 'target-falling + 'target-attack-air + ;; also used for daxter driving + 'target-pilot-edge-grab + 'target-pilot-get-on + 'target-pilot-start + 'target-pilot-stance + 'target-pilot-get-off + 'target-pilot-hit + 'target-pilot-impact + ;; jetboard + 'target-board-clone-anim + 'target-board-duck-stance + 'target-board-falling + 'target-board-flip + 'target-board-get-off + 'target-board-get-on + 'target-board-grab + 'target-board-grenade + 'target-board-halfpipe + 'target-board-hit + 'target-board-hit-ground + 'target-board-hold + 'target-board-jump + 'target-board-jump-kick + 'target-board-pegasus + 'target-board-ride-edge + 'target-board-stance + 'target-board-start + 'target-board-trickx + 'target-board-turn-to + 'target-board-wall-kick + ;; guns + ;; 'target-gun-stance + ;; 'target-gun-walk + ;; mech + 'target-mech-carry-drag + 'target-mech-carry-drop + 'target-mech-carry-falling + 'target-mech-carry-hit-ground + 'target-mech-carry-jump + 'target-mech-carry-pickup + 'target-mech-carry-stance + 'target-mech-carry-throw + 'target-mech-carry-walk + 'target-mech-clone-anim + 'target-mech-death + 'target-mech-falling + 'target-mech-get-off + 'target-mech-get-on + 'target-mech-grab + 'target-mech-hit + 'target-mech-hit-ground + 'target-mech-jump + 'target-mech-punch + 'target-mech-stance + 'target-mech-start + 'target-mech-walk + ;; turrets + 'target-turret-get-off + 'target-turret-get-on + 'target-turret-stance + ;; misc + 'target-title + 'target-float + 'target-continue + 'target-grab + ;; edge grabs + 'target-edge-grab + 'target-edge-grab-jump + 'target-edge-grab-off + 'target-jump-forward + ;; darkjak transitions + 'target-darkjak-get-on + 'target-darkjak-get-off + 'target-darkjak-bomb0 + 'target-darkjak-bomb1 + 'target-darkjak-giant + ) + ;; do nothing + ;; (format 0 "no indax event while in ~S next state ~S ~%" (-> *target* state name) (-> *target* next-state name)) + ) + (else + ;; force to indax mode + (when (not (logtest? (-> *kernel-context* prevent-from-run) (process-mask movie))) + (format 0 "sending change-mode indax while in ~S next state ~S ~%" (-> *target* state name) (-> *target* next-state name)) + (send-event *target* 'change-mode 'indax #f) + ) + ) + ) + ;; hide jak + (logior! (-> *target* draw status) (draw-control-status no-draw-bounds2)) + ) + ; ;; modify vertices for merc face animation. I believe this is somewhat racing DMA of merc data to VU1. ; (with-profiler 'merc *profile-merc-color* ; (blerc-execute) diff --git a/goal_src/jak3/engine/target/board/board-util.gc b/goal_src/jak3/engine/target/board/board-util.gc index cb9b5ed9d0..04a3ee4aa8 100644 --- a/goal_src/jak3/engine/target/board/board-util.gc +++ b/goal_src/jak3/engine/target/board/board-util.gc @@ -53,7 +53,8 @@ 0 ) ) - (if (or (logtest? (-> v1-0 draw status) (draw-control-status no-draw no-draw-temp no-draw-bounds no-draw-bounds2)) + (if (or ;; (logtest? (-> v1-0 draw status) (draw-control-status no-draw no-draw-temp no-draw-bounds no-draw-bounds2)) + (not (focus-test? *target* board)) (or (logtest? (-> v1-0 target-effect) 1) (zero? (-> v1-0 skel active-channels))) ) (logior! (-> self draw status) (draw-control-status no-draw)) diff --git a/goal_src/jak3/engine/target/indax/target-indax.gc b/goal_src/jak3/engine/target/indax/target-indax.gc index f6aad4499c..0fb0150972 100644 --- a/goal_src/jak3/engine/target/indax/target-indax.gc +++ b/goal_src/jak3/engine/target/indax/target-indax.gc @@ -199,6 +199,9 @@ (go target-tube-start (process->handle (the-as process (-> arg3 param 1)))) ) ) + (('turret 'board 'pilot 'mech 'darkjak) + (target-standard-event-handler arg0 arg1 arg2 arg3) + ) ) ) (('trip) @@ -209,7 +212,7 @@ (go target-indax-trip) ) ) - (('swim 'slide 'edge-grab) + (('swim 'slide) #f ) (('clone-anim) @@ -391,9 +394,9 @@ (set! (-> self indax) (new 'process 'indax-info)) (set! (-> self indax pad) (the-as object #f)) ) - (set! (-> self control transv quad) (the-as uint128 0)) - (set! (-> self control ctrl-xz-vel) 0.0) - (set! (-> self fact health) (-> self fact health-max)) + ;; (set! (-> self control transv quad) (the-as uint128 0)) + ;; (set! (-> self control ctrl-xz-vel) 0.0) + ;; (set! (-> self fact health) (-> self fact health-max)) (set-time! (-> self indax indax-start-time)) (set! (-> self indax art-group-backup) (-> self draw art-group)) (set! (-> self draw art-group) (-> self sidekick 0 draw art-group)) @@ -443,9 +446,9 @@ (set! (-> self draw art-group) (-> self indax art-group-backup)) (logclear! (-> self draw status) (draw-control-status no-draw-bounds2)) (send-event (ppointer->process (-> self sidekick)) 'matrix #f) - (if (not (focus-test? self dead)) - (set! (-> self fact health) (-> self fact health-max)) - ) + ;; (if (not (focus-test? self dead)) + ;; (set! (-> self fact health) (-> self fact health-max)) + ;; ) (let ((v1-33 (-> self manipy))) (when v1-33 (deactivate (-> v1-33 0)) @@ -536,6 +539,16 @@ (set! (-> a2-3 action-mask) (collide-action solid)) (fill-cache-integrate-and-collide (-> self control) (-> self control transv) a2-3 (meters 1)) ) + (if (and (logtest? (-> self control root-prim prim-core action) (collide-action check-edge)) + (>= (vector-dot + (-> self control dynam gravity-normal) + (vector-! (new 'stack-no-clear 'vector) (-> self control trans) (-> self control gspot-pos)) + ) + (-> *TARGET-bank* edge-grab-height-off-ground) + ) + ) + (target-method-28 *target* *collide-cache* *collide-edge-spec*) ;; do-edge-grabs + ) (bend-gravity) (post-flag-setup) ) @@ -605,12 +618,30 @@ (target-indax-init) (if (= arg1 'hang) (go target-indax-hang-stance) - (go target-indax-stance) + (cond + ((or (cpad-hold? 0 circle) (cpad-pressed? 0 circle)) + (if (focus-test? self in-air) + (go target-indax-attack-air #f) + (go target-indax-attack) + ) + ) + ((or (cpad-hold? 0 x) (cpad-pressed? 0 x)) + ;; skip to double jump to prevent triple jump + (go target-indax-double-jump + (-> *TARGET-bank* indax-jump-height-min) + (-> *TARGET-bank* indax-jump-height-max)) + ) + (else + (go target-indax-stance) + ) + ) ) ) :post target-no-stick-post ) +(define *dax-highjump-factor* 1.6) + (defstate target-indax-stance (target) :event target-indax-handler :enter (behavior () @@ -641,7 +672,11 @@ (go target-indax-jump (-> *TARGET-bank* indax-jump-height-min) - (-> *TARGET-bank* indax-jump-height-max) + ;; multiply max height if holding l1, high jump hack + (if (cpad-hold? (-> self control cpad number) l1) + (* (-> *TARGET-bank* indax-jump-height-max) *dax-highjump-factor*) + (-> *TARGET-bank* indax-jump-height-max) + ) (the-as surface #f) ) ) @@ -667,7 +702,9 @@ ) (go target-indax-attack) ) - (fall-test target-indax-falling (-> *TARGET-bank* fall-height)) + (when (and (time-elapsed? (-> self state-time) (seconds 0.5)) (> (vector-length (-> self root transv)) (meters 0.1))) + (fall-test target-indax-falling -4096000.0) + ) ) :code (behavior () (let ((v1-2 (ja-group))) @@ -775,7 +812,9 @@ ) (go target-indax-attack) ) - (fall-test target-indax-falling (-> *TARGET-bank* fall-height)) + (when (and (time-elapsed? (-> self state-time) (seconds 0.5)) (> (vector-length (-> self root transv)) (meters 0.1))) + (fall-test target-indax-falling -4096000.0) + ) ) :code (behavior () (let ((f26-0 0.0) @@ -811,7 +850,8 @@ ) ) (ja-no-eval :group! daxter-indax-run-ja :num! (identity f26-0) :dist 13107.2) - (ja-no-eval :chan 1 :group! daxter-indax-run-look-back-ja :num! (identity f26-0) :dist 12697.6) + ;; (ja-no-eval :chan 1 :group! daxter-indax-run-look-back-ja :num! (identity f26-0) :dist 12697.6) + (ja-no-eval :chan 1 :group! daxter-indax-run-ja :num! (identity f26-0) :dist 12697.6) (let ((a0-25 (-> self skel root-channel 2))) (let ((f0-12 (- 1.0 f28-0))) (set! (-> a0-25 frame-interp 1) f0-12) @@ -892,9 +932,12 @@ (('tube) ) (else - (if (logtest? (-> self control status) (collide-status on-surface)) + (if (or (logtest? (-> self control status) (collide-status on-surface))) (go target-indax-hit-ground #f) ) + (if (and (time-elapsed? (-> self state-time) (seconds 0.5)) (< (vector-length (-> self root transv)) (meters 0.1))) + (go target-indax-hit-ground #f) + ) (if (and (cpad-pressed? (-> self control cpad number) circle) (can-feet? #f)) (go target-indax-attack-air #f) ) @@ -1002,6 +1045,33 @@ (-> *TARGET-bank* indax-double-jump-height-max) ) ) + (if (and (cpad-pressed? (-> self control cpad number) square) + (and ;; (< (vector-dot (-> self control dynam gravity-normal) (-> self control transv)) + ;; (* 26624.0 (-> self darkjak-giant-interp) (-> self darkjak-giant-interp)) + ;; ) + (< -61440.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) + (and (>= (- (current-time) (-> self control last-time-of-stuck)) + (the-as time-frame (-> *TARGET-bank* stuck-timeout)) + ) + (not (logtest? (-> self state-flags) (state-flags sf8))) ;; prevent-attack))) + (not (logtest? (-> self control current-surface flags) (surface-flag no-attack no-hands))) + (not (and (not (using-gun? self)) (!= (-> self skel top-anim interp) 0.0))) + ) + ) + ) + (go + target-flop + 65502.96 + -163840.0 + (the-as float (if (= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) + 0 + #x47866666 + ) + ) + #f ;; unused??? + ) + ) + (mod-var-jump #t #t (cpad-hold? (-> self control cpad number) x) (-> self control transv)) ) :code (behavior ((arg0 float) (arg1 float) (arg2 surface)) (ja-channel-push! 2 (seconds 0.02)) @@ -1069,6 +1139,32 @@ :exit (-> target-indax-jump exit) :trans (behavior () ((-> target-indax-falling trans)) + (if (and (cpad-pressed? (-> self control cpad number) square) + (and ;; (< (vector-dot (-> self control dynam gravity-normal) (-> self control transv)) + ;; (* 26624.0 (-> self darkjak-giant-interp) (-> self darkjak-giant-interp)) + ;; ) + (< -61440.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) + (and (>= (- (current-time) (-> self control last-time-of-stuck)) + (the-as time-frame (-> *TARGET-bank* stuck-timeout)) + ) + (not (logtest? (-> self state-flags) (state-flags sf8))) ;; prevent-attack))) + (not (logtest? (-> self control current-surface flags) (surface-flag no-attack no-hands))) + (not (and (not (using-gun? self)) (!= (-> self skel top-anim interp) 0.0))) + ) + ) + ) + (go + target-flop + 65502.96 + -163840.0 + (the-as float (if (= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) + 0 + #x47866666 + ) + ) + #f ;; unused??? + ) + ) (mod-var-jump #t #t (cpad-hold? (-> self control cpad number) x) (-> self control transv)) ) :code (behavior ((arg0 float) (arg1 float)) @@ -1134,7 +1230,13 @@ (go target-indax-jump (-> *TARGET-bank* indax-jump-height-min) - (-> *TARGET-bank* indax-jump-height-max) + ;; multiply max height if holding l1 and not moving, high jump hack + (if (and (cpad-hold? (-> self control cpad number) l1) + (zero? (-> *cpad-list* cpads (-> self control cpad number) stick0-speed)) + ) + (* (-> *TARGET-bank* indax-jump-height-max) *dax-highjump-factor*) + (-> *TARGET-bank* indax-jump-height-max) + ) (the-as surface #f) ) ) @@ -1163,7 +1265,9 @@ ) (go target-indax-attack) ) - (fall-test target-indax-falling (-> *TARGET-bank* fall-height)) + (when (and (time-elapsed? (-> self state-time) (seconds 0.5)) (> (vector-length (-> self root transv)) (meters 0.1))) + (fall-test target-indax-falling -4096000.0) + ) ) :code (behavior ((arg0 symbol)) (ja-channel-push! 1 (seconds 0.05)) @@ -1258,9 +1362,85 @@ (defstate target-indax-attack-air (target) :event target-indax-dangerous-event-handler - :enter (-> target-attack-air enter) + :enter (behavior ((arg0 symbol)) + (set! (-> self state-time) (current-time)) + (logclear! (-> self control status) (collide-status on-surface on-ground touch-surface)) + (target-start-attack) + (target-danger-set! 'spin-air #f) + (set! (-> self control mod-surface) *jump-attack-mods*) + (set! (-> self neck flex-blend) 0.0) + (let ((f0-2 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) + (cond + ((or (>= 0.0 f0-2) (= arg0 'flop)) + (let ((v1-14 (new-stack-vector0))) + (let ((f0-4 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) + 0.0 + (vector-! v1-14 (-> self control transv) (vector-float*! v1-14 (-> self control dynam gravity-normal) f0-4)) + ) + (let* ((f0-5 (vector-length v1-14)) + (f1-2 f0-5) + (f2-0 33775.48) + ) + (vector+! + (-> self control transv) + (vector-float*! (-> self control transv) (-> self control dynam gravity-normal) f2-0) + (vector-float*! v1-14 v1-14 (/ f0-5 f1-2)) + ) + ) + ) + ) + (else + (let* ((f1-5 (/ f0-2 (* (-> self control dynam gravity-length) (-> self clock seconds-per-frame)))) + (f0-7 (* 0.5 f1-5 (-> self clock seconds-per-frame) f0-2)) + ) + (let ((v1-22 (ja-group))) + (if (and v1-22 + (or (= v1-22 (-> self draw art-group data 51)) + (= v1-22 (-> self draw art-group data 267)) + (= v1-22 (-> self draw art-group data 279)) + ) + ) + (set! f0-7 + (fmax + 0.0 + (- (-> *TARGET-bank* attack-jump-height-max) + (vector-dot + (-> self control dynam gravity-normal) + (vector-! (new 'stack-no-clear 'vector) (-> self control trans) (-> self control last-trans-any-surf)) + ) + ) + ) + ) + ) + ) + (let ((v1-33 (new-stack-vector0))) + (let ((f1-11 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) + 0.0 + (vector-! v1-33 (-> self control transv) (vector-float*! v1-33 (-> self control dynam gravity-normal) f1-11)) + ) + (let* ((f1-12 (vector-length v1-33)) + (f2-7 f1-12) + (f0-12 (+ 1024.0 (sqrtf (* 245760.0 (+ 2048.0 f0-7))))) + ) + (vector+! + (-> self control transv) + (vector-float*! (-> self control transv) (-> self control dynam gravity-normal) f0-12) + (vector-float*! v1-33 v1-33 (/ f1-12 f2-7)) + ) + ) + ) + ) + ) + ) + ) + (set! (-> self control dynam gravity-length) 122880.0) + (set! (-> self control last-trans-any-surf quad) (-> self control trans quad)) + ) :exit (behavior () - ((-> target-attack-air exit)) + (set! (-> self control dynam gravity-max) (-> self control standard-dynamics gravity-max)) + (set! (-> self control dynam gravity-length) (-> self control standard-dynamics gravity-length)) + (set! (-> self control last-attack-end-time) (current-time)) + (target-exit) (target-indax-exit) ) :code (behavior ((arg0 symbol)) @@ -1302,6 +1482,7 @@ :enter (-> target-running-attack enter) :exit (behavior () ((-> target-running-attack enter)) + (target-danger-set! 'harmless #f) (target-indax-exit) ) :code (behavior () diff --git a/goal_src/jak3/engine/target/logic-target.gc b/goal_src/jak3/engine/target/logic-target.gc index b30a04684e..bb493898b0 100644 --- a/goal_src/jak3/engine/target/logic-target.gc +++ b/goal_src/jak3/engine/target/logic-target.gc @@ -1927,7 +1927,7 @@ ) (and (< f0-17 0.0) (and (or (not (and (= *cheat-mode* 'debug) (cpad-hold? (-> self control cpad number) r2))) *pause-lock*) - (not (focus-test? self flut pilot mech indax)) + (not (focus-test? self flut pilot mech)) (not (logtest? (-> self target-flags) (target-flags prevent-jump))) #t ) diff --git a/goal_src/jak3/engine/target/sidekick.gc b/goal_src/jak3/engine/target/sidekick.gc index 7db7ed2d7c..c3d118aa7a 100644 --- a/goal_src/jak3/engine/target/sidekick.gc +++ b/goal_src/jak3/engine/target/sidekick.gc @@ -359,6 +359,40 @@ (set! (-> self offset trans y) (* 204.8 f0-7)) (set! (-> self offset trans z) (* 409.6 f0-7)) ) + ;; offset daxter position in some states + (when *target* + (case (-> *target* state) + ((target-edge-grab target-edge-grab-jump target-pilot-edge-grab) + (cond + ((focus-test? *target* dark) + (set! (-> self offset trans y) (meters -0.125)) ;; up/down + (set! (-> self offset trans z) (meters 0.3)) ;; forward/back relative + ) + (else + (set! (-> self offset trans y) (meters 1.09)) ;; up/down + (set! (-> self offset trans z) (meters 0.4)) ;; forward/back relative + ) + ) + ) + ((target-pole-cycle) + ;; doesnt seem to follow jak's orientation, maybe could try to figure that out but meh + ;; (set! (-> self offset trans y) (meters 1.09)) ;; up/down + ) + ((target-pilot-stance) + (set! (-> self offset trans x) (meters -0.4)) ;; left/right relative + (set! (-> self offset trans y) (meters -0.7)) ;; up/down + ) + ((target-grab) + (set! (-> self offset trans y) (meters -2.1)) ;; up/down + ) + ((target-darkjak-get-on) + (set! (-> self offset trans y) (meters -1.5)) ;; up/down + ) + ((target-darkjak-get-off) + (set! (-> self offset trans y) (meters -1.4)) ;; up/down + ) + ) + ) (cond ((= (-> self parent 0 skel override 0) 0.00001) (set! (-> self skel override 0) 0.00001) @@ -452,6 +486,10 @@ (update-anim-data (-> self skel)) (do-joint-math (-> self draw) (-> self node-list) (-> self skel)) ) + ;; hack to copy indax position to last daxter shoulder position + (when (and *target* (focus-test? *target* indax)) + (vector-copy! (-> self parent 0 control sidekick-root parent bone transform trans) (-> *target* root trans)) + ) (when *display-sidekick-stats* (format *stdcon* "~%") (debug-print-channels (-> self skel) (the-as symbol *stdcon*)) diff --git a/goal_src/jak3/engine/target/target-handler.gc b/goal_src/jak3/engine/target/target-handler.gc index 8b3102abb4..1d55c52cd5 100644 --- a/goal_src/jak3/engine/target/target-handler.gc +++ b/goal_src/jak3/engine/target/target-handler.gc @@ -1375,7 +1375,7 @@ ) ) ((= v1-63 'indax) - (go target-indax-start (process->handle (the-as process (-> arg3 param 1))) (-> arg3 param 2)) + (go target-indax-start (the handle #f) #f) ;; (process->handle (the-as process (-> arg3 param 1))) (-> arg3 param 2)) ) ((= v1-63 'gun) (when (logtest? (-> self game features) (game-feature gun)) diff --git a/goal_src/jak3/engine/target/target.gc b/goal_src/jak3/engine/target/target.gc index 6bc4f5e0e6..ed7e6d3adf 100644 --- a/goal_src/jak3/engine/target/target.gc +++ b/goal_src/jak3/engine/target/target.gc @@ -2064,7 +2064,7 @@ ) :code (behavior ((arg0 symbol)) (target-hit-ground-anim #f (are-still?)) - (go target-stance) + (go target-indax-start (the handle #f) #f) ;; (go target-stance) ) :post target-post ) @@ -3815,7 +3815,7 @@ ) (can-feet? #f) ) - (go target-attack-air 'flop) + (go target-attack-air #f) ;; 'flop) ) ) (when (and (and (= (-> self fact eco-type) 2) (>= (-> self fact eco-level) 1.0)) diff --git a/goal_src/jak3/engine/target/target2.gc b/goal_src/jak3/engine/target/target2.gc index 6e0e60c54e..5f72a2a002 100644 --- a/goal_src/jak3/engine/target/target2.gc +++ b/goal_src/jak3/engine/target/target2.gc @@ -321,7 +321,7 @@ (('end-mode) (case (-> block param 0) (('grab) - (go target-stance) + (go target-indax-start (the handle #f) #f) ;; (go target-stance) ) (('gun) (target-gun-end-mode #t)