dax3

OpenGOAL-Mods · May 11, 2024 · 7eca9a6 · 7eca9a6
1 parent 07e42bc
commit 7eca9a6
Show file tree

Hide file tree

Showing 13 changed files with 390 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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))