From f50c0e56e91eda2c592d92b1f193c2db17fe4bba Mon Sep 17 00:00:00 2001 From: water111 <48171810+water111@users.noreply.github.com> Date: Sat, 7 Jan 2023 10:32:03 -0500 Subject: [PATCH] [jak2] use art constants (#2097) --- decompiler/config/jak2/all-types.gc | 3 +- decompiler/config/jak2/type_casts.jsonc | 4 +- .../jak2/engine/common_objs/collectables.gc | 25 +- goal_src/jak2/engine/common_objs/conveyor.gc | 44 +- goal_src/jak2/engine/common_objs/crates.gc | 4 +- .../jak2/engine/common_objs/water-anim.gc | 118 +- goal_src/jak2/engine/data/art-elts.gc | 3105 +++++++++++++++++ goal_src/jak2/engine/target/mech_suit/mech.gc | 10 +- .../engine/target/mech_suit/target-mech.gc | 37 +- goal_src/jak2/engine/target/sidekick.gc | 14 +- goal_src/jak2/engine/target/target-h.gc | 3 +- goal_src/jak2/engine/target/target-util.gc | 39 +- .../engine/ui/progress/progress-static.gc | 95 +- goal_src/jak2/levels/atoll/atoll-scenes.gc | 15 +- .../jak2/levels/castle/boss/castle-scenes.gc | 6 +- .../jak2/levels/city/kid_escort/crocesc-h.gc | 6 +- .../jak2/levels/city/kid_escort/kidesc-h.gc | 6 +- .../jak2/levels/city/market/ctymark-obs.gc | 24 +- .../levels/city/onin_tent/onintent-scenes.gc | 4 +- goal_src/jak2/levels/common/airlock.gc | 69 +- .../levels/common/cty-guard-turret-button.gc | 13 +- .../jak2/levels/common/enemy/fodder/fodder.gc | 26 +- .../jak2/levels/common/guard-projectile.gc | 4 +- goal_src/jak2/levels/common/scene-actor.gc | 146 +- goal_src/jak2/levels/common/warp-gate.gc | 8 +- .../jak2/levels/consite/consite-scenes.gc | 28 +- goal_src/jak2/levels/dig/dig-scenes.gc | 28 +- .../levels/drill_platform/drill-scenes.gc | 16 +- .../jak2/levels/fortress/exit/forexita-obs.gc | 93 +- goal_src/jak2/levels/fortress/fortress-obs.gc | 9 +- goal_src/jak2/levels/gungame/gun-dummy.gc | 100 +- goal_src/jak2/levels/hideout/hideout-obs.gc | 15 +- .../jak2/levels/hideout/hideout-scenes.gc | 8 +- goal_src/jak2/levels/hiphog/hiphog-scenes.gc | 14 +- goal_src/jak2/levels/intro/intro-scenes.gc | 56 +- .../jak2/levels/nest/boss/nestb-scenes.gc | 12 +- goal_src/jak2/levels/nest/nest-scenes.gc | 16 +- .../levels/power_station/vinroom-scenes.gc | 14 +- goal_src/jak2/levels/ruins/ruins-scenes.gc | 28 +- .../jak2/levels/stadium/stadium-scenes.gc | 16 +- .../levels/temple/canyon/canyon-scenes.gc | 20 +- .../jak2/levels/temple/mountain-scenes.gc | 8 +- .../jak2/levels/underport/under-scenes.gc | 8 +- scripts/combine_all_imports.py | 15 + .../jak2/engine/common_objs/basebutton_REF.gc | 5 +- .../engine/common_objs/blocking-plane_REF.gc | 4 +- .../engine/common_objs/collectables_REF.gc | 25 +- .../jak2/engine/common_objs/conveyor_REF.gc | 9 +- .../jak2/engine/common_objs/crates_REF.gc | 4 +- .../engine/common_objs/generic-obs_REF.gc | 4 +- .../jak2/engine/common_objs/voicebox_REF.gc | 4 +- .../jak2/engine/common_objs/water-anim_REF.gc | 142 +- .../jak2/engine/game/task/task-arrow_REF.gc | 4 +- .../jak2/engine/target/board/board-h_REF.gc | 6 +- .../jak2/engine/target/gun/gun-h_REF.gc | 26 +- .../engine/target/mech_suit/mech-h_REF.gc | 10 +- .../jak2/engine/target/mech_suit/mech_REF.gc | 13 +- .../target/mech_suit/target-mech_REF.gc | 1793 ++++++++++ .../jak2/engine/target/sidekick_REF.gc | 12 +- .../jak2/engine/target/target-util_REF.gc | 24 +- .../engine/ui/progress/progress-static_REF.gc | 10 +- .../jak2/levels/atoll/atoll-scenes_REF.gc | 15 +- .../levels/castle/boss/castle-scenes_REF.gc | 6 +- .../levels/city/common/ctywide-scenes_REF.gc | 4 +- .../levels/city/kid_escort/crocesc-h_REF.gc | 6 +- .../levels/city/kid_escort/kidesc-h_REF.gc | 6 +- .../levels/city/market/ctymark-obs_REF.gc | 24 +- .../collection_task/collection-task_REF.gc | 10 +- .../city/onin_tent/onintent-scenes_REF.gc | 4 +- .../jak2/levels/common/airlock_REF.gc | 30 +- .../common/cty-guard-turret-button_REF.gc | 13 +- .../levels/common/enemy/fodder/fodder_REF.gc | 26 +- .../jak2/levels/common/flitter_REF.gc | 28 +- .../reference/jak2/levels/common/grunt_REF.gc | 53 +- .../levels/common/guard-projectile_REF.gc | 4 +- .../jak2/levels/common/scene-actor_REF.gc | 242 +- .../jak2/levels/common/warp-gate_REF.gc | 8 +- .../jak2/levels/consite/consite-scenes_REF.gc | 28 +- .../jak2/levels/dig/dig-scenes_REF.gc | 28 +- .../levels/drill_platform/drill-scenes_REF.gc | 16 +- .../jak2/levels/forest/pegasus_REF.gc | 92 +- .../levels/fortress/exit/forexita-obs_REF.gc | 4 +- .../jak2/levels/fortress/fortress-obs_REF.gc | 9 +- .../levels/fortress/prison/prison-obs_REF.gc | 16 +- .../jak2/levels/gungame/gun-dummy_REF.gc | 108 +- .../jak2/levels/gungame/gungame-obs_REF.gc | 5 +- .../jak2/levels/hideout/hideout-obs_REF.gc | 14 +- .../jak2/levels/hideout/hideout-scenes_REF.gc | 8 +- .../jak2/levels/hiphog/hiphog-scenes_REF.gc | 34 +- .../jak2/levels/intro/intro-scenes_REF.gc | 64 +- .../jak2/levels/mars_tomb/tomb-scenes_REF.gc | 8 +- .../jak2/levels/nest/boss/nestb-scenes_REF.gc | 12 +- .../jak2/levels/nest/nest-scenes_REF.gc | 16 +- .../levels/palace/roof/palboss-scenes_REF.gc | 28 +- .../power_station/vinroom-scenes_REF.gc | 14 +- .../jak2/levels/ruins/ruins-scenes_REF.gc | 56 +- .../jak2/levels/sewer/escort/jinx-h_REF.gc | 6 +- .../levels/stadium/jetboard/skatea-obs_REF.gc | 17 +- .../jak2/levels/stadium/stadium-scenes_REF.gc | 24 +- .../levels/temple/canyon/canyon-scenes_REF.gc | 20 +- .../jak2/levels/temple/mountain-scenes_REF.gc | 24 +- .../jak2/levels/underport/under-scenes_REF.gc | 24 +- test/offline/framework/execution.cpp | 3 + test/offline/framework/orchestration.cpp | 16 +- 104 files changed, 6185 insertions(+), 1415 deletions(-) create mode 100644 scripts/combine_all_imports.py create mode 100644 test/decompiler/reference/jak2/engine/target/mech_suit/target-mech_REF.gc diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 2f234cb6ce..56fe8ba6e4 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -18086,7 +18086,8 @@ (arm-ik joint-mod-ik 2 :offset-assert 248) (leg-ik joint-mod-ik 2 :offset-assert 256) (foot joint-mod 2 :offset-assert 264) - (init-time time-frame :offset-assert 272) + (mech-ik joint-mod-ik 2 :offset-assert 272) + (init-time time-frame :offset 272) (teleport-time time-frame :offset-assert 280) (state-hook-time time-frame :offset-assert 288) ;; time-frame (state-hook (function none :behavior target) :offset-assert 296) ;; guessed by decompiler diff --git a/decompiler/config/jak2/type_casts.jsonc b/decompiler/config/jak2/type_casts.jsonc index 318f009fd2..1896b26117 100644 --- a/decompiler/config/jak2/type_casts.jsonc +++ b/decompiler/config/jak2/type_casts.jsonc @@ -5692,9 +5692,7 @@ [14, "gp", "target"] ], "(anon-function 9 target-mech)": [ - [[3, 33], "v1", "target"], - [43, "a0", "joint-mod-ik"], - [42, "v1", "(array joint-mod-ik)"] + [2, "a0", "(pointer target)"] ], "target-mech-handler": [ [91, "a0", "process"], diff --git a/goal_src/jak2/engine/common_objs/collectables.gc b/goal_src/jak2/engine/common_objs/collectables.gc index fd8df84275..63a256c288 100644 --- a/goal_src/jak2/engine/common_objs/collectables.gc +++ b/goal_src/jak2/engine/common_objs/collectables.gc @@ -24,34 +24,37 @@ ;; DECOMP BEGINS -(defskelgroup skel-health collectables 3 5 - ((4 (meters 999999))) +(defskelgroup skel-health collectables collectables-health-lod0-jg collectables-health-idle-ja + ((collectables-health-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :texture-level 6 ) -(defskelgroup skel-gem collectables 6 9 - ((7 (meters 20)) (8 (meters 999999))) +(defskelgroup skel-gem collectables collectables-gem-lod0-jg collectables-gem-idle-ja + ((collectables-gem-lod0-mg (meters 20)) (collectables-gem-lod1-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.6) :texture-level 6 ) -(defskelgroup skel-gun-yellow-up yellow-barrel 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-yellow-up yellow-barrel yellow-barrel-lod0-jg yellow-barrel-idle-ja + ((yellow-barrel-lod0-mg (meters 999999))) :bounds (static-spherem 0 1 0 1.6) :origin-joint-index 3 ) -(defskelgroup skel-gun-dark-up dark-barrel 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-dark-up dark-barrel dark-barrel-lod0-jg dark-barrel-idle-ja + ((dark-barrel-lod0-mg (meters 999999))) :bounds (static-spherem 0 1 0 1.6) :origin-joint-index 3 ) -(defskelgroup skel-skill collectables 17 22 - ((18 (meters 20)) (19 (meters 40)) (20 (meters 999999))) +(defskelgroup skel-skill collectables collectables-skill-lod0-jg collectables-skill-idle-ja + ((collectables-skill-lod0-mg (meters 20)) + (collectables-skill-lod1-mg (meters 40)) + (collectables-skill-lod2-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 0.6) - :shadow 21 + :shadow collectables-skill-shadow-mg :texture-level 6 :shadow-joint-index 0 ) diff --git a/goal_src/jak2/engine/common_objs/conveyor.gc b/goal_src/jak2/engine/common_objs/conveyor.gc index c2cf97fe6c..1517096b48 100644 --- a/goal_src/jak2/engine/common_objs/conveyor.gc +++ b/goal_src/jak2/engine/common_objs/conveyor.gc @@ -406,22 +406,10 @@ ) -(let ((a0-19 (new 'static 'skeleton-group - :name "skel-strip-conveyor" - :extra #f - :info #f - :art-group-name "strip-conveyor" - :bounds (new 'static 'vector :w 147456.0) - :version #x7 - ) - ) - ) - (set! (-> a0-19 jgeo) 0) - (set! (-> a0-19 janim) 2) - (set! (-> a0-19 mgeo 0) 1) - (set! (-> a0-19 lod-dist 0) 4095996000.0) - (add-to-loading-level a0-19) - ) +(defskelgroup skel-strip-conveyor strip-conveyor strip-conveyor-lod0-jg strip-conveyor-idle-ja + ((strip-conveyor-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 36) + ) (defmethod get-art-group strip-conveyor ((obj strip-conveyor)) "@returns The respective [[art-group]] for the [[conveyor]]" @@ -437,24 +425,12 @@ ) -(let ((a0-23 (new 'static 'skeleton-group - :name "skel-lgconveyor" - :extra #f - :info #f - :art-group-name "lgconveyor" - :bounds (new 'static 'vector :y 12288.0 :w 61440.0) - :longest-edge (meters 24.7389) - :version #x7 - :origin-joint-index 3 - ) - ) - ) - (set! (-> a0-23 jgeo) 0) - (set! (-> a0-23 janim) 3) - (set! (-> a0-23 mgeo 0) 1) - (set! (-> a0-23 lod-dist 0) 4095996000.0) - (add-to-loading-level a0-23) - ) +(defskelgroup skel-lgconveyor lgconveyor lgconveyor-lod0-jg lgconveyor-idle-ja + ((lgconveyor-lod0-mg (meters 999999))) + :bounds (static-spherem 0 3 0 15) + :longest-edge (meters 24.7389) + :origin-joint-index 3 + ) (defmethod get-art-group lgconveyor ((obj lgconveyor)) "@returns The respective [[art-group]] for the [[conveyor]]" diff --git a/goal_src/jak2/engine/common_objs/crates.gc b/goal_src/jak2/engine/common_objs/crates.gc index 5284e45096..d81e2fa4ee 100644 --- a/goal_src/jak2/engine/common_objs/crates.gc +++ b/goal_src/jak2/engine/common_objs/crates.gc @@ -10,8 +10,8 @@ ;; DECOMP BEGINS -(defskelgroup skel-crate-krimson crate 0 3 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-crate-krimson crate crate-krimson-lod0-jg crate-idle-ja + ((crate-krimson-lod0-mg (meters 20)) (crate-krimson-lod1-mg (meters 999999))) :bounds (static-spherem 0 1 0 1.6) :texture-level 6 ) diff --git a/goal_src/jak2/engine/common_objs/water-anim.gc b/goal_src/jak2/engine/common_objs/water-anim.gc index 87f2f59354..eef96ea504 100644 --- a/goal_src/jak2/engine/common_objs/water-anim.gc +++ b/goal_src/jak2/engine/common_objs/water-anim.gc @@ -48,43 +48,49 @@ ((the-as (function water-anim int water-anim) (find-parent-method water-anim 7)) obj arg0) ) -(defskelgroup skel-water-anim-nest-dark-eco-largepool water-anim-nest-dark-eco 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-largepool water-anim-nest-dark-eco water-anim-nest-dark-eco-largepool-lod0-jg -1 + ((water-anim-nest-dark-eco-largepool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 50) ) -(defskelgroup skel-water-anim-nest-dark-eco-smlupperpool water-anim-nest-dark-eco 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-smlupperpool water-anim-nest-dark-eco water-anim-nest-dark-eco-smlupperpool-lod0-jg -1 + ((water-anim-nest-dark-eco-smlupperpool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) ) -(defskelgroup skel-water-anim-nest-dark-eco-middlepool water-anim-nest-dark-eco 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-middlepool water-anim-nest-dark-eco water-anim-nest-dark-eco-middlepool-lod0-jg -1 + ((water-anim-nest-dark-eco-middlepool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 32) ) -(defskelgroup skel-water-anim-nest-dark-eco-botpool water-anim-nest-dark-eco 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-botpool water-anim-nest-dark-eco water-anim-nest-dark-eco-botpool-lod0-jg -1 + ((water-anim-nest-dark-eco-botpool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 35) ) -(defskelgroup skel-water-anim-strip-dark-eco-near-lift water-anim-strip-dark-eco 0 -1 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-near-lift water-anim-strip-dark-eco water-anim-strip-dark-eco-near-lift-lod0-jg -1 + ((water-anim-strip-dark-eco-near-lift-lod0-mg (meters 20)) + (water-anim-strip-dark-eco-near-lift-lod1-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 29) ) -(defskelgroup skel-water-anim-strip-dark-eco-near-crane water-anim-strip-dark-eco 3 -1 - ((4 (meters 20)) (5 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-near-crane water-anim-strip-dark-eco water-anim-strip-dark-eco-near-crane-lod0-jg -1 + ((water-anim-strip-dark-eco-near-crane-lod0-mg (meters 20)) + (water-anim-strip-dark-eco-near-crane-lod1-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 35) ) -(defskelgroup skel-water-anim-strip-dark-eco-with-eggs water-anim-strip-dark-eco 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-with-eggs water-anim-strip-dark-eco water-anim-strip-dark-eco-with-eggs-lod0-jg -1 + ((water-anim-strip-dark-eco-with-eggs-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 40) ) -(defskelgroup skel-water-anim-strip-dark-eco-under-bridge water-anim-strip-dark-eco 9 -1 - ((10 (meters 20)) (11 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-under-bridge water-anim-strip-dark-eco water-anim-strip-dark-eco-under-bridge-lod0-jg -1 + ((water-anim-strip-dark-eco-under-bridge-lod0-mg (meters 20)) + (water-anim-strip-dark-eco-under-bridge-lod1-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 32) ) @@ -108,33 +114,33 @@ :bounds (static-spherem 0 0 0 23) ) -(defskelgroup skel-water-anim-mountain-fall-hi water-anim-mountain 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-mountain-fall-hi water-anim-mountain water-anim-mountain-fall-hi-lod0-jg -1 + ((water-anim-mountain-fall-hi-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 42) ) -(defskelgroup skel-water-anim-mountain-fall-med water-anim-mountain 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-mountain-fall-med water-anim-mountain water-anim-mountain-fall-med-lod0-jg -1 + ((water-anim-mountain-fall-med-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) ) -(defskelgroup skel-water-anim-mountain-fall-low water-anim-mountain 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-mountain-fall-low water-anim-mountain water-anim-mountain-fall-low-lod0-jg -1 + ((water-anim-mountain-fall-low-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 25) ) -(defskelgroup skel-water-anim-stadium-middle-pool water-anim-stadium 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-stadium-middle-pool water-anim-stadium water-anim-stadium-middle-pool-lod0-jg -1 + ((water-anim-stadium-middle-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 24) ) -(defskelgroup skel-water-anim-stadium-top-fountain water-anim-stadium 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-stadium-top-fountain water-anim-stadium water-anim-stadium-top-fountain-lod0-jg -1 + ((water-anim-stadium-top-fountain-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 9.5) ) -(defskelgroup skel-water-anim-stadium-floor-pool water-anim-stadium 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-stadium-floor-pool water-anim-stadium water-anim-stadium-floor-pool-lod0-jg -1 + ((water-anim-stadium-floor-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22) ) @@ -148,73 +154,73 @@ :bounds (static-spherem 0 0 0 80) ) -(defskelgroup skel-water-anim-fortress-exitb-pool water-anim-fortress 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-fortress-exitb-pool water-anim-fortress water-anim-fortress-exitb-pool-lod0-jg -1 + ((water-anim-fortress-exitb-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 51) ) -(defskelgroup skel-water-anim-tomb-main-hall water-anim-tomb 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-tomb-main-hall water-anim-tomb water-anim-tomb-main-hall-lod0-jg -1 + ((water-anim-tomb-main-hall-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 150) ) -(defskelgroup skel-water-anim-tomb-tunnel-b water-anim-tomb 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-b water-anim-tomb water-anim-tomb-tunnel-b-lod0-jg -1 + ((water-anim-tomb-tunnel-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 36) ) -(defskelgroup skel-water-anim-tomb-tunnel-c water-anim-tomb 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-c water-anim-tomb water-anim-tomb-tunnel-c-lod0-jg -1 + ((water-anim-tomb-tunnel-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 23) ) -(defskelgroup skel-water-anim-tomb-tunnel-d water-anim-tomb 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-d water-anim-tomb water-anim-tomb-tunnel-d-lod0-jg -1 + ((water-anim-tomb-tunnel-d-lod0-mg (meters 999999))) :bounds (static-spherem 5 0 5 42) ) -(defskelgroup skel-water-anim-tomb-tunnel-e water-anim-tomb 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-e water-anim-tomb water-anim-tomb-tunnel-e-lod0-jg -1 + ((water-anim-tomb-tunnel-e-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 37) ) -(defskelgroup skel-water-anim-tomb-tunnel-f water-anim-tomb 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-f water-anim-tomb water-anim-tomb-tunnel-f-lod0-jg -1 + ((water-anim-tomb-tunnel-f-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 24) ) -(defskelgroup skel-water-anim-mincan-exitb-pool water-anim-mincan 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-mincan-exitb-pool water-anim-mincan water-anim-mincan-exitb-pool-lod0-jg -1 + ((water-anim-mincan-exitb-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 55) ) -(defskelgroup skel-water-anim-ctypal-lrgsqr-pool water-anim-ctypal 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-lrgsqr-pool water-anim-ctypal water-anim-ctypal-lrgsqr-pool-lod0-jg -1 + ((water-anim-ctypal-lrgsqr-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 24) ) -(defskelgroup skel-water-anim-ctypal-smlsqr-pool water-anim-ctypal 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-smlsqr-pool water-anim-ctypal water-anim-ctypal-smlsqr-pool-lod0-jg -1 + ((water-anim-ctypal-smlsqr-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 11.25) ) -(defskelgroup skel-water-anim-ctypal-lrgfloor-pool water-anim-ctypal 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-lrgfloor-pool water-anim-ctypal water-anim-ctypal-lrgfloor-pool-lod0-jg -1 + ((water-anim-ctypal-lrgfloor-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22) ) -(defskelgroup skel-water-anim-ctypal-smlground-pool water-anim-ctypal 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-smlground-pool water-anim-ctypal water-anim-ctypal-smlground-pool-lod0-jg -1 + ((water-anim-ctypal-smlground-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22.5) ) -(defskelgroup skel-water-anim-ctypal-middle-fountain water-anim-ctypal 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-middle-fountain water-anim-ctypal water-anim-ctypal-middle-fountain-lod0-jg -1 + ((water-anim-ctypal-middle-fountain-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22.5) ) -(defskelgroup skel-water-anim-ctypal-long-grnd-pool water-anim-ctypal 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-long-grnd-pool water-anim-ctypal water-anim-ctypal-long-grnd-pool-lod0-jg -1 + ((water-anim-ctypal-long-grnd-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 50) ) diff --git a/goal_src/jak2/engine/data/art-elts.gc b/goal_src/jak2/engine/data/art-elts.gc index e0205bf0c5..eba5c78cd9 100644 --- a/goal_src/jak2/engine/data/art-elts.gc +++ b/goal_src/jak2/engine/data/art-elts.gc @@ -1,9 +1,104 @@ +(def-art-elt hovering-mine-ag hovering-mine-idle-ja 3) +(def-art-elt hovering-mine-ag hovering-mine-shadow-mg 2) +(def-art-elt hovering-mine-ag hovering-mine-lod0-mg 1) +(def-art-elt hovering-mine-ag hovering-mine-lod0-jg 0) +(def-art-elt dig-bomb-crate-cylinder-ag dig-bomb-crate-cylinder-pulse-ja 3) +(def-art-elt dig-bomb-crate-cylinder-ag dig-bomb-crate-cylinder-idle-ja 2) +(def-art-elt dig-bomb-crate-cylinder-ag dig-bomb-crate-cylinder-lod0-mg 1) +(def-art-elt dig-bomb-crate-cylinder-ag dig-bomb-crate-cylinder-lod0-jg 0) +(def-art-elt curtainsaw-ag curtainsaw-idle-ja 3) +(def-art-elt curtainsaw-ag curtainsaw-lod1-mg 2) +(def-art-elt curtainsaw-ag curtainsaw-lod0-mg 1) +(def-art-elt curtainsaw-ag curtainsaw-lod0-jg 0) +(def-art-elt atollrotpipe-ag atollrotpipe-idle-ja 2) +(def-art-elt atollrotpipe-ag atollrotpipe-lod0-mg 1) +(def-art-elt atollrotpipe-ag atollrotpipe-lod0-jg 0) +(def-art-elt stdm-barrels-ag stdm-barrels-idle-ja 2) +(def-art-elt stdm-barrels-ag stdm-barrels-lod0-mg 1) +(def-art-elt stdm-barrels-ag stdm-barrels-lod0-jg 0) +(def-art-elt yellow-barrel-ag yellow-barrel-idle-ja 2) +(def-art-elt yellow-barrel-ag yellow-barrel-lod0-mg 1) +(def-art-elt yellow-barrel-ag yellow-barrel-lod0-jg 0) +(def-art-elt mtn-button-ag mtn-button-press-ja 3) +(def-art-elt mtn-button-ag mtn-button-open-ja 2) +(def-art-elt mtn-button-ag mtn-button-lod0-mg 1) +(def-art-elt mtn-button-ag mtn-button-lod0-jg 0) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-impact-ja 45) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-fly-ja 44) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-wings-open-ja 43) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-hit-major-ja 42) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-walk-to-stance-ja 41) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-run-back-ja 40) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-walk-back-ja 39) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-walk-right-ja 38) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-walk-left-ja 37) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hit-right-ja 36) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hit-left-ja 35) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hit-ja 34) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-shot-ja 33) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-pre-shot-ja 32) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-attack-tail-ja 31) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-recover-ja 30) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-hit-back-ja 29) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-right-end-ja 12) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-right-ja 11) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-right-start-ja 10) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-ja 9) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-breathe-ja 8) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-ja 7) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-run-ja 6) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-walk-ja 5) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-idle-alt-ja 4) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-idle-ja 3) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-shadow-mg 2) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-lod0-mg 1) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-lod0-jg 0) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-left-start-ja 13) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-left-ja 14) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-left-end-ja 15) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-right-end-alt-ja 16) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-turn-left-end-alt-ja 17) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-hit-ja 18) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-hit-left-ja 19) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-hit-right-ja 20) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-roar-ja 21) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-breathe-ja 22) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-pre-shot-ja 23) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-hang-shot-ja 24) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-hit-ja 25) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-hit-left-ja 26) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-hit-right-ja 27) +(def-art-elt metalkor-lowtorso-ag metalkor-lowtorso-collapse-hit-top-ja 28) +(def-art-elt skate-gate-ag skate-gate-idle-ja 2) +(def-art-elt skate-gate-ag skate-gate-lod0-mg 1) +(def-art-elt skate-gate-ag skate-gate-lod0-jg 0) (def-art-elt race-bike-a-ag race-bike-a-idle-ja 5) (def-art-elt race-bike-a-ag race-bike-a-shadow-mg 4) (def-art-elt race-bike-a-ag race-bike-a-lod2-mg 3) (def-art-elt race-bike-a-ag race-bike-a-lod1-mg 2) (def-art-elt race-bike-a-ag race-bike-a-lod0-mg 1) (def-art-elt race-bike-a-ag race-bike-a-lod0-jg 0) +(def-art-elt mtn-dice-ag mtn-dice-idle-ja 2) +(def-art-elt mtn-dice-ag mtn-dice-lod0-mg 1) +(def-art-elt mtn-dice-ag mtn-dice-lod0-jg 0) +(def-art-elt bombbot-ag bombbot-exploding-idle-ja 6) +(def-art-elt bombbot-ag bombbot-exploding-lod0-mg 5) +(def-art-elt bombbot-ag bombbot-exploding-lod0-jg 4) +(def-art-elt bombbot-ag bombbot-idle-ja 3) +(def-art-elt bombbot-ag bombbot-shadow-mg 2) +(def-art-elt bombbot-ag bombbot-lod0-mg 1) +(def-art-elt bombbot-ag bombbot-lod0-jg 0) +(def-art-elt dig-sinking-plat-ag dig-sinking-plat-shake-ja 3) +(def-art-elt dig-sinking-plat-ag dig-sinking-plat-idle-ja 2) +(def-art-elt dig-sinking-plat-ag dig-sinking-plat-lod0-mg 1) +(def-art-elt dig-sinking-plat-ag dig-sinking-plat-lod0-jg 0) +(def-art-elt fort-missile-ag fort-missile-idle-ja 2) +(def-art-elt fort-missile-ag fort-missile-lod0-mg 1) +(def-art-elt fort-missile-ag fort-missile-lod0-jg 0) +(def-art-elt liftcat-ag liftcat-idle-ja 3) +(def-art-elt liftcat-ag liftcat-lod1-mg 2) +(def-art-elt liftcat-ag liftcat-lod0-mg 1) +(def-art-elt liftcat-ag liftcat-lod0-jg 0) (def-art-elt jellyfish-ag jellyfish-grab-detach-ja 11) (def-art-elt jellyfish-ag jellyfish-grab-attach-loop-ja 10) (def-art-elt jellyfish-ag jellyfish-grab-attach-ja 9) @@ -16,24 +111,116 @@ (def-art-elt jellyfish-ag jellyfish-idle-ja 2) (def-art-elt jellyfish-ag jellyfish-lod0-mg 1) (def-art-elt jellyfish-ag jellyfish-lod0-jg 0) +(def-art-elt keira-ag keira-stad-sit-ja 10) +(def-art-elt keira-ag keira-idle-wiping-brow-ja 9) +(def-art-elt keira-ag keira-idle-transition-left-to-right-ja 8) +(def-art-elt keira-ag keira-idle-leaning-left-ja 7) +(def-art-elt keira-ag keira-idle-transition-right-to-left-ja 6) +(def-art-elt keira-ag keira-idle-leaning-right-ja 5) +(def-art-elt keira-ag keira-shadow-mg 4) +(def-art-elt keira-ag keira-lod2-mg 3) +(def-art-elt keira-ag keira-lod1-mg 2) +(def-art-elt keira-ag keira-lod0-mg 1) +(def-art-elt keira-ag keira-lod0-jg 0) +(def-art-elt garage-bikeb-ag garage-bikeb-idle-ja 2) +(def-art-elt garage-bikeb-ag garage-bikeb-lod0-mg 1) +(def-art-elt garage-bikeb-ag garage-bikeb-lod0-jg 0) +(def-art-elt under-break-bridge-ag under-break-bridge-broken-sig-dead-ja 3) +(def-art-elt under-break-bridge-ag under-break-bridge-idle-ja 2) +(def-art-elt under-break-bridge-ag under-break-bridge-lod0-mg 1) +(def-art-elt under-break-bridge-ag under-break-bridge-lod0-jg 0) +(def-art-elt rift-rider-break-b-ag rift-rider-break-b-idle-ja 2) +(def-art-elt rift-rider-break-b-ag rift-rider-break-b-lod0-mg 1) +(def-art-elt rift-rider-break-b-ag rift-rider-break-b-lod0-jg 0) +(def-art-elt ecowell-b-ag ecowell-b-idle-ja 2) +(def-art-elt ecowell-b-ag ecowell-b-lod0-mg 1) +(def-art-elt ecowell-b-ag ecowell-b-lod0-jg 0) +(def-art-elt mtn-plat-long-ag mtn-plat-long-idle-ja 3) +(def-art-elt mtn-plat-long-ag mtn-plat-long-lod1-mg 2) +(def-art-elt mtn-plat-long-ag mtn-plat-long-lod0-mg 1) +(def-art-elt mtn-plat-long-ag mtn-plat-long-lod0-jg 0) +(def-art-elt skatea-jump-pad-ag skatea-jump-pad-idle-ja 2) +(def-art-elt skatea-jump-pad-ag skatea-jump-pad-lod0-mg 1) +(def-art-elt skatea-jump-pad-ag skatea-jump-pad-lod0-jg 0) +(def-art-elt mtn-lens-floor-ag mtn-lens-floor-idle-ja 2) +(def-art-elt mtn-lens-floor-ag mtn-lens-floor-lod0-mg 1) +(def-art-elt mtn-lens-floor-ag mtn-lens-floor-lod0-jg 0) (def-art-elt bikec-ag bikec-idle-ja 5) (def-art-elt bikec-ag bikec-shadow-mg 4) (def-art-elt bikec-ag bikec-lod2-mg 3) (def-art-elt bikec-ag bikec-lod1-mg 2) (def-art-elt bikec-ag bikec-lod0-mg 1) (def-art-elt bikec-ag bikec-lod0-jg 0) +(def-art-elt flying-spider-ag flying-spider-turn-right-180-ja 20) +(def-art-elt flying-spider-ag flying-spider-turn-left-180-ja 19) +(def-art-elt flying-spider-ag flying-spider-death-standing-ja 18) +(def-art-elt flying-spider-ag flying-spider-shoot-stop-ja 17) +(def-art-elt flying-spider-ag flying-spider-shoot-left-ja 16) +(def-art-elt flying-spider-ag flying-spider-shoot-right-ja 15) +(def-art-elt flying-spider-ag flying-spider-shoot-start-ja 14) +(def-art-elt flying-spider-ag flying-spider-knocked-red0-land-ja 13) +(def-art-elt flying-spider-ag flying-spider-lod0-jg 0) +(def-art-elt flying-spider-ag flying-spider-lod0-mg 1) +(def-art-elt flying-spider-ag flying-spider-lod1-mg 2) +(def-art-elt flying-spider-ag flying-spider-lod2-mg 3) +(def-art-elt flying-spider-ag flying-spider-shadow-mg 4) +(def-art-elt flying-spider-ag flying-spider-idle0-ja 5) +(def-art-elt flying-spider-ag flying-spider-idle-flying-ja 6) +(def-art-elt flying-spider-ag flying-spider-drop-down-ja 7) +(def-art-elt flying-spider-ag flying-spider-drop-down-land-ja 8) +(def-art-elt flying-spider-ag flying-spider-walk0-ja 9) +(def-art-elt flying-spider-ag flying-spider-knocked-blue0-ja 10) +(def-art-elt flying-spider-ag flying-spider-attack-close0-ja 11) +(def-art-elt flying-spider-ag flying-spider-knocked-red0-ja 12) +(def-art-elt pal-cable-nut-ag pal-cable-nut-idle-ja 3) +(def-art-elt pal-cable-nut-ag pal-cable-nut-lod1-mg 2) +(def-art-elt pal-cable-nut-ag pal-cable-nut-lod0-mg 1) +(def-art-elt pal-cable-nut-ag pal-cable-nut-lod0-jg 0) +(def-art-elt hip-mole-ag hip-mole-down-ja 5) +(def-art-elt hip-mole-ag hip-mole-loop-ja 4) +(def-art-elt hip-mole-ag hip-mole-up-ja 3) +(def-art-elt hip-mole-ag hip-mole-idle-ja 2) +(def-art-elt hip-mole-ag hip-mole-lod0-mg 1) +(def-art-elt hip-mole-ag hip-mole-lod0-jg 0) +(def-art-elt hide-faucet-ag hide-faucet-idle-ja 2) +(def-art-elt hide-faucet-ag hide-faucet-lod0-mg 1) +(def-art-elt hide-faucet-ag hide-faucet-lod0-jg 0) +(def-art-elt crocadog-highres-ag crocadog-highres-idle-stand-ja 4) +(def-art-elt crocadog-highres-ag crocadog-highres-idle-ja 3) +(def-art-elt crocadog-highres-ag crocadog-highres-shadow-mg 2) +(def-art-elt crocadog-highres-ag crocadog-highres-lod0-mg 1) +(def-art-elt crocadog-highres-ag crocadog-highres-lod0-jg 0) (def-art-elt bikea-ag bikea-idle-ja 5) (def-art-elt bikea-ag bikea-shadow-mg 4) (def-art-elt bikea-ag bikea-lod2-mg 3) (def-art-elt bikea-ag bikea-lod1-mg 2) (def-art-elt bikea-ag bikea-lod0-mg 1) (def-art-elt bikea-ag bikea-lod0-jg 0) +(def-art-elt cas-rot-blade-ag cas-rot-blade-idle-ja 3) +(def-art-elt cas-rot-blade-ag cas-rot-blade-shadow-mg 2) +(def-art-elt cas-rot-blade-ag cas-rot-blade-lod0-mg 1) +(def-art-elt cas-rot-blade-ag cas-rot-blade-lod0-jg 0) +(def-art-elt ctypal-broke-wall-ag ctypal-broke-wall-idle-ja 2) +(def-art-elt ctypal-broke-wall-ag ctypal-broke-wall-lod0-mg 1) +(def-art-elt ctypal-broke-wall-ag ctypal-broke-wall-lod0-jg 0) +(def-art-elt baron-ag baron-idle-ja 2) +(def-art-elt baron-ag baron-lod0-mg 1) +(def-art-elt baron-ag baron-lod0-jg 0) (def-art-elt under-break-wall-ag under-break-wall-idle-ja 2) (def-art-elt under-break-wall-ag under-break-wall-lod0-mg 1) (def-art-elt under-break-wall-ag under-break-wall-lod0-jg 0) +(def-art-elt cpad-elevator-ag cpad-elevator-idle-ja 2) +(def-art-elt cpad-elevator-ag cpad-elevator-lod0-mg 1) +(def-art-elt cpad-elevator-ag cpad-elevator-lod0-jg 0) +(def-art-elt hip-trophy-i-ag hip-trophy-i-idle-ja 2) +(def-art-elt hip-trophy-i-ag hip-trophy-i-lod0-mg 1) +(def-art-elt hip-trophy-i-ag hip-trophy-i-lod0-jg 0) (def-art-elt market-basket-b-ag market-basket-b-idle-ja 2) (def-art-elt market-basket-b-ag market-basket-b-lod0-mg 1) (def-art-elt market-basket-b-ag market-basket-b-lod0-jg 0) +(def-art-elt plasmitebox-ag plasmitebox-idle-ja 2) +(def-art-elt plasmitebox-ag plasmitebox-lod0-mg 1) +(def-art-elt plasmitebox-ag plasmitebox-lod0-jg 0) (def-art-elt roboguard-ag roboguard-explode-idle-ja 31) (def-art-elt roboguard-ag roboguard-explode-lod0-mg 30) (def-art-elt roboguard-ag roboguard-explode-lod0-jg 29) @@ -73,6 +260,9 @@ (def-art-elt cty-guard-turret-ag cty-guard-turret-idle-ja 2) (def-art-elt cty-guard-turret-ag cty-guard-turret-lod0-mg 1) (def-art-elt cty-guard-turret-ag cty-guard-turret-lod0-jg 0) +(def-art-elt dark-barrel-ag dark-barrel-idle-ja 2) +(def-art-elt dark-barrel-ag dark-barrel-lod0-mg 1) +(def-art-elt dark-barrel-ag dark-barrel-lod0-jg 0) (def-art-elt warp-gate-b-ag warp-gate-b-idle-ja 2) (def-art-elt warp-gate-b-ag warp-gate-b-lod0-mg 1) (def-art-elt warp-gate-b-ag warp-gate-b-lod0-jg 0) @@ -89,44 +279,413 @@ (def-art-elt drill-metalhead-eggs-a-ag drill-metalhead-eggs-a-idle-ja 2) (def-art-elt drill-metalhead-eggs-a-ag drill-metalhead-eggs-a-lod0-mg 1) (def-art-elt drill-metalhead-eggs-a-ag drill-metalhead-eggs-a-lod0-jg 0) +(def-art-elt drill-plat-ag drill-plat-idle-ja 3) +(def-art-elt drill-plat-ag drill-plat-lod1-mg 2) +(def-art-elt drill-plat-ag drill-plat-lod0-mg 1) +(def-art-elt drill-plat-ag drill-plat-lod0-jg 0) +(def-art-elt tess-lwhack+0-ag tess-highres-idle-whack-ja 0) +(def-art-elt tomb-bounce-web-ag tomb-bounce-web-idle-ja 2) +(def-art-elt tomb-bounce-web-ag tomb-bounce-web-lod0-mg 1) +(def-art-elt tomb-bounce-web-ag tomb-bounce-web-lod0-jg 0) +(def-art-elt ctyport-spy-ag ctyport-spy-idle-ja 3) +(def-art-elt ctyport-spy-ag ctyport-spy-lod1-mg 2) +(def-art-elt ctyport-spy-ag ctyport-spy-lod0-mg 1) +(def-art-elt ctyport-spy-ag ctyport-spy-lod0-jg 0) +(def-art-elt sew-tri-blade-ag sew-tri-blade-idle-ja 3) +(def-art-elt sew-tri-blade-ag sew-tri-blade-lod1-mg 2) +(def-art-elt sew-tri-blade-ag sew-tri-blade-lod0-mg 1) +(def-art-elt sew-tri-blade-ag sew-tri-blade-lod0-jg 0) +(def-art-elt gun-cit-a-ag gun-cit-a-explode-idle-ja 5) +(def-art-elt gun-cit-a-ag gun-cit-a-explode-lod0-mg 4) +(def-art-elt gun-cit-a-ag gun-cit-a-explode-lod0-jg 3) +(def-art-elt gun-cit-a-ag gun-cit-a-idle-ja 2) +(def-art-elt gun-cit-a-ag gun-cit-a-lod0-mg 1) +(def-art-elt gun-cit-a-ag gun-cit-a-lod0-jg 0) +(def-art-elt farm-chilirots-ag farm-chilirots-explode-idle-ja 5) +(def-art-elt farm-chilirots-ag farm-chilirots-explode-lod0-mg 4) +(def-art-elt farm-chilirots-ag farm-chilirots-explode-lod0-jg 3) +(def-art-elt farm-chilirots-ag farm-chilirots-idle-ja 2) +(def-art-elt farm-chilirots-ag farm-chilirots-lod0-mg 1) +(def-art-elt farm-chilirots-ag farm-chilirots-lod0-jg 0) +(def-art-elt dig-digger-ag dig-digger-explode-b-lod0-mg 11) +(def-art-elt dig-digger-ag dig-digger-explode-b-lod0-jg 10) +(def-art-elt dig-digger-ag dig-digger-explode-a-lod0-mg 8) +(def-art-elt dig-digger-ag dig-digger-explode-a-lod0-jg 7) +(def-art-elt dig-digger-ag dig-digger-explode-lod0-mg 5) +(def-art-elt dig-digger-ag dig-digger-explode-lod0-jg 4) +(def-art-elt dig-digger-ag dig-digger-idle-ja 2) +(def-art-elt dig-digger-ag dig-digger-explode-c-lod0-mg 14) +(def-art-elt dig-digger-ag dig-digger-lod0-mg 1) +(def-art-elt dig-digger-ag dig-digger-explode-c-lod0-jg 13) +(def-art-elt dig-digger-ag dig-digger-lod0-jg 0) +(def-art-elt door-ctyinda-ag vin-door-ctyinda-idle-ja 2) +(def-art-elt door-ctyinda-ag vin-door-ctyinda-lod0-mg 1) +(def-art-elt door-ctyinda-ag vin-door-ctyinda-lod0-jg 0) +(def-art-elt pal-electric-fan-ag pal-electric-fan-idle-ja 3) +(def-art-elt pal-electric-fan-ag pal-electric-fan-lod1-mg 2) +(def-art-elt pal-electric-fan-ag pal-electric-fan-lod0-mg 1) +(def-art-elt pal-electric-fan-ag pal-electric-fan-lod0-jg 0) +(def-art-elt cas-chain-plat-ag cas-chain-plat-drop-ja 3) +(def-art-elt cas-chain-plat-ag cas-chain-plat-idle-ja 2) +(def-art-elt cas-chain-plat-ag cas-chain-plat-lod0-mg 1) +(def-art-elt cas-chain-plat-ag cas-chain-plat-lod0-jg 0) +(def-art-elt mtn-plat-buried-rocks-ag mtn-plat-buried-rocks-idle-ja 3) +(def-art-elt mtn-plat-buried-rocks-ag mtn-plat-buried-rocks-lod1-mg 2) +(def-art-elt mtn-plat-buried-rocks-ag mtn-plat-buried-rocks-lod0-mg 1) +(def-art-elt mtn-plat-buried-rocks-ag mtn-plat-buried-rocks-lod0-jg 0) (def-art-elt under-lift-ag under-lift-idle-ja 3) (def-art-elt under-lift-ag under-lift-lod1-mg 2) (def-art-elt under-lift-ag under-lift-lod0-mg 1) (def-art-elt under-lift-ag under-lift-lod0-jg 0) +(def-art-elt skate-training-ramp-ag skate-training-ramp-idle-ja 2) +(def-art-elt skate-training-ramp-ag skate-training-ramp-lod0-mg 1) +(def-art-elt skate-training-ramp-ag skate-training-ramp-lod0-jg 0) +(def-art-elt atoll-tank-ag atoll-tank-c-debris-ja 10) +(def-art-elt atoll-tank-ag atoll-tank-c-lod0-mg 9) +(def-art-elt atoll-tank-ag atoll-tank-c-lod0-jg 8) +(def-art-elt atoll-tank-ag atoll-tank-b-debris-ja 6) +(def-art-elt atoll-tank-ag atoll-tank-b-lod0-mg 5) +(def-art-elt atoll-tank-ag atoll-tank-b-lod0-jg 4) +(def-art-elt atoll-tank-ag atoll-tank-a-debris-ja 2) +(def-art-elt atoll-tank-ag atoll-tank-a-lod0-mg 1) +(def-art-elt atoll-tank-ag atoll-tank-a-lod0-jg 0) +(def-art-elt tomb-boss-pillar-ag tomb-boss-pillar-end-ja 5) +(def-art-elt tomb-boss-pillar-ag tomb-boss-pillar-break-ja 4) +(def-art-elt tomb-boss-pillar-ag tomb-boss-pillar-idle-ja 3) +(def-art-elt tomb-boss-pillar-ag tomb-boss-pillar-lod1-mg 2) +(def-art-elt tomb-boss-pillar-ag tomb-boss-pillar-lod0-mg 1) +(def-art-elt tomb-boss-pillar-ag tomb-boss-pillar-lod0-jg 0) +(def-art-elt shield-gunner-ag shield-gunner-idle-ja 2) +(def-art-elt shield-gunner-ag shield-gunner-lod0-mg 1) +(def-art-elt shield-gunner-ag shield-gunner-lod0-jg 0) +(def-art-elt tomb-simon-button-ag tomb-simon-button-unpress-ja 5) +(def-art-elt tomb-simon-button-ag tomb-simon-button-press-ja 4) +(def-art-elt tomb-simon-button-ag tomb-simon-button-open-ja 3) +(def-art-elt tomb-simon-button-ag tomb-simon-button-lod1-mg 2) +(def-art-elt tomb-simon-button-ag tomb-simon-button-lod0-mg 1) +(def-art-elt tomb-simon-button-ag tomb-simon-button-lod0-jg 0) +(def-art-elt rift-occlude-ag rift-occlude-idle-ja 2) +(def-art-elt rift-occlude-ag rift-occlude-lod0-mg 1) +(def-art-elt rift-occlude-ag rift-occlude-lod0-jg 0) +(def-art-elt squid-ag squid-squid-shield-idle-ja 70) +(def-art-elt squid-ag squid-squid-shield-lod0-mg 69) +(def-art-elt squid-ag squid-lights-idle-ja 51) +(def-art-elt squid-ag squid-lights-lod0-mg 50) +(def-art-elt squid-ag squid-lights-lod0-jg 49) +(def-art-elt squid-ag squid-tentacle-recharge-end-ja 48) +(def-art-elt squid-ag squid-tentacle-recharge-ja 47) +(def-art-elt squid-ag squid-tentacle-recharge-start-ja 46) +(def-art-elt squid-ag squid-tentacle-idle-ja 45) +(def-art-elt squid-ag squid-tentacle-shadow-mg 44) +(def-art-elt squid-ag squid-tentacle-lod0-mg 43) +(def-art-elt squid-ag squid-tentacle-lod0-jg 42) +(def-art-elt squid-ag squid-firepool-lod0-jg 60) +(def-art-elt squid-ag squid-lod0-mg 1) +(def-art-elt squid-ag squid-grenade-idle-ja 59) +(def-art-elt squid-ag squid-lod0-jg 0) +(def-art-elt squid-ag squid-grenade-shadow-mg 58) +(def-art-elt squid-ag squid-driver-lod0-jg 52) +(def-art-elt squid-ag squid-driver-lod0-mg 53) +(def-art-elt squid-ag squid-driver-test-ja 54) +(def-art-elt squid-ag squid-grenade-lod0-jg 56) +(def-art-elt squid-ag squid-grenade-lod0-mg 57) +(def-art-elt squid-ag squid-shadow-mg 2) +(def-art-elt squid-ag squid-firepool-lod0-mg 61) +(def-art-elt squid-ag squid-firepool-idle-ja 62) +(def-art-elt squid-ag squid-firepool-form-ja 63) +(def-art-elt squid-ag squid-firepool-dissipate-ja 64) +(def-art-elt squid-ag squid-tentacle-shield-lod0-jg 65) +(def-art-elt squid-ag squid-tentacle-shield-lod0-mg 66) +(def-art-elt squid-ag squid-tentacle-shield-idle-ja 67) +(def-art-elt squid-ag squid-squid-shield-lod0-jg 68) +(def-art-elt pal-throne-door-ag pal-throne-door-idle-ja 2) +(def-art-elt pal-throne-door-ag pal-throne-door-lod0-mg 1) +(def-art-elt pal-throne-door-ag pal-throne-door-lod0-jg 0) +(def-art-elt tomb-plat-pillar-ag tomb-plat-pillar-idle-ja 2) +(def-art-elt tomb-plat-pillar-ag tomb-plat-pillar-lod0-mg 1) +(def-art-elt tomb-plat-pillar-ag tomb-plat-pillar-lod0-jg 0) (def-art-elt prsn-torture-ag prsn-torture-idle-ja 2) (def-art-elt prsn-torture-ag prsn-torture-lod0-mg 1) (def-art-elt prsn-torture-ag prsn-torture-lod0-jg 0) +(def-art-elt vin-ag vin-idle-ja 3) +(def-art-elt vin-ag vin-shadow-mg 2) +(def-art-elt vin-ag vin-lod0-mg 1) +(def-art-elt vin-ag vin-lod0-jg 0) +(def-art-elt hide-door-b-ag hide-door-b-idle-ja 2) +(def-art-elt hide-door-b-ag hide-door-b-lod0-mg 1) +(def-art-elt hide-door-b-ag hide-door-b-lod0-jg 0) (def-art-elt stdmb-race-hatch-ag stdmb-race-hatch-idle-ja 3) (def-art-elt stdmb-race-hatch-ag stdmb-race-hatch-lod1-mg 2) (def-art-elt stdmb-race-hatch-ag stdmb-race-hatch-lod0-mg 1) (def-art-elt stdmb-race-hatch-ag stdmb-race-hatch-lod0-jg 0) +(def-art-elt krew-clone-ag krew-clone-birth-ja 12) +(def-art-elt krew-clone-ag krew-clone-knocked-land-ja 11) +(def-art-elt krew-clone-ag krew-clone-knocked-ja 10) +(def-art-elt krew-clone-ag krew-clone-attack-ja 9) +(def-art-elt krew-clone-ag krew-clone-run-right-ja 8) +(def-art-elt krew-clone-ag krew-clone-run-left-ja 7) +(def-art-elt krew-clone-ag krew-clone-run-ja 6) +(def-art-elt krew-clone-ag krew-clone-idle-right-ja 5) +(def-art-elt krew-clone-ag krew-clone-idle-left-ja 4) +(def-art-elt krew-clone-ag krew-clone-idle-ja 3) +(def-art-elt krew-clone-ag krew-clone-shadow-mg 2) +(def-art-elt krew-clone-ag krew-clone-lod0-mg 1) +(def-art-elt krew-clone-ag krew-clone-lod0-jg 0) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-idle-ja 8) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-botpool-lod0-mg 7) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-botpool-lod0-jg 6) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-middlepool-lod0-mg 5) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-middlepool-lod0-jg 4) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-smlupperpool-lod0-mg 3) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-smlupperpool-lod0-jg 2) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-largepool-lod0-mg 1) +(def-art-elt water-anim-nest-dark-eco-ag water-anim-nest-dark-eco-largepool-lod0-jg 0) +(def-art-elt ctypal-baron-statue-broken-ag ctypal-baron-statue-broken-idle-ja 2) +(def-art-elt ctypal-baron-statue-broken-ag ctypal-baron-statue-broken-lod0-mg 1) +(def-art-elt ctypal-baron-statue-broken-ag ctypal-baron-statue-broken-lod0-jg 0) (def-art-elt under-rise-plat-ag under-rise-plat-idle2-ja 5) (def-art-elt under-rise-plat-ag under-rise-plat-rise2-ja 4) (def-art-elt under-rise-plat-ag under-rise-plat-idle-ja 3) (def-art-elt under-rise-plat-ag under-rise-plat-rise1-ja 2) (def-art-elt under-rise-plat-ag under-rise-plat-lod0-mg 1) (def-art-elt under-rise-plat-ag under-rise-plat-lod0-jg 0) +(def-art-elt gun-dummy-gold-ag gun-dummy-gold-explode-idle-ja 5) +(def-art-elt gun-dummy-gold-ag gun-dummy-gold-explode-lod0-mg 4) +(def-art-elt gun-dummy-gold-ag gun-dummy-gold-explode-lod0-jg 3) +(def-art-elt gun-dummy-gold-ag gun-dummy-gold-idle-ja 2) +(def-art-elt gun-dummy-gold-ag gun-dummy-gold-lod0-mg 1) +(def-art-elt gun-dummy-gold-ag gun-dummy-gold-lod0-jg 0) (def-art-elt samos-highres-ag samos-highres-idle-ja 3) (def-art-elt samos-highres-ag samos-highres-shadow-mg 2) (def-art-elt samos-highres-ag samos-highres-lod0-mg 1) (def-art-elt samos-highres-ag samos-highres-lod0-jg 0) +(def-art-elt dig-jump-pad-ag dig-jump-pad-idle-ja 2) +(def-art-elt dig-jump-pad-ag dig-jump-pad-lod0-mg 1) +(def-art-elt dig-jump-pad-ag dig-jump-pad-lod0-jg 0) +(def-art-elt nest-break-precipice-ag nest-break-precipice-idle-ja 2) +(def-art-elt nest-break-precipice-ag nest-break-precipice-lod0-mg 1) +(def-art-elt nest-break-precipice-ag nest-break-precipice-lod0-jg 0) +(def-art-elt tomb-mar-door-ag tomb-mar-door-idle-ja 2) +(def-art-elt tomb-mar-door-ag tomb-mar-door-lod0-mg 1) +(def-art-elt tomb-mar-door-ag tomb-mar-door-lod0-jg 0) +(def-art-elt fort-conveyor-ag fort-conveyor-idle-ja 2) +(def-art-elt fort-conveyor-ag fort-conveyor-lod0-mg 1) +(def-art-elt fort-conveyor-ag fort-conveyor-lod0-jg 0) +(def-art-elt jak-stand-ag jak-stand-end-ja 5) +(def-art-elt jak-stand-ag jak-stand-idle-ja 2) +(def-art-elt jak-stand-ag jak-stand-lod0-mg 1) +(def-art-elt jak-stand-ag jak-stand-lod0-jg 0) +(def-art-elt spydroid-ag spydroid-exploding-idle-ja 20) +(def-art-elt spydroid-ag spydroid-exploding-lod0-mg 19) +(def-art-elt spydroid-ag spydroid-exploding-lod0-jg 18) +(def-art-elt spydroid-ag spydroid-turn-left-ja 17) +(def-art-elt spydroid-ag spydroid-turn-right-ja 16) +(def-art-elt spydroid-ag spydroid-explode-ja 15) +(def-art-elt spydroid-ag spydroid-knocked1-land-ja 14) +(def-art-elt spydroid-ag spydroid-knocked1-ja 13) +(def-art-elt spydroid-ag spydroid-lod0-jg 0) +(def-art-elt spydroid-ag spydroid-lod0-mg 1) +(def-art-elt spydroid-ag spydroid-shadow-mg 2) +(def-art-elt spydroid-ag spydroid-idle-ja 3) +(def-art-elt spydroid-ag spydroid-walk-ja 4) +(def-art-elt spydroid-ag spydroid-run-ja 5) +(def-art-elt spydroid-ag spydroid-attack-jump-ja 6) +(def-art-elt spydroid-ag spydroid-attack-land-ja 7) +(def-art-elt spydroid-ag spydroid-jump-wind-up-ja 8) +(def-art-elt spydroid-ag spydroid-jump-ja 9) +(def-art-elt spydroid-ag spydroid-jump-land-ja 10) +(def-art-elt spydroid-ag spydroid-knocked0-ja 11) +(def-art-elt spydroid-ag spydroid-knocked0-land-ja 12) +(def-art-elt ruins-tower-c-ag ruins-tower-c-idle-ja 2) +(def-art-elt ruins-tower-c-ag ruins-tower-c-lod0-mg 1) +(def-art-elt ruins-tower-c-ag ruins-tower-c-lod0-jg 0) +(def-art-elt cboss-tractor-ag cboss-tractor-idle-ja 2) +(def-art-elt cboss-tractor-ag cboss-tractor-lod0-mg 1) +(def-art-elt cboss-tractor-ag cboss-tractor-lod0-jg 0) +(def-art-elt consite-silo-doors-ag consite-silo-doors-idle-ja 2) +(def-art-elt consite-silo-doors-ag consite-silo-doors-lod0-mg 1) +(def-art-elt consite-silo-doors-ag consite-silo-doors-lod0-jg 0) (def-art-elt vil-windspinner-ag vil-windspinner-idle-ja 4) (def-art-elt vil-windspinner-ag vil-windspinner-lod2-mg 3) (def-art-elt vil-windspinner-ag vil-windspinner-lod1-mg 2) (def-art-elt vil-windspinner-ag vil-windspinner-lod0-mg 1) (def-art-elt vil-windspinner-ag vil-windspinner-lod0-jg 0) +(def-art-elt gun-dummy-b-ag gun-dummy-b-explode-idle-ja 5) +(def-art-elt gun-dummy-b-ag gun-dummy-b-explode-lod0-mg 4) +(def-art-elt gun-dummy-b-ag gun-dummy-b-explode-lod0-jg 3) +(def-art-elt gun-dummy-b-ag gun-dummy-b-idle-ja 2) +(def-art-elt gun-dummy-b-ag gun-dummy-b-lod0-mg 1) +(def-art-elt gun-dummy-b-ag gun-dummy-b-lod0-jg 0) +(def-art-elt cas-conveyor-switch-ag cas-conveyor-switch-idle-ja 2) +(def-art-elt cas-conveyor-switch-ag cas-conveyor-switch-lod0-mg 1) +(def-art-elt cas-conveyor-switch-ag cas-conveyor-switch-lod0-jg 0) +(def-art-elt pal-ent-door-ag pal-ent-door-idle-ja 2) +(def-art-elt pal-ent-door-ag pal-ent-door-lod0-mg 1) +(def-art-elt pal-ent-door-ag pal-ent-door-lod0-jg 0) +(def-art-elt under-break-ceiling-ag under-break-ceiling-idle-ja 2) +(def-art-elt under-break-ceiling-ag under-break-ceiling-lod0-mg 1) +(def-art-elt under-break-ceiling-ag under-break-ceiling-lod0-jg 0) (def-art-elt cty-fruit-stand-ag cty-fruit-stand-idle-ja 2) (def-art-elt cty-fruit-stand-ag cty-fruit-stand-lod0-mg 1) (def-art-elt cty-fruit-stand-ag cty-fruit-stand-lod0-jg 0) (def-art-elt scenecamera-ag scenecamera-idle-ja 2) (def-art-elt scenecamera-ag scenecamera-lod0-mg 1) (def-art-elt scenecamera-ag scenecamera-lod0-jg 0) +(def-art-elt barge-ag barge-idle-ja 2) +(def-art-elt barge-ag barge-lod0-mg 1) +(def-art-elt barge-ag barge-lod0-jg 0) +(def-art-elt pitspikes-ag pitspikes-idle-ja 3) +(def-art-elt pitspikes-ag pitspikes-lod1-mg 2) +(def-art-elt pitspikes-ag pitspikes-lod0-mg 1) +(def-art-elt pitspikes-ag pitspikes-lod0-jg 0) +(def-art-elt hip-bottle-b-ag hip-bottle-b-idle-ja 2) +(def-art-elt hip-bottle-b-ag hip-bottle-b-lod0-mg 1) +(def-art-elt hip-bottle-b-ag hip-bottle-b-lod0-jg 0) +(def-art-elt metalkor-distort-ag metalkor-distort-idle-ja 2) +(def-art-elt metalkor-distort-ag metalkor-distort-lod0-mg 1) +(def-art-elt metalkor-distort-ag metalkor-distort-lod0-jg 0) +(def-art-elt fencespikes-ag fencespikes-idle-ja 3) +(def-art-elt fencespikes-ag fencespikes-lod1-mg 2) +(def-art-elt fencespikes-ag fencespikes-lod0-mg 1) +(def-art-elt fencespikes-ag fencespikes-lod0-jg 0) +(def-art-elt precursor-stone-ag precursor-stone-idle-ja 2) +(def-art-elt precursor-stone-ag precursor-stone-lod0-mg 1) +(def-art-elt precursor-stone-ag precursor-stone-lod0-jg 0) +(def-art-elt mincan-cogs-ag mincan-cogs-idle-ja 2) +(def-art-elt mincan-cogs-ag mincan-cogs-lod0-mg 1) +(def-art-elt mincan-cogs-ag mincan-cogs-lod0-jg 0) +(def-art-elt beam-ag beam-slide-center-ja 3) +(def-art-elt beam-ag beam-idle-ja 2) +(def-art-elt beam-ag beam-lod0-mg 1) +(def-art-elt beam-ag beam-lod0-jg 0) +(def-art-elt strip-chain-crate-ag strip-chain-crate-idle-ja 2) +(def-art-elt strip-chain-crate-ag strip-chain-crate-lod0-mg 1) +(def-art-elt strip-chain-crate-ag strip-chain-crate-lod0-jg 0) +(def-art-elt fort-elec-belt-ag fort-elec-belt-idle-ja 2) +(def-art-elt fort-elec-belt-ag fort-elec-belt-lod0-mg 1) +(def-art-elt fort-elec-belt-ag fort-elec-belt-lod0-jg 0) +(def-art-elt centurion-ag centurion-death-in-place-ja 34) +(def-art-elt centurion-ag centurion-die-land-ja 33) +(def-art-elt centurion-ag centurion-yellow-hit-ja 32) +(def-art-elt centurion-ag centurion-shoot-end-ja 31) +(def-art-elt centurion-ag centurion-shoot-loop-ja 30) +(def-art-elt centurion-ag centurion-shoot-start-ja 29) +(def-art-elt centurion-ag centurion-shieldup-ja 12) +(def-art-elt centurion-ag centurion-rotate-end-ja 11) +(def-art-elt centurion-ag centurion-rotate-ja 10) +(def-art-elt centurion-ag centurion-patrol-ja 9) +(def-art-elt centurion-ag centurion-notice-ja 8) +(def-art-elt centurion-ag centurion-jump-ja 7) +(def-art-elt centurion-ag centurion-idle-ja 6) +(def-art-elt centurion-ag centurion-die-ja 5) +(def-art-elt centurion-ag centurion-celebrate-ja 4) +(def-art-elt centurion-ag centurion-shadow-mg 3) +(def-art-elt centurion-ag centurion-lod1-mg 2) +(def-art-elt centurion-ag centurion-lod0-mg 1) +(def-art-elt centurion-ag centurion-lod0-jg 0) +(def-art-elt centurion-ag centurion-shieldup-idle-ja 13) +(def-art-elt centurion-ag centurion-shoot-ja 14) +(def-art-elt centurion-ag centurion-take-big-hit-ja 15) +(def-art-elt centurion-ag centurion-take-hit-ja 16) +(def-art-elt centurion-ag centurion-unblock-ja 17) +(def-art-elt centurion-ag centurion-blue-hit-front-ja 18) +(def-art-elt centurion-ag centurion-blue-hit-right-ja 19) +(def-art-elt centurion-ag centurion-blue-hit-left-ja 20) +(def-art-elt centurion-ag centurion-knocked-ja 21) +(def-art-elt centurion-ag centurion-knocked-land-ja 22) +(def-art-elt centurion-ag centurion-falling-death-ja 23) +(def-art-elt centurion-ag centurion-hit-away-ja 24) +(def-art-elt centurion-ag centurion-side-stepR-ja 25) +(def-art-elt centurion-ag centurion-side-stepDR-ja 26) +(def-art-elt centurion-ag centurion-side-stepDL-ja 27) +(def-art-elt centurion-ag centurion-walk-forward-ja 28) +(def-art-elt grenadier-ag grenadier-die-falling-ja 34) +(def-art-elt grenadier-ag grenadier-die-ja 33) +(def-art-elt grenadier-ag grenadier-knocked-land-ja 32) +(def-art-elt grenadier-ag grenadier-knocked-ja 31) +(def-art-elt grenadier-ag grenadier-blue-land-ja 30) +(def-art-elt grenadier-ag grenadier-blue-hit2-ja 29) +(def-art-elt grenadier-ag grenadier-notice1-ja 12) +(def-art-elt grenadier-ag grenadier-notice-ja 11) +(def-art-elt grenadier-ag grenadier-patrol1-ja 10) +(def-art-elt grenadier-ag grenadier-patrol-ja 9) +(def-art-elt grenadier-ag grenadier-idle-look-right-ja 8) +(def-art-elt grenadier-ag grenadier-idle-look-left-ja 7) +(def-art-elt grenadier-ag grenadier-idle2-ja 6) +(def-art-elt grenadier-ag grenadier-idle-ja 5) +(def-art-elt grenadier-ag grenadier-shadow-mg 4) +(def-art-elt grenadier-ag grenadier-lod2-mg 3) +(def-art-elt grenadier-ag grenadier-lod1-mg 2) +(def-art-elt grenadier-ag grenadier-lod0-mg 1) +(def-art-elt grenadier-ag grenadier-lod0-jg 0) +(def-art-elt grenadier-ag grenadier-run-ja 13) +(def-art-elt grenadier-ag grenadier-run1-ja 14) +(def-art-elt grenadier-ag grenadier-run-to-throw-ja 15) +(def-art-elt grenadier-ag grenadier-throw-turn-in-place-ja 16) +(def-art-elt grenadier-ag grenadier-throw-stance-ja 17) +(def-art-elt grenadier-ag grenadier-throw-ja 18) +(def-art-elt grenadier-ag grenadier-throw1-ja 19) +(def-art-elt grenadier-ag grenadier-throw-quick-ja 20) +(def-art-elt grenadier-ag grenadier-spin-kick-ja 21) +(def-art-elt grenadier-ag grenadier-victory-ja 22) +(def-art-elt grenadier-ag grenadier-hit-ja 23) +(def-art-elt grenadier-ag grenadier-hit-right-ja 24) +(def-art-elt grenadier-ag grenadier-hit-left-ja 25) +(def-art-elt grenadier-ag grenadier-hit-back-ja 26) +(def-art-elt grenadier-ag grenadier-blue-hit0-ja 27) +(def-art-elt grenadier-ag grenadier-blue-hit1-ja 28) (def-art-elt market-crate-ag market-crate-idle-ja 2) (def-art-elt market-crate-ag market-crate-lod0-mg 1) (def-art-elt market-crate-ag market-crate-lod0-jg 0) +(def-art-elt baron-consite+0-ag baron-highres-idle-dead-ja 0) (def-art-elt under-buoy-base-ag under-buoy-base-idle-ja 2) (def-art-elt under-buoy-base-ag under-buoy-base-lod0-mg 1) (def-art-elt under-buoy-base-ag under-buoy-base-lod0-jg 0) +(def-art-elt tomb-boulder-ag tomb-boulder-wing-door-end-ja 56) +(def-art-elt tomb-boulder-ag tomb-boulder-wing-door-mid-ja 55) +(def-art-elt tomb-boulder-ag tomb-boulder-wing-door-lod0-jg 52) +(def-art-elt tomb-boulder-ag tomb-boulder-stick-idle-ja 50) +(def-art-elt tomb-boulder-ag tomb-boulder-stick-lod0-mg 49) +(def-art-elt tomb-boulder-ag tomb-boulder-stick-lod0-jg 48) +(def-art-elt tomb-boulder-ag tomb-boulder-spider-end-ja 43) +(def-art-elt tomb-boulder-ag tomb-boulder-spider-mid-ja 42) +(def-art-elt tomb-boulder-ag tomb-boulder-spider-shadow-mg 40) +(def-art-elt tomb-boulder-ag tomb-boulder-lod0-jg 0) +(def-art-elt tomb-boulder-ag tomb-boulder-lod0-mg 1) +(def-art-elt tomb-boulder-ag tomb-boulder-idle-ja 2) +(def-art-elt tomb-boulder-ag tomb-boulder-stop-lod0-jg 15) +(def-art-elt tomb-boulder-ag tomb-boulder-mid-ja 3) +(def-art-elt tomb-boulder-ag tomb-boulder-stop-lod0-mg 16) +(def-art-elt tomb-boulder-ag tomb-boulder-end-ja 4) +(def-art-elt tomb-boulder-ag tomb-boulder-spider-lod0-jg 38) +(def-art-elt tomb-boulder-ag tomb-boulder-explode-lod0-jg 9) +(def-art-elt tomb-boulder-ag tomb-boulder-spider-lod0-mg 39) +(def-art-elt tomb-boulder-ag tomb-boulder-explode-lod0-mg 10) +(def-art-elt tomb-boulder-ag tomb-boulder-spider-idle-ja 41) +(def-art-elt tomb-boulder-ag tomb-boulder-explode-a-mid-ja 12) +(def-art-elt tomb-boulder-ag tomb-boulder-wing-door-idle-ja 54) +(def-art-elt tomb-boulder-ag tomb-boulder-pillar-lod0-mg 25) +(def-art-elt tomb-boulder-ag tomb-boulder-stop-a-mid-ja 18) +(def-art-elt tomb-boulder-ag tomb-boulder-wing-door-lod0-mg 53) +(def-art-elt tomb-boulder-ag tomb-boulder-pillar-lod0-jg 24) +(def-art-elt fort-robotank-ag fort-robotank-fire-end-ja 5) +(def-art-elt fort-robotank-ag fort-robotank-fire-start-ja 4) +(def-art-elt fort-robotank-ag fort-robotank-idle-ja 3) +(def-art-elt fort-robotank-ag fort-robotank-lod1-mg 2) +(def-art-elt fort-robotank-ag fort-robotank-lod0-mg 1) +(def-art-elt fort-robotank-ag fort-robotank-lod0-jg 0) +(def-art-elt gun-dummy-yellow-gun-ag gun-dummy-yellow-gun-explode-idle-ja 5) +(def-art-elt gun-dummy-yellow-gun-ag gun-dummy-yellow-gun-explode-lod0-mg 4) +(def-art-elt gun-dummy-yellow-gun-ag gun-dummy-yellow-gun-explode-lod0-jg 3) +(def-art-elt gun-dummy-yellow-gun-ag gun-dummy-yellow-gun-idle-ja 2) +(def-art-elt gun-dummy-yellow-gun-ag gun-dummy-yellow-gun-lod0-mg 1) +(def-art-elt gun-dummy-yellow-gun-ag gun-dummy-yellow-gun-lod0-jg 0) +(def-art-elt brutter-low-ag brutter-low-stad-sit-ja 5) +(def-art-elt brutter-low-ag brutter-low-idle-ja 4) +(def-art-elt brutter-low-ag brutter-low-shadow-mg 3) +(def-art-elt brutter-low-ag brutter-low-lod1-mg 2) +(def-art-elt brutter-low-ag brutter-low-lod0-mg 1) +(def-art-elt brutter-low-ag brutter-low-lod0-jg 0) (def-art-elt daxter-highres-ag daxter-highres-idle-ja 3) (def-art-elt daxter-highres-ag daxter-highres-shadow-mg 2) (def-art-elt daxter-highres-ag daxter-highres-lod0-mg 1) @@ -136,12 +695,78 @@ (def-art-elt vil-windmill-sail-ag vil-windmill-sail-lod1-mg 2) (def-art-elt vil-windmill-sail-ag vil-windmill-sail-lod0-mg 1) (def-art-elt vil-windmill-sail-ag vil-windmill-sail-lod0-jg 0) +(def-art-elt dig-tipping-rock-ag dig-tipping-rock-idle-ja 2) +(def-art-elt dig-tipping-rock-ag dig-tipping-rock-lod0-mg 1) +(def-art-elt dig-tipping-rock-ag dig-tipping-rock-lod0-jg 0) +(def-art-elt nest-unbroken-rocks-ag nest-unbroken-rocks-idle-ja 2) +(def-art-elt nest-unbroken-rocks-ag nest-unbroken-rocks-lod0-mg 1) +(def-art-elt nest-unbroken-rocks-ag nest-unbroken-rocks-lod0-jg 0) (def-art-elt hide-door-a-ag hide-door-a-idle-ja 2) (def-art-elt hide-door-a-ag hide-door-a-lod0-mg 1) (def-art-elt hide-door-a-ag hide-door-a-lod0-jg 0) +(def-art-elt tomb-beetle-ag tomb-beetle-die-ja 13) +(def-art-elt tomb-beetle-ag tomb-beetle-lod0-jg 0) +(def-art-elt tomb-beetle-ag tomb-beetle-lod0-mg 1) +(def-art-elt tomb-beetle-ag tomb-beetle-shadow-mg 2) +(def-art-elt tomb-beetle-ag tomb-beetle-falling-ja 3) +(def-art-elt tomb-beetle-ag tomb-beetle-land-ja 4) +(def-art-elt tomb-beetle-ag tomb-beetle-wiggle-ja 5) +(def-art-elt tomb-beetle-ag tomb-beetle-flip-ja 6) +(def-art-elt tomb-beetle-ag tomb-beetle-run0-ja 7) +(def-art-elt tomb-beetle-ag tomb-beetle-run1-ja 8) +(def-art-elt tomb-beetle-ag tomb-beetle-stand0-ja 9) +(def-art-elt tomb-beetle-ag tomb-beetle-fly-takeoff-ja 10) +(def-art-elt tomb-beetle-ag tomb-beetle-fly-ja 11) +(def-art-elt tomb-beetle-ag tomb-beetle-fly-land-ja 12) +(def-art-elt mine-b-ag sew-mine-b-idle-ja 2) +(def-art-elt mine-b-ag sew-mine-b-lod0-mg 1) +(def-art-elt mine-b-ag sew-mine-b-lod0-jg 0) +(def-art-elt ctypal-break-wall-ag ctypal-break-wall-idle-ja 2) +(def-art-elt ctypal-break-wall-ag ctypal-break-wall-lod0-mg 1) +(def-art-elt ctypal-break-wall-ag ctypal-break-wall-lod0-jg 0) (def-art-elt vehicle-explosion-ag vehicle-explosion-idle-ja 2) (def-art-elt vehicle-explosion-ag vehicle-explosion-lod0-mg 1) (def-art-elt vehicle-explosion-ag vehicle-explosion-lod0-jg 0) +(def-art-elt ctyn-lamp-ag ctyn-lamp-explode-idle-ja 5) +(def-art-elt ctyn-lamp-ag ctyn-lamp-explode-lod0-mg 4) +(def-art-elt ctyn-lamp-ag ctyn-lamp-explode-lod0-jg 3) +(def-art-elt ctyn-lamp-ag ctyn-lamp-idle-ja 2) +(def-art-elt ctyn-lamp-ag ctyn-lamp-lod0-mg 1) +(def-art-elt ctyn-lamp-ag ctyn-lamp-lod0-jg 0) +(def-art-elt atoll-hatch-ag atoll-hatch-idle-ja 3) +(def-art-elt atoll-hatch-ag atoll-hatch-lod1-mg 2) +(def-art-elt atoll-hatch-ag atoll-hatch-lod0-mg 1) +(def-art-elt atoll-hatch-ag atoll-hatch-lod0-jg 0) +(def-art-elt cty-guard-turret-button-ag cty-guard-turret-button-pop-up-ja 3) +(def-art-elt cty-guard-turret-button-ag cty-guard-turret-button-idle-ja 2) +(def-art-elt cty-guard-turret-button-ag cty-guard-turret-button-lod0-mg 1) +(def-art-elt cty-guard-turret-button-ag cty-guard-turret-button-lod0-jg 0) +(def-art-elt zipline-ag zipline-idle-ja 2) +(def-art-elt zipline-ag zipline-lod0-mg 1) +(def-art-elt zipline-ag zipline-lod0-jg 0) +(def-art-elt krew-lowres-ag krew-lowres-fire-rise-ja 18) +(def-art-elt krew-lowres-ag krew-lowres-fire-straight-ja 17) +(def-art-elt krew-lowres-ag krew-lowres-activate-clone-ja 16) +(def-art-elt krew-lowres-ag krew-lowres-death-land-ja 15) +(def-art-elt krew-lowres-ag krew-lowres-death-spin-ja 14) +(def-art-elt krew-lowres-ag krew-lowres-death-knocked-ja 13) +(def-art-elt krew-lowres-ag krew-lowres-lod0-jg 0) +(def-art-elt krew-lowres-ag krew-lowres-lod0-mg 1) +(def-art-elt krew-lowres-ag krew-lowres-lod1-mg 2) +(def-art-elt krew-lowres-ag krew-lowres-shadow-mg 3) +(def-art-elt krew-lowres-ag krew-lowres-idle-ja 4) +(def-art-elt krew-lowres-ag krew-lowres-idle-left-ja 5) +(def-art-elt krew-lowres-ag krew-lowres-idle-right-ja 6) +(def-art-elt krew-lowres-ag krew-lowres-run-ja 7) +(def-art-elt krew-lowres-ag krew-lowres-run-left-ja 8) +(def-art-elt krew-lowres-ag krew-lowres-run-right-ja 9) +(def-art-elt krew-lowres-ag krew-lowres-attack-ja 10) +(def-art-elt krew-lowres-ag krew-lowres-knocked-ja 11) +(def-art-elt krew-lowres-ag krew-lowres-knocked-land-ja 12) +(def-art-elt sinking-plat-ag sinking-plat-idle-ja 3) +(def-art-elt sinking-plat-ag sinking-plat-lod1-mg 2) +(def-art-elt sinking-plat-ag sinking-plat-lod0-mg 1) +(def-art-elt sinking-plat-ag sinking-plat-lod0-jg 0) (def-art-elt jak-pidax+0-ag daxter-pidax-car-crash-right-ja 6) (def-art-elt jak-pidax+0-ag daxter-pidax-car-crash-left-ja 5) (def-art-elt jak-pidax+0-ag daxter-pidax-car-crash-back-ja 4) @@ -149,15 +774,112 @@ (def-art-elt jak-pidax+0-ag daxter-pidax-car-up-down-ja 2) (def-art-elt jak-pidax+0-ag daxter-pidax-car-turn-back-ja 1) (def-art-elt jak-pidax+0-ag daxter-pidax-car-turn-front-ja 0) +(def-art-elt drill-falling-door-ag drill-falling-door-fall-ja 6) +(def-art-elt drill-falling-door-ag drill-falling-door-hit3-ja 5) +(def-art-elt drill-falling-door-ag drill-falling-door-hit2-ja 4) +(def-art-elt drill-falling-door-ag drill-falling-door-hit1-ja 3) +(def-art-elt drill-falling-door-ag drill-falling-door-idle-ja 2) +(def-art-elt drill-falling-door-ag drill-falling-door-lod0-mg 1) +(def-art-elt drill-falling-door-ag drill-falling-door-lod0-jg 0) (def-art-elt drill-elevator-doors-ag drill-elevator-doors-idle-ja 2) (def-art-elt drill-elevator-doors-ag drill-elevator-doors-lod0-mg 1) (def-art-elt drill-elevator-doors-ag drill-elevator-doors-lod0-jg 0) +(def-art-elt jak-highres-ag jak-highres-idle-ja 3) +(def-art-elt jak-highres-ag jak-highres-shadow-mg 2) +(def-art-elt jak-highres-ag jak-highres-lod0-mg 1) +(def-art-elt jak-highres-ag jak-highres-lod0-jg 0) +(def-art-elt tanker-container-ag tanker-container-idle-ja 2) +(def-art-elt tanker-container-ag tanker-container-lod0-mg 1) +(def-art-elt tanker-container-ag tanker-container-lod0-jg 0) +(def-art-elt kor-transform-ag kor-transform-monsterparts-idle-ja 8) +(def-art-elt kor-transform-ag kor-transform-monsterparts-shadow-mg 7) +(def-art-elt kor-transform-ag kor-transform-monsterparts-lod0-mg 6) +(def-art-elt kor-transform-ag kor-transform-monsterparts-lod0-jg 5) +(def-art-elt kor-transform-ag kor-transform-idle-ja 3) +(def-art-elt kor-transform-ag kor-transform-shadow-mg 2) +(def-art-elt kor-transform-ag kor-transform-lod0-mg 1) +(def-art-elt kor-transform-ag kor-transform-lod0-jg 0) +(def-art-elt samos-lsamergd+0-ag samos-highres-idle-garage-ja 0) +(def-art-elt tomb-plat-simon-ag tomb-plat-simon-idle-ja 3) +(def-art-elt tomb-plat-simon-ag tomb-plat-simon-lod1-mg 2) +(def-art-elt tomb-plat-simon-ag tomb-plat-simon-lod0-mg 1) +(def-art-elt tomb-plat-simon-ag tomb-plat-simon-lod0-jg 0) +(def-art-elt air-train-ag air-train-idle-ja 2) +(def-art-elt air-train-ag air-train-lod0-mg 1) +(def-art-elt air-train-ag air-train-lod0-jg 0) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-b-idle-ja 10) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-b-lod0-mg 9) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-b-lod0-jg 8) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-a-idle-ja 6) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-a-lod0-mg 5) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-a-lod0-jg 4) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-idle-ja 2) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-lod0-mg 1) +(def-art-elt nest-break-rocks-ag nest-break-rocks-break-lod0-jg 0) +(def-art-elt metalmonk-ag metalmonk-die-falling-ja 33) +(def-art-elt metalmonk-ag metalmonk-death-ja 32) +(def-art-elt metalmonk-ag metalmonk-yellow-hit3-ja 31) +(def-art-elt metalmonk-ag metalmonk-yellow-hit2-ja 30) +(def-art-elt metalmonk-ag metalmonk-yellow-hit1-ja 29) +(def-art-elt metalmonk-ag metalmonk-charge0-ja 12) +(def-art-elt metalmonk-ag metalmonk-notice1-ja 11) +(def-art-elt metalmonk-ag metalmonk-notice-ja 10) +(def-art-elt metalmonk-ag metalmonk-patrol1-ja 9) +(def-art-elt metalmonk-ag metalmonk-patrol0-ja 8) +(def-art-elt metalmonk-ag metalmonk-idle-look-right-ja 7) +(def-art-elt metalmonk-ag metalmonk-idle-look-left-ja 6) +(def-art-elt metalmonk-ag metalmonk-idle-ja 5) +(def-art-elt metalmonk-ag metalmonk-shadow-mg 4) +(def-art-elt metalmonk-ag metalmonk-lod2-mg 3) +(def-art-elt metalmonk-ag metalmonk-lod1-mg 2) +(def-art-elt metalmonk-ag metalmonk-lod0-mg 1) +(def-art-elt metalmonk-ag metalmonk-lod0-jg 0) +(def-art-elt metalmonk-ag metalmonk-charge1-ja 13) +(def-art-elt metalmonk-ag metalmonk-attack0-ja 14) +(def-art-elt metalmonk-ag metalmonk-attack1-ja 15) +(def-art-elt metalmonk-ag metalmonk-knocked0-ja 16) +(def-art-elt metalmonk-ag metalmonk-knocked-land0-ja 17) +(def-art-elt metalmonk-ag metalmonk-knocked1-ja 18) +(def-art-elt metalmonk-ag metalmonk-knocked-land1-ja 19) +(def-art-elt metalmonk-ag metalmonk-knocked-forward0-ja 20) +(def-art-elt metalmonk-ag metalmonk-knocked-forward-land0-ja 21) +(def-art-elt metalmonk-ag metalmonk-celebrate-ja 22) +(def-art-elt metalmonk-ag metalmonk-celebrate1-ja 23) +(def-art-elt metalmonk-ag metalmonk-blue-hit0-ja 24) +(def-art-elt metalmonk-ag metalmonk-blue-hit1-ja 25) +(def-art-elt metalmonk-ag metalmonk-blue-hit2-ja 26) +(def-art-elt metalmonk-ag metalmonk-blue-land-ja 27) +(def-art-elt metalmonk-ag metalmonk-yellow-hit0-ja 28) +(def-art-elt under-break-bridge-b-ag under-break-bridge-b-broken-sig-dead-ja 3) +(def-art-elt under-break-bridge-b-ag under-break-bridge-b-idle-ja 2) +(def-art-elt under-break-bridge-b-ag under-break-bridge-b-lod0-mg 1) +(def-art-elt under-break-bridge-b-ag under-break-bridge-b-lod0-jg 0) +(def-art-elt dig-spikey-step-ag dig-spikey-step-idle-ja 2) +(def-art-elt dig-spikey-step-ag dig-spikey-step-lod0-mg 1) +(def-art-elt dig-spikey-step-ag dig-spikey-step-lod0-jg 0) +(def-art-elt pal-flip-step-ag pal-flip-step-fall-ja 3) +(def-art-elt pal-flip-step-ag pal-flip-step-idle-ja 2) +(def-art-elt pal-flip-step-ag pal-flip-step-lod0-mg 1) +(def-art-elt pal-flip-step-ag pal-flip-step-lod0-jg 0) (def-art-elt under-shoot-block-ag under-shoot-block-explode-idle-ja 5) (def-art-elt under-shoot-block-ag under-shoot-block-explode-lod0-mg 4) (def-art-elt under-shoot-block-ag under-shoot-block-explode-lod0-jg 3) (def-art-elt under-shoot-block-ag under-shoot-block-idle-ja 2) (def-art-elt under-shoot-block-ag under-shoot-block-lod0-mg 1) (def-art-elt under-shoot-block-ag under-shoot-block-lod0-jg 0) +(def-art-elt hip-trophy-g-ag hip-trophy-g-idle-ja 2) +(def-art-elt hip-trophy-g-ag hip-trophy-g-lod0-mg 1) +(def-art-elt hip-trophy-g-ag hip-trophy-g-lod0-jg 0) +(def-art-elt oracle-roof-banner-b-ag oracle-roof-banner-b-idle-ja 2) +(def-art-elt oracle-roof-banner-b-ag oracle-roof-banner-b-lod0-mg 1) +(def-art-elt oracle-roof-banner-b-ag oracle-roof-banner-b-lod0-jg 0) +(def-art-elt dig-spikey-sphere-door-ag dig-spikey-sphere-door-idle-ja 2) +(def-art-elt dig-spikey-sphere-door-ag dig-spikey-sphere-door-lod0-mg 1) +(def-art-elt dig-spikey-sphere-door-ag dig-spikey-sphere-door-lod0-jg 0) +(def-art-elt sew-arm-blade-ag sew-arm-blade-idle-ja 3) +(def-art-elt sew-arm-blade-ag sew-arm-blade-lod1-mg 2) +(def-art-elt sew-arm-blade-ag sew-arm-blade-lod0-mg 1) +(def-art-elt sew-arm-blade-ag sew-arm-blade-lod0-jg 0) (def-art-elt grunt-mech-anims+0-ag grunt-mech-dismount-land-ja 7) (def-art-elt grunt-mech-anims+0-ag grunt-mech-dismount-ja 6) (def-art-elt grunt-mech-anims+0-ag grunt-mech-double-pound-ja 5) @@ -166,6 +888,34 @@ (def-art-elt grunt-mech-anims+0-ag grunt-mech-idle0-ja 2) (def-art-elt grunt-mech-anims+0-ag grunt-mech-grab-ja 1) (def-art-elt grunt-mech-anims+0-ag grunt-mech-lunge-ja 0) +(def-art-elt kid-medallion-ag kid-medallion-idle-ja 2) +(def-art-elt kid-medallion-ag kid-medallion-lod0-mg 1) +(def-art-elt kid-medallion-ag kid-medallion-lod0-jg 0) +(def-art-elt hip-trophy-j-ag hip-trophy-j-idle-ja 2) +(def-art-elt hip-trophy-j-ag hip-trophy-j-lod0-mg 1) +(def-art-elt hip-trophy-j-ag hip-trophy-j-lod0-jg 0) +(def-art-elt sew-mar-statue-explode-ag sew-mar-statue-explode-b-idle-ja 6) +(def-art-elt sew-mar-statue-explode-ag sew-mar-statue-explode-b-lod0-mg 5) +(def-art-elt sew-mar-statue-explode-ag sew-mar-statue-explode-b-lod0-jg 4) +(def-art-elt sew-mar-statue-explode-ag sew-mar-statue-explode-a-idle-ja 2) +(def-art-elt sew-mar-statue-explode-ag sew-mar-statue-explode-a-lod0-mg 1) +(def-art-elt sew-mar-statue-explode-ag sew-mar-statue-explode-a-lod0-jg 0) +(def-art-elt son-of-particleman-ag son-of-particleman-idle-ja 2) +(def-art-elt son-of-particleman-ag son-of-particleman-lod0-mg 1) +(def-art-elt son-of-particleman-ag son-of-particleman-lod0-jg 0) +(def-art-elt tomb-elevator-ag tomb-elevator-run-ja 4) +(def-art-elt tomb-elevator-ag tomb-elevator-idle-ja 3) +(def-art-elt tomb-elevator-ag tomb-elevator-lod1-mg 2) +(def-art-elt tomb-elevator-ag tomb-elevator-lod0-mg 1) +(def-art-elt tomb-elevator-ag tomb-elevator-lod0-jg 0) +(def-art-elt youngsamos-ltrnysam+0-ag youngsamos-highres-idle-stand3-ja 0) +(def-art-elt gar-trophy-cb-ag gar-trophy-cb-idle-ja 2) +(def-art-elt gar-trophy-cb-ag gar-trophy-cb-lod0-mg 1) +(def-art-elt gar-trophy-cb-ag gar-trophy-cb-lod0-jg 0) +(def-art-elt mtn-dice-button-ag mtn-dice-button-idle-ja 3) +(def-art-elt mtn-dice-button-ag mtn-dice-button-lod1-mg 2) +(def-art-elt mtn-dice-button-ag mtn-dice-button-lod0-mg 1) +(def-art-elt mtn-dice-button-ag mtn-dice-button-lod0-jg 0) (def-art-elt citizen-norm-ag citizen-norm-knocked-from-bike-ja 34) (def-art-elt citizen-norm-ag citizen-norm-knocked-from-car-ja 33) (def-art-elt citizen-norm-ag citizen-norm-get-in-car-ja 32) @@ -201,6 +951,15 @@ (def-art-elt citizen-norm-ag citizen-norm-cover-head-start-ja 26) (def-art-elt citizen-norm-ag citizen-norm-cover-head-loop-ja 27) (def-art-elt citizen-norm-ag citizen-norm-cover-head-end-ja 28) +(def-art-elt stadium-racer-ag stadium-racer-car-taunt-ja 8) +(def-art-elt stadium-racer-ag stadium-racer-car-taunt-right-ja 7) +(def-art-elt stadium-racer-ag stadium-racer-car-taunt-left-ja 6) +(def-art-elt stadium-racer-ag stadium-racer-car-stance-ja 5) +(def-art-elt stadium-racer-ag stadium-racer-bike-stance-ja 4) +(def-art-elt stadium-racer-ag stadium-racer-idle-ja 3) +(def-art-elt stadium-racer-ag stadium-racer-lod1-mg 2) +(def-art-elt stadium-racer-ag stadium-racer-lod0-mg 1) +(def-art-elt stadium-racer-ag stadium-racer-lod0-jg 0) (def-art-elt wasp-ag wasp-explode-idle-ja 22) (def-art-elt wasp-ag wasp-explode-lod0-mg 21) (def-art-elt wasp-ag wasp-explode-lod0-jg 20) @@ -224,6 +983,19 @@ (def-art-elt wasp-ag wasp-knocked0-ja 10) (def-art-elt wasp-ag wasp-knocked0-recover-ja 11) (def-art-elt wasp-ag wasp-knocked1-ja 12) +(def-art-elt farm-beetree-ag farm-beetree-explode-idle-ja 5) +(def-art-elt farm-beetree-ag farm-beetree-explode-lod0-mg 4) +(def-art-elt farm-beetree-ag farm-beetree-explode-lod0-jg 3) +(def-art-elt farm-beetree-ag farm-beetree-idle-ja 2) +(def-art-elt farm-beetree-ag farm-beetree-lod0-mg 1) +(def-art-elt farm-beetree-ag farm-beetree-lod0-jg 0) +(def-art-elt sew-valve-ag sew-valve-idle-ja 3) +(def-art-elt sew-valve-ag sew-valve-lod1-mg 2) +(def-art-elt sew-valve-ag sew-valve-lod0-mg 1) +(def-art-elt sew-valve-ag sew-valve-lod0-jg 0) +(def-art-elt heart-of-mar-ag heart-of-mar-idle-ja 2) +(def-art-elt heart-of-mar-ag heart-of-mar-lod0-mg 1) +(def-art-elt heart-of-mar-ag heart-of-mar-lod0-jg 0) (def-art-elt wren-ag wren-land-ja 8) (def-art-elt wren-ag wren-glide-ja 7) (def-art-elt wren-ag wren-fly-ja 6) @@ -233,6 +1005,46 @@ (def-art-elt wren-ag wren-idle-ja 2) (def-art-elt wren-ag wren-lod0-mg 1) (def-art-elt wren-ag wren-lod0-jg 0) +(def-art-elt monster-frog-ag monster-frog-knocked1-land-ja 33) +(def-art-elt monster-frog-ag monster-frog-knocked1-ja 32) +(def-art-elt monster-frog-ag monster-frog-knocked0-land-ja 31) +(def-art-elt monster-frog-ag monster-frog-knocked0-ja 30) +(def-art-elt monster-frog-ag monster-frog-knocked-yellow-right-land-ja 29) +(def-art-elt monster-frog-ag monster-frog-rotate-right-start-ja 12) +(def-art-elt monster-frog-ag monster-frog-rotate-left-start-ja 11) +(def-art-elt monster-frog-ag monster-frog-notice0-land-ja 10) +(def-art-elt monster-frog-ag monster-frog-notice0-jump-ja 9) +(def-art-elt monster-frog-ag monster-frog-notice0-ja 8) +(def-art-elt monster-frog-ag monster-frog-submerge0-ja 7) +(def-art-elt monster-frog-ag monster-frog-popup0-ja 6) +(def-art-elt monster-frog-ag monster-frog-idle1-ja 5) +(def-art-elt monster-frog-ag monster-frog-idle0-ja 4) +(def-art-elt monster-frog-ag monster-frog-shadow-mg 3) +(def-art-elt monster-frog-ag monster-frog-lod1-mg 2) +(def-art-elt monster-frog-ag monster-frog-lod0-mg 1) +(def-art-elt monster-frog-ag monster-frog-lod0-jg 0) +(def-art-elt monster-frog-ag monster-frog-rotate-left-end-ja 13) +(def-art-elt monster-frog-ag monster-frog-hop-small-start-ja 14) +(def-art-elt monster-frog-ag monster-frog-hop-small-end-ja 15) +(def-art-elt monster-frog-ag monster-frog-hop-slow-start-ja 16) +(def-art-elt monster-frog-ag monster-frog-hop-slow-end-ja 17) +(def-art-elt monster-frog-ag monster-frog-hop-fast-start-ja 18) +(def-art-elt monster-frog-ag monster-frog-hop-fast-end-ja 19) +(def-art-elt monster-frog-ag monster-frog-attack0-start-ja 20) +(def-art-elt monster-frog-ag monster-frog-attack0-end-ja 21) +(def-art-elt monster-frog-ag monster-frog-blue-hit0-ja 22) +(def-art-elt monster-frog-ag monster-frog-blue-hit0-land-ja 23) +(def-art-elt monster-frog-ag monster-frog-blue-hit1-ja 24) +(def-art-elt monster-frog-ag monster-frog-blue-hit1-land-ja 25) +(def-art-elt monster-frog-ag monster-frog-knocked-yellow-left-ja 26) +(def-art-elt monster-frog-ag monster-frog-knocked-yellow-left-land-ja 27) +(def-art-elt monster-frog-ag monster-frog-knocked-yellow-right-ja 28) +(def-art-elt gun-cit-c-ag gun-cit-c-explode-idle-ja 5) +(def-art-elt gun-cit-c-ag gun-cit-c-explode-lod0-mg 4) +(def-art-elt gun-cit-c-ag gun-cit-c-explode-lod0-jg 3) +(def-art-elt gun-cit-c-ag gun-cit-c-idle-ja 2) +(def-art-elt gun-cit-c-ag gun-cit-c-lod0-mg 1) +(def-art-elt gun-cit-c-ag gun-cit-c-lod0-jg 0) (def-art-elt gun-ag gun-idle-blue-ja 16) (def-art-elt gun-ag gun-idle-yellow-ja 15) (def-art-elt gun-ag gun-idle-dark-ja 14) @@ -329,9 +1141,32 @@ (def-art-elt jak-pilot+0-ag jakb-pilot-bike-get-off-ja 56) (def-art-elt jak-pilot+0-ag jakb-pilot-eject-loop-ja 57) (def-art-elt jak-pilot+0-ag jakb-pilot-gun-red-idle-ja 58) +(def-art-elt metalkor-wings-ag metalkor-wings-impact-ja 6) +(def-art-elt metalkor-wings-ag metalkor-wings-fly-ja 5) +(def-art-elt metalkor-wings-ag metalkor-wings-wings-open-ja 4) +(def-art-elt metalkor-wings-ag metalkor-wings-idle-ja 3) +(def-art-elt metalkor-wings-ag metalkor-wings-shadow-mg 2) +(def-art-elt metalkor-wings-ag metalkor-wings-lod0-mg 1) +(def-art-elt metalkor-wings-ag metalkor-wings-lod0-jg 0) +(def-art-elt errol-highres-ag errol-highres-idle-ja 3) +(def-art-elt errol-highres-ag errol-highres-shadow-mg 2) +(def-art-elt errol-highres-ag errol-highres-lod0-mg 1) +(def-art-elt errol-highres-ag errol-highres-lod0-jg 0) +(def-art-elt time-map-ag time-map-idle-ja 2) +(def-art-elt time-map-ag time-map-lod0-mg 1) +(def-art-elt time-map-ag time-map-lod0-jg 0) +(def-art-elt pal-ent-glass-ag pal-ent-glass-explode-idle-ja 5) +(def-art-elt pal-ent-glass-ag pal-ent-glass-explode-lod0-mg 4) +(def-art-elt pal-ent-glass-ag pal-ent-glass-explode-lod0-jg 3) +(def-art-elt pal-ent-glass-ag pal-ent-glass-idle-ja 2) +(def-art-elt pal-ent-glass-ag pal-ent-glass-lod0-mg 1) +(def-art-elt pal-ent-glass-ag pal-ent-glass-lod0-jg 0) (def-art-elt under-laser-ag under-laser-idle-ja 2) (def-art-elt under-laser-ag under-laser-lod0-mg 1) (def-art-elt under-laser-ag under-laser-lod0-jg 0) +(def-art-elt under-seaweed-c-ag under-seaweed-c-idle-ja 2) +(def-art-elt under-seaweed-c-ag under-seaweed-c-lod0-mg 1) +(def-art-elt under-seaweed-c-ag under-seaweed-c-lod0-jg 0) (def-art-elt drill-barons-ship-ag drill-barons-ship-turret-c-idle-ja 14) (def-art-elt drill-barons-ship-ag drill-barons-ship-turret-c-lod0-mg 13) (def-art-elt drill-barons-ship-ag drill-barons-ship-lod0-jg 0) @@ -347,9 +1182,15 @@ (def-art-elt drill-barons-ship-ag drill-barons-ship-turret-b-lod0-mg 10) (def-art-elt drill-barons-ship-ag drill-barons-ship-turret-b-idle-ja 11) (def-art-elt drill-barons-ship-ag drill-barons-ship-turret-c-lod0-jg 12) +(def-art-elt throne-throne-ag throne-throne-idle-ja 2) +(def-art-elt throne-throne-ag throne-throne-lod0-mg 1) +(def-art-elt throne-throne-ag throne-throne-lod0-jg 0) (def-art-elt under-buoy-chain-ag under-buoy-chain-idle-ja 2) (def-art-elt under-buoy-chain-ag under-buoy-chain-lod0-mg 1) (def-art-elt under-buoy-chain-ag under-buoy-chain-lod0-jg 0) +(def-art-elt ruins-tower-f-ag ruins-tower-f-idle-ja 2) +(def-art-elt ruins-tower-f-ag ruins-tower-f-lod0-mg 1) +(def-art-elt ruins-tower-f-ag ruins-tower-f-lod0-jg 0) (def-art-elt under-plat-shoot-ag under-plat-shoot-idle-ja 3) (def-art-elt under-plat-shoot-ag under-plat-shoot-lod1-mg 2) (def-art-elt under-plat-shoot-ag under-plat-shoot-lod0-mg 1) @@ -358,6 +1199,66 @@ (def-art-elt paddy-wagon-ag paddy-wagon-shadow-mg 2) (def-art-elt paddy-wagon-ag paddy-wagon-lod0-mg 1) (def-art-elt paddy-wagon-ag paddy-wagon-lod0-jg 0) +(def-art-elt cas-flag-b-ag cas-flag-b-idle-ja 2) +(def-art-elt cas-flag-b-ag cas-flag-b-lod0-mg 1) +(def-art-elt cas-flag-b-ag cas-flag-b-lod0-jg 0) +(def-art-elt seal-of-mar-top-ag seal-of-mar-top-idle-ja 2) +(def-art-elt seal-of-mar-top-ag seal-of-mar-top-lod0-mg 1) +(def-art-elt seal-of-mar-top-ag seal-of-mar-top-lod0-jg 0) +(def-art-elt tomb-button-ag tomb-button-idle-ja 2) +(def-art-elt tomb-button-ag tomb-button-lod0-mg 1) +(def-art-elt tomb-button-ag tomb-button-lod0-jg 0) +(def-art-elt tess-ltrntess+0-ag tess-highres-idle-alley-ja 0) +(def-art-elt water-anim-tomb-dark-eco-ag water-anim-tomb-dark-eco-idle-ja 4) +(def-art-elt water-anim-tomb-dark-eco-ag water-anim-tomb-dark-eco-raised-block-lod0-mg 3) +(def-art-elt water-anim-tomb-dark-eco-ag water-anim-tomb-dark-eco-raised-block-lod0-jg 2) +(def-art-elt water-anim-tomb-dark-eco-ag water-anim-tomb-dark-eco-stair-block-lod0-mg 1) +(def-art-elt water-anim-tomb-dark-eco-ag water-anim-tomb-dark-eco-stair-block-lod0-jg 0) +(def-art-elt tomb-boss-door-ag tomb-boss-door-idle-ja 2) +(def-art-elt tomb-boss-door-ag tomb-boss-door-lod0-mg 1) +(def-art-elt tomb-boss-door-ag tomb-boss-door-lod0-jg 0) +(def-art-elt mecha-daxter-ag mecha-daxter-idle-ja 2) +(def-art-elt mecha-daxter-ag mecha-daxter-lod0-mg 1) +(def-art-elt mecha-daxter-ag mecha-daxter-lod0-jg 0) +(def-art-elt race-start-light-ag race-start-light-idle-ja 2) +(def-art-elt race-start-light-ag race-start-light-lod0-mg 1) +(def-art-elt race-start-light-ag race-start-light-lod0-jg 0) +(def-art-elt plat-return-ag mtn-plat-return-idle-ja 4) +(def-art-elt plat-return-ag mtn-plat-return-lod2-mg 3) +(def-art-elt plat-return-ag mtn-plat-return-lod1-mg 2) +(def-art-elt plat-return-ag mtn-plat-return-lod0-mg 1) +(def-art-elt plat-return-ag mtn-plat-return-lod0-jg 0) +(def-art-elt rapid-gunner-ag rapid-gunner-knocked-land0-ja 30) +(def-art-elt rapid-gunner-ag rapid-gunner-die-falling-ja 29) +(def-art-elt rapid-gunner-ag rapid-gunner-aim-ja 12) +(def-art-elt rapid-gunner-ag rapid-gunner-hop-right-ja 11) +(def-art-elt rapid-gunner-ag rapid-gunner-hop-left-ja 10) +(def-art-elt rapid-gunner-ag rapid-gunner-hop-back-ja 9) +(def-art-elt rapid-gunner-ag rapid-gunner-hop-forward-ja 8) +(def-art-elt rapid-gunner-ag rapid-gunner-turn-ja 7) +(def-art-elt rapid-gunner-ag rapid-gunner-notice-ja 6) +(def-art-elt rapid-gunner-ag rapid-gunner-idle-ja 5) +(def-art-elt rapid-gunner-ag rapid-gunner-shadow-mg 4) +(def-art-elt rapid-gunner-ag rapid-gunner-lod2-mg 3) +(def-art-elt rapid-gunner-ag rapid-gunner-lod1-mg 2) +(def-art-elt rapid-gunner-ag rapid-gunner-lod0-mg 1) +(def-art-elt rapid-gunner-ag rapid-gunner-lod0-jg 0) +(def-art-elt rapid-gunner-ag rapid-gunner-shift-gun-ja 13) +(def-art-elt rapid-gunner-ag rapid-gunner-shoot-ja 14) +(def-art-elt rapid-gunner-ag rapid-gunner-shoot1-ja 15) +(def-art-elt rapid-gunner-ag rapid-gunner-shoottoreload-ja 16) +(def-art-elt rapid-gunner-ag rapid-gunner-shoot-track-ja 17) +(def-art-elt rapid-gunner-ag rapid-gunner-spin-attack-ja 18) +(def-art-elt rapid-gunner-ag rapid-gunner-reload-ja 19) +(def-art-elt rapid-gunner-ag rapid-gunner-hit-ja 20) +(def-art-elt rapid-gunner-ag rapid-gunner-hit-left-ja 21) +(def-art-elt rapid-gunner-ag rapid-gunner-hit-right-ja 22) +(def-art-elt rapid-gunner-ag rapid-gunner-knocked0-ja 23) +(def-art-elt rapid-gunner-ag rapid-gunner-blue-hit0-ja 24) +(def-art-elt rapid-gunner-ag rapid-gunner-blue-hit1-ja 25) +(def-art-elt rapid-gunner-ag rapid-gunner-blue-hit2-ja 26) +(def-art-elt rapid-gunner-ag rapid-gunner-land-ja 27) +(def-art-elt rapid-gunner-ag rapid-gunner-die-in-place-ja 28) (def-art-elt drill-control-panel-ag drill-control-panel-a-break-ja 9) (def-art-elt drill-control-panel-ag drill-control-panel-a-idle-ja 8) (def-art-elt drill-control-panel-ag drill-control-panel-a-lod1-mg 7) @@ -371,21 +1272,113 @@ (def-art-elt market-basket-a-ag market-basket-a-idle-ja 2) (def-art-elt market-basket-a-ag market-basket-a-lod0-mg 1) (def-art-elt market-basket-a-ag market-basket-a-lod0-jg 0) +(def-art-elt under-break-door-ag under-break-door-4-end-ja 12) +(def-art-elt under-break-door-ag under-break-door-4-idle-ja 11) +(def-art-elt under-break-door-ag under-break-door-3-end-ja 9) +(def-art-elt under-break-door-ag under-break-door-3-idle-ja 8) +(def-art-elt under-break-door-ag under-break-door-2-end-ja 6) +(def-art-elt under-break-door-ag under-break-door-2-idle-ja 5) +(def-art-elt under-break-door-ag under-break-door-1-end-ja 3) +(def-art-elt under-break-door-ag under-break-door-1-idle-ja 2) +(def-art-elt under-break-door-ag under-break-door-lod0-mg 1) +(def-art-elt under-break-door-ag under-break-door-lod0-jg 0) +(def-art-elt tomb-wing-door-ag tomb-wing-door-idle-ja 2) +(def-art-elt tomb-wing-door-ag tomb-wing-door-lod0-mg 1) +(def-art-elt tomb-wing-door-ag tomb-wing-door-lod0-jg 0) (def-art-elt prsn-hang-cell-ag prsn-hang-cell-idle-ja 2) (def-art-elt prsn-hang-cell-ag prsn-hang-cell-lod0-mg 1) (def-art-elt prsn-hang-cell-ag prsn-hang-cell-lod0-jg 0) +(def-art-elt hip-trophy-n-ag hip-trophy-n-idle-ja 2) +(def-art-elt hip-trophy-n-ag hip-trophy-n-lod0-mg 1) +(def-art-elt hip-trophy-n-ag hip-trophy-n-lod0-jg 0) (def-art-elt race-bike-b-ag race-bike-b-idle-ja 4) (def-art-elt race-bike-b-ag race-bike-b-shadow-mg 3) (def-art-elt race-bike-b-ag race-bike-b-lod1-mg 2) (def-art-elt race-bike-b-ag race-bike-b-lod0-mg 1) (def-art-elt race-bike-b-ag race-bike-b-lod0-jg 0) +(def-art-elt dig-bomb-crate-ag dig-bomb-crate-explode-idle-ja 6) +(def-art-elt dig-bomb-crate-ag dig-bomb-crate-explode-lod0-mg 5) +(def-art-elt dig-bomb-crate-ag dig-bomb-crate-explode-lod0-jg 4) +(def-art-elt dig-bomb-crate-ag dig-bomb-crate-idle-ja 3) +(def-art-elt dig-bomb-crate-ag dig-bomb-crate-lod1-mg 2) +(def-art-elt dig-bomb-crate-ag dig-bomb-crate-lod0-mg 1) +(def-art-elt dig-bomb-crate-ag dig-bomb-crate-lod0-jg 0) (def-art-elt precursor-ag precursor-idle-ja 2) (def-art-elt precursor-ag precursor-lod0-mg 1) (def-art-elt precursor-ag precursor-lod0-jg 0) +(def-art-elt garage-bikec-ag garage-bikec-idle-ja 2) +(def-art-elt garage-bikec-ag garage-bikec-lod0-mg 1) +(def-art-elt garage-bikec-ag garage-bikec-lod0-jg 0) +(def-art-elt warp-gate-ag warp-gate-idle-ja 2) +(def-art-elt warp-gate-ag warp-gate-lod0-mg 1) +(def-art-elt warp-gate-ag warp-gate-lod0-jg 0) +(def-art-elt cas-robot-door-ag cas-robot-door-idle-ja 2) +(def-art-elt cas-robot-door-ag cas-robot-door-lod0-mg 1) +(def-art-elt cas-robot-door-ag cas-robot-door-lod0-jg 0) +(def-art-elt jak-turret+0-ag jakb-turret-get-on-ja 5) +(def-art-elt jak-turret+0-ag jakb-turret-get-off-ja 4) +(def-art-elt jak-turret+0-ag jakb-turret-stance-ja 3) +(def-art-elt jak-turret+0-ag daxter-turret-get-on-ja 2) +(def-art-elt jak-turret+0-ag daxter-turret-get-off-ja 1) +(def-art-elt jak-turret+0-ag daxter-turret-stance-ja 0) (def-art-elt jak-highres-prison-ag jak-highres-prison-idle-ja 3) (def-art-elt jak-highres-prison-ag jak-highres-prison-shadow-mg 2) (def-art-elt jak-highres-prison-ag jak-highres-prison-lod0-mg 1) (def-art-elt jak-highres-prison-ag jak-highres-prison-lod0-jg 0) +(def-art-elt tanker-crash-ag tanker-crash-idle-ja 2) +(def-art-elt tanker-crash-ag tanker-crash-lod0-mg 1) +(def-art-elt tanker-crash-ag tanker-crash-lod0-jg 0) +(def-art-elt gear-device-gear-ag mtn-gear-device-gear-idle-ja 2) +(def-art-elt gear-device-gear-ag mtn-gear-device-gear-lod0-mg 1) +(def-art-elt gear-device-gear-ag mtn-gear-device-gear-lod0-jg 0) +(def-art-elt ashelin-ag ashelin-tumble-right-land-ja 41) +(def-art-elt ashelin-ag ashelin-tumble-right-loop-ja 40) +(def-art-elt ashelin-ag ashelin-tumble-right-start-ja 39) +(def-art-elt ashelin-ag ashelin-cartwheel-left-land-ja 38) +(def-art-elt ashelin-ag ashelin-cartwheel-left-loop-ja 37) +(def-art-elt ashelin-ag ashelin-cartwheel-left-start-ja 36) +(def-art-elt ashelin-ag ashelin-back-spring-land-ja 35) +(def-art-elt ashelin-ag ashelin-back-spring-loop-ja 34) +(def-art-elt ashelin-ag ashelin-back-spring-start-ja 33) +(def-art-elt ashelin-ag ashelin-standing-turn-right-ja 32) +(def-art-elt ashelin-ag ashelin-standing-turn-left-ja 31) +(def-art-elt ashelin-ag ashelin-standing-to-waiting-ja 30) +(def-art-elt ashelin-ag ashelin-standing-idle-ja 29) +(def-art-elt ashelin-ag ashelin-knocked-right-die0-ja 12) +(def-art-elt ashelin-ag ashelin-knocked-right-land0-ja 11) +(def-art-elt ashelin-ag ashelin-knocked-right0-ja 10) +(def-art-elt ashelin-ag ashelin-knocked-back-die0-ja 9) +(def-art-elt ashelin-ag ashelin-knocked-back-land0-ja 8) +(def-art-elt ashelin-ag ashelin-knocked-back0-ja 7) +(def-art-elt ashelin-ag ashelin-run0-ja 6) +(def-art-elt ashelin-ag ashelin-jog0-ja 5) +(def-art-elt ashelin-ag ashelin-walk0-ja 4) +(def-art-elt ashelin-ag ashelin-idle0-ja 3) +(def-art-elt ashelin-ag ashelin-shadow-mg 2) +(def-art-elt ashelin-ag ashelin-lod0-mg 1) +(def-art-elt ashelin-ag ashelin-lod0-jg 0) +(def-art-elt ashelin-ag ashelin-blue-hit-front0-ja 13) +(def-art-elt ashelin-ag ashelin-blue-hit-front1-ja 14) +(def-art-elt ashelin-ag ashelin-blue-hit-front2-ja 15) +(def-art-elt ashelin-ag ashelin-blue-hit-front-land0-ja 16) +(def-art-elt ashelin-ag ashelin-blue-hit-front-land1-ja 17) +(def-art-elt ashelin-ag ashelin-blue-hit-front-land2-ja 18) +(def-art-elt ashelin-ag ashelin-blue-hit-back0-ja 19) +(def-art-elt ashelin-ag ashelin-blue-hit-back1-ja 20) +(def-art-elt ashelin-ag ashelin-blue-hit-back2-ja 21) +(def-art-elt ashelin-ag ashelin-blue-hit-back-land0-ja 22) +(def-art-elt ashelin-ag ashelin-blue-hit-back-land1-ja 23) +(def-art-elt ashelin-ag ashelin-blue-hit-back-land2-ja 24) +(def-art-elt ashelin-ag ashelin-blue-hit-recover-ja 25) +(def-art-elt ashelin-ag ashelin-die-in-place0-ja 26) +(def-art-elt ashelin-ag ashelin-waiting-to-standing-ja 27) +(def-art-elt ashelin-ag ashelin-standing-fire-ja 28) +(def-art-elt fort-led-ag fort-led-idle-ja 2) +(def-art-elt fort-led-ag fort-led-lod0-mg 1) +(def-art-elt fort-led-ag fort-led-lod0-jg 0) +(def-art-elt ruins-tower-rp-ag ruins-tower-rp-idle-ja 2) +(def-art-elt ruins-tower-rp-ag ruins-tower-rp-lod0-mg 1) +(def-art-elt ruins-tower-rp-ag ruins-tower-rp-lod0-jg 0) (def-art-elt grunt-ag grunt-sew-scare-grunt-end-ja 57) (def-art-elt grunt-ag grunt-jump-land-ja 47) (def-art-elt grunt-ag grunt-jump-in-air-ja 46) @@ -435,6 +1428,14 @@ (def-art-elt grunt-ag grunt-knocked2-ja 26) (def-art-elt grunt-ag grunt-knocked-land2-ja 27) (def-art-elt grunt-ag grunt-explode0-ja 28) +(def-art-elt rift-ring-in-game-ag rift-ring-in-game-idle-ja 2) +(def-art-elt rift-ring-in-game-ag rift-ring-in-game-lod0-mg 1) +(def-art-elt rift-ring-in-game-ag rift-ring-in-game-lod0-jg 0) +(def-art-elt atoll-hellcat-ag atoll-hellcat-idle-ja 4) +(def-art-elt atoll-hellcat-ag atoll-hellcat-lod2-mg 3) +(def-art-elt atoll-hellcat-ag atoll-hellcat-lod1-mg 2) +(def-art-elt atoll-hellcat-ag atoll-hellcat-lod0-mg 1) +(def-art-elt atoll-hellcat-ag atoll-hellcat-lod0-jg 0) (def-art-elt water-anim-fortress-ag water-anim-fortress-idle-ja 2) (def-art-elt water-anim-fortress-ag water-anim-fortress-exitb-pool-lod0-mg 1) (def-art-elt water-anim-fortress-ag water-anim-fortress-exitb-pool-lod0-jg 0) @@ -442,12 +1443,131 @@ (def-art-elt drill-lift-ag drill-lift-lod1-mg 2) (def-art-elt drill-lift-ag drill-lift-lod0-mg 1) (def-art-elt drill-lift-ag drill-lift-lod0-jg 0) +(def-art-elt kor-break-ag kor-break-idle-ja 2) +(def-art-elt kor-break-ag kor-break-lod0-mg 1) +(def-art-elt kor-break-ag kor-break-lod0-jg 0) +(def-art-elt under-seaweed-a-ag under-seaweed-a-idle-ja 2) +(def-art-elt under-seaweed-a-ag under-seaweed-a-lod0-mg 1) +(def-art-elt under-seaweed-a-ag under-seaweed-a-lod0-jg 0) +(def-art-elt kid-ag kid-knocked-land0-ja 18) +(def-art-elt kid-ag kid-knocked0-ja 17) +(def-art-elt kid-ag kid-arrest-idle0-ja 16) +(def-art-elt kid-ag kid-arrest-start-ja 15) +(def-art-elt kid-ag kid-turn-right150-end0-ja 14) +(def-art-elt kid-ag kid-turn-right100-end0-ja 13) +(def-art-elt kid-ag kid-lod0-jg 0) +(def-art-elt kid-ag kid-lod0-mg 1) +(def-art-elt kid-ag kid-shadow-mg 2) +(def-art-elt kid-ag kid-idle0-ja 3) +(def-art-elt kid-ag kid-scared0-ja 4) +(def-art-elt kid-ag kid-walk0-ja 5) +(def-art-elt kid-ag kid-run0-ja 6) +(def-art-elt kid-ag kid-turn-left-start0-ja 7) +(def-art-elt kid-ag kid-turn-left50-end0-ja 8) +(def-art-elt kid-ag kid-turn-left100-end0-ja 9) +(def-art-elt kid-ag kid-turn-left150-end0-ja 10) +(def-art-elt kid-ag kid-turn-right-start0-ja 11) +(def-art-elt kid-ag kid-turn-right50-end0-ja 12) +(def-art-elt hide-light-ag hide-light-fog-idle-ja 7) +(def-art-elt hide-light-ag hide-light-fog-lod0-mg 6) +(def-art-elt hide-light-ag hide-light-fog-lod0-jg 5) +(def-art-elt hide-light-ag hide-light-idle-ja 3) +(def-art-elt hide-light-ag hide-light-shadow-mg 2) +(def-art-elt hide-light-ag hide-light-lod0-mg 1) +(def-art-elt hide-light-ag hide-light-lod0-jg 0) +(def-art-elt mtn-lens-base-ag mtn-lens-base-opened-ja 3) +(def-art-elt mtn-lens-base-ag mtn-lens-base-idle-ja 2) +(def-art-elt mtn-lens-base-ag mtn-lens-base-lod0-mg 1) +(def-art-elt mtn-lens-base-ag mtn-lens-base-lod0-jg 0) +(def-art-elt pal-grind-ring-ag pal-grind-ring-idle-ja 2) +(def-art-elt pal-grind-ring-ag pal-grind-ring-lod0-mg 1) +(def-art-elt pal-grind-ring-ag pal-grind-ring-lod0-jg 0) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lens-idle-erect-ja 8) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lens-idle-ja 7) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lens-lod0-mg 6) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lens-lod0-jg 5) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-idle-erect-ja 3) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-idle-ja 2) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lod0-mg 1) +(def-art-elt mincan-lighthouse-ag mincan-lighthouse-lod0-jg 0) +(def-art-elt mar-statue-ag sew-mar-statue-idle-ja 2) +(def-art-elt mar-statue-ag sew-mar-statue-lod0-mg 1) +(def-art-elt mar-statue-ag sew-mar-statue-lod0-jg 0) +(def-art-elt strip-conveyor-ag strip-conveyor-idle-ja 2) +(def-art-elt strip-conveyor-ag strip-conveyor-lod0-mg 1) +(def-art-elt strip-conveyor-ag strip-conveyor-lod0-jg 0) +(def-art-elt precipice-b-ag precipice-b-idle-ja 2) +(def-art-elt precipice-b-ag precipice-b-lod0-mg 1) +(def-art-elt precipice-b-ag precipice-b-lod0-jg 0) (def-art-elt drill-turret-int-ag drill-turret-int-idle-ja 2) (def-art-elt drill-turret-int-ag drill-turret-int-lod0-mg 1) (def-art-elt drill-turret-int-ag drill-turret-int-lod0-jg 0) +(def-art-elt door-ag oracle-door-idle-ja 2) +(def-art-elt door-ag oracle-door-lod0-mg 1) +(def-art-elt door-ag oracle-door-lod0-jg 0) +(def-art-elt tomb-door-ag tomb-door-open-ja 3) +(def-art-elt tomb-door-ag tomb-door-idle-ja 2) +(def-art-elt tomb-door-ag tomb-door-lod0-mg 1) +(def-art-elt tomb-door-ag tomb-door-lod0-jg 0) +(def-art-elt mincan-lens-ag mincan-lens-idle-closed-ja 3) +(def-art-elt mincan-lens-ag mincan-lens-idle-ja 2) +(def-art-elt mincan-lens-ag mincan-lens-lod0-mg 1) +(def-art-elt mincan-lens-ag mincan-lens-lod0-jg 0) (def-art-elt blocking-plane-ag blocking-plane-idle-ja 2) (def-art-elt blocking-plane-ag blocking-plane-lod0-mg 1) (def-art-elt blocking-plane-ag blocking-plane-lod0-jg 0) +(def-art-elt mantis-ag mantis-hop-left-land-ja 38) +(def-art-elt mantis-ag mantis-hop-left-ja 37) +(def-art-elt mantis-ag mantis-roll-left-ja 36) +(def-art-elt mantis-ag mantis-roll-right-land-ja 35) +(def-art-elt mantis-ag mantis-roll-right-ja 34) +(def-art-elt mantis-ag mantis-attack1-land-ja 33) +(def-art-elt mantis-ag mantis-attack1-go-ja 32) +(def-art-elt mantis-ag mantis-attack1-wind-up-ja 31) +(def-art-elt mantis-ag mantis-attack0-land-ja 30) +(def-art-elt mantis-ag mantis-attack0-ja 29) +(def-art-elt mantis-ag mantis-hop-forward-wind-up-ja 12) +(def-art-elt mantis-ag mantis-knocked-red-land0-ja 11) +(def-art-elt mantis-ag mantis-knocked-red0-ja 10) +(def-art-elt mantis-ag mantis-run0-ja 9) +(def-art-elt mantis-ag mantis-idle1-to-idle0-ja 8) +(def-art-elt mantis-ag mantis-idle0-to-idle1-ja 7) +(def-art-elt mantis-ag mantis-idle1-ja 6) +(def-art-elt mantis-ag mantis-idle0-ja 5) +(def-art-elt mantis-ag mantis-shadow-mg 4) +(def-art-elt mantis-ag mantis-lod2-mg 3) +(def-art-elt mantis-ag mantis-lod1-mg 2) +(def-art-elt mantis-ag mantis-lod0-mg 1) +(def-art-elt mantis-ag mantis-lod0-jg 0) +(def-art-elt mantis-ag mantis-hop-forward-go-ja 13) +(def-art-elt mantis-ag mantis-hop-backward-wind-up-ja 14) +(def-art-elt mantis-ag mantis-hop-backward-go-ja 15) +(def-art-elt mantis-ag mantis-hop-backward-land-ja 16) +(def-art-elt mantis-ag mantis-flip-forward-wind-up-ja 17) +(def-art-elt mantis-ag mantis-flip-forward-go-ja 18) +(def-art-elt mantis-ag mantis-flip-forward-land-ja 19) +(def-art-elt mantis-ag mantis-flip-backward-wind-up-ja 20) +(def-art-elt mantis-ag mantis-flip-backward-go-ja 21) +(def-art-elt mantis-ag mantis-flip-backward-land-ja 22) +(def-art-elt mantis-ag mantis-ground-jump-out-ja 23) +(def-art-elt mantis-ag mantis-ground-jump-out-land-ja 24) +(def-art-elt mantis-ag mantis-ground-crawl-out-ja 25) +(def-art-elt mantis-ag mantis-death0-ja 26) +(def-art-elt mantis-ag mantis-knocked-blue0-ja 27) +(def-art-elt mantis-ag mantis-knocked-blue-land0-ja 28) +(def-art-elt tomb-vibe-ag tomb-vibe-fall-ja 5) +(def-art-elt tomb-vibe-ag tomb-vibe-vibrate-ja 4) +(def-art-elt tomb-vibe-ag tomb-vibe-idle-ja 3) +(def-art-elt tomb-vibe-ag tomb-vibe-lod1-mg 2) +(def-art-elt tomb-vibe-ag tomb-vibe-lod0-mg 1) +(def-art-elt tomb-vibe-ag tomb-vibe-lod0-jg 0) +(def-art-elt tomb-move-swing-pole-ag tomb-move-swing-pole-idle-ja 2) +(def-art-elt tomb-move-swing-pole-ag tomb-move-swing-pole-lod0-mg 1) +(def-art-elt tomb-move-swing-pole-ag tomb-move-swing-pole-lod0-jg 0) +(def-art-elt fort-plat-shuttle-ag fort-plat-shuttle-idle-ja 3) +(def-art-elt fort-plat-shuttle-ag fort-plat-shuttle-lod1-mg 2) +(def-art-elt fort-plat-shuttle-ag fort-plat-shuttle-lod0-mg 1) +(def-art-elt fort-plat-shuttle-ag fort-plat-shuttle-lod0-jg 0) (def-art-elt market-sack-a-ag market-sack-a-idle-ja 2) (def-art-elt market-sack-a-ag market-sack-a-lod0-mg 1) (def-art-elt market-sack-a-ag market-sack-a-lod0-jg 0) @@ -457,12 +1577,49 @@ (def-art-elt onin-highres-ag onin-highres-shadow-mg 2) (def-art-elt onin-highres-ag onin-highres-lod0-mg 1) (def-art-elt onin-highres-ag onin-highres-lod0-jg 0) +(def-art-elt tanker-barrels-ag tanker-barrels-idle-ja 2) +(def-art-elt tanker-barrels-ag tanker-barrels-lod0-mg 1) +(def-art-elt tanker-barrels-ag tanker-barrels-lod0-jg 0) +(def-art-elt crimson-guard-lowres-ag crimson-guard-lowres-shadow-mg 2) +(def-art-elt crimson-guard-lowres-ag crimson-guard-lowres-lod0-mg 1) +(def-art-elt crimson-guard-lowres-ag crimson-guard-lowres-lod0-jg 0) +(def-art-elt mtn-lens-ag mtn-lens-idle-ja 2) +(def-art-elt mtn-lens-ag mtn-lens-lod0-mg 1) +(def-art-elt mtn-lens-ag mtn-lens-lod0-jg 0) +(def-art-elt fort-turret-ag fort-turret-explode-idle-ja 9) +(def-art-elt fort-turret-ag fort-turret-explode-lod0-mg 8) +(def-art-elt fort-turret-ag fort-turret-explode-lod0-jg 7) +(def-art-elt fort-turret-ag fort-turret-rise-ja 6) +(def-art-elt fort-turret-ag fort-turret-shoot-ja 5) +(def-art-elt fort-turret-ag fort-turret-idle-ja 4) +(def-art-elt fort-turret-ag fort-turret-shadow-mg 3) +(def-art-elt fort-turret-ag fort-turret-lod1-mg 2) +(def-art-elt fort-turret-ag fort-turret-lod0-mg 1) +(def-art-elt fort-turret-ag fort-turret-lod0-jg 0) +(def-art-elt pal-lowrez-throne-ag pal-lowrez-throne-idle-ja 2) +(def-art-elt pal-lowrez-throne-ag pal-lowrez-throne-lod0-mg 1) +(def-art-elt pal-lowrez-throne-ag pal-lowrez-throne-lod0-jg 0) (def-art-elt rift-ring-ag rift-ring-idle-ja 2) (def-art-elt rift-ring-ag rift-ring-lod0-mg 1) (def-art-elt rift-ring-ag rift-ring-lod0-jg 0) +(def-art-elt fort-robotank-top-ag fort-robotank-top-fire-end-ja 5) +(def-art-elt fort-robotank-top-ag fort-robotank-top-fire-start-ja 4) +(def-art-elt fort-robotank-top-ag fort-robotank-top-idle-ja 3) +(def-art-elt fort-robotank-top-ag fort-robotank-top-lod1-mg 2) +(def-art-elt fort-robotank-top-ag fort-robotank-top-lod0-mg 1) +(def-art-elt fort-robotank-top-ag fort-robotank-top-lod0-jg 0) (def-art-elt vil-break-support-ag vil-break-support-idle-ja 2) (def-art-elt vil-break-support-ag vil-break-support-lod0-mg 1) (def-art-elt vil-break-support-ag vil-break-support-lod0-jg 0) +(def-art-elt gun-dummy-c-ag gun-dummy-c-explode-idle-ja 5) +(def-art-elt gun-dummy-c-ag gun-dummy-c-explode-lod0-mg 4) +(def-art-elt gun-dummy-c-ag gun-dummy-c-explode-lod0-jg 3) +(def-art-elt gun-dummy-c-ag gun-dummy-c-idle-ja 2) +(def-art-elt gun-dummy-c-ag gun-dummy-c-lod0-mg 1) +(def-art-elt gun-dummy-c-ag gun-dummy-c-lod0-jg 0) +(def-art-elt hip-bottle-c-ag hip-bottle-c-idle-ja 2) +(def-art-elt hip-bottle-c-ag hip-bottle-c-lod0-mg 1) +(def-art-elt hip-bottle-c-ag hip-bottle-c-lod0-jg 0) (def-art-elt darkjak-highres-ag darkjak-highres-idle-ja 2) (def-art-elt darkjak-highres-ag darkjak-highres-lod0-mg 1) (def-art-elt darkjak-highres-ag darkjak-highres-lod0-jg 0) @@ -492,18 +1649,73 @@ (def-art-elt collectables-ag collectables-generic-blast-lod0-jg 10) (def-art-elt collectables-ag collectables-generic-blast-lod0-mg 11) (def-art-elt collectables-ag collectables-generic-blast-idle-ja 12) +(def-art-elt kid-lyskdcd+0-ag kid-highres-idle-alley-ja 0) +(def-art-elt tomb-boss-explode-ag tomb-boss-explode-a-lod0-mg 4) +(def-art-elt tomb-boss-explode-ag tomb-boss-explode-a-lod0-jg 3) +(def-art-elt tomb-boss-explode-ag tomb-boss-explode-lod0-mg 1) +(def-art-elt tomb-boss-explode-ag tomb-boss-explode-lod0-jg 0) +(def-art-elt fort-dump-bomb-a-ag fort-dump-bomb-a-idle-ja 3) +(def-art-elt fort-dump-bomb-a-ag fort-dump-bomb-a-lod1-mg 2) +(def-art-elt fort-dump-bomb-a-ag fort-dump-bomb-a-lod0-mg 1) +(def-art-elt fort-dump-bomb-a-ag fort-dump-bomb-a-lod0-jg 0) (def-art-elt com-airlock-outer-ag com-airlock-outer-idle-ja 2) (def-art-elt com-airlock-outer-ag com-airlock-outer-lod0-mg 1) (def-art-elt com-airlock-outer-ag com-airlock-outer-lod0-jg 0) +(def-art-elt krew-highres-ag krew-highres-idle-float-ja 4) +(def-art-elt krew-highres-ag krew-highres-idle-ja 3) +(def-art-elt krew-highres-ag krew-highres-shadow-mg 2) +(def-art-elt krew-highres-ag krew-highres-lod0-mg 1) +(def-art-elt krew-highres-ag krew-highres-lod0-jg 0) (def-art-elt baron-statue-ag baron-statue-idle-ja 2) (def-art-elt baron-statue-ag baron-statue-lod0-mg 1) (def-art-elt baron-statue-ag baron-statue-lod0-jg 0) +(def-art-elt farm-cabbage-ag farm-cabbage-explode-idle-ja 5) +(def-art-elt farm-cabbage-ag farm-cabbage-explode-lod0-mg 4) +(def-art-elt farm-cabbage-ag farm-cabbage-explode-lod0-jg 3) +(def-art-elt farm-cabbage-ag farm-cabbage-idle-ja 2) +(def-art-elt farm-cabbage-ag farm-cabbage-lod0-mg 1) +(def-art-elt farm-cabbage-ag farm-cabbage-lod0-jg 0) +(def-art-elt mine-a-ag sew-mine-a-idle-ja 2) +(def-art-elt mine-a-ag sew-mine-a-lod0-mg 1) +(def-art-elt mine-a-ag sew-mine-a-lod0-jg 0) +(def-art-elt flag-ag flag-idle-ja 3) +(def-art-elt flag-ag flag-lod1-mg 2) +(def-art-elt flag-ag flag-lod0-mg 1) +(def-art-elt flag-ag flag-lod0-jg 0) +(def-art-elt water-anim-tomb-ag water-anim-tomb-idle-ja 12) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-f-lod0-mg 11) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-f-lod0-jg 10) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-e-lod0-mg 9) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-e-lod0-jg 8) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-d-lod0-mg 7) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-d-lod0-jg 6) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-c-lod0-mg 5) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-c-lod0-jg 4) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-b-lod0-mg 3) +(def-art-elt water-anim-tomb-ag water-anim-tomb-tunnel-b-lod0-jg 2) +(def-art-elt water-anim-tomb-ag water-anim-tomb-main-hall-lod0-mg 1) +(def-art-elt water-anim-tomb-ag water-anim-tomb-main-hall-lod0-jg 0) +(def-art-elt metalkor-chopped-ag metalkor-chopped-idle-ja 2) +(def-art-elt metalkor-chopped-ag metalkor-chopped-lod0-mg 1) +(def-art-elt metalkor-chopped-ag metalkor-chopped-lod0-jg 0) (def-art-elt citizen-norm-rider-ag citizen-norm-rider-car-stance-ja 5) (def-art-elt citizen-norm-rider-ag citizen-norm-rider-bike-stance-ja 4) (def-art-elt citizen-norm-rider-ag citizen-norm-rider-idle-ja 3) (def-art-elt citizen-norm-rider-ag citizen-norm-rider-lod2-mg 2) (def-art-elt citizen-norm-rider-ag citizen-norm-rider-lod0-mg 1) (def-art-elt citizen-norm-rider-ag citizen-norm-rider-lod0-jg 0) +(def-art-elt cntrlrm-door-ag cntrlrm-door-opened-ja 3) +(def-art-elt cntrlrm-door-ag cntrlrm-door-idle-ja 2) +(def-art-elt cntrlrm-door-ag cntrlrm-door-lod0-mg 1) +(def-art-elt cntrlrm-door-ag cntrlrm-door-lod0-jg 0) +(def-art-elt rift-rider-dash-ag rift-rider-dash-idle-ja 2) +(def-art-elt rift-rider-dash-ag rift-rider-dash-lod0-mg 1) +(def-art-elt rift-rider-dash-ag rift-rider-dash-lod0-jg 0) +(def-art-elt fort-robotank-sight-ag fort-robotank-sight-locked-ja 4) +(def-art-elt fort-robotank-sight-ag fort-robotank-sight-idle-ja 3) +(def-art-elt fort-robotank-sight-ag fort-robotank-sight-shadow-mg 2) +(def-art-elt fort-robotank-sight-ag fort-robotank-sight-lod0-mg 1) +(def-art-elt fort-robotank-sight-ag fort-robotank-sight-lod0-jg 0) (def-art-elt crimson-guard-hover-ag crimson-guard-hover-explode-idle-ja 25) (def-art-elt crimson-guard-hover-ag crimson-guard-hover-explode-lod0-mg 24) (def-art-elt crimson-guard-hover-ag crimson-guard-hover-explode-lod0-jg 23) @@ -527,13 +1739,55 @@ (def-art-elt crimson-guard-hover-ag crimson-guard-hover-knocked0-ja 10) (def-art-elt crimson-guard-hover-ag crimson-guard-hover-knocked0-recover-ja 11) (def-art-elt crimson-guard-hover-ag crimson-guard-hover-knocked1-ja 12) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-c-lod0-jg 12) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-b-idle-ja 10) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-b-lod0-mg 9) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-b-lod0-jg 8) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-a-idle-ja 6) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-a-lod0-mg 5) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-a-lod0-jg 4) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-idle-ja 2) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-c-idle-ja 14) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-lod0-mg 1) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-c-lod0-mg 13) +(def-art-elt consite-break-scaffold-a-ag consite-break-scaffold-a-break-lod0-jg 0) (def-art-elt rift-break-ring-ag rift-break-ring-idle-ja 2) (def-art-elt rift-break-ring-ag rift-break-ring-lod0-mg 1) (def-art-elt rift-break-ring-ag rift-break-ring-lod0-jg 0) +(def-art-elt youngsamos-highres-ag youngsamos-highres-walk1-ja 26) +(def-art-elt youngsamos-highres-ag youngsamos-highres-walk0-ja 25) +(def-art-elt youngsamos-highres-ag youngsamos-highres-death0-end-ja 24) +(def-art-elt youngsamos-highres-ag youngsamos-highres-death0-ja 23) +(def-art-elt youngsamos-highres-ag youngsamos-highres-knocked-forward-land-ja 22) +(def-art-elt youngsamos-highres-ag youngsamos-highres-knocked-forward-ja 21) +(def-art-elt youngsamos-highres-ag youngsamos-highres-knocked-back-land-ja 20) +(def-art-elt youngsamos-highres-ag youngsamos-highres-knocked-back-ja 19) +(def-art-elt youngsamos-highres-ag youngsamos-highres-lod0-jg 0) +(def-art-elt youngsamos-highres-ag youngsamos-highres-hit-right0-ja 13) +(def-art-elt youngsamos-highres-ag youngsamos-highres-lod0-mg 1) +(def-art-elt youngsamos-highres-ag youngsamos-highres-hit-left0-ja 14) +(def-art-elt youngsamos-highres-ag youngsamos-highres-shadow-mg 2) +(def-art-elt youngsamos-highres-ag youngsamos-highres-death-fall-ja 15) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-ja 3) +(def-art-elt youngsamos-highres-ag youngsamos-highres-death-land-ja 16) +(def-art-elt youngsamos-highres-ag youngsamos-highres-stand-to-meditate0-ja 10) +(def-art-elt youngsamos-highres-ag youngsamos-highres-idle-deep-meditate0-ja 11) +(def-art-elt youngsamos-highres-ag youngsamos-highres-hit-back0-ja 12) +(def-art-elt youngsamos-highres-ag youngsamos-highres-stand0-ja 17) +(def-art-elt youngsamos-highres-ag youngsamos-highres-raise-ship-ja 18) (def-art-elt jak-tube+0-ag jakb-tube-jump-land-ja 3) (def-art-elt jak-tube+0-ag jakb-tube-turn-ja 2) (def-art-elt jak-tube+0-ag daxter-tube-jump-land-ja 1) (def-art-elt jak-tube+0-ag daxter-tube-turn-ja 0) +(def-art-elt under-seaweed-d-ag under-seaweed-d-idle-ja 2) +(def-art-elt under-seaweed-d-ag under-seaweed-d-lod0-mg 1) +(def-art-elt under-seaweed-d-ag under-seaweed-d-lod0-jg 0) +(def-art-elt pecker-highres-ag pecker-highres-idle-wakeup-ja 5) +(def-art-elt pecker-highres-ag pecker-highres-idle-sleep-ja 4) +(def-art-elt pecker-highres-ag pecker-highres-idle-ja 3) +(def-art-elt pecker-highres-ag pecker-highres-shadow-mg 2) +(def-art-elt pecker-highres-ag pecker-highres-lod0-mg 1) +(def-art-elt pecker-highres-ag pecker-highres-lod0-jg 0) (def-art-elt sig-ag sig-chased-idle-loop-ja 62) (def-art-elt sig-ag sig-chased-idle-start-ja 61) (def-art-elt sig-ag sig-chased-shoot-jump-land0-ja 60) @@ -597,21 +1851,205 @@ (def-art-elt sig-ag sig-chased-run0-ja 56) (def-art-elt sig-ag sig-chased-run-jump0-ja 57) (def-art-elt sig-ag sig-chased-run-jump-land0-ja 58) +(def-art-elt oracle-roof-banner-ag oracle-roof-banner-idle-ja 2) +(def-art-elt oracle-roof-banner-ag oracle-roof-banner-lod0-mg 1) +(def-art-elt oracle-roof-banner-ag oracle-roof-banner-lod0-jg 0) +(def-art-elt jinx-bomb-ag jinx-bomb-idle-ja 2) +(def-art-elt jinx-bomb-ag jinx-bomb-lod0-mg 1) +(def-art-elt jinx-bomb-ag jinx-bomb-lod0-jg 0) +(def-art-elt onin-game+0-ag pecker-highres-idle-game-ja 1) +(def-art-elt onin-game+0-ag onin-highres-idle-game-ja 0) +(def-art-elt pal-prong-ag pal-prong-explode-idle-ja 5) +(def-art-elt pal-prong-ag pal-prong-explode-lod0-mg 4) +(def-art-elt pal-prong-ag pal-prong-explode-lod0-jg 3) +(def-art-elt pal-prong-ag pal-prong-idle-ja 2) +(def-art-elt pal-prong-ag pal-prong-lod0-mg 1) +(def-art-elt pal-prong-ag pal-prong-lod0-jg 0) +(def-art-elt tess-lhiphog+0-ag tess-highres-idle-hiphog-ja 0) +(def-art-elt consite-bomb-elevator-ag consite-bomb-elevator-hinges-idle-ja 6) +(def-art-elt consite-bomb-elevator-ag consite-bomb-elevator-hinges-lod0-mg 5) +(def-art-elt consite-bomb-elevator-ag consite-bomb-elevator-hinges-lod0-jg 4) +(def-art-elt consite-bomb-elevator-ag consite-bomb-elevator-idle-ja 2) +(def-art-elt consite-bomb-elevator-ag consite-bomb-elevator-lod0-mg 1) +(def-art-elt consite-bomb-elevator-ag consite-bomb-elevator-lod0-jg 0) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy12-ja 43) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy11-ja 42) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy10-ja 41) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy9-ja 40) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy8-ja 39) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy7-ja 38) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-dummy6-ja 37) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-shock-end-ja 36) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-shock-ja 35) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-shock-ja 34) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-angry-ja 33) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-tired-ja 32) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-crazy-ja 31) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack7-ja 30) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack6-ja 29) +(def-art-elt daxter-mole+0-ag big-bopper-mole-shock-ja 12) +(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-angry-ja 11) +(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-tired-ja 10) +(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-crazy-ja 9) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack7-ja 8) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack6-ja 7) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack5-ja 6) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack4-ja 5) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack3-ja 4) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack2-ja 3) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack1-ja 2) +(def-art-elt daxter-mole+0-ag big-bopper-mole-whack0-ja 1) +(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-ja 0) +(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-shock-ja 13) +(def-art-elt daxter-mole+0-ag big-bopper-mole-idle-shock-end-ja 14) +(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy6-ja 15) +(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy7-ja 16) +(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy8-ja 17) +(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy9-ja 18) +(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy10-ja 19) +(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy11-ja 20) +(def-art-elt daxter-mole+0-ag big-bopper-mole-dummy12-ja 21) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-idle-ja 22) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack0-ja 23) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack1-ja 24) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack2-ja 25) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack3-ja 26) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack4-ja 27) +(def-art-elt daxter-mole+0-ag daxter-highres-mole-whack5-ja 28) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-single-section-reverse-ja 10) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-section-three-reverse-ja 9) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-section-two-reverse-ja 8) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-section-one-reverse-ja 7) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-single-section-ja 6) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-section-three-ja 5) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-section-two-ja 4) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-section-one-ja 3) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-idle-ja 2) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-lod0-mg 1) +(def-art-elt cas-rot-bridge-ag cas-rot-bridge-lod0-jg 0) +(def-art-elt water-anim-mountain-dark-eco-ag water-anim-mountain-dark-eco-idle-ja 2) +(def-art-elt water-anim-mountain-dark-eco-ag water-anim-mountain-dark-eco-dice-lod0-mg 1) +(def-art-elt water-anim-mountain-dark-eco-ag water-anim-mountain-dark-eco-dice-lod0-jg 0) +(def-art-elt samos-ag samos-death0-end-ja 14) +(def-art-elt samos-ag samos-death0-ja 13) +(def-art-elt samos-ag samos-lod0-jg 0) +(def-art-elt samos-ag samos-lod0-mg 1) +(def-art-elt samos-ag samos-lod1-mg 2) +(def-art-elt samos-ag samos-shadow-mg 3) +(def-art-elt samos-ag samos-idle-ja 4) +(def-art-elt samos-ag samos-idle-bots-ja 5) +(def-art-elt samos-ag samos-stand0-ja 6) +(def-art-elt samos-ag samos-raise-ship-ja 7) +(def-art-elt samos-ag samos-walk0-ja 8) +(def-art-elt samos-ag samos-knocked-forward-ja 9) +(def-art-elt samos-ag samos-knocked-forward-land-ja 10) +(def-art-elt samos-ag samos-knocked-back-ja 11) +(def-art-elt samos-ag samos-knocked-back-land-ja 12) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-c-end-ja 16) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-c-idle-ja 15) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-a-lod0-jg 0) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-c-lod0-mg 13) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-a-lod0-mg 1) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-c-lod1-mg 14) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-a-lod1-mg 2) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-a-idle-ja 3) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-a-end-ja 4) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-b-lod0-jg 6) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-b-lod0-mg 7) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-b-lod1-mg 8) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-b-idle-ja 9) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-b-end-ja 10) +(def-art-elt mtn-step-plat-rocks-ag mtn-step-plat-rocks-c-lod0-jg 12) (def-art-elt ctywide-arrow-ag ctywide-arrow-idle-ja 2) (def-art-elt ctywide-arrow-ag ctywide-arrow-lod0-mg 1) (def-art-elt ctywide-arrow-ag ctywide-arrow-lod0-jg 0) +(def-art-elt jak-indax+0-ag daxter-indax-dummy9-ja 36) +(def-art-elt jak-indax+0-ag daxter-indax-dummy8-ja 35) +(def-art-elt jak-indax+0-ag daxter-indax-dummy7-ja 34) +(def-art-elt jak-indax+0-ag daxter-indax-dummy6-ja 33) +(def-art-elt jak-indax+0-ag daxter-indax-dummy5-ja 32) +(def-art-elt jak-indax+0-ag daxter-indax-dummy4-ja 31) +(def-art-elt jak-indax+0-ag daxter-indax-dummy3-ja 30) +(def-art-elt jak-indax+0-ag daxter-indax-trip-land-ja 29) +(def-art-elt jak-indax+0-ag daxter-indax-run-squash-ja 12) +(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-land-ja 11) +(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-loop-ja 10) +(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-ja 9) +(def-art-elt jak-indax+0-ag daxter-indax-run-look-back-ja 8) +(def-art-elt jak-indax+0-ag daxter-indax-attack-spin-end-ja 7) +(def-art-elt jak-indax+0-ag daxter-indax-attack-spin-ja 6) +(def-art-elt jak-indax+0-ag daxter-indax-jump-land-ja 5) +(def-art-elt jak-indax+0-ag daxter-indax-jump-loop-ja 4) +(def-art-elt jak-indax+0-ag daxter-indax-jump-ja 3) +(def-art-elt jak-indax+0-ag daxter-indax-run-ja 2) +(def-art-elt jak-indax+0-ag daxter-indax-walk-ja 1) +(def-art-elt jak-indax+0-ag daxter-indax-stance-ja 0) +(def-art-elt jak-indax+0-ag daxter-indax-attack-spin-air-ja 13) +(def-art-elt jak-indax+0-ag daxter-indax-run-to-stance-ja 14) +(def-art-elt jak-indax+0-ag daxter-indax-hit-front-ja 15) +(def-art-elt jak-indax+0-ag daxter-indax-hit-back-ja 16) +(def-art-elt jak-indax+0-ag daxter-indax-hit-roll-ja 17) +(def-art-elt jak-indax+0-ag daxter-indax-death-squashed-ja 18) +(def-art-elt jak-indax+0-ag daxter-indax-death-fall-ja 19) +(def-art-elt jak-indax+0-ag daxter-indax-death-kill-ja 20) +(def-art-elt jak-indax+0-ag daxter-indax-death-eaten-ja 21) +(def-art-elt jak-indax+0-ag daxter-indax-running-attack-ja 22) +(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-hands-ja 23) +(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-hands-loop-ja 24) +(def-art-elt jak-indax+0-ag daxter-indax-jump-forward-hands-land-ja 25) +(def-art-elt jak-indax+0-ag daxter-indax-run-squash-hands-ja 26) +(def-art-elt jak-indax+0-ag daxter-indax-running-attack-end-ja 27) +(def-art-elt jak-indax+0-ag daxter-indax-trip-ja 28) (def-art-elt burning-bush-ag burning-bush-idle-ja 2) (def-art-elt burning-bush-ag burning-bush-lod0-mg 1) (def-art-elt burning-bush-ag burning-bush-lod0-jg 0) (def-art-elt security-wall-ag security-wall-idle-ja 2) (def-art-elt security-wall-ag security-wall-lod0-mg 1) (def-art-elt security-wall-ag security-wall-lod0-jg 0) +(def-art-elt hip-whack-a-metal-ag hip-whack-a-metal-idle-ja 2) +(def-art-elt hip-whack-a-metal-ag hip-whack-a-metal-lod0-mg 1) +(def-art-elt hip-whack-a-metal-ag hip-whack-a-metal-lod0-jg 0) +(def-art-elt pal-breakable-window-ag pal-breakable-window-explode-idle-ja 5) +(def-art-elt pal-breakable-window-ag pal-breakable-window-explode-lod0-mg 4) +(def-art-elt pal-breakable-window-ag pal-breakable-window-explode-lod0-jg 3) +(def-art-elt pal-breakable-window-ag pal-breakable-window-idle-ja 2) +(def-art-elt pal-breakable-window-ag pal-breakable-window-lod0-mg 1) +(def-art-elt pal-breakable-window-ag pal-breakable-window-lod0-jg 0) +(def-art-elt onin-brain-ag onin-brain-idle-ja 2) +(def-art-elt onin-brain-ag onin-brain-lod0-mg 1) +(def-art-elt onin-brain-ag onin-brain-lod0-jg 0) (def-art-elt carc-ag carc-idle-ja 5) (def-art-elt carc-ag carc-shadow-mg 4) (def-art-elt carc-ag carc-lod2-mg 3) (def-art-elt carc-ag carc-lod1-mg 2) (def-art-elt carc-ag carc-lod0-mg 1) (def-art-elt carc-ag carc-lod0-jg 0) +(def-art-elt tanker-roof-break-ag tanker-roof-break-idle-ja 2) +(def-art-elt tanker-roof-break-ag tanker-roof-break-lod0-mg 1) +(def-art-elt tanker-roof-break-ag tanker-roof-break-lod0-jg 0) +(def-art-elt pushblock-ag pushblock-idle-ja 3) +(def-art-elt pushblock-ag pushblock-lod1-mg 2) +(def-art-elt pushblock-ag pushblock-lod0-mg 1) +(def-art-elt pushblock-ag pushblock-lod0-jg 0) +(def-art-elt ginsu-ag ginsu-attack-ja 15) +(def-art-elt ginsu-ag ginsu-blue-hit-land-ja 14) +(def-art-elt ginsu-ag ginsu-blue-hit-air-ja 13) +(def-art-elt ginsu-ag ginsu-lod0-jg 0) +(def-art-elt ginsu-ag ginsu-lod0-mg 1) +(def-art-elt ginsu-ag ginsu-lod1-mg 2) +(def-art-elt ginsu-ag ginsu-lod2-mg 3) +(def-art-elt ginsu-ag ginsu-shadow-mg 4) +(def-art-elt ginsu-ag ginsu-idle-ja 5) +(def-art-elt ginsu-ag ginsu-flap-ja 6) +(def-art-elt ginsu-ag ginsu-fly-forward-ja 7) +(def-art-elt ginsu-ag ginsu-fly-right-ja 8) +(def-art-elt ginsu-ag ginsu-fly-left-ja 9) +(def-art-elt ginsu-ag ginsu-notice-ja 10) +(def-art-elt ginsu-ag ginsu-die-ja 11) +(def-art-elt ginsu-ag ginsu-die-land-ja 12) +(def-art-elt hip-trophy-a-ag hip-trophy-a-idle-ja 2) +(def-art-elt hip-trophy-a-ag hip-trophy-a-lod0-mg 1) +(def-art-elt hip-trophy-a-ag hip-trophy-a-lod0-jg 0) (def-art-elt citizen-fat-ag citizen-fat-tread-water-ja 32) (def-art-elt citizen-fat-ag citizen-fat-riding-stance-ja 31) (def-art-elt citizen-fat-ag citizen-fat-cover-head-end-ja 30) @@ -650,6 +2088,12 @@ (def-art-elt drill-metalhead-eggs-c-ag drill-metalhead-eggs-c-idle-ja 2) (def-art-elt drill-metalhead-eggs-c-ag drill-metalhead-eggs-c-lod0-mg 1) (def-art-elt drill-metalhead-eggs-c-ag drill-metalhead-eggs-c-lod0-jg 0) +(def-art-elt tomb-plat-return-ag tomb-plat-return-idle-ja 2) +(def-art-elt tomb-plat-return-ag tomb-plat-return-lod0-mg 1) +(def-art-elt tomb-plat-return-ag tomb-plat-return-lod0-jg 0) +(def-art-elt hip-trophy-d-ag hip-trophy-d-idle-ja 2) +(def-art-elt hip-trophy-d-ag hip-trophy-d-lod0-mg 1) +(def-art-elt hip-trophy-d-ag hip-trophy-d-lod0-jg 0) (def-art-elt pegasus-ag pegasus-board-attack-pegasus-ja 20) (def-art-elt pegasus-ag pegasus-fly-to-idle-ja 19) (def-art-elt pegasus-ag pegasus-run-to-fly-ja 18) @@ -757,6 +2201,12 @@ (def-art-elt jak-board+0-ag jakb-board-ride-turn-front-ja 56) (def-art-elt jak-board+0-ag jakb-board-ride-turn-right-ja 57) (def-art-elt jak-board+0-ag jakb-board-ride-turn-left-ja 58) +(def-art-elt gun-cit-d-ag gun-cit-d-explode-idle-ja 5) +(def-art-elt gun-cit-d-ag gun-cit-d-explode-lod0-mg 4) +(def-art-elt gun-cit-d-ag gun-cit-d-explode-lod0-jg 3) +(def-art-elt gun-cit-d-ag gun-cit-d-idle-ja 2) +(def-art-elt gun-cit-d-ag gun-cit-d-lod0-mg 1) +(def-art-elt gun-cit-d-ag gun-cit-d-lod0-jg 0) (def-art-elt race-bike-c-ag race-bike-c-idle-ja 4) (def-art-elt race-bike-c-ag race-bike-c-shadow-mg 3) (def-art-elt race-bike-c-ag race-bike-c-lod1-mg 2) @@ -779,6 +2229,10 @@ (def-art-elt water-anim-under-ag water-anim-under-drainout-lod0-jg 2) (def-art-elt water-anim-under-ag water-anim-under-pool-lod0-mg 1) (def-art-elt water-anim-under-ag water-anim-under-pool-lod0-jg 0) +(def-art-elt cas-elevator-ag cas-elevator-up-down-ja 3) +(def-art-elt cas-elevator-ag cas-elevator-idle-ja 2) +(def-art-elt cas-elevator-ag cas-elevator-lod0-mg 1) +(def-art-elt cas-elevator-ag cas-elevator-lod0-jg 0) (def-art-elt babak-ag babak-jump-ja 21) (def-art-elt babak-ag babak-swim-ilde-ja 20) (def-art-elt babak-ag babak-swim-ja 19) @@ -804,6 +2258,26 @@ (def-art-elt drill-moving-staircase-ag drill-moving-staircase-idle-ja 2) (def-art-elt drill-moving-staircase-ag drill-moving-staircase-lod0-mg 1) (def-art-elt drill-moving-staircase-ag drill-moving-staircase-lod0-jg 0) +(def-art-elt ashelin-highres-ag ashelin-highres-idle-ja 3) +(def-art-elt ashelin-highres-ag ashelin-highres-shadow-mg 2) +(def-art-elt ashelin-highres-ag ashelin-highres-lod0-mg 1) +(def-art-elt ashelin-highres-ag ashelin-highres-lod0-jg 0) +(def-art-elt hip-trophy-f-ag hip-trophy-f-idle-ja 2) +(def-art-elt hip-trophy-f-ag hip-trophy-f-lod0-mg 1) +(def-art-elt hip-trophy-f-ag hip-trophy-f-lod0-jg 0) +(def-art-elt kid-escort-ag kid-escort-vehicle-lean-z-ja 12) +(def-art-elt kid-escort-ag kid-escort-vehicle-lean-x-ja 11) +(def-art-elt kid-escort-ag kid-escort-jump-in-vehicle-ja 10) +(def-art-elt kid-escort-ag kid-escort-arrest-idle0-ja 9) +(def-art-elt kid-escort-ag kid-escort-arrest-start-ja 8) +(def-art-elt kid-escort-ag kid-escort-knocked-land0-ja 7) +(def-art-elt kid-escort-ag kid-escort-knocked0-ja 6) +(def-art-elt kid-escort-ag kid-escort-turn0-ja 5) +(def-art-elt kid-escort-ag kid-escort-run0-ja 4) +(def-art-elt kid-escort-ag kid-escort-idle0-ja 3) +(def-art-elt kid-escort-ag kid-escort-shadow-mg 2) +(def-art-elt kid-escort-ag kid-escort-lod0-mg 1) +(def-art-elt kid-escort-ag kid-escort-lod0-jg 0) (def-art-elt flitter-ag flitter-blue-hit0-ja 23) (def-art-elt flitter-ag flitter-knocked-land-upright-ja 22) (def-art-elt flitter-ag flitter-knocked-land0-ja 21) @@ -828,6 +2302,9 @@ (def-art-elt flitter-ag flitter-ambush-jump-ja 10) (def-art-elt flitter-ag flitter-ambush-land-ja 11) (def-art-elt flitter-ag flitter-notice-ja 12) +(def-art-elt mtn-plat-updown-ag mtn-plat-updown-idle-ja 2) +(def-art-elt mtn-plat-updown-ag mtn-plat-updown-lod0-mg 1) +(def-art-elt mtn-plat-updown-ag mtn-plat-updown-lod0-jg 0) (def-art-elt prsn-cell-door-ag prsn-cell-door-idle-ja 2) (def-art-elt prsn-cell-door-ag prsn-cell-door-lod0-mg 1) (def-art-elt prsn-cell-door-ag prsn-cell-door-lod0-jg 0) @@ -837,15 +2314,52 @@ (def-art-elt drill-turret-ext-ag drill-turret-ext-idle-ja 2) (def-art-elt drill-turret-ext-ag drill-turret-ext-lod0-mg 1) (def-art-elt drill-turret-ext-ag drill-turret-ext-lod0-jg 0) +(def-art-elt awning-ag awning-idle-ja 2) +(def-art-elt awning-ag awning-lod0-mg 1) +(def-art-elt awning-ag awning-lod0-jg 0) +(def-art-elt life-seed-ag life-seed-idle-ja 2) +(def-art-elt life-seed-ag life-seed-lod0-mg 1) +(def-art-elt life-seed-ag life-seed-lod0-jg 0) +(def-art-elt dig-tether-ag dig-tether-idle-ja 4) +(def-art-elt dig-tether-ag dig-tether-unsnapped-lod0-mg 3) +(def-art-elt dig-tether-ag dig-tether-unsnapped-lod0-jg 2) +(def-art-elt dig-tether-ag dig-tether-snapped-lod0-mg 1) +(def-art-elt dig-tether-ag dig-tether-snapped-lod0-jg 0) +(def-art-elt youngsamos-forestb+0-ag youngsamos-highres-idle-meditate-ja 0) (def-art-elt barons-ship-lores-ag barons-ship-lores-idle-ja 2) (def-art-elt barons-ship-lores-ag barons-ship-lores-lod0-mg 1) (def-art-elt barons-ship-lores-ag barons-ship-lores-lod0-jg 0) +(def-art-elt spotlight-ag spotlight-idle-ja 2) +(def-art-elt spotlight-ag spotlight-lod0-mg 1) +(def-art-elt spotlight-ag spotlight-lod0-jg 0) +(def-art-elt brutter-balloon-norift-ag brutter-balloon-norift-idle-ja 2) +(def-art-elt brutter-balloon-norift-ag brutter-balloon-norift-lod0-mg 1) +(def-art-elt brutter-balloon-norift-ag brutter-balloon-norift-lod0-jg 0) (def-art-elt board-ag board-board-idle-ja 5) (def-art-elt board-ag board-close-ja 4) (def-art-elt board-ag board-open-ja 3) (def-art-elt board-ag board-shadow-mg 2) (def-art-elt board-ag board-lod0-mg 1) (def-art-elt board-ag board-lod0-jg 0) +(def-art-elt water-anim-stadium-ag water-anim-stadium-idle-ja 6) +(def-art-elt water-anim-stadium-ag water-anim-stadium-floor-pool-lod0-mg 5) +(def-art-elt water-anim-stadium-ag water-anim-stadium-floor-pool-lod0-jg 4) +(def-art-elt water-anim-stadium-ag water-anim-stadium-top-fountain-lod0-mg 3) +(def-art-elt water-anim-stadium-ag water-anim-stadium-top-fountain-lod0-jg 2) +(def-art-elt water-anim-stadium-ag water-anim-stadium-middle-pool-lod0-mg 1) +(def-art-elt water-anim-stadium-ag water-anim-stadium-middle-pool-lod0-jg 0) +(def-art-elt ctyport-cargo-ag ctyport-cargo-explode-idle-ja 6) +(def-art-elt ctyport-cargo-ag ctyport-cargo-explode-lod0-mg 5) +(def-art-elt ctyport-cargo-ag ctyport-cargo-explode-lod0-jg 4) +(def-art-elt ctyport-cargo-ag ctyport-cargo-idle-ja 3) +(def-art-elt ctyport-cargo-ag ctyport-cargo-lod1-mg 2) +(def-art-elt ctyport-cargo-ag ctyport-cargo-lod0-mg 1) +(def-art-elt ctyport-cargo-ag ctyport-cargo-lod0-jg 0) +(def-art-elt ruins-bridge-ag ruins-bridge-1-end-ja 4) +(def-art-elt ruins-bridge-ag ruins-bridge-1-idle-ja 3) +(def-art-elt ruins-bridge-ag ruins-bridge-1-lod1-mg 2) +(def-art-elt ruins-bridge-ag ruins-bridge-1-lod0-mg 1) +(def-art-elt ruins-bridge-ag ruins-bridge-1-lod0-jg 0) (def-art-elt lurker-pipe-lid-ag lurker-pipe-lid-idle-ja 2) (def-art-elt lurker-pipe-lid-ag lurker-pipe-lid-lod0-mg 1) (def-art-elt lurker-pipe-lid-ag lurker-pipe-lid-lod0-jg 0) @@ -855,6 +2369,9 @@ (def-art-elt under-break-floor-ag under-break-floor-idle-ja 2) (def-art-elt under-break-floor-ag under-break-floor-lod0-mg 1) (def-art-elt under-break-floor-ag under-break-floor-lod0-jg 0) +(def-art-elt hide-bike-ag hide-bike-idle-ja 2) +(def-art-elt hide-bike-ag hide-bike-lod0-mg 1) +(def-art-elt hide-bike-ag hide-bike-lod0-jg 0) (def-art-elt hud-ring-ag hud-ring-part-idle-ja 5) (def-art-elt hud-ring-ag hud-ring-part-lod0-mg 4) (def-art-elt hud-ring-ag hud-ring-part-lod0-jg 3) @@ -885,6 +2402,45 @@ (def-art-elt spyder-ag spyder-shoot-high-ja 10) (def-art-elt spyder-ag spyder-falling-death-ja 11) (def-art-elt spyder-ag spyder-death-ja 12) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-6-end-front-ja 40) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-6-idle-ja 39) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-6-lod0-mg 38) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-6-lod0-jg 37) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-2-lod2-mg 12) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-2-lod1-mg 11) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-2-lod0-mg 10) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-2-lod0-jg 9) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-1-end-rear-ja 7) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-1-end-front-ja 5) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-5-idle-ja 34) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-1-idle-ja 4) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-5-lod0-mg 33) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-1-lod2-mg 3) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-5-lod0-jg 32) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-1-lod1-mg 2) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-2-end-front-ja 14) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-1-lod0-mg 1) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-4-end-front-ja 30) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-2-idle-ja 13) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-1-lod0-jg 0) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-4-idle-ja 29) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-2-end-rear-ja 16) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-3-lod0-jg 18) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-3-lod0-mg 19) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-3-lod1-mg 20) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-3-lod2-mg 21) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-3-idle-ja 22) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-3-end-front-ja 23) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-3-end-rear-ja 25) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-4-lod0-jg 27) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-4-lod0-mg 28) +(def-art-elt ruins-breakable-wall-ag ruins-breakable-wall-5-end-front-ja 35) +(def-art-elt farm-marrow-ag farm-marrow-explode-idle-ja 5) +(def-art-elt farm-marrow-ag farm-marrow-explode-lod0-mg 4) +(def-art-elt farm-marrow-ag farm-marrow-explode-lod0-jg 3) +(def-art-elt farm-marrow-ag farm-marrow-idle-ja 2) +(def-art-elt farm-marrow-ag farm-marrow-lod0-mg 1) +(def-art-elt farm-marrow-ag farm-marrow-lod0-jg 0) (def-art-elt daxter-ag daxter-wall-hide-body-ja 84) (def-art-elt daxter-ag daxter-wall-hide-head-right-ja 83) (def-art-elt daxter-ag daxter-wall-hide-head-left-ja 82) @@ -962,10 +2518,103 @@ (def-art-elt daxter-ag daxter-flop-jump-ja 56) (def-art-elt daxter-ag daxter-duck-roll-ja 57) (def-art-elt daxter-ag daxter-duck-roll-end-ja 58) +(def-art-elt metalkor-highres-ag metalkor-highres-wings-idle-ja 24) +(def-art-elt metalkor-highres-ag metalkor-highres-wings-shadow-mg 23) +(def-art-elt metalkor-highres-ag metalkor-highres-wings-lod0-mg 22) +(def-art-elt metalkor-highres-ag metalkor-highres-lod0-jg 0) +(def-art-elt metalkor-highres-ag metalkor-highres-lod0-mg 1) +(def-art-elt metalkor-highres-ag metalkor-highres-legs-lod0-jg 14) +(def-art-elt metalkor-highres-ag metalkor-highres-shadow-mg 2) +(def-art-elt metalkor-highres-ag metalkor-highres-legs-lod0-mg 15) +(def-art-elt metalkor-highres-ag metalkor-highres-idle-ja 3) +(def-art-elt metalkor-highres-ag metalkor-highres-legs-shadow-mg 16) +(def-art-elt metalkor-highres-ag metalkor-highres-lowtorso-lod0-jg 7) +(def-art-elt metalkor-highres-ag metalkor-highres-lowtorso-lod0-mg 8) +(def-art-elt metalkor-highres-ag metalkor-highres-wings-lod0-jg 21) +(def-art-elt metalkor-highres-ag metalkor-highres-lowtorso-shadow-mg 9) +(def-art-elt metalkor-highres-ag metalkor-highres-lowtorso-idle-ja 10) +(def-art-elt metalkor-highres-ag metalkor-highres-legs-idle-ja 17) (def-art-elt tess-highres-ag tess-highres-idle-ja 3) (def-art-elt tess-highres-ag tess-highres-shadow-mg 2) (def-art-elt tess-highres-ag tess-highres-lod0-mg 1) (def-art-elt tess-highres-ag tess-highres-lod0-jg 0) +(def-art-elt metalkor-head-ag metalkor-head-idle-ja 2) +(def-art-elt metalkor-head-ag metalkor-head-lod0-mg 1) +(def-art-elt metalkor-head-ag metalkor-head-lod0-jg 0) +(def-art-elt gun-dummy-big-ag gun-dummy-big-explode-idle-ja 5) +(def-art-elt gun-dummy-big-ag gun-dummy-big-explode-lod0-mg 4) +(def-art-elt gun-dummy-big-ag gun-dummy-big-explode-lod0-jg 3) +(def-art-elt gun-dummy-big-ag gun-dummy-big-idle-ja 2) +(def-art-elt gun-dummy-big-ag gun-dummy-big-lod0-mg 1) +(def-art-elt gun-dummy-big-ag gun-dummy-big-lod0-jg 0) +(def-art-elt atoll-mar-symbol-ag atoll-mar-symbol-idle-ja 2) +(def-art-elt atoll-mar-symbol-ag atoll-mar-symbol-lod0-mg 1) +(def-art-elt atoll-mar-symbol-ag atoll-mar-symbol-lod0-jg 0) +(def-art-elt dig-stomp-block-ag dig-stomp-block-idle-ja 2) +(def-art-elt dig-stomp-block-ag dig-stomp-block-lod0-mg 1) +(def-art-elt dig-stomp-block-ag dig-stomp-block-lod0-jg 0) +(def-art-elt dig-log-ag dig-log-idle-ja 2) +(def-art-elt dig-log-ag dig-log-lod0-mg 1) +(def-art-elt dig-log-ag dig-log-lod0-jg 0) +(def-art-elt squid-break-ag squid-break-tentacle-idle-ja 26) +(def-art-elt squid-break-ag squid-break-tentacle-lod0-mg 25) +(def-art-elt squid-break-ag squid-break-tentacle-lod0-jg 24) +(def-art-elt squid-break-ag squid-break-e-idle-ja 22) +(def-art-elt squid-break-ag squid-break-e-lod0-mg 21) +(def-art-elt squid-break-ag squid-break-e-lod0-jg 20) +(def-art-elt squid-break-ag squid-break-d-idle-ja 18) +(def-art-elt squid-break-ag squid-break-d-lod0-mg 17) +(def-art-elt squid-break-ag squid-break-pod-lod0-jg 0) +(def-art-elt squid-break-ag squid-break-c-lod0-mg 13) +(def-art-elt squid-break-ag squid-break-pod-lod0-mg 1) +(def-art-elt squid-break-ag squid-break-c-idle-ja 14) +(def-art-elt squid-break-ag squid-break-pod-idle-ja 2) +(def-art-elt squid-break-ag squid-break-a-lod0-jg 4) +(def-art-elt squid-break-ag squid-break-a-lod0-mg 5) +(def-art-elt squid-break-ag squid-break-a-idle-ja 6) +(def-art-elt squid-break-ag squid-break-b-lod0-jg 8) +(def-art-elt squid-break-ag squid-break-b-lod0-mg 9) +(def-art-elt squid-break-ag squid-break-b-idle-ja 10) +(def-art-elt squid-break-ag squid-break-c-lod0-jg 12) +(def-art-elt squid-break-ag squid-break-d-lod0-jg 16) +(def-art-elt youngsamos-lysamsam+0-ag youngsamos-highres-idle-stand2-ja 1) +(def-art-elt youngsamos-lysamsam+0-ag samos-highres-idle-bots-ja 0) +(def-art-elt cas-electric-fence-ag cas-electric-fence-explode-idle-ja 5) +(def-art-elt cas-electric-fence-ag cas-electric-fence-explode-lod0-mg 4) +(def-art-elt cas-electric-fence-ag cas-electric-fence-explode-lod0-jg 3) +(def-art-elt cas-electric-fence-ag cas-electric-fence-idle-ja 2) +(def-art-elt cas-electric-fence-ag cas-electric-fence-lod0-mg 1) +(def-art-elt cas-electric-fence-ag cas-electric-fence-lod0-jg 0) +(def-art-elt rhino-ag rhino-victory-hit2-ja 24) +(def-art-elt rhino-ag rhino-victory-hit-ja 23) +(def-art-elt rhino-ag rhino-skid-right-ja 22) +(def-art-elt rhino-ag rhino-skid-left-ja 21) +(def-art-elt rhino-ag rhino-skid-ja 20) +(def-art-elt rhino-ag rhino-knocked-soft-behind-ja 19) +(def-art-elt rhino-ag rhino-knocked-soft-right-ja 18) +(def-art-elt rhino-ag rhino-knocked-soft-left-ja 17) +(def-art-elt rhino-ag rhino-knocked-soft-ja 16) +(def-art-elt rhino-ag rhino-death-ja 15) +(def-art-elt rhino-ag rhino-die-ja 14) +(def-art-elt rhino-ag rhino-victory-end-ja 13) +(def-art-elt rhino-ag rhino-lod0-jg 0) +(def-art-elt rhino-ag rhino-lod0-mg 1) +(def-art-elt rhino-ag rhino-shadow-mg 2) +(def-art-elt rhino-ag rhino-idle-ja 3) +(def-art-elt rhino-ag rhino-idleB-ja 4) +(def-art-elt rhino-ag rhino-jump-ja 5) +(def-art-elt rhino-ag rhino-patrol-ja 6) +(def-art-elt rhino-ag rhino-notice-ja 7) +(def-art-elt rhino-ag rhino-attack-ja 8) +(def-art-elt rhino-ag rhino-attack-to-charge-ja 9) +(def-art-elt rhino-ag rhino-charge-ja 10) +(def-art-elt rhino-ag rhino-victory-begin-ja 11) +(def-art-elt rhino-ag rhino-victory-loop-ja 12) +(def-art-elt grunt-egg-d-ag grunt-egg-d-idle2-ja 4) +(def-art-elt grunt-egg-d-ag grunt-egg-d-idle-ja 3) +(def-art-elt grunt-egg-d-ag grunt-egg-d-lod1-mg 2) +(def-art-elt grunt-egg-d-ag grunt-egg-d-lod0-mg 1) +(def-art-elt grunt-egg-d-ag grunt-egg-d-lod0-jg 0) (def-art-elt jakb-ag jakb-wall-hide-body-ja 88) (def-art-elt jakb-ag jakb-wall-hide-head-right-ja 87) (def-art-elt jakb-ag jakb-wall-hide-head-left-ja 86) @@ -1047,9 +2696,174 @@ (def-art-elt jakb-ag jakb-moving-flop-down-ja 55) (def-art-elt jakb-ag jakb-moving-flop-down-loop-ja 56) (def-art-elt jakb-ag jakb-flop-jump-ja 58) +(def-art-elt fort-fence-ag fort-fence-b-end-ja 8) +(def-art-elt fort-fence-ag fort-fence-b-idle-ja 7) +(def-art-elt fort-fence-ag fort-fence-b-lod0-mg 6) +(def-art-elt fort-fence-ag fort-fence-b-lod0-jg 5) +(def-art-elt fort-fence-ag fort-fence-a-end-ja 3) +(def-art-elt fort-fence-ag fort-fence-a-idle-ja 2) +(def-art-elt fort-fence-ag fort-fence-a-lod0-mg 1) +(def-art-elt fort-fence-ag fort-fence-a-lod0-jg 0) +(def-art-elt kiosk-fish-sign-ag kiosk-fish-sign-idle-ja 2) +(def-art-elt kiosk-fish-sign-ag kiosk-fish-sign-lod0-mg 1) +(def-art-elt kiosk-fish-sign-ag kiosk-fish-sign-lod0-jg 0) +(def-art-elt ruins-tower-a-ag ruins-tower-a-idle-ja 2) +(def-art-elt ruins-tower-a-ag ruins-tower-a-lod0-mg 1) +(def-art-elt ruins-tower-a-ag ruins-tower-a-lod0-jg 0) +(def-art-elt dig-clasp-b-ag dig-clasp-b-idle-ja 2) +(def-art-elt dig-clasp-b-ag dig-clasp-b-lod0-mg 1) +(def-art-elt dig-clasp-b-ag dig-clasp-b-lod0-jg 0) +(def-art-elt hip-trophy-c-ag hip-trophy-c-idle-ja 2) +(def-art-elt hip-trophy-c-ag hip-trophy-c-lod0-mg 1) +(def-art-elt hip-trophy-c-ag hip-trophy-c-lod0-jg 0) +(def-art-elt atoll-valve-ag atoll-valve-idle-ja 3) +(def-art-elt atoll-valve-ag atoll-valve-lod1-mg 2) +(def-art-elt atoll-valve-ag atoll-valve-lod0-mg 1) +(def-art-elt atoll-valve-ag atoll-valve-lod0-jg 0) +(def-art-elt crocadog-escort-ag crocadog-escort-angry-bark-ja 14) +(def-art-elt crocadog-escort-ag crocadog-escort-knocked-land0-ja 13) +(def-art-elt crocadog-escort-ag crocadog-escort-lod0-jg 0) +(def-art-elt crocadog-escort-ag crocadog-escort-lod0-mg 1) +(def-art-elt crocadog-escort-ag crocadog-escort-shadow-mg 2) +(def-art-elt crocadog-escort-ag crocadog-escort-idle-pant-ja 3) +(def-art-elt crocadog-escort-ag crocadog-escort-idle-wag-ja 4) +(def-art-elt crocadog-escort-ag crocadog-escort-idle-scratch-ja 5) +(def-art-elt crocadog-escort-ag crocadog-escort-idle-bark-ja 6) +(def-art-elt crocadog-escort-ag crocadog-escort-walk0-ja 7) +(def-art-elt crocadog-escort-ag crocadog-escort-run0-ja 8) +(def-art-elt crocadog-escort-ag crocadog-escort-turn0-ja 9) +(def-art-elt crocadog-escort-ag crocadog-escort-jump-in-vehicle-ja 10) +(def-art-elt crocadog-escort-ag crocadog-escort-idle-car0-ja 11) +(def-art-elt crocadog-escort-ag crocadog-escort-knocked0-ja 12) +(def-art-elt metalkor-egg-ag metalkor-egg-hop-ja 7) +(def-art-elt metalkor-egg-ag metalkor-egg-tumble-ja 6) +(def-art-elt metalkor-egg-ag metalkor-egg-hatch-ja 5) +(def-art-elt metalkor-egg-ag metalkor-egg-land-ja 4) +(def-art-elt metalkor-egg-ag metalkor-egg-idle-ja 3) +(def-art-elt metalkor-egg-ag metalkor-egg-shadow-mg 2) +(def-art-elt metalkor-egg-ag metalkor-egg-lod0-mg 1) +(def-art-elt metalkor-egg-ag metalkor-egg-lod0-jg 0) +(def-art-elt nest-gun-elevator-ag nest-gun-elevator-raiserail-ja 3) +(def-art-elt nest-gun-elevator-ag nest-gun-elevator-idle-ja 2) +(def-art-elt nest-gun-elevator-ag nest-gun-elevator-lod0-mg 1) +(def-art-elt nest-gun-elevator-ag nest-gun-elevator-lod0-jg 0) (def-art-elt stadium-barrier-ag stadium-barrier-idle-ja 2) (def-art-elt stadium-barrier-ag stadium-barrier-lod0-mg 1) (def-art-elt stadium-barrier-ag stadium-barrier-lod0-jg 0) +(def-art-elt mtn-plat-elevator-ag mtn-plat-elevator-idle-ja 3) +(def-art-elt mtn-plat-elevator-ag mtn-plat-elevator-lod1-mg 2) +(def-art-elt mtn-plat-elevator-ag mtn-plat-elevator-lod0-mg 1) +(def-art-elt mtn-plat-elevator-ag mtn-plat-elevator-lod0-jg 0) +(def-art-elt cas-button-ag cas-button-idle-ja 2) +(def-art-elt cas-button-ag cas-button-lod0-mg 1) +(def-art-elt cas-button-ag cas-button-lod0-jg 0) +(def-art-elt baron-squid+0-ag squid-driver-squid-idle-ja 76) +(def-art-elt baron-squid+0-ag squid-dummy20-ja 75) +(def-art-elt baron-squid+0-ag squid-dummy19-ja 74) +(def-art-elt baron-squid+0-ag squid-dummy18-ja 73) +(def-art-elt baron-squid+0-ag squid-dummy17-ja 72) +(def-art-elt baron-squid+0-ag squid-damaged-ja 71) +(def-art-elt baron-squid+0-ag squid-recharge-ja 70) +(def-art-elt baron-squid+0-ag squid-recharge-liftoff-ja 69) +(def-art-elt baron-squid+0-ag squid-recharge-landing-ja 68) +(def-art-elt baron-squid+0-ag squid-fly-backward-end-ja 67) +(def-art-elt baron-squid+0-ag squid-fly-backward-idle-ja 66) +(def-art-elt baron-squid+0-ag squid-fly-backward-start-ja 65) +(def-art-elt baron-squid+0-ag squid-fly-foreward-end-ja 64) +(def-art-elt baron-squid+0-ag squid-fly-foreward-idle-ja 63) +(def-art-elt baron-squid+0-ag squid-fly-foreward-start-ja 62) +(def-art-elt baron-squid+0-ag squid-fly-right-end-ja 61) +(def-art-elt baron-squid+0-ag squid-fly-right-idle-ja 60) +(def-art-elt baron-squid+0-ag squid-fly-right-start-ja 59) +(def-art-elt baron-squid+0-ag baron-fly-backward-idle-ja 28) +(def-art-elt baron-squid+0-ag baron-fly-backward-start-ja 27) +(def-art-elt baron-squid+0-ag baron-fly-foreward-end-ja 26) +(def-art-elt baron-squid+0-ag baron-fly-foreward-idle-ja 25) +(def-art-elt baron-squid+0-ag baron-fly-foreward-start-ja 24) +(def-art-elt baron-squid+0-ag baron-fly-right-end-ja 23) +(def-art-elt baron-squid+0-ag baron-fly-right-idle-ja 22) +(def-art-elt baron-squid+0-ag baron-fly-right-start-ja 21) +(def-art-elt baron-squid+0-ag baron-fly-left-end-ja 20) +(def-art-elt baron-squid+0-ag baron-fly-left-idle-ja 19) +(def-art-elt baron-squid+0-ag baron-fly-left-start-ja 18) +(def-art-elt baron-squid+0-ag baron-fire-guns-breathe-ja 17) +(def-art-elt baron-squid+0-ag baron-fire-guns-release-ja 16) +(def-art-elt baron-squid+0-ag baron-fire-guns-end-ja 15) +(def-art-elt baron-squid+0-ag baron-fire-guns-loop-ja 14) +(def-art-elt baron-squid+0-ag baron-fire-guns-start-ja 13) +(def-art-elt baron-squid+0-ag baron-squid-idle-ja 0) +(def-art-elt baron-squid+0-ag baron-shields-up-ja 1) +(def-art-elt baron-squid+0-ag baron-shields-idle-ja 2) +(def-art-elt baron-squid+0-ag baron-shields-down-ja 3) +(def-art-elt baron-squid+0-ag baron-pods-down-ja 4) +(def-art-elt baron-squid+0-ag baron-hatch-fore-open-ja 5) +(def-art-elt baron-squid+0-ag baron-hatch-fore-launch-ja 6) +(def-art-elt baron-squid+0-ag baron-hatch-fore-close-ja 7) +(def-art-elt baron-squid+0-ag baron-hatch-aft-open-ja 8) +(def-art-elt baron-squid+0-ag baron-hatch-aft-launch-ja 9) +(def-art-elt baron-squid+0-ag baron-hatch-aft-close-ja 10) +(def-art-elt baron-squid+0-ag baron-breathe-between-grenades-ja 11) +(def-art-elt baron-squid+0-ag baron-pods-up-ja 12) +(def-art-elt baron-squid+0-ag baron-fly-backward-end-ja 29) +(def-art-elt baron-squid+0-ag baron-recharge-landing-ja 30) +(def-art-elt baron-squid+0-ag baron-recharge-liftoff-ja 31) +(def-art-elt baron-squid+0-ag baron-recharge-ja 32) +(def-art-elt baron-squid+0-ag baron-damaged-ja 33) +(def-art-elt baron-squid+0-ag baron-dummy17-ja 34) +(def-art-elt baron-squid+0-ag baron-dummy18-ja 35) +(def-art-elt baron-squid+0-ag baron-dummy19-ja 36) +(def-art-elt baron-squid+0-ag baron-dummy20-ja 37) +(def-art-elt baron-squid+0-ag squid-squid-idle-ja 38) +(def-art-elt baron-squid+0-ag squid-shields-up-ja 39) +(def-art-elt baron-squid+0-ag squid-shields-idle-ja 40) +(def-art-elt baron-squid+0-ag squid-shields-down-ja 41) +(def-art-elt baron-squid+0-ag squid-pods-down-ja 42) +(def-art-elt baron-squid+0-ag squid-hatch-fore-open-ja 43) +(def-art-elt baron-squid+0-ag squid-hatch-fore-launch-ja 44) +(def-art-elt baron-squid+0-ag squid-hatch-fore-close-ja 45) +(def-art-elt baron-squid+0-ag squid-hatch-aft-open-ja 46) +(def-art-elt baron-squid+0-ag squid-hatch-aft-launch-ja 47) +(def-art-elt baron-squid+0-ag squid-hatch-aft-close-ja 48) +(def-art-elt baron-squid+0-ag squid-breathe-between-grenades-ja 49) +(def-art-elt baron-squid+0-ag squid-pods-up-ja 50) +(def-art-elt baron-squid+0-ag squid-fire-guns-start-ja 51) +(def-art-elt baron-squid+0-ag squid-fire-guns-loop-ja 52) +(def-art-elt baron-squid+0-ag squid-fire-guns-end-ja 53) +(def-art-elt baron-squid+0-ag squid-fire-guns-release-ja 54) +(def-art-elt baron-squid+0-ag squid-fire-guns-breathe-ja 55) +(def-art-elt baron-squid+0-ag squid-fly-left-start-ja 56) +(def-art-elt baron-squid+0-ag squid-fly-left-idle-ja 57) +(def-art-elt baron-squid+0-ag squid-fly-left-end-ja 58) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-hit-blue-land-ja 22) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-hit-blue-back-ja 21) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-hit-blue-front-ja 20) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-knocked1-land-fadeout-ja 19) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-knocked1-land-ja 18) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-knocked1-ja 17) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-knocked0-land-fadeout-ja 16) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-knocked0-land-ja 15) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-knocked0-ja 14) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-die-ja 13) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-lod0-jg 0) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-lod0-mg 1) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-lod1-mg 2) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-shadow-mg 3) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-idle-ja 4) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-walk0-ja 5) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-notice-spin-ja 6) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-notice-land-ja 7) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-run0-ja 8) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-turn-right-ja 9) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-turn-left-ja 10) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-attack0-start-ja 11) +(def-art-elt tomb-baby-spider-ag tomb-baby-spider-attack0-stop-ja 12) +(def-art-elt tomb-beetle-door-ag tomb-beetle-door-open-ja 3) +(def-art-elt tomb-beetle-door-ag tomb-beetle-door-idle-ja 2) +(def-art-elt tomb-beetle-door-ag tomb-beetle-door-lod0-mg 1) +(def-art-elt tomb-beetle-door-ag tomb-beetle-door-lod0-jg 0) +(def-art-elt throwblock-ag throwblock-idle-ja 2) +(def-art-elt throwblock-ag throwblock-lod0-mg 1) +(def-art-elt throwblock-ag throwblock-lod0-jg 0) (def-art-elt bikeb-ag bikeb-idle-ja 5) (def-art-elt bikeb-ag bikeb-shadow-mg 4) (def-art-elt bikeb-ag bikeb-lod2-mg 3) @@ -1059,6 +2873,33 @@ (def-art-elt prsn-chair-shackle-ag prsn-chair-shackle-idle-ja 2) (def-art-elt prsn-chair-shackle-ag prsn-chair-shackle-lod0-mg 1) (def-art-elt prsn-chair-shackle-ag prsn-chair-shackle-lod0-jg 0) +(def-art-elt metalkor-rays-ag metalkor-rays-idle-ja 2) +(def-art-elt metalkor-rays-ag metalkor-rays-lod0-mg 1) +(def-art-elt metalkor-rays-ag metalkor-rays-lod0-jg 0) +(def-art-elt flamer-ag flamer-explode-idle-ja 23) +(def-art-elt flamer-ag flamer-explode-lod0-mg 22) +(def-art-elt flamer-ag flamer-explode-lod0-jg 21) +(def-art-elt flamer-ag flamer-blue-hit2-ja 20) +(def-art-elt flamer-ag flamer-blue-hit1-ja 19) +(def-art-elt flamer-ag flamer-blue-hit0-ja 18) +(def-art-elt flamer-ag flamer-die-in-place-ja 17) +(def-art-elt flamer-ag flamer-knock-back-land-ja 16) +(def-art-elt flamer-ag flamer-die-ja 15) +(def-art-elt flamer-ag flamer-knock-back-fall-ja 14) +(def-art-elt flamer-ag flamer-knock-back-ja 13) +(def-art-elt flamer-ag flamer-lod0-jg 0) +(def-art-elt flamer-ag flamer-lod0-mg 1) +(def-art-elt flamer-ag flamer-lod1-mg 2) +(def-art-elt flamer-ag flamer-lod2-mg 3) +(def-art-elt flamer-ag flamer-shadow-mg 4) +(def-art-elt flamer-ag flamer-idle-ja 5) +(def-art-elt flamer-ag flamer-fly-right-ja 6) +(def-art-elt flamer-ag flamer-fly-left-ja 7) +(def-art-elt flamer-ag flamer-fly-forward-ja 8) +(def-art-elt flamer-ag flamer-fly-back-ja 9) +(def-art-elt flamer-ag flamer-fly-straight-ja 10) +(def-art-elt flamer-ag flamer-shoot-ja 11) +(def-art-elt flamer-ag flamer-shoot1-ja 12) (def-art-elt predator-ag predator-blue-hit-land-ja 23) (def-art-elt predator-ag predator-blue-hit-back-ja 22) (def-art-elt predator-ag predator-blue-hit-front-ja 21) @@ -1089,6 +2930,12 @@ (def-art-elt hellcat-ag hellcat-lod1-mg 2) (def-art-elt hellcat-ag hellcat-lod0-mg 1) (def-art-elt hellcat-ag hellcat-lod0-jg 0) +(def-art-elt pal-falling-plat-ag pal-falling-plat-shake-ja 3) +(def-art-elt pal-falling-plat-ag pal-falling-plat-idle-ja 2) +(def-art-elt pal-falling-plat-ag pal-falling-plat-lod0-mg 1) +(def-art-elt pal-falling-plat-ag pal-falling-plat-lod0-jg 0) +(def-art-elt jak-dark-on+0-ag jakb-darkjak-get-on-ja 1) +(def-art-elt jak-dark-on+0-ag daxter-darkjak-get-on-ja 0) (def-art-elt drill-top-break-ag drill-top-break-explode-b-lod0-mg 11) (def-art-elt drill-top-break-ag drill-top-break-explode-b-lod0-jg 10) (def-art-elt drill-top-break-ag drill-top-break-explode-a-lod0-mg 8) @@ -1098,9 +2945,160 @@ (def-art-elt drill-top-break-ag drill-top-break-idle-ja 2) (def-art-elt drill-top-break-ag drill-top-break-lod0-mg 1) (def-art-elt drill-top-break-ag drill-top-break-lod0-jg 0) +(def-art-elt kid-ltrnkrkd+0-ag kor-highres-idle-shuttle-ugrnd-ja 1) +(def-art-elt kid-ltrnkrkd+0-ag kid-highres-idle-shuttle-ugrnd-ja 0) (def-art-elt drill-switch-ag drill-switch-idle-ja 2) (def-art-elt drill-switch-ag drill-switch-lod0-mg 1) (def-art-elt drill-switch-ag drill-switch-lod0-jg 0) +(def-art-elt brutter-highres-ag brutter-highres-idle-kiosk-ja 4) +(def-art-elt brutter-highres-ag brutter-highres-idle-ja 3) +(def-art-elt brutter-highres-ag brutter-highres-shadow-mg 2) +(def-art-elt brutter-highres-ag brutter-highres-lod0-mg 1) +(def-art-elt brutter-highres-ag brutter-highres-lod0-jg 0) +(def-art-elt fort-elec-switch-ag fort-elec-switch-idle-ja 2) +(def-art-elt fort-elec-switch-ag fort-elec-switch-lod0-mg 1) +(def-art-elt fort-elec-switch-ag fort-elec-switch-lod0-jg 0) +(def-art-elt widow-bomb-ag widow-bomb-idle-ja 5) +(def-art-elt widow-bomb-ag widow-bomb-shadow-mg 4) +(def-art-elt widow-bomb-ag widow-bomb-lod2-mg 3) +(def-art-elt widow-bomb-ag widow-bomb-lod1-mg 2) +(def-art-elt widow-bomb-ag widow-bomb-lod0-mg 1) +(def-art-elt widow-bomb-ag widow-bomb-lod0-jg 0) +(def-art-elt cas-trapdoor-ag cas-trapdoor-explode-idle-ja 5) +(def-art-elt cas-trapdoor-ag cas-trapdoor-explode-lod0-mg 4) +(def-art-elt cas-trapdoor-ag cas-trapdoor-explode-lod0-jg 3) +(def-art-elt cas-trapdoor-ag cas-trapdoor-idle-ja 2) +(def-art-elt cas-trapdoor-ag cas-trapdoor-lod0-mg 1) +(def-art-elt cas-trapdoor-ag cas-trapdoor-lod0-jg 0) +(def-art-elt drill-elevator-base-ag drill-elevator-base-idle-ja 2) +(def-art-elt drill-elevator-base-ag drill-elevator-base-lod0-mg 1) +(def-art-elt drill-elevator-base-ag drill-elevator-base-lod0-jg 0) +(def-art-elt farm-sprinkler-barrels-ag farm-sprinkler-barrels-idle-ja 2) +(def-art-elt farm-sprinkler-barrels-ag farm-sprinkler-barrels-lod0-mg 1) +(def-art-elt farm-sprinkler-barrels-ag farm-sprinkler-barrels-lod0-jg 0) +(def-art-elt metalkor-legs-ag metalkor-legs-impact-ja 28) +(def-art-elt metalkor-legs-ag metalkor-legs-fly-ja 27) +(def-art-elt metalkor-legs-ag metalkor-legs-wings-open-ja 26) +(def-art-elt metalkor-legs-ag metalkor-legs-walk-to-stance-ja 25) +(def-art-elt metalkor-legs-ag metalkor-legs-run-back-ja 24) +(def-art-elt metalkor-legs-ag metalkor-legs-walk-back-ja 23) +(def-art-elt metalkor-legs-ag metalkor-legs-walk-right-ja 22) +(def-art-elt metalkor-legs-ag metalkor-legs-walk-left-ja 21) +(def-art-elt metalkor-legs-ag metalkor-legs-hit-right-ja 20) +(def-art-elt metalkor-legs-ag metalkor-legs-hit-left-ja 19) +(def-art-elt metalkor-legs-ag metalkor-legs-hit-ja 18) +(def-art-elt metalkor-legs-ag metalkor-legs-shot-ja 17) +(def-art-elt metalkor-legs-ag metalkor-legs-pre-shot-ja 16) +(def-art-elt metalkor-legs-ag metalkor-legs-attack-tail-ja 15) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-recover-ja 14) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-hit-back-ja 13) +(def-art-elt metalkor-legs-ag metalkor-legs-lod0-jg 0) +(def-art-elt metalkor-legs-ag metalkor-legs-lod0-mg 1) +(def-art-elt metalkor-legs-ag metalkor-legs-shadow-mg 2) +(def-art-elt metalkor-legs-ag metalkor-legs-idle-ja 3) +(def-art-elt metalkor-legs-ag metalkor-legs-idle-alt-ja 4) +(def-art-elt metalkor-legs-ag metalkor-legs-walk-ja 5) +(def-art-elt metalkor-legs-ag metalkor-legs-run-ja 6) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-ja 7) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-breathe-ja 8) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-hit-ja 9) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-hit-left-ja 10) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-hit-right-ja 11) +(def-art-elt metalkor-legs-ag metalkor-legs-collapse-hit-top-ja 12) +(def-art-elt krew-moneybag-ag krew-moneybag-idle-ja 3) +(def-art-elt krew-moneybag-ag krew-moneybag-shadow-mg 2) +(def-art-elt krew-moneybag-ag krew-moneybag-lod0-mg 1) +(def-art-elt krew-moneybag-ag krew-moneybag-lod0-jg 0) +(def-art-elt drill-bridge-shot-ag drill-bridge-shot-end-ja 5) +(def-art-elt drill-bridge-shot-ag drill-bridge-shot-break-ja 4) +(def-art-elt drill-bridge-shot-ag drill-bridge-shot-idle-ja 3) +(def-art-elt drill-bridge-shot-ag drill-bridge-shot-lod1-mg 2) +(def-art-elt drill-bridge-shot-ag drill-bridge-shot-lod0-mg 1) +(def-art-elt drill-bridge-shot-ag drill-bridge-shot-lod0-jg 0) +(def-art-elt water-anim-mountain-ag water-anim-mountain-idle-ja 6) +(def-art-elt water-anim-mountain-ag water-anim-mountain-fall-low-lod0-mg 5) +(def-art-elt water-anim-mountain-ag water-anim-mountain-fall-low-lod0-jg 4) +(def-art-elt water-anim-mountain-ag water-anim-mountain-fall-med-lod0-mg 3) +(def-art-elt water-anim-mountain-ag water-anim-mountain-fall-med-lod0-jg 2) +(def-art-elt water-anim-mountain-ag water-anim-mountain-fall-hi-lod0-mg 1) +(def-art-elt water-anim-mountain-ag water-anim-mountain-fall-hi-lod0-jg 0) +(def-art-elt ruins-tower-e-ag ruins-tower-e-idle-ja 2) +(def-art-elt ruins-tower-e-ag ruins-tower-e-lod0-mg 1) +(def-art-elt ruins-tower-e-ag ruins-tower-e-lod0-jg 0) +(def-art-elt plat-buried-ag mtn-plat-buried-idle-ja 4) +(def-art-elt plat-buried-ag mtn-plat-buried-lod2-mg 3) +(def-art-elt plat-buried-ag mtn-plat-buried-lod1-mg 2) +(def-art-elt plat-buried-ag mtn-plat-buried-lod0-mg 1) +(def-art-elt plat-buried-ag mtn-plat-buried-lod0-jg 0) +(def-art-elt dig-totem-fish-ag dig-totem-fish-idle-ja 2) +(def-art-elt dig-totem-fish-ag dig-totem-fish-lod0-mg 1) +(def-art-elt dig-totem-fish-ag dig-totem-fish-lod0-jg 0) +(def-art-elt juicer-ag juicer-die-falling-ja 41) +(def-art-elt juicer-ag juicer-death-ja 40) +(def-art-elt juicer-ag juicer-jump-land-ja 39) +(def-art-elt juicer-ag juicer-jump-in-air-ja 38) +(def-art-elt juicer-ag juicer-jump-wind-up-ja 37) +(def-art-elt juicer-ag juicer-yellow-hit3-ja 36) +(def-art-elt juicer-ag juicer-yellow-hit2-ja 35) +(def-art-elt juicer-ag juicer-yellow-hit1-ja 34) +(def-art-elt juicer-ag juicer-yellow-hit0-ja 33) +(def-art-elt juicer-ag juicer-blue-land-ja 32) +(def-art-elt juicer-ag juicer-blue-hit5-ja 31) +(def-art-elt juicer-ag juicer-blue-hit4-ja 30) +(def-art-elt juicer-ag juicer-blue-hit3-ja 29) +(def-art-elt juicer-ag juicer-attack-turn-ja 12) +(def-art-elt juicer-ag juicer-hit-in-place-ja 11) +(def-art-elt juicer-ag juicer-turn-ja 10) +(def-art-elt juicer-ag juicer-charge0-ja 9) +(def-art-elt juicer-ag juicer-patrol0-ja 8) +(def-art-elt juicer-ag juicer-idle-right-ja 7) +(def-art-elt juicer-ag juicer-idle-left-ja 6) +(def-art-elt juicer-ag juicer-idle-ja 5) +(def-art-elt juicer-ag juicer-shadow-mg 4) +(def-art-elt juicer-ag juicer-lod2-mg 3) +(def-art-elt juicer-ag juicer-lod1-mg 2) +(def-art-elt juicer-ag juicer-lod0-mg 1) +(def-art-elt juicer-ag juicer-lod0-jg 0) +(def-art-elt juicer-ag juicer-attack0-start-ja 13) +(def-art-elt juicer-ag juicer-attack0-ja 14) +(def-art-elt juicer-ag juicer-attack-spin-ja 15) +(def-art-elt juicer-ag juicer-knocked0-ja 16) +(def-art-elt juicer-ag juicer-knocked-land0-ja 17) +(def-art-elt juicer-ag juicer-knocked1-ja 18) +(def-art-elt juicer-ag juicer-knocked-land1-ja 19) +(def-art-elt juicer-ag juicer-charge1-ja 20) +(def-art-elt juicer-ag juicer-notice0-ja 21) +(def-art-elt juicer-ag juicer-notice1-ja 22) +(def-art-elt juicer-ag juicer-patrol1-ja 23) +(def-art-elt juicer-ag juicer-celebrate0-ja 24) +(def-art-elt juicer-ag juicer-celebrate1-ja 25) +(def-art-elt juicer-ag juicer-blue-hit0-ja 26) +(def-art-elt juicer-ag juicer-blue-hit1-ja 27) +(def-art-elt juicer-ag juicer-blue-hit2-ja 28) +(def-art-elt cranecrate-ag cranecrate-idle-ja 3) +(def-art-elt cranecrate-ag cranecrate-lod1-mg 2) +(def-art-elt cranecrate-ag cranecrate-lod0-mg 1) +(def-art-elt cranecrate-ag cranecrate-lod0-jg 0) +(def-art-elt grunt-egg-b-ag grunt-egg-b-idle2-ja 4) +(def-art-elt grunt-egg-b-ag grunt-egg-b-idle-ja 3) +(def-art-elt grunt-egg-b-ag grunt-egg-b-lod1-mg 2) +(def-art-elt grunt-egg-b-ag grunt-egg-b-lod0-mg 1) +(def-art-elt grunt-egg-b-ag grunt-egg-b-lod0-jg 0) +(def-art-elt palace-door-ag palace-door-idle-ja 2) +(def-art-elt palace-door-ag palace-door-lod0-mg 1) +(def-art-elt palace-door-ag palace-door-lod0-jg 0) +(def-art-elt torn-highres-ag torn-highres-idle-alley-ja 5) +(def-art-elt torn-highres-ag torn-highres-idle-table-ja 4) +(def-art-elt torn-highres-ag torn-highres-idle-ja 3) +(def-art-elt torn-highres-ag torn-highres-shadow-mg 2) +(def-art-elt torn-highres-ag torn-highres-lod0-mg 1) +(def-art-elt torn-highres-ag torn-highres-lod0-jg 0) +(def-art-elt pal-rot-gun-ag pal-rot-gun-idle-ja 2) +(def-art-elt pal-rot-gun-ag pal-rot-gun-lod0-mg 1) +(def-art-elt pal-rot-gun-ag pal-rot-gun-lod0-jg 0) +(def-art-elt rift-rider-heart-of-mar-ag rift-rider-heart-of-mar-idle-ja 2) +(def-art-elt rift-rider-heart-of-mar-ag rift-rider-heart-of-mar-lod0-mg 1) +(def-art-elt rift-rider-heart-of-mar-ag rift-rider-heart-of-mar-lod0-jg 0) (def-art-elt fort-lift-plat-ag fort-lift-plat-scale-ja 4) (def-art-elt fort-lift-plat-ag fort-lift-plat-idle-ja 3) (def-art-elt fort-lift-plat-ag fort-lift-plat-lod1-mg 2) @@ -1123,14 +3121,127 @@ (def-art-elt baron-highres-ag baron-highres-shadow-mg 2) (def-art-elt baron-highres-ag baron-highres-lod0-mg 1) (def-art-elt baron-highres-ag baron-highres-lod0-jg 0) +(def-art-elt hip-trophy-m-ag hip-trophy-m-idle-ja 2) +(def-art-elt hip-trophy-m-ag hip-trophy-m-lod0-mg 1) +(def-art-elt hip-trophy-m-ag hip-trophy-m-lod0-jg 0) (def-art-elt propa-ag propa-idle-ja 2) (def-art-elt propa-ag propa-lod0-mg 1) (def-art-elt propa-ag propa-lod0-jg 0) +(def-art-elt ecowell-a-ag ecowell-a-idle-ja 2) +(def-art-elt ecowell-a-ag ecowell-a-lod0-mg 1) +(def-art-elt ecowell-a-ag ecowell-a-lod0-jg 0) (def-art-elt vil-sagesail-ag vil-sagesail-idle-ja 4) (def-art-elt vil-sagesail-ag vil-sagesail-lod2-mg 3) (def-art-elt vil-sagesail-ag vil-sagesail-lod1-mg 2) (def-art-elt vil-sagesail-ag vil-sagesail-lod0-mg 1) (def-art-elt vil-sagesail-ag vil-sagesail-lod0-jg 0) +(def-art-elt gun-cit-b-ag gun-cit-b-explode-idle-ja 5) +(def-art-elt gun-cit-b-ag gun-cit-b-explode-lod0-mg 4) +(def-art-elt gun-cit-b-ag gun-cit-b-explode-lod0-jg 3) +(def-art-elt gun-cit-b-ag gun-cit-b-idle-ja 2) +(def-art-elt gun-cit-b-ag gun-cit-b-lod0-mg 1) +(def-art-elt gun-cit-b-ag gun-cit-b-lod0-jg 0) +(def-art-elt stdm-baron-box-ag stdm-baron-box-idle-ja 2) +(def-art-elt stdm-baron-box-ag stdm-baron-box-lod0-mg 1) +(def-art-elt stdm-baron-box-ag stdm-baron-box-lod0-jg 0) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-trapeze-jak-on-ja 7) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-trapeze-jak-off-ja 6) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-trapeze-shadow-mg 5) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-trapeze-lod0-mg 4) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-trapeze-lod0-jg 3) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-idle-ja 2) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-lod0-mg 1) +(def-art-elt dig-balloon-lurker-ag dig-balloon-lurker-lod0-jg 0) +(def-art-elt brutter-balloon-ag brutter-balloon-idle-ja 2) +(def-art-elt brutter-balloon-ag brutter-balloon-lod0-mg 1) +(def-art-elt brutter-balloon-ag brutter-balloon-lod0-jg 0) +(def-art-elt fodder-ag fodder-die-falling-ja 21) +(def-art-elt fodder-ag fodder-blue-hit2-ja 20) +(def-art-elt fodder-ag fodder-blue-hit1-ja 19) +(def-art-elt fodder-ag fodder-blue-hit0-ja 18) +(def-art-elt fodder-ag fodder-knocked-land0-ja 17) +(def-art-elt fodder-ag fodder-knocked0-ja 16) +(def-art-elt fodder-ag fodder-snap-ja 15) +(def-art-elt fodder-ag fodder-die-ja 14) +(def-art-elt fodder-ag fodder-look-around-ja 13) +(def-art-elt fodder-ag fodder-lod0-jg 0) +(def-art-elt fodder-ag fodder-lod0-mg 1) +(def-art-elt fodder-ag fodder-lod1-mg 2) +(def-art-elt fodder-ag fodder-shadow-mg 3) +(def-art-elt fodder-ag fodder-idle-ja 4) +(def-art-elt fodder-ag fodder-up-ja 5) +(def-art-elt fodder-ag fodder-chew-ja 6) +(def-art-elt fodder-ag fodder-run-ja 7) +(def-art-elt fodder-ag fodder-run-low-ja 8) +(def-art-elt fodder-ag fodder-biting-run-ja 9) +(def-art-elt fodder-ag fodder-jump-chomp-ja 10) +(def-art-elt fodder-ag fodder-jump-kick-ja 11) +(def-art-elt fodder-ag fodder-walk-ja 12) +(def-art-elt jinx-ag jinx-bomb-recoil1-ja 64) +(def-art-elt jinx-ag jinx-bomb-recoil0-ja 63) +(def-art-elt jinx-ag jinx-plant-bomb-right-ja 62) +(def-art-elt jinx-ag jinx-alert-to-idle0-ja 61) +(def-art-elt jinx-ag jinx-alert0-ja 60) +(def-art-elt jinx-ag jinx-blast-forward-alert-ja 59) +(def-art-elt jinx-ag jinx-jump-land-ja 28) +(def-art-elt jinx-ag jinx-jump-in-air-ja 27) +(def-art-elt jinx-ag jinx-jump-wind-up-ja 26) +(def-art-elt jinx-ag jinx-die-in-place0-ja 25) +(def-art-elt jinx-ag jinx-hard-hit-land-ja 24) +(def-art-elt jinx-ag jinx-hard-hit0-ja 23) +(def-art-elt jinx-ag jinx-knocked-land0-ja 22) +(def-art-elt jinx-ag jinx-knocked0-ja 21) +(def-art-elt jinx-ag jinx-yellow-hit-land-right0-ja 20) +(def-art-elt jinx-ag jinx-yellow-hit-right0-ja 19) +(def-art-elt jinx-ag jinx-yellow-hit-land-left0-ja 18) +(def-art-elt jinx-ag jinx-yellow-hit-left0-ja 17) +(def-art-elt jinx-ag jinx-blue-hit-land-ja 16) +(def-art-elt jinx-ag jinx-blue-hit-back2-ja 15) +(def-art-elt jinx-ag jinx-blue-hit-back1-ja 14) +(def-art-elt jinx-ag jinx-blue-hit-back0-ja 13) +(def-art-elt jinx-ag jinx-lod0-jg 0) +(def-art-elt jinx-ag jinx-lod0-mg 1) +(def-art-elt jinx-ag jinx-shadow-mg 2) +(def-art-elt jinx-ag jinx-idle0-ja 3) +(def-art-elt jinx-ag jinx-idle1-ja 4) +(def-art-elt jinx-ag jinx-scared0-ja 5) +(def-art-elt jinx-ag jinx-scared1-ja 6) +(def-art-elt jinx-ag jinx-scared2-ja 7) +(def-art-elt jinx-ag jinx-scared3-ja 8) +(def-art-elt jinx-ag jinx-scared4-ja 9) +(def-art-elt jinx-ag jinx-blue-hit-front0-ja 10) +(def-art-elt jinx-ag jinx-blue-hit-front1-ja 11) +(def-art-elt jinx-ag jinx-blue-hit-front2-ja 12) +(def-art-elt jinx-ag jinx-jump-wind-up-mog-ja 29) +(def-art-elt jinx-ag jinx-jump-in-air-mog-ja 30) +(def-art-elt jinx-ag jinx-jump-land-mog-ja 31) +(def-art-elt jinx-ag jinx-walk0-ja 32) +(def-art-elt jinx-ag jinx-run0-ja 33) +(def-art-elt jinx-ag jinx-walk-limp0-ja 34) +(def-art-elt jinx-ag jinx-run-limp0-ja 35) +(def-art-elt jinx-ag jinx-walk-mog0-ja 36) +(def-art-elt jinx-ag jinx-run-mog0-ja 37) +(def-art-elt jinx-ag jinx-turn-left-start0-ja 38) +(def-art-elt jinx-ag jinx-turn-left50-end0-ja 39) +(def-art-elt jinx-ag jinx-turn-left100-end0-ja 40) +(def-art-elt jinx-ag jinx-turn-left150-end0-ja 41) +(def-art-elt jinx-ag jinx-turn-right-start0-ja 42) +(def-art-elt jinx-ag jinx-turn-right50-end0-ja 43) +(def-art-elt jinx-ag jinx-turn-right100-end0-ja 44) +(def-art-elt jinx-ag jinx-turn-right150-end0-ja 45) +(def-art-elt jinx-ag jinx-scared-turn-left-start0-ja 46) +(def-art-elt jinx-ag jinx-scared-turn-left50-end0-ja 47) +(def-art-elt jinx-ag jinx-scared-turn-left100-end0-ja 48) +(def-art-elt jinx-ag jinx-scared-turn-left150-end0-ja 49) +(def-art-elt jinx-ag jinx-scared-turn-right-start0-ja 50) +(def-art-elt jinx-ag jinx-scared-turn-right50-end0-ja 51) +(def-art-elt jinx-ag jinx-scared-turn-right100-end0-ja 52) +(def-art-elt jinx-ag jinx-scared-turn-right150-end0-ja 53) +(def-art-elt jinx-ag jinx-blast-forward-ja 54) +(def-art-elt jinx-ag jinx-blast-left-ja 55) +(def-art-elt jinx-ag jinx-blast-right-ja 56) +(def-art-elt jinx-ag jinx-kick0-ja 57) +(def-art-elt jinx-ag jinx-kick1-ja 58) (def-art-elt jak-mech+0-ag mech-mech-punch-u-ja 89) (def-art-elt jak-mech+0-ag mech-mech-death-b-ja 88) (def-art-elt jak-mech+0-ag mech-mech-death-a-ja 87) @@ -1221,15 +3332,81 @@ (def-art-elt jak-mech+0-ag jakb-mech-get-on-ja 56) (def-art-elt jak-mech+0-ag jakb-mech-death-a-ja 57) (def-art-elt jak-mech+0-ag jakb-mech-death-b-ja 58) +(def-art-elt squid-collision-ag squid-collision-idle-ja 6) +(def-art-elt squid-collision-ag squid-collision-c-lod0-mg 5) +(def-art-elt squid-collision-ag squid-collision-c-lod0-jg 4) +(def-art-elt squid-collision-ag squid-collision-b-lod0-mg 3) +(def-art-elt squid-collision-ag squid-collision-b-lod0-jg 2) +(def-art-elt squid-collision-ag squid-collision-lod0-mg 1) +(def-art-elt squid-collision-ag squid-collision-lod0-jg 0) +(def-art-elt com-elevator-ag com-elevator-idle-ja 3) +(def-art-elt com-elevator-ag com-elevator-lod1-mg 2) +(def-art-elt com-elevator-ag com-elevator-lod0-mg 1) +(def-art-elt com-elevator-ag com-elevator-lod0-jg 0) +(def-art-elt sew-multi-blade-ag sew-multi-blade-idle-ja 3) +(def-art-elt sew-multi-blade-ag sew-multi-blade-lod1-mg 2) +(def-art-elt sew-multi-blade-ag sew-multi-blade-lod0-mg 1) +(def-art-elt sew-multi-blade-ag sew-multi-blade-lod0-jg 0) +(def-art-elt gun-buoy-ag gun-buoy-close-ja 4) +(def-art-elt gun-buoy-ag gun-buoy-open-ja 3) +(def-art-elt gun-buoy-ag gun-buoy-idle-ja 2) +(def-art-elt gun-buoy-ag gun-buoy-lod0-mg 1) +(def-art-elt gun-buoy-ag gun-buoy-lod0-jg 0) +(def-art-elt gar-door-ag gar-door-idle-ja 2) +(def-art-elt gar-door-ag gar-door-lod0-mg 1) +(def-art-elt gar-door-ag gar-door-lod0-jg 0) +(def-art-elt drill-plat-falling-ag drill-plat-falling-idle-ja 2) +(def-art-elt drill-plat-falling-ag drill-plat-falling-lod0-mg 1) +(def-art-elt drill-plat-falling-ag drill-plat-falling-lod0-jg 0) +(def-art-elt seal-of-mar-base-ag seal-of-mar-base-idle-ja 2) +(def-art-elt seal-of-mar-base-ag seal-of-mar-base-lod0-mg 1) +(def-art-elt seal-of-mar-base-ag seal-of-mar-base-lod0-jg 0) +(def-art-elt transport-ag transport-hatch-close-ja 6) +(def-art-elt transport-ag transport-hatch-open-ja 5) +(def-art-elt transport-ag transport-idle-ja 4) +(def-art-elt transport-ag transport-lod2-mg 3) +(def-art-elt transport-ag transport-lod1-mg 2) +(def-art-elt transport-ag transport-lod0-mg 1) +(def-art-elt transport-ag transport-lod0-jg 0) +(def-art-elt mtn-plat-shoot-ag mtn-plat-shoot-idle-ja 3) +(def-art-elt mtn-plat-shoot-ag mtn-plat-shoot-lod1-mg 2) +(def-art-elt mtn-plat-shoot-ag mtn-plat-shoot-lod0-mg 1) +(def-art-elt mtn-plat-shoot-ag mtn-plat-shoot-lod0-jg 0) +(def-art-elt cboss-bomb-ag cboss-bomb-idle-ja 2) +(def-art-elt cboss-bomb-ag cboss-bomb-lod0-mg 1) +(def-art-elt cboss-bomb-ag cboss-bomb-lod0-jg 0) +(def-art-elt switch-ag cas-switch-idle-ja 2) +(def-art-elt switch-ag cas-switch-lod0-mg 1) +(def-art-elt switch-ag cas-switch-lod0-jg 0) +(def-art-elt pal-grind-ring-center-ag pal-grind-ring-center-explode-idle-ja 5) +(def-art-elt pal-grind-ring-center-ag pal-grind-ring-center-explode-lod0-mg 4) +(def-art-elt pal-grind-ring-center-ag pal-grind-ring-center-explode-lod0-jg 3) +(def-art-elt pal-grind-ring-center-ag pal-grind-ring-center-idle-ja 2) +(def-art-elt pal-grind-ring-center-ag pal-grind-ring-center-lod0-mg 1) +(def-art-elt pal-grind-ring-center-ag pal-grind-ring-center-lod0-jg 0) +(def-art-elt fort-plat-orbit-ag fort-plat-orbit-idle-ja 2) +(def-art-elt fort-plat-orbit-ag fort-plat-orbit-lod0-mg 1) +(def-art-elt fort-plat-orbit-ag fort-plat-orbit-lod0-jg 0) (def-art-elt fort-entry-gate-ag fort-entry-gate-idle-ja 2) (def-art-elt fort-entry-gate-ag fort-entry-gate-lod0-mg 1) (def-art-elt fort-entry-gate-ag fort-entry-gate-lod0-jg 0) (def-art-elt eco-canister-ag eco-canister-dark-idle-ja 2) (def-art-elt eco-canister-ag eco-canister-dark-lod0-mg 1) (def-art-elt eco-canister-ag eco-canister-dark-lod0-jg 0) +(def-art-elt fort-floor-spike-b-ag fort-floor-spike-b-idle-ja 4) +(def-art-elt fort-floor-spike-b-ag fort-floor-spike-b-lod2-mg 3) +(def-art-elt fort-floor-spike-b-ag fort-floor-spike-b-lod1-mg 2) +(def-art-elt fort-floor-spike-b-ag fort-floor-spike-b-lod0-mg 1) +(def-art-elt fort-floor-spike-b-ag fort-floor-spike-b-lod0-jg 0) +(def-art-elt hip-mug-ag hip-mug-idle-ja 2) +(def-art-elt hip-mug-ag hip-mug-lod0-mg 1) +(def-art-elt hip-mug-ag hip-mug-lod0-jg 0) (def-art-elt talk-box-ag talk-box-idle-ja 2) (def-art-elt talk-box-ag talk-box-lod0-mg 1) (def-art-elt talk-box-ag talk-box-lod0-jg 0) +(def-art-elt light-switch-ag sew-light-switch-idle-ja 2) +(def-art-elt light-switch-ag sew-light-switch-lod0-mg 1) +(def-art-elt light-switch-ag sew-light-switch-lod0-jg 0) (def-art-elt particleman-ag particleman-idle-ja 2) (def-art-elt particleman-ag particleman-lod0-mg 1) (def-art-elt particleman-ag particleman-lod0-jg 0) @@ -1380,6 +3557,128 @@ (def-art-elt vehicle-turret-ag vehicle-turret-lod1-mg 2) (def-art-elt vehicle-turret-ag vehicle-turret-lod0-mg 1) (def-art-elt vehicle-turret-ag vehicle-turret-lod0-jg 0) +(def-art-elt citizen-rebel-ag citizen-rebel-get-in-car-ja 35) +(def-art-elt citizen-rebel-ag citizen-rebel-car-stance-ja 34) +(def-art-elt citizen-rebel-ag citizen-rebel-bike-stance-ja 33) +(def-art-elt citizen-rebel-ag citizen-rebel-tread-water-ja 32) +(def-art-elt citizen-rebel-ag citizen-rebel-cover-head-end-ja 31) +(def-art-elt citizen-rebel-ag citizen-rebel-cover-head-loop-ja 30) +(def-art-elt citizen-rebel-ag citizen-rebel-cover-head-start-ja 29) +(def-art-elt citizen-rebel-ag citizen-rebel-walk2-ja 12) +(def-art-elt citizen-rebel-ag citizen-rebel-walk-ja 11) +(def-art-elt citizen-rebel-ag citizen-rebel-shuffle-ja 10) +(def-art-elt citizen-rebel-ag citizen-rebel-out-of-breath-ja 9) +(def-art-elt citizen-rebel-ag citizen-rebel-idle-to-out-of-breath-ja 8) +(def-art-elt citizen-rebel-ag citizen-rebel-arms-crossed-ja 7) +(def-art-elt citizen-rebel-ag citizen-rebel-idle-to-arms-crossed-ja 6) +(def-art-elt citizen-rebel-ag citizen-rebel-arms-hips-ja 5) +(def-art-elt citizen-rebel-ag citizen-rebel-idle-to-arms-hips-ja 4) +(def-art-elt citizen-rebel-ag citizen-rebel-idle-ja 3) +(def-art-elt citizen-rebel-ag citizen-rebel-shadow-mg 2) +(def-art-elt citizen-rebel-ag citizen-rebel-lod0-mg 1) +(def-art-elt citizen-rebel-ag citizen-rebel-lod0-jg 0) +(def-art-elt citizen-rebel-ag citizen-rebel-walk3-ja 13) +(def-art-elt citizen-rebel-ag citizen-rebel-run-ja 14) +(def-art-elt citizen-rebel-ag citizen-rebel-run2-ja 15) +(def-art-elt citizen-rebel-ag citizen-rebel-run3-ja 16) +(def-art-elt citizen-rebel-ag citizen-rebel-panic-run-ja 17) +(def-art-elt citizen-rebel-ag citizen-rebel-panic-run2-ja 18) +(def-art-elt citizen-rebel-ag citizen-rebel-dive-forward-ja 19) +(def-art-elt citizen-rebel-ag citizen-rebel-hit-the-deck-ja 20) +(def-art-elt citizen-rebel-ag citizen-rebel-knocked-front-ja 21) +(def-art-elt citizen-rebel-ag citizen-rebel-knocked-front-land-ja 22) +(def-art-elt citizen-rebel-ag citizen-rebel-knocked-back-ja 23) +(def-art-elt citizen-rebel-ag citizen-rebel-knocked-back-land-ja 24) +(def-art-elt citizen-rebel-ag citizen-rebel-get-up-from-front-ja 25) +(def-art-elt citizen-rebel-ag citizen-rebel-get-up-from-back-ja 26) +(def-art-elt citizen-rebel-ag citizen-rebel-blue-hit-ja 27) +(def-art-elt citizen-rebel-ag citizen-rebel-blue-hit-land-death-ja 28) +(def-art-elt fort-missile-target-ag fort-missile-target-explode-idle-ja 5) +(def-art-elt fort-missile-target-ag fort-missile-target-explode-lod0-mg 4) +(def-art-elt fort-missile-target-ag fort-missile-target-explode-lod0-jg 3) +(def-art-elt fort-missile-target-ag fort-missile-target-idle-ja 2) +(def-art-elt fort-missile-target-ag fort-missile-target-lod0-mg 1) +(def-art-elt fort-missile-target-ag fort-missile-target-lod0-jg 0) +(def-art-elt tomb-boulder-door-ag tomb-boulder-door-idle-ja 2) +(def-art-elt tomb-boulder-door-ag tomb-boulder-door-lod0-mg 1) +(def-art-elt tomb-boulder-door-ag tomb-boulder-door-lod0-jg 0) +(def-art-elt gar-trophy-ca-ag gar-trophy-ca-idle-ja 2) +(def-art-elt gar-trophy-ca-ag gar-trophy-ca-lod0-mg 1) +(def-art-elt gar-trophy-ca-ag gar-trophy-ca-lod0-jg 0) +(def-art-elt vin-turbine-ag vin-turbine-idle-ja 2) +(def-art-elt vin-turbine-ag vin-turbine-lod0-mg 1) +(def-art-elt vin-turbine-ag vin-turbine-lod0-jg 0) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-i-idle-ja 26) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-i-lod0-mg 25) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-i-lod0-jg 24) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-h-idle-ja 23) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-h-lod0-mg 22) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-h-lod0-jg 21) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-g-idle-ja 20) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-g-lod0-mg 19) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-g-lod0-jg 18) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-f-idle-ja 17) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-f-lod0-mg 16) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-f-lod0-jg 15) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-e-idle-ja 14) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-e-lod0-mg 13) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-a-lod0-jg 0) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-a-lod0-mg 1) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-a-idle-ja 2) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-b-lod0-jg 3) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-b-lod0-mg 4) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-b-idle-ja 5) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-c-lod0-jg 6) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-c-lod0-mg 7) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-c-idle-ja 8) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-d-lod0-jg 9) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-d-lod0-mg 10) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-d-idle-ja 11) +(def-art-elt tomb-boss-debris-ag tomb-boss-debris-e-lod0-jg 12) +(def-art-elt dig-totem-ag dig-totem-idle-ja 2) +(def-art-elt dig-totem-ag dig-totem-lod0-mg 1) +(def-art-elt dig-totem-ag dig-totem-lod0-jg 0) +(def-art-elt sew-twist-blade-ag sew-twist-blade-idle-ja 3) +(def-art-elt sew-twist-blade-ag sew-twist-blade-lod1-mg 2) +(def-art-elt sew-twist-blade-ag sew-twist-blade-lod0-mg 1) +(def-art-elt sew-twist-blade-ag sew-twist-blade-lod0-jg 0) +(def-art-elt sew-gunturret-ag sew-gunturret-explode-idle-ja 6) +(def-art-elt sew-gunturret-ag sew-gunturret-explode-lod0-mg 5) +(def-art-elt sew-gunturret-ag sew-gunturret-explode-lod0-jg 4) +(def-art-elt sew-gunturret-ag sew-gunturret-shoot-ja 3) +(def-art-elt sew-gunturret-ag sew-gunturret-idle-ja 2) +(def-art-elt sew-gunturret-ag sew-gunturret-lod0-mg 1) +(def-art-elt sew-gunturret-ag sew-gunturret-lod0-jg 0) +(def-art-elt dig-button-ag dig-button-idle-ja 2) +(def-art-elt dig-button-ag dig-button-lod0-mg 1) +(def-art-elt dig-button-ag dig-button-lod0-jg 0) +(def-art-elt tomb-stair-block-spikes-ag tomb-stair-block-spikes-idle-ja 2) +(def-art-elt tomb-stair-block-spikes-ag tomb-stair-block-spikes-lod0-mg 1) +(def-art-elt tomb-stair-block-spikes-ag tomb-stair-block-spikes-lod0-jg 0) +(def-art-elt kid-nestb+0-ag kid-idle-floating-ja 0) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-idle-ja 12) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-long-grnd-pool-lod0-mg 11) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-long-grnd-pool-lod0-jg 10) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-middle-fountain-lod0-mg 9) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-middle-fountain-lod0-jg 8) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-smlground-pool-lod0-mg 7) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-smlground-pool-lod0-jg 6) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-lrgfloor-pool-lod0-mg 5) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-lrgfloor-pool-lod0-jg 4) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-smlsqr-pool-lod0-mg 3) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-smlsqr-pool-lod0-jg 2) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-lrgsqr-pool-lod0-mg 1) +(def-art-elt water-anim-ctypal-ag water-anim-ctypal-lrgsqr-pool-lod0-jg 0) +(def-art-elt kor-break-ray-ag kor-break-ray-idle-ja 2) +(def-art-elt kor-break-ray-ag kor-break-ray-lod0-mg 1) +(def-art-elt kor-break-ray-ag kor-break-ray-lod0-jg 0) +(def-art-elt dig-clasp-ag dig-clasp-explode-idle-ja 5) +(def-art-elt dig-clasp-ag dig-clasp-explode-lod0-mg 4) +(def-art-elt dig-clasp-ag dig-clasp-explode-lod0-jg 3) +(def-art-elt dig-clasp-ag dig-clasp-idle-ja 2) +(def-art-elt dig-clasp-ag dig-clasp-lod0-mg 1) +(def-art-elt dig-clasp-ag dig-clasp-lod0-jg 0) +(def-art-elt keira-garage+0-ag keira-highres-idle-garage-ja 0) (def-art-elt prsn-daxter-plat-ag prsn-daxter-plat-idle-ja 2) (def-art-elt prsn-daxter-plat-ag prsn-daxter-plat-lod0-mg 1) (def-art-elt prsn-daxter-plat-ag prsn-daxter-plat-lod0-jg 0) @@ -1404,6 +3703,9 @@ (def-art-elt drill-crane-ag drill-crane-a-end-ja 10) (def-art-elt drill-crane-ag drill-crane-b-lod0-jg 11) (def-art-elt drill-crane-ag drill-crane-b-lod0-mg 12) +(def-art-elt kid-tombd+0-ag kid-highres-idle-tomb-ja 1) +(def-art-elt kid-tombd+0-ag crocadog-highres-idle-vinroom-ja 0) +(def-art-elt youngsamos-lyskdcd+0-ag youngsamos-highres-idle-alley-ja 0) (def-art-elt centipede-ag centipede-mand-close-mouth-jitter-ja 14) (def-art-elt centipede-ag centipede-mand-close-mouth-ja 13) (def-art-elt centipede-ag centipede-lod0-jg 0) @@ -1419,9 +3721,68 @@ (def-art-elt centipede-ag centipede-mand-chomp3-ja 10) (def-art-elt centipede-ag centipede-mand-open-mouth-ja 11) (def-art-elt centipede-ag centipede-mand-open-mouth-jitter-ja 12) +(def-art-elt stad-force-field-ag stad-force-field-idle-ja 2) +(def-art-elt stad-force-field-ag stad-force-field-lod0-mg 1) +(def-art-elt stad-force-field-ag stad-force-field-lod0-jg 0) +(def-art-elt ruins-tower-d-ag ruins-tower-d-idle-ja 2) +(def-art-elt ruins-tower-d-ag ruins-tower-d-lod0-mg 1) +(def-art-elt ruins-tower-d-ag ruins-tower-d-lod0-jg 0) +(def-art-elt ctyport-mine-ag ctyport-mine-idle-ja 2) +(def-art-elt ctyport-mine-ag ctyport-mine-lod0-mg 1) +(def-art-elt ctyport-mine-ag ctyport-mine-lod0-jg 0) +(def-art-elt spider-eyes-ag spider-eyes-idle-ja 2) +(def-art-elt spider-eyes-ag spider-eyes-lod0-mg 1) +(def-art-elt spider-eyes-ag spider-eyes-lod0-jg 0) (def-art-elt drill-metalhead-eggs-b-ag drill-metalhead-eggs-b-idle-ja 2) (def-art-elt drill-metalhead-eggs-b-ag drill-metalhead-eggs-b-lod0-mg 1) (def-art-elt drill-metalhead-eggs-b-ag drill-metalhead-eggs-b-lod0-jg 0) +(def-art-elt ecowell-d-ag ecowell-d-idle-ja 2) +(def-art-elt ecowell-d-ag ecowell-d-lod0-mg 1) +(def-art-elt ecowell-d-ag ecowell-d-lod0-jg 0) +(def-art-elt turbine-ag turbine-idle-ja 3) +(def-art-elt turbine-ag turbine-lod1-mg 2) +(def-art-elt turbine-ag turbine-lod0-mg 1) +(def-art-elt turbine-ag turbine-lod0-jg 0) +(def-art-elt rhino-wall-ag rhino-wall-2-end-ja 9) +(def-art-elt rhino-wall-ag rhino-wall-2-idle-ja 7) +(def-art-elt rhino-wall-ag rhino-wall-2-lod0-mg 6) +(def-art-elt rhino-wall-ag rhino-wall-2-lod0-jg 5) +(def-art-elt rhino-wall-ag rhino-wall-1-end-ja 4) +(def-art-elt rhino-wall-ag rhino-wall-1-idle-ja 2) +(def-art-elt rhino-wall-ag rhino-wall-1-lod0-mg 1) +(def-art-elt rhino-wall-ag rhino-wall-1-lod0-jg 0) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-3-end-ja 9) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-3-idle-ja 8) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-2-end-ja 6) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-2-idle-ja 5) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-1-end-ja 3) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-1-idle-ja 2) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-lod0-mg 1) +(def-art-elt ruins-pillar-collapse-ag ruins-pillar-collapse-lod0-jg 0) +(def-art-elt dig-wheel-step-ag dig-wheel-step-idle-ja 2) +(def-art-elt dig-wheel-step-ag dig-wheel-step-lod0-mg 1) +(def-art-elt dig-wheel-step-ag dig-wheel-step-lod0-jg 0) +(def-art-elt heart-mar-ag heart-mar-idle-ja 2) +(def-art-elt heart-mar-ag heart-mar-lod0-mg 1) +(def-art-elt heart-mar-ag heart-mar-lod0-jg 0) +(def-art-elt pal-gun-turret-ag pal-gun-turret-explode-idle-ja 6) +(def-art-elt pal-gun-turret-ag pal-gun-turret-explode-lod0-mg 5) +(def-art-elt pal-gun-turret-ag pal-gun-turret-explode-lod0-jg 4) +(def-art-elt pal-gun-turret-ag pal-gun-turret-shoot-ja 3) +(def-art-elt pal-gun-turret-ag pal-gun-turret-idle-ja 2) +(def-art-elt pal-gun-turret-ag pal-gun-turret-lod0-mg 1) +(def-art-elt pal-gun-turret-ag pal-gun-turret-lod0-jg 0) +(def-art-elt gar-curtain-ag gar-curtain-idle-ja 2) +(def-art-elt gar-curtain-ag gar-curtain-lod0-mg 1) +(def-art-elt gar-curtain-ag gar-curtain-lod0-jg 0) +(def-art-elt sig-highres-ag sig-highres-idle-stand-ja 4) +(def-art-elt sig-highres-ag sig-highres-idle-ja 3) +(def-art-elt sig-highres-ag sig-highres-shadow-mg 2) +(def-art-elt sig-highres-ag sig-highres-lod0-mg 1) +(def-art-elt sig-highres-ag sig-highres-lod0-jg 0) +(def-art-elt meteor-ag meteor-idle-ja 2) +(def-art-elt meteor-ag meteor-lod0-mg 1) +(def-art-elt meteor-ag meteor-lod0-jg 0) (def-art-elt under-mine-ag under-mine-explode-idle-ja 7) (def-art-elt under-mine-ag under-mine-explode-lod0-mg 6) (def-art-elt under-mine-ag under-mine-explode-lod0-jg 5) @@ -1430,6 +3791,10 @@ (def-art-elt under-mine-ag under-mine-lod1-mg 2) (def-art-elt under-mine-ag under-mine-lod0-mg 1) (def-art-elt under-mine-ag under-mine-lod0-jg 0) +(def-art-elt jak-logo-ag jak-logo-end-ja 5) +(def-art-elt jak-logo-ag jak-logo-idle-ja 2) +(def-art-elt jak-logo-ag jak-logo-lod0-mg 1) +(def-art-elt jak-logo-ag jak-logo-lod0-jg 0) (def-art-elt crimson-guard-ag crimson-guard-knocked-from-bike-ja 43) (def-art-elt crimson-guard-ag crimson-guard-knocked-from-car-ja 42) (def-art-elt crimson-guard-ag crimson-guard-jump-left-ja 41) @@ -1474,24 +3839,310 @@ (def-art-elt crimson-guard-ag crimson-guard-gun-attack-ja 26) (def-art-elt crimson-guard-ag crimson-guard-attack-shoot-knee-start-ja 27) (def-art-elt crimson-guard-ag crimson-guard-attack-shoot-knee-loop-ja 28) +(def-art-elt drill-elevator-ag drill-elevator-drop-rail-ja 4) +(def-art-elt drill-elevator-ag drill-elevator-raise-rail-ja 3) +(def-art-elt drill-elevator-ag drill-elevator-idle-ja 2) +(def-art-elt drill-elevator-ag drill-elevator-lod0-mg 1) +(def-art-elt drill-elevator-ag drill-elevator-lod0-jg 0) +(def-art-elt metalkor-ag metalkor-spinner-dissolve-ja 53) +(def-art-elt metalkor-ag metalkor-spinner-short-ja 52) +(def-art-elt metalkor-ag metalkor-spinner-fire-ja 51) +(def-art-elt metalkor-ag metalkor-spinner-idle-ja 50) +(def-art-elt metalkor-ag metalkor-spinner-lod0-mg 49) +(def-art-elt metalkor-ag metalkor-spinner-lod0-jg 48) +(def-art-elt metalkor-ag metalkor-impact-ja 47) +(def-art-elt metalkor-ag metalkor-fly-ja 46) +(def-art-elt metalkor-ag metalkor-wings-open-ja 45) +(def-art-elt metalkor-ag metalkor-hang-hit-major-ja 44) +(def-art-elt metalkor-ag metalkor-attack-sweep-right-ja 43) +(def-art-elt metalkor-ag metalkor-attack-sweep-left-ja 42) +(def-art-elt metalkor-ag metalkor-walk-to-stance-ja 41) +(def-art-elt metalkor-ag metalkor-run-back-ja 40) +(def-art-elt metalkor-ag metalkor-walk-back-ja 39) +(def-art-elt metalkor-ag metalkor-walk-right-ja 38) +(def-art-elt metalkor-ag metalkor-walk-left-ja 37) +(def-art-elt metalkor-ag metalkor-hit-right-ja 36) +(def-art-elt metalkor-ag metalkor-hit-left-ja 35) +(def-art-elt metalkor-ag metalkor-hit-ja 34) +(def-art-elt metalkor-ag metalkor-shot-ja 33) +(def-art-elt metalkor-ag metalkor-pre-shot-ja 32) +(def-art-elt metalkor-ag metalkor-attack-tail-ja 31) +(def-art-elt metalkor-ag metalkor-collapse-recover-ja 30) +(def-art-elt metalkor-ag metalkor-collapse-hit-back-ja 29) +(def-art-elt metalkor-ag metalkor-hang-turn-right-end-ja 12) +(def-art-elt metalkor-ag metalkor-hang-turn-right-ja 11) +(def-art-elt metalkor-ag metalkor-hang-turn-right-start-ja 10) +(def-art-elt metalkor-ag metalkor-hang-ja 9) +(def-art-elt metalkor-ag metalkor-collapse-breathe-ja 8) +(def-art-elt metalkor-ag metalkor-collapse-ja 7) +(def-art-elt metalkor-ag metalkor-run-ja 6) +(def-art-elt metalkor-ag metalkor-walk-ja 5) +(def-art-elt metalkor-ag metalkor-idle-alt-ja 4) +(def-art-elt metalkor-ag metalkor-idle-ja 3) +(def-art-elt metalkor-ag metalkor-shadow-mg 2) +(def-art-elt metalkor-ag metalkor-lod0-mg 1) +(def-art-elt metalkor-ag metalkor-lod0-jg 0) +(def-art-elt metalkor-ag metalkor-hang-turn-left-start-ja 13) +(def-art-elt metalkor-ag metalkor-hang-turn-left-ja 14) +(def-art-elt metalkor-ag metalkor-hang-turn-left-end-ja 15) +(def-art-elt metalkor-ag metalkor-hang-turn-right-end-alt-ja 16) +(def-art-elt metalkor-ag metalkor-hang-turn-left-end-alt-ja 17) +(def-art-elt metalkor-ag metalkor-hang-hit-ja 18) +(def-art-elt metalkor-ag metalkor-hang-hit-left-ja 19) +(def-art-elt metalkor-ag metalkor-hang-hit-right-ja 20) +(def-art-elt metalkor-ag metalkor-hang-roar-ja 21) +(def-art-elt metalkor-ag metalkor-breathe-ja 22) +(def-art-elt metalkor-ag metalkor-hang-pre-shot-ja 23) +(def-art-elt metalkor-ag metalkor-hang-shot-ja 24) +(def-art-elt metalkor-ag metalkor-collapse-hit-ja 25) +(def-art-elt metalkor-ag metalkor-collapse-hit-left-ja 26) +(def-art-elt metalkor-ag metalkor-collapse-hit-right-ja 27) +(def-art-elt metalkor-ag metalkor-collapse-hit-top-ja 28) +(def-art-elt rift-rider-chunk-a-ag rift-rider-chunk-a-idle-ja 2) +(def-art-elt rift-rider-chunk-a-ag rift-rider-chunk-a-lod0-mg 1) +(def-art-elt rift-rider-chunk-a-ag rift-rider-chunk-a-lod0-jg 0) +(def-art-elt homing-beacon-ag homing-beacon-idle-ja 2) +(def-art-elt homing-beacon-ag homing-beacon-lod0-mg 1) +(def-art-elt homing-beacon-ag homing-beacon-lod0-jg 0) +(def-art-elt pow-mov-plat-ag pow-mov-plat-idle-ja 2) +(def-art-elt pow-mov-plat-ag pow-mov-plat-lod0-mg 1) +(def-art-elt pow-mov-plat-ag pow-mov-plat-lod0-jg 0) +(def-art-elt cboss-elevator-ag cboss-elevator-idle-ja 2) +(def-art-elt cboss-elevator-ag cboss-elevator-lod0-mg 1) +(def-art-elt cboss-elevator-ag cboss-elevator-lod0-jg 0) +(def-art-elt drill-drop-plat-ag drill-drop-plat-swing-down-ja 3) +(def-art-elt drill-drop-plat-ag drill-drop-plat-swing-up-ja 2) +(def-art-elt drill-drop-plat-ag drill-drop-plat-lod0-mg 1) +(def-art-elt drill-drop-plat-ag drill-drop-plat-lod0-jg 0) +(def-art-elt dig-spikey-sphere-ag dig-spikey-sphere-explode-idle-ja 6) +(def-art-elt dig-spikey-sphere-ag dig-spikey-sphere-explode-lod0-mg 5) +(def-art-elt dig-spikey-sphere-ag dig-spikey-sphere-explode-lod0-jg 4) +(def-art-elt dig-spikey-sphere-ag dig-spikey-sphere-idle-ja 3) +(def-art-elt dig-spikey-sphere-ag dig-spikey-sphere-shadow-mg 2) +(def-art-elt dig-spikey-sphere-ag dig-spikey-sphere-lod0-mg 1) +(def-art-elt dig-spikey-sphere-ag dig-spikey-sphere-lod0-jg 0) +(def-art-elt hosehead-ag hosehead-jump-down-land-ja 41) +(def-art-elt hosehead-ag hosehead-jump-down-ja 40) +(def-art-elt hosehead-ag hosehead-jitter-ja 39) +(def-art-elt hosehead-ag hosehead-idle2-ja 38) +(def-art-elt hosehead-ag hosehead-idle1-ja 37) +(def-art-elt hosehead-ag hosehead-run1-ja 36) +(def-art-elt hosehead-ag hosehead-knocked-land2-ja 35) +(def-art-elt hosehead-ag hosehead-knocked2-ja 34) +(def-art-elt hosehead-ag hosehead-knocked-land1-ja 33) +(def-art-elt hosehead-ag hosehead-knocked1-ja 32) +(def-art-elt hosehead-ag hosehead-blue-hit-land2-ja 31) +(def-art-elt hosehead-ag hosehead-blue-hit2-ja 30) +(def-art-elt hosehead-ag hosehead-blue-hit-land1-ja 29) +(def-art-elt hosehead-ag hosehead-shoot-end-ja 12) +(def-art-elt hosehead-ag hosehead-shoot-loop-ja 11) +(def-art-elt hosehead-ag hosehead-shoot-start-ja 10) +(def-art-elt hosehead-ag hosehead-wall-jump-land-ja 9) +(def-art-elt hosehead-ag hosehead-wall-jump-air-ja 8) +(def-art-elt hosehead-ag hosehead-wall-jump-start-ja 7) +(def-art-elt hosehead-ag hosehead-walk-wall-ja 6) +(def-art-elt hosehead-ag hosehead-walk-ja 5) +(def-art-elt hosehead-ag hosehead-shadow-mg 4) +(def-art-elt hosehead-ag hosehead-lod2-mg 3) +(def-art-elt hosehead-ag hosehead-lod1-mg 2) +(def-art-elt hosehead-ag hosehead-lod0-mg 1) +(def-art-elt hosehead-ag hosehead-lod0-jg 0) +(def-art-elt hosehead-ag hosehead-attack0-ja 13) +(def-art-elt hosehead-ag hosehead-attack1-ja 14) +(def-art-elt hosehead-ag hosehead-idle0-ja 15) +(def-art-elt hosehead-ag hosehead-idle-wall0-ja 16) +(def-art-elt hosehead-ag hosehead-run-ja 17) +(def-art-elt hosehead-ag hosehead-knocked-ja 18) +(def-art-elt hosehead-ag hosehead-knocked-land-ja 19) +(def-art-elt hosehead-ag hosehead-notice-ja 20) +(def-art-elt hosehead-ag hosehead-attack-left-ja 21) +(def-art-elt hosehead-ag hosehead-attack-right-ja 22) +(def-art-elt hosehead-ag hosehead-die-standing-ja 23) +(def-art-elt hosehead-ag hosehead-yellow-hit0-ja 24) +(def-art-elt hosehead-ag hosehead-yellow-hit1-ja 25) +(def-art-elt hosehead-ag hosehead-blue-hit0-ja 26) +(def-art-elt hosehead-ag hosehead-blue-hit-land0-ja 27) +(def-art-elt hosehead-ag hosehead-blue-hit1-ja 28) (def-art-elt market-sack-b-ag market-sack-b-idle-ja 2) (def-art-elt market-sack-b-ag market-sack-b-lod0-mg 1) (def-art-elt market-sack-b-ag market-sack-b-lod0-jg 0) +(def-art-elt mammoth-ag mammoth-turn-right-150-end-ja 18) +(def-art-elt mammoth-ag mammoth-turn-right-150-ja 17) +(def-art-elt mammoth-ag mammoth-turn-right-50-ja 16) +(def-art-elt mammoth-ag mammoth-turn-left-150-ja 15) +(def-art-elt mammoth-ag mammoth-turn-left-150-start-ja 14) +(def-art-elt mammoth-ag mammoth-turn-left-50-ja 13) +(def-art-elt mammoth-ag mammoth-lod0-jg 0) +(def-art-elt mammoth-ag mammoth-lod0-mg 1) +(def-art-elt mammoth-ag mammoth-lod1-mg 2) +(def-art-elt mammoth-ag mammoth-shadow-mg 3) +(def-art-elt mammoth-ag mammoth-idle0-ja 4) +(def-art-elt mammoth-ag mammoth-idle0-to-walk-ja 5) +(def-art-elt mammoth-ag mammoth-walk0-ja 6) +(def-art-elt mammoth-ag mammoth-walk1-ja 7) +(def-art-elt mammoth-ag mammoth-walk-fire0-ja 8) +(def-art-elt mammoth-ag mammoth-death-right-ja 9) +(def-art-elt mammoth-ag mammoth-death-right-fall-ja 10) +(def-art-elt mammoth-ag mammoth-death-right-fall-end-ja 11) +(def-art-elt mammoth-ag mammoth-turn-left-50-start-ja 12) +(def-art-elt metalkor-explode-ag metalkor-explode-idle-ja 2) +(def-art-elt metalkor-explode-ag metalkor-explode-lod0-mg 1) +(def-art-elt metalkor-explode-ag metalkor-explode-lod0-jg 0) +(def-art-elt stad-c-force-field-ag stad-c-force-field-idle-ja 2) +(def-art-elt stad-c-force-field-ag stad-c-force-field-lod0-mg 1) +(def-art-elt stad-c-force-field-ag stad-c-force-field-lod0-jg 0) +(def-art-elt tomb-plat-wall-ag tomb-plat-wall-idle-ja 3) +(def-art-elt tomb-plat-wall-ag tomb-plat-wall-lod1-mg 2) +(def-art-elt tomb-plat-wall-ag tomb-plat-wall-lod0-mg 1) +(def-art-elt tomb-plat-wall-ag tomb-plat-wall-lod0-jg 0) +(def-art-elt jakone-highres-ag jakone-highres-idle-ja 2) +(def-art-elt jakone-highres-ag jakone-highres-lod0-mg 1) +(def-art-elt jakone-highres-ag jakone-highres-lod0-jg 0) (def-art-elt intro-flamer-ag intro-flamer-fly-straight-ja 5) (def-art-elt intro-flamer-ag intro-flamer-shadow-mg 4) (def-art-elt intro-flamer-ag intro-flamer-lod2-mg 3) (def-art-elt intro-flamer-ag intro-flamer-lod1-mg 2) (def-art-elt intro-flamer-ag intro-flamer-lod0-mg 1) (def-art-elt intro-flamer-ag intro-flamer-lod0-jg 0) +(def-art-elt palmpilot-ag palmpilot-idle-ja 2) +(def-art-elt palmpilot-ag palmpilot-lod0-mg 1) +(def-art-elt palmpilot-ag palmpilot-lod0-jg 0) +(def-art-elt atoll-windmill-ag atoll-windmill-idle-ja 4) +(def-art-elt atoll-windmill-ag atoll-windmill-lod2-mg 3) +(def-art-elt atoll-windmill-ag atoll-windmill-lod1-mg 2) +(def-art-elt atoll-windmill-ag atoll-windmill-lod0-mg 1) +(def-art-elt atoll-windmill-ag atoll-windmill-lod0-jg 0) +(def-art-elt iris-door-ag mtn-iris-door-idle-ja 2) +(def-art-elt iris-door-ag mtn-iris-door-lod0-mg 1) +(def-art-elt iris-door-ag mtn-iris-door-lod0-jg 0) +(def-art-elt baron-widow+0-ag widow-flight-hit-final-ja 71) +(def-art-elt baron-widow+0-ag widow-flight-hit-left-ja 70) +(def-art-elt baron-widow+0-ag widow-flight-hit-right-ja 69) +(def-art-elt baron-widow+0-ag widow-flight-launch-right-ja 68) +(def-art-elt baron-widow+0-ag widow-flight-launch-left-ja 67) +(def-art-elt baron-widow+0-ag widow-grab-launch-right-ja 66) +(def-art-elt baron-widow+0-ag widow-grab-launch-left-ja 65) +(def-art-elt baron-widow+0-ag widow-grab-footing-loop-ja 64) +(def-art-elt baron-widow+0-ag widow-grab-tug-loop-ja 63) +(def-art-elt baron-widow+0-ag widow-grab-yank-loop-ja 62) +(def-art-elt baron-widow+0-ag widow-grab-pull-loop-ja 61) +(def-art-elt baron-widow+0-ag widow-hit-gun-right-ja 60) +(def-art-elt baron-widow+0-ag widow-hit-gun-left-ja 59) +(def-art-elt baron-widow+0-ag baron-grab-launch-left-ja 28) +(def-art-elt baron-widow+0-ag baron-grab-footing-loop-ja 27) +(def-art-elt baron-widow+0-ag baron-grab-tug-loop-ja 26) +(def-art-elt baron-widow+0-ag baron-grab-yank-loop-ja 25) +(def-art-elt baron-widow+0-ag baron-grab-pull-loop-ja 24) +(def-art-elt baron-widow+0-ag baron-hit-gun-right-ja 23) +(def-art-elt baron-widow+0-ag baron-hit-gun-left-ja 22) +(def-art-elt baron-widow+0-ag baron-hit-front-ja 21) +(def-art-elt baron-widow+0-ag baron-hit-pod-right-ja 20) +(def-art-elt baron-widow+0-ag baron-hit-pod-left-ja 19) +(def-art-elt baron-widow+0-ag baron-launch-right-ja 18) +(def-art-elt baron-widow+0-ag baron-grab-punch-ja 17) +(def-art-elt baron-widow+0-ag baron-grab-fail-ja 16) +(def-art-elt baron-widow+0-ag baron-launch-left-ja 15) +(def-art-elt baron-widow+0-ag baron-grab-stone-ja 14) +(def-art-elt baron-widow+0-ag baron-fire-end-ja 13) +(def-art-elt baron-widow+0-ag baron-grab-success-ja 0) +(def-art-elt baron-widow+0-ag baron-fly-ja 1) +(def-art-elt baron-widow+0-ag baron-return-ja 2) +(def-art-elt baron-widow+0-ag baron-landing-ja 3) +(def-art-elt baron-widow+0-ag baron-drill-ja 4) +(def-art-elt baron-widow+0-ag baron-drill-right-high-ja 5) +(def-art-elt baron-widow+0-ag baron-drill-right-mid-ja 6) +(def-art-elt baron-widow+0-ag baron-drill-right-low-ja 7) +(def-art-elt baron-widow+0-ag baron-drill-left-high-ja 8) +(def-art-elt baron-widow+0-ag baron-drill-left-mid-ja 9) +(def-art-elt baron-widow+0-ag baron-drill-left-low-ja 10) +(def-art-elt baron-widow+0-ag baron-fire-start-ja 11) +(def-art-elt baron-widow+0-ag baron-fire-loop-ja 12) +(def-art-elt baron-widow+0-ag baron-grab-launch-right-ja 29) +(def-art-elt baron-widow+0-ag baron-flight-launch-left-ja 30) +(def-art-elt baron-widow+0-ag baron-flight-launch-right-ja 31) +(def-art-elt baron-widow+0-ag baron-flight-hit-right-ja 32) +(def-art-elt baron-widow+0-ag baron-flight-hit-left-ja 33) +(def-art-elt baron-widow+0-ag baron-flight-hit-final-ja 34) +(def-art-elt baron-widow+0-ag baron-pod-grab-success-ja 35) +(def-art-elt baron-widow+0-ag heart-mar-grab-success-ja 36) +(def-art-elt baron-widow+0-ag widow-grab-success-ja 37) +(def-art-elt baron-widow+0-ag widow-fly-ja 38) +(def-art-elt baron-widow+0-ag widow-return-ja 39) +(def-art-elt baron-widow+0-ag widow-landing-ja 40) +(def-art-elt baron-widow+0-ag widow-drill-ja 41) +(def-art-elt baron-widow+0-ag widow-drill-right-high-ja 42) +(def-art-elt baron-widow+0-ag widow-drill-right-mid-ja 43) +(def-art-elt baron-widow+0-ag widow-drill-right-low-ja 44) +(def-art-elt baron-widow+0-ag widow-drill-left-high-ja 45) +(def-art-elt baron-widow+0-ag widow-drill-left-mid-ja 46) +(def-art-elt baron-widow+0-ag widow-drill-left-low-ja 47) +(def-art-elt baron-widow+0-ag widow-fire-start-ja 48) +(def-art-elt baron-widow+0-ag widow-fire-loop-ja 49) +(def-art-elt baron-widow+0-ag widow-fire-end-ja 50) +(def-art-elt baron-widow+0-ag widow-grab-stone-ja 51) +(def-art-elt baron-widow+0-ag widow-launch-left-ja 52) +(def-art-elt baron-widow+0-ag widow-grab-fail-ja 53) +(def-art-elt baron-widow+0-ag widow-grab-punch-ja 54) +(def-art-elt baron-widow+0-ag widow-launch-right-ja 55) +(def-art-elt baron-widow+0-ag widow-hit-pod-left-ja 56) +(def-art-elt baron-widow+0-ag widow-hit-pod-right-ja 57) +(def-art-elt baron-widow+0-ag widow-hit-front-ja 58) (def-art-elt com-airlock-inner-ag com-airlock-inner-idle-ja 2) (def-art-elt com-airlock-inner-ag com-airlock-inner-lod0-mg 1) (def-art-elt com-airlock-inner-ag com-airlock-inner-lod0-jg 0) +(def-art-elt gun-barrel-ag gun-barrel-idle-ja 2) +(def-art-elt gun-barrel-ag gun-barrel-lod0-mg 1) +(def-art-elt gun-barrel-ag gun-barrel-lod0-jg 0) +(def-art-elt gar-trophy-cc-ag gar-trophy-cc-idle-ja 2) +(def-art-elt gar-trophy-cc-ag gar-trophy-cc-lod0-mg 1) +(def-art-elt gar-trophy-cc-ag gar-trophy-cc-lod0-jg 0) +(def-art-elt youngsamos-onintent+0-ag youngsamos-highres-idle-onintent-ja 0) +(def-art-elt gun-upgrade-a-ag gun-upgrade-a-idle-ja 2) +(def-art-elt gun-upgrade-a-ag gun-upgrade-a-lod0-mg 1) +(def-art-elt gun-upgrade-a-ag gun-upgrade-a-lod0-jg 0) +(def-art-elt nest-gun-parts-ag nest-gun-parts-idle-ja 2) +(def-art-elt nest-gun-parts-ag nest-gun-parts-lod0-mg 1) +(def-art-elt nest-gun-parts-ag nest-gun-parts-lod0-jg 0) +(def-art-elt tanker-ag tanker-idle-ja 2) +(def-art-elt tanker-ag tanker-lod0-mg 1) +(def-art-elt tanker-ag tanker-lod0-jg 0) (def-art-elt cara-ag cara-idle-ja 5) (def-art-elt cara-ag cara-shadow-mg 4) (def-art-elt cara-ag cara-lod2-mg 3) (def-art-elt cara-ag cara-lod1-mg 2) (def-art-elt cara-ag cara-lod0-mg 1) (def-art-elt cara-ag cara-lod0-jg 0) +(def-art-elt crane-ag crane-idle-ja 2) +(def-art-elt crane-ag crane-lod0-mg 1) +(def-art-elt crane-ag crane-lod0-jg 0) +(def-art-elt widow-ag widow-idle-ja 3) +(def-art-elt widow-ag widow-shadow-mg 2) +(def-art-elt widow-ag widow-lod0-mg 1) +(def-art-elt widow-ag widow-lod0-jg 0) +(def-art-elt fort-roboscreen-ag fort-roboscreen-end-ja 3) +(def-art-elt fort-roboscreen-ag fort-roboscreen-idle-ja 2) +(def-art-elt fort-roboscreen-ag fort-roboscreen-lod0-mg 1) +(def-art-elt fort-roboscreen-ag fort-roboscreen-lod0-jg 0) +(def-art-elt dig-conveyor-ag dig-conveyor-idle-ja 2) +(def-art-elt dig-conveyor-ag dig-conveyor-lod0-mg 1) +(def-art-elt dig-conveyor-ag dig-conveyor-lod0-jg 0) +(def-art-elt youngsamos-tombd+0-ag youngsamos-highres-idle-tomb-ja 0) +(def-art-elt pal-windmill-ag pal-windmill-idle-ja 2) +(def-art-elt pal-windmill-ag pal-windmill-lod0-mg 1) +(def-art-elt pal-windmill-ag pal-windmill-lod0-jg 0) +(def-art-elt gar-weld-project-ag gar-weld-project-idle-ja 3) +(def-art-elt gar-weld-project-ag gar-weld-project-shadow-mg 2) +(def-art-elt gar-weld-project-ag gar-weld-project-lod0-mg 1) +(def-art-elt gar-weld-project-ag gar-weld-project-lod0-jg 0) +(def-art-elt baron-pod-ag baron-pod-idle-ja 3) +(def-art-elt baron-pod-ag baron-pod-shadow-mg 2) +(def-art-elt baron-pod-ag baron-pod-lod0-mg 1) +(def-art-elt baron-pod-ag baron-pod-lod0-jg 0) +(def-art-elt grill-ag sew-grill-sew-scare-grunt-end-ja 5) +(def-art-elt grill-ag sew-grill-idle-ja 3) +(def-art-elt grill-ag sew-grill-lod1-mg 2) +(def-art-elt grill-ag sew-grill-lod0-mg 1) +(def-art-elt grill-ag sew-grill-lod0-jg 0) (def-art-elt port-turret-ag port-turret-idle-ja 2) (def-art-elt port-turret-ag port-turret-lod0-mg 1) (def-art-elt port-turret-ag port-turret-lod0-jg 0) @@ -1527,9 +4178,110 @@ (def-art-elt carb-ag carb-lod1-mg 2) (def-art-elt carb-ag carb-lod0-mg 1) (def-art-elt carb-ag carb-lod0-jg 0) +(def-art-elt rift-rider-ag rift-rider-idle-ja 4) +(def-art-elt rift-rider-ag rift-rider-shadow-no-lift-mg 3) +(def-art-elt rift-rider-ag rift-rider-shadow-mg 2) +(def-art-elt rift-rider-ag rift-rider-lod0-mg 1) +(def-art-elt rift-rider-ag rift-rider-lod0-jg 0) +(def-art-elt water-anim-mincan-ag water-anim-mincan-idle-ja 2) +(def-art-elt water-anim-mincan-ag water-anim-mincan-exitb-pool-lod0-mg 1) +(def-art-elt water-anim-mincan-ag water-anim-mincan-exitb-pool-lod0-jg 0) +(def-art-elt gun-dummy-a-ag gun-dummy-a-explode-idle-ja 5) +(def-art-elt gun-dummy-a-ag gun-dummy-a-explode-lod0-mg 4) +(def-art-elt gun-dummy-a-ag gun-dummy-a-explode-lod0-jg 3) +(def-art-elt gun-dummy-a-ag gun-dummy-a-idle-ja 2) +(def-art-elt gun-dummy-a-ag gun-dummy-a-lod0-mg 1) +(def-art-elt gun-dummy-a-ag gun-dummy-a-lod0-jg 0) +(def-art-elt plasmitebomb-ag plasmitebomb-idle-ja 2) +(def-art-elt plasmitebomb-ag plasmitebomb-lod0-mg 1) +(def-art-elt plasmitebomb-ag plasmitebomb-lod0-jg 0) +(def-art-elt ruins-tower-b-ag ruins-tower-b-idle-ja 2) +(def-art-elt ruins-tower-b-ag ruins-tower-b-lod0-mg 1) +(def-art-elt ruins-tower-b-ag ruins-tower-b-lod0-jg 0) +(def-art-elt cas-flag-a-ag cas-flag-a-idle-ja 2) +(def-art-elt cas-flag-a-ag cas-flag-a-lod0-mg 1) +(def-art-elt cas-flag-a-ag cas-flag-a-lod0-jg 0) +(def-art-elt tomb-stair-block-ag tomb-stair-block-sink-ja 4) +(def-art-elt tomb-stair-block-ag tomb-stair-block-straight-ja 3) +(def-art-elt tomb-stair-block-ag tomb-stair-block-idle-ja 2) +(def-art-elt tomb-stair-block-ag tomb-stair-block-lod0-mg 1) +(def-art-elt tomb-stair-block-ag tomb-stair-block-lod0-jg 0) (def-art-elt metalkor-torso-ag metalkor-torso-idle-ja 2) (def-art-elt metalkor-torso-ag metalkor-torso-lod0-mg 1) (def-art-elt metalkor-torso-ag metalkor-torso-lod0-jg 0) +(def-art-elt farthy-ag farthy-idle-ja 2) +(def-art-elt farthy-ag farthy-lod0-mg 1) +(def-art-elt farthy-ag farthy-lod0-jg 0) +(def-art-elt kiosk-banner-ag kiosk-banner-idle-ja 2) +(def-art-elt kiosk-banner-ag kiosk-banner-lod0-mg 1) +(def-art-elt kiosk-banner-ag kiosk-banner-lod0-jg 0) +(def-art-elt centipede-fma-ag centipede-fma-idle-ja 2) +(def-art-elt centipede-fma-ag centipede-fma-lod0-mg 1) +(def-art-elt centipede-fma-ag centipede-fma-lod0-jg 0) +(def-art-elt rift-rider-bar-ag rift-rider-bar-idle-ja 2) +(def-art-elt rift-rider-bar-ag rift-rider-bar-lod0-mg 1) +(def-art-elt rift-rider-bar-ag rift-rider-bar-lod0-jg 0) +(def-art-elt crimson-guard-highres-ag crimson-guard-highres-idle-ja 3) +(def-art-elt crimson-guard-highres-ag crimson-guard-highres-shadow-mg 2) +(def-art-elt crimson-guard-highres-ag crimson-guard-highres-lod0-mg 1) +(def-art-elt crimson-guard-highres-ag crimson-guard-highres-lod0-jg 0) +(def-art-elt amphibian-ag amphibian-turn-left-fast-ja 40) +(def-art-elt amphibian-ag amphibian-turn-right-fast-ja 39) +(def-art-elt amphibian-ag amphibian-turn-left-ja 38) +(def-art-elt amphibian-ag amphibian-turn-right-ja 37) +(def-art-elt amphibian-ag amphibian-jump-in-air1-part2-ja 36) +(def-art-elt amphibian-ag amphibian-jump-land1-ja 35) +(def-art-elt amphibian-ag amphibian-jump-in-air1-ja 34) +(def-art-elt amphibian-ag amphibian-jump-wind-up1-ja 33) +(def-art-elt amphibian-ag amphibian-jump-land0-ja 32) +(def-art-elt amphibian-ag amphibian-jump-in-air0-ja 31) +(def-art-elt amphibian-ag amphibian-jump-wind-up0-ja 30) +(def-art-elt amphibian-ag amphibian-notice1-ja 29) +(def-art-elt amphibian-ag amphibian-die-ja 12) +(def-art-elt amphibian-ag amphibian-knocked-land2-ja 11) +(def-art-elt amphibian-ag amphibian-knocked2-ja 10) +(def-art-elt amphibian-ag amphibian-knocked-land1-ja 9) +(def-art-elt amphibian-ag amphibian-knocked1-ja 8) +(def-art-elt amphibian-ag amphibian-knocked-land0-ja 7) +(def-art-elt amphibian-ag amphibian-knocked0-ja 6) +(def-art-elt amphibian-ag amphibian-tongue-attack-ja 5) +(def-art-elt amphibian-ag amphibian-idle-ja 4) +(def-art-elt amphibian-ag amphibian-shadow-mg 3) +(def-art-elt amphibian-ag amphibian-lod1-mg 2) +(def-art-elt amphibian-ag amphibian-lod0-mg 1) +(def-art-elt amphibian-ag amphibian-lod0-jg 0) +(def-art-elt amphibian-ag amphibian-swim-ja 13) +(def-art-elt amphibian-ag amphibian-swim-fast-ja 14) +(def-art-elt amphibian-ag amphibian-swim-chomp-ja 15) +(def-art-elt amphibian-ag amphibian-walk-ja 16) +(def-art-elt amphibian-ag amphibian-attack-ja 17) +(def-art-elt amphibian-ag amphibian-attack-left-ja 18) +(def-art-elt amphibian-ag amphibian-attack-right-ja 19) +(def-art-elt amphibian-ag amphibian-attack-forward-ja 20) +(def-art-elt amphibian-ag amphibian-die-falling-ja 21) +(def-art-elt amphibian-ag amphibian-blue-hit0-ja 22) +(def-art-elt amphibian-ag amphibian-blue-hit1-ja 23) +(def-art-elt amphibian-ag amphibian-blue-hit2-ja 24) +(def-art-elt amphibian-ag amphibian-blue-land-ja 25) +(def-art-elt amphibian-ag amphibian-run0-ja 26) +(def-art-elt amphibian-ag amphibian-run1-ja 27) +(def-art-elt amphibian-ag amphibian-notice0-ja 28) +(def-art-elt mtn-plat-eject-ag mtn-plat-eject-idle-ja 3) +(def-art-elt mtn-plat-eject-ag mtn-plat-eject-lod1-mg 2) +(def-art-elt mtn-plat-eject-ag mtn-plat-eject-lod0-mg 1) +(def-art-elt mtn-plat-eject-ag mtn-plat-eject-lod0-jg 0) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-c-lod0-jg 12) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-b-idle-ja 10) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-b-lod0-mg 9) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-b-lod0-jg 8) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-a-idle-ja 6) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-a-lod0-mg 5) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-a-lod0-jg 4) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-idle-ja 2) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-c-idle-ja 14) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-lod0-mg 1) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-c-lod0-mg 13) +(def-art-elt ctypal-baron-statue-break-ag ctypal-baron-statue-break-lod0-jg 0) (def-art-elt jak-dark+0-ag jakb-darkjak-attack-ice-end-ja 57) (def-art-elt jak-dark+0-ag jakb-darkjak-attack-ice-loop2-ja 56) (def-art-elt jak-dark+0-ag jakb-darkjak-attack-ice-loop-ja 55) @@ -1588,10 +4340,131 @@ (def-art-elt jak-dark+0-ag daxter-darkjak-attack-ice-loop-ja 26) (def-art-elt jak-dark+0-ag daxter-darkjak-attack-ice-loop2-ja 27) (def-art-elt jak-dark+0-ag daxter-darkjak-attack-ice-end-ja 28) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-main-idle-ja 37) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-main-lod0-mg 36) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-main-lod0-jg 35) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-g-end-ja 34) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-g-break-ja 33) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-g-idle-ja 32) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-g-lod0-mg 31) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-g-lod0-jg 30) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-f-end-ja 29) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-c-idle-ja 12) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-c-lod0-mg 11) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-c-lod0-jg 10) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-b-end-ja 9) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-b-break-ja 8) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-b-idle-ja 7) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-b-lod0-mg 6) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-b-lod0-jg 5) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-a-end-ja 4) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-a-break-ja 3) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-a-idle-ja 2) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-a-lod0-mg 1) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-a-lod0-jg 0) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-c-break-ja 13) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-c-end-ja 14) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-d-lod0-jg 15) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-d-lod0-mg 16) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-d-idle-ja 17) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-d-break-ja 18) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-d-end-ja 19) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-e-lod0-jg 20) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-e-lod0-mg 21) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-e-idle-ja 22) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-e-break-ja 23) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-e-end-ja 24) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-f-lod0-jg 25) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-f-lod0-mg 26) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-f-idle-ja 27) +(def-art-elt tomb-boss-catwalk-ag tomb-boss-catwalk-f-break-ja 28) +(def-art-elt ecowell-c-ag ecowell-c-idle-ja 2) +(def-art-elt ecowell-c-ag ecowell-c-lod0-mg 1) +(def-art-elt ecowell-c-ag ecowell-c-lod0-jg 0) +(def-art-elt fort-floor-spike-c-ag fort-floor-spike-c-idle-ja 4) +(def-art-elt fort-floor-spike-c-ag fort-floor-spike-c-lod2-mg 3) +(def-art-elt fort-floor-spike-c-ag fort-floor-spike-c-lod1-mg 2) +(def-art-elt fort-floor-spike-c-ag fort-floor-spike-c-lod0-mg 1) +(def-art-elt fort-floor-spike-c-ag fort-floor-spike-c-lod0-jg 0) +(def-art-elt piston-ag piston-idle-ja 3) +(def-art-elt piston-ag piston-lod1-mg 2) +(def-art-elt piston-ag piston-lod0-mg 1) +(def-art-elt piston-ag piston-lod0-jg 0) +(def-art-elt sew-wall-ag sew-wall-2-end-ja 7) +(def-art-elt sew-wall-ag sew-wall-2-idle-ja 6) +(def-art-elt sew-wall-ag sew-wall-1-end-ja 4) +(def-art-elt sew-wall-ag sew-wall-1-idle-ja 3) +(def-art-elt sew-wall-ag sew-wall-lod1-mg 2) +(def-art-elt sew-wall-ag sew-wall-lod0-mg 1) +(def-art-elt sew-wall-ag sew-wall-lod0-jg 0) +(def-art-elt mtn-aval-rocks-ag mtn-aval-rocks-shadow-idle-ja 7) +(def-art-elt mtn-aval-rocks-ag mtn-aval-rocks-shadow-shadow-mg 6) +(def-art-elt mtn-aval-rocks-ag mtn-aval-rocks-shadow-lod0-mg 5) +(def-art-elt mtn-aval-rocks-ag mtn-aval-rocks-shadow-lod0-jg 4) +(def-art-elt mtn-aval-rocks-ag mtn-aval-rocks-1-idle-ja 2) +(def-art-elt mtn-aval-rocks-ag mtn-aval-rocks-1-lod0-mg 1) +(def-art-elt mtn-aval-rocks-ag mtn-aval-rocks-1-lod0-jg 0) +(def-art-elt hopper-ag hopper-hop-attack-land-ja 36) +(def-art-elt hopper-ag hopper-hop-attack-air-ja 35) +(def-art-elt hopper-ag hopper-hop-attack-start-ja 34) +(def-art-elt hopper-ag hopper-hop-land-ja 33) +(def-art-elt hopper-ag hopper-hop-air-ja 32) +(def-art-elt hopper-ag hopper-hop-start-ja 31) +(def-art-elt hopper-ag hopper-knocked2-land-ja 30) +(def-art-elt hopper-ag hopper-knocked2-ja 29) +(def-art-elt hopper-ag hopper-jump-start-right-ja 12) +(def-art-elt hopper-ag hopper-jump-start-left-ja 11) +(def-art-elt hopper-ag hopper-jump-start-ja 10) +(def-art-elt hopper-ag hopper-turn-ja 9) +(def-art-elt hopper-ag hopper-notice-alt-ja 8) +(def-art-elt hopper-ag hopper-notice-ja 7) +(def-art-elt hopper-ag hopper-idle-look-right-ja 6) +(def-art-elt hopper-ag hopper-idle-look-left-ja 5) +(def-art-elt hopper-ag hopper-idle-ja 4) +(def-art-elt hopper-ag hopper-shadow-mg 3) +(def-art-elt hopper-ag hopper-lod1-mg 2) +(def-art-elt hopper-ag hopper-lod0-mg 1) +(def-art-elt hopper-ag hopper-lod0-jg 0) +(def-art-elt hopper-ag hopper-jump-ja 13) +(def-art-elt hopper-ag hopper-jump-land-ja 14) +(def-art-elt hopper-ag hopper-jump-attack-ja 15) +(def-art-elt hopper-ag hopper-jump-attack-land-ja 16) +(def-art-elt hopper-ag hopper-jump-attack2-ja 17) +(def-art-elt hopper-ag hopper-jump-attack2-land-ja 18) +(def-art-elt hopper-ag hopper-die-ja 19) +(def-art-elt hopper-ag hopper-die-falling-ja 20) +(def-art-elt hopper-ag hopper-blue-hit0-ja 21) +(def-art-elt hopper-ag hopper-blue-hit1-ja 22) +(def-art-elt hopper-ag hopper-blue-hit2-ja 23) +(def-art-elt hopper-ag hopper-blue-hit-land-ja 24) +(def-art-elt hopper-ag hopper-knocked0-ja 25) +(def-art-elt hopper-ag hopper-knocked0-land-ja 26) +(def-art-elt hopper-ag hopper-knocked1-ja 27) +(def-art-elt hopper-ag hopper-knocked1-land-ja 28) +(def-art-elt shard-ag mtn-shard-idle-ja 2) +(def-art-elt shard-ag mtn-shard-lod0-mg 1) +(def-art-elt shard-ag mtn-shard-lod0-jg 0) +(def-art-elt vin-door-ag vin-door-idle-ja 2) +(def-art-elt vin-door-ag vin-door-lod0-mg 1) +(def-art-elt vin-door-ag vin-door-lod0-jg 0) (def-art-elt prsn-vent-fan-ag prsn-vent-fan-idle-ja 3) (def-art-elt prsn-vent-fan-ag prsn-vent-fan-lod1-mg 2) (def-art-elt prsn-vent-fan-ag prsn-vent-fan-lod0-mg 1) (def-art-elt prsn-vent-fan-ag prsn-vent-fan-lod0-jg 0) +(def-art-elt under-seaweed-b-ag under-seaweed-b-idle-ja 2) +(def-art-elt under-seaweed-b-ag under-seaweed-b-lod0-mg 1) +(def-art-elt under-seaweed-b-ag under-seaweed-b-lod0-jg 0) +(def-art-elt big-bopper-ag big-bopper-idle-ja 2) +(def-art-elt big-bopper-ag big-bopper-lod0-mg 1) +(def-art-elt big-bopper-ag big-bopper-lod0-jg 0) +(def-art-elt rift-rider-break-ag rift-rider-break-a-end-ja 11) +(def-art-elt rift-rider-break-ag rift-rider-break-a-idle-ja 9) +(def-art-elt rift-rider-break-ag rift-rider-break-a-lod0-mg 8) +(def-art-elt rift-rider-break-ag rift-rider-break-a-lod0-jg 7) +(def-art-elt rift-rider-break-ag rift-rider-break-end-ja 4) +(def-art-elt rift-rider-break-ag rift-rider-break-idle-ja 2) +(def-art-elt rift-rider-break-ag rift-rider-break-lod0-mg 1) +(def-art-elt rift-rider-break-ag rift-rider-break-lod0-jg 0) (def-art-elt jak-pole+0-ag jakb-pole-jump-loop-ja 8) (def-art-elt jak-pole+0-ag jakb-pole-flip-forward-ja 7) (def-art-elt jak-pole+0-ag jakb-pole-flip-up-ja 6) @@ -1601,6 +4474,9 @@ (def-art-elt jak-pole+0-ag daxter-pole-flip-up-ja 2) (def-art-elt jak-pole+0-ag daxter-pole-cycle2-ja 1) (def-art-elt jak-pole+0-ag daxter-pole-cycle-ja 0) +(def-art-elt rift-rider-break-c-ag rift-rider-break-c-idle-ja 2) +(def-art-elt rift-rider-break-c-ag rift-rider-break-c-lod0-mg 1) +(def-art-elt rift-rider-break-c-ag rift-rider-break-c-lod0-jg 0) (def-art-elt crimson-bike-ag crimson-bike-idle-ja 5) (def-art-elt crimson-bike-ag crimson-bike-shadow-mg 4) (def-art-elt crimson-bike-ag crimson-bike-lod2-mg 3) @@ -1611,9 +4487,42 @@ (def-art-elt crate-ag crate-krimson-lod1-mg 2) (def-art-elt crate-ag crate-krimson-lod0-mg 1) (def-art-elt crate-ag crate-krimson-lod0-jg 0) +(def-art-elt consite-break-scaffold-ag consite-break-scaffold-break-d-idle-ja 2) +(def-art-elt consite-break-scaffold-ag consite-break-scaffold-break-d-lod0-mg 1) +(def-art-elt consite-break-scaffold-ag consite-break-scaffold-break-d-lod0-jg 0) +(def-art-elt sew-catwalk-ag sew-catwalk-1-end-ja 4) +(def-art-elt sew-catwalk-ag sew-catwalk-1-idle-ja 3) +(def-art-elt sew-catwalk-ag sew-catwalk-1-lod1-mg 2) +(def-art-elt sew-catwalk-ag sew-catwalk-1-lod0-mg 1) +(def-art-elt sew-catwalk-ag sew-catwalk-1-lod0-jg 0) +(def-art-elt farm-small-cabbage-ag farm-small-cabbage-explode-idle-ja 5) +(def-art-elt farm-small-cabbage-ag farm-small-cabbage-explode-lod0-mg 4) +(def-art-elt farm-small-cabbage-ag farm-small-cabbage-explode-lod0-jg 3) +(def-art-elt farm-small-cabbage-ag farm-small-cabbage-idle-ja 2) +(def-art-elt farm-small-cabbage-ag farm-small-cabbage-lod0-mg 1) +(def-art-elt farm-small-cabbage-ag farm-small-cabbage-lod0-jg 0) +(def-art-elt lgconveyor-ag lgconveyor-idle-ja 3) +(def-art-elt lgconveyor-ag lgconveyor-lod1-mg 2) +(def-art-elt lgconveyor-ag lgconveyor-lod0-mg 1) +(def-art-elt lgconveyor-ag lgconveyor-lod0-jg 0) +(def-art-elt mtn-gear-device-ag mtn-gear-device-collapse-idle-ja 6) +(def-art-elt mtn-gear-device-ag mtn-gear-device-collapse-lod0-mg 5) +(def-art-elt mtn-gear-device-ag mtn-gear-device-collapse-lod0-jg 4) +(def-art-elt mtn-gear-device-ag mtn-gear-device-idle-ja 2) +(def-art-elt mtn-gear-device-ag mtn-gear-device-lod0-mg 1) +(def-art-elt mtn-gear-device-ag mtn-gear-device-lod0-jg 0) +(def-art-elt seal-of-mar-ag seal-of-mar-idle-ja 2) +(def-art-elt seal-of-mar-ag seal-of-mar-lod0-mg 1) +(def-art-elt seal-of-mar-ag seal-of-mar-lod0-jg 0) (def-art-elt jak-clothes-ag jak-clothes-idle-ja 2) (def-art-elt jak-clothes-ag jak-clothes-lod0-mg 1) (def-art-elt jak-clothes-ag jak-clothes-lod0-jg 0) +(def-art-elt gold-key-ag sew-gold-key-idle-ja 2) +(def-art-elt gold-key-ag sew-gold-key-lod0-mg 1) +(def-art-elt gold-key-ag sew-gold-key-lod0-jg 0) +(def-art-elt cntrlrm-button-ag cntrlrm-button-idle-ja 2) +(def-art-elt cntrlrm-button-ag cntrlrm-button-lod0-mg 1) +(def-art-elt cntrlrm-button-ag cntrlrm-button-lod0-jg 0) (def-art-elt citizen-chick-ag citizen-chick-riding-stance-ja 27) (def-art-elt citizen-chick-ag citizen-chick-shuffle-ja 26) (def-art-elt citizen-chick-ag citizen-chick-get-up-from-back-ja 25) @@ -1642,9 +4551,21 @@ (def-art-elt citizen-chick-ag citizen-chick-idle-ja 10) (def-art-elt citizen-chick-ag citizen-chick-panic-run-ja 11) (def-art-elt citizen-chick-ag citizen-chick-tread-water-ja 12) +(def-art-elt oracle-wall-banner-ag oracle-wall-banner-idle-ja 2) +(def-art-elt oracle-wall-banner-ag oracle-wall-banner-lod0-mg 1) +(def-art-elt oracle-wall-banner-ag oracle-wall-banner-lod0-jg 0) +(def-art-elt tomb-boss-firepot-ag tomb-boss-firepot-end-ja 5) +(def-art-elt tomb-boss-firepot-ag tomb-boss-firepot-break-ja 4) +(def-art-elt tomb-boss-firepot-ag tomb-boss-firepot-idle-ja 3) +(def-art-elt tomb-boss-firepot-ag tomb-boss-firepot-lod1-mg 2) +(def-art-elt tomb-boss-firepot-ag tomb-boss-firepot-lod0-mg 1) +(def-art-elt tomb-boss-firepot-ag tomb-boss-firepot-lod0-jg 0) (def-art-elt under-int-door-ag under-int-door-open-ja 2) (def-art-elt under-int-door-ag under-int-door-lod0-mg 1) (def-art-elt under-int-door-ag under-int-door-lod0-jg 0) +(def-art-elt skatea-floating-ring-ag skatea-floating-ring-idle-ja 2) +(def-art-elt skatea-floating-ring-ag skatea-floating-ring-lod0-mg 1) +(def-art-elt skatea-floating-ring-ag skatea-floating-ring-lod0-jg 0) (def-art-elt under-plat-long-ag under-plat-long-idle-ja 2) (def-art-elt under-plat-long-ag under-plat-long-lod0-mg 1) (def-art-elt under-plat-long-ag under-plat-long-lod0-jg 0) @@ -1652,23 +4573,207 @@ (def-art-elt under-laser-shadow-ag under-laser-shadow-shadow-mg 2) (def-art-elt under-laser-shadow-ag under-laser-shadow-lod0-mg 1) (def-art-elt under-laser-shadow-ag under-laser-shadow-lod0-jg 0) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-b-end-ja 10) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-b-break-ja 9) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-b-idle-ja 8) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-b-lod0-mg 7) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-b-lod0-jg 6) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-a-end-ja 4) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-a-break-ja 3) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-a-idle-ja 2) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-a-lod0-mg 1) +(def-art-elt tomb-boss-bridge-ag tomb-boss-bridge-a-lod0-jg 0) +(def-art-elt race-start-light-banner-ag race-start-light-banner-idle-ja 2) +(def-art-elt race-start-light-banner-ag race-start-light-banner-lod0-mg 1) +(def-art-elt race-start-light-banner-ag race-start-light-banner-lod0-jg 0) +(def-art-elt krew-package-ag krew-package-idle-ja 4) +(def-art-elt krew-package-ag krew-package-lod2-mg 3) +(def-art-elt krew-package-ag krew-package-lod1-mg 2) +(def-art-elt krew-package-ag krew-package-lod0-mg 1) +(def-art-elt krew-package-ag krew-package-lod0-jg 0) +(def-art-elt strip-game-crate-ag strip-game-crate-final-ja 3) +(def-art-elt strip-game-crate-ag strip-game-crate-idle-ja 2) +(def-art-elt strip-game-crate-ag strip-game-crate-lod0-mg 1) +(def-art-elt strip-game-crate-ag strip-game-crate-lod0-jg 0) +(def-art-elt keira-anim+0-ag keira-highres-idle-anim-ja 0) (def-art-elt drill-flip-step-ag drill-flip-step-swing-down-ja 3) (def-art-elt drill-flip-step-ag drill-flip-step-swing-up-ja 2) (def-art-elt drill-flip-step-ag drill-flip-step-lod0-mg 1) (def-art-elt drill-flip-step-ag drill-flip-step-lod0-jg 0) +(def-art-elt grunt-fma-ag grunt-fma-lod0-mg 1) +(def-art-elt grunt-fma-ag grunt-fma-lod0-jg 0) (def-art-elt under-break-wall-b-ag under-break-wall-b-idle-ja 2) (def-art-elt under-break-wall-b-ag under-break-wall-b-lod0-mg 1) (def-art-elt under-break-wall-b-ag under-break-wall-b-lod0-jg 0) +(def-art-elt cable-ag cable-idle-ja 2) +(def-art-elt cable-ag cable-lod0-mg 1) +(def-art-elt cable-ag cable-lod0-jg 0) +(def-art-elt tanker-one-barrel-ag tanker-one-barrel-idle-ja 2) +(def-art-elt tanker-one-barrel-ag tanker-one-barrel-lod0-mg 1) +(def-art-elt tanker-one-barrel-ag tanker-one-barrel-lod0-jg 0) +(def-art-elt nestb-tail-bound-ag nestb-tail-bound-idle-ja 2) +(def-art-elt nestb-tail-bound-ag nestb-tail-bound-lod0-mg 1) +(def-art-elt nestb-tail-bound-ag nestb-tail-bound-lod0-jg 0) +(def-art-elt ruins-precipice-ag ruins-precipice-idle-ja 2) +(def-art-elt ruins-precipice-ag ruins-precipice-lod0-mg 1) +(def-art-elt ruins-precipice-ag ruins-precipice-lod0-jg 0) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-idle-ja 12) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-under-bridge-lod1-mg 11) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-under-bridge-lod0-mg 10) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-under-bridge-lod0-jg 9) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-with-eggs-lod1-mg 8) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-with-eggs-lod0-mg 7) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-with-eggs-lod0-jg 6) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-near-crane-lod1-mg 5) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-near-crane-lod0-mg 4) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-near-crane-lod0-jg 3) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-near-lift-lod1-mg 2) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-near-lift-lod0-mg 1) +(def-art-elt water-anim-strip-dark-eco-ag water-anim-strip-dark-eco-near-lift-lod0-jg 0) (def-art-elt drill-drill-ag drill-drill-idle-ja 2) (def-art-elt drill-drill-ag drill-drill-lod0-mg 1) (def-art-elt drill-drill-ag drill-drill-lod0-jg 0) +(def-art-elt computerpaper-ag computerpaper-idle-ja 2) +(def-art-elt computerpaper-ag computerpaper-lod0-mg 1) +(def-art-elt computerpaper-ag computerpaper-lod0-jg 0) +(def-art-elt sew-single-blade-ag sew-single-blade-idle-ja 2) +(def-art-elt sew-single-blade-ag sew-single-blade-lod0-mg 1) +(def-art-elt sew-single-blade-ag sew-single-blade-lod0-jg 0) +(def-art-elt mtn-gate-ag mtn-gate-idle-ja 3) +(def-art-elt mtn-gate-ag mtn-gate-lod1-mg 2) +(def-art-elt mtn-gate-ag mtn-gate-lod0-mg 1) +(def-art-elt mtn-gate-ag mtn-gate-lod0-jg 0) +(def-art-elt slider-ag slider-idle-ja 3) +(def-art-elt slider-ag slider-lod1-mg 2) +(def-art-elt slider-ag slider-lod0-mg 1) +(def-art-elt slider-ag slider-lod0-jg 0) +(def-art-elt vortex-light-ag vortex-light-idle-ja 2) +(def-art-elt vortex-light-ag vortex-light-lod0-mg 1) +(def-art-elt vortex-light-ag vortex-light-lod0-jg 0) +(def-art-elt metalkor-bomb-ag metalkor-bomb-idle-ja 2) +(def-art-elt metalkor-bomb-ag metalkor-bomb-lod0-mg 1) +(def-art-elt metalkor-bomb-ag metalkor-bomb-lod0-jg 0) +(def-art-elt bomb-trigger-ag bomb-trigger-idle-ja 2) +(def-art-elt bomb-trigger-ag bomb-trigger-lod0-mg 1) +(def-art-elt bomb-trigger-ag bomb-trigger-lod0-jg 0) (def-art-elt under-plat-wall-ag under-plat-wall-idle-ja 2) (def-art-elt under-plat-wall-ag under-plat-wall-lod0-mg 1) (def-art-elt under-plat-wall-ag under-plat-wall-lod0-jg 0) +(def-art-elt precipice-a-ag precipice-a-idle-ja 2) +(def-art-elt precipice-a-ag precipice-a-lod0-mg 1) +(def-art-elt precipice-a-ag precipice-a-lod0-jg 0) +(def-art-elt metalkor-fma-spinner-ag metalkor-fma-spinner-idle-ja 2) +(def-art-elt metalkor-fma-spinner-ag metalkor-fma-spinner-lod0-mg 1) +(def-art-elt metalkor-fma-spinner-ag metalkor-fma-spinner-lod0-jg 0) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-2-end-ja 28) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-2-idle-ja 27) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-1-end-ja 25) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-1-idle-ja 24) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-lod1-mg 23) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-lod0-mg 22) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-lod0-jg 21) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-b-2-end-ja 19) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-b-2-idle-ja 18) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-b-1-end-ja 16) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-lod0-jg 0) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-b-lod0-mg 13) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-3-idle-ja 30) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-lod0-mg 1) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-b-lod1-mg 14) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-c-3-end-ja 31) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-lod1-mg 2) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-b-1-idle-ja 15) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-1-idle-ja 3) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-1-end-ja 4) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-2-idle-ja 6) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-2-end-ja 7) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-3-idle-ja 9) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-a-3-end-ja 10) +(def-art-elt ruins-drop-plat-ag ruins-drop-plat-b-lod0-jg 12) +(def-art-elt yakow-ag yakow-kicked-in-place-ja 10) +(def-art-elt yakow-ag yakow-walk-left-ja 9) +(def-art-elt yakow-ag yakow-walk-right-ja 8) +(def-art-elt yakow-ag yakow-kicked-ja 7) +(def-art-elt yakow-ag yakow-run-ja 6) +(def-art-elt yakow-ag yakow-walk-ja 5) +(def-art-elt yakow-ag yakow-graze-ja 4) +(def-art-elt yakow-ag yakow-idle-ja 3) +(def-art-elt yakow-ag yakow-shadow-mg 2) +(def-art-elt yakow-ag yakow-lod0-mg 1) +(def-art-elt yakow-ag yakow-lod0-jg 0) (def-art-elt rift-rider-donut-ag rift-rider-donut-idle-ja 3) (def-art-elt rift-rider-donut-ag rift-rider-donut-shadow-mg 2) (def-art-elt rift-rider-donut-ag rift-rider-donut-lod0-mg 1) (def-art-elt rift-rider-donut-ag rift-rider-donut-lod0-jg 0) +(def-art-elt kor-highres-ag kor-highres-idle-stand-ja 4) +(def-art-elt kor-highres-ag kor-highres-idle-ja 3) +(def-art-elt kor-highres-ag kor-highres-shadow-mg 2) +(def-art-elt kor-highres-ag kor-highres-lod0-mg 1) +(def-art-elt kor-highres-ag kor-highres-lod0-jg 0) +(def-art-elt hip-mirror-ag hip-mirror-idle-ja 2) +(def-art-elt hip-mirror-ag hip-mirror-lod0-mg 1) +(def-art-elt hip-mirror-ag hip-mirror-lod0-jg 0) +(def-art-elt kor-ag kor-arrest-idle0-ja 18) +(def-art-elt kor-ag kor-arrest-start-ja 17) +(def-art-elt kor-ag kor-knocked-land0-ja 16) +(def-art-elt kor-ag kor-knocked0-ja 15) +(def-art-elt kor-ag kor-turn-right150-end0-ja 14) +(def-art-elt kor-ag kor-turn-right100-end0-ja 13) +(def-art-elt kor-ag kor-lod0-jg 0) +(def-art-elt kor-ag kor-lod0-mg 1) +(def-art-elt kor-ag kor-shadow-mg 2) +(def-art-elt kor-ag kor-idle0-ja 3) +(def-art-elt kor-ag kor-scared0-ja 4) +(def-art-elt kor-ag kor-walk0-ja 5) +(def-art-elt kor-ag kor-run0-ja 6) +(def-art-elt kor-ag kor-turn-left-start0-ja 7) +(def-art-elt kor-ag kor-turn-left50-end0-ja 8) +(def-art-elt kor-ag kor-turn-left100-end0-ja 9) +(def-art-elt kor-ag kor-turn-left150-end0-ja 10) +(def-art-elt kor-ag kor-turn-right-start0-ja 11) +(def-art-elt kor-ag kor-turn-right50-end0-ja 12) +(def-art-elt sew-elevator-ag sew-elevator-idle-ja 3) +(def-art-elt sew-elevator-ag sew-elevator-lod1-mg 2) +(def-art-elt sew-elevator-ag sew-elevator-lod0-mg 1) +(def-art-elt sew-elevator-ag sew-elevator-lod0-jg 0) +(def-art-elt errol-racer-ag errol-racer-bike-taunt-right-ja 6) +(def-art-elt errol-racer-ag errol-racer-bike-taunt-left-ja 5) +(def-art-elt errol-racer-ag errol-racer-bike-stance-ja 4) +(def-art-elt errol-racer-ag errol-racer-idle-ja 3) +(def-art-elt errol-racer-ag errol-racer-lod1-mg 2) +(def-art-elt errol-racer-ag errol-racer-lod0-mg 1) +(def-art-elt errol-racer-ag errol-racer-lod0-jg 0) +(def-art-elt dig-breakable-door-ag dig-breakable-door-idle-ja 2) +(def-art-elt dig-breakable-door-ag dig-breakable-door-lod0-mg 1) +(def-art-elt dig-breakable-door-ag dig-breakable-door-lod0-jg 0) +(def-art-elt kid-highres-ag kid-highres-idle-ja 3) +(def-art-elt kid-highres-ag kid-highres-shadow-mg 2) +(def-art-elt kid-highres-ag kid-highres-lod0-mg 1) +(def-art-elt kid-highres-ag kid-highres-lod0-jg 0) +(def-art-elt grunt-egg-c-ag grunt-egg-c-idle2-ja 4) +(def-art-elt grunt-egg-c-ag grunt-egg-c-idle-ja 3) +(def-art-elt grunt-egg-c-ag grunt-egg-c-lod1-mg 2) +(def-art-elt grunt-egg-c-ag grunt-egg-c-lod0-mg 1) +(def-art-elt grunt-egg-c-ag grunt-egg-c-lod0-jg 0) +(def-art-elt helldog-ag helldog-idle-ja 5) +(def-art-elt helldog-ag helldog-shadow-mg 4) +(def-art-elt helldog-ag helldog-lod2-mg 3) +(def-art-elt helldog-ag helldog-lod1-mg 2) +(def-art-elt helldog-ag helldog-lod0-mg 1) +(def-art-elt helldog-ag helldog-lod0-jg 0) (def-art-elt hip-door-a-ag hip-door-a-idle-ja 2) (def-art-elt hip-door-a-ag hip-door-a-lod0-mg 1) (def-art-elt hip-door-a-ag hip-door-a-lod0-jg 0) +(def-art-elt palent-turret-ag palent-turret-explode-idle-ja 6) +(def-art-elt palent-turret-ag palent-turret-explode-lod0-mg 5) +(def-art-elt palent-turret-ag palent-turret-explode-lod0-jg 4) +(def-art-elt palent-turret-ag palent-turret-shoot-ja 3) +(def-art-elt palent-turret-ag palent-turret-idle-ja 2) +(def-art-elt palent-turret-ag palent-turret-lod0-mg 1) +(def-art-elt palent-turret-ag palent-turret-lod0-jg 0) +(def-art-elt grunt-egg-a-ag grunt-egg-a-idle2-ja 4) +(def-art-elt grunt-egg-a-ag grunt-egg-a-idle-ja 3) +(def-art-elt grunt-egg-a-ag grunt-egg-a-lod1-mg 2) +(def-art-elt grunt-egg-a-ag grunt-egg-a-lod0-mg 1) +(def-art-elt grunt-egg-a-ag grunt-egg-a-lod0-jg 0) + diff --git a/goal_src/jak2/engine/target/mech_suit/mech.gc b/goal_src/jak2/engine/target/mech_suit/mech.gc index 093538434e..b149d73c0e 100644 --- a/goal_src/jak2/engine/target/mech_suit/mech.gc +++ b/goal_src/jak2/engine/target/mech_suit/mech.gc @@ -145,7 +145,7 @@ :code (behavior () (change-parent self *entity-pool*) (ja-channel-set! 1) - (ja :group! mech-mech-idle-ja) + (ja :group! (-> self draw art-group data 3)) (set! (-> self root-override root-prim prim-core action) (collide-action solid can-ride no-standon)) (set! (-> self root-override penetrated-by) (penetrate)) 0.0 @@ -228,7 +228,7 @@ (case event-type (('draw) (ja-channel-set! 1) - (ja :group! mech-mech-idle-ja) + (ja :group! (-> self draw art-group data 3)) (set! (-> self root-override root-prim prim-core action) (collide-action solid can-ride no-standon)) (set! (-> self root-override penetrated-by) (penetrate)) (transform-post) @@ -416,10 +416,7 @@ ) -(defskelgroup skel-mech-target mech mech-target-lod0-jg mech-target-idle-ja - ((mech-target-lod0-mg (meters 999999))) - :bounds (static-spherem 0 0 0 4) - ) +(defskelgroup skel-mech-target mech 42 44 ((43 (meters 999999))) :bounds (static-spherem 0 0 0 4)) (defstate idle (mech-target) :virtual #t @@ -517,6 +514,7 @@ (none) ) +;; WARN: Return type mismatch (pointer process) vs (pointer mech-target). (defun mech-target-spawn ((arg0 vector) (arg1 target) (arg2 quaternion) (arg3 entity-actor)) (process-spawn mech-target :init mech-target-init arg0 arg2 arg3 :to arg1) ) diff --git a/goal_src/jak2/engine/target/mech_suit/target-mech.gc b/goal_src/jak2/engine/target/mech_suit/target-mech.gc index 400846f5de..3a55dbc9c6 100644 --- a/goal_src/jak2/engine/target/mech_suit/target-mech.gc +++ b/goal_src/jak2/engine/target/mech_suit/target-mech.gc @@ -33,8 +33,6 @@ ;; DECOMP BEGINS -(format 0 "SKIP: mech-update-ik in target-mech") - (defmethod draw hud-heatmeter ((obj hud-heatmeter)) (set-hud-piece-position! (the-as hud-sprite (-> obj sprites)) @@ -1218,7 +1216,7 @@ () (let* ((a0-0 (-> self parent)) (v1-0 (if a0-0 - (-> (the-as target (-> a0-0 0)) self-override) + (-> (the-as (pointer target) a0-0) 0 self-override) ) ) ) @@ -1238,9 +1236,9 @@ (set! (-> self draw shadow-ctrl settings shadow-dir quad) v1-4) ) ) - ;; (dotimes (gp-0 2) - ;; (enable-set! (-> (the-as (array joint-mod-ik) (+ (* gp-0 4) (the-as int self))) 64) #t) - ;; ) + (dotimes (gp-0 2) + (enable-set! (-> self mech-ik gp-0) #t) + ) (none) ) ) @@ -1263,7 +1261,7 @@ ) ) ) - ;; (mech-update-ik) + (mech-update-ik) (target-mech-mech-effect (the-as target gp-0)) ) (none) @@ -1278,20 +1276,16 @@ () (set! (-> self state-hook) #f) (set! (-> self draw shadow-ctrl) *mech-shadow-control*) - ;; (let ((v0-0 (new 'process 'joint-mod-ik self 27 5283.84))) - ;; (s.w! (+ self 268) v0-0) - ;; ) - ;; (let ((v0-1 (new 'process 'joint-mod-ik self 33 5283.84))) - ;; (s.w! (+ self 272) v0-1) - ;; ) - ;; (dotimes (v1-3 2) - ;; (let ((a0-5 (-> (the-as (array joint-mod-ik) (+ (* v1-3 4) (the-as int self))) 64))) - ;; (set! (-> a0-5 elbow-pole-vector-axis) (the-as uint 2)) - ;; (set! (-> a0-5 elbow-rotation-axis) (the-as uint 0)) - ;; (set! (-> a0-5 callback) mech-leg-ik-callback) - ;; (logior! (-> a0-5 flags) (joint-mod-ik-flags elbow-trans-neg)) - ;; ) - ;; ) + (set! (-> self mech-ik 0) (new 'process 'joint-mod-ik self 27 5283.84)) + (set! (-> self mech-ik 1) (new 'process 'joint-mod-ik self 33 5283.84)) + (dotimes (v1-3 2) + (let ((a0-5 (-> (the-as (array joint-mod-ik) (+ (* v1-3 4) (the-as int self))) 64))) + (set! (-> a0-5 elbow-pole-vector-axis) (the-as uint 2)) + (set! (-> a0-5 elbow-rotation-axis) (the-as uint 0)) + (set! (-> a0-5 callback) mech-leg-ik-callback) + (logior! (-> a0-5 flags) (joint-mod-ik-flags elbow-trans-neg)) + ) + ) (none) ) ) @@ -1392,6 +1386,7 @@ (none) ) +;; WARN: Return type mismatch symbol vs none. (defbehavior target-mech-add-thrust target () (let ((s5-0 (-> self control target-transv)) (gp-0 (-> self control transv-ctrl)) diff --git a/goal_src/jak2/engine/target/sidekick.gc b/goal_src/jak2/engine/target/sidekick.gc index c8cb15a79d..ce95f97328 100644 --- a/goal_src/jak2/engine/target/sidekick.gc +++ b/goal_src/jak2/engine/target/sidekick.gc @@ -10,24 +10,22 @@ ;; DECOMP BEGINS -;; failed to figure out what this is: -(defskelgroup skel-sidekick daxter 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-sidekick daxter daxter-lod0-jg -1 + ((daxter-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) :longest-edge (meters 1) - :shadow 3 + :shadow daxter-shadow-mg :texture-level 6 :sort 1 :origin-joint-index 6 :shadow-joint-index 6 ) -;; failed to figure out what this is: -(defskelgroup skel-sidekick-highres daxter-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-sidekick-highres daxter-highres daxter-highres-lod0-jg -1 + ((daxter-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) :longest-edge (meters 1) - :shadow 2 + :shadow daxter-highres-shadow-mg :sort 1 :origin-joint-index 6 :shadow-joint-index 6 diff --git a/goal_src/jak2/engine/target/target-h.gc b/goal_src/jak2/engine/target/target-h.gc index 1c98ddaf17..7e59a9a5e8 100644 --- a/goal_src/jak2/engine/target/target-h.gc +++ b/goal_src/jak2/engine/target/target-h.gc @@ -196,7 +196,8 @@ (arm-ik joint-mod-ik 2 :offset-assert 248) (leg-ik joint-mod-ik 2 :offset-assert 256) (foot joint-mod 2 :offset-assert 264) - (init-time time-frame :offset-assert 272) + (mech-ik joint-mod-ik 2 :offset-assert 272) + (init-time time-frame :offset 272) (teleport-time time-frame :offset-assert 280) (state-hook-time time-frame :offset-assert 288) (state-hook (function none :behavior target) :offset-assert 296) diff --git a/goal_src/jak2/engine/target/target-util.gc b/goal_src/jak2/engine/target/target-util.gc index 6a8c44652c..166e15b915 100644 --- a/goal_src/jak2/engine/target/target-util.gc +++ b/goal_src/jak2/engine/target/target-util.gc @@ -7,39 +7,16 @@ ;; DECOMP BEGINS -; (defskelgroup skel-jchar jakb jakb-lod0-jg -1 -; ((jakb-lod0-mg (meters 999999))) -; :bounds (static-spherem 0 0 0 3.2) -; :longest-edge (meters 1) -; :shadow jakb-shadow-mg -; :texture-level 6 -; :sort 1 -; :origin-joint-index 3 -; :shadow-joint-index 3 -; ) - -(let ((a0-0 (new 'static 'skeleton-group - :name "skel-jchar" - :extra #f - :info #f - :art-group-name "jakb" - :bounds (new 'static 'vector :w 13107.2) +(defskelgroup skel-jchar jakb jakb-lod0-jg -1 + ((jakb-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) - :texture-level #x6 - :version #x7 - :shadow 2 + :shadow jakb-shadow-mg + :texture-level 6 :sort 1 :origin-joint-index 3 :shadow-joint-index 3 ) - ) - ) - (set! (-> a0-0 jgeo) 0) - (set! (-> a0-0 janim) -1) - (set! (-> a0-0 mgeo 0) 1) - (set! (-> a0-0 lod-dist 0) 4095996000.0) - (add-to-loading-level a0-0) - ) (define *target-shadow-control* (new 'static 'shadow-control :settings (new 'static 'shadow-settings @@ -51,11 +28,11 @@ ) ) -(defskelgroup skel-jak-highres jak-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jak-highres jak-highres jak-highres-lod0-jg -1 + ((jak-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) - :shadow 2 + :shadow jak-highres-shadow-mg :sort 1 :origin-joint-index 3 :shadow-joint-index 3 diff --git a/goal_src/jak2/engine/ui/progress/progress-static.gc b/goal_src/jak2/engine/ui/progress/progress-static.gc index 930c1a8952..be4519a267 100644 --- a/goal_src/jak2/engine/ui/progress/progress-static.gc +++ b/goal_src/jak2/engine/ui/progress/progress-static.gc @@ -7,39 +7,15 @@ ;; DECOMP BEGINS -(let ((a0-0 (new 'static 'skeleton-group - :name "skel-hud-ring" - :extra #f - :info #f - :art-group-name "hud-ring" - :bounds (new 'static 'vector :w 225280.0) - :version #x7 +(defskelgroup skel-hud-ring hud-ring hud-ring-lod0-jg hud-ring-idle-ja + ((hud-ring-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 55) ) - ) - ) - (set! (-> a0-0 jgeo) 0) - (set! (-> a0-0 janim) 2) - (set! (-> a0-0 mgeo 0) 1) - (set! (-> a0-0 lod-dist 0) 4095996000.0) - (add-to-loading-level a0-0) - ) -(let ((a0-1 (new 'static 'skeleton-group - :name "skel-hud-ring-part" - :extra #f - :info #f - :art-group-name "hud-ring" - :bounds (new 'static 'vector :w 225280.0) - :version #x7 +(defskelgroup skel-hud-ring-part hud-ring hud-ring-part-lod0-jg hud-ring-part-idle-ja + ((hud-ring-part-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 55) ) - ) - ) - (set! (-> a0-1 jgeo) 3) - (set! (-> a0-1 janim) 5) - (set! (-> a0-1 mgeo 0) 4) - (set! (-> a0-1 lod-dist 0) 4095996000.0) - (add-to-loading-level a0-1) - ) (define *main-options* (new 'static 'menu-option-list @@ -166,7 +142,6 @@ ) ) - (define *title* (new 'static 'menu-option-list :y-center #xc6 @@ -193,7 +168,6 @@ ) ) - (define *unlocked-secrets* (new 'static 'menu-option-list :y-center #xc6 @@ -219,7 +193,6 @@ ) ) - (define *options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 @@ -244,7 +217,6 @@ ) ) - (define *game-options* (new 'static 'menu-option-list :y-center #xc6 @@ -260,7 +232,6 @@ ) ) - (define *game-options-japan* (new 'static 'menu-option-list :y-center #xc6 @@ -273,7 +244,6 @@ ) ) - (define *game-options-demo* (new 'static 'menu-option-list :y-center #xc6 @@ -287,7 +257,6 @@ ) ) - (define *graphic-options* (new 'static 'menu-option-list :y-center #xc6 @@ -304,7 +273,6 @@ ) ) - (define *graphic-title-options-pal* (new 'static 'menu-option-list :y-center #xc6 @@ -322,7 +290,6 @@ ) ) - (define *sound-options* (new 'static 'menu-option-list :y-center #xc6 @@ -337,7 +304,6 @@ ) ) - (define *quit-restart-options* (new 'static 'menu-option-list :y-center #xc6 @@ -350,7 +316,6 @@ ) ) - (define *load-save-options* (new 'static 'menu-option-list :y-center #xdc :y-space 30 @@ -364,7 +329,6 @@ ) ) - (define *save-options-title* (new 'static 'menu-option-list :y-center #xdc :y-space 30 @@ -383,7 +347,6 @@ ) ) - (define *loading-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 @@ -392,7 +355,6 @@ ) ) - (define *insufficient-space-options* (new 'static 'menu-option-list :y-center #xc6 @@ -402,7 +364,6 @@ ) ) - (define *secrets-insufficient-space-options* (new 'static 'menu-option-list :y-center #xc6 @@ -412,7 +373,6 @@ ) ) - (define *insert-card-options* (new 'static 'menu-option-list :y-center #xc6 @@ -422,7 +382,6 @@ ) ) - (define *error-loading-options* (new 'static 'menu-option-list :y-center #xc6 @@ -432,7 +391,6 @@ ) ) - (define *error-auto-saving-options* (new 'static 'menu-option-list :y-center #xc6 @@ -442,7 +400,6 @@ ) ) - (define *card-removed-options* (new 'static 'menu-option-list :y-center #x104 @@ -452,7 +409,6 @@ ) ) - (define *error-disc-removed-options* (new 'static 'menu-option-list :y-center #xc6 @@ -462,7 +418,6 @@ ) ) - (define *error-reading-options* (new 'static 'menu-option-list :y-center #xc6 @@ -472,7 +427,6 @@ ) ) - (define *icon-info-options* (new 'static 'menu-option-list :y-center #xc6 @@ -482,7 +436,6 @@ ) ) - (define *format-card-options* (new 'static 'menu-option-list :y-center #xc6 @@ -492,7 +445,6 @@ ) ) - (define *already-exists-options* (new 'static 'menu-option-list :y-center #xc6 @@ -502,7 +454,6 @@ ) ) - (define *create-game-options* (new 'static 'menu-option-list :y-center #xc6 @@ -512,7 +463,6 @@ ) ) - (define *video-mode-warning-options* (new 'static 'menu-option-list :y-center #xc6 @@ -522,7 +472,6 @@ ) ) - (define *video-mode-ok-options* (new 'static 'menu-option-list :y-center #xc6 @@ -532,7 +481,6 @@ ) ) - (define *progressive-mode-warning-options* (new 'static 'menu-option-list :y-center #xc6 @@ -542,7 +490,6 @@ ) ) - (define *progressive-mode-ok-options* (new 'static 'menu-option-list :y-center #xc6 @@ -552,7 +499,6 @@ ) ) - (define *quit-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 @@ -561,7 +507,6 @@ ) ) - (define *select-start-options* "List of [[menu-select-start-option]]" (new 'static 'menu-option-list @@ -572,7 +517,6 @@ ) ) - (define *select-scene-options* "List of [[menu-select-scene-option]]" (new 'static 'menu-option-list @@ -583,7 +527,6 @@ ) ) - (define *bigmap-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 @@ -592,7 +535,6 @@ ) ) - (define *missions-options* "List of [[menu-missions-option]]" (new 'static 'menu-option-list @@ -603,7 +545,6 @@ ) ) - (define *highscores-options* "List of [[menu-highscores-option]]" (new 'static 'menu-option-list @@ -616,7 +557,6 @@ ) ) - (define *secret-options* (new 'static 'menu-option-list :y-center #xc6 @@ -888,34 +828,28 @@ ) ) - (define *language-name-remap* (the-as (array game-text-id) (new 'static 'boxed-array :type uint32 #x111 #x112 #x113 #x114 #x115 #x117 #x116 #x30b) ) ) - (define *stereo-mode-name-remap* (the-as (array game-text-id) (new 'static 'boxed-array :type uint32 #x104 #x105 #x106)) ) - (define *hud-ring-graphic-remap* (new 'static 'boxed-array :type uint64 #x80 #x40 #x10 #x4 #x8 #x400 #x20 #x100 #x200 #x2) ) - (define *hud-ring-kiosk-graphic-remap* (new 'static 'boxed-array :type uint64 #x40 #x80 #x2 #x200 #x200 #x200 #x200 #x200 #x200 #x200) ) - (define *hud-ring-demo-graphic-remap* (new 'static 'boxed-array :type uint64 #x80 #x2 #x200 #x200 #x200 #x200 #x200 #x200 #x200 #x200) ) -;; definition of type hud-scene-info (deftype hud-scene-info (basic) ((name string :offset-assert 4) (continue string :offset-assert 8) @@ -929,21 +863,6 @@ :flag-assert #x900000014 ) -;; definition for method 3 of type hud-scene-info -(defmethod inspect hud-scene-info ((obj hud-scene-info)) - (when (not obj) - (set! obj obj) - (goto cfg-4) - ) - (format #t "[~8x] ~A~%" obj (-> obj type)) - (format #t "~1Tname: ~A~%" (-> obj name)) - (format #t "~1Tcontinue: ~A~%" (-> obj continue)) - (format #t "~1Tinfo: ~A~%" (-> obj info)) - (format #t "~1Ttext: ~D~%" (-> obj text)) - (label cfg-4) - obj - ) - (define *hud-select-scene-act1* (new 'static 'boxed-array :type hud-scene-info @@ -1226,7 +1145,6 @@ ) ) - (define *hud-select-scene-act2* (new 'static 'boxed-array :type hud-scene-info (new 'static 'hud-scene-info @@ -1455,7 +1373,6 @@ ) ) - (define *hud-select-scene-act3* (new 'static 'boxed-array :type hud-scene-info (new 'static 'hud-scene-info diff --git a/goal_src/jak2/levels/atoll/atoll-scenes.gc b/goal_src/jak2/levels/atoll/atoll-scenes.gc index 4015116ed7..871ef22696 100644 --- a/goal_src/jak2/levels/atoll/atoll-scenes.gc +++ b/goal_src/jak2/levels/atoll/atoll-scenes.gc @@ -1683,11 +1683,20 @@ ) ) -(defskelgroup skel-atoll-tank-a atoll-tank 0 -1 ((1 (meters 999999))) :bounds (static-spherem 30 -15 13 82)) +(defskelgroup skel-atoll-tank-a atoll-tank atoll-tank-a-lod0-jg -1 + ((atoll-tank-a-lod0-mg (meters 999999))) + :bounds (static-spherem 30 -15 13 82) + ) -(defskelgroup skel-atoll-tank-b atoll-tank 4 -1 ((5 (meters 999999))) :bounds (static-spherem 0 -15 -5 82)) +(defskelgroup skel-atoll-tank-b atoll-tank atoll-tank-b-lod0-jg -1 + ((atoll-tank-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 -15 -5 82) + ) -(defskelgroup skel-atoll-tank-c atoll-tank 8 -1 ((9 (meters 999999))) :bounds (static-spherem 30 -15 26 82)) +(defskelgroup skel-atoll-tank-c atoll-tank atoll-tank-c-lod0-jg -1 + ((atoll-tank-c-lod0-mg (meters 999999))) + :bounds (static-spherem 30 -15 26 82) + ) (scene-method-16 (new 'static 'scene diff --git a/goal_src/jak2/levels/castle/boss/castle-scenes.gc b/goal_src/jak2/levels/castle/boss/castle-scenes.gc index eb46a5e245..a035f152a6 100644 --- a/goal_src/jak2/levels/castle/boss/castle-scenes.gc +++ b/goal_src/jak2/levels/castle/boss/castle-scenes.gc @@ -445,10 +445,10 @@ ) ) -(defskelgroup skel-movie-hellcat hellcat 0 5 - ((1 (meters 20)) (2 (meters 40)) (3 (meters 999999))) +(defskelgroup skel-movie-hellcat hellcat hellcat-lod0-jg hellcat-idle-ja + ((hellcat-lod0-mg (meters 20)) (hellcat-lod1-mg (meters 40)) (hellcat-lod2-mg (meters 999999))) :bounds (static-spherem 0 0 0 6.6) - :shadow 4 + :shadow hellcat-shadow-mg :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/city/kid_escort/crocesc-h.gc b/goal_src/jak2/levels/city/kid_escort/crocesc-h.gc index 4f85f5cb12..ac3e091d9c 100644 --- a/goal_src/jak2/levels/city/kid_escort/crocesc-h.gc +++ b/goal_src/jak2/levels/city/kid_escort/crocesc-h.gc @@ -38,10 +38,10 @@ ) -(defskelgroup skel-crocadog-escort crocadog-escort 0 3 - ((1 (meters 999999))) +(defskelgroup skel-crocadog-escort crocadog-escort crocadog-escort-lod0-jg crocadog-escort-idle-pant-ja + ((crocadog-escort-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) - :shadow 2 + :shadow crocadog-escort-shadow-mg :origin-joint-index 20 ) diff --git a/goal_src/jak2/levels/city/kid_escort/kidesc-h.gc b/goal_src/jak2/levels/city/kid_escort/kidesc-h.gc index db01e84c87..3a0a0962f9 100644 --- a/goal_src/jak2/levels/city/kid_escort/kidesc-h.gc +++ b/goal_src/jak2/levels/city/kid_escort/kidesc-h.gc @@ -38,10 +38,10 @@ ) -(defskelgroup skel-kid-escort kid-escort 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kid-escort kid-escort kid-escort-lod0-jg kid-escort-idle0-ja + ((kid-escort-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) - :shadow 2 + :shadow kid-escort-shadow-mg :origin-joint-index 13 ) diff --git a/goal_src/jak2/levels/city/market/ctymark-obs.gc b/goal_src/jak2/levels/city/market/ctymark-obs.gc index 012fb500f3..dda1c517d6 100644 --- a/goal_src/jak2/levels/city/market/ctymark-obs.gc +++ b/goal_src/jak2/levels/city/market/ctymark-obs.gc @@ -1073,8 +1073,8 @@ ) ) -(defskelgroup skel-market-basket-a market-basket-a 0 2 - ((1 (meters 999999))) +(defskelgroup skel-market-basket-a market-basket-a market-basket-a-lod0-jg market-basket-a-idle-ja + ((market-basket-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 0 2.5) ) @@ -1148,7 +1148,10 @@ (none) ) -(defskelgroup skel-market-basket-b market-basket-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 2)) +(defskelgroup skel-market-basket-b market-basket-b market-basket-b-lod0-jg market-basket-b-idle-ja + ((market-basket-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 2) + ) (deftype market-basket-b (market-object) () @@ -1220,7 +1223,10 @@ (none) ) -(defskelgroup skel-market-crate market-crate 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 2)) +(defskelgroup skel-market-crate market-crate market-crate-lod0-jg market-crate-idle-ja + ((market-crate-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 2) + ) (deftype market-crate (market-object) () @@ -1292,7 +1298,10 @@ (none) ) -(defskelgroup skel-market-sack-a market-sack-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1 0 2)) +(defskelgroup skel-market-sack-a market-sack-a market-sack-a-lod0-jg market-sack-a-idle-ja + ((market-sack-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1 0 2) + ) (deftype market-sack-a (market-object) () @@ -1364,7 +1373,10 @@ (none) ) -(defskelgroup skel-market-sack-b market-sack-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1 0 2)) +(defskelgroup skel-market-sack-b market-sack-b market-sack-b-lod0-jg market-sack-b-idle-ja + ((market-sack-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1 0 2) + ) (deftype market-sack-b (market-object) () diff --git a/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc b/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc index 4e80cbfc46..7ab8f8e242 100644 --- a/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc +++ b/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc @@ -505,8 +505,8 @@ :init-specs ((sp-flt spt-scalevel-x (meters -0.04)) (sp-copy-from-other spt-scalevel-y -4) (sp-flt spt-fade-a -1.28)) ) -(defskelgroup skel-son-of-particleman son-of-particleman 0 2 - ((1 (meters 200))) +(defskelgroup skel-son-of-particleman son-of-particleman son-of-particleman-lod0-jg son-of-particleman-idle-ja + ((son-of-particleman-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/common/airlock.gc b/goal_src/jak2/levels/common/airlock.gc index 5c8b1f5099..65e4b3fbb3 100644 --- a/goal_src/jak2/levels/common/airlock.gc +++ b/goal_src/jak2/levels/common/airlock.gc @@ -356,8 +356,8 @@ (none) ) -(defskelgroup skel-com-airlock-outer com-airlock-outer 0 2 - ((1 (meters 999999))) +(defskelgroup skel-com-airlock-outer com-airlock-outer com-airlock-outer-lod0-jg com-airlock-outer-idle-ja + ((com-airlock-outer-lod0-mg (meters 999999))) :bounds (static-spherem 0 5 0 14) ) @@ -366,42 +366,6 @@ :bounds (static-spherem 0 5 0 14) ) -; ;; failed to figure out what this is: -; (let ((a0-10 (new 'static 'skeleton-group -; :name "skel-com-airlock-outer" -; :extra #f -; :info #f -; :art-group-name "com-airlock-outer" -; :bounds (new 'static 'vector :y 20480.0 :w 57344.0) -; :version #x7 -; ) -; ) -; ) -; (set! (-> a0-10 jgeo) 0) -; (set! (-> a0-10 janim) 2) -; (set! (-> a0-10 mgeo 0) 1) -; (set! (-> a0-10 lod-dist 0) 4095996000.0) -; (add-to-loading-level a0-10) -; ) - -; ;; failed to figure out what this is: -; (let ((a0-11 (new 'static 'skeleton-group -; :name "skel-com-airlock-inner" -; :extra #f -; :info #f -; :art-group-name "com-airlock-inner" -; :bounds (new 'static 'vector :y 20480.0 :w 57344.0) -; :version #x7 -; ) -; ) -; ) -; (set! (-> a0-11 jgeo) 0) -; (set! (-> a0-11 janim) 2) -; (set! (-> a0-11 mgeo 0) 1) -; (set! (-> a0-11 lod-dist 0) 4095996000.0) -; (add-to-loading-level a0-11) -; ) - (defstate close (com-airlock) :virtual #t :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) @@ -990,22 +954,11 @@ (none) ) -(let ((a0-20 (new 'static 'skeleton-group - :name "skel-fort-entry-gate" - :extra #f - :info #f - :art-group-name "fort-entry-gate" - :bounds (new 'static 'vector :y 12288.0 :w 40960.0) - :version #x7 - ) - ) - ) - (set! (-> a0-20 jgeo) 0) - (set! (-> a0-20 janim) 2) - (set! (-> a0-20 mgeo 0) 1) - (set! (-> a0-20 lod-dist 0) 4095996000.0) - (add-to-loading-level a0-20) - ) +(defskelgroup skel-fort-entry-gate fort-entry-gate fort-entry-gate-lod0-jg fort-entry-gate-idle-ja + ((fort-entry-gate-lod0-mg (meters 999999))) + :bounds (static-spherem 0 3 0 10) + ) + (deftype fort-entry-gate (com-airlock) () :heap-base #x100 @@ -1126,8 +1079,8 @@ (none) ) -(defskelgroup skel-tomb-mar-door tomb-mar-door 0 2 - ((1 (meters 999999))) +(defskelgroup skel-tomb-mar-door tomb-mar-door tomb-mar-door-lod0-jg tomb-mar-door-idle-ja + ((tomb-mar-door-lod0-mg (meters 999999))) :bounds (static-spherem 0 6 0 18) :origin-joint-index 3 ) @@ -1184,8 +1137,8 @@ ) -(defskelgroup skel-pal-throne-door pal-throne-door 0 2 - ((1 (meters 999999))) +(defskelgroup skel-pal-throne-door pal-throne-door pal-throne-door-lod0-jg pal-throne-door-idle-ja + ((pal-throne-door-lod0-mg (meters 999999))) :bounds (static-spherem 0 6 0 24) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/common/cty-guard-turret-button.gc b/goal_src/jak2/levels/common/cty-guard-turret-button.gc index d5f29be695..da2e954c7f 100644 --- a/goal_src/jak2/levels/common/cty-guard-turret-button.gc +++ b/goal_src/jak2/levels/common/cty-guard-turret-button.gc @@ -7,8 +7,8 @@ ;; DECOMP BEGINS -(defskelgroup skel-cty-guard-turret-button cty-guard-turret-button 0 2 - ((1 (meters 999999))) +(defskelgroup skel-cty-guard-turret-button cty-guard-turret-button cty-guard-turret-button-lod0-jg cty-guard-turret-button-idle-ja + ((cty-guard-turret-button-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) ) @@ -111,15 +111,18 @@ (defstate pop-up (cty-guard-turret-button) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.4) + (ja-no-eval :group! cty-guard-turret-button-pop-up-ja + :num! (seek! + (the float (+ (-> (the-as art-joint-anim cty-guard-turret-button-pop-up-ja) frames num-frames) -1)) + 0.4 + ) :frame-num 0.0 ) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4)) ) - (ja :group! (-> self draw art-group data 2) :num! min) + (ja :group! cty-guard-turret-button-idle-ja :num! min) (go-virtual up-idle) (none) ) diff --git a/goal_src/jak2/levels/common/enemy/fodder/fodder.gc b/goal_src/jak2/levels/common/enemy/fodder/fodder.gc index 667d4e9eb9..4bf26c0411 100644 --- a/goal_src/jak2/levels/common/enemy/fodder/fodder.gc +++ b/goal_src/jak2/levels/common/enemy/fodder/fodder.gc @@ -7,10 +7,10 @@ ;; DECOMP BEGINS -(defskelgroup skel-fodder fodder 0 -1 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-fodder fodder fodder-lod0-jg -1 + ((fodder-lod0-mg (meters 20)) (fodder-lod1-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) - :shadow 3 + :shadow fodder-shadow-mg :origin-joint-index 12 ) @@ -385,11 +385,8 @@ (until (not #f) (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1)) - f30-0 - ) + (ja-no-eval :group! fodder-idle-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-idle-ja) frames num-frames) -1)) f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -400,11 +397,8 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) (dotimes (gp-0 (rand-vu-int-range 4 7)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) - f30-0 - ) + (ja-no-eval :group! fodder-chew-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-chew-ja) frames num-frames) -1)) f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -661,7 +655,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info-override hostile-anim))) ) ((= v1-55 1) - (ja :group! (-> self draw art-group data 10)) + (ja :group! fodder-jump-chomp-ja) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-64 *game-info*) (a0-30 (+ (-> v1-64 attack-id) 1)) @@ -671,7 +665,7 @@ ) ) (else - (ja :group! (-> self draw art-group data 11)) + (ja :group! fodder-jump-kick-ja) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-70 *game-info*) (a0-35 (+ (-> v1-70 attack-id) 1)) @@ -759,7 +753,7 @@ (when (and (< f30-0 (* f0-20 f0-20)) (>= (- (-> self clock frame-counter) (-> self look-at-other-time)) (seconds 0.125)) ) - (let ((v1-117 (ja-channel-float! (the-as art-joint-anim (-> self draw art-group data 15)) 0.0 0.0 0.0))) + (let ((v1-117 (ja-channel-float! (the-as art-joint-anim fodder-snap-ja) 0.0 0.0 0.0))) (when v1-117 (set! (-> self skel interp-select 0) #xe00010) (set! (-> self skel interp-select 1) 0) diff --git a/goal_src/jak2/levels/common/guard-projectile.gc b/goal_src/jak2/levels/common/guard-projectile.gc index a97cb13da8..afe511bbf1 100644 --- a/goal_src/jak2/levels/common/guard-projectile.gc +++ b/goal_src/jak2/levels/common/guard-projectile.gc @@ -846,7 +846,7 @@ :fade-to-color (new 'static 'rgba :r #xbf :b #x8f :a #x5) :fade-start-factor 0.2 :fade-time 120.0 - :texture #xc08300 + :texture (new 'static 'texture-id :index #x83 :page #xc) :reduction 0.6 :num-points 16 :box-size 2048.0 @@ -865,7 +865,7 @@ :fade-to-color (new 'static 'rgba :r #xbf :b #x8f :a #x5) :fade-start-factor 0.2 :fade-time 120.0 - :texture #xc08300 + :texture (new 'static 'texture-id :index #x83 :page #xc) :reduction 0.6 :num-points 16 :box-size 2048.0 diff --git a/goal_src/jak2/levels/common/scene-actor.gc b/goal_src/jak2/levels/common/scene-actor.gc index 804012a63e..a94d74cea1 100644 --- a/goal_src/jak2/levels/common/scene-actor.gc +++ b/goal_src/jak2/levels/common/scene-actor.gc @@ -22,8 +22,8 @@ :origin-joint-index 3 ) -(defskelgroup skel-jakone-highres jakone-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jakone-highres jakone-highres jakone-highres-lod0-jg -1 + ((jakone-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) :sort 1 @@ -40,11 +40,11 @@ :shadow-joint-index 3 ) -(defskelgroup skel-jak-highres-prison jak-highres-prison 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jak-highres-prison jak-highres-prison jak-highres-prison-lod0-jg -1 + ((jak-highres-prison-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) - :shadow 2 + :shadow jak-highres-prison-shadow-mg :sort 1 :origin-joint-index 3 :shadow-joint-index 3 @@ -64,66 +64,66 @@ :origin-joint-index 3 ) -(defskelgroup skel-kor-highres kor-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kor-highres kor-highres kor-highres-lod0-jg kor-highres-idle-ja + ((kor-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow kor-highres-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-metalkor-highres metalkor-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-metalkor-highres metalkor-highres metalkor-highres-lod0-jg metalkor-highres-idle-ja + ((metalkor-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 2 8) - :shadow 2 + :shadow metalkor-highres-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-metalkor-highres-lowtorso metalkor-highres 7 10 - ((8 (meters 999999))) +(defskelgroup skel-metalkor-highres-lowtorso metalkor-highres metalkor-highres-lowtorso-lod0-jg metalkor-highres-lowtorso-idle-ja + ((metalkor-highres-lowtorso-lod0-mg (meters 999999))) :bounds (static-spherem 0 -9 -12 22) - :shadow 9 + :shadow metalkor-highres-lowtorso-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-metalkor-highres-legs metalkor-highres 14 17 - ((15 (meters 999999))) +(defskelgroup skel-metalkor-highres-legs metalkor-highres metalkor-highres-legs-lod0-jg metalkor-highres-legs-idle-ja + ((metalkor-highres-legs-lod0-mg (meters 999999))) :bounds (static-spherem 0 -9 2 15) - :shadow 16 + :shadow metalkor-highres-legs-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-metalkor-highres-wings metalkor-highres 21 24 - ((22 (meters 999999))) +(defskelgroup skel-metalkor-highres-wings metalkor-highres metalkor-highres-wings-lod0-jg metalkor-highres-wings-idle-ja + ((metalkor-highres-wings-lod0-mg (meters 999999))) :bounds (static-spherem 0 8 -5 20) - :shadow 23 + :shadow metalkor-highres-wings-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-kor-transform kor-transform 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kor-transform kor-transform kor-transform-lod0-jg kor-transform-idle-ja + ((kor-transform-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 2 8) - :shadow 2 + :shadow kor-transform-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-kor-transform-monsterparts kor-transform 5 8 - ((6 (meters 999999))) +(defskelgroup skel-kor-transform-monsterparts kor-transform kor-transform-monsterparts-lod0-jg kor-transform-monsterparts-idle-ja + ((kor-transform-monsterparts-lod0-mg (meters 999999))) :bounds (static-spherem 0 -9 -12 22) - :shadow 7 + :shadow kor-transform-monsterparts-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-baron-highres baron-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-baron-highres baron-highres baron-highres-lod0-jg baron-highres-idle-ja + ((baron-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow baron-highres-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-errol-highres errol-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-errol-highres errol-highres errol-highres-lod0-jg errol-highres-idle-ja + ((errol-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow errol-highres-shadow-mg :origin-joint-index 3 ) @@ -134,39 +134,39 @@ :origin-joint-index 3 ) -(defskelgroup skel-pecker-highres pecker-highres 0 3 - ((1 (meters 200))) +(defskelgroup skel-pecker-highres pecker-highres pecker-highres-lod0-jg pecker-highres-idle-ja + ((pecker-highres-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow pecker-highres-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-kid-highres kid-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kid-highres kid-highres kid-highres-lod0-jg kid-highres-idle-ja + ((kid-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow kid-highres-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) -(defskelgroup skel-crocadog-highres crocadog-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-crocadog-highres crocadog-highres crocadog-highres-lod0-jg crocadog-highres-idle-ja + ((crocadog-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow crocadog-highres-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-crimson-guard-highres crimson-guard-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-crimson-guard-highres crimson-guard-highres crimson-guard-highres-lod0-jg -1 + ((crimson-guard-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow crimson-guard-highres-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-crimson-guard-lowres crimson-guard-lowres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-crimson-guard-lowres crimson-guard-lowres crimson-guard-lowres-lod0-jg -1 + ((crimson-guard-lowres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow crimson-guard-lowres-shadow-mg :origin-joint-index 3 ) @@ -177,8 +177,8 @@ :origin-joint-index 3 ) -(defskelgroup skel-atoll-hellcat atoll-hellcat 0 4 - ((1 (meters 999999))) +(defskelgroup skel-atoll-hellcat atoll-hellcat atoll-hellcat-lod0-jg atoll-hellcat-idle-ja + ((atoll-hellcat-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 8.5) :origin-joint-index 3 ) @@ -198,39 +198,39 @@ :origin-joint-index 3 ) -(defskelgroup skel-sig-highres sig-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-sig-highres sig-highres sig-highres-lod0-jg sig-highres-idle-ja + ((sig-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow sig-highres-shadow-mg :origin-joint-index 30 ) -(defskelgroup skel-ashelin-highres ashelin-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-ashelin-highres ashelin-highres ashelin-highres-lod0-jg ashelin-highres-idle-ja + ((ashelin-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow ashelin-highres-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) -(defskelgroup skel-brutter-highres brutter-highres 0 4 - ((1 (meters 999999))) +(defskelgroup skel-brutter-highres brutter-highres brutter-highres-lod0-jg brutter-highres-idle-kiosk-ja + ((brutter-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow brutter-highres-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) -(defskelgroup skel-palmpilot palmpilot 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-palmpilot palmpilot palmpilot-lod0-jg -1 + ((palmpilot-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1.5) :origin-joint-index 3 ) -(defskelgroup skel-krew-highres krew-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-krew-highres krew-highres krew-highres-lod0-jg krew-highres-idle-ja + ((krew-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow krew-highres-shadow-mg :origin-joint-index 3 ) @@ -255,14 +255,14 @@ :origin-joint-index 3 ) -(defskelgroup skel-life-seed life-seed 0 2 - ((1 (meters 200))) +(defskelgroup skel-life-seed life-seed life-seed-lod0-jg life-seed-idle-ja + ((life-seed-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) -(defskelgroup skel-grunt-fma grunt-fma 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-grunt-fma grunt-fma grunt-fma-lod0-jg -1 + ((grunt-fma-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) @@ -996,14 +996,14 @@ :origin-joint-index 31 ) -(defskelgroup skel-time-map time-map 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-time-map time-map time-map-lod0-jg -1 + ((time-map-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 20 ) -(defskelgroup skel-precursor-stone precursor-stone 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-precursor-stone precursor-stone precursor-stone-lod0-jg -1 + ((precursor-stone-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) @@ -1032,8 +1032,8 @@ :origin-joint-index 3 ) -(defskelgroup skel-mtn-lens mtn-lens 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-lens mtn-lens mtn-lens-lod0-jg mtn-lens-idle-ja + ((mtn-lens-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.5) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/common/warp-gate.gc b/goal_src/jak2/levels/common/warp-gate.gc index 316a5c0ef5..944c4eaea2 100644 --- a/goal_src/jak2/levels/common/warp-gate.gc +++ b/goal_src/jak2/levels/common/warp-gate.gc @@ -443,8 +443,8 @@ ) ) -(defskelgroup skel-warp-gate warp-gate 0 2 - ((1 (meters 999999))) +(defskelgroup skel-warp-gate warp-gate warp-gate-lod0-jg warp-gate-idle-ja + ((warp-gate-lod0-mg (meters 999999))) :bounds (static-spherem 0 3 0 4) :origin-joint-index 3 ) @@ -1101,8 +1101,8 @@ :post target-no-move-post ) -(defskelgroup skel-air-train air-train 0 2 - ((1 (meters 999999))) +(defskelgroup skel-air-train air-train air-train-lod0-jg air-train-idle-ja + ((air-train-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 -2 12.5) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/consite/consite-scenes.gc b/goal_src/jak2/levels/consite/consite-scenes.gc index 7a670e3724..d9df623bce 100644 --- a/goal_src/jak2/levels/consite/consite-scenes.gc +++ b/goal_src/jak2/levels/consite/consite-scenes.gc @@ -7,44 +7,44 @@ ;; DECOMP BEGINS -(defskelgroup skel-consite-break-scaffold-a-break consite-break-scaffold-a 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break consite-break-scaffold-a consite-break-scaffold-a-break-lod0-jg -1 + ((consite-break-scaffold-a-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 90) :origin-joint-index 8 ) -(defskelgroup skel-consite-break-scaffold-a-break-a consite-break-scaffold-a 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break-a consite-break-scaffold-a consite-break-scaffold-a-break-a-lod0-jg -1 + ((consite-break-scaffold-a-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -20 70) :origin-joint-index 3 ) -(defskelgroup skel-consite-break-scaffold-a-break-b consite-break-scaffold-a 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break-b consite-break-scaffold-a consite-break-scaffold-a-break-b-lod0-jg -1 + ((consite-break-scaffold-a-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -20 60) :origin-joint-index 3 ) -(defskelgroup skel-consite-break-scaffold-a-break-c consite-break-scaffold-a 12 -1 - ((13 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break-c consite-break-scaffold-a consite-break-scaffold-a-break-c-lod0-jg -1 + ((consite-break-scaffold-a-break-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -20 140) :origin-joint-index 3 ) -(defskelgroup skel-bomb-trigger bomb-trigger 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-bomb-trigger bomb-trigger bomb-trigger-lod0-jg -1 + ((bomb-trigger-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) -(defskelgroup skel-kor-break kor-break 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-kor-break kor-break kor-break-lod0-jg -1 + ((kor-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) :origin-joint-index 3 ) -(defskelgroup skel-kor-break-ray kor-break-ray 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-kor-break-ray kor-break-ray kor-break-ray-lod0-jg -1 + ((kor-break-ray-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/dig/dig-scenes.gc b/goal_src/jak2/levels/dig/dig-scenes.gc index 79e6ff6ec0..55b07a278c 100644 --- a/goal_src/jak2/levels/dig/dig-scenes.gc +++ b/goal_src/jak2/levels/dig/dig-scenes.gc @@ -7,20 +7,20 @@ ;; DECOMP BEGINS -(defskelgroup skel-dig-totem-fish dig-totem-fish 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-dig-totem-fish dig-totem-fish dig-totem-fish-lod0-jg -1 + ((dig-totem-fish-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) -(defskelgroup skel-seal-of-mar-base seal-of-mar-base 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-seal-of-mar-base seal-of-mar-base seal-of-mar-base-lod0-jg -1 + ((seal-of-mar-base-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) -(defskelgroup skel-dig-totem dig-totem 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-dig-totem dig-totem dig-totem-lod0-jg -1 + ((dig-totem-lod0-mg (meters 999999))) :bounds (static-spherem 0 10 0 20) :origin-joint-index 3 ) @@ -283,26 +283,26 @@ ) ) -(defskelgroup skel-dig-digger-explode dig-digger 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-dig-digger-explode dig-digger dig-digger-explode-lod0-jg -1 + ((dig-digger-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 4 ) -(defskelgroup skel-dig-digger-explode-a dig-digger 7 -1 - ((8 (meters 999999))) +(defskelgroup skel-dig-digger-explode-a dig-digger dig-digger-explode-a-lod0-jg -1 + ((dig-digger-explode-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) -(defskelgroup skel-dig-digger-explode-b dig-digger 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-dig-digger-explode-b dig-digger dig-digger-explode-b-lod0-jg -1 + ((dig-digger-explode-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) -(defskelgroup skel-dig-digger-explode-c dig-digger 13 -1 - ((14 (meters 999999))) +(defskelgroup skel-dig-digger-explode-c dig-digger dig-digger-explode-c-lod0-jg -1 + ((dig-digger-explode-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/drill_platform/drill-scenes.gc b/goal_src/jak2/levels/drill_platform/drill-scenes.gc index 77adfce9ce..106142132e 100644 --- a/goal_src/jak2/levels/drill_platform/drill-scenes.gc +++ b/goal_src/jak2/levels/drill_platform/drill-scenes.gc @@ -561,26 +561,26 @@ ) ) -(defskelgroup skel-drill-top-break drill-top-break 0 2 - ((1 (meters 999999))) +(defskelgroup skel-drill-top-break drill-top-break drill-top-break-lod0-jg drill-top-break-idle-ja + ((drill-top-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 20 0 80) :origin-joint-index 3 ) -(defskelgroup skel-drill-top-break-explode-b drill-top-break 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-drill-top-break-explode-b drill-top-break drill-top-break-explode-b-lod0-jg -1 + ((drill-top-break-explode-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 20 0 1000) :origin-joint-index 3 ) -(defskelgroup skel-drill-top-break-explode drill-top-break 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-drill-top-break-explode drill-top-break drill-top-break-explode-lod0-jg -1 + ((drill-top-break-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 4 ) -(defskelgroup skel-drill-top-break-explode-a drill-top-break 7 -1 - ((8 (meters 999999))) +(defskelgroup skel-drill-top-break-explode-a drill-top-break drill-top-break-explode-a-lod0-jg -1 + ((drill-top-break-explode-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/fortress/exit/forexita-obs.gc b/goal_src/jak2/levels/fortress/exit/forexita-obs.gc index 8a99450d95..0e43865492 100644 --- a/goal_src/jak2/levels/fortress/exit/forexita-obs.gc +++ b/goal_src/jak2/levels/fortress/exit/forexita-obs.gc @@ -7,7 +7,6 @@ ;; DECOMP BEGINS -;; definition of type fort-lift-plat (deftype fort-lift-plat (plat) ((sound-time time-frame :offset-assert 328) (last-val float :offset-assert 336) @@ -21,61 +20,27 @@ ) ) -;; definition for method 3 of type fort-lift-plat -(defmethod inspect fort-lift-plat ((obj fort-lift-plat)) - (when (not obj) - (set! obj obj) - (goto cfg-4) - ) - (let ((t9-0 (method-of-type plat inspect))) - (t9-0 obj) - ) - (format #t "~2Tsound-time: ~D~%" (-> obj sound-time)) - (format #t "~2Tlast-val: ~f~%" (-> obj last-val)) - (label cfg-4) - obj - ) -;; failed to figure out what this is: -(let ((a0-2 (new 'static 'skeleton-group - :name "skel-fort-lift-plat" - :extra #f - :info #f - :art-group-name "fort-lift-plat" - :bounds (new 'static 'vector :y -8192.0 :z -32768.0 :w 61440.0) - :version #x7 +(defskelgroup skel-fort-lift-plat fort-lift-plat fort-lift-plat-lod0-jg fort-lift-plat-idle-ja + ((fort-lift-plat-lod0-mg (meters 999999))) + :bounds (static-spherem 0 -2 -8 15) ) - ) - ) - (set! (-> a0-2 jgeo) 0) - (set! (-> a0-2 janim) 3) - (set! (-> a0-2 mgeo 0) 1) - (set! (-> a0-2 lod-dist 0) 4095996000.0) - (add-to-loading-level a0-2) - ) -;; definition for method 30 of type fort-lift-plat (defmethod get-art-group fort-lift-plat ((obj fort-lift-plat)) "@returns The associated [[art-group]]" (art-group-get-by-name *level* "skel-fort-lift-plat" (the-as (pointer uint32) #f)) ) -;; definition for method 32 of type fort-lift-plat -;; INFO: this function exists in multiple non-identical object files -;; WARN: Return type mismatch int vs none. -;; multiply defined ; (defmethod base-plat-method-32 fort-lift-plat ((obj fort-lift-plat)) ; 0 ; (none) ; ) -;; failed to figure out what this is: (defstate plat-idle (fort-lift-plat) :virtual #t :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) ) -;; failed to figure out what this is: (defstate plat-anim-active (fort-lift-plat) :virtual #t :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) @@ -113,7 +78,6 @@ ) ) -;; failed to figure out what this is: (defstate plat-path-active (fort-lift-plat) :virtual #t :event (the-as (function process int symbol event-message-block object :behavior fort-lift-plat) #f) @@ -151,9 +115,6 @@ ) ) -;; definition for method 27 of type fort-lift-plat -;; INFO: Used lq/sq -;; WARN: Return type mismatch int vs none. (defmethod execute-effects fort-lift-plat ((obj fort-lift-plat)) "Executes various ancillary tasks with the platform, such as spawning particles or playing the associated sound" (if (nonzero? (-> obj part)) @@ -166,7 +127,6 @@ (none) ) -;; definition for method 31 of type fort-lift-plat ;; WARN: Return type mismatch collide-shape-moving vs none. (defmethod base-plat-method-31 fort-lift-plat ((obj fort-lift-plat)) "TODO - collision stuff" @@ -231,15 +191,12 @@ (none) ) -;; definition for method 32 of type fort-lift-plat -;; INFO: this function exists in multiple non-identical object files ;; WARN: Return type mismatch sparticle-launch-control vs none. (defmethod base-plat-method-32 fort-lift-plat ((obj fort-lift-plat)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 618) obj)) (none) ) -;; definition for method 33 of type fort-lift-plat ;; WARN: Return type mismatch sound-id vs none. (defmethod base-plat-method-33 fort-lift-plat ((obj fort-lift-plat)) (set! (-> obj root-override pause-adjust-distance) 327680.0) @@ -247,14 +204,12 @@ (none) ) -;; definition for method 10 of type fort-lift-plat (defmethod deactivate fort-lift-plat ((obj fort-lift-plat)) (sound-stop (-> obj sound-id)) ((method-of-type plat deactivate) obj) (none) ) -;; definition for method 36 of type fort-lift-plat (defmethod plat-path-sync fort-lift-plat ((obj fort-lift-plat)) "If the `sync` period is greater than `0` then transition the state to [[plat::35]] otherwise, [[plat::34]] @@ -283,7 +238,6 @@ ) ) -;; definition of type fort-claw (deftype fort-claw (process-drawable) ((path-u float :offset-assert 200) (path-dest float :offset-assert 204) @@ -298,43 +252,12 @@ ) ) -;; definition for method 3 of type fort-claw -(defmethod inspect fort-claw ((obj fort-claw)) - (when (not obj) - (set! obj obj) - (goto cfg-4) - ) - (let ((t9-0 (method-of-type process-drawable inspect))) - (t9-0 obj) - ) - (format #t "~2Tpath-u: ~f~%" (-> obj path-u)) - (format #t "~2Tpath-dest: ~f~%" (-> obj path-dest)) - (label cfg-4) - obj - ) -;; failed to figure out what this is: -(let ((a0-18 (new 'static 'skeleton-group - :name "skel-fort-claw" - :extra #f - :info #f - :art-group-name "fort-claw" - :bounds (new 'static 'vector :y -106496.0 :z -16384.0 :w 143360.0) - :max-lod 1 - :version #x7 - ) - ) - ) - (set! (-> a0-18 jgeo) 0) - (set! (-> a0-18 janim) 3) - (set! (-> a0-18 mgeo 0) 1) - (set! (-> a0-18 lod-dist 0) 81920.0) - (set! (-> a0-18 mgeo 1) 2) - (set! (-> a0-18 lod-dist 1) 4095996000.0) - (add-to-loading-level a0-18) - ) +(defskelgroup skel-fort-claw fort-claw 0 3 + ((1 (meters 20)) (2 (meters 999999))) + :bounds (static-spherem 0 -26 -4 35) + ) -;; failed to figure out what this is: (defstate idle (fort-claw) :virtual #t :code (the-as (function none :behavior fort-claw) sleep-code) @@ -354,7 +277,6 @@ ) ) -;; failed to figure out what this is: (defstate pause (fort-claw) :virtual #t :enter (behavior () @@ -370,7 +292,6 @@ :code (the-as (function none :behavior fort-claw) sleep-code) ) -;; definition for method 11 of type fort-claw ;; WARN: Return type mismatch object vs none. (defmethod init-from-entity! fort-claw ((obj fort-claw) (arg0 entity-actor)) (set! (-> obj root) (new 'process 'trsqv)) diff --git a/goal_src/jak2/levels/fortress/fortress-obs.gc b/goal_src/jak2/levels/fortress/fortress-obs.gc index d522f3171a..51f7eed247 100644 --- a/goal_src/jak2/levels/fortress/fortress-obs.gc +++ b/goal_src/jak2/levels/fortress/fortress-obs.gc @@ -22,10 +22,13 @@ ) -(defskelgroup skel-fort-trap-door fort-trap-door 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 5)) +(defskelgroup skel-fort-trap-door fort-trap-door fort-trap-door-lod0-jg fort-trap-door-idle-ja + ((fort-trap-door-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 5) + ) -(defskelgroup skel-fort-trap-door-explode fort-trap-door 3 5 - ((4 (meters 999999))) +(defskelgroup skel-fort-trap-door-explode fort-trap-door fort-trap-door-explode-lod0-jg fort-trap-door-explode-idle-ja + ((fort-trap-door-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 15) ) diff --git a/goal_src/jak2/levels/gungame/gun-dummy.gc b/goal_src/jak2/levels/gungame/gun-dummy.gc index b347d59636..c8e44df780 100644 --- a/goal_src/jak2/levels/gungame/gun-dummy.gc +++ b/goal_src/jak2/levels/gungame/gun-dummy.gc @@ -1619,69 +1619,105 @@ (defskelgroup skel-gun-dummy gun-dummy 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) -(defskelgroup skel-gun-dummy-a gun-dummy-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -(defskelgroup skel-gun-dummy-b gun-dummy-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -(defskelgroup skel-gun-dummy-c gun-dummy-c 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -(defskelgroup skel-gun-dummy-big gun-dummy-big 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -(defskelgroup skel-gun-dummy-gold gun-dummy-gold 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-dummy-a gun-dummy-a gun-dummy-a-lod0-jg gun-dummy-a-idle-ja + ((gun-dummy-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2) ) -(defskelgroup skel-gun-dummy-peace gun-dummy-yellow-gun 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-dummy-b gun-dummy-b gun-dummy-b-lod0-jg gun-dummy-b-idle-ja + ((gun-dummy-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2) ) -(defskelgroup skel-gun-cit-a gun-cit-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-c gun-dummy-c gun-dummy-c-lod0-jg gun-dummy-c-idle-ja + ((gun-dummy-c-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) -(defskelgroup skel-gun-cit-b gun-cit-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-big gun-dummy-big gun-dummy-big-lod0-jg gun-dummy-big-idle-ja + ((gun-dummy-big-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) -(defskelgroup skel-gun-cit-c gun-cit-c 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-gold gun-dummy-gold gun-dummy-gold-lod0-jg gun-dummy-gold-idle-ja + ((gun-dummy-gold-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) -(defskelgroup skel-gun-cit-d gun-cit-d 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-peace gun-dummy-yellow-gun gun-dummy-yellow-gun-lod0-jg gun-dummy-yellow-gun-idle-ja + ((gun-dummy-yellow-gun-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) -(defskelgroup skel-gun-dummy-a-explode gun-dummy-a 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-cit-a gun-cit-a gun-cit-a-lod0-jg gun-cit-a-idle-ja + ((gun-cit-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +(defskelgroup skel-gun-cit-b gun-cit-b gun-cit-b-lod0-jg gun-cit-b-idle-ja + ((gun-cit-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +(defskelgroup skel-gun-cit-c gun-cit-c gun-cit-c-lod0-jg gun-cit-c-idle-ja + ((gun-cit-c-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +(defskelgroup skel-gun-cit-d gun-cit-d gun-cit-d-lod0-jg gun-cit-d-idle-ja + ((gun-cit-d-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +(defskelgroup skel-gun-dummy-a-explode gun-dummy-a gun-dummy-a-explode-lod0-jg gun-dummy-a-explode-idle-ja + ((gun-dummy-a-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) -(defskelgroup skel-gun-dummy-b-explode gun-dummy-b 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-b-explode gun-dummy-b gun-dummy-b-explode-lod0-jg gun-dummy-b-explode-idle-ja + ((gun-dummy-b-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) -(defskelgroup skel-gun-dummy-c-explode gun-dummy-c 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-c-explode gun-dummy-c gun-dummy-c-explode-lod0-jg gun-dummy-c-explode-idle-ja + ((gun-dummy-c-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) -(defskelgroup skel-gun-dummy-big-explode gun-dummy-big 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-big-explode gun-dummy-big gun-dummy-big-explode-lod0-jg gun-dummy-big-explode-idle-ja + ((gun-dummy-big-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) -(defskelgroup skel-gun-dummy-gold-explode gun-dummy-gold 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-gold-explode gun-dummy-gold gun-dummy-gold-explode-lod0-jg gun-dummy-gold-explode-idle-ja + ((gun-dummy-gold-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) -(defskelgroup skel-gun-dummy-peace-explode gun-dummy-yellow-gun 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-peace-explode gun-dummy-yellow-gun gun-dummy-yellow-gun-explode-lod0-jg gun-dummy-yellow-gun-explode-idle-ja + ((gun-dummy-yellow-gun-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) -(defskelgroup skel-gun-cit-a-explode gun-cit-a 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-a-explode gun-cit-a gun-cit-a-explode-lod0-jg gun-cit-a-explode-idle-ja + ((gun-cit-a-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) -(defskelgroup skel-gun-cit-b-explode gun-cit-b 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-b-explode gun-cit-b gun-cit-b-explode-lod0-jg gun-cit-b-explode-idle-ja + ((gun-cit-b-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) -(defskelgroup skel-gun-cit-c-explode gun-cit-c 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-c-explode gun-cit-c gun-cit-c-explode-lod0-jg gun-cit-c-explode-idle-ja + ((gun-cit-c-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) -(defskelgroup skel-gun-cit-d-explode gun-cit-d 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-d-explode gun-cit-d gun-cit-d-explode-lod0-jg gun-cit-d-explode-idle-ja + ((gun-cit-d-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) (define *gun-dummy-a-exploder-params* (new 'static 'joint-exploder-static-params diff --git a/goal_src/jak2/levels/hideout/hideout-obs.gc b/goal_src/jak2/levels/hideout/hideout-obs.gc index 343b211d6c..12417582a9 100644 --- a/goal_src/jak2/levels/hideout/hideout-obs.gc +++ b/goal_src/jak2/levels/hideout/hideout-obs.gc @@ -7,8 +7,8 @@ ;; DECOMP BEGINS -(defskelgroup skel-hide-door-b hide-door-b 0 2 - ((1 (meters 999999))) +(defskelgroup skel-hide-door-b hide-door-b hide-door-b-lod0-jg hide-door-b-idle-ja + ((hide-door-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 0 5) :origin-joint-index 3 ) @@ -24,7 +24,6 @@ ;; WARN: Return type mismatch object vs none. (defmethod init-from-entity! hide-door-b ((obj hide-door-b) (arg0 entity-actor)) - (stack-size-set! (-> obj main-thread) 1024) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 penetrated-by) (penetrate)) (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) @@ -84,16 +83,16 @@ ) -(defskelgroup skel-hide-light hide-light 0 3 - ((1 (meters 999999))) +(defskelgroup skel-hide-light hide-light hide-light-lod0-jg hide-light-idle-ja + ((hide-light-lod0-mg (meters 999999))) :bounds (static-spherem 0 -2.3 0 4.5) - :shadow 2 + :shadow hide-light-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) -(defskelgroup skel-hide-light-fog hide-light 5 7 - ((6 (meters 999999))) +(defskelgroup skel-hide-light-fog hide-light hide-light-fog-lod0-jg hide-light-fog-idle-ja + ((hide-light-fog-lod0-mg (meters 999999))) :bounds (static-spherem 0 -2.5 0 3) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/hideout/hideout-scenes.gc b/goal_src/jak2/levels/hideout/hideout-scenes.gc index dc2b743270..884f175cd2 100644 --- a/goal_src/jak2/levels/hideout/hideout-scenes.gc +++ b/goal_src/jak2/levels/hideout/hideout-scenes.gc @@ -9,14 +9,14 @@ ;; DECOMP BEGINS -(defskelgroup skel-hide-faucet hide-faucet 0 2 - ((1 (meters 999999))) +(defskelgroup skel-hide-faucet hide-faucet hide-faucet-lod0-jg hide-faucet-idle-ja + ((hide-faucet-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) -(defskelgroup skel-gun-barrel gun-barrel 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-barrel gun-barrel gun-barrel-lod0-jg gun-barrel-idle-ja + ((gun-barrel-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/hiphog/hiphog-scenes.gc b/goal_src/jak2/levels/hiphog/hiphog-scenes.gc index ad6d1b3484..c2524e9816 100644 --- a/goal_src/jak2/levels/hiphog/hiphog-scenes.gc +++ b/goal_src/jak2/levels/hiphog/hiphog-scenes.gc @@ -10,7 +10,10 @@ ;; DECOMP BEGINS -(defskelgroup skel-hip-door-b hip-door-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 2 0 5)) +(defskelgroup skel-hip-door-b hip-door-a hip-door-a-lod0-jg hip-door-a-idle-ja + ((hip-door-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 2 0 5) + ) (deftype hip-door-b (com-airlock) () @@ -69,8 +72,8 @@ (none) ) -(defskelgroup skel-hip-whack-a-metal hip-whack-a-metal 0 2 - ((1 (meters 999999))) +(defskelgroup skel-hip-whack-a-metal hip-whack-a-metal hip-whack-a-metal-lod0-jg hip-whack-a-metal-idle-ja + ((hip-whack-a-metal-lod0-mg (meters 999999))) :bounds (static-spherem 0 -1 1 3.8) :origin-joint-index 3 ) @@ -158,7 +161,10 @@ ) -(defskelgroup skel-hip-mirror hip-mirror 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 12)) +(defskelgroup skel-hip-mirror hip-mirror hip-mirror-lod0-jg hip-mirror-idle-ja + ((hip-mirror-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 12) + ) (defstate idle (hip-mirror) :virtual #t diff --git a/goal_src/jak2/levels/intro/intro-scenes.gc b/goal_src/jak2/levels/intro/intro-scenes.gc index 9facb6878a..28edc62b18 100644 --- a/goal_src/jak2/levels/intro/intro-scenes.gc +++ b/goal_src/jak2/levels/intro/intro-scenes.gc @@ -2111,86 +2111,86 @@ :origin-joint-index 3 ) -(defskelgroup skel-vortex-light vortex-light 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-vortex-light vortex-light vortex-light-lod0-jg -1 + ((vortex-light-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5000) :origin-joint-index 3 ) -(defskelgroup skel-rift-rider-bar rift-rider-bar 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-bar rift-rider-bar rift-rider-bar-lod0-jg -1 + ((rift-rider-bar-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) -(defskelgroup skel-rift-rider-chunk-a rift-rider-chunk-a 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-chunk-a rift-rider-chunk-a rift-rider-chunk-a-lod0-jg -1 + ((rift-rider-chunk-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-rift-rider-break-b rift-rider-break-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-break-b rift-rider-break-b rift-rider-break-b-lod0-jg -1 + ((rift-rider-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-rift-rider-break-c rift-rider-break-c 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-break-c rift-rider-break-c rift-rider-break-c-lod0-jg -1 + ((rift-rider-break-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-meteor meteor 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-meteor meteor meteor-lod0-jg -1 + ((meteor-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-metalkor-torso metalkor-torso 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-metalkor-torso metalkor-torso metalkor-torso-lod0-jg -1 + ((metalkor-torso-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) :origin-joint-index 3 ) -(defskelgroup skel-rift-rider-donut rift-rider-donut 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-donut rift-rider-donut rift-rider-donut-lod0-jg -1 + ((rift-rider-donut-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-vil-break-support vil-break-support 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-vil-break-support vil-break-support vil-break-support-lod0-jg -1 + ((vil-break-support-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 120) :origin-joint-index 3 ) -(defskelgroup skel-prsn-chair-shackle prsn-chair-shackle 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-prsn-chair-shackle prsn-chair-shackle prsn-chair-shackle-lod0-jg -1 + ((prsn-chair-shackle-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :origin-joint-index 3 ) -(defskelgroup skel-prsn-daxter-plat prsn-daxter-plat 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-prsn-daxter-plat prsn-daxter-plat prsn-daxter-plat-lod0-jg -1 + ((prsn-daxter-plat-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :origin-joint-index 3 ) -(defskelgroup skel-jak-clothes jak-clothes 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jak-clothes jak-clothes jak-clothes-lod0-jg -1 + ((jak-clothes-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-rift-rider-dash rift-rider-dash 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-dash rift-rider-dash rift-rider-dash-lod0-jg -1 + ((rift-rider-dash-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-rift-rider-heart-of-mar rift-rider-heart-of-mar 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-heart-of-mar rift-rider-heart-of-mar rift-rider-heart-of-mar-lod0-jg -1 + ((rift-rider-heart-of-mar-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/nest/boss/nestb-scenes.gc b/goal_src/jak2/levels/nest/boss/nestb-scenes.gc index 1a917a06a7..a676b57a8e 100644 --- a/goal_src/jak2/levels/nest/boss/nestb-scenes.gc +++ b/goal_src/jak2/levels/nest/boss/nestb-scenes.gc @@ -40,8 +40,8 @@ ) ) -(defskelgroup skel-metalkor-fma-spinner metalkor-fma-spinner 0 2 - ((1 (meters 999999))) +(defskelgroup skel-metalkor-fma-spinner metalkor-fma-spinner metalkor-fma-spinner-lod0-jg metalkor-fma-spinner-idle-ja + ((metalkor-fma-spinner-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :origin-joint-index 3 ) @@ -1664,8 +1664,8 @@ ) -(defskelgroup skel-nest-gun-parts nest-gun-parts 0 2 - ((1 (meters 999999))) +(defskelgroup skel-nest-gun-parts nest-gun-parts nest-gun-parts-lod0-jg nest-gun-parts-idle-ja + ((nest-gun-parts-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 25 40) :origin-joint-index 3 ) @@ -1715,8 +1715,8 @@ ) -(defskelgroup skel-nest-unbroken-rocks nest-unbroken-rocks 0 2 - ((1 (meters 999999))) +(defskelgroup skel-nest-unbroken-rocks nest-unbroken-rocks nest-unbroken-rocks-lod0-jg nest-unbroken-rocks-idle-ja + ((nest-unbroken-rocks-lod0-mg (meters 999999))) :bounds (static-spherem 75 0 -75 55) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/nest/nest-scenes.gc b/goal_src/jak2/levels/nest/nest-scenes.gc index 13c0bec9df..96a3632bbb 100644 --- a/goal_src/jak2/levels/nest/nest-scenes.gc +++ b/goal_src/jak2/levels/nest/nest-scenes.gc @@ -7,26 +7,26 @@ ;; DECOMP BEGINS -(defskelgroup skel-nest-gun-elevator nest-gun-elevator 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-nest-gun-elevator nest-gun-elevator nest-gun-elevator-lod0-jg -1 + ((nest-gun-elevator-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) -(defskelgroup skel-nest-break-rocks-break nest-break-rocks 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-nest-break-rocks-break nest-break-rocks nest-break-rocks-break-lod0-jg -1 + ((nest-break-rocks-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 3 ) -(defskelgroup skel-nest-break-rocks-break-a nest-break-rocks 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-nest-break-rocks-break-a nest-break-rocks nest-break-rocks-break-a-lod0-jg -1 + ((nest-break-rocks-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 300) :origin-joint-index 3 ) -(defskelgroup skel-nest-break-rocks-break-b nest-break-rocks 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-nest-break-rocks-break-b nest-break-rocks nest-break-rocks-break-b-lod0-jg -1 + ((nest-break-rocks-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/power_station/vinroom-scenes.gc b/goal_src/jak2/levels/power_station/vinroom-scenes.gc index 28ecb7fb0c..8f8af33610 100644 --- a/goal_src/jak2/levels/power_station/vinroom-scenes.gc +++ b/goal_src/jak2/levels/power_station/vinroom-scenes.gc @@ -16,10 +16,10 @@ ) -(defskelgroup skel-vin vin 0 3 - ((1 (meters 999999))) +(defskelgroup skel-vin vin vin-lod0-jg vin-idle-ja + ((vin-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) - :shadow 2 + :shadow vin-shadow-mg :origin-joint-index 3 ) @@ -331,14 +331,14 @@ ) ) -(defskelgroup skel-pow-mov-plat pow-mov-plat 0 2 - ((1 (meters 999999))) +(defskelgroup skel-pow-mov-plat pow-mov-plat pow-mov-plat-lod0-jg pow-mov-plat-idle-ja + ((pow-mov-plat-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) -(defskelgroup skel-plasmitebox plasmitebox 0 2 - ((1 (meters 999999))) +(defskelgroup skel-plasmitebox plasmitebox plasmitebox-lod0-jg plasmitebox-idle-ja + ((plasmitebox-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/ruins/ruins-scenes.gc b/goal_src/jak2/levels/ruins/ruins-scenes.gc index 794db95171..463efbed4b 100644 --- a/goal_src/jak2/levels/ruins/ruins-scenes.gc +++ b/goal_src/jak2/levels/ruins/ruins-scenes.gc @@ -34,32 +34,32 @@ ) ) -(defskelgroup skel-awning awning 0 2 - ((1 (meters 999999))) +(defskelgroup skel-awning awning awning-lod0-jg awning-idle-ja + ((awning-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 3 ) -(defskelgroup skel-flag flag 0 3 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-flag flag flag-lod0-jg flag-idle-ja + ((flag-lod0-mg (meters 20)) (flag-lod1-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) -(defskelgroup skel-movie-flag flag 0 3 - ((1 (meters 999999))) +(defskelgroup skel-movie-flag flag flag-lod0-jg flag-idle-ja + ((flag-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 3 ) -(defskelgroup skel-precipice-a precipice-a 0 2 - ((1 (meters 999999))) +(defskelgroup skel-precipice-a precipice-a precipice-a-lod0-jg precipice-a-idle-ja + ((precipice-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 18 ) -(defskelgroup skel-precipice-b precipice-b 0 2 - ((1 (meters 999999))) +(defskelgroup skel-precipice-b precipice-b precipice-b-lod0-jg precipice-b-idle-ja + ((precipice-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 26 ) @@ -106,8 +106,8 @@ :origin-joint-index 4 ) -(defskelgroup skel-zipline zipline 0 2 - ((1 (meters 999999))) +(defskelgroup skel-zipline zipline zipline-lod0-jg zipline-idle-ja + ((zipline-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 4 ) @@ -1373,8 +1373,8 @@ ) -(defskelgroup skel-ruins-precipice ruins-precipice 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-precipice ruins-precipice ruins-precipice-lod0-jg ruins-precipice-idle-ja + ((ruins-precipice-lod0-mg (meters 999999))) :bounds (static-spherem 5 0 5 12) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/stadium/stadium-scenes.gc b/goal_src/jak2/levels/stadium/stadium-scenes.gc index ac390eb27c..d9be74fa26 100644 --- a/goal_src/jak2/levels/stadium/stadium-scenes.gc +++ b/goal_src/jak2/levels/stadium/stadium-scenes.gc @@ -7,17 +7,17 @@ ;; DECOMP BEGINS -(defskelgroup skel-movie-race-bike-b race-bike-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-movie-race-bike-b race-bike-b race-bike-b-lod0-jg -1 + ((race-bike-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 3 + :shadow race-bike-b-shadow-mg :origin-joint-index 3 ) -(defskelgroup skel-movie-race-bike-c race-bike-c 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-movie-race-bike-c race-bike-c race-bike-c-lod0-jg -1 + ((race-bike-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 3 + :shadow race-bike-c-shadow-mg :origin-joint-index 3 ) @@ -33,8 +33,8 @@ :origin-joint-index 3 ) -(defskelgroup skel-babak babak 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-babak babak babak-lod0-jg -1 + ((babak-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/temple/canyon/canyon-scenes.gc b/goal_src/jak2/levels/temple/canyon/canyon-scenes.gc index 59ee7dc475..60a961a99b 100644 --- a/goal_src/jak2/levels/temple/canyon/canyon-scenes.gc +++ b/goal_src/jak2/levels/temple/canyon/canyon-scenes.gc @@ -7,32 +7,32 @@ ;; DECOMP BEGINS -(defskelgroup skel-ctypal-baron-statue-break ctypal-baron-statue-break 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break ctypal-baron-statue-break ctypal-baron-statue-break-lod0-jg ctypal-baron-statue-break-idle-ja + ((ctypal-baron-statue-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 9 ) -(defskelgroup skel-ctypal-baron-statue-break-a ctypal-baron-statue-break 4 6 - ((5 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break-a ctypal-baron-statue-break ctypal-baron-statue-break-a-lod0-jg ctypal-baron-statue-break-a-idle-ja + ((ctypal-baron-statue-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 9 ) -(defskelgroup skel-ctypal-baron-statue-break-b ctypal-baron-statue-break 8 10 - ((9 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break-b ctypal-baron-statue-break ctypal-baron-statue-break-b-lod0-jg ctypal-baron-statue-break-b-idle-ja + ((ctypal-baron-statue-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 3 ) -(defskelgroup skel-ctypal-baron-statue-break-c ctypal-baron-statue-break 12 14 - ((13 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break-c ctypal-baron-statue-break ctypal-baron-statue-break-c-lod0-jg ctypal-baron-statue-break-c-idle-ja + ((ctypal-baron-statue-break-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 3 ) -(defskelgroup skel-ctypal-break-wall ctypal-break-wall 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ctypal-break-wall ctypal-break-wall ctypal-break-wall-lod0-jg ctypal-break-wall-idle-ja + ((ctypal-break-wall-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/temple/mountain-scenes.gc b/goal_src/jak2/levels/temple/mountain-scenes.gc index 0c329447b1..4c7d74ed80 100644 --- a/goal_src/jak2/levels/temple/mountain-scenes.gc +++ b/goal_src/jak2/levels/temple/mountain-scenes.gc @@ -1894,14 +1894,14 @@ ) ) -(defskelgroup skel-mtn-lens-base mtn-lens-base 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-lens-base mtn-lens-base mtn-lens-base-lod0-jg mtn-lens-base-idle-ja + ((mtn-lens-base-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 40) :origin-joint-index 3 ) -(defskelgroup skel-mtn-lens-floor mtn-lens-floor 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-lens-floor mtn-lens-floor mtn-lens-floor-lod0-jg mtn-lens-floor-idle-ja + ((mtn-lens-floor-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 40) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/underport/under-scenes.gc b/goal_src/jak2/levels/underport/under-scenes.gc index 686b74de48..c94b7d51e7 100644 --- a/goal_src/jak2/levels/underport/under-scenes.gc +++ b/goal_src/jak2/levels/underport/under-scenes.gc @@ -31,14 +31,14 @@ :origin-joint-index 4 ) -(defskelgroup skel-under-break-wall under-break-wall 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-under-break-wall under-break-wall under-break-wall-lod0-jg -1 + ((under-break-wall-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) :origin-joint-index 4 ) -(defskelgroup skel-under-break-wall-b under-break-wall-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-under-break-wall-b under-break-wall-b under-break-wall-b-lod0-jg -1 + ((under-break-wall-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) :origin-joint-index 4 ) diff --git a/scripts/combine_all_imports.py b/scripts/combine_all_imports.py new file mode 100644 index 0000000000..ee7184f67e --- /dev/null +++ b/scripts/combine_all_imports.py @@ -0,0 +1,15 @@ +import os +import glob + +def get_goal_files(root_dir, ext = "*.gc"): + """Get all GOAL source files under root_dir.""" + return [goal_file for file in os.walk(root_dir) for goal_file in glob.glob(os.path.join(file[0], ext))] + +all_files = get_goal_files("./decompiler_out/jak2/import") +result = "" +for file in all_files: + with open(file) as f: + for line in f: + if line.startswith("(def"): + result += line +print(result) \ No newline at end of file diff --git a/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc index a9ad2a3812..c36f3f1f35 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/basebutton_REF.gc @@ -67,7 +67,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-generic-button mtn-dice-button 0 3 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 3)) +(defskelgroup skel-generic-button mtn-dice-button mtn-dice-button-lod0-jg mtn-dice-button-idle-ja + ((mtn-dice-button-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 3) + ) ;; definition for method 37 of type basebutton ;; INFO: Used lq/sq diff --git a/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc index a4aa46df53..a473e6ab2a 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc @@ -29,8 +29,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-blocking-plane blocking-plane 0 2 - ((1 (meters 999999))) +(defskelgroup skel-blocking-plane blocking-plane blocking-plane-lod0-jg blocking-plane-idle-ja + ((blocking-plane-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100.1) :texture-level 6 ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc index 1032fc7463..61317d989c 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc @@ -2,38 +2,41 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-health collectables 3 5 - ((4 (meters 999999))) +(defskelgroup skel-health collectables collectables-health-lod0-jg collectables-health-idle-ja + ((collectables-health-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :texture-level 6 ) ;; failed to figure out what this is: -(defskelgroup skel-gem collectables 6 9 - ((7 (meters 20)) (8 (meters 999999))) +(defskelgroup skel-gem collectables collectables-gem-lod0-jg collectables-gem-idle-ja + ((collectables-gem-lod0-mg (meters 20)) (collectables-gem-lod1-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.6) :texture-level 6 ) ;; failed to figure out what this is: -(defskelgroup skel-gun-yellow-up yellow-barrel 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-yellow-up yellow-barrel yellow-barrel-lod0-jg yellow-barrel-idle-ja + ((yellow-barrel-lod0-mg (meters 999999))) :bounds (static-spherem 0 1 0 1.6) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dark-up dark-barrel 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-dark-up dark-barrel dark-barrel-lod0-jg dark-barrel-idle-ja + ((dark-barrel-lod0-mg (meters 999999))) :bounds (static-spherem 0 1 0 1.6) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-skill collectables 17 22 - ((18 (meters 20)) (19 (meters 40)) (20 (meters 999999))) +(defskelgroup skel-skill collectables collectables-skill-lod0-jg collectables-skill-idle-ja + ((collectables-skill-lod0-mg (meters 20)) + (collectables-skill-lod1-mg (meters 40)) + (collectables-skill-lod2-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 0.6) - :shadow 21 + :shadow collectables-skill-shadow-mg :texture-level 6 :shadow-joint-index 0 ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc index 5c98fd633d..589479eb77 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc @@ -480,7 +480,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-strip-conveyor strip-conveyor 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 36)) +(defskelgroup skel-strip-conveyor strip-conveyor strip-conveyor-lod0-jg strip-conveyor-idle-ja + ((strip-conveyor-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 36) + ) ;; definition for method 22 of type strip-conveyor (defmethod get-art-group strip-conveyor ((obj strip-conveyor)) @@ -511,8 +514,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-lgconveyor lgconveyor 0 3 - ((1 (meters 999999))) +(defskelgroup skel-lgconveyor lgconveyor lgconveyor-lod0-jg lgconveyor-idle-ja + ((lgconveyor-lod0-mg (meters 999999))) :bounds (static-spherem 0 3 0 15) :longest-edge (meters 24.7389) :origin-joint-index 3 diff --git a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc index c4b8b48445..b201145bf7 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc @@ -2,8 +2,8 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-crate-krimson crate 0 3 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-crate-krimson crate crate-krimson-lod0-jg crate-idle-ja + ((crate-krimson-lod0-mg (meters 20)) (crate-krimson-lod1-mg (meters 999999))) :bounds (static-spherem 0 1 0 1.6) :texture-level 6 ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc index 2bdbefe6d9..b91eb3190e 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc @@ -2,8 +2,8 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-spotlight spotlight 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-spotlight spotlight spotlight-lod0-jg -1 + ((spotlight-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 5 ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc index e651585a15..cf1eeac8df 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc @@ -113,8 +113,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-voicebox talk-box 0 2 - ((1 (meters 999999))) +(defskelgroup skel-voicebox talk-box talk-box-lod0-jg talk-box-idle-ja + ((talk-box-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :texture-level 6 :sort 1 diff --git a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc index 60859fc835..a22ded97e3 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc @@ -67,206 +67,212 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-nest-dark-eco-largepool water-anim-nest-dark-eco 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-largepool water-anim-nest-dark-eco water-anim-nest-dark-eco-largepool-lod0-jg -1 + ((water-anim-nest-dark-eco-largepool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 50) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-nest-dark-eco-smlupperpool water-anim-nest-dark-eco 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-smlupperpool water-anim-nest-dark-eco water-anim-nest-dark-eco-smlupperpool-lod0-jg -1 + ((water-anim-nest-dark-eco-smlupperpool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-nest-dark-eco-middlepool water-anim-nest-dark-eco 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-middlepool water-anim-nest-dark-eco water-anim-nest-dark-eco-middlepool-lod0-jg -1 + ((water-anim-nest-dark-eco-middlepool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 32) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-nest-dark-eco-botpool water-anim-nest-dark-eco 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-nest-dark-eco-botpool water-anim-nest-dark-eco water-anim-nest-dark-eco-botpool-lod0-jg -1 + ((water-anim-nest-dark-eco-botpool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 35) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-strip-dark-eco-near-lift water-anim-strip-dark-eco 0 -1 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-near-lift water-anim-strip-dark-eco water-anim-strip-dark-eco-near-lift-lod0-jg -1 + ((water-anim-strip-dark-eco-near-lift-lod0-mg (meters 20)) + (water-anim-strip-dark-eco-near-lift-lod1-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 29) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-strip-dark-eco-near-crane water-anim-strip-dark-eco 3 -1 - ((4 (meters 20)) (5 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-near-crane water-anim-strip-dark-eco water-anim-strip-dark-eco-near-crane-lod0-jg -1 + ((water-anim-strip-dark-eco-near-crane-lod0-mg (meters 20)) + (water-anim-strip-dark-eco-near-crane-lod1-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 35) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-strip-dark-eco-with-eggs water-anim-strip-dark-eco 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-with-eggs water-anim-strip-dark-eco water-anim-strip-dark-eco-with-eggs-lod0-jg -1 + ((water-anim-strip-dark-eco-with-eggs-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 40) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-strip-dark-eco-under-bridge water-anim-strip-dark-eco 9 -1 - ((10 (meters 20)) (11 (meters 999999))) +(defskelgroup skel-water-anim-strip-dark-eco-under-bridge water-anim-strip-dark-eco water-anim-strip-dark-eco-under-bridge-lod0-jg -1 + ((water-anim-strip-dark-eco-under-bridge-lod0-mg (meters 20)) + (water-anim-strip-dark-eco-under-bridge-lod1-mg (meters 999999)) + ) :bounds (static-spherem 0 0 0 32) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-mountain-dark-eco-dice water-anim-mountain-dark-eco 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-mountain-dark-eco-dice water-anim-mountain-dark-eco water-anim-mountain-dark-eco-dice-lod0-jg -1 + ((water-anim-mountain-dark-eco-dice-lod0-mg (meters 999999))) :bounds (static-spherem -20 0 0 110) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-under-pool water-anim-under 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-under-pool water-anim-under water-anim-under-pool-lod0-jg -1 + ((water-anim-under-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 51) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-under-drainout water-anim-under 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-under-drainout water-anim-under water-anim-under-drainout-lod0-jg -1 + ((water-anim-under-drainout-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-under-fillup water-anim-under 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-under-fillup water-anim-under water-anim-under-fillup-lod0-jg -1 + ((water-anim-under-fillup-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 23) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-mountain-fall-hi water-anim-mountain 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-mountain-fall-hi water-anim-mountain water-anim-mountain-fall-hi-lod0-jg -1 + ((water-anim-mountain-fall-hi-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 42) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-mountain-fall-med water-anim-mountain 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-mountain-fall-med water-anim-mountain water-anim-mountain-fall-med-lod0-jg -1 + ((water-anim-mountain-fall-med-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-mountain-fall-low water-anim-mountain 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-mountain-fall-low water-anim-mountain water-anim-mountain-fall-low-lod0-jg -1 + ((water-anim-mountain-fall-low-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 25) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-stadium-middle-pool water-anim-stadium 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-stadium-middle-pool water-anim-stadium water-anim-stadium-middle-pool-lod0-jg -1 + ((water-anim-stadium-middle-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 24) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-stadium-top-fountain water-anim-stadium 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-stadium-top-fountain water-anim-stadium water-anim-stadium-top-fountain-lod0-jg -1 + ((water-anim-stadium-top-fountain-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 9.5) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-stadium-floor-pool water-anim-stadium 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-stadium-floor-pool water-anim-stadium water-anim-stadium-floor-pool-lod0-jg -1 + ((water-anim-stadium-floor-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-dark-eco-stair-block water-anim-tomb-dark-eco 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-tomb-dark-eco-stair-block water-anim-tomb-dark-eco water-anim-tomb-dark-eco-stair-block-lod0-jg -1 + ((water-anim-tomb-dark-eco-stair-block-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-dark-eco-raised-block water-anim-tomb-dark-eco 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-tomb-dark-eco-raised-block water-anim-tomb-dark-eco water-anim-tomb-dark-eco-raised-block-lod0-jg -1 + ((water-anim-tomb-dark-eco-raised-block-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-fortress-exitb-pool water-anim-fortress 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-fortress-exitb-pool water-anim-fortress water-anim-fortress-exitb-pool-lod0-jg -1 + ((water-anim-fortress-exitb-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 51) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-main-hall water-anim-tomb 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-tomb-main-hall water-anim-tomb water-anim-tomb-main-hall-lod0-jg -1 + ((water-anim-tomb-main-hall-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 150) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-tunnel-b water-anim-tomb 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-b water-anim-tomb water-anim-tomb-tunnel-b-lod0-jg -1 + ((water-anim-tomb-tunnel-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 36) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-tunnel-c water-anim-tomb 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-c water-anim-tomb water-anim-tomb-tunnel-c-lod0-jg -1 + ((water-anim-tomb-tunnel-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 23) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-tunnel-d water-anim-tomb 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-d water-anim-tomb water-anim-tomb-tunnel-d-lod0-jg -1 + ((water-anim-tomb-tunnel-d-lod0-mg (meters 999999))) :bounds (static-spherem 5 0 5 42) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-tunnel-e water-anim-tomb 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-e water-anim-tomb water-anim-tomb-tunnel-e-lod0-jg -1 + ((water-anim-tomb-tunnel-e-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 37) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-tomb-tunnel-f water-anim-tomb 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-water-anim-tomb-tunnel-f water-anim-tomb water-anim-tomb-tunnel-f-lod0-jg -1 + ((water-anim-tomb-tunnel-f-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 24) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-mincan-exitb-pool water-anim-mincan 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-mincan-exitb-pool water-anim-mincan water-anim-mincan-exitb-pool-lod0-jg -1 + ((water-anim-mincan-exitb-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 55) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-ctypal-lrgsqr-pool water-anim-ctypal 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-lrgsqr-pool water-anim-ctypal water-anim-ctypal-lrgsqr-pool-lod0-jg -1 + ((water-anim-ctypal-lrgsqr-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 24) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-ctypal-smlsqr-pool water-anim-ctypal 2 -1 - ((3 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-smlsqr-pool water-anim-ctypal water-anim-ctypal-smlsqr-pool-lod0-jg -1 + ((water-anim-ctypal-smlsqr-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 11.25) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-ctypal-lrgfloor-pool water-anim-ctypal 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-lrgfloor-pool water-anim-ctypal water-anim-ctypal-lrgfloor-pool-lod0-jg -1 + ((water-anim-ctypal-lrgfloor-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-ctypal-smlground-pool water-anim-ctypal 6 -1 - ((7 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-smlground-pool water-anim-ctypal water-anim-ctypal-smlground-pool-lod0-jg -1 + ((water-anim-ctypal-smlground-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22.5) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-ctypal-middle-fountain water-anim-ctypal 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-middle-fountain water-anim-ctypal water-anim-ctypal-middle-fountain-lod0-jg -1 + ((water-anim-ctypal-middle-fountain-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 22.5) ) ;; failed to figure out what this is: -(defskelgroup skel-water-anim-ctypal-long-grnd-pool water-anim-ctypal 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-water-anim-ctypal-long-grnd-pool water-anim-ctypal water-anim-ctypal-long-grnd-pool-lod0-jg -1 + ((water-anim-ctypal-long-grnd-pool-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 50) ) diff --git a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc index ddab41334a..faab268365 100644 --- a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc @@ -2,8 +2,8 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-task-arrow ctywide-arrow 0 2 - ((1 (meters 999999))) +(defskelgroup skel-task-arrow ctywide-arrow ctywide-arrow-lod0-jg ctywide-arrow-idle-ja + ((ctywide-arrow-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :texture-level 6 ) diff --git a/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc b/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc index 812f65a150..4d728e41f8 100644 --- a/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc @@ -477,10 +477,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-board board 0 5 - ((1 (meters 999999))) +(defskelgroup skel-board board board-lod0-jg board-board-idle-ja + ((board-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.5) - :shadow 2 + :shadow board-shadow-mg :sort 1 :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/engine/target/gun/gun-h_REF.gc b/test/decompiler/reference/jak2/engine/target/gun/gun-h_REF.gc index 74fc8ba8f9..5ae69486f0 100644 --- a/test/decompiler/reference/jak2/engine/target/gun/gun-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/gun/gun-h_REF.gc @@ -533,10 +533,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-gun gun 9 -1 - ((10 (meters 999999))) +(defskelgroup skel-gun gun gun-lod0-jg -1 + ((gun-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1.5) - :shadow 11 + :shadow gun-shadow-mg :sort 1 :origin-joint-index 3 ) @@ -553,40 +553,40 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-ammo-yellow gun 0 8 - ((1 (meters 999999))) +(defskelgroup skel-ammo-yellow gun gun-ammo-yellow-lod0-jg gun-ammo-idle-ja + ((gun-ammo-yellow-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :texture-level 6 :sort 1 ) ;; failed to figure out what this is: -(defskelgroup skel-ammo-red gun 2 8 - ((3 (meters 999999))) +(defskelgroup skel-ammo-red gun gun-ammo-red-lod0-jg gun-ammo-idle-ja + ((gun-ammo-red-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :texture-level 6 :sort 1 ) ;; failed to figure out what this is: -(defskelgroup skel-ammo-blue gun 4 8 - ((5 (meters 999999))) +(defskelgroup skel-ammo-blue gun gun-ammo-blue-lod0-jg gun-ammo-idle-ja + ((gun-ammo-blue-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :texture-level 6 :sort 1 ) ;; failed to figure out what this is: -(defskelgroup skel-ammo-dark gun 6 8 - ((7 (meters 999999))) +(defskelgroup skel-ammo-dark gun gun-ammo-dark-lod0-jg gun-ammo-idle-ja + ((gun-ammo-dark-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :texture-level 6 :sort 1 ) ;; failed to figure out what this is: -(defskelgroup skel-gun-red-cone gun 40 42 - ((41 (meters 999999))) +(defskelgroup skel-gun-red-cone gun gun-red-cone-lod0-jg gun-red-cone-idle-ja + ((gun-red-cone-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :texture-level 6 ) diff --git a/test/decompiler/reference/jak2/engine/target/mech_suit/mech-h_REF.gc b/test/decompiler/reference/jak2/engine/target/mech_suit/mech-h_REF.gc index a27efb3b5a..8d81f164f6 100644 --- a/test/decompiler/reference/jak2/engine/target/mech_suit/mech-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech_suit/mech-h_REF.gc @@ -109,10 +109,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mech mech 0 3 - ((1 (meters 999999))) +(defskelgroup skel-mech mech mech-lod0-jg mech-mech-idle-ja + ((mech-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4.5) - :shadow 2 + :shadow mech-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) @@ -129,8 +129,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mech-explode mech 39 41 - ((40 (meters 999999))) +(defskelgroup skel-mech-explode mech mech-explode-lod0-jg mech-explode-idle-ja + ((mech-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4.5) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/engine/target/mech_suit/mech_REF.gc b/test/decompiler/reference/jak2/engine/target/mech_suit/mech_REF.gc index 032f621c08..b0a204d594 100644 --- a/test/decompiler/reference/jak2/engine/target/mech_suit/mech_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech_suit/mech_REF.gc @@ -161,7 +161,7 @@ :code (behavior () (change-parent self *entity-pool*) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! mech-mech-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid can-ride no-standon)) (set! (-> self root-override penetrated-by) (penetrate)) 0.0 @@ -245,7 +245,7 @@ (case event-type (('draw) (ja-channel-set! 1) - (ja :group! (-> self draw art-group data 3)) + (ja :group! mech-mech-idle-ja) (set! (-> self root-override root-prim prim-core action) (collide-action solid can-ride no-standon)) (set! (-> self root-override penetrated-by) (penetrate)) (transform-post) @@ -451,7 +451,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mech-target mech 42 44 ((43 (meters 999999))) :bounds (static-spherem 0 0 0 4)) +(defskelgroup skel-mech-target mech mech-target-lod0-jg mech-target-idle-ja + ((mech-target-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 4) + ) ;; failed to figure out what this is: (defstate idle (mech-target) @@ -558,7 +561,3 @@ (defun mech-target-spawn ((arg0 vector) (arg1 target) (arg2 quaternion) (arg3 entity-actor)) (process-spawn mech-target :init mech-target-init arg0 arg2 arg3 :to arg1) ) - - - - diff --git a/test/decompiler/reference/jak2/engine/target/mech_suit/target-mech_REF.gc b/test/decompiler/reference/jak2/engine/target/mech_suit/target-mech_REF.gc new file mode 100644 index 0000000000..10c788b74d --- /dev/null +++ b/test/decompiler/reference/jak2/engine/target/mech_suit/target-mech_REF.gc @@ -0,0 +1,1793 @@ +;;-*-Lisp-*- +(in-package goal) + +;; definition for method 15 of type hud-heatmeter +;; WARN: Return type mismatch int vs none. +(defmethod draw hud-heatmeter ((obj hud-heatmeter)) + (set-hud-piece-position! + (the-as hud-sprite (-> obj sprites)) + 256 + (the int (+ 25.0 (* -100.0 (-> obj offset)))) + ) + (set! (-> obj sprites 0 pos z) #xfffff0) + (set-as-offset-from! + (-> obj sprites 1) + (the-as vector4w (-> obj sprites)) + (+ (the int (* 0.128 (the float (-> obj values 0 current)))) -63) + 1 + ) + (set! (-> obj sprites 1 pos z) #xfffff0) + ((method-of-type hud draw) obj) + 0 + (none) + ) + +;; definition for method 16 of type hud-heatmeter +;; WARN: Return type mismatch int vs none. +(defmethod update-values hud-heatmeter ((obj hud-heatmeter)) + (set! (-> obj values 0 target) (the int (* 1000.0 (-> *game-info* distance)))) + (logclear! (-> obj flags) (hud-flags disable)) + ((method-of-type hud update-values) obj) + 0 + (none) + ) + +;; definition for method 17 of type hud-heatmeter +;; WARN: Return type mismatch int vs none. +(defmethod init-callback hud-heatmeter ((obj hud-heatmeter)) + (set! (-> obj gui-id) + (add-process *gui-control* obj (gui-channel hud-upper-center-2) (gui-action hidden) (-> obj name) 81920.0 0) + ) + (logior! (-> obj flags) (hud-flags show)) + (set! (-> obj sprites 0 tex) (lookup-texture-by-id (new 'static 'texture-id :index #x43 :page #x67a))) + (set! (-> obj sprites 0 flags) (the-as uint 8)) + (set! (-> obj sprites 0 scale-x) 1.2) + (set! (-> obj sprites 0 scale-y) 1.2) + (set! (-> obj sprites 1 tex) (lookup-texture-by-id (new 'static 'texture-id :index #x34 :page #x67a))) + (set! (-> obj sprites 1 flags) (the-as uint 8)) + (set! (-> obj sprites 1 scale-x) 1.8) + (set! (-> obj sprites 1 scale-y) 1.8) + 0 + (none) + ) + +;; definition for symbol *mech-stance-mods*, type surface +(define *mech-stance-mods* + (new 'static 'surface + :name 'run + :turnv 18204262.0 + :turnvv 40049.777 + :tiltv 65536.0 + :tiltvv 262144.0 + :fric 0.3 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 4.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :slope-up-traction 1.0 + :turnvf 0.03 + :turnvvf 30.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :mult-hook (lambda :behavior target + ((arg0 surface) (arg1 object) (arg2 surface) (arg3 int)) + (case arg3 + ((1) + (if (= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) + (seek! + (-> self control did-move-to-pole-or-max-jump-height) + 0.0 + (* 127431.11 (-> self clock seconds-per-frame)) + ) + (seek! + (-> self control did-move-to-pole-or-max-jump-height) + (* (-> self control turn-to-magnitude) (-> arg0 turnvv)) + (* 127431.11 (-> self clock seconds-per-frame)) + ) + ) + (set! (-> arg0 turnvv) (-> self control did-move-to-pole-or-max-jump-height)) + (when (= (-> arg2 name) '*edge-surface*) + (set! (-> arg0 target-speed) 32768.0) + (set! (-> arg0 transv-max) 32768.0) + (set! (-> arg0 seek0) (* 1.6666 (-> arg2 seek0))) + (set! (-> arg0 seek90) (* 1.6666 (-> arg2 seek90))) + (set! (-> arg0 seek180) (* 1.6666 (-> arg2 seek180))) + ) + ) + ) + (none) + ) + :flags (surface-flag look-around no-turn-around) + ) + ) + +;; definition for symbol *mech-walk-mods*, type surface +(define *mech-walk-mods* + (new 'static 'surface + :name 'run + :turnv 32768.0 + :turnvv 524288.0 + :tiltv 65536.0 + :tiltvv 262144.0 + :transv-max 32768.0 + :target-speed 32768.0 + :seek0 1.6666 + :seek90 1.6666 + :seek180 1.0 + :fric 0.1 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :turnvf 120.0 + :turnvvf 30.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :vel-turn -1.0 + :mult-hook (lambda :behavior target + ((arg0 surface) (arg1 object) (arg2 surface) (arg3 int)) + (case arg3 + ((1) + (when (= (-> arg2 name) '*edge-surface*) + (let ((v1-5 + (vector-flatten! + (new 'stack-no-clear 'vector) + (vector-negate! (new-stack-vector0) (-> self control dynam gravity-normal)) + (-> self control local-normal) + ) + ) + ) + (set! (-> arg0 vel-turn) 0.0) + (vector+float*! + (-> self control transv) + (-> self control transv) + v1-5 + (* 409600.0 (-> self clock seconds-per-frame)) + ) + ) + ) + ) + ) + (none) + ) + :flags (surface-flag look-around no-turn-around) + ) + ) + +;; definition for symbol *mech-jump-mods*, type surface +(define *mech-jump-mods* (new 'static 'surface + :name 'jump + :turnv 131072.0 + :turnvv 18204.445 + :tiltv 32768.0 + :tiltvv 262144.0 + :transv-max 32768.0 + :target-speed 32768.0 + :seek0 0.3 + :seek90 0.3 + :seek180 0.3 + :fric 0.2 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :turnvf 90.0 + :turnvvf 30.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :mode 'air + :flags (surface-flag no-turn-around air) + ) + ) + +;; definition for symbol *mech-punch-mods*, type surface +(define *mech-punch-mods* (new 'static 'surface + :name 'punch + :turnv 131072.0 + :tiltv 32768.0 + :tiltvv 262144.0 + :transv-max 91750.4 + :target-speed 122880.0 + :seek90 0.5 + :seek180 0.15 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 0.25 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :mode 'attack + :flags (surface-flag no-turn-around turn-to-pad attack) + ) + ) + +;; definition for symbol *mech-pickup-mods*, type surface +(define *mech-pickup-mods* (new 'static 'surface + :name 'run + :turnv 16384.0 + :tiltv 65536.0 + :tiltvv 262144.0 + :transv-max 12288.0 + :target-speed 12288.0 + :seek0 1.0 + :seek90 1.0 + :seek180 1.0 + :fric 0.5 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :turnvf 240.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :vel-turn -1.0 + :flags (surface-flag look-around no-turn-around) + ) + ) + +;; definition for symbol *mech-carry-walk-mods*, type surface +(define *mech-carry-walk-mods* (new 'static 'surface + :name 'run + :turnv 16384.0 + :turnvv 524288.0 + :tiltv 65536.0 + :tiltvv 262144.0 + :transv-max 12288.0 + :target-speed 12288.0 + :seek0 1.0 + :seek90 1.0 + :seek180 1.0 + :fric 0.5 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :turnvf 240.0 + :turnvvf 30.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :vel-turn -1.0 + :flags (surface-flag look-around no-turn-around) + ) + ) + +;; failed to figure out what this is: +(set! (-> *mech-carry-walk-mods* mult-hook) (-> *mech-walk-mods* mult-hook)) + +;; definition for symbol *mech-carry-drag-mods*, type surface +(define *mech-carry-drag-mods* (new 'static 'surface + :name 'run + :tiltv 65536.0 + :tiltvv 262144.0 + :transv-max 12288.0 + :fric 1.0 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :flags (surface-flag look-around no-turn-around) + ) + ) + +;; definition for symbol *mech-carry-jump-mods*, type surface +(define *mech-carry-jump-mods* (new 'static 'surface + :name 'jump + :turnv 131072.0 + :turnvv 18204.445 + :tiltv 32768.0 + :tiltvv 262144.0 + :transv-max 24576.0 + :target-speed 24576.0 + :seek0 0.3 + :seek90 0.3 + :seek180 0.3 + :fric 0.2 + :nonlin-fric-dist 1.0 + :slip-factor 1.0 + :slide-factor 1.0 + :slope-up-factor 1.0 + :slope-down-factor 1.0 + :slope-slip-angle 1.0 + :impact-fric 1.0 + :bend-factor 1.0 + :bend-speed 1.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :turnvf 90.0 + :turnvvf 30.0 + :tiltvf 150.0 + :tiltvvf 15.0 + :mode 'air + :flags (surface-flag air) + ) + ) + +;; definition for function target-mech-falling-anim-trans +;; WARN: Return type mismatch int vs none. +(defbehavior target-mech-falling-anim-trans target () + 0 + (none) + ) + +;; definition for function target-mech-mech-effect +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. +(defbehavior target-mech-mech-effect mech ((arg0 target)) + (when (!= (-> arg0 mech thruster-flame-length) 0.0) + (let ((f30-0 0.0)) + (if (!= (-> *setting-control* user-current under-water-pitch-mod) 0.0) + (set! f30-0 -2.0) + ) + (sound-play-by-name + (static-sound-name "mech-thrust") + (the-as sound-id (-> arg0 mech thrust-sound-id)) + (the int (* 1024.0 (lerp-scale 0.3 1.0 (-> arg0 mech thruster-flame-length) 0.0 4096.0))) + (the int (* 1524.0 f30-0)) + 0 + (sound-group sfx) + #t + ) + ) + (dotimes (s5-1 2) + (let* ((s3-1 (-> self node-list data (if (zero? s5-1) + 37 + 38 + ) + ) + ) + (s4-1 (vector<-cspace! (new 'stack-no-clear 'vector) s3-1)) + (a2-2 (vector-negate! (new 'stack-no-clear 'vector) (-> s3-1 bone transform vector 1))) + ) + (mech-spawn-thruster + (-> arg0 mech) + s4-1 + a2-2 + (-> arg0 mech thruster-flame-width) + (-> arg0 mech thruster-flame-length) + ) + ) + ) + ) + (when (logtest? (water-flags touch-water) (-> arg0 water flags)) + (let ((f30-1 (-> arg0 water height))) + (let ((s5-2 (-> *part-id-table* 947))) + (let ((v1-28 (get-field-spec-by-id s5-2 (sp-field-id spt-userdata)))) + (if v1-28 + (set! (-> v1-28 initial-valuef) f30-1) + ) + ) + (let ((t9-6 sp-launch-particles-var) + (a0-12 *sp-particle-system-2d*) + (a2-3 *launch-matrix*) + ) + (set! (-> a2-3 trans quad) (-> self root-override trans quad)) + (t9-6 a0-12 s5-2 a2-3 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + ) + (let ((s5-3 (-> *part-id-table* 950))) + (let ((v1-34 (get-field-spec-by-id s5-3 (sp-field-id spt-userdata)))) + (if v1-34 + (set! (-> v1-34 initial-valuef) f30-1) + ) + ) + (let ((t9-8 sp-launch-particles-var) + (a0-15 *sp-particle-system-2d*) + (a2-4 *launch-matrix*) + ) + (set! (-> a2-4 trans quad) (-> self root-override trans quad)) + (t9-8 a0-15 s5-3 a2-4 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + ) + (let* ((s5-4 (-> *part-id-table* 953)) + (v1-40 (get-field-spec-by-id s5-4 (sp-field-id spt-userdata))) + (s4-2 (new 'stack-no-clear 'vector)) + ) + (if v1-40 + (set! (-> v1-40 initial-valuef) f30-1) + ) + (let ((s3-2 (get-field-spec-by-id s5-4 (sp-field-id spt-num)))) + (if s3-2 + (set! (-> s3-2 initial-valuef) (lerp-scale 0.1 2.0 (-> arg0 control ctrl-xz-vel) 0.0 40960.0)) + ) + ) + (process-drawable-random-point! self s4-2) + (let ((t9-13 sp-launch-particles-var) + (a0-21 *sp-particle-system-2d*) + (a2-6 *launch-matrix*) + ) + (set! (-> a2-6 trans quad) (-> s4-2 quad)) + (t9-13 a0-21 s5-4 a2-6 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + ) + ) + ) + 0 + (none) + ) + +;; definition for function mech-on-ground? +(defbehavior mech-on-ground? target () + (logtest? (-> self control status) (collide-status on-surface)) + ) + +;; definition for function target-mech-get-off? +(defbehavior target-mech-get-off? target () + (when (and (mech-on-ground?) + (< (-> self mech no-get-off-time) (-> self clock frame-counter)) + (-> *setting-control* user-current pilot-exit) + ) + (let ((gp-0 (new 'stack-no-clear 'collide-query)) + (s4-0 (new 'stack-no-clear 'sphere)) + ) + (dotimes (s5-0 1) + ((method-of-type sphere new) (the-as symbol (+ (the-as uint s4-0) (* s5-0 16))) sphere) + ) + (let ((s5-1 (-> self node-list data 0 bone transform))) + (vector-matrix*! (the-as vector (&-> s4-0 x)) (new 'static 'vector :y 14336.0 :z 12288.0 :w 1.0) s5-1) + (set! (-> s4-0 r) 10240.0) + (let ((v1-11 gp-0)) + (set! (-> v1-11 best-dist) (the-as float s4-0)) + (set! (-> v1-11 num-spheres) (the-as uint 1)) + (set! (-> v1-11 collide-with) (-> self control root-prim prim-core collide-with)) + (set! (-> v1-11 ignore-process0) #f) + (set! (-> v1-11 ignore-process1) #f) + (set! (-> v1-11 ignore-pat) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1 :noendlessfall #x1)) + (set! (-> v1-11 best-my-prim) (the-as collide-shape-prim #t)) + (set! (-> v1-11 action-mask) (collide-action solid)) + ) + (let ((s4-1 (fill-and-probe-using-spheres *collide-cache* gp-0))) + (when (not s4-1) + (vector-matrix*! (-> gp-0 start-pos) (new 'static 'vector :y 8192.0 :z 4096.0 :w 1.0) s5-1) + (set-vector! (-> gp-0 move-dist) 0.0 -40960.0 0.0 0.0) + (let ((v1-15 gp-0)) + (set! (-> v1-15 radius) 409.6) + (set! (-> v1-15 collide-with) (collide-spec backgnd obstacle hit-by-others-list pusher)) + (set! (-> v1-15 ignore-process0) self) + (set! (-> v1-15 ignore-process1) #f) + (set! (-> v1-15 ignore-pat) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1 :noendlessfall #x1)) + (set! (-> v1-15 action-mask) (collide-action solid)) + ) + (set! s4-1 (< (fill-and-probe-using-line-sphere *collide-cache* gp-0) 0.0)) + ) + (if (and s4-1 (-> *setting-control* user-current pilot)) + (talker-spawn-func (-> *talker-speech* 460) *entity-pool* (target-pos 0) (the-as region #f)) + ) + (not s4-1) + ) + ) + ) + ) + ) + +;; definition for function target-mech-handler +;; INFO: Used lq/sq +(defbehavior target-mech-handler target ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + (local-vars (v0-0 object) (a0-18 symbol) (sv-96 target) (sv-112 process)) + (cond + ((and (= arg2 'query) (= (-> arg3 param 0) 'mode)) + 'mech + ) + (else + (case arg2 + (('end-mode) + enter-state + (process->handle arg0) + (go target-mech-get-off) + ) + (('change-mode) + (let ((v1-7 (-> arg3 param 0))) + (cond + ((= v1-7 'grab) + (when (not (logtest? (-> self focus-status) (focus-status dead))) + (if (not (-> arg3 param 1)) + #t + (go target-mech-grab) + ) + ) + ) + ((= v1-7 'normal) + enter-state + (process->handle arg0) + (go target-mech-get-off) + ) + ((begin (set! a0-18 'falling) (= v1-7 a0-18)) + (go target-mech-falling a0-18) + ) + ) + ) + ) + (('swim 'slide 'edge-grab) + #f + ) + (('clone-anim) + (go target-mech-clone-anim (process->handle (the-as process (-> arg3 param 0)))) + ) + (('touched) + (cond + ((logtest? (process-mask crate) (-> arg0 mask)) + (let ((a1-1 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-1 from) (process->ppointer self)) + (set! (-> a1-1 num-params) 2) + (set! (-> a1-1 message) 'attack) + (set! (-> a1-1 param 0) (-> arg3 param 0)) + (let ((v1-25 (new 'static 'attack-info :mask (attack-info-mask mode id penetrate-using)))) + (set! (-> v1-25 id) (-> self mech attack-id)) + (set! (-> v1-25 mode) 'mech) + (set! (-> v1-25 penetrate-using) (-> self control penetrate-using)) + (set! (-> a1-1 param 1) (the-as uint v1-25)) + ) + (set! v0-0 (send-event-function arg0 a1-1)) + ) + (when v0-0 + (let* ((v1-27 (-> self game)) + (a0-39 (+ (-> v1-27 attack-id) 1)) + ) + (set! (-> v1-27 attack-id) a0-39) + (set! (-> self mech attack-id) a0-39) + ) + ) + v0-0 + ) + (else + (target-standard-event-handler arg0 arg1 arg2 arg3) + ) + ) + ) + (('attack 'attack-or-shove 'attack-invinc) + (let ((s3-0 (the-as + attack-info + (mem-copy! (the-as pointer (-> self attack-info-rec)) (the-as pointer (-> arg3 param 1)) 160) + ) + ) + ) + (let ((s2-0 s3-0) + (s1-0 (method-of-type attack-info compute-intersect-info)) + (s0-0 (-> arg3 param 1)) + ) + (set! sv-96 self) + (set! sv-112 arg0) + (let ((a3-2 (if (type? sv-112 process-drawable) + sv-112 + ) + ) + (t0-0 (-> arg3 param 0)) + ) + (s1-0 s2-0 s0-0 sv-96 a3-2 (the-as touching-shapes-entry t0-0)) + ) + ) + (let* ((v1-30 (-> s3-0 mode)) + (f30-0 + (cond + ((= v1-30 'tar) + (set! (-> s3-0 id) (the-as uint 2)) + (* 100.0 (-> self clock seconds-per-frame)) + ) + ((= v1-30 'melt) + (set! (-> s3-0 id) (the-as uint 2)) + (let ((s2-1 (if (logtest? (-> s3-0 mask) (attack-info-mask intersection)) + (-> s3-0 intersection) + (-> self control trans) + ) + ) + ) + (let ((t9-10 sp-launch-particles-var) + (a0-50 *sp-particle-system-2d*) + (a1-5 (-> *part-id-table* 955)) + (a2-8 *launch-matrix*) + ) + (set! (-> a2-8 trans quad) (-> s2-1 quad)) + (t9-10 a0-50 a1-5 a2-8 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-11 sp-launch-particles-var) + (a0-51 *sp-particle-system-2d*) + (a1-6 (-> *part-id-table* 957)) + (a2-9 *launch-matrix*) + ) + (set! (-> a2-9 trans quad) (-> s2-1 quad)) + (t9-11 a0-51 a1-6 a2-9 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + ) + (* 100.0 (-> self clock seconds-per-frame)) + ) + ((or (= v1-30 'burn) (= v1-30 'burnup)) + (set! (-> s3-0 id) (the-as uint 2)) + (if (logtest? (-> s3-0 mask) (attack-info-mask intersection)) + (-> s3-0 intersection) + (-> self control trans) + ) + (let ((t9-12 sp-launch-particles-var) + (a0-55 *sp-particle-system-2d*) + (a1-8 (-> *part-id-table* 955)) + (a2-10 *launch-matrix*) + ) + (set! (-> a2-10 trans quad) (-> self control trans quad)) + (t9-12 a0-55 a1-8 a2-10 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-13 sp-launch-particles-var) + (a0-56 *sp-particle-system-2d*) + (a1-9 (-> *part-id-table* 957)) + (a2-11 *launch-matrix*) + ) + (set! (-> a2-11 trans quad) (-> self control trans quad)) + (t9-13 a0-56 a1-9 a2-11 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (* 20.0 (-> self clock seconds-per-frame)) + ) + ((= v1-30 'shock) + (let ((s2-2 (if (logtest? (-> s3-0 mask) (attack-info-mask intersection)) + (-> s3-0 intersection) + (-> self control trans) + ) + ) + ) + (let ((t9-14 sp-launch-particles-var) + (a0-58 *sp-particle-system-2d*) + (a1-10 (-> *part-id-table* 959)) + (a2-12 *launch-matrix*) + ) + (set! (-> a2-12 trans quad) (-> s2-2 quad)) + (t9-14 a0-58 a1-10 a2-12 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-15 sp-launch-particles-var) + (a0-59 *sp-particle-system-2d*) + (a1-11 (-> *part-id-table* 960)) + (a2-13 *launch-matrix*) + ) + (set! (-> a2-13 trans quad) (-> s2-2 quad)) + (t9-15 a0-59 a1-11 a2-13 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + ) + (set! (-> s3-0 id) (the-as uint 2)) + (* 20.0 (-> self clock seconds-per-frame)) + ) + ((= v1-30 'explode) + 20.0 + ) + ((= v1-30 'grunt) + 1.0 + ) + ((= v1-30 'air) + 100.0 + ) + ((or (= v1-30 'endlessfall) (= v1-30 'crush) (= v1-30 'instant-death)) + 100.0 + ) + (else + 3.0 + ) + ) + ) + ) + (when (target-log-attack s3-0 'background) + (case arg2 + (('attack 'attack-or-shove 'attack-invinc) + (if (not (or (logtest? (-> self state-flags) (state-flags sf2)) + (logtest? (-> self game secrets) (game-secrets invulnerable)) + ) + ) + (seek! (-> self mech shield-value) 0.0 f30-0) + ) + ) + ) + (if (and (= arg2 'attack-or-shove) (< 0.0 (-> self mech shield-value))) + (set! arg2 'shove) + ) + (if (= arg2 'attack-invinc) + (set! (-> self mech shield-value) 0.0) + ) + (if (or (= (-> self mech shield-value) 0.0) (= arg2 'shove)) + (target-attacked arg2 s3-0 arg0 (the-as touching-shapes-entry (-> arg3 param 0)) target-mech-hit) + 'block + ) + ) + ) + ) + ) + (('shove) + (when (not (logtest? (-> self focus-status) (focus-status dead hit))) + (mem-copy! (the-as pointer (-> self attack-info-rec)) (the-as pointer (-> arg3 param 1)) 160) + (when (not (logtest? (-> self attack-info-rec mask) (attack-info-mask attacker))) + (set! (-> self attack-info-rec attacker) (process->handle arg0)) + (logior! (-> self attack-info-rec mask) (attack-info-mask attacker)) + ) + (go target-mech-hit 'shove (-> self attack-info-rec)) + ) + ) + (('effect-control) + (case (-> arg3 param 0) + (('target-mech-walk) + (sound-play-by-name + (static-sound-name "mech-walk") + (new-sound-id) + 1024 + (the int (* 1524.0 (lerp-scale -0.2 0.0 (-> self control ctrl-xz-vel) 12288.0 32768.0))) + 0 + (sound-group sfx) + #t + ) + ) + ) + ) + (('target-mech-get-off) + (set! v0-0 (+ (-> self clock frame-counter) (the-as time-frame (-> arg3 param 0)))) + (set! (-> self mech no-get-off-time) (the-as time-frame v0-0)) + v0-0 + ) + (else + (target-standard-event-handler arg0 arg1 arg2 arg3) + ) + ) + ) + ) + ) + +;; definition for function target-mech-bonk-event-handler +;; INFO: Used lq/sq +;; WARN: Return type mismatch symbol vs object. +(defbehavior target-mech-bonk-event-handler target ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + (let ((s4-0 (new 'stack-no-clear 'vector))) + (the-as + object + (when (and (= arg2 'touched) + ((method-of-type touching-shapes-entry prims-touching?) + (the-as touching-shapes-entry (-> arg3 param 0)) + (-> self control) + (the-as uint 6) + ) + (>= 409.6 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) + (begin + (vector-normalize! + (vector-! + s4-0 + (the-as vector (-> self control collision-spheres 0 prim-core)) + (-> self control actor-contact-pt) + ) + 1.0 + ) + (< 0.01 (-> s4-0 y)) + ) + ) + (if (< 0.75 (-> s4-0 y)) + (send-event + arg0 + 'bonk + (-> arg3 param 0) + (fmax + (-> self control ground-impact-vel) + (- (vector-dot (-> self control transv) (-> self control dynam gravity-normal))) + ) + ) + ) + (when (and (= (target-send-attack + arg0 + 'bonk + (the-as touching-shapes-entry (-> arg3 param 0)) + (the-as int (-> self control target-attack-id)) + (the-as int (-> self control attack-count)) + (penetrate touch bonk mech-bonk) + ) + 'bounce + ) + (zero? (logand (-> self focus-status) (focus-status dead hit))) + ) + (set! (-> self control last-trans-any-surf quad) (-> self control trans quad)) + (target-timed-invulnerable (seconds 0.1) self 1) + (cond + ((logtest? (focus-status carry) (-> self focus-status)) + enter-state + (let ((a0-19 (-> *TARGET-bank* mech-carry-jump-height-min)) + (a1-8 (-> *TARGET-bank* mech-carry-jump-height-max)) + ) + (go target-mech-carry-jump a0-19 a1-8) + ) + ) + (else + (go + target-mech-jump + (-> *TARGET-bank* mech-jump-height-min) + (-> *TARGET-bank* mech-jump-height-max) + (the-as surface #f) + ) + ) + ) + ) + #f + ) + ) + ) + ) + +;; definition for function mech-leg-ik-callback +;; INFO: Used lq/sq +;; WARN: Return type mismatch none vs object. +(defbehavior mech-leg-ik-callback target ((arg0 joint-mod-ik) (arg1 matrix) (arg2 matrix) (arg3 vector)) + (rlet ((acc :class vf) + (vf0 :class vf) + (vf4 :class vf) + (vf5 :class vf) + (vf6 :class vf) + (vf7 :class vf) + ) + (init-vf0-vector) + (let ((s5-0 (new 'stack-no-clear 'vector))) + (set! (-> s5-0 quad) (-> arg3 quad)) + (let ((f0-1 (- (-> arg3 y) (-> (target-pos 0) y)))) + (if (< 6144.0 f0-1) + (set! f0-1 6144.0) + ) + (if (< f0-1 -6144.0) + (set! f0-1 -6144.0) + ) + (+! (-> arg0 user-position y) f0-1) + ) + (let ((f0-4 (- (-> arg3 y) (-> arg0 user-position y)))) + (seek! (-> arg0 user-float) f0-4 (* 40960.0 (-> self clock seconds-per-frame))) + ) + (let* ((f28-0 (-> arg0 user-float)) + (f30-1 (lerp-scale 1.0 0.0 f28-0 0.0 12288.0)) + (s3-0 (new 'stack-no-clear 'vector)) + ) + (let ((v1-12 s5-0)) + (let ((a0-4 *up-vector*)) + (let ((a1-4 8192.0)) + (.mov vf7 a1-4) + ) + (.lvf vf5 (&-> a0-4 quad)) + ) + (.lvf vf4 (&-> v1-12 quad)) + ) + (.add.x.vf vf6 vf0 vf0 :mask #b1000) + (.mul.x.vf acc vf5 vf7 :mask #b111) + (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) + (.svf (&-> s3-0 quad) vf6) + (vector-float*! (new 'stack-no-clear 'vector) *up-vector* -16384.0) + (let ((s2-0 (new 'stack-no-clear 'vector))) + 0.0 + (let ((f0-11 (intersect-ray-plane s3-0 *up-vector* (-> arg0 user-position) *up-vector*)) + (a0-7 s2-0) + ) + (let ((v1-15 *up-vector*)) + (let ((a1-7 f0-11)) + (.mov vf7 a1-7) + ) + (.lvf vf5 (&-> v1-15 quad)) + ) + (.lvf vf4 (&-> s3-0 quad)) + (.add.x.vf vf6 vf0 vf0 :mask #b1000) + (.mul.x.vf acc vf5 vf7 :mask #b111) + (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) + (.svf (&-> a0-7 quad) vf6) + ) + (let ((a0-8 s2-0)) + (let ((v1-16 *up-vector*)) + (let ((a1-8 (- f28-0))) + (.mov vf7 a1-8) + ) + (.lvf vf5 (&-> v1-16 quad)) + ) + (.lvf vf4 (&-> arg3 quad)) + (.add.x.vf vf6 vf0 vf0 :mask #b1000) + (.mul.x.vf acc vf5 vf7 :mask #b111) + (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) + (.svf (&-> a0-8 quad) vf6) + ) + (let ((a1-9 s5-0)) + (let ((v1-17 s5-0)) + (let ((a0-10 (vector-! (new 'stack-no-clear 'vector) s2-0 s5-0))) + (let ((a2-6 (fmin 1.0 (* (-> arg0 user-blend) f30-1)))) + (.mov vf7 a2-6) + ) + (.lvf vf5 (&-> a0-10 quad)) + ) + (.lvf vf4 (&-> v1-17 quad)) + ) + (.add.x.vf vf6 vf0 vf0 :mask #b1000) + (.mul.x.vf acc vf5 vf7 :mask #b111) + (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) + (.svf (&-> a1-9 quad) vf6) + ) + ) + ) + (the-as object (handle-copy! arg0 s5-0)) + ) + ) + ) + +;; definition for function mech-update-ik +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. +(defbehavior mech-update-ik target () + (local-vars (sv-720 vector)) + (rlet ((acc :class vf) + (vf0 :class vf) + (vf4 :class vf) + (vf5 :class vf) + (vf6 :class vf) + (vf7 :class vf) + ) + (init-vf0-vector) + (let ((gp-0 (new 'stack-no-clear 'collide-query)) + (s5-0 (-> (the-as process-drawable (-> self parent 0)) root)) + ) + (let ((a1-0 (-> gp-0 bbox)) + (v1-2 (-> s5-0 trans)) + (a0-0 (new 'stack-no-clear 'vector)) + ) + (set! (-> a0-0 x) 10240.0) + (set! (-> a0-0 y) 10240.0) + (set! (-> a0-0 z) 10240.0) + (set! (-> a0-0 w) 1.0) + (vector-! (the-as vector a1-0) v1-2 a0-0) + ) + (let ((a1-2 (-> gp-0 bbox max)) + (v1-3 (-> s5-0 trans)) + (a0-1 (new 'stack-no-clear 'vector)) + ) + (set! (-> a0-1 x) 10240.0) + (set! (-> a0-1 y) 10240.0) + (set! (-> a0-1 z) 10240.0) + (set! (-> a0-1 w) 1.0) + (vector+! a1-2 v1-3 a0-1) + ) + (set! (-> gp-0 collide-with) (-> (the-as collide-shape-moving s5-0) root-prim prim-core collide-with)) + (set! (-> gp-0 ignore-process0) #f) + (set! (-> gp-0 ignore-process1) #f) + (set! (-> gp-0 ignore-pat) (-> (the-as collide-shape-moving s5-0) pat-ignore-mask)) + (fill-using-bounding-box *collide-cache* gp-0) + (dotimes (s4-0 2) + (let ((s3-0 (-> (the-as (array joint-mod-ik) (+ (* s4-0 4) (the-as int self))) 64))) + #t + (set! (-> s3-0 callback) mech-leg-ik-callback) + (-> s3-0 shoulder-matrix-no-ik) + (let ((v1-13 (-> s3-0 elbow-matrix-no-ik)) + (s0-0 (new 'stack-no-clear 'vector)) + ) + (set! sv-720 (new 'stack-no-clear 'vector)) + (let ((a0-5 (-> *y-vector* quad))) + (set! (-> sv-720 quad) a0-5) + ) + (let ((s2-0 (new 'stack-no-clear 'vector))) + (new 'stack-no-clear 'vector) + (new 'stack-no-clear 'vector) + (let ((s1-0 (new 'stack-no-clear 'vector))) + (let ((a1-6 s0-0)) + (let ((a0-8 (-> v1-13 trans))) + (let ((v1-14 (-> v1-13 vector 1))) + (let ((a2-8 (-> s3-0 hand-dist))) + (.mov vf7 a2-8) + ) + (.lvf vf5 (&-> v1-14 quad)) + ) + (.lvf vf4 (&-> a0-8 quad)) + ) + (.add.x.vf vf6 vf0 vf0 :mask #b1000) + (.mul.x.vf acc vf5 vf7 :mask #b111) + (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) + (.svf (&-> a1-6 quad) vf6) + ) + (let ((f0-11 + (lerp-scale 1.0 0.0 (- (-> s0-0 y) (-> (the-as collide-shape-moving s5-0) gspot-pos y)) 2048.0 12288.0) + ) + ) + (seek! (-> s3-0 user-blend) f0-11 (* 4.0 (-> self clock seconds-per-frame))) + ) + (let ((a1-9 (-> gp-0 start-pos))) + (let ((v1-18 s0-0)) + (let ((a0-11 sv-720)) + (let ((a2-12 6144.0)) + (.mov vf7 a2-12) + ) + (.lvf vf5 (&-> a0-11 quad)) + ) + (.lvf vf4 (&-> v1-18 quad)) + ) + (.add.x.vf vf6 vf0 vf0 :mask #b1000) + (.mul.x.vf acc vf5 vf7 :mask #b111) + (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) + (.svf (&-> a1-9 quad) vf6) + ) + (let ((v1-19 (-> gp-0 move-dist)) + (f0-16 -20480.0) + ) + (vector-float*! v1-19 sv-720 f0-16) + ) + (let ((v1-21 gp-0)) + (set! (-> v1-21 radius) 4.096) + (set! (-> v1-21 collide-with) (-> gp-0 collide-with)) + (set! (-> v1-21 ignore-process0) #f) + (set! (-> v1-21 ignore-process1) #f) + (set! (-> v1-21 ignore-pat) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1 :noendlessfall #x1)) + (set! (-> v1-21 action-mask) (collide-action solid)) + ) + (let ((f30-0 (probe-using-line-sphere *collide-cache* gp-0))) + (cond + ((>= f30-0 0.0) + (set! (-> s1-0 quad) (-> gp-0 best-other-tri normal quad)) + (when (< 8192.0 (vector-vector-angle-safe *y-vector* s1-0)) + (let* ((a1-14 (vector-normalize! (vector-cross! (new 'stack-no-clear 'vector) *y-vector* s1-0) 1.0)) + (a2-14 (quaternion-vector-angle! (new 'stack-no-clear 'quaternion) a1-14 8192.0)) + ) + (vector-orient-by-quat! s1-0 *y-vector* a2-14) + ) + ) + (let ((a1-16 s2-0)) + (let ((v1-28 (-> gp-0 start-pos))) + (let ((a0-26 (-> gp-0 move-dist))) + (let ((a2-15 f30-0)) + (.mov vf7 a2-15) + ) + (.lvf vf5 (&-> a0-26 quad)) + ) + (.lvf vf4 (&-> v1-28 quad)) + ) + (.add.x.vf vf6 vf0 vf0 :mask #b1000) + (.mul.x.vf acc vf5 vf7 :mask #b111) + (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) + (.svf (&-> a1-16 quad) vf6) + ) + (set! (-> s3-0 user-position quad) (-> s2-0 quad)) + (set! (-> s3-0 user-normal quad) (-> s1-0 quad)) + ) + (else + (set! (-> s0-0 y) (-> (target-pos 0) y)) + (set! (-> s3-0 user-position quad) (-> s0-0 quad)) + (set! (-> s3-0 user-normal quad) (-> *y-vector* quad)) + ) + ) + ) + ) + ) + ) + ) + ) + ) + 0 + (none) + ) + ) + +;; definition for function target-mech-init +;; INFO: Used lq/sq +;; WARN: Return type mismatch object vs none. +(defbehavior target-mech-init target ((arg0 handle) (arg1 float) (arg2 symbol)) + (local-vars + (sv-96 (function vector entity-actor skeleton-group vector object none :behavior manipy)) + (sv-112 vector) + (sv-128 entity-actor) + ) + (target-gun-end-mode #f) + (target-exit) + (when (zero? (-> self mech)) + (set! (-> self mech) (new 'process 'mech-info)) + (set! (-> self mech hud 0) (the-as uint #f)) + (set! (-> self mech engine-sound-id) (the-as uint (new-sound-id))) + (set! (-> self mech thrust-sound-id) (the-as uint (new-sound-id))) + (set! (-> self mech drag-sound-id) (the-as uint (new-sound-id))) + (set! (-> self mech whine-sound-id) (the-as uint (new-sound-id))) + ) + (set! (-> self board latch?) #f) + (set! (-> self mech stick-lock) #f) + (set! (-> self mech stick-off) #f) + (set! (-> self mech unstuck-time) (-> self clock frame-counter)) + (set! (-> self mech stuck-count) 0) + (set! (-> self mech mech-start-time) (-> self clock frame-counter)) + (set! (-> self mech jump-thrust) 0.0) + (set! (-> self mech jump-thrust-fuel) (-> *TARGET-bank* mech-jump-thrust-fuel)) + (set! (-> self mech state-impact? 0) #f) + ((method-of-type impact-control initialize) + (the-as impact-control (-> self mech state-impact)) + self + -1 + 0.0 + (collide-spec) + ) + (set! (-> self mech shield-max) 100.0) + (set! (-> self mech shield-value) arg1) + (set! (-> self mech entity) #f) + (let ((v1-27 (handle->process arg0))) + (if v1-27 + (set! (-> self mech entity) (-> v1-27 entity)) + ) + ) + (let ((v1-30 (-> self mech))) + (set! (-> v1-30 particle-system-2d) *sp-particle-system-2d*) + (set! (-> v1-30 particle-system-3d) *sp-particle-system-3d*) + (set! (-> v1-30 part-quat) *particle-quat*) + (set! (-> v1-30 part-vel) *particle-vel*) + (set! (-> v1-30 part-thruster) (-> *part-id-table* 939)) + (set! (-> v1-30 part-thruster-scale-x) (-> *part-id-table* 939 init-specs 4)) + (set! (-> v1-30 part-thruster-scale-y) (-> *part-id-table* 939 init-specs 5)) + (set! (-> v1-30 thruster-flame-width) 0.0) + (set! (-> v1-30 thruster-flame-length) 0.0) + ) + (set! (-> self control reaction) target-collision-reaction) + (set! (-> self control transv quad) (the-as uint128 0)) + (set! (-> self control ctrl-xz-vel) 0.0) + (set! (-> self focus-status) (logior (focus-status mech) (-> self focus-status))) + (set! (-> self control bend-target) 0.0) + (let ((v1-40 (-> self node-list data))) + (set! (-> v1-40 0 param0) (the-as (function cspace matrix none) cspace<-transformq+world-trans!)) + (set! (-> v1-40 0 param1) (the-as basic (-> self control trans))) + (set! (-> v1-40 0 param2) (the-as basic (-> self control cspace-offset))) + ) + (target-collide-set! 'mech 0.0) + (set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :nomech #x1)) + (set! (-> self draw shadow) #f) + (let ((s4-1 (-> self entity)) + (s3-0 (-> self level)) + ) + (process-entity-set! self (the-as entity-actor (-> self mech entity))) + (let ((s2-0 (get-process *16k-dead-pool* manipy #x4000))) + (set! (-> self manipy) + (the-as + (pointer manipy) + (when s2-0 + (let ((t9-11 (method-of-type manipy activate))) + (t9-11 (the-as manipy s2-0) self (symbol->string (-> manipy symbol)) (the-as pointer #x70004000)) + ) + (let ((s1-0 run-function-in-process) + (s0-0 s2-0) + ) + (set! sv-96 manipy-init) + (set! sv-112 (-> self control trans)) + (set! sv-128 (-> self entity)) + (let ((t0-1 (art-group-get-by-name *level* "skel-mech" (the-as (pointer uint32) #f))) + (t1-0 #f) + (t2-0 0) + ) + ((the-as (function object object object object object object object none) s1-0) + s0-0 + sv-96 + sv-112 + sv-128 + t0-1 + t1-0 + t2-0 + ) + ) + ) + (-> s2-0 ppointer) + ) + ) + ) + ) + (set! (-> self entity) s4-1) + (set! (-> self level) s3-0) + ) + (when (-> self manipy) + (send-event + (ppointer->process (-> self manipy)) + 'trans-hook + (lambda :behavior target + () + (let* ((a0-0 (-> self parent)) + (v1-0 (if a0-0 + (-> (the-as (pointer target) a0-0) 0 self-override) + ) + ) + ) + (set! (-> self control trans quad) (-> v1-0 mech mech-trans quad)) + (let ((a0-4 (-> v1-0 mech mech-quat quad))) + (set! (-> self control quat quad) a0-4) + ) + (set! (-> self control scale quad) (-> v1-0 mech mech-scale quad)) + (set! (-> self draw light-index) (-> v1-0 draw light-index)) + (let ((a0-10 (-> v1-0 draw color-mult quad))) + (set! (-> self draw color-mult quad) a0-10) + ) + (let ((a0-12 (-> v1-0 draw color-emissive quad))) + (set! (-> self draw color-emissive quad) a0-12) + ) + (let ((v1-4 (-> v1-0 draw shadow-ctrl settings shadow-dir quad))) + (set! (-> self draw shadow-ctrl settings shadow-dir quad) v1-4) + ) + ) + (dotimes (gp-0 2) + (enable-set! (-> self mech-ik gp-0) #t) + ) + (none) + ) + ) + (send-event + (ppointer->process (-> self manipy)) + 'post-hook + (lambda :behavior mech + () + (let ((gp-0 (ppointer->process (-> self parent)))) + ((method-of-type impact-control update-from-cspace) + (the-as impact-control (-> (the-as target gp-0) mech state-impact)) + ) + (when (-> (the-as target gp-0) mech state-impact? 0) + (let ((a1-0 (new 'stack-no-clear 'collide-query))) + ((method-of-type impact-control impact-control-method-11) + (the-as impact-control (-> (the-as target gp-0) mech state-impact)) + a1-0 + (the-as process gp-0) + (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1 :noendlessfall #x1) + ) + ) + ) + (mech-update-ik) + (target-mech-mech-effect (the-as target gp-0)) + ) + (none) + ) + ) + (send-event (ppointer->process (-> self manipy)) 'anim-mode 'clone-anim) + (send-event (ppointer->process (-> self manipy)) 'sync #t) + (send-event + (ppointer->process (-> self manipy)) + 'eval + (lambda :behavior target + () + (set! (-> self state-hook) #f) + (set! (-> self draw shadow-ctrl) *mech-shadow-control*) + (set! (-> self mech-ik 0) (new 'process 'joint-mod-ik self 27 5283.84)) + (set! (-> self mech-ik 1) (new 'process 'joint-mod-ik self 33 5283.84)) + (dotimes (v1-3 2) + (let ((a0-5 (-> (the-as (array joint-mod-ik) (+ (* v1-3 4) (the-as int self))) 64))) + (set! (-> a0-5 elbow-pole-vector-axis) (the-as uint 2)) + (set! (-> a0-5 elbow-rotation-axis) (the-as uint 0)) + (set! (-> a0-5 callback) mech-leg-ik-callback) + (logior! (-> a0-5 flags) (joint-mod-ik-flags elbow-trans-neg)) + ) + ) + (none) + ) + ) + ) + (logior! (-> self state-flags) (state-flags sf6)) + (set-setting! 'string-max-length 'low #x46e00000 0) + (set-setting! 'string-min-length 'low #x46800000 0) + (set-setting! 'string-max-height 'low #x46a00000 0) + (set-setting! 'string-min-height 'low #x46600000 0) + (set-setting! 'fov 'abs #x46555555 0) + (set-setting! 'head-offset 'abs #x46900000 0) + (set-setting! 'mode-sound-bank 'mech 0 0) + (set-setting! 'sound-flava #f #x41f00000 3) + (set! (-> self mech hud 0) + (the-as uint (ppointer->handle (process-spawn hud-heatmeter :init hud-init-by-other :to self))) + ) + (remove-exit) + (if arg2 + (go target-mech-stance) + (go target-mech-get-on arg0) + ) + (none) + ) + +;; definition for function target-mech-exit +;; INFO: Used lq/sq +(defbehavior target-mech-exit target () + (when (not (and (-> self next-state) (let ((v1-3 (-> self next-state name))) + (or (= v1-3 'target-mech-stance) + (= v1-3 'target-mech-walk) + (= v1-3 'target-mech-jump) + (= v1-3 'target-mech-jump-jump) + (= v1-3 'target-mech-falling) + (= v1-3 'target-mech-hit-ground) + (= v1-3 'target-mech-punch) + (= v1-3 'target-mech-hit) + (= v1-3 'target-mech-death) + (= v1-3 'target-mech-carry-drag) + (= v1-3 'target-mech-carry-pickup) + (= v1-3 'target-mech-carry-drop) + (= v1-3 'target-mech-carry-stance) + (= v1-3 'target-mech-carry-walk) + (= v1-3 'target-mech-carry-jump) + (= v1-3 'target-mech-carry-falling) + (= v1-3 'target-mech-carry-hit-ground) + (= v1-3 'target-mech-carry-throw) + (= v1-3 'target-mech-get-off) + (= v1-3 'target-mech-get-off-jump) + (= v1-3 'target-mech-grab) + (= v1-3 'target-mech-clone-anim) + ) + ) + ) + ) + (let ((v1-4 (-> self manipy))) + (when v1-4 + (deactivate (-> v1-4 0)) + (set! (-> self manipy) (the-as (pointer manipy) #f)) + ) + ) + (logclear! (-> self focus-status) (focus-status mech)) + (logclear! (-> self control root-prim prim-core action) (collide-action stuck-wall-escape)) + (set! (-> self control mod-surface) *walk-mods*) + (logclear! (-> self state-flags) (state-flags sf6)) + (remove-setting! 'string-max-length) + (remove-setting! 'string-min-length) + (remove-setting! 'string-max-height) + (remove-setting! 'string-min-height) + (remove-setting! 'fov) + (remove-setting! 'head-offset) + (remove-setting! 'mode-sound-bank) + (remove-setting! 'sound-flava) + (set! (-> self control dynam gravity-max) (-> self control standard-dynamics gravity-max)) + (set! (-> self control dynam gravity-length) (-> self control standard-dynamics gravity-length)) + (let ((v1-39 (-> self node-list data))) + (set! (-> v1-39 0 param0) (the-as (function cspace matrix none) cspace<-transformq+trans!)) + (set! (-> v1-39 0 param1) (the-as basic (-> self control trans))) + (set! (-> v1-39 0 param2) (the-as basic (-> self control cspace-offset))) + ) + (target-collide-set! 'normal 0.0) + (set! (-> self control reaction) target-collision-reaction) + (set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :nojak #x1 :probe #x1)) + (sound-stop (the-as sound-id (-> self mech engine-sound-id))) + (sound-stop (the-as sound-id (-> self mech thrust-sound-id))) + (sound-stop (the-as sound-id (-> self mech drag-sound-id))) + (sound-stop (the-as sound-id (-> self mech whine-sound-id))) + (send-event (handle->process (-> self mech hud 0)) 'hide-and-die) + (set! (-> self draw shadow) (-> self shadow-backup)) + (set! (-> self control cspace-offset quad) (the-as uint128 0)) + (remove-setting! 'sound-flava) + (target-exit) + ) + (none) + ) + +;; definition for function target-mech-effect +;; WARN: Return type mismatch int vs none. +(defbehavior target-mech-effect target () + (sound-play "mech-pulse" :id (the-as sound-id (-> self mech engine-sound-id))) + (set! (-> self game distance) (/ (-> self mech shield-value) (-> self mech shield-max))) + 0 + (none) + ) + +;; definition for function target-mech-add-thrust +;; INFO: Used lq/sq +;; WARN: Return type mismatch symbol vs none. +(defbehavior target-mech-add-thrust target () + (let ((s5-0 (-> self control target-transv)) + (gp-0 (-> self control transv-ctrl)) + ) + (set! (-> (new 'stack-no-clear 'vector) quad) (-> self control target-transv quad)) + (target-bend-vel-turn gp-0) + (target-add-slide-factor s5-0) + (let ((t9-2 vector-xz-normalize!) + (a0-5 (new-stack-vector0)) + ) + (set! (-> a0-5 quad) (-> s5-0 quad)) + (let ((s4-0 (t9-2 a0-5 1.0))) + (let ((t9-3 vector-xz-normalize!) + (a0-6 (new-stack-vector0)) + ) + (set! (-> a0-6 quad) (-> gp-0 quad)) + (let ((v1-7 (t9-3 a0-6 1.0))) + (set! (-> s4-0 y) 0.0) + (set! (-> v1-7 y) 0.0) + ) + ) + (let* ((f0-2 (-> s4-0 z)) + (v1-8 gp-0) + (f1-4 (sqrtf (+ (* (-> v1-8 x) (-> v1-8 x)) (* (-> v1-8 z) (-> v1-8 z))))) + (v1-10 s5-0) + (f0-11 + (cond + ((>= f1-4 (sqrtf (+ (* (-> v1-10 x) (-> v1-10 x)) (* (-> v1-10 z) (-> v1-10 z))))) + (let ((f0-3 (-> self control current-surface fric)) + (f1-5 1.0) + (v1-15 gp-0) + ) + (* f0-3 (fmax f1-5 (/ (sqrtf (+ (* (-> v1-15 x) (-> v1-15 x)) (* (-> v1-15 z) (-> v1-15 z)))) + (-> self control current-surface nonlin-fric-dist) + ) + ) + ) + ) + ) + ((>= f0-2 0.0) + (+ (* f0-2 (-> self control current-surface seek0)) (* (- 1.0 f0-2) (-> self control current-surface seek90))) + ) + (else + (+ (* (fabs f0-2) (-> self control current-surface seek180)) + (* (+ 1.0 f0-2) (-> self control current-surface seek90)) + ) + ) + ) + ) + (s4-1 vector-xz-normalize!) + (s3-0 gp-0) + (t9-4 seek) + (v1-30 gp-0) + ) + (s4-1 s3-0 (t9-4 + (sqrtf (+ (* (-> v1-30 x) (-> v1-30 x)) (* (-> v1-30 z) (-> v1-30 z)))) + (sqrtf (+ (* (-> s5-0 x) (-> s5-0 x)) (* (-> s5-0 z) (-> s5-0 z)))) + (* f0-11 (-> self clock seconds-per-frame)) + ) + ) + ) + ) + ) + (set! (-> self control velocity-after-thrust) (vector-length gp-0)) + ) + (let ((gp-1 (new-stack-vector0))) + (vector-matrix*! gp-1 (-> self control transv-ctrl) (-> self control c-R-w)) + (vector-float*! gp-1 gp-1 0.5) + (vector+! gp-1 gp-1 (-> self control trans)) + (add-debug-text-sphere + *display-target-marks* + (bucket-id debug-no-zbuf1) + gp-1 + (meters 0.2) + "ltransv" + (new 'static 'rgba :g #xff :a #x80) + ) + ) + (none) + ) + +;; definition for function target-mech-collision +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. +(defbehavior target-mech-collision target () + (cond + ((and (-> self next-state) (= (-> self next-state name) 'target-mech-carry-drag)) + (let ((s5-0 (new 'stack-no-clear 'vector)) + (gp-0 (new 'stack-no-clear 'vector)) + ) + (let ((a1-0 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-0 from) (process->ppointer self)) + (set! (-> a1-0 num-params) 2) + (set! (-> a1-0 message) 'move) + (set! (-> a1-0 param 0) (the-as uint (-> self control transv))) + (set! (-> a1-0 param 1) (the-as uint s5-0)) + (let ((s3-0 (send-event-function (handle->process (-> self carry other)) a1-0)) + (s4-0 (new 'stack-no-clear 'vector)) + ) + (set! (-> s4-0 quad) (-> self control trans quad)) + (set! (-> (new 'stack-no-clear 'vector) quad) (-> self control transv quad)) + (let ((a2-1 (new 'stack-no-clear 'collide-query)) + (v1-18 (-> self control)) + ) + (set! (-> a2-1 collide-with) (-> v1-18 root-prim prim-core collide-with)) + (set! (-> a2-1 ignore-process0) self) + (set! (-> a2-1 ignore-process1) #f) + (set! (-> a2-1 ignore-pat) (-> v1-18 pat-ignore-mask)) + (set! (-> a2-1 action-mask) (collide-action solid)) + (fill-cache-integrate-and-collide v1-18 (-> v1-18 transv) a2-1 (meters 1)) + ) + (vector-! gp-0 (-> self control trans) s4-0) + (let* ((s2-0 (-> self control dynam gravity-normal)) + (f30-0 (- (vector-dot s2-0 gp-0) (vector-dot s2-0 s5-0))) + (a1-4 (new 'stack-no-clear 'event-message-block)) + ) + (set! (-> a1-4 from) (process->ppointer self)) + (set! (-> a1-4 num-params) 0) + (set! (-> a1-4 message) 'carry-info) + (let* ((s1-0 (the-as carry-info (send-event-function (handle->process (-> self carry other)) a1-4))) + (f0-2 (distance-from-destination (-> self carry) s1-0)) + ) + (cond + ((not s3-0) + ) + ((>= f0-2 0.0) + (let ((v1-38 (vector-float*! (new 'stack-no-clear 'vector) s2-0 f30-0))) + (vector+! (-> s1-0 hold-trans) (-> s1-0 hold-trans) v1-38) + ) + (let ((v1-39 (new-stack-vector0))) + (let ((f0-4 (vector-dot (-> self control dynam gravity-normal) s5-0))) + 0.0 + (vector-! v1-39 s5-0 (vector-float*! v1-39 (-> self control dynam gravity-normal) f0-4)) + ) + (let ((f0-5 (vector-length v1-39))) + f0-5 + (let ((f0-6 f0-5) + (v1-42 (new-stack-vector0)) + ) + (let ((f1-6 (vector-dot (-> self control dynam gravity-normal) gp-0))) + 0.0 + (vector-! v1-42 gp-0 (vector-float*! v1-42 (-> self control dynam gravity-normal) f1-6)) + ) + (let ((f1-7 (vector-length v1-42))) + f1-7 + (when (< f0-6 f1-7) + (let ((v1-46 (new-stack-vector0)) + (f0-8 (vector-dot (-> self control dynam gravity-normal) gp-0)) + ) + 0.0 + (vector-! v1-46 gp-0 (vector-float*! v1-46 (-> self control dynam gravity-normal) f0-8)) + (let ((f1-11 (vector-length v1-46)) + (a0-43 (new-stack-vector0)) + ) + (let ((f2-3 (vector-dot (-> self control dynam gravity-normal) s5-0))) + 0.0 + (vector-! a0-43 s5-0 (vector-float*! a0-43 (-> self control dynam gravity-normal) f2-3)) + ) + (let ((f2-4 (vector-length a0-43))) + f2-4 + (let ((f2-5 f2-4)) + (vector+! + gp-0 + (vector-float*! gp-0 (-> self control dynam gravity-normal) f0-8) + (vector-float*! v1-46 v1-46 (/ f2-5 f1-11)) + ) + ) + ) + ) + ) + (let ((a1-25 (vector+! (new 'stack-no-clear 'vector) s4-0 gp-0))) + (move-to-point! (-> self control) a1-25) + ) + ) + ) + ) + ) + ) + ) + (else + (send-event self 'drop 150) + ) + ) + ) + ) + ) + ) + ) + ) + (else + (when *debug-segment* + (let ((gp-1 (-> *display* frames (-> *display* on-screen) profile-array data 0)) + (v1-61 'target) + (s5-1 *profile-target-color*) + ) + (when (and *dproc* *debug-segment*) + (let ((s4-1 (-> gp-1 data (-> gp-1 count)))) + (let ((s3-1 (-> gp-1 base-time))) + (set! (-> s4-1 name) v1-61) + (set! (-> s4-1 start-time) (the-as int (- (timer-count (the-as timer-bank #x10000800)) (the-as uint s3-1)))) + ) + (set! (-> s4-1 depth) (the-as uint (-> gp-1 depth))) + (set! (-> s4-1 color) s5-1) + (set! (-> gp-1 segment (-> gp-1 depth)) s4-1) + ) + (+! (-> gp-1 count) 1) + (+! (-> gp-1 depth) 1) + (set! (-> gp-1 max-depth) (max (-> gp-1 max-depth) (-> gp-1 depth))) + ) + ) + 0 + ) + (let ((a2-17 (new 'stack-no-clear 'collide-query)) + (v1-74 (-> self control)) + ) + (set! (-> a2-17 collide-with) (-> v1-74 root-prim prim-core collide-with)) + (set! (-> a2-17 ignore-process0) self) + (set! (-> a2-17 ignore-process1) #f) + (set! (-> a2-17 ignore-pat) (-> v1-74 pat-ignore-mask)) + (set! (-> a2-17 action-mask) (collide-action solid)) + (fill-cache-integrate-and-collide v1-74 (-> v1-74 transv) a2-17 (meters 1)) + ) + (when *debug-segment* + (let ((gp-2 (-> *display* frames (-> *display* on-screen) profile-array data 0))) + (when (and *dproc* *debug-segment*) + (let* ((v1-87 (+ (-> gp-2 depth) -1)) + (s5-2 (-> gp-2 segment v1-87)) + (s4-2 (-> gp-2 base-time)) + ) + (when (>= v1-87 0) + (set! (-> s5-2 end-time) (the-as int (- (timer-count (the-as timer-bank #x10000800)) (the-as uint s4-2)))) + (+! (-> gp-2 depth) -1) + ) + ) + ) + ) + 0 + ) + ) + ) + (when (logtest? (-> self control status) (collide-status touch-wall)) + (let ((v1-98 (vector-! (new 'stack-no-clear 'vector) (-> self control wall-contact-pt) (-> self control trans)))) + (set! (-> v1-98 y) 0.0) + (when (< (vector-dot v1-98 (-> self control c-R-w vector 2)) 0.0) + (set! (-> self mech back-touch-time) (-> self clock frame-counter)) + (set! (-> self mech back-touch-point quad) (-> self control wall-contact-pt quad)) + (set! (-> self mech back-touch-trans quad) (-> self control trans quad)) + ) + ) + ) + 0 + (none) + ) + +;; definition for function target-mech-real-post +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. +(defbehavior target-mech-real-post target () + (let ((f30-0 (-> self clock clock-ratio))) + (let ((gp-1 (max 1 (the int (-> self clock time-adjust-ratio))))) + (update-rates! (-> self clock) (/ f30-0 (the float gp-1))) + (while (nonzero? gp-1) + (+! gp-1 -1) + (set! (-> self control remaining-ctrl-iterations) gp-1) + (flag-setup) + (if (< (-> self control force-turn-to-strength) 0.0) + (set! (-> self control force-turn-to-strength) (- 1.0 (-> self control cpad stick0-speed))) + ) + (build-conversions (-> self control transv)) + (do-rotations1) + (let ((s5-0 (new-stack-vector0))) + (read-pad s5-0) + (let ((f28-0 (-> self control pad-magnitude))) + (if (or (and (< 0.0 f28-0) + (< 0.3 (-> self control pad-magnitude)) + (< (vector-dot (-> self control pad-xz-dir) (-> self control last-pad-xz-dir)) 0.2) + (< f28-0 0.7) + ) + (-> self mech stick-off) + ) + (set! f28-0 0.0) + ) + (when (!= (-> self control force-turn-to-strength) 0.0) + (let ((f0-15 (fmin 1.0 (-> self control force-turn-to-strength)))) + (set! (-> self control force-turn-to-strength) f0-15) + (let ((a1-2 (vector-float*! + (new 'stack-no-clear 'vector) + (if (= f28-0 0.0) + *zero-vector* + s5-0 + ) + f28-0 + ) + ) + (a2-1 (vector-float*! + (new 'stack-no-clear 'vector) + (-> self control force-turn-to-direction) + (-> self control force-turn-to-speed) + ) + ) + ) + (vector-lerp! s5-0 a1-2 a2-1 f0-15) + ) + ) + (set! f28-0 (vector-length s5-0)) + (vector-normalize! s5-0 1.0) + ) + (turn-to-vector s5-0 f28-0) + ) + ) + (cond + ((and (logtest? (-> self control mod-surface flags) (surface-flag air)) + (zero? (logand (-> self control status) (collide-status on-surface))) + ) + (add-thrust) + ) + (else + (let* ((v1-51 (-> self control target-transv)) + (f0-20 (sqrtf (+ (* (-> v1-51 x) (-> v1-51 x)) (* (-> v1-51 z) (-> v1-51 z))))) + ) + (set-vector! (-> self control target-transv) 0.0 0.0 f0-20 1.0) + ) + (target-mech-add-thrust) + ) + ) + (add-gravity) + (do-rotations2) + (reverse-conversions (-> self control transv)) + (pre-collide-setup) + (target-mech-collision) + (bend-gravity) + (post-flag-setup) + ) + ) + (update-rates! (-> self clock) f30-0) + ) + (when *debug-segment* + (let ((gp-2 (-> *display* frames (-> *display* on-screen) profile-array data 0)) + (v1-68 'target-post) + (s5-1 *profile-target-post-color*) + ) + (when (and *dproc* *debug-segment*) + (let ((s4-0 (-> gp-2 data (-> gp-2 count)))) + (let ((s3-0 (-> gp-2 base-time))) + (set! (-> s4-0 name) v1-68) + (set! (-> s4-0 start-time) (the-as int (- (timer-count (the-as timer-bank #x10000800)) (the-as uint s3-0)))) + ) + (set! (-> s4-0 depth) (the-as uint (-> gp-2 depth))) + (set! (-> s4-0 color) s5-1) + (set! (-> gp-2 segment (-> gp-2 depth)) s4-0) + ) + (+! (-> gp-2 count) 1) + (+! (-> gp-2 depth) 1) + (set! (-> gp-2 max-depth) (max (-> gp-2 max-depth) (-> gp-2 depth))) + ) + ) + 0 + ) + (ja-post) + (when *debug-segment* + (let ((gp-3 (-> *display* frames (-> *display* on-screen) profile-array data 0))) + (when (and *dproc* *debug-segment*) + (let* ((v1-92 (+ (-> gp-3 depth) -1)) + (s5-2 (-> gp-3 segment v1-92)) + (s4-1 (-> gp-3 base-time)) + ) + (when (>= v1-92 0) + (set! (-> s5-2 end-time) (the-as int (- (timer-count (the-as timer-bank #x10000800)) (the-as uint s4-1)))) + (+! (-> gp-3 depth) -1) + ) + ) + ) + ) + 0 + ) + (joint-points) + (do-target-gspot) + (target-powerup-process) + (vector+! (-> self mech mech-trans) (-> self control trans) (-> self control cspace-offset)) + (quaternion-copy! (the-as quaternion (-> self mech mech-quat)) (-> self control quat)) + (set! (-> self mech mech-scale quad) (-> self control scale quad)) + (vector+! (-> self alt-cam-pos) (-> self control camera-pos) (new 'static 'vector :y 4096.0 :w 1.0)) + (set! (-> self mech mech-time) (-> self clock frame-counter)) + (target-mech-effect) + 0 + (none) + ) + +;; definition for function target-mech-post +(defbehavior target-mech-post target () + (target-mech-real-post) + (none) + ) + + + + diff --git a/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc b/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc index 6a5fb31b39..67280e7928 100644 --- a/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc @@ -2,11 +2,11 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-sidekick daxter 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-sidekick daxter daxter-lod0-jg -1 + ((daxter-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) :longest-edge (meters 1) - :shadow 3 + :shadow daxter-shadow-mg :texture-level 6 :sort 1 :origin-joint-index 6 @@ -14,11 +14,11 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-sidekick-highres daxter-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-sidekick-highres daxter-highres daxter-highres-lod0-jg -1 + ((daxter-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) :longest-edge (meters 1) - :shadow 2 + :shadow daxter-highres-shadow-mg :sort 1 :origin-joint-index 6 :shadow-joint-index 6 diff --git a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc index eaeda596e7..5356caa293 100644 --- a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc @@ -2,11 +2,11 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-jchar jakb 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jchar jakb jakb-lod0-jg -1 + ((jakb-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) - :shadow 2 + :shadow jakb-shadow-mg :texture-level 6 :sort 1 :origin-joint-index 3 @@ -25,35 +25,35 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-jak-highres jak-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jak-highres jak-highres jak-highres-lod0-jg -1 + ((jak-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) - :shadow 2 + :shadow jak-highres-shadow-mg :sort 1 :origin-joint-index 3 :shadow-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-generic-blast collectables 10 12 - ((11 (meters 999999))) +(defskelgroup skel-generic-blast collectables collectables-generic-blast-lod0-jg collectables-generic-blast-idle-ja + ((collectables-generic-blast-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 50) :texture-level 6 :sort 4 ) ;; failed to figure out what this is: -(defskelgroup skel-generic-ripples collectables 13 15 - ((14 (meters 999999))) +(defskelgroup skel-generic-ripples collectables collectables-generic-ripples-lod0-jg collectables-generic-ripples-idle-ja + ((collectables-generic-ripples-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 6) :texture-level 6 :sort 4 ) ;; failed to figure out what this is: -(defskelgroup skel-bomb-blast collectables 0 2 - ((1 (meters 999999))) +(defskelgroup skel-bomb-blast collectables collectables-bomb-blast-lod0-jg collectables-bomb-blast-idle-ja + ((collectables-bomb-blast-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 50) :texture-level 6 :sort 4 diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc index 3329554fd5..00b1ace19b 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc @@ -2,10 +2,16 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-hud-ring hud-ring 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 55)) +(defskelgroup skel-hud-ring hud-ring hud-ring-lod0-jg hud-ring-idle-ja + ((hud-ring-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 55) + ) ;; failed to figure out what this is: -(defskelgroup skel-hud-ring-part hud-ring 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 55)) +(defskelgroup skel-hud-ring-part hud-ring hud-ring-part-lod0-jg hud-ring-part-idle-ja + ((hud-ring-part-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 55) + ) ;; definition for symbol *main-options*, type menu-option-list (define *main-options* diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc index 5f1905e394..0c161ba0ad 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc @@ -1722,13 +1722,22 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-atoll-tank-a atoll-tank 0 -1 ((1 (meters 999999))) :bounds (static-spherem 30 -15 13 82)) +(defskelgroup skel-atoll-tank-a atoll-tank atoll-tank-a-lod0-jg -1 + ((atoll-tank-a-lod0-mg (meters 999999))) + :bounds (static-spherem 30 -15 13 82) + ) ;; failed to figure out what this is: -(defskelgroup skel-atoll-tank-b atoll-tank 4 -1 ((5 (meters 999999))) :bounds (static-spherem 0 -15 -5 82)) +(defskelgroup skel-atoll-tank-b atoll-tank atoll-tank-b-lod0-jg -1 + ((atoll-tank-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 -15 -5 82) + ) ;; failed to figure out what this is: -(defskelgroup skel-atoll-tank-c atoll-tank 8 -1 ((9 (meters 999999))) :bounds (static-spherem 30 -15 26 82)) +(defskelgroup skel-atoll-tank-c atoll-tank atoll-tank-c-lod0-jg -1 + ((atoll-tank-c-lod0-mg (meters 999999))) + :bounds (static-spherem 30 -15 26 82) + ) ;; failed to figure out what this is: (scene-method-16 diff --git a/test/decompiler/reference/jak2/levels/castle/boss/castle-scenes_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/castle-scenes_REF.gc index 880df5eea2..287243de67 100644 --- a/test/decompiler/reference/jak2/levels/castle/boss/castle-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/boss/castle-scenes_REF.gc @@ -468,10 +468,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-movie-hellcat hellcat 0 5 - ((1 (meters 20)) (2 (meters 40)) (3 (meters 999999))) +(defskelgroup skel-movie-hellcat hellcat hellcat-lod0-jg hellcat-idle-ja + ((hellcat-lod0-mg (meters 20)) (hellcat-lod1-mg (meters 40)) (hellcat-lod2-mg (meters 999999))) :bounds (static-spherem 0 0 0 6.6) - :shadow 4 + :shadow hellcat-shadow-mg :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc b/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc index ad1832ba62..48c7991f6c 100644 --- a/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc @@ -485,8 +485,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-seal-of-mar-top seal-of-mar-top 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-seal-of-mar-top seal-of-mar-top seal-of-mar-top-lod0-jg -1 + ((seal-of-mar-top-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/city/kid_escort/crocesc-h_REF.gc b/test/decompiler/reference/jak2/levels/city/kid_escort/crocesc-h_REF.gc index e2d690b5f7..d6d11e0ce9 100644 --- a/test/decompiler/reference/jak2/levels/city/kid_escort/crocesc-h_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kid_escort/crocesc-h_REF.gc @@ -52,10 +52,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-crocadog-escort crocadog-escort 0 3 - ((1 (meters 999999))) +(defskelgroup skel-crocadog-escort crocadog-escort crocadog-escort-lod0-jg crocadog-escort-idle-pant-ja + ((crocadog-escort-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) - :shadow 2 + :shadow crocadog-escort-shadow-mg :origin-joint-index 20 ) diff --git a/test/decompiler/reference/jak2/levels/city/kid_escort/kidesc-h_REF.gc b/test/decompiler/reference/jak2/levels/city/kid_escort/kidesc-h_REF.gc index 366d2378d5..879786f1b3 100644 --- a/test/decompiler/reference/jak2/levels/city/kid_escort/kidesc-h_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kid_escort/kidesc-h_REF.gc @@ -51,10 +51,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-kid-escort kid-escort 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kid-escort kid-escort kid-escort-lod0-jg kid-escort-idle0-ja + ((kid-escort-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) - :shadow 2 + :shadow kid-escort-shadow-mg :origin-joint-index 13 ) diff --git a/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc index 7283319eff..bb91b69ea9 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc @@ -1127,8 +1127,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-market-basket-a market-basket-a 0 2 - ((1 (meters 999999))) +(defskelgroup skel-market-basket-a market-basket-a market-basket-a-lod0-jg market-basket-a-idle-ja + ((market-basket-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 0 2.5) ) @@ -1218,7 +1218,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-market-basket-b market-basket-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 2)) +(defskelgroup skel-market-basket-b market-basket-b market-basket-b-lod0-jg market-basket-b-idle-ja + ((market-basket-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 2) + ) ;; definition of type market-basket-b (deftype market-basket-b (market-object) @@ -1306,7 +1309,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-market-crate market-crate 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 2)) +(defskelgroup skel-market-crate market-crate market-crate-lod0-jg market-crate-idle-ja + ((market-crate-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 2) + ) ;; definition of type market-crate (deftype market-crate (market-object) @@ -1394,7 +1400,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-market-sack-a market-sack-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1 0 2)) +(defskelgroup skel-market-sack-a market-sack-a market-sack-a-lod0-jg market-sack-a-idle-ja + ((market-sack-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1 0 2) + ) ;; definition of type market-sack-a (deftype market-sack-a (market-object) @@ -1482,7 +1491,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-market-sack-b market-sack-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1 0 2)) +(defskelgroup skel-market-sack-b market-sack-b market-sack-b-lod0-jg market-sack-b-idle-ja + ((market-sack-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1 0 2) + ) ;; definition of type market-sack-b (deftype market-sack-b (market-object) diff --git a/test/decompiler/reference/jak2/levels/city/misc/collection_task/collection-task_REF.gc b/test/decompiler/reference/jak2/levels/city/misc/collection_task/collection-task_REF.gc index 7837755719..bfc21a2560 100644 --- a/test/decompiler/reference/jak2/levels/city/misc/collection_task/collection-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/misc/collection_task/collection-task_REF.gc @@ -45,10 +45,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-krew-collection-item krew-moneybag 0 3 - ((1 (meters 999999))) +(defskelgroup skel-krew-collection-item krew-moneybag krew-moneybag-lod0-jg krew-moneybag-idle-ja + ((krew-moneybag-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) - :shadow 2 + :shadow krew-moneybag-shadow-mg ) ;; definition of type krew-collection-item @@ -404,7 +404,3 @@ (the-as object (talker-spawn-func (-> *talker-speech* 88) *entity-pool* (target-pos 0) (the-as region #f))) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc b/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc index e62ea4eb78..43cc7356ca 100644 --- a/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc @@ -531,8 +531,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-son-of-particleman son-of-particleman 0 2 - ((1 (meters 200))) +(defskelgroup skel-son-of-particleman son-of-particleman son-of-particleman-lod0-jg son-of-particleman-idle-ja + ((son-of-particleman-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/common/airlock_REF.gc b/test/decompiler/reference/jak2/levels/common/airlock_REF.gc index c009e6f466..00d1392b62 100644 --- a/test/decompiler/reference/jak2/levels/common/airlock_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/airlock_REF.gc @@ -410,14 +410,14 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-com-airlock-outer com-airlock-outer 0 2 - ((1 (meters 999999))) +(defskelgroup skel-com-airlock-outer com-airlock-outer com-airlock-outer-lod0-jg com-airlock-outer-idle-ja + ((com-airlock-outer-lod0-mg (meters 999999))) :bounds (static-spherem 0 5 0 14) ) ;; failed to figure out what this is: -(defskelgroup skel-com-airlock-inner com-airlock-inner 0 2 - ((1 (meters 999999))) +(defskelgroup skel-com-airlock-inner com-airlock-inner com-airlock-inner-lod0-jg com-airlock-inner-idle-ja + ((com-airlock-inner-lod0-mg (meters 999999))) :bounds (static-spherem 0 5 0 14) ) @@ -1038,8 +1038,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-fort-entry-gate fort-entry-gate 0 2 - ((1 (meters 999999))) +(defskelgroup skel-fort-entry-gate fort-entry-gate fort-entry-gate-lod0-jg fort-entry-gate-idle-ja + ((fort-entry-gate-lod0-mg (meters 999999))) :bounds (static-spherem 0 3 0 10) ) @@ -1114,7 +1114,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-hip-door-a hip-door-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 2 0 5)) +(defskelgroup skel-hip-door-a hip-door-a hip-door-a-lod0-jg hip-door-a-idle-ja + ((hip-door-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 2 0 5) + ) ;; definition of type hip-door-a (deftype hip-door-a (com-airlock) @@ -1188,8 +1191,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-tomb-mar-door tomb-mar-door 0 2 - ((1 (meters 999999))) +(defskelgroup skel-tomb-mar-door tomb-mar-door tomb-mar-door-lod0-jg tomb-mar-door-idle-ja + ((tomb-mar-door-lod0-mg (meters 999999))) :bounds (static-spherem 0 6 0 18) :origin-joint-index 3 ) @@ -1274,8 +1277,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-pal-throne-door pal-throne-door 0 2 - ((1 (meters 999999))) +(defskelgroup skel-pal-throne-door pal-throne-door pal-throne-door-lod0-jg pal-throne-door-idle-ja + ((pal-throne-door-lod0-mg (meters 999999))) :bounds (static-spherem 0 6 0 24) :origin-joint-index 3 ) @@ -1429,7 +1432,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-under-door hip-door-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 2 0 5)) +(defskelgroup skel-under-door hip-door-a hip-door-a-lod0-jg hip-door-a-idle-ja + ((hip-door-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 2 0 5) + ) ;; definition of type under-door (deftype under-door (com-airlock) diff --git a/test/decompiler/reference/jak2/levels/common/cty-guard-turret-button_REF.gc b/test/decompiler/reference/jak2/levels/common/cty-guard-turret-button_REF.gc index bbd9eded99..fc00192ac7 100644 --- a/test/decompiler/reference/jak2/levels/common/cty-guard-turret-button_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/cty-guard-turret-button_REF.gc @@ -2,8 +2,8 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-cty-guard-turret-button cty-guard-turret-button 0 2 - ((1 (meters 999999))) +(defskelgroup skel-cty-guard-turret-button cty-guard-turret-button cty-guard-turret-button-lod0-jg cty-guard-turret-button-idle-ja + ((cty-guard-turret-button-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) ) @@ -124,15 +124,18 @@ (defstate pop-up (cty-guard-turret-button) :virtual #t :code (behavior () - (ja-no-eval :group! (-> self draw art-group data 3) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1)) 0.4) + (ja-no-eval :group! cty-guard-turret-button-pop-up-ja + :num! (seek! + (the float (+ (-> (the-as art-joint-anim cty-guard-turret-button-pop-up-ja) frames num-frames) -1)) + 0.4 + ) :frame-num 0.0 ) (until (ja-done? 0) (suspend) (ja :num! (seek! max 0.4)) ) - (ja :group! (-> self draw art-group data 2) :num! min) + (ja :group! cty-guard-turret-button-idle-ja :num! min) (go-virtual up-idle) (none) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc index 8e51b1c92e..cd98b584bf 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc @@ -2,10 +2,10 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-fodder fodder 0 -1 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-fodder fodder fodder-lod0-jg -1 + ((fodder-lod0-mg (meters 20)) (fodder-lod1-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) - :shadow 3 + :shadow fodder-shadow-mg :origin-joint-index 12 ) @@ -440,11 +440,8 @@ (until (not #f) (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) - (ja-no-eval :group! (-> self draw art-group data 4) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) frames num-frames) -1)) - f30-0 - ) + (ja-no-eval :group! fodder-idle-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-idle-ja) frames num-frames) -1)) f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -455,11 +452,8 @@ (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.25)) (dotimes (gp-0 (rand-vu-int-range 4 7)) - (ja-no-eval :group! (-> self draw art-group data 6) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 6)) frames num-frames) -1)) - f30-0 - ) + (ja-no-eval :group! fodder-chew-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim fodder-chew-ja) frames num-frames) -1)) f30-0) :frame-num 0.0 ) (until (ja-done? 0) @@ -719,7 +713,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info-override hostile-anim))) ) ((= v1-55 1) - (ja :group! (-> self draw art-group data 10)) + (ja :group! fodder-jump-chomp-ja) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-64 *game-info*) (a0-30 (+ (-> v1-64 attack-id) 1)) @@ -729,7 +723,7 @@ ) ) (else - (ja :group! (-> self draw art-group data 11)) + (ja :group! fodder-jump-kick-ja) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-70 *game-info*) (a0-35 (+ (-> v1-70 attack-id) 1)) @@ -817,7 +811,7 @@ (when (and (< f30-0 (* f0-20 f0-20)) (>= (- (-> self clock frame-counter) (-> self look-at-other-time)) (seconds 0.125)) ) - (let ((v1-117 (ja-channel-float! (the-as art-joint-anim (-> self draw art-group data 15)) 0.0 0.0 0.0))) + (let ((v1-117 (ja-channel-float! (the-as art-joint-anim fodder-snap-ja) 0.0 0.0 0.0))) (when v1-117 (set! (-> self skel interp-select 0) #xe00010) (set! (-> self skel interp-select 1) 0) diff --git a/test/decompiler/reference/jak2/levels/common/flitter_REF.gc b/test/decompiler/reference/jak2/levels/common/flitter_REF.gc index 29cf19bc65..566b99f97e 100644 --- a/test/decompiler/reference/jak2/levels/common/flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/flitter_REF.gc @@ -432,10 +432,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-flitter flitter 0 -1 - ((1 (meters 20)) (2 (meters 40)) (3 (meters 999999))) +(defskelgroup skel-flitter flitter flitter-lod0-jg -1 + ((flitter-lod0-mg (meters 20)) (flitter-lod1-mg (meters 40)) (flitter-lod2-mg (meters 999999))) :bounds (static-spherem 0 0 0 5.5) - :shadow 4 + :shadow flitter-shadow-mg :origin-joint-index 3 ) @@ -780,8 +780,8 @@ ) :code (behavior () (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 10) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1))) + (ja-no-eval :group! flitter-ambush-jump-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-jump-ja) frames num-frames) -1))) ) (until #f (when (< (-> self base-height) (-> self root-override2 trans y)) @@ -855,8 +855,8 @@ ) #f (label cfg-26) - (ja-no-eval :group! (-> self draw art-group data 11) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1))) + (ja-no-eval :group! flitter-ambush-land-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-land-ja) frames num-frames) -1))) :frame-num 0.0 ) (until (ja-done? 0) @@ -1029,7 +1029,7 @@ 0 (ja-no-eval :num! (loop!)) (ja-channel-push! 1 (seconds 0.2)) - (ja :group! (-> self draw art-group data 15)) + (ja :group! flitter-turn-ja) (ja :num-func num-func-identity :frame-num 0.0) (until (enemy-method-96 self 1820.4445 #t) (ja-blend-eval) @@ -1304,17 +1304,17 @@ :code (behavior () (ja-channel-push! 2 (seconds 0.1)) (let ((f30-0 (flitter-method-183 self))) - (ja-no-eval :group! (-> self draw art-group data 16) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1)) 0.8) + (ja-no-eval :group! flitter-attack-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-attack-ja) frames num-frames) -1)) 0.8) :frame-num 0.0 ) (let ((a0-3 (-> self skel root-channel 1))) (set! (-> a0-3 frame-interp 1) f30-0) (set! (-> a0-3 frame-interp 0) f30-0) - (set! (-> a0-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 17))) + (set! (-> a0-3 frame-group) (the-as art-joint-anim flitter-attack-high-ja)) (set! (-> a0-3 param 0) 0.0) (set! (-> a0-3 frame-num) 0.0) - (joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 17)) num-func-chan) + (joint-control-channel-group! a0-3 (the-as art-joint-anim flitter-attack-high-ja) num-func-chan) ) (until (ja-done? 0) (suspend) @@ -1339,8 +1339,8 @@ (logclear! (-> self focus-status) (focus-status dangerous)) ) (dotimes (gp-1 (get-rand-int self 3)) - (ja-no-eval :group! (-> self draw art-group data 5) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1))) + (ja-no-eval :group! flitter-idle-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-idle-ja) frames num-frames) -1))) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/common/grunt_REF.gc b/test/decompiler/reference/jak2/levels/common/grunt_REF.gc index b0436602ef..f276d8fafe 100644 --- a/test/decompiler/reference/jak2/levels/common/grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/grunt_REF.gc @@ -2,10 +2,10 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-grunt grunt 0 -1 - ((1 (meters 20)) (2 (meters 40)) (3 (meters 999999))) +(defskelgroup skel-grunt grunt grunt-lod0-jg -1 + ((grunt-lod0-mg (meters 20)) (grunt-lod1-mg (meters 40)) (grunt-lod2-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 4 + :shadow grunt-shadow-mg :origin-joint-index 18 ) @@ -590,17 +590,10 @@ :virtual #t :code (behavior () (let ((v1-2 (ja-group))) - (when (or (and v1-2 (or (= v1-2 (-> self draw art-group data 14)) - (= v1-2 (-> self draw art-group data 15)) - (= v1-2 (-> self draw art-group data 16)) - ) - ) + (when (or (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja))) (let ((v1-8 (ja-group))) - (and v1-8 (or (= v1-8 (-> self draw art-group data 11)) - (= v1-8 (-> self draw art-group data 12)) - (= v1-8 (-> self draw art-group data 14)) - (= v1-8 (-> self draw art-group data 15)) - ) + (and v1-8 + (or (= v1-8 grunt-patrol0-ja) (= v1-8 grunt-patrol1-ja) (= v1-8 grunt-charge0-ja) (= v1-8 grunt-charge1-ja)) ) ) ) @@ -814,11 +807,7 @@ ) :code (behavior () (let ((v1-2 (ja-group))) - (when (and v1-2 (or (= v1-2 (-> self draw art-group data 14)) - (= v1-2 (-> self draw art-group data 15)) - (= v1-2 (-> self draw art-group data 16)) - ) - ) + (when (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja))) (let ((v1-6 (-> self nav))) (set! (-> v1-6 target-speed) (-> self charge-anim travel-speed)) ) @@ -1061,11 +1050,7 @@ :virtual #t :code (behavior () (let ((v1-2 (ja-group))) - (when (and v1-2 (or (= v1-2 (-> self draw art-group data 14)) - (= v1-2 (-> self draw art-group data 15)) - (= v1-2 (-> self draw art-group data 16)) - ) - ) + (when (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja))) (let ((v1-6 (-> self nav))) (set! (-> v1-6 target-speed) (-> self charge-anim travel-speed)) ) @@ -1138,27 +1123,21 @@ 0 (vector-reset! (-> self root-override2 transv)) (let ((v1-77 (ja-group))) - (if (not (and v1-77 (= v1-77 (-> self draw art-group data 30)))) + (if (not (and v1-77 (= v1-77 grunt-celebrate-start-ja))) (ja-channel-push! 1 (seconds 0.1)) ) ) (let ((f30-2 (get-rand-float-range self 0.9 1.1))) - (ja-no-eval :group! (-> self draw art-group data 30) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1)) - f30-2 - ) + (ja-no-eval :group! grunt-celebrate-start-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-start-ja) frames num-frames) -1)) f30-2) :frame-num 0.0 ) (until (ja-done? 0) (suspend) (ja :num! (seek! max f30-2)) ) - (ja-no-eval :group! (-> self draw art-group data 31) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) frames num-frames) -1)) - f30-2 - ) + (ja-no-eval :group! grunt-celebrate-finish-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-finish-ja) frames num-frames) -1)) f30-2) :frame-num 0.0 ) (until (ja-done? 0) @@ -1178,11 +1157,7 @@ :virtual #t :code (behavior () (let ((v1-2 (ja-group))) - (when (and v1-2 (or (= v1-2 (-> self draw art-group data 14)) - (= v1-2 (-> self draw art-group data 15)) - (= v1-2 (-> self draw art-group data 16)) - ) - ) + (when (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja))) (let ((v1-6 (-> self nav))) (set! (-> v1-6 target-speed) (-> self charge-anim travel-speed)) ) diff --git a/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc b/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc index 43198077d3..30b05a8155 100644 --- a/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc @@ -741,8 +741,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-vehicle-grenade eco-canister 0 2 - ((1 (meters 999999))) +(defskelgroup skel-vehicle-grenade eco-canister eco-canister-dark-lod0-jg eco-canister-dark-idle-ja + ((eco-canister-dark-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.3) :texture-level 6 ) diff --git a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc index aa60c7d008..f0148b7241 100644 --- a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc @@ -2,22 +2,22 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-scenecamera scenecamera 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-scenecamera scenecamera scenecamera-lod0-jg -1 + ((scenecamera-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :texture-level 6 ) ;; failed to figure out what this is: -(defskelgroup skel-particleman particleman 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-particleman particleman particleman-lod0-jg -1 + ((particleman-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-jakone-highres jakone-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jakone-highres jakone-highres jakone-highres-lod0-jg -1 + ((jakone-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) :sort 1 @@ -26,8 +26,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-darkjak-highres darkjak-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-darkjak-highres darkjak-highres darkjak-highres-lod0-jg -1 + ((darkjak-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) :sort 1 @@ -36,239 +36,239 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-jak-highres-prison jak-highres-prison 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jak-highres-prison jak-highres-prison jak-highres-prison-lod0-jg -1 + ((jak-highres-prison-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :longest-edge (meters 1) - :shadow 2 + :shadow jak-highres-prison-shadow-mg :sort 1 :origin-joint-index 3 :shadow-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-youngsamos-highres youngsamos-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-youngsamos-highres youngsamos-highres youngsamos-highres-lod0-jg youngsamos-highres-idle-ja + ((youngsamos-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) - :shadow 2 + :shadow youngsamos-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-samos-highres samos-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-samos-highres samos-highres samos-highres-lod0-jg samos-highres-idle-ja + ((samos-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) - :shadow 2 + :shadow samos-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-kor-highres kor-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kor-highres kor-highres kor-highres-lod0-jg kor-highres-idle-ja + ((kor-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow kor-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-metalkor-highres metalkor-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-metalkor-highres metalkor-highres metalkor-highres-lod0-jg metalkor-highres-idle-ja + ((metalkor-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 2 8) - :shadow 2 + :shadow metalkor-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-metalkor-highres-lowtorso metalkor-highres 7 10 - ((8 (meters 999999))) +(defskelgroup skel-metalkor-highres-lowtorso metalkor-highres metalkor-highres-lowtorso-lod0-jg metalkor-highres-lowtorso-idle-ja + ((metalkor-highres-lowtorso-lod0-mg (meters 999999))) :bounds (static-spherem 0 -9 -12 22) - :shadow 9 + :shadow metalkor-highres-lowtorso-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-metalkor-highres-legs metalkor-highres 14 17 - ((15 (meters 999999))) +(defskelgroup skel-metalkor-highres-legs metalkor-highres metalkor-highres-legs-lod0-jg metalkor-highres-legs-idle-ja + ((metalkor-highres-legs-lod0-mg (meters 999999))) :bounds (static-spherem 0 -9 2 15) - :shadow 16 + :shadow metalkor-highres-legs-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-metalkor-highres-wings metalkor-highres 21 24 - ((22 (meters 999999))) +(defskelgroup skel-metalkor-highres-wings metalkor-highres metalkor-highres-wings-lod0-jg metalkor-highres-wings-idle-ja + ((metalkor-highres-wings-lod0-mg (meters 999999))) :bounds (static-spherem 0 8 -5 20) - :shadow 23 + :shadow metalkor-highres-wings-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-kor-transform kor-transform 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kor-transform kor-transform kor-transform-lod0-jg kor-transform-idle-ja + ((kor-transform-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 2 8) - :shadow 2 + :shadow kor-transform-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-kor-transform-monsterparts kor-transform 5 8 - ((6 (meters 999999))) +(defskelgroup skel-kor-transform-monsterparts kor-transform kor-transform-monsterparts-lod0-jg kor-transform-monsterparts-idle-ja + ((kor-transform-monsterparts-lod0-mg (meters 999999))) :bounds (static-spherem 0 -9 -12 22) - :shadow 7 + :shadow kor-transform-monsterparts-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-baron-highres baron-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-baron-highres baron-highres baron-highres-lod0-jg baron-highres-idle-ja + ((baron-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow baron-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-errol-highres errol-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-errol-highres errol-highres errol-highres-lod0-jg errol-highres-idle-ja + ((errol-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow errol-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-onin-highres onin-highres 0 3 - ((1 (meters 200))) +(defskelgroup skel-onin-highres onin-highres onin-highres-lod0-jg onin-highres-idle-ja + ((onin-highres-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow onin-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-pecker-highres pecker-highres 0 3 - ((1 (meters 200))) +(defskelgroup skel-pecker-highres pecker-highres pecker-highres-lod0-jg pecker-highres-idle-ja + ((pecker-highres-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow pecker-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-kid-highres kid-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-kid-highres kid-highres kid-highres-lod0-jg kid-highres-idle-ja + ((kid-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow kid-highres-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-crocadog-highres crocadog-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-crocadog-highres crocadog-highres crocadog-highres-lod0-jg crocadog-highres-idle-ja + ((crocadog-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow crocadog-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-crimson-guard-highres crimson-guard-highres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-crimson-guard-highres crimson-guard-highres crimson-guard-highres-lod0-jg -1 + ((crimson-guard-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow crimson-guard-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-crimson-guard-lowres crimson-guard-lowres 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-crimson-guard-lowres crimson-guard-lowres crimson-guard-lowres-lod0-jg -1 + ((crimson-guard-lowres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow crimson-guard-lowres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-crimson-guard-hover crimson-guard-hover 0 -1 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-crimson-guard-hover crimson-guard-hover crimson-guard-hover-lod0-jg -1 + ((crimson-guard-hover-lod0-mg (meters 20)) (crimson-guard-hover-lod1-mg (meters 999999))) :bounds (static-spherem 0 0 0 7.5) - :shadow 3 + :shadow crimson-guard-hover-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-atoll-hellcat atoll-hellcat 0 4 - ((1 (meters 999999))) +(defskelgroup skel-atoll-hellcat atoll-hellcat atoll-hellcat-lod0-jg atoll-hellcat-idle-ja + ((atoll-hellcat-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 8.5) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider rift-rider 0 4 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider rift-rider rift-rider-lod0-jg rift-rider-idle-ja + ((rift-rider-lod0-mg (meters 999999))) :bounds (static-spherem 0 1.5 0 5) - :shadow 2 + :shadow rift-rider-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-torn-highres torn-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-torn-highres torn-highres torn-highres-lod0-jg torn-highres-idle-ja + ((torn-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2.5) - :shadow 2 + :shadow torn-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-sig-highres sig-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-sig-highres sig-highres sig-highres-lod0-jg sig-highres-idle-ja + ((sig-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow sig-highres-shadow-mg :origin-joint-index 30 ) ;; failed to figure out what this is: -(defskelgroup skel-ashelin-highres ashelin-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-ashelin-highres ashelin-highres ashelin-highres-lod0-jg ashelin-highres-idle-ja + ((ashelin-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow ashelin-highres-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-brutter-highres brutter-highres 0 4 - ((1 (meters 999999))) +(defskelgroup skel-brutter-highres brutter-highres brutter-highres-lod0-jg brutter-highres-idle-kiosk-ja + ((brutter-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow brutter-highres-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-palmpilot palmpilot 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-palmpilot palmpilot palmpilot-lod0-jg -1 + ((palmpilot-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1.5) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-krew-highres krew-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-krew-highres krew-highres krew-highres-lod0-jg krew-highres-idle-ja + ((krew-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow krew-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-tess-highres tess-highres 0 3 - ((1 (meters 999999))) +(defskelgroup skel-tess-highres tess-highres tess-highres-lod0-jg tess-highres-idle-ja + ((tess-highres-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) - :shadow 2 + :shadow tess-highres-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-keira-highres keira-highres 0 3 - ((1 (meters 200))) +(defskelgroup skel-keira-highres keira-highres keira-highres-lod0-jg keira-highres-idle-ja + ((keira-highres-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow keira-highres-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) @@ -281,22 +281,22 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-life-seed life-seed 0 2 - ((1 (meters 200))) +(defskelgroup skel-life-seed life-seed life-seed-lod0-jg life-seed-idle-ja + ((life-seed-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-grunt-fma grunt-fma 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-grunt-fma grunt-fma grunt-fma-lod0-jg -1 + ((grunt-fma-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-baron baron 0 2 - ((1 (meters 999999))) +(defskelgroup skel-baron baron baron-lod0-jg baron-idle-ja + ((baron-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3) :origin-joint-index 3 ) @@ -1249,57 +1249,57 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-prsn-torture prsn-torture 0 2 - ((1 (meters 999999))) +(defskelgroup skel-prsn-torture prsn-torture prsn-torture-lod0-jg prsn-torture-idle-ja + ((prsn-torture-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-tomb-boss-bridge-a tomb-boss-bridge 0 2 - ((1 (meters 999999))) +(defskelgroup skel-tomb-boss-bridge-a tomb-boss-bridge tomb-boss-bridge-a-lod0-jg tomb-boss-bridge-a-idle-ja + ((tomb-boss-bridge-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 17) :origin-joint-index 30 ) ;; failed to figure out what this is: -(defskelgroup skel-tomb-boss-bridge-b tomb-boss-bridge 6 8 - ((7 (meters 999999))) +(defskelgroup skel-tomb-boss-bridge-b tomb-boss-bridge tomb-boss-bridge-b-lod0-jg tomb-boss-bridge-b-idle-ja + ((tomb-boss-bridge-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 17) :origin-joint-index 31 ) ;; failed to figure out what this is: -(defskelgroup skel-time-map time-map 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-time-map time-map time-map-lod0-jg -1 + ((time-map-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 20 ) ;; failed to figure out what this is: -(defskelgroup skel-precursor-stone precursor-stone 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-precursor-stone precursor-stone precursor-stone-lod0-jg -1 + ((precursor-stone-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-seal-of-mar seal-of-mar 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-seal-of-mar seal-of-mar seal-of-mar-lod0-jg -1 + ((seal-of-mar-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-talk-box talk-box 0 2 - ((1 (meters 999999))) +(defskelgroup skel-talk-box talk-box talk-box-lod0-jg talk-box-idle-ja + ((talk-box-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-ring rift-ring 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-ring rift-ring rift-ring-lod0-jg -1 + ((rift-ring-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 60) :origin-joint-index 6 ) @@ -1312,8 +1312,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-lens mtn-lens 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-lens mtn-lens mtn-lens-lod0-jg mtn-lens-idle-ja + ((mtn-lens-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 0.5) :origin-joint-index 3 ) @@ -1326,15 +1326,15 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-heart-of-mar heart-of-mar 0 2 - ((1 (meters 999999))) +(defskelgroup skel-heart-of-mar heart-of-mar heart-of-mar-lod0-jg heart-of-mar-idle-ja + ((heart-of-mar-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-gun-upgrade-a gun-upgrade-a 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-gun-upgrade-a gun-upgrade-a gun-upgrade-a-lod0-jg -1 + ((gun-upgrade-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc index 1a33acc91c..2db15c85f0 100644 --- a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc @@ -464,8 +464,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-warp-gate warp-gate 0 2 - ((1 (meters 999999))) +(defskelgroup skel-warp-gate warp-gate warp-gate-lod0-jg warp-gate-idle-ja + ((warp-gate-lod0-mg (meters 999999))) :bounds (static-spherem 0 3 0 4) :origin-joint-index 3 ) @@ -1159,8 +1159,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-air-train air-train 0 2 - ((1 (meters 999999))) +(defskelgroup skel-air-train air-train air-train-lod0-jg air-train-idle-ja + ((air-train-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 -2 12.5) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc b/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc index 83ba8478d8..5d04b15865 100644 --- a/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc @@ -2,50 +2,50 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-consite-break-scaffold-a-break consite-break-scaffold-a 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break consite-break-scaffold-a consite-break-scaffold-a-break-lod0-jg -1 + ((consite-break-scaffold-a-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 90) :origin-joint-index 8 ) ;; failed to figure out what this is: -(defskelgroup skel-consite-break-scaffold-a-break-a consite-break-scaffold-a 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break-a consite-break-scaffold-a consite-break-scaffold-a-break-a-lod0-jg -1 + ((consite-break-scaffold-a-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -20 70) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-consite-break-scaffold-a-break-b consite-break-scaffold-a 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break-b consite-break-scaffold-a consite-break-scaffold-a-break-b-lod0-jg -1 + ((consite-break-scaffold-a-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -20 60) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-consite-break-scaffold-a-break-c consite-break-scaffold-a 12 -1 - ((13 (meters 999999))) +(defskelgroup skel-consite-break-scaffold-a-break-c consite-break-scaffold-a consite-break-scaffold-a-break-c-lod0-jg -1 + ((consite-break-scaffold-a-break-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -20 140) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-bomb-trigger bomb-trigger 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-bomb-trigger bomb-trigger bomb-trigger-lod0-jg -1 + ((bomb-trigger-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-kor-break kor-break 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-kor-break kor-break kor-break-lod0-jg -1 + ((kor-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-kor-break-ray kor-break-ray 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-kor-break-ray kor-break-ray kor-break-ray-lod0-jg -1 + ((kor-break-ray-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc index 893943c01d..2caa064e3b 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc @@ -2,22 +2,22 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-dig-totem-fish dig-totem-fish 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-dig-totem-fish dig-totem-fish dig-totem-fish-lod0-jg -1 + ((dig-totem-fish-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-seal-of-mar-base seal-of-mar-base 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-seal-of-mar-base seal-of-mar-base seal-of-mar-base-lod0-jg -1 + ((seal-of-mar-base-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-dig-totem dig-totem 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-dig-totem dig-totem dig-totem-lod0-jg -1 + ((dig-totem-lod0-mg (meters 999999))) :bounds (static-spherem 0 10 0 20) :origin-joint-index 3 ) @@ -290,29 +290,29 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-dig-digger-explode dig-digger 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-dig-digger-explode dig-digger dig-digger-explode-lod0-jg -1 + ((dig-digger-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-dig-digger-explode-a dig-digger 7 -1 - ((8 (meters 999999))) +(defskelgroup skel-dig-digger-explode-a dig-digger dig-digger-explode-a-lod0-jg -1 + ((dig-digger-explode-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-dig-digger-explode-b dig-digger 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-dig-digger-explode-b dig-digger dig-digger-explode-b-lod0-jg -1 + ((dig-digger-explode-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-dig-digger-explode-c dig-digger 13 -1 - ((14 (meters 999999))) +(defskelgroup skel-dig-digger-explode-c dig-digger dig-digger-explode-c-lod0-jg -1 + ((dig-digger-explode-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/drill_platform/drill-scenes_REF.gc b/test/decompiler/reference/jak2/levels/drill_platform/drill-scenes_REF.gc index c28e830e2d..36ee2f865d 100644 --- a/test/decompiler/reference/jak2/levels/drill_platform/drill-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill_platform/drill-scenes_REF.gc @@ -591,29 +591,29 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-drill-top-break drill-top-break 0 2 - ((1 (meters 999999))) +(defskelgroup skel-drill-top-break drill-top-break drill-top-break-lod0-jg drill-top-break-idle-ja + ((drill-top-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 20 0 80) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-drill-top-break-explode-b drill-top-break 10 -1 - ((11 (meters 999999))) +(defskelgroup skel-drill-top-break-explode-b drill-top-break drill-top-break-explode-b-lod0-jg -1 + ((drill-top-break-explode-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 20 0 1000) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-drill-top-break-explode drill-top-break 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-drill-top-break-explode drill-top-break drill-top-break-explode-lod0-jg -1 + ((drill-top-break-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-drill-top-break-explode-a drill-top-break 7 -1 - ((8 (meters 999999))) +(defskelgroup skel-drill-top-break-explode-a drill-top-break drill-top-break-explode-a-lod0-jg -1 + ((drill-top-break-explode-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc index 4e4bef4acb..a0f1b141f1 100644 --- a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc @@ -105,10 +105,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-pegasus pegasus 0 5 - ((1 (meters 20)) (2 (meters 40)) (3 (meters 999999))) +(defskelgroup skel-pegasus pegasus pegasus-lod0-jg pegasus-idle-ja + ((pegasus-lod0-mg (meters 20)) (pegasus-lod1-mg (meters 40)) (pegasus-lod2-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) - :shadow 4 + :shadow pegasus-shadow-mg ) ;; definition for symbol *pegasus-enemy-info*, type enemy-info @@ -647,7 +647,7 @@ ) (let ((v1-22 (ja-group))) (cond - ((and v1-22 (= v1-22 (-> self draw art-group data 13))) + ((and v1-22 (= v1-22 pegasus-flip-around-a-ja)) (if (< 1.0 (fabs (-> self speed))) (set! (-> self speed) (* 0.92 (-> self speed))) ) @@ -655,7 +655,7 @@ (else (let ((v1-31 (ja-group))) (cond - ((and v1-31 (= v1-31 (-> self draw art-group data 14))) + ((and v1-31 (= v1-31 pegasus-flip-around-b-ja)) (if (< (-> self speed) 0.0) (seek! (-> self speed) (- f0-6) 13.653334) (seek! (-> self speed) f0-6 13.653334) @@ -759,14 +759,14 @@ (-> self speed) (ja-channel-push! 1 (seconds 0.1)) (let ((a0-7 (-> self skel root-channel 0))) - (set! (-> a0-7 frame-group) (the-as art-joint-anim (-> self draw art-group data 20))) + (set! (-> a0-7 frame-group) (the-as art-joint-anim pegasus-board-attack-pegasus-ja)) (set! (-> a0-7 param 0) - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) frames num-frames) -1)) + (the float (+ (-> (the-as art-joint-anim pegasus-board-attack-pegasus-ja) frames num-frames) -1)) ) (set! (-> a0-7 param 1) 1.5) (set! (-> a0-7 frame-num) 0.0) (let ((t9-3 joint-control-channel-group!) - (a1-3 (-> self draw art-group data 20)) + (a1-3 pegasus-board-attack-pegasus-ja) (a2-2 (the-as object num-func-seek!)) ) (t9-3 @@ -849,9 +849,9 @@ ) :code (behavior () (let ((v1-2 (ja-group))) - (when (not (and v1-2 (= v1-2 (-> self draw art-group data 8)))) + (when (not (and v1-2 (= v1-2 pegasus-fly-ja))) (ja-channel-push! 1 (seconds 0.2)) - (ja :group! (-> self draw art-group data 8)) + (ja :group! pegasus-fly-ja) ) ) (until #f @@ -945,15 +945,15 @@ ) (let ((a0-13 (ja-group))) (when (not (and a0-13 (begin - (set! a2-3 (= a0-13 (-> self draw art-group data 10))) + (set! a2-3 (= a0-13 pegasus-fly-glide-ja)) (or (the-as symbol a2-3) - (begin (set! a2-3 (= a0-13 (-> self draw art-group data 9))) (the-as symbol a2-3)) - (begin (set! a2-3 (= a0-13 (-> self draw art-group data 8))) (the-as symbol a2-3)) - (begin (set! a2-3 (= a0-13 (-> self draw art-group data 13))) (the-as symbol a2-3)) - (begin (set! a2-3 (= a0-13 (-> self draw art-group data 14))) (the-as symbol a2-3)) - (begin (set! a2-3 (= a0-13 (-> self draw art-group data 16))) (the-as symbol a2-3)) - (begin (set! a2-3 (= a0-13 (-> self draw art-group data 17))) (the-as symbol a2-3)) - (= a0-13 (-> self draw art-group data 18)) + (begin (set! a2-3 (= a0-13 pegasus-fly-doublespeed-ja)) (the-as symbol a2-3)) + (begin (set! a2-3 (= a0-13 pegasus-fly-ja)) (the-as symbol a2-3)) + (begin (set! a2-3 (= a0-13 pegasus-flip-around-a-ja)) (the-as symbol a2-3)) + (begin (set! a2-3 (= a0-13 pegasus-flip-around-b-ja)) (the-as symbol a2-3)) + (begin (set! a2-3 (= a0-13 pegasus-fly-to-run-ja)) (the-as symbol a2-3)) + (begin (set! a2-3 (= a0-13 pegasus-run-ja)) (the-as symbol a2-3)) + (= a0-13 pegasus-run-to-fly-ja) ) ) ) @@ -965,15 +965,15 @@ (cond ((and s4-0 (let ((a0-21 (ja-group))) (not (and a0-21 (begin - (set! a2-3 (= a0-21 (-> self draw art-group data 13))) - (or (the-as symbol a2-3) (= a0-21 (-> self draw art-group data 14))) + (set! a2-3 (= a0-21 pegasus-flip-around-a-ja)) + (or (the-as symbol a2-3) (= a0-21 pegasus-flip-around-b-ja)) ) ) ) ) ) (ja-channel-push! 1 (seconds 0.125)) - (ja :group! (-> self draw art-group data 13)) + (ja :group! pegasus-flip-around-a-ja) (ja :num-func num-func-identity :frame-num 0.0) ) ((and (not v1-34) (not (ja-done? 0))) @@ -981,14 +981,14 @@ (else (let ((v1-46 (ja-group))) (cond - ((and v1-46 (= v1-46 (-> self draw art-group data 16))) - (ja :group! (-> self draw art-group data 17)) + ((and v1-46 (= v1-46 pegasus-fly-to-run-ja)) + (ja :group! pegasus-run-ja) (ja :num-func num-func-identity :frame-num 0.0) ) ((let ((v1-58 (ja-group))) - (and v1-58 (= v1-58 (-> self draw art-group data 13))) + (and v1-58 (= v1-58 pegasus-flip-around-a-ja)) ) - (ja :group! (-> self draw art-group data 14) :num! min) + (ja :group! pegasus-flip-around-b-ja :num! min) (set! (-> self speed) (- (-> self speed))) (let ((s5-3 (new 'stack-no-clear 'vector)) (s4-1 (new 'stack-no-clear 'matrix)) @@ -1003,16 +1003,16 @@ (vector-matrix*! (-> self facing) (-> self facing) (the-as matrix a2-3)) ) ((let ((v1-72 (ja-group))) - (and v1-72 (= v1-72 (-> self draw art-group data 17))) + (and v1-72 (= v1-72 pegasus-run-ja)) ) (if (or (not (-> self can-run)) (< (the-as time-frame (-> self ambient-expire)) (-> self clock frame-counter))) - (ja :group! (-> self draw art-group data 18)) + (ja :group! pegasus-run-to-fly-ja) ) (ja :num-func num-func-identity :frame-num 0.0) ) ((and gp-0 (-> self on-ground)) (ja-channel-push! 1 (seconds 0.125)) - (ja :group! (-> self draw art-group data 16)) + (ja :group! pegasus-fly-to-run-ja) (ja :num-func num-func-identity :frame-num 0.0) (let* ((s5-4 (-> self clock frame-counter)) (f30-1 300.0) @@ -1041,27 +1041,27 @@ (and (< 0.0 (-> self speed)) (< (-> self tangent y) -0.125)) ) (let ((v1-121 (ja-group))) - (when (not (and v1-121 (= v1-121 (-> self draw art-group data 10)))) + (when (not (and v1-121 (= v1-121 pegasus-fly-glide-ja))) (ja-channel-push! 1 (the-as time-frame s5-1)) - (ja :group! (-> self draw art-group data 10)) + (ja :group! pegasus-fly-glide-ja) ) ) (ja :num-func num-func-identity :frame-num 0.0) ) ((< 1.25 f30-0) (let ((v1-135 (ja-group))) - (when (not (and v1-135 (= v1-135 (-> self draw art-group data 9)))) + (when (not (and v1-135 (= v1-135 pegasus-fly-doublespeed-ja))) (ja-channel-push! 1 (the-as time-frame s5-1)) - (ja :group! (-> self draw art-group data 9)) + (ja :group! pegasus-fly-doublespeed-ja) ) ) (ja :num-func num-func-identity :frame-num 0.0) ) (else (let ((v1-148 (ja-group))) - (when (not (and v1-148 (= v1-148 (-> self draw art-group data 8)))) + (when (not (and v1-148 (= v1-148 pegasus-fly-ja))) (ja-channel-push! 1 (the-as time-frame s5-1)) - (ja :group! (-> self draw art-group data 8)) + (ja :group! pegasus-fly-ja) ) ) (ja :num-func num-func-identity :frame-num 0.0) @@ -1076,13 +1076,12 @@ 0.0 (the-as symbol - (or gp-0 (let ((v1-161 (ja-group))) - (and v1-161 (begin - (set! a2-3 (= v1-161 (-> self draw art-group data 16))) - (or (the-as symbol a2-3) (= v1-161 (-> self draw art-group data 17))) - ) - ) + (or gp-0 + (let ((v1-161 (ja-group))) + (and v1-161 + (begin (set! a2-3 (= v1-161 pegasus-fly-to-run-ja)) (or (the-as symbol a2-3) (= v1-161 pegasus-run-ja))) ) + ) ) ) (the-as symbol a2-3) @@ -1222,10 +1221,10 @@ :code (behavior () (set! (-> self allow-idle) #f) (let ((v1-2 (ja-group))) - (when (not (and v1-2 (= v1-2 (-> self draw art-group data 5)))) + (when (not (and v1-2 (= v1-2 pegasus-idle-ja))) (ja-channel-push! 1 (seconds 0.1)) - (ja-no-eval :group! (-> self draw art-group data 19) - :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 19)) frames num-frames) -1))) + (ja-no-eval :group! pegasus-fly-to-idle-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim pegasus-fly-to-idle-ja) frames num-frames) -1))) :frame-num 0.0 ) (until (ja-done? 0) @@ -1299,11 +1298,8 @@ (suspend) (ja :num! (seek! max f30-0)) ) - (ja-no-eval :group! (-> self draw art-group data 7) - :num! (seek! - (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 7)) frames num-frames) -1)) - f30-0 - ) + (ja-no-eval :group! pegasus-idle-takeoff-in-air-ja + :num! (seek! (the float (+ (-> (the-as art-joint-anim pegasus-idle-takeoff-in-air-ja) frames num-frames) -1)) f30-0) :frame-num 0.0 ) (until (ja-done? 0) diff --git a/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc index fa4d17c0e1..d1fc0160dd 100644 --- a/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/exit/forexita-obs_REF.gc @@ -31,8 +31,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-fort-lift-plat fort-lift-plat 0 3 - ((1 (meters 999999))) +(defskelgroup skel-fort-lift-plat fort-lift-plat fort-lift-plat-lod0-jg fort-lift-plat-idle-ja + ((fort-lift-plat-lod0-mg (meters 999999))) :bounds (static-spherem 0 -2 -8 15) ) diff --git a/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc index 39578a5af2..64208752af 100644 --- a/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc @@ -31,11 +31,14 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-fort-trap-door fort-trap-door 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 5)) +(defskelgroup skel-fort-trap-door fort-trap-door fort-trap-door-lod0-jg fort-trap-door-idle-ja + ((fort-trap-door-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 5) + ) ;; failed to figure out what this is: -(defskelgroup skel-fort-trap-door-explode fort-trap-door 3 5 - ((4 (meters 999999))) +(defskelgroup skel-fort-trap-door-explode fort-trap-door fort-trap-door-explode-lod0-jg fort-trap-door-explode-idle-ja + ((fort-trap-door-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 15) ) diff --git a/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc index b564d3bf2b..fab54face9 100644 --- a/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/prison/prison-obs_REF.gc @@ -239,8 +239,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-prsn-hang-cell prsn-hang-cell 0 2 - ((1 (meters 999999))) +(defskelgroup skel-prsn-hang-cell prsn-hang-cell prsn-hang-cell-lod0-jg prsn-hang-cell-idle-ja + ((prsn-hang-cell-lod0-mg (meters 999999))) :bounds (static-spherem 0 -9.5 0 10) ) @@ -334,8 +334,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-warp-gate-b warp-gate-b 0 2 - ((1 (meters 999999))) +(defskelgroup skel-warp-gate-b warp-gate-b warp-gate-b-lod0-jg warp-gate-b-idle-ja + ((warp-gate-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 3 0 4) :origin-joint-index 3 ) @@ -420,8 +420,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-prsn-cell-door prsn-cell-door 0 2 - ((1 (meters 999999))) +(defskelgroup skel-prsn-cell-door prsn-cell-door prsn-cell-door-lod0-jg prsn-cell-door-idle-ja + ((prsn-cell-door-lod0-mg (meters 999999))) :bounds (static-spherem -2.5 3.25 0 4.25) :origin-joint-index 3 ) @@ -520,8 +520,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-prsn-vent-fan prsn-vent-fan 0 3 - ((1 (meters 999999))) +(defskelgroup skel-prsn-vent-fan prsn-vent-fan prsn-vent-fan-lod0-jg prsn-vent-fan-idle-ja + ((prsn-vent-fan-lod0-mg (meters 999999))) :bounds (static-spherem -2.5 3.25 0 4.25) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc index cec20c4d6d..988b3bd460 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc @@ -1721,88 +1721,124 @@ (defskelgroup skel-gun-dummy gun-dummy 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-a gun-dummy-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-b gun-dummy-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-c gun-dummy-c 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-big gun-dummy-big 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) - -;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-gold gun-dummy-gold 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-dummy-a gun-dummy-a gun-dummy-a-lod0-jg gun-dummy-a-idle-ja + ((gun-dummy-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-peace gun-dummy-yellow-gun 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-dummy-b gun-dummy-b gun-dummy-b-lod0-jg gun-dummy-b-idle-ja + ((gun-dummy-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-a gun-cit-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-c gun-dummy-c gun-dummy-c-lod0-jg gun-dummy-c-idle-ja + ((gun-dummy-c-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-b gun-cit-b 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-big gun-dummy-big gun-dummy-big-lod0-jg gun-dummy-big-idle-ja + ((gun-dummy-big-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-c gun-cit-c 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-gold gun-dummy-gold gun-dummy-gold-lod0-jg gun-dummy-gold-idle-ja + ((gun-dummy-gold-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-d gun-cit-d 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 1.8 0 3.2)) +(defskelgroup skel-gun-dummy-peace gun-dummy-yellow-gun gun-dummy-yellow-gun-lod0-jg gun-dummy-yellow-gun-idle-ja + ((gun-dummy-yellow-gun-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-a-explode gun-dummy-a 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-cit-a gun-cit-a gun-cit-a-lod0-jg gun-cit-a-idle-ja + ((gun-cit-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +;; failed to figure out what this is: +(defskelgroup skel-gun-cit-b gun-cit-b gun-cit-b-lod0-jg gun-cit-b-idle-ja + ((gun-cit-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +;; failed to figure out what this is: +(defskelgroup skel-gun-cit-c gun-cit-c gun-cit-c-lod0-jg gun-cit-c-idle-ja + ((gun-cit-c-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +;; failed to figure out what this is: +(defskelgroup skel-gun-cit-d gun-cit-d gun-cit-d-lod0-jg gun-cit-d-idle-ja + ((gun-cit-d-lod0-mg (meters 999999))) + :bounds (static-spherem 0 1.8 0 3.2) + ) + +;; failed to figure out what this is: +(defskelgroup skel-gun-dummy-a-explode gun-dummy-a gun-dummy-a-explode-lod0-jg gun-dummy-a-explode-idle-ja + ((gun-dummy-a-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-b-explode gun-dummy-b 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-b-explode gun-dummy-b gun-dummy-b-explode-lod0-jg gun-dummy-b-explode-idle-ja + ((gun-dummy-b-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-c-explode gun-dummy-c 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-c-explode gun-dummy-c gun-dummy-c-explode-lod0-jg gun-dummy-c-explode-idle-ja + ((gun-dummy-c-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-big-explode gun-dummy-big 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-big-explode gun-dummy-big gun-dummy-big-explode-lod0-jg gun-dummy-big-explode-idle-ja + ((gun-dummy-big-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-gold-explode gun-dummy-gold 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-gold-explode gun-dummy-gold gun-dummy-gold-explode-lod0-jg gun-dummy-gold-explode-idle-ja + ((gun-dummy-gold-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-dummy-peace-explode gun-dummy-yellow-gun 3 5 - ((4 (meters 999999))) +(defskelgroup skel-gun-dummy-peace-explode gun-dummy-yellow-gun gun-dummy-yellow-gun-explode-lod0-jg gun-dummy-yellow-gun-explode-idle-ja + ((gun-dummy-yellow-gun-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 80) ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-a-explode gun-cit-a 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-a-explode gun-cit-a gun-cit-a-explode-lod0-jg gun-cit-a-explode-idle-ja + ((gun-cit-a-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-b-explode gun-cit-b 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-b-explode gun-cit-b gun-cit-b-explode-lod0-jg gun-cit-b-explode-idle-ja + ((gun-cit-b-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-c-explode gun-cit-c 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-c-explode gun-cit-c gun-cit-c-explode-lod0-jg gun-cit-c-explode-idle-ja + ((gun-cit-c-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) ;; failed to figure out what this is: -(defskelgroup skel-gun-cit-d-explode gun-cit-d 3 5 ((4 (meters 999999))) :bounds (static-spherem 0 0 0 80)) +(defskelgroup skel-gun-cit-d-explode gun-cit-d gun-cit-d-explode-lod0-jg gun-cit-d-explode-idle-ja + ((gun-cit-d-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 80) + ) ;; definition for symbol *gun-dummy-a-exploder-params*, type joint-exploder-static-params (define *gun-dummy-a-exploder-params* diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc index bbe2bfda05..045455ae6a 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc @@ -2344,7 +2344,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-gungame-door fort-entry-gate 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 3 0 10)) +(defskelgroup skel-gungame-door fort-entry-gate fort-entry-gate-lod0-jg fort-entry-gate-idle-ja + ((fort-entry-gate-lod0-mg (meters 999999))) + :bounds (static-spherem 0 3 0 10) + ) ;; failed to figure out what this is: (defstate idle (gungame-door) diff --git a/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc b/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc index de6387a791..9a7cadb554 100644 --- a/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc @@ -2,8 +2,8 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-hide-door-b hide-door-b 0 2 - ((1 (meters 999999))) +(defskelgroup skel-hide-door-b hide-door-b hide-door-b-lod0-jg hide-door-b-idle-ja + ((hide-door-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 0 5) :origin-joint-index 3 ) @@ -106,17 +106,17 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-hide-light hide-light 0 3 - ((1 (meters 999999))) +(defskelgroup skel-hide-light hide-light hide-light-lod0-jg hide-light-idle-ja + ((hide-light-lod0-mg (meters 999999))) :bounds (static-spherem 0 -2.3 0 4.5) - :shadow 2 + :shadow hide-light-shadow-mg :origin-joint-index 3 :shadow-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-hide-light-fog hide-light 5 7 - ((6 (meters 999999))) +(defskelgroup skel-hide-light-fog hide-light hide-light-fog-lod0-jg hide-light-fog-idle-ja + ((hide-light-fog-lod0-mg (meters 999999))) :bounds (static-spherem 0 -2.5 0 3) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/hideout/hideout-scenes_REF.gc b/test/decompiler/reference/jak2/levels/hideout/hideout-scenes_REF.gc index 69f40d9eac..634fa3aa9d 100644 --- a/test/decompiler/reference/jak2/levels/hideout/hideout-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/hideout/hideout-scenes_REF.gc @@ -2,15 +2,15 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-hide-faucet hide-faucet 0 2 - ((1 (meters 999999))) +(defskelgroup skel-hide-faucet hide-faucet hide-faucet-lod0-jg hide-faucet-idle-ja + ((hide-faucet-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-gun-barrel gun-barrel 0 2 - ((1 (meters 999999))) +(defskelgroup skel-gun-barrel gun-barrel gun-barrel-lod0-jg gun-barrel-idle-ja + ((gun-barrel-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc b/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc index aaaae9652b..a4c05394b8 100644 --- a/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc @@ -2,7 +2,10 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-hip-door-b hip-door-a 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 2 0 5)) +(defskelgroup skel-hip-door-b hip-door-a hip-door-a-lod0-jg hip-door-a-idle-ja + ((hip-door-a-lod0-mg (meters 999999))) + :bounds (static-spherem 0 2 0 5) + ) ;; definition of type hip-door-b (deftype hip-door-b (com-airlock) @@ -76,8 +79,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-hip-whack-a-metal hip-whack-a-metal 0 2 - ((1 (meters 999999))) +(defskelgroup skel-hip-whack-a-metal hip-whack-a-metal hip-whack-a-metal-lod0-jg hip-whack-a-metal-idle-ja + ((hip-whack-a-metal-lod0-mg (meters 999999))) :bounds (static-spherem 0 -1 1 3.8) :origin-joint-index 3 ) @@ -196,7 +199,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-hip-mirror hip-mirror 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 12)) +(defskelgroup skel-hip-mirror hip-mirror hip-mirror-lod0-jg hip-mirror-idle-ja + ((hip-mirror-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 12) + ) ;; failed to figure out what this is: (defstate idle (hip-mirror) @@ -371,36 +377,36 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-computerpaper computerpaper 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-computerpaper computerpaper computerpaper-lod0-jg -1 + ((computerpaper-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-hip-bottle-b hip-bottle-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-hip-bottle-b hip-bottle-b hip-bottle-b-lod0-jg -1 + ((hip-bottle-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-hip-bottle-c hip-bottle-c 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-hip-bottle-c hip-bottle-c hip-bottle-c-lod0-jg -1 + ((hip-bottle-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-hip-mug hip-mug 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-hip-mug hip-mug hip-mug-lod0-jg -1 + ((hip-mug-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-krew-moneybag krew-moneybag 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-krew-moneybag krew-moneybag krew-moneybag-lod0-jg -1 + ((krew-moneybag-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc b/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc index 2c0a0268a1..26f9a4e94a 100644 --- a/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc @@ -2210,15 +2210,15 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-break rift-rider-break 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-break rift-rider-break rift-rider-break-lod0-jg -1 + ((rift-rider-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :origin-joint-index 25 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-break-a rift-rider-break 7 -1 - ((8 (meters 999999))) +(defskelgroup skel-rift-rider-break-a rift-rider-break rift-rider-break-a-lod0-jg -1 + ((rift-rider-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :origin-joint-index 10 ) @@ -2238,99 +2238,99 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-vortex-light vortex-light 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-vortex-light vortex-light vortex-light-lod0-jg -1 + ((vortex-light-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5000) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-bar rift-rider-bar 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-bar rift-rider-bar rift-rider-bar-lod0-jg -1 + ((rift-rider-bar-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-chunk-a rift-rider-chunk-a 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-chunk-a rift-rider-chunk-a rift-rider-chunk-a-lod0-jg -1 + ((rift-rider-chunk-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-break-b rift-rider-break-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-break-b rift-rider-break-b rift-rider-break-b-lod0-jg -1 + ((rift-rider-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-break-c rift-rider-break-c 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-break-c rift-rider-break-c rift-rider-break-c-lod0-jg -1 + ((rift-rider-break-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-meteor meteor 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-meteor meteor meteor-lod0-jg -1 + ((meteor-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-metalkor-torso metalkor-torso 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-metalkor-torso metalkor-torso metalkor-torso-lod0-jg -1 + ((metalkor-torso-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-donut rift-rider-donut 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-donut rift-rider-donut rift-rider-donut-lod0-jg -1 + ((rift-rider-donut-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-vil-break-support vil-break-support 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-vil-break-support vil-break-support vil-break-support-lod0-jg -1 + ((vil-break-support-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 120) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-prsn-chair-shackle prsn-chair-shackle 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-prsn-chair-shackle prsn-chair-shackle prsn-chair-shackle-lod0-jg -1 + ((prsn-chair-shackle-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-prsn-daxter-plat prsn-daxter-plat 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-prsn-daxter-plat prsn-daxter-plat prsn-daxter-plat-lod0-jg -1 + ((prsn-daxter-plat-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-jak-clothes jak-clothes 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-jak-clothes jak-clothes jak-clothes-lod0-jg -1 + ((jak-clothes-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-dash rift-rider-dash 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-dash rift-rider-dash rift-rider-dash-lod0-jg -1 + ((rift-rider-dash-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-rift-rider-heart-of-mar rift-rider-heart-of-mar 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-rift-rider-heart-of-mar rift-rider-heart-of-mar rift-rider-heart-of-mar-lod0-jg -1 + ((rift-rider-heart-of-mar-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/mars_tomb/tomb-scenes_REF.gc b/test/decompiler/reference/jak2/levels/mars_tomb/tomb-scenes_REF.gc index 4141a8c3c3..bf93a974f8 100644 --- a/test/decompiler/reference/jak2/levels/mars_tomb/tomb-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/mars_tomb/tomb-scenes_REF.gc @@ -2,15 +2,15 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-tomb-boss-explode tomb-boss-explode 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-tomb-boss-explode tomb-boss-explode tomb-boss-explode-lod0-jg -1 + ((tomb-boss-explode-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-tomb-boss-explode-a tomb-boss-explode 3 -1 - ((4 (meters 999999))) +(defskelgroup skel-tomb-boss-explode-a tomb-boss-explode tomb-boss-explode-a-lod0-jg -1 + ((tomb-boss-explode-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc index 358d5d5361..3660d8c256 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc @@ -36,8 +36,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-metalkor-fma-spinner metalkor-fma-spinner 0 2 - ((1 (meters 999999))) +(defskelgroup skel-metalkor-fma-spinner metalkor-fma-spinner metalkor-fma-spinner-lod0-jg metalkor-fma-spinner-idle-ja + ((metalkor-fma-spinner-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 20) :origin-joint-index 3 ) @@ -1706,8 +1706,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-nest-gun-parts nest-gun-parts 0 2 - ((1 (meters 999999))) +(defskelgroup skel-nest-gun-parts nest-gun-parts nest-gun-parts-lod0-jg nest-gun-parts-idle-ja + ((nest-gun-parts-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 25 40) :origin-joint-index 3 ) @@ -1773,8 +1773,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-nest-unbroken-rocks nest-unbroken-rocks 0 2 - ((1 (meters 999999))) +(defskelgroup skel-nest-unbroken-rocks nest-unbroken-rocks nest-unbroken-rocks-lod0-jg nest-unbroken-rocks-idle-ja + ((nest-unbroken-rocks-lod0-mg (meters 999999))) :bounds (static-spherem 75 0 -75 55) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc b/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc index 5a0a74f90c..0242a1acad 100644 --- a/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/nest-scenes_REF.gc @@ -2,29 +2,29 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-nest-gun-elevator nest-gun-elevator 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-nest-gun-elevator nest-gun-elevator nest-gun-elevator-lod0-jg -1 + ((nest-gun-elevator-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 2) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-nest-break-rocks-break nest-break-rocks 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-nest-break-rocks-break nest-break-rocks nest-break-rocks-break-lod0-jg -1 + ((nest-break-rocks-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-nest-break-rocks-break-a nest-break-rocks 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-nest-break-rocks-break-a nest-break-rocks nest-break-rocks-break-a-lod0-jg -1 + ((nest-break-rocks-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 300) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-nest-break-rocks-break-b nest-break-rocks 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-nest-break-rocks-break-b nest-break-rocks nest-break-rocks-break-b-lod0-jg -1 + ((nest-break-rocks-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 200) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/palace/roof/palboss-scenes_REF.gc b/test/decompiler/reference/jak2/levels/palace/roof/palboss-scenes_REF.gc index 845185d459..29963de76e 100644 --- a/test/decompiler/reference/jak2/levels/palace/roof/palboss-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/roof/palboss-scenes_REF.gc @@ -2,50 +2,50 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-squid-break-pod squid-break 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-squid-break-pod squid-break squid-break-pod-lod0-jg -1 + ((squid-break-pod-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 4) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-squid-break-a squid-break 4 -1 - ((5 (meters 999999))) +(defskelgroup skel-squid-break-a squid-break squid-break-a-lod0-jg -1 + ((squid-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 500) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-squid-break-b squid-break 8 -1 - ((9 (meters 999999))) +(defskelgroup skel-squid-break-b squid-break squid-break-b-lod0-jg -1 + ((squid-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 500) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-squid-break-c squid-break 12 -1 - ((13 (meters 999999))) +(defskelgroup skel-squid-break-c squid-break squid-break-c-lod0-jg -1 + ((squid-break-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 500) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-squid-break-d squid-break 16 -1 - ((17 (meters 999999))) +(defskelgroup skel-squid-break-d squid-break squid-break-d-lod0-jg -1 + ((squid-break-d-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 500) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-squid-break-e squid-break 20 -1 - ((21 (meters 999999))) +(defskelgroup skel-squid-break-e squid-break squid-break-e-lod0-jg -1 + ((squid-break-e-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 500) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-squid-break-tentacle squid-break 24 -1 - ((25 (meters 999999))) +(defskelgroup skel-squid-break-tentacle squid-break squid-break-tentacle-lod0-jg -1 + ((squid-break-tentacle-lod0-mg (meters 999999))) :bounds (static-spherem 5 0 0 11) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc b/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc index 908228d5d2..f77a9e87c0 100644 --- a/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc @@ -24,10 +24,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-vin vin 0 3 - ((1 (meters 999999))) +(defskelgroup skel-vin vin vin-lod0-jg vin-idle-ja + ((vin-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) - :shadow 2 + :shadow vin-shadow-mg :origin-joint-index 3 ) @@ -362,15 +362,15 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-pow-mov-plat pow-mov-plat 0 2 - ((1 (meters 999999))) +(defskelgroup skel-pow-mov-plat pow-mov-plat pow-mov-plat-lod0-jg pow-mov-plat-idle-ja + ((pow-mov-plat-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-plasmitebox plasmitebox 0 2 - ((1 (meters 999999))) +(defskelgroup skel-plasmitebox plasmitebox plasmitebox-lod0-jg plasmitebox-idle-ja + ((plasmitebox-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc b/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc index 153053fbd8..3ebde4bed4 100644 --- a/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc @@ -31,92 +31,92 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-awning awning 0 2 - ((1 (meters 999999))) +(defskelgroup skel-awning awning awning-lod0-jg awning-idle-ja + ((awning-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-flag flag 0 3 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-flag flag flag-lod0-jg flag-idle-ja + ((flag-lod0-mg (meters 20)) (flag-lod1-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-movie-flag flag 0 3 - ((1 (meters 999999))) +(defskelgroup skel-movie-flag flag flag-lod0-jg flag-idle-ja + ((flag-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-precipice-a precipice-a 0 2 - ((1 (meters 999999))) +(defskelgroup skel-precipice-a precipice-a precipice-a-lod0-jg precipice-a-idle-ja + ((precipice-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 18 ) ;; failed to figure out what this is: -(defskelgroup skel-precipice-b precipice-b 0 2 - ((1 (meters 999999))) +(defskelgroup skel-precipice-b precipice-b precipice-b-lod0-jg precipice-b-idle-ja + ((precipice-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 26 ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-tower-a ruins-tower-a 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-tower-a ruins-tower-a ruins-tower-a-lod0-jg ruins-tower-a-idle-ja + ((ruins-tower-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 49 ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-tower-b ruins-tower-b 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-tower-b ruins-tower-b ruins-tower-b-lod0-jg ruins-tower-b-idle-ja + ((ruins-tower-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 46 ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-tower-c ruins-tower-c 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-tower-c ruins-tower-c ruins-tower-c-lod0-jg ruins-tower-c-idle-ja + ((ruins-tower-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 25 ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-tower-d ruins-tower-d 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-tower-d ruins-tower-d ruins-tower-d-lod0-jg ruins-tower-d-idle-ja + ((ruins-tower-d-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 9 ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-tower-e ruins-tower-e 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-tower-e ruins-tower-e ruins-tower-e-lod0-jg ruins-tower-e-idle-ja + ((ruins-tower-e-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 53 ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-tower-f ruins-tower-f 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-tower-f ruins-tower-f ruins-tower-f-lod0-jg ruins-tower-f-idle-ja + ((ruins-tower-f-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-tower-rp ruins-tower-rp 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-tower-rp ruins-tower-rp ruins-tower-rp-lod0-jg ruins-tower-rp-idle-ja + ((ruins-tower-rp-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1000) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-zipline zipline 0 2 - ((1 (meters 999999))) +(defskelgroup skel-zipline zipline zipline-lod0-jg zipline-idle-ja + ((zipline-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 4 ) @@ -1421,8 +1421,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-ruins-precipice ruins-precipice 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ruins-precipice ruins-precipice ruins-precipice-lod0-jg ruins-precipice-idle-ja + ((ruins-precipice-lod0-mg (meters 999999))) :bounds (static-spherem 5 0 5 12) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-h_REF.gc b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-h_REF.gc index 18c5a64ed5..20689bf41b 100644 --- a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-h_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-h_REF.gc @@ -30,10 +30,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-jinx jinx 0 3 - ((1 (meters 999999))) +(defskelgroup skel-jinx jinx jinx-lod0-jg jinx-idle0-ja + ((jinx-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 2 + :shadow jinx-shadow-mg :origin-joint-index 15 :shadow-joint-index 15 ) diff --git a/test/decompiler/reference/jak2/levels/stadium/jetboard/skatea-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/jetboard/skatea-obs_REF.gc index 8586acf74d..83985f318b 100644 --- a/test/decompiler/reference/jak2/levels/stadium/jetboard/skatea-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/jetboard/skatea-obs_REF.gc @@ -1497,8 +1497,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-skate-training-ramp skate-training-ramp 0 2 - ((1 (meters 999999))) +(defskelgroup skel-skate-training-ramp skate-training-ramp skate-training-ramp-lod0-jg skate-training-ramp-idle-ja + ((skate-training-ramp-lod0-mg (meters 999999))) :bounds (static-spherem 4 -4 8 12) ) @@ -1639,7 +1639,10 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-skate-gate skate-gate 0 2 ((1 (meters 999999))) :bounds (static-spherem 0 8 0 30)) +(defskelgroup skel-skate-gate skate-gate skate-gate-lod0-jg skate-gate-idle-ja + ((skate-gate-lod0-mg (meters 999999))) + :bounds (static-spherem 0 8 0 30) + ) ;; failed to figure out what this is: (defstate idle (skate-gate) @@ -1761,8 +1764,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-skatea-jump-pad skatea-jump-pad 0 2 - ((1 (meters 999999))) +(defskelgroup skel-skatea-jump-pad skatea-jump-pad skatea-jump-pad-lod0-jg skatea-jump-pad-idle-ja + ((skatea-jump-pad-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 15) ) @@ -1890,8 +1893,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-skatea-floating-ring skatea-floating-ring 0 2 - ((1 (meters 999999))) +(defskelgroup skel-skatea-floating-ring skatea-floating-ring skatea-floating-ring-lod0-jg skatea-floating-ring-idle-ja + ((skatea-floating-ring-lod0-mg (meters 999999))) :bounds (static-spherem 0 4 0 8) ) diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-scenes_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-scenes_REF.gc index 1be89f04fd..95b1cffe40 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-scenes_REF.gc @@ -2,38 +2,38 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-movie-race-bike-b race-bike-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-movie-race-bike-b race-bike-b race-bike-b-lod0-jg -1 + ((race-bike-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 3 + :shadow race-bike-b-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-movie-race-bike-c race-bike-c 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-movie-race-bike-c race-bike-c race-bike-c-lod0-jg -1 + ((race-bike-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) - :shadow 3 + :shadow race-bike-c-shadow-mg :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-stdm-barrels stdm-barrels 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-stdm-barrels stdm-barrels stdm-barrels-lod0-jg -1 + ((stdm-barrels-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-stdm-baron-box stdm-baron-box 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-stdm-baron-box stdm-baron-box stdm-baron-box-lod0-jg -1 + ((stdm-baron-box-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 10) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-babak babak 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-babak babak babak-lod0-jg -1 + ((babak-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 5) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/temple/canyon/canyon-scenes_REF.gc b/test/decompiler/reference/jak2/levels/temple/canyon/canyon-scenes_REF.gc index da7c90ecac..278b9b320d 100644 --- a/test/decompiler/reference/jak2/levels/temple/canyon/canyon-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/temple/canyon/canyon-scenes_REF.gc @@ -2,36 +2,36 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-ctypal-baron-statue-break ctypal-baron-statue-break 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break ctypal-baron-statue-break ctypal-baron-statue-break-lod0-jg ctypal-baron-statue-break-idle-ja + ((ctypal-baron-statue-break-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 9 ) ;; failed to figure out what this is: -(defskelgroup skel-ctypal-baron-statue-break-a ctypal-baron-statue-break 4 6 - ((5 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break-a ctypal-baron-statue-break ctypal-baron-statue-break-a-lod0-jg ctypal-baron-statue-break-a-idle-ja + ((ctypal-baron-statue-break-a-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 9 ) ;; failed to figure out what this is: -(defskelgroup skel-ctypal-baron-statue-break-b ctypal-baron-statue-break 8 10 - ((9 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break-b ctypal-baron-statue-break ctypal-baron-statue-break-b-lod0-jg ctypal-baron-statue-break-b-idle-ja + ((ctypal-baron-statue-break-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-ctypal-baron-statue-break-c ctypal-baron-statue-break 12 14 - ((13 (meters 999999))) +(defskelgroup skel-ctypal-baron-statue-break-c ctypal-baron-statue-break ctypal-baron-statue-break-c-lod0-jg ctypal-baron-statue-break-c-idle-ja + ((ctypal-baron-statue-break-c-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-ctypal-break-wall ctypal-break-wall 0 2 - ((1 (meters 999999))) +(defskelgroup skel-ctypal-break-wall ctypal-break-wall ctypal-break-wall-lod0-jg ctypal-break-wall-idle-ja + ((ctypal-break-wall-lod0-mg (meters 999999))) :bounds (static-spherem 0 60 0 600) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc b/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc index c0bddeb014..44ff3e753b 100644 --- a/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc @@ -774,22 +774,22 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-step-plat-rocks-a mtn-step-plat-rocks 0 3 - ((1 (meters 200)) (2 (meters 999999))) +(defskelgroup skel-mtn-step-plat-rocks-a mtn-step-plat-rocks mtn-step-plat-rocks-a-lod0-jg mtn-step-plat-rocks-a-idle-ja + ((mtn-step-plat-rocks-a-lod0-mg (meters 200)) (mtn-step-plat-rocks-a-lod1-mg (meters 999999))) :bounds (static-spherem 0 -10 0 100) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-step-plat-rocks-b mtn-step-plat-rocks 6 9 - ((7 (meters 200)) (8 (meters 999999))) +(defskelgroup skel-mtn-step-plat-rocks-b mtn-step-plat-rocks mtn-step-plat-rocks-b-lod0-jg mtn-step-plat-rocks-b-idle-ja + ((mtn-step-plat-rocks-b-lod0-mg (meters 200)) (mtn-step-plat-rocks-b-lod1-mg (meters 999999))) :bounds (static-spherem 0 -10 0 100) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-step-plat-rocks-c mtn-step-plat-rocks 12 15 - ((13 (meters 200)) (14 (meters 999999))) +(defskelgroup skel-mtn-step-plat-rocks-c mtn-step-plat-rocks mtn-step-plat-rocks-c-lod0-jg mtn-step-plat-rocks-c-idle-ja + ((mtn-step-plat-rocks-c-lod0-mg (meters 200)) (mtn-step-plat-rocks-c-lod1-mg (meters 999999))) :bounds (static-spherem 0 -10 0 100) :origin-joint-index 3 ) @@ -1024,8 +1024,8 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-plat-buried-rocks mtn-plat-buried-rocks 0 3 - ((1 (meters 20)) (2 (meters 999999))) +(defskelgroup skel-mtn-plat-buried-rocks mtn-plat-buried-rocks mtn-plat-buried-rocks-lod0-jg mtn-plat-buried-rocks-idle-ja + ((mtn-plat-buried-rocks-lod0-mg (meters 20)) (mtn-plat-buried-rocks-lod1-mg (meters 999999))) :bounds (static-spherem 0 -20 0 40) :origin-joint-index 3 ) @@ -2068,15 +2068,15 @@ ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-lens-base mtn-lens-base 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-lens-base mtn-lens-base mtn-lens-base-lod0-jg mtn-lens-base-idle-ja + ((mtn-lens-base-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 40) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-mtn-lens-floor mtn-lens-floor 0 2 - ((1 (meters 999999))) +(defskelgroup skel-mtn-lens-floor mtn-lens-floor mtn-lens-floor-lod0-jg mtn-lens-floor-idle-ja + ((mtn-lens-floor-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 40) :origin-joint-index 3 ) diff --git a/test/decompiler/reference/jak2/levels/underport/under-scenes_REF.gc b/test/decompiler/reference/jak2/levels/underport/under-scenes_REF.gc index c8e9e62fea..b4ab1b769b 100644 --- a/test/decompiler/reference/jak2/levels/underport/under-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/underport/under-scenes_REF.gc @@ -2,43 +2,43 @@ (in-package goal) ;; failed to figure out what this is: -(defskelgroup skel-centipede-fma centipede-fma 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-centipede-fma centipede-fma centipede-fma-lod0-jg -1 + ((centipede-fma-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-under-break-bridge under-break-bridge 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-under-break-bridge under-break-bridge under-break-bridge-lod0-jg -1 + ((under-break-bridge-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -7 200) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-under-break-bridge-b under-break-bridge-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-under-break-bridge-b under-break-bridge-b under-break-bridge-b-lod0-jg -1 + ((under-break-bridge-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 -7 200) :origin-joint-index 3 ) ;; failed to figure out what this is: -(defskelgroup skel-under-break-ceiling under-break-ceiling 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-under-break-ceiling under-break-ceiling under-break-ceiling-lod0-jg -1 + ((under-break-ceiling-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 50) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-under-break-wall under-break-wall 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-under-break-wall under-break-wall under-break-wall-lod0-jg -1 + ((under-break-wall-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) :origin-joint-index 4 ) ;; failed to figure out what this is: -(defskelgroup skel-under-break-wall-b under-break-wall-b 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-under-break-wall-b under-break-wall-b under-break-wall-b-lod0-jg -1 + ((under-break-wall-b-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 30) :origin-joint-index 4 ) diff --git a/test/offline/framework/execution.cpp b/test/offline/framework/execution.cpp index 3abafdd7d6..8330e87797 100644 --- a/test/offline/framework/execution.cpp +++ b/test/offline/framework/execution.cpp @@ -109,6 +109,9 @@ OfflineTestCompileResult compile(OfflineTestDecompiler& dc, {"decompiler", "config", game_name_to_all_types1[config.game_name]}); compiler.run_front_end_on_file( {"test", "decompiler", "reference", config.game_name, "decompiler-macros.gc"}); + if (config.game_name == "jak2") { + compiler.run_front_end_on_file({"goal_src", "jak2", "engine", "data", "art-elts.gc"}); + } int total_lines = 0; diff --git a/test/offline/framework/orchestration.cpp b/test/offline/framework/orchestration.cpp index 00edb16b0d..b3c76d3589 100644 --- a/test/offline/framework/orchestration.cpp +++ b/test/offline/framework/orchestration.cpp @@ -41,14 +41,6 @@ OfflineTestDecompiler setup_decompiler(const OfflineTestWorkGroup& work, object_files.insert(file.name_in_dgo); // todo, make this work with unique_name } auto art_group_info = find_art_files(offline_config.game_name); - for (const auto& [file_name, info] : art_group_info) { - // Add the names of all art files to the allowed object list - // TODO - skip this for jak2, it's not yet emitting *-ag files! / art-elts.gc is not - // comprehensive - if (offline_config.game_name != "jak2") { - object_files.insert(file_name); - } - } dc.config->allowed_objects = object_files; // don't try to do this because we can't write the file @@ -62,13 +54,7 @@ OfflineTestDecompiler setup_decompiler(const OfflineTestWorkGroup& work, dc.db = std::make_unique(dgo_paths, dc.config->obj_file_name_map_file, std::vector{}, std::vector{}, *dc.config); - - // Set the decompiler's art group info - // - NOTE - this omits *-vis files and tpage* files. Is that a problem? - // TODO - skip this for jak2, it's not yet emitting *-ag files! / art-elts.gc is not comprehensive - if (offline_config.game_name != "jak2") { - dc.db->dts.art_group_info = art_group_info; - } + dc.db->dts.art_group_info = art_group_info; std::unordered_set db_files; for (auto& files_by_name : dc.db->obj_files_by_name) {