From 2a41bc615e090ea1a17a837789bf8de06e57b8e1 Mon Sep 17 00:00:00 2001 From: Matt Dallmeyer Date: Tue, 12 Nov 2024 11:59:21 -0800 Subject: [PATCH] [jak2] Fix bug where spinning into grind doesnt break clasps in dig1 (#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 --- goal_src/jak2/levels/dig/dig-digger.gc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/goal_src/jak2/levels/dig/dig-digger.gc b/goal_src/jak2/levels/dig/dig-digger.gc index cda20850d59..6c6edb9f25e 100644 --- a/goal_src/jak2/levels/dig/dig-digger.gc +++ b/goal_src/jak2/levels/dig/dig-digger.gc @@ -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) )