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

d/jak2: finish atoll-scenes (#2069)

Browse Source
This commit is contained in:
Tyler Wilding 2022-12-30 18:23:45 -05:00 committed by GitHub
parent d454dfbcd8
commit 6406ba05a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 5713 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decompiler/config/jak2/all-types.gc
View File

@ -15283,7 +15283,7 @@
)
)
(define-extern *scene-player* scene-player)
(define-extern *scene-player* (pointer scene-player))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; sync-info-h ;;

2
decompiler/config/jak2/anonymous_function_types.jsonc
View File

@ -500,7 +500,7 @@
"atoll-scenes": [
[0, "(function (pointer process) :behavior process-drawable)"],
[1, "(function float)"],
[2, "(function none)"]
[2, "(function (pointer process))"]
],
"castle-scenes": [
[0, "(function none :behavior scene-player)"],

2
goal_src/jak2/engine/scene/scene-h.gc
View File

@ -118,4 +118,4 @@
)
(define *scene-player* (the-as scene-player #f))
(define *scene-player* (the-as (pointer scene-player) #f))

4
goal_src/jak2/engine/scene/scene.gc
View File

@ -237,7 +237,7 @@
)
(defmethod deactivate scene-player ((obj scene-player))
(set! *scene-player* #f)
(set! *scene-player* (the-as (pointer scene-player) #f))
(kill-persister *setting-control* (the-as engine-pers 'blackout) 'bg-a-force)
((method-of-type process-drawable deactivate) obj)
(none)
@ -1687,7 +1687,7 @@
)
)
)
(set! *scene-player* (the-as scene-player (process->ppointer self)))
(set! *scene-player* (the-as (pointer scene-player) (process->ppointer self)))
(set! *display-entity-errors* #f)
(set-setting! 'speech-control #f 0 0)
(set-setting! 'allow-progress #f 0 0)

211
goal_src/jak2/game.gp
View File

@ -1077,57 +1077,55 @@
;; ;; ATE
;; ;;;;;;;;;;;;;;;;;;;;;
;; (cgo "ATE.DGO" "ate.gd")
(cgo "ATE.DGO" "ate.gd")
;; (goal-src-sequence
;; ""
;; :deps ("$OUT/obj/los-control.o")
;; "levels/common/ai/ai-task-h.gc"
;; "levels/common/ai/bot-h.gc"
;; "levels/common/ai/bot.gc"
;; "levels/common/ai/bot-states.gc"
;; "characters/sig/sig-h.gc"
;; "characters/sig/sig-task.gc"
;; "characters/sig/sig-shot.gc"
;; "characters/sig/sig-plasma.gc"
;; "characters/sig/sig.gc"
;; "characters/sig/sig-states.gc"
;; "characters/ashelin/ash-h.gc"
;; "characters/ashelin/ash-task.gc"
;; "characters/ashelin/ash-shot.gc"
;; "characters/ashelin/ash.gc"
;; "characters/ashelin/ash-states.gc"
;; "levels/common/enemy/spyder.gc"
;; "levels/atoll/sig0-course.gc"
;; "levels/atoll/ash1-course.gc"
;; "levels/atoll/atoll-tank.gc"
;; "levels/atoll/atoll-scenes.gc"
;; "levels/atoll/sniper.gc"
;; "levels/common/enemy/amphibian/amphibian.gc"
;; "levels/atoll/juicer.gc"
;; "levels/common/enemy/metalhead_brown/metalmonk.gc"
;; )
(goal-src-sequence
""
:deps ("$OUT/obj/los-control.o")
"levels/common/ai/ai-task-h.gc"
"levels/common/ai/bot-h.gc"
"levels/common/ai/bot.gc"
"levels/common/ai/bot-states.gc"
"characters/sig/sig-h.gc"
"characters/sig/sig-task.gc"
"characters/sig/sig-shot.gc"
"characters/sig/sig-plasma.gc"
"characters/sig/sig.gc"
"characters/sig/sig-states.gc"
"characters/ashelin/ash-h.gc"
"characters/ashelin/ash-task.gc"
"characters/ashelin/ash-shot.gc"
"characters/ashelin/ash.gc"
"characters/ashelin/ash-states.gc"
"levels/common/enemy/spyder.gc"
"levels/atoll/sig0-course.gc"
"levels/atoll/ash1-course.gc"
"levels/atoll/atoll-tank.gc"
"levels/atoll/atoll-scenes.gc"
"levels/atoll/sniper.gc"
"levels/common/enemy/amphibian/amphibian.gc"
"levels/atoll/juicer.gc"
"levels/common/enemy/metalhead_brown/metalmonk.gc"
)
;; (copy-textures 1606 1607 2461 3237 3412)
(copy-textures 1606 1607 2461 3237 3412)
;; (copy-gos
;; "sig-ag"
;; "daxter-highres-ag"
;; "jak-highres-ag"
;; "atoll-tank-ag"
;; "sig-highres-ag"
;; "juicer-ag"
;; "ashelin-highres-ag"
;; "atoll-hellcat-ag"
;; "ashelin-ag"
;; "metalmonk-ag"
;; "amphibian-ag"
;; "spyder-ag"
;; "com-airlock-inner-ag"
;; "palmpilot-ag"
;; "particleman-ag"
;; "atollext-vis"
;; )
(copy-gos
"sig-ag"
"jak-highres-ag"
"atoll-tank-ag"
"sig-highres-ag"
"juicer-ag"
"ashelin-highres-ag"
"atoll-hellcat-ag"
"ashelin-ag"
"metalmonk-ag"
"amphibian-ag"
"spyder-ag"
"com-airlock-inner-ag"
"palmpilot-ag"
"atollext-vis"
)
;; ;;;;;;;;;;;;;;;;;;;;;
;; ;; ATO
@ -1205,11 +1203,8 @@
(copy-textures 2537 2539 2538 3498)
(copy-gos
;; "daxter-highres-ag"
"jak-highres-ag"
"air-train-ag"
"cpad-elevator-ag"
;; "particleman-ag"
"caspad-vis"
)
@ -1300,7 +1295,6 @@
(copy-textures 2444 2445 2645 2644 2744 2791 2441)
(copy-gos
"com-airlock-inner-ag"
"farm-chilirots-ag"
"farm-cabbage-ag"
"farm-marrow-ag"
@ -1747,7 +1741,6 @@
"levels/dig/dig3-obs.gc"
"levels/common/enemy/baby_spider/tomb-baby-spider.gc"
"levels/common/enemy/metalhead_slinger/grenadier.gc"
"levels/common/enemy/metalhead_brown/metalmonk.gc"
"levels/dig/dig-texture.gc"
"levels/dig/dig-scenes.gc"
"levels/dig/dig-part.gc"
@ -1757,7 +1750,6 @@
(copy-gos
"grenadier-ag"
"metalmonk-ag"
"flitter-ag"
"dig-balloon-lurker-ag"
"dig-spikey-sphere-ag"
@ -2122,20 +2114,6 @@
(goal-src-sequence
""
:deps ("$OUT/obj/los-control.o")
"levels/common/enemy/spyder.gc"
;; "levels/common/enemy/hover/hover-formation-h.gc"
;; "levels/common/enemy/hover/hover-nav-control-h.gc"
;; "levels/common/enemy/hover/hover-enemy-h.gc"
;; "levels/common/enemy/hover/hover-nav-network.gc"
;; "levels/common/enemy/hover/hover-nav-control.gc"
;; "levels/common/enemy/hover/hover-enemy.gc"
;; "levels/common/enemy/hover/hover-enemy-battle.gc"
;; "levels/common/enemy/hover/hover-formation.gc"
;; "levels/common/enemy/hover/hover-nav-edit.gc"
;; "levels/common/enemy/hover/wasp-part.gc"
;; "levels/common/enemy/hover/wasp.gc"
;; "levels/common/enemy/hover/crimson-guard-hover.gc"
;; "levels/common/enemy/hover/flamer.gc"
"levels/forest/forest-part.gc"
"levels/forest/forest-obs.gc"
"levels/forest/pegasus.gc"
@ -2153,7 +2131,6 @@
"jak-pegasus+0-ag"
"pegasus-ag"
"predator-ag"
"spyder-ag"
"wren-ag"
"minnow-ag"
"forest-vis"
@ -2819,13 +2796,6 @@
(goal-src-sequence
""
:deps ("$OUT/obj/los-control.o")
"levels/common/ai/ai-task-h.gc"
"levels/common/ai/bot-h.gc"
"levels/common/ai/bot.gc"
"levels/common/ai/bot-states.gc"
"levels/undefined/hal-h.gc"
"levels/undefined/hal-task.gc"
"levels/undefined/hal.gc"
"levels/city/kid_escort/kidesc-h.gc"
"levels/city/kid_escort/crocesc-h.gc"
"levels/city/kid_escort/hal4-course.gc"
@ -3515,19 +3485,6 @@
(goal-src-sequence
""
:deps ("$OUT/obj/los-control.o")
;; "levels/common/enemy/hover/hover-formation-h.gc"
;; "levels/common/enemy/hover/hover-nav-control-h.gc"
;; "levels/common/enemy/hover/hover-enemy-h.gc"
;; "levels/common/enemy/hover/hover-nav-network.gc"
;; "levels/common/enemy/hover/hover-nav-control.gc"
;; "levels/common/enemy/hover/hover-enemy.gc"
;; "levels/common/enemy/hover/hover-enemy-battle.gc"
;; "levels/common/enemy/hover/hover-formation.gc"
;; "levels/common/enemy/hover/hover-nav-edit.gc"
;; "levels/common/enemy/hover/wasp-part.gc"
;; "levels/common/enemy/hover/wasp.gc"
;; "levels/common/enemy/hover/crimson-guard-hover.gc"
;; "levels/common/enemy/hover/flamer.gc"
"levels/nest/boss/nest-texture.gc"
"levels/nest/boss/metalkor-part.gc"
"levels/nest/boss/metalkor-setup.gc"
@ -3542,17 +3499,13 @@
(copy-gos
"kid-nestb+0-ag"
"metalkor-ag"
;; "daxter-highres-ag"
"metalkor-lowtorso-ag"
"metalkor-highres-ag"
;; "darkjak-highres-ag"
"metalkor-legs-ag"
"metalkor-explode-ag"
"kid-highres-ag"
"nest-gun-parts-ag"
;; "wasp-ag"
"kid-ag"
;; "flitter-ag"
"nest-break-precipice-ag"
"metalkor-bomb-ag"
"metalkor-wings-ag"
@ -3562,11 +3515,8 @@
"metalkor-distort-ag"
"metalkor-rays-ag"
"nest-gun-elevator-ag"
;; "precursor-stone-ag"
"palmpilot-ag"
"metalkor-fma-spinner-ag"
"nestb-tail-bound-ag"
;; "particleman-ag"
"rift-occlude-ag"
"nestb-vis"
)
@ -3906,11 +3856,6 @@
(goal-src-sequence
""
:deps ("$OUT/obj/los-control.o")
;; "engine/target/mech_suit/mech-part.gc"
;; "engine/target/mech_suit/mech.gc"
;; "engine/target/mech_suit/target-mech.gc"
;; "engine/target/mech_suit/mech-states.gc"
;; "engine/target/mech_suit/grunt-mech.gc"
"levels/ruins/ruins-ocean.gc"
"levels/ruins/ruins-scenes.gc"
"levels/ruins/mechtest-obs.gc"
@ -3919,27 +3864,15 @@
"levels/ruins/pillar-collapse.gc"
"levels/ruins/ruins-obs.gc"
"levels/ruins/rapid-gunner.gc"
"levels/common/enemy/amphibian/amphibian.gc"
;; "levels/common/enemy/fodder/fodder.gc"
;; "levels/common/enemy/metalhead_slinger/grenadier.gc"
)
(copy-textures 851 853 852 2205 1000)
(copy-gos
;; "jak-pole+0-ag"
;; "jak-mech+0-ag"
;; "grunt-mech-anims+0-ag"
;; "grunt-ag"
"ruins-breakable-wall-ag"
;; "grenadier-ag"
"amphibian-ag"
"ruins-drop-plat-ag"
"rapid-gunner-ag"
;; "flitter-ag"
"ruins-pillar-collapse-ag"
;; "mech-ag"
;; "fodder-ag"
"ruins-bridge-ag"
"shield-gunner-ag"
"precipice-b-ag"
@ -4613,50 +4546,6 @@
(goal-src-sequence
""
:deps ("$OUT/obj/los-control.o")
;; "levels/common/enemy/hover/hover-formation-h.gc"
;; "levels/common/enemy/hover/hover-nav-control-h.gc"
;; "levels/common/enemy/hover/hover-enemy-h.gc"
;; "levels/common/enemy/hover/hover-nav-network.gc"
;; "levels/common/enemy/hover/hover-nav-control.gc"
;; "levels/common/enemy/hover/hover-enemy.gc"
;; "levels/common/enemy/hover/hover-enemy-battle.gc"
;; "levels/common/enemy/hover/hover-formation.gc"
;; "levels/common/enemy/hover/hover-nav-edit.gc"
;; "levels/common/enemy/hover/wasp-part.gc"
;; "levels/common/enemy/hover/wasp.gc"
;; "levels/common/enemy/hover/crimson-guard-hover.gc"
;; "levels/common/enemy/hover/flamer.gc"
;; "levels/common/ai/ai-task-h.gc"
;; "levels/common/ai/bot-h.gc"
;; "levels/common/ai/bot.gc"
;; "levels/common/ai/bot-states.gc"
;; "levels/undefined/hal-h.gc"
;; "levels/undefined/hal-task.gc"
;; "levels/undefined/hal.gc"
;; "levels/undefined/ruf-h.gc"
;; "levels/undefined/ruf-task.gc"
;; "levels/undefined/ruf.gc"
;; "levels/undefined/ruf-states.gc"
;; "levels/sewer/escort/jinx-h.gc"
;; "levels/sewer/escort/jinx-shot.gc"
;; "levels/sewer/escort/jinx-bomb.gc"
;; "levels/sewer/escort/jinx.gc"
;; "levels/sewer/escort/jinx-states.gc"
;; "levels/sewer/escort/mog-h.gc"
;; "levels/sewer/escort/mog.gc"
;; "levels/sewer/escort/grim-h.gc"
;; "levels/sewer/escort/grim.gc"
"characters/sig/sig-h.gc"
"characters/sig/sig-task.gc"
"characters/sig/sig-shot.gc"
"characters/sig/sig-plasma.gc"
"characters/sig/sig.gc"
"characters/sig/sig-states.gc"
;; "engine/target/mech_suit/mech-part.gc"
;; "engine/target/mech_suit/mech.gc"
;; "engine/target/mech_suit/target-mech.gc"
;; "engine/target/mech_suit/mech-states.gc"
;; "engine/target/mech_suit/grunt-mech.gc"
"levels/underport/under-shoot-block.gc"
"levels/underport/underb-master.gc"
"levels/underport/under-obs.gc"
@ -4671,23 +4560,16 @@
"levels/underport/sig5-course.gc"
"levels/underport/under-scenes.gc"
"levels/underport/sig-recorder.gc"
;; "levels/common/enemy/metalhead_slinger/grenadier.gc"
)
(copy-textures 3051 3053 3054 3413)
(copy-gos
;; "jak-mech+0-ag"
;; "grunt-mech-anims+0-ag"
"sig-ag"
;; "grunt-ag"
"under-mine-ag"
"jellyfish-ag"
;; "mech-ag"
"under-shoot-block-ag"
"under-break-floor-ag"
"centipede-ag"
;; "com-airlock-inner-ag"
"under-int-door-ag"
"under-break-wall-b-ag"
"under-break-wall-ag"
@ -4700,7 +4582,6 @@
"under-plat-shoot-ag"
"under-plat-wall-ag"
"under-plat-long-ag"
;; "hip-door-a-ag"
"under-warp-ag"
"under-laser-ag"
"under-laser-shadow-ag"

2798
goal_src/jak2/levels/atoll/atoll-scenes.gc
View File

File diff suppressed because it is too large Load Diff

4
test/decompiler/reference/jak2/engine/scene/scene-h_REF.gc generated vendored
View File

@ -211,8 +211,8 @@
obj
)
;; definition for symbol *scene-player*, type scene-player
(define *scene-player* (the-as scene-player #f))
;; definition for symbol *scene-player*, type (pointer scene-player)
(define *scene-player* (the-as (pointer scene-player) #f))
;; failed to figure out what this is:
0

4
test/decompiler/reference/jak2/engine/scene/scene_REF.gc generated vendored
View File

@ -375,7 +375,7 @@
;; definition for method 10 of type scene-player
(defmethod deactivate scene-player ((obj scene-player))
(set! *scene-player* #f)
(set! *scene-player* (the-as (pointer scene-player) #f))
(kill-persister *setting-control* (the-as engine-pers 'blackout) 'bg-a-force)
((method-of-type process-drawable deactivate) obj)
(none)
@ -1855,7 +1855,7 @@
)
)
)
(set! *scene-player* (the-as scene-player (process->ppointer self)))
(set! *scene-player* (the-as (pointer scene-player) (process->ppointer self)))
(set! *display-entity-errors* #f)
(set-setting! 'speech-control #f 0 0)
(set-setting! 'allow-progress #f 0 0)

2859
test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc generated vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1
test/offline/config/jak2/config.jsonc
View File

@ -4,6 +4,7 @@
"CGO/ENGINE.CGO",
"CGO/GAME.CGO",
"CGO/KERNEL.CGO",
"DGO/ATE.DGO",
"DGO/ATO.DGO",
"DGO/CAB.DGO",
"DGO/CAP.DGO",