Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-23 06:09:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[jak2] Fix bug where spinning into grind doesnt break clasps in dig1 (#3740)
Some checks failed
Build / 🖥️ Windows (push) Waiting to run
Details
Build / 🐧 Linux (push) Waiting to run
Details
Build / 🍎 MacOS (push) Waiting to run
Details
Lint / 📝 Formatting (push) Waiting to run
Details
Lint / 📝 Required Checks (push) Waiting to run
Details
Lint / 📝 Optional Checks (push) Waiting to run
Details
Inform Pages Repo / Generate Documentation (push) Has been cancelled
Details

Browse Source 
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
This commit is contained in:
Matt Dallmeyer 2024-11-12 11:59:21 -08:00 committed by GitHub
parent 7553877e57
commit 2a41bc615e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
goal_src/jak2/levels/dig/dig-digger.gc
View File

@ -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)
)