jak2/jak3: fix overlapping layers on non-playable Hellcats (#4161)

fix for issue #4120, along with other areas this happens in Jak II and
Jak 3

**Before**
<img width="2560" height="1440" alt="desoasis-hellcat"
src="https://github.com/user-attachments/assets/c77db831-c9c7-493d-a426-de12248312d4"
/>
**After**
<img width="2560" height="1440" alt="desoasis-hellcat-fixed"
src="https://github.com/user-attachments/assets/f75c57ec-dc76-43bb-b743-7fe659d36a15"
/>

**Before**
<img width="2560" height="1440" alt="ctywide-scenes-atoll-hellcat"
src="https://github.com/user-attachments/assets/73162526-9676-4937-96e8-78636248fbdc"
/>
**After**
<img width="2560" height="1440" alt="ctywide-scenes-atoll-hellcat-fixed"
src="https://github.com/user-attachments/assets/0f5b1e85-dd45-4933-98c1-589bc41aeafb"
/>

---------

Co-authored-by: Matt Dallmeyer <mattdallmeyer@gmail.com>
This commit is contained in:
rocket
2026-04-03 18:41:47 +00:00
committed by GitHub
parent a75e8203da
commit 64baff9614
8 changed files with 15 additions and 0 deletions
+4
View File
@@ -1116,6 +1116,10 @@
(defstate idle (atoll-hellcat)
:virtual #t
;; og:preserve-this fixes overlapping Hellcat layers
:enter (behavior ()
(setup-masks (-> self draw) #x1fe #x1fe)
)
:code sleep-code
)
@@ -1239,6 +1239,7 @@
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
:no-draw-seg #x1fe ;; og:preserve-this fixes overlapping Hellcat layers
)
)
:load-point-obj "atoll-movie"
@@ -1634,6 +1635,7 @@
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
:no-draw-seg #x1fe ;; og:preserve-this fixes overlapping Hellcat layers
)
(new 'static 'scene-actor
:name "palmpilot"
@@ -779,6 +779,7 @@
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
:no-draw-seg #x1fe ;; og:preserve-this fixes overlapping Hellcat layers
)
(new 'static 'scene-actor
:name "particleman"
@@ -779,6 +779,7 @@
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
:no-draw-seg #x1fe ;; og:preserve-this fixes overlapping Hellcat layers
)
(new 'static 'scene-actor
:name "crimson-guard-highres"
+1
View File
@@ -1772,6 +1772,7 @@
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
:no-draw-seg #x1fe ;; og:preserve-this fixes overlapping Hellcat layers
)
)
:load-point-obj "ctyport-air-train-ashelin"
@@ -773,6 +773,10 @@
(defstate idle (desoasis-hellcat)
:virtual #t
;; og:preserve-this fixes overlapping Hellcat layers
:enter (behavior ()
(setup-masks (-> self draw) #x1fe #x1fe)
)
:code sleep-code
)
@@ -5524,6 +5524,7 @@
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
:no-draw-seg #x1fe ;; og:preserve-this fixes overlapping Hellcat layers
)
(new 'static 'scene-actor
:name "hellcat-lowres-fma"
@@ -440,6 +440,7 @@
:flags #x1
:shadow-flags -1
:shadow-volume-joint #f
:no-draw-seg #x1fe ;; og:preserve-this fixes overlapping Hellcat layers
)
(new 'static 'scene-actor
:name "sidekick-highres"