Skip to content

Commit

Permalink
[jak2] Fix bug where spinning into grind doesnt break clasps in dig1 (#…
Browse files Browse the repository at this point in the history
…3740)

if you sideflip into grind in the digsite mission, the clasps wont break
because it is considered a `board-spin` attack instead of `board`. This
extends the condition to allow for `board-spin` as well.

~~Should I wrap this in an `#if PC_PORT`?~~ done
  • Loading branch information
dallmeyer authored Nov 12, 2024
1 parent 7553877 commit 2a41bc6
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion goal_src/jak2/levels/dig/dig-digger.gc
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,12 @@
)
(('attack)
(let ((v1-2 (the-as attack-info (-> block param 1))))
(when (and (logtest? (-> v1-2 mask) (attack-mask mode)) (= (-> v1-2 mode) 'board))
(when (and (logtest? (-> v1-2 mask) (attack-mask mode))
;; og:preserve-this fix bug where spinning into grind doesnt break
(#if PC_PORT
(or (= (-> v1-2 mode) 'board)
(and (= (-> v1-2 mode) 'board-spin) (focus-test? *target* rail)))
(= (-> v1-2 mode) 'board)))
(cpad-set-buzz! (-> *cpad-list* cpads 0) 0 85 (seconds 0.1))
(go-virtual break-it)
)
Expand Down

0 comments on commit 2a41bc6

Please sign in to comment.