From c1faf3b6b95ed566bc46af7b67febf52a139413f Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sun, 10 Apr 2022 17:14:17 +0100 Subject: [PATCH 1/6] make flags! --- decompiler/config/all-types.gc | 27 +- goal_src/engine/game/game-info-h.gc | 30 +- goal_src/engine/level/level-info.gc | 4265 +++++++++-------- goal_src/engine/target/target-death.gc | 20 +- .../reference/engine/game/game-info-h_REF.gc | 26 +- .../reference/engine/level/level-info_REF.gc | 22 +- .../engine/target/target-death_REF.gc | 20 +- 7 files changed, 2381 insertions(+), 2029 deletions(-) diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index c41bdff0a4..da5928180a 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -9381,10 +9381,35 @@ ) ) +(defenum continue-flags + :type uint32 + :bitfield #t + (contf00) + (contf01) + (contf02) + (contf03) + (contf04) + (contf05) + (contf06) + (contf07) + (contf08) + (contf09) + (contf10) + (contf11) + (contf12) + (contf13) + (contf14) + (contf15) + (contf16) + (contf17) + (contf18) + (contf19) + ) + (deftype continue-point (basic) ((name string :offset-assert 4) (level symbol :offset-assert 8) - (flags uint32 :offset-assert 12) + (flags continue-flags :offset-assert 12) (trans vector :inline :offset-assert 16) (quat quaternion :inline :offset-assert 32) (camera-trans vector :inline :offset-assert 48) diff --git a/goal_src/engine/game/game-info-h.gc b/goal_src/engine/game/game-info-h.gc index 7d4b67abd7..11adf14a8d 100644 --- a/goal_src/engine/game/game-info-h.gc +++ b/goal_src/engine/game/game-info-h.gc @@ -86,11 +86,37 @@ (define-extern *load-state* load-state) -;; a game checkpoint + +(defenum continue-flags + :type uint32 + :bitfield #t + (contf00) + (contf01) + (contf02) + (contf03) + (contf04) + (contf05) + (contf06) + (contf07) + (contf08) + (contf09) + (contf10) + (contf11) + (contf12) + (contf13) + (contf14) + (contf15) + (contf16) + (contf17) + (contf18) + (contf19) + ) + +;; static data for a continue point (deftype continue-point (basic) ((name string :offset-assert 4) (level symbol :offset-assert 8) - (flags uint32 :offset-assert 12) + (flags continue-flags :offset-assert 12) (trans vector :inline :offset-assert 16) (quat quaternion :inline :offset-assert 32) (camera-trans vector :inline :offset-assert 48) diff --git a/goal_src/engine/level/level-info.gc b/goal_src/engine/level/level-info.gc index 2fea2e14d0..663cb76467 100644 --- a/goal_src/engine/level/level-info.gc +++ b/goal_src/engine/level/level-info.gc @@ -5,2058 +5,2359 @@ ;; name in dgo: level-info ;; dgos: GAME, ENGINE -(define training - (new 'static 'level-load-info - :name 'training - :visname 'training-vis - :nickname 'tra - :index 1 - :packages '(training) - :sound-banks '(training) - :music-bank 'village1 - :ambient-sounds '() - :mood '*training-mood* - :mood-func 'update-mood-training - :ocean '*ocean-map-village1* - :sky #t - :sun-fade 1.0 - :continues - '( - (new 'static 'continue-point - :name "training-start" - :level 'training - :trans (new 'static 'vector :x -5393626.5 :y 28072.346 :z 4332472.5 :w 1.0) - :quat (new 'static 'quaternion :y 0.9995 :w 0.0297) - :camera-trans (new 'static 'vector :x -5426915.0 :y 45930.906 :z 4353156.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.5571 0.0 -0.8304 0.1264 0.9883 -0.0848 0.8207 -0.1522 -0.5506) - :load-commands '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - ) - :vis-nick 'tra - :lev0 'training - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - (new 'static 'continue-point - :name "training-warp" - :level 'training - :flags #x4 - :trans (new 'static 'vector :x -5383524.0 :y 28019.098 :z 4360302.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.084 :w 0.9964) - :camera-trans - (new 'static 'vector :x -5366765.0 :y 45646.234 :z 4325889.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.9057 0.0 0.4238 -0.0666 0.9875 0.1424 -0.4186 -0.1572 0.8944) - :load-commands '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - ) - :vis-nick 'tra - :lev0 'training - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - (new 'static 'continue-point - :name "game-start" - :level 'training - :flags #x404 - :trans (new 'static 'vector :x -5393740.5 :y 28259.533 :z 4360945.5 :w 1.0) - :quat (new 'static 'quaternion :y 0.9993 :w 0.0359) - :camera-trans (new 'static 'vector :x -5434444.5 :y 47050.344 :z 4372832.5 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.3536 0.0 -0.9353 0.1315 0.99 -0.0497 0.926 -0.1406 -0.35) - :load-commands - '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - ) - :vis-nick 'tra - :lev0 'training - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - ) - :tasks '((the binteger 92) (the binteger 93) (the binteger 94) (the binteger 95)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x -5079040.0 :z 4055040.0 :w 1024000.0) - :buzzer 95 - :bottom-height (meters -114.0) - :run-packages '("common" "villagep") - :wait-for-load #f - ) - ) +;; DECOMP BEGINS -;; definition for symbol village1, type level-load-info -(define village1 +(define + training (new 'static 'level-load-info - :name 'village1 - :visname 'village1-vis - :nickname 'vi1 - :index 2 - :packages '(village1) - :sound-banks '(village1) - :music-bank 'village1 - :ambient-sounds '() - :mood '*village1-mood* - :mood-func 'update-mood-village1 - :ocean '*ocean-map-village1* - :sky #t - :sun-fade 1.0 - :continues - '((new 'static 'continue-point - :name "village1-hut" - :level 'village1 - :trans (new 'static 'vector :x -638860.06 :y 139319.7 :z 769990.6 :w 1.0) - :quat (new 'static 'quaternion :y -0.9889 :w -0.148) - :camera-trans (new 'static 'vector :x -668114.1 :y 164536.31 :z 828633.06 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.8947 0.0 -0.4464 0.1082 0.9701 -0.2169 0.4331 -0.2424 -0.868) - :load-commands '() - :vis-nick 'vi1 - :lev0 'village1 - :disp0 'display - :lev1 'beach - :disp1 #f - ) - (new 'static 'continue-point - :name "village1-intro" - :level 'village1 - :flags #x24 - :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) - :quat (new 'static 'quaternion :y 0.591 :w 0.8066) - :camera-trans (new 'static 'vector :x -559109.3 :y 200461.92 :z 826073.06 :w 1.0) - :camera-rot (new 'static 'array float 9 0.7221 0.0 -0.6917 -0.0517 0.9972 -0.054 0.6897 0.0747 0.7201) - :load-commands '() - :vis-nick 'vi1 - :lev0 'village1 - :disp0 'display - :lev1 #f - :disp1 #f - ) - (new 'static 'continue-point - :name "village1-warp" - :level 'village1 - :flags #x804 - :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) - :quat (new 'static 'quaternion :y 0.591 :w 0.8066) - :camera-trans (new 'static 'vector :x -559109.3 :y 200461.92 :z 826073.06 :w 1.0) - :camera-rot (new 'static 'array float 9 0.7221 0.0 -0.6917 -0.0517 0.9972 -0.054 0.6897 0.0747 0.7201) - :load-commands '() - :vis-nick 'vi1 - :lev0 'village1 - :disp0 'display - :lev1 'beach - :disp1 #f - ) - (new 'static 'continue-point - :name "village1-demo-convo" - :level 'village1 - :flags #x40 - :trans (new 'static 'vector :x -542529.1 :y 189424.03 :z 847101.94 :w 1.0) - :quat (new 'static 'quaternion :y -0.1717 :w -0.9851) - :camera-trans (new 'static 'vector :x -559085.2 :y 202996.53 :z 826054.25 :w 1.0) - :camera-rot (new 'static 'array float 9 0.7868 0.0 -0.6171 0.0775 0.992 0.0989 0.6122 -0.1257 0.7806) - :load-commands '() - :vis-nick 'vi1 - :lev0 'village1 - :disp0 'display - :lev1 'misty - :disp1 #f - ) - (new 'static 'continue-point - :name "intro-start" - :level 'village1 - :flags #x10 - :trans (new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.2339 :w 0.9722) - :camera-trans (new 'static 'vector :x 204089.34 :y 36257.793 :z 3358341.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.6381 0.0 0.7699 -0.0938 0.9925 0.0777 -0.7642 -0.1218 0.6333) - :load-commands - '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-11" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - (special "fishermans-boat-2" #t) - ) - :vis-nick 'vi1 - :lev0 'village1 - :disp0 'display - :lev1 'misty - :disp1 #f + :index 1 + :name 'training + :visname 'training-vis + :nickname 'tra + :packages '(training) + :sound-banks '(training) + :music-bank 'village1 + :ambient-sounds '() + :mood '*training-mood* + :mood-func 'update-mood-training + :ocean '*ocean-map-village1* + :sky #t + :sun-fade 1.0 + :continues + '((new 'static 'continue-point + :name "training-start" + :level 'training + :trans + (new 'static 'vector :x -5393626.5 :y 28072.346 :z 4332472.5 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9995 :w 0.0297) + :camera-trans + (new 'static 'vector :x -5426915.0 :y 45930.906 :z 4353156.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.5571 0.0 -0.8304 0.1264 0.9883 -0.0848 0.8207 -0.1522 -0.5506) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + ) + :vis-nick 'tra + :lev0 'training + :disp0 'display + :lev1 'village1 + :disp1 'special + ) + (new 'static 'continue-point + :name "training-warp" + :level 'training + :flags (continue-flags contf02) + :trans + (new 'static 'vector :x -5383524.0 :y 28019.098 :z 4360302.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.084 :w 0.9964) + :camera-trans + (new 'static 'vector :x -5366765.0 :y 45646.234 :z 4325889.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9057 0.0 0.4238 -0.0666 0.9875 0.1424 -0.4186 -0.1572 0.8944) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + ) + :vis-nick 'tra + :lev0 'training + :disp0 'display + :lev1 'village1 + :disp1 'special + ) + (new 'static 'continue-point + :name "game-start" + :level 'training + :flags (continue-flags contf02 contf10) + :trans + (new 'static 'vector :x -5393740.5 :y 28259.533 :z 4360945.5 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9993 :w 0.0359) + :camera-trans + (new 'static 'vector :x -5434444.5 :y 47050.344 :z 4372832.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.3536 0.0 -0.9353 0.1315 0.99 -0.0497 0.926 -0.1406 -0.35) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + ) + :vis-nick 'tra + :lev0 'training + :disp0 'display + :lev1 'village1 + :disp1 'special + ) ) - ) - :tasks '((the binteger 10) (the binteger 11) (the binteger 12) (the binteger 13) (the binteger 14) (the binteger 75)) - :priority #xc8 - :load-commands '() - :alt-load-commands - '(((display village1) (load misty)) - ((special village1) (display misty)) ((display village1) (load beach)) - ) - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x -444416.0 :y 133120.0 :z 360448.0 :w 843776.0) - :buzzer 75 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) + :tasks '(92 93 94 95) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x -5079040.0 :z 4055040.0 :w 1024000.0) + :buzzer 95 + :bottom-height (meters -114) + :run-packages '("common" "villagep") + :wait-for-load #f + ) ) -;; definition for symbol beach, type level-load-info -(define beach +(define + village1 (new 'static 'level-load-info - :name 'beach - :visname 'beach-vis - :nickname 'bea - :index 3 - :packages '(beach) - :sound-banks '(beach) - :music-bank 'beach - :ambient-sounds '() - :mood '*beach-mood* - :mood-func 'update-mood-village1 - :ocean '*ocean-map-village1* - :sky #t - :sun-fade 1.0 - :continues - '((new 'static 'continue-point - :name "beach-start" - :level 'beach - :trans (new 'static 'vector :x -504960.22 :y 9477.325 :z -223513.81 :w 1.0) - :quat (new 'static 'quaternion :y 0.9486 :w -0.3163) - :camera-trans (new 'static 'vector :x -487550.16 :y 28354.15 :z -184211.05 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9139 0.0 0.4058 -0.0551 0.9907 -0.1241 -0.4021 -0.1358 -0.9054) - :load-commands '() - :vis-nick 'bea - :lev0 'beach - :disp0 'display - :lev1 'village1 - :disp1 'display - ) - ) - :tasks '((the binteger 15) (the binteger 16) (the binteger 17) (the binteger 18) (the binteger 19) (the binteger 20) (the binteger 21) (the binteger 22)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x -819200.0 :z -1556480.0 :w 1474560.0) - :buzzer 20 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) + :index 2 + :name 'village1 + :visname 'village1-vis + :nickname 'vi1 + :packages '(village1) + :sound-banks '(village1) + :music-bank 'village1 + :ambient-sounds '() + :mood '*village1-mood* + :mood-func 'update-mood-village1 + :ocean '*ocean-map-village1* + :sky #t + :sun-fade 1.0 + :continues + '((new 'static 'continue-point + :name "village1-hut" + :level 'village1 + :trans + (new 'static 'vector :x -638860.06 :y 139319.7 :z 769990.6 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9889 :w -0.148) + :camera-trans + (new 'static 'vector :x -668114.1 :y 164536.31 :z 828633.06 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.8947 0.0 -0.4464 0.1082 0.9701 -0.2169 0.4331 -0.2424 -0.868) + :load-commands '() + :vis-nick 'vi1 + :lev0 'village1 + :disp0 'display + :lev1 'beach + :disp1 #f + ) + (new 'static 'continue-point + :name "village1-intro" + :level 'village1 + :flags (continue-flags contf02 contf05) + :trans + (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) + :quat + (new 'static 'quaternion :y 0.591 :w 0.8066) + :camera-trans + (new 'static 'vector :x -559109.3 :y 200461.92 :z 826073.06 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7221 0.0 -0.6917 -0.0517 0.9972 -0.054 0.6897 0.0747 0.7201) + :load-commands '() + :vis-nick 'vi1 + :lev0 'village1 + :disp0 'display + :lev1 #f + :disp1 #f + ) + (new 'static 'continue-point + :name "village1-warp" + :level 'village1 + :flags (continue-flags contf02 contf11) + :trans + (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) + :quat + (new 'static 'quaternion :y 0.591 :w 0.8066) + :camera-trans + (new 'static 'vector :x -559109.3 :y 200461.92 :z 826073.06 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7221 0.0 -0.6917 -0.0517 0.9972 -0.054 0.6897 0.0747 0.7201) + :load-commands '() + :vis-nick 'vi1 + :lev0 'village1 + :disp0 'display + :lev1 'beach + :disp1 #f + ) + (new 'static 'continue-point + :name "village1-demo-convo" + :level 'village1 + :flags (continue-flags contf06) + :trans + (new 'static 'vector :x -542529.1 :y 189424.03 :z 847101.94 :w 1.0) + :quat + (new 'static 'quaternion :y -0.1717 :w -0.9851) + :camera-trans + (new 'static 'vector :x -559085.2 :y 202996.53 :z 826054.25 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7868 0.0 -0.6171 0.0775 0.992 0.0989 0.6122 -0.1257 0.7806) + :load-commands '() + :vis-nick 'vi1 + :lev0 'village1 + :disp0 'display + :lev1 'misty + :disp1 #f + ) + (new 'static 'continue-point + :name "intro-start" + :level 'village1 + :flags (continue-flags contf04) + :trans + (new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.2339 :w 0.9722) + :camera-trans + (new 'static 'vector :x 204089.34 :y 36257.793 :z 3358341.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.6381 0.0 0.7699 -0.0938 0.9925 0.0777 -0.7642 -0.1218 0.6333) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-11" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + (special "fishermans-boat-2" #t) + ) + :vis-nick 'vi1 + :lev0 'village1 + :disp0 'display + :lev1 'misty + :disp1 #f + ) + ) + :tasks '(10 11 12 13 14 75) + :priority #xc8 + :load-commands '() + :alt-load-commands + '(((display village1) (load misty)) ((special village1) (display misty)) ((display village1) (load beach))) + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x -444416.0 :y 133120.0 :z 360448.0 :w 843776.0) + :buzzer 75 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol jungle, type level-load-info -(define jungle +(define + beach (new 'static 'level-load-info - :name 'jungle - :visname 'jungle-vis - :nickname 'jun - :index 4 - :packages '(jungle) - :sound-banks '(jungle) - :music-bank 'jungle - :ambient-sounds '() - :mood '*jungle-mood* - :mood-func 'update-mood-jungle - :ocean '*ocean-map-village1* - :sky #t - :sun-fade 1.0 - :continues - '((new 'static 'continue-point - :name "jungle-start" - :level 'jungle - :trans (new 'static 'vector :x 1057631.9 :y 86404.305 :z -647140.56 :w 1.0) - :quat (new 'static 'quaternion :y -0.9009 :w -0.4339) - :camera-trans (new 'static 'vector :x 1004424.8 :y 111181.82 :z -611527.9 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.5568 0.0 -0.8306 0.201 0.9702 -0.1347 0.8059 -0.2419 -0.5402) - :load-commands '() - :vis-nick 'jun - :lev0 'jungle - :disp0 'display - :lev1 'village1 - :disp1 'display - ) - ) - :tasks '((the binteger 2) (the binteger 3) (the binteger 4) (the binteger 5) (the binteger 7) (the binteger 8) (the binteger 9)) - :priority 100 - :load-commands '() - :alt-load-commands '(((display jungle) (display jungleb)) ((display jungle) (display village1))) - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 1474560.0 :y 2519040.0 :z -983040.0 :w 2457600.0) - :buzzer 7 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) + :index 3 + :name 'beach + :visname 'beach-vis + :nickname 'bea + :packages '(beach) + :sound-banks '(beach) + :music-bank 'beach + :ambient-sounds '() + :mood '*beach-mood* + :mood-func 'update-mood-village1 + :ocean '*ocean-map-village1* + :sky #t + :sun-fade 1.0 + :continues + '((new 'static 'continue-point + :name "beach-start" + :level 'beach + :trans + (new 'static 'vector :x -504960.22 :y 9477.325 :z -223513.81 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9486 :w -0.3163) + :camera-trans + (new 'static 'vector :x -487550.16 :y 28354.15 :z -184211.05 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9139 0.0 0.4058 -0.0551 0.9907 -0.1241 -0.4021 -0.1358 -0.9054) + :load-commands '() + :vis-nick 'bea + :lev0 'beach + :disp0 'display + :lev1 'village1 + :disp1 'display + ) + ) + :tasks '(15 16 17 18 19 20 21 22) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x -819200.0 :z -1556480.0 :w 1474560.0) + :buzzer 20 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol jungleb, type level-load-info -(define jungleb +(define + jungle (new 'static 'level-load-info - :name 'jungleb - :visname 'jungleb-vis - :nickname 'jub - :index 5 - :packages '(jungleb) - :sound-banks '(jungleb) - :music-bank 'jungleb - :ambient-sounds '() - :mood '*jungleb-mood* - :mood-func 'update-mood-jungleb - :ocean 'none - :sky #f - :continues - '((new 'static 'continue-point - :name "jungle-tower" - :level 'jungleb - :trans (new 'static 'vector :x 1469510.0 :y -204745.52 :z -959058.3 :w 1.0) - :quat (new 'static 'quaternion :y -0.6194 :w -0.785) - :camera-trans (new 'static 'vector :x 1485298.5 :y -189972.08 :z -936548.75 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.8614 0.0 0.5078 -0.1177 0.9727 -0.1997 -0.4939 -0.2318 -0.8379) - :load-commands '() - :vis-nick 'jub - :lev0 'jungle - :disp0 'display - :lev1 'jungleb - :disp1 'display - ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsphere (new 'static 'sphere :x 1486848.0 :y -1269760.0 :z -1064960.0 :w 1228800.0) - :buzzer 7 - :bottom-height (meters -80.0) - :run-packages '("common" "jungle") - :wait-for-load #f - ) - ) - -;; definition for symbol misty, type level-load-info -(define misty - (new 'static 'level-load-info - :name 'misty - :visname 'misty-vis - :nickname 'mis - :index 6 - :packages '(misty) - :sound-banks '(misty) - :music-bank 'misty - :ambient-sounds '() - :mood '*misty-mood* - :mood-func 'update-mood-misty - :ocean '*ocean-map-village1* - :sky #t - :sun-fade 0.25 - :continues - '((new 'static 'continue-point - :name "misty-start" - :level 'misty - :trans (new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.2339 :w 0.9722) - :camera-trans (new 'static 'vector :x 204089.34 :y 36257.793 :z 3358341.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.6381 0.0 0.7699 -0.0938 0.9925 0.0777 -0.7642 -0.1218 0.6333) - :load-commands - '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-11" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - (special "fishermans-boat-2" #t) - ) - :vis-nick 'mis - :lev0 'misty - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - (new 'static 'continue-point - :name "misty-silo" - :level 'misty - :trans (new 'static 'vector :x -672503.0 :y 82131.35 :z 3651465.8 :w 1.0) - :quat (new 'static 'quaternion :y 0.0878 :w 0.9961) - :camera-trans (new 'static 'vector :x -675754.0 :y 102028.91 :z 3604800.8 :w 1.0) - :camera-rot (new 'static 'array float 9 0.9975 0.0 -0.0704 0.0086 0.9924 0.1223 0.0698 -0.1226 0.9899) - :load-commands - '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-11" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - (special "fishermans-boat-2" #t) - ) - :vis-nick 'mis - :lev0 'misty - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - (new 'static 'continue-point - :name "misty-bike" - :level 'misty - :trans (new 'static 'vector :x 302533.44 :y 35901.848 :z 4138967.8 :w 1.0) - :quat (new 'static 'quaternion :y -0.2809 :w 0.9597) - :camera-trans (new 'static 'vector :x 338476.25 :y 55700.684 :z 4109729.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.6308 0.0 0.7759 -0.096 0.9923 0.078 -0.7699 -0.1237 0.6259) - :load-commands - '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-11" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - (special "fishermans-boat-2" #t) - ) - :vis-nick 'mis - :lev0 'misty - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - (new 'static 'continue-point - :name "misty-backside" - :level 'misty - :trans (new 'static 'vector :x -304192.72 :y 33270.99 :z 4646525.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.8443 :w -0.5357) - :camera-trans (new 'static 'vector :x -346989.78 :y 54377.676 :z 4674685.5 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.5497 0.0 -0.8353 0.1009 0.9926 -0.0664 0.8291 -0.1208 -0.5457) - :load-commands - '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-11" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - (special "fishermans-boat-2" #t) - ) - :vis-nick 'mis - :lev0 'misty - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - (new 'static 'continue-point - :name "misty-silo2" - :level 'misty - :trans (new 'static 'vector :x -898000.06 :y 98038.17 :z 4162091.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.1102 :w 0.9938) - :camera-trans (new 'static 'vector :x -931459.9 :y 118198.68 :z 4196081.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.6605 0.0 -0.7508 0.1086 0.9894 -0.0955 0.7429 -0.1447 -0.6535) - :load-commands - '((special "med-res-level-1" #t) - (special "med-res-level-2" #t) - (special "med-res-level-4" #t) - (special "med-res-level-6" #t) - (special "med-res-level-7" #t) - (special "med-res-level-8" #t) - (special "med-res-level-9" #t) - (special "med-res-level-11" #t) - (special "med-res-level-14" #t) - (special "med-res-level-22" #t) - (special "med-res-level-23" #t) - (special "fishermans-boat-2" #t) - ) - :vis-nick 'mis - :lev0 'misty - :disp0 'display - :lev1 'village1 - :disp1 'special - ) - ) - :tasks '((the binteger 23) (the binteger 24) (the binteger 25) (the binteger 26) (the binteger 27) (the binteger 28) (the binteger 29) (the binteger 30)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :z 4096000.0 :w 1269760.0) - :buzzer 28 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #f - ) + :index 4 + :name 'jungle + :visname 'jungle-vis + :nickname 'jun + :packages '(jungle) + :sound-banks '(jungle) + :music-bank 'jungle + :ambient-sounds '() + :mood '*jungle-mood* + :mood-func 'update-mood-jungle + :ocean '*ocean-map-village1* + :sky #t + :sun-fade 1.0 + :continues + '((new 'static 'continue-point + :name "jungle-start" + :level 'jungle + :trans + (new 'static 'vector :x 1057631.9 :y 86404.305 :z -647140.56 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9009 :w -0.4339) + :camera-trans + (new 'static 'vector :x 1004424.8 :y 111181.82 :z -611527.9 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.5568 0.0 -0.8306 0.201 0.9702 -0.1347 0.8059 -0.2419 -0.5402) + :load-commands '() + :vis-nick 'jun + :lev0 'jungle + :disp0 'display + :lev1 'village1 + :disp1 'display + ) + ) + :tasks '(2 3 4 5 7 8 9) + :priority 100 + :load-commands '() + :alt-load-commands + '(((display jungle) (display jungleb)) ((display jungle) (display village1))) + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 1474560.0 :y 2519040.0 :z -983040.0 :w 2457600.0) + :buzzer 7 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol firecanyon, type level-load-info -(define firecanyon +(define + jungleb (new 'static 'level-load-info - :name 'firecanyon - :visname 'firecanyon-vis - :nickname 'fic - :index 7 - :packages '(firecanyon) - :sound-banks '(firecanyon) - :music-bank 'firecanyon - :ambient-sounds '() - :mood '*firecanyon-mood* - :mood-func 'update-mood-firecanyon - :ocean 'none - :sky #t - :continues - '((new 'static 'continue-point - :name "firecanyon-start" - :level 'firecanyon - :trans (new 'static 'vector :x -87377.1 :y 126444.75 :z -681697.25 :w 1.0) - :quat (new 'static 'quaternion :y 0.9921 :w -0.1246) - :camera-trans (new 'static 'vector :x -84559.055 :y 144685.47 :z -641194.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9976 0.0 0.0688 -0.01 0.9893 -0.1452 -0.068 -0.1456 -0.9869) - :load-commands '() - :vis-nick 'fic - :lev0 'firecanyon - :disp0 'display - :lev1 'village1 - :disp1 'display - ) - (new 'static 'continue-point - :name "firecanyon-end" - :level 'firecanyon - :trans (new 'static 'vector :x 1360576.1 :y 126976.0 :z -5839533.5 :w 1.0) - :quat (new 'static 'quaternion :y 0.1666 :w 0.986) - :camera-trans (new 'static 'vector :x 1378912.6 :y 144452.81 :z -5872527.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.8847 0.0 0.466 -0.0744 0.9871 0.1414 -0.46 -0.1598 0.8733) - :load-commands '() - :vis-nick 'fic - :lev0 'village2 - :disp0 'display - :lev1 'firecanyon - :disp1 'display + :index 5 + :name 'jungleb + :visname 'jungleb-vis + :nickname 'jub + :packages '(jungleb) + :sound-banks '(jungleb) + :music-bank 'jungleb + :ambient-sounds '() + :mood '*jungleb-mood* + :mood-func 'update-mood-jungleb + :ocean 'none + :sky #f + :continues + '((new 'static 'continue-point + :name "jungle-tower" + :level 'jungleb + :trans + (new 'static 'vector :x 1469510.0 :y -204745.52 :z -959058.3 :w 1.0) + :quat + (new 'static 'quaternion :y -0.6194 :w -0.785) + :camera-trans + (new 'static 'vector :x 1485298.5 :y -189972.08 :z -936548.75 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.8614 0.0 0.5078 -0.1177 0.9727 -0.1997 -0.4939 -0.2318 -0.8379) + :load-commands '() + :vis-nick 'jub + :lev0 'jungle + :disp0 'display + :lev1 'jungleb + :disp1 'display + ) ) - ) - :tasks '((the binteger 68) (the binteger 69)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 419840.0 :y 151552.0 :z -3006464.0 :w 2048000.0) - :buzzer 68 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsphere + (new 'static 'sphere :x 1486848.0 :y -1269760.0 :z -1064960.0 :w 1228800.0) + :buzzer 7 + :bottom-height (meters -80) + :run-packages '("common" "jungle") + :wait-for-load #f + ) ) -;; definition for symbol village2, type level-load-info -(define village2 +(define + misty (new 'static 'level-load-info - :name 'village2 - :visname 'village2-vis - :nickname 'vi2 - :index 8 - :packages '(village2) - :sound-banks '(village2) - :music-bank 'village2 - :ambient-sounds '() - :mood '*village2-mood* - :mood-func 'update-mood-village2 - :ocean '*ocean-map-village2* - :sky #t - :continues - '((new 'static 'continue-point - :name "village2-start" - :level 'village2 - :trans (new 'static 'vector :x 1460961.2 :y 108562.02 :z -6161391.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.9917 :w 0.1278) - :camera-trans (new 'static 'vector :x 1468018.8 :y 133790.92 :z -6096227.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9941 0.0 0.1076 -0.0261 0.9699 -0.2418 -0.1044 -0.2432 -0.9643) - :load-commands '() - :vis-nick 'vi2 - :lev0 'village2 - :disp0 'display - :lev1 'firecanyon - :disp1 #f - ) - (new 'static 'continue-point - :name "village2-warp" - :level 'village2 - :flags #x4 - :trans (new 'static 'vector :x 1592492.9 :y 91648.0 :z -6328677.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.7469 :w 0.6648) - :camera-trans (new 'static 'vector :x 1555766.1 :y 103759.46 :z -6318964.5 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.2562 0.0 -0.9666 -0.0253 0.9996 0.0067 0.9662 0.0262 -0.2561) - :load-commands '() - :vis-nick 'vi2 - :lev0 'village2 - :disp0 'display - :lev1 'firecanyon - :disp1 #f - ) - (new 'static 'continue-point - :name "village2-dock" - :level 'village2 - :trans (new 'static 'vector :x 1264346.8 :y 19451.494 :z -6833563.5 :w 1.0) - :quat (new 'static 'quaternion :y 0.0258 :w 0.9996) - :camera-trans (new 'static 'vector :x 1265547.2 :y 34647.656 :z -6862636.5 :w 1.0) - :camera-rot (new 'static 'array float 9 0.9991 0.0 0.0411 -0.0088 0.9764 0.2155 -0.0401 -0.2156 0.9756) - :load-commands '() - :vis-nick 'vi2 - :lev0 'village2 - :disp0 'display - :lev1 'rolling - :disp1 #f + :index 6 + :name 'misty + :visname 'misty-vis + :nickname 'mis + :packages '(misty) + :sound-banks '(misty) + :music-bank 'misty + :ambient-sounds '() + :mood '*misty-mood* + :mood-func 'update-mood-misty + :ocean '*ocean-map-village1* + :sky #t + :sun-fade 0.25 + :continues + '((new 'static 'continue-point + :name "misty-start" + :level 'misty + :trans + (new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.2339 :w 0.9722) + :camera-trans + (new 'static 'vector :x 204089.34 :y 36257.793 :z 3358341.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.6381 0.0 0.7699 -0.0938 0.9925 0.0777 -0.7642 -0.1218 0.6333) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-11" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + (special "fishermans-boat-2" #t) + ) + :vis-nick 'mis + :lev0 'misty + :disp0 'display + :lev1 'village1 + :disp1 'special + ) + (new 'static 'continue-point + :name "misty-silo" + :level 'misty + :trans + (new 'static 'vector :x -672503.0 :y 82131.35 :z 3651465.8 :w 1.0) + :quat + (new 'static 'quaternion :y 0.0878 :w 0.9961) + :camera-trans + (new 'static 'vector :x -675754.0 :y 102028.91 :z 3604800.8 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9975 0.0 -0.0704 0.0086 0.9924 0.1223 0.0698 -0.1226 0.9899) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-11" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + (special "fishermans-boat-2" #t) + ) + :vis-nick 'mis + :lev0 'misty + :disp0 'display + :lev1 'village1 + :disp1 'special + ) + (new 'static 'continue-point + :name "misty-bike" + :level 'misty + :trans + (new 'static 'vector :x 302533.44 :y 35901.848 :z 4138967.8 :w 1.0) + :quat + (new 'static 'quaternion :y -0.2809 :w 0.9597) + :camera-trans + (new 'static 'vector :x 338476.25 :y 55700.684 :z 4109729.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.6308 0.0 0.7759 -0.096 0.9923 0.078 -0.7699 -0.1237 0.6259) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-11" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + (special "fishermans-boat-2" #t) + ) + :vis-nick 'mis + :lev0 'misty + :disp0 'display + :lev1 'village1 + :disp1 'special + ) + (new 'static 'continue-point + :name "misty-backside" + :level 'misty + :trans + (new 'static 'vector :x -304192.72 :y 33270.99 :z 4646525.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.8443 :w -0.5357) + :camera-trans + (new 'static 'vector :x -346989.78 :y 54377.676 :z 4674685.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.5497 0.0 -0.8353 0.1009 0.9926 -0.0664 0.8291 -0.1208 -0.5457) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-11" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + (special "fishermans-boat-2" #t) + ) + :vis-nick 'mis + :lev0 'misty + :disp0 'display + :lev1 'village1 + :disp1 'special + ) + (new 'static 'continue-point + :name "misty-silo2" + :level 'misty + :trans + (new 'static 'vector :x -898000.06 :y 98038.17 :z 4162091.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.1102 :w 0.9938) + :camera-trans + (new 'static 'vector :x -931459.9 :y 118198.68 :z 4196081.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.6605 0.0 -0.7508 0.1086 0.9894 -0.0955 0.7429 -0.1447 -0.6535) + :load-commands + '((special "med-res-level-1" #t) + (special "med-res-level-2" #t) + (special "med-res-level-4" #t) + (special "med-res-level-6" #t) + (special "med-res-level-7" #t) + (special "med-res-level-8" #t) + (special "med-res-level-9" #t) + (special "med-res-level-11" #t) + (special "med-res-level-14" #t) + (special "med-res-level-22" #t) + (special "med-res-level-23" #t) + (special "fishermans-boat-2" #t) + ) + :vis-nick 'mis + :lev0 'misty + :disp0 'display + :lev1 'village1 + :disp1 'special + ) ) - ) - :tasks '((the binteger 31) (the binteger 32) (the binteger 34) (the binteger 35) (the binteger 76)) - :priority #xc8 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 1392640.0 :y 81920.0 :z -6770688.0 :w 696320.0) - :buzzer 76 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) + :tasks '(23 24 25 26 27 28 29 30) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :z 4096000.0 :w 1269760.0) + :buzzer 28 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol sunken, type level-load-info -(define sunken +(define + firecanyon (new 'static 'level-load-info - :name 'sunken - :visname 'sunken-vis - :nickname 'sun - :index 9 - :packages '(sunken) - :sound-banks '(sunken) - :music-bank 'sunken - :ambient-sounds '() - :mood '*sunken-mood* - :mood-func 'update-mood-sunken - :ocean '*ocean-map-sunken* - :sky #f - :continues - '((new 'static 'continue-point - :name "sunken-start" - :level 'sunken - :trans (new 'static 'vector :x 2172095.2 :y -591749.94 :z -6721553.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.5083 :w 0.8611) - :camera-trans (new 'static 'vector :x 2138871.5 :y -572296.4 :z -6751967.5 :w 1.0) - :camera-rot (new 'static 'array float 9 0.7575 0.0 -0.6527 0.0858 0.9913 0.0995 0.647 -0.1314 0.7509) - :load-commands '() - :vis-nick 'sun - :lev0 'sunken - :disp0 'display - :lev1 'village2 - :disp1 'display - ) - (new 'static 'continue-point - :name "sunken1" - :level 'sunken - :trans (new 'static 'vector :x 3062988.5 :y -536575.56 :z -6527484.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.5304 :w 0.8477) - :camera-trans (new 'static 'vector :x 3015461.2 :y -515480.38 :z -6546573.5 :w 1.0) - :camera-rot (new 'static 'array float 9 0.3725 0.0 -0.928 0.1121 0.9926 0.045 0.9212 -0.1208 0.3697) - :load-commands '() - :vis-nick 'sun - :lev0 'sunken - :disp0 'display - :lev1 'sunkenb - :disp1 #f - ) - (new 'static 'continue-point - :name "sunken2" - :level 'sunken - :trans (new 'static 'vector :x 3133625.5 :y -569343.56 :z -6909587.5 :w 1.0) - :quat (new 'static 'quaternion :y -0.9512 :w 0.3083) - :camera-trans (new 'static 'vector :x 3170833.2 :y -548244.25 :z -6874378.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.6872 0.0 0.7263 -0.0878 0.9926 -0.0831 -0.721 -0.1209 -0.6822) - :load-commands '() - :vis-nick 'sun - :lev0 'sunken - :disp0 'display - :lev1 'sunkenb - :disp1 #f - ) - (new 'static 'continue-point - :name "sunken-tube1" - :level 'sunken - :trans (new 'static 'vector :x 2649601.8 :y -569343.56 :z -7132970.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.9936 :w 0.1124) - :camera-trans (new 'static 'vector :x 2636150.2 :y -555656.4 :z -7114732.5 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.8024 0.0 -0.5967 0.1721 0.9574 -0.2315 0.5713 -0.2885 -0.7683) - :load-commands '() - :vis-nick 'sun - :lev0 'sunken - :disp0 'display - :lev1 'sunkenb - :disp1 #f + :index 7 + :name 'firecanyon + :visname 'firecanyon-vis + :nickname 'fic + :packages '(firecanyon) + :sound-banks '(firecanyon) + :music-bank 'firecanyon + :ambient-sounds '() + :mood '*firecanyon-mood* + :mood-func 'update-mood-firecanyon + :ocean 'none + :sky #t + :continues + '((new 'static 'continue-point + :name "firecanyon-start" + :level 'firecanyon + :trans + (new 'static 'vector :x -87377.1 :y 126444.75 :z -681697.25 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9921 :w -0.1246) + :camera-trans + (new 'static 'vector :x -84559.055 :y 144685.47 :z -641194.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9976 0.0 0.0688 -0.01 0.9893 -0.1452 -0.068 -0.1456 -0.9869) + :load-commands '() + :vis-nick 'fic + :lev0 'firecanyon + :disp0 'display + :lev1 'village1 + :disp1 'display + ) + (new 'static 'continue-point + :name "firecanyon-end" + :level 'firecanyon + :trans + (new 'static 'vector :x 1360576.1 :y 126976.0 :z -5839533.5 :w 1.0) + :quat + (new 'static 'quaternion :y 0.1666 :w 0.986) + :camera-trans + (new 'static 'vector :x 1378912.6 :y 144452.81 :z -5872527.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.8847 0.0 0.466 -0.0744 0.9871 0.1414 -0.46 -0.1598 0.8733) + :load-commands '() + :vis-nick 'fic + :lev0 'village2 + :disp0 'display + :lev1 'firecanyon + :disp1 'display + ) ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 2867200.0 :y -2048000.0 :z -6553600.0 :w 2048000.0) - :buzzer 49 - :bottom-height (meters -500.0) - :run-packages '("common") - :wait-for-load #f - ) + :tasks '(68 69) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 419840.0 :y 151552.0 :z -3006464.0 :w 2048000.0) + :buzzer 68 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol sunkenb, type level-load-info -(define sunkenb +(define + village2 (new 'static 'level-load-info - :name 'sunkenb - :visname 'sunkenb-vis - :nickname 'sub - :index 10 - :packages '() - :sound-banks '(sunken) - :music-bank 'sunken - :ambient-sounds '() - :mood '*sunkenb-mood* - :mood-func 'update-mood-sunken - :ocean '*ocean-map-sunken* - :sky #t - :continues - '((new 'static 'continue-point - :name "sunkenb-start" - :level 'sunkenb - :trans (new 'static 'vector :x 2229231.2 :y -1019912.2 :z -6788748.5 :w 1.0) - :quat (new 'static 'quaternion :y 0.895 :w 0.446) - :camera-trans (new 'static 'vector :x 2187840.0 :y -998915.7 :z -6759328.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.5786 0.0 -0.8155 0.0992 0.9925 -0.0704 0.8094 -0.1217 -0.5743) - :load-commands '((alive "exit-chamber-1")) - :vis-nick 'sub - :lev0 'sunken - :disp0 'display - :lev1 'sunkenb - :disp1 'display - ) - (new 'static 'continue-point - :name "sunkenb-helix" - :level 'sunkenb - :trans (new 'static 'vector :x 2466572.8 :y -1838989.2 :z -7299582.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.8841 :w 0.4672) - :camera-trans (new 'static 'vector :x 2515616.2 :y -1817888.4 :z -7284843.5 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.2889 0.0 0.9573 -0.1163 0.9925 -0.0351 -0.9502 -0.1214 -0.2867) - :load-commands '() - :vis-nick 'sub - :lev0 'sunken - :disp0 'display - :lev1 'sunkenb - :disp1 'display + :index 8 + :name 'village2 + :visname 'village2-vis + :nickname 'vi2 + :packages '(village2) + :sound-banks '(village2) + :music-bank 'village2 + :ambient-sounds '() + :mood '*village2-mood* + :mood-func 'update-mood-village2 + :ocean '*ocean-map-village2* + :sky #t + :continues + '((new 'static 'continue-point + :name "village2-start" + :level 'village2 + :trans + (new 'static 'vector :x 1460961.2 :y 108562.02 :z -6161391.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9917 :w 0.1278) + :camera-trans + (new 'static 'vector :x 1468018.8 :y 133790.92 :z -6096227.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9941 0.0 0.1076 -0.0261 0.9699 -0.2418 -0.1044 -0.2432 -0.9643) + :load-commands '() + :vis-nick 'vi2 + :lev0 'village2 + :disp0 'display + :lev1 'firecanyon + :disp1 #f + ) + (new 'static 'continue-point + :name "village2-warp" + :level 'village2 + :flags (continue-flags contf02) + :trans + (new 'static 'vector :x 1592492.9 :y 91648.0 :z -6328677.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.7469 :w 0.6648) + :camera-trans + (new 'static 'vector :x 1555766.1 :y 103759.46 :z -6318964.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.2562 0.0 -0.9666 -0.0253 0.9996 0.0067 0.9662 0.0262 -0.2561) + :load-commands '() + :vis-nick 'vi2 + :lev0 'village2 + :disp0 'display + :lev1 'firecanyon + :disp1 #f + ) + (new 'static 'continue-point + :name "village2-dock" + :level 'village2 + :trans + (new 'static 'vector :x 1264346.8 :y 19451.494 :z -6833563.5 :w 1.0) + :quat + (new 'static 'quaternion :y 0.0258 :w 0.9996) + :camera-trans + (new 'static 'vector :x 1265547.2 :y 34647.656 :z -6862636.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9991 0.0 0.0411 -0.0088 0.9764 0.2155 -0.0401 -0.2156 0.9756) + :load-commands '() + :vis-nick 'vi2 + :lev0 'village2 + :disp0 'display + :lev1 'rolling + :disp1 #f + ) ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 2867200.0 :y -2048000.0 :z -6553600.0 :w 2048000.0) - :buzzer 49 - :bottom-height (meters -500.0) - :run-packages '("common" "sunken") - :wait-for-load #f - ) + :tasks '(31 32 34 35 76) + :priority #xc8 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 1392640.0 :y 81920.0 :z -6770688.0 :w 696320.0) + :buzzer 76 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol swamp, type level-load-info -(define swamp +(define + sunken (new 'static 'level-load-info - :name 'swamp - :visname 'swamp-vis - :nickname 'swa - :index 11 - :packages '(swamp) - :sound-banks '(swamp) - :music-bank 'swamp - :ambient-sounds '() - :mood '*swamp-mood* - :mood-func 'update-mood-swamp - :ocean '*ocean-map-village2* - :sky #t - :continues - '((new 'static 'continue-point - :name "swamp-start" - :level 'swamp - :trans (new 'static 'vector :x 1842537.2 :y 21027.227 :z -7333297.5 :w 1.0) - :quat (new 'static 'quaternion :y -0.9933 :w 0.1153) - :camera-trans (new 'static 'vector :x 1862529.9 :y 44371.56 :z -7277995.5 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9403 0.0 0.3402 -0.0814 0.9708 -0.2252 -0.3303 -0.2394 -0.9129) - :load-commands - '((special "swamp-blimp-3" #t) - (special "precursor-arm-3" #t) - (special "swamp-tetherrock-13" #t) - (special "swamp-tetherrock-14" #t) - (special "swamp-tetherrock-15" #t) - (special "swamp-tetherrock-16" #t) - ) - :vis-nick 'swa - :lev0 'swamp - :disp0 'display - :lev1 'village2 - :disp1 'display - ) - (new 'static 'continue-point - :name "swamp-dock1" - :level 'swamp - :trans (new 'static 'vector :x 1360386.9 :y 5823.693 :z -8218890.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.585 :w -0.811) - :camera-trans (new 'static 'vector :x 1314475.6 :y 26164.838 :z -8234152.5 :w 1.0) - :camera-rot (new 'static 'array float 9 0.3154 0.0 -0.9489 0.1134 0.9928 0.0376 0.9421 -0.1195 0.3131) - :load-commands - '((special "swamp-blimp-3" #t) - (special "precursor-arm-3" #t) - (special "swamp-tetherrock-13" #t) - (special "swamp-tetherrock-14" #t) - (special "swamp-tetherrock-15" #t) - (special "swamp-tetherrock-16" #t) - ) - :vis-nick 'swa - :lev0 'swamp - :disp0 'display - :lev1 'village2 - :disp1 'special-vis - ) - (new 'static 'continue-point - :name "swamp-cave1" - :level 'swamp - :trans (new 'static 'vector :x 1553700.5 :y 1835.4176 :z -8258429.5 :w 1.0) - :quat (new 'static 'quaternion :y -0.9871 :w -0.1599) - :camera-trans (new 'static 'vector :x 1556873.2 :y 22715.598 :z -8208106.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9982 0.0 0.0596 -0.0072 0.9926 -0.1209 -0.0592 -0.1211 -0.9908) - :load-commands - '((special "swamp-blimp-3" #t) - (special "precursor-arm-3" #t) - (special "swamp-tetherrock-13" #t) - (special "swamp-tetherrock-14" #t) - (special "swamp-tetherrock-15" #t) - (special "swamp-tetherrock-16" #t) - ) - :vis-nick 'swa - :lev0 'swamp - :disp0 'display - :lev1 'village2 - :disp1 'special-vis - ) - (new 'static 'continue-point - :name "swamp-dock2" - :level 'swamp - :trans (new 'static 'vector :x 1645872.4 :y 36495.77 :z -8427323.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.8294 :w -0.5586) - :camera-trans (new 'static 'vector :x 1599338.9 :y 57590.168 :z -8405954.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.418 0.0 -0.9084 0.1106 0.9925 -0.0509 0.9016 -0.1218 -0.4149) - :load-commands - '((special "swamp-blimp-3" #t) - (special "precursor-arm-3" #t) - (special "swamp-tetherrock-13" #t) - (special "swamp-tetherrock-14" #t) - (special "swamp-tetherrock-15" #t) - (special "swamp-tetherrock-16" #t) - ) - :vis-nick 'swa - :lev0 'swamp - :disp0 'display - :lev1 'village2 - :disp1 'special-vis - ) - (new 'static 'continue-point - :name "swamp-cave2" - :level 'swamp - :trans (new 'static 'vector :x 2037539.2 :y 1103.872 :z -8560013.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.0559 :w 0.9984) - :camera-trans (new 'static 'vector :x 1995208.2 :y 21832.908 :z -8586304.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.5516 0.0 -0.834 0.097 0.9932 0.0641 0.8283 -0.1163 0.5479) - :load-commands - '((special "swamp-blimp-3" #t) - (special "precursor-arm-3" #t) - (special "swamp-tetherrock-13" #t) - (special "swamp-tetherrock-14" #t) - (special "swamp-tetherrock-15" #t) - (special "swamp-tetherrock-16" #t) - ) - :vis-nick 'swa - :lev0 'swamp - :disp0 'display - :lev1 'village2 - :disp1 'special-vis - ) - (new 'static 'continue-point - :name "swamp-game" - :level 'swamp - :trans (new 'static 'vector :x 2612289.2 :y -2047.5905 :z -8315907.5 :w 1.0) - :quat (new 'static 'quaternion :y -0.6975 :w 0.7165) - :camera-trans (new 'static 'vector :x 2661940.5 :y 20693.81 :z -8317980.5 :w 1.0) - :camera-rot (new 'static 'array float 9 0.0406 0.0 0.9991 -0.1452 0.9893 0.0059 -0.9885 -0.1453 0.0402) - :load-commands - '((special "swamp-blimp-3" #t) - (special "precursor-arm-3" #t) - (special "swamp-tetherrock-13" #t) - (special "swamp-tetherrock-14" #t) - (special "swamp-tetherrock-15" #t) - (special "swamp-tetherrock-16" #t) - ) - :vis-nick 'swa - :lev0 'swamp - :disp0 'display - :lev1 'village2 - :disp1 'special-vis - ) - (new 'static 'continue-point - :name "swamp-cave3" - :level 'swamp - :trans (new 'static 'vector :x 2011811.4 :y 3711.7952 :z -7923027.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.5269 :w 0.8499) - :camera-trans (new 'static 'vector :x 2053120.4 :y 22242.51 :z -7927784.5 :w 1.0) - :camera-rot (new 'static 'array float 9 0.1145 0.0 0.9934 -0.1412 0.9898 0.0162 -0.9833 -0.1422 0.1134) - :load-commands - '((special "swamp-blimp-3" #t) - (special "precursor-arm-3" #t) - (special "swamp-tetherrock-13" #t) - (special "swamp-tetherrock-14" #t) - (special "swamp-tetherrock-15" #t) - (special "swamp-tetherrock-16" #t) - ) - :vis-nick 'swa - :lev0 'swamp - :disp0 'display - :lev1 'village2 - :disp1 'special-vis + :index 9 + :name 'sunken + :visname 'sunken-vis + :nickname 'sun + :packages '(sunken) + :sound-banks '(sunken) + :music-bank 'sunken + :ambient-sounds '() + :mood '*sunken-mood* + :mood-func 'update-mood-sunken + :ocean '*ocean-map-sunken* + :sky #f + :continues + '((new 'static 'continue-point + :name "sunken-start" + :level 'sunken + :trans + (new 'static 'vector :x 2172095.2 :y -591749.94 :z -6721553.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.5083 :w 0.8611) + :camera-trans + (new 'static 'vector :x 2138871.5 :y -572296.4 :z -6751967.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7575 0.0 -0.6527 0.0858 0.9913 0.0995 0.647 -0.1314 0.7509) + :load-commands '() + :vis-nick 'sun + :lev0 'sunken + :disp0 'display + :lev1 'village2 + :disp1 'display + ) + (new 'static 'continue-point + :name "sunken1" + :level 'sunken + :trans + (new 'static 'vector :x 3062988.5 :y -536575.56 :z -6527484.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.5304 :w 0.8477) + :camera-trans + (new 'static 'vector :x 3015461.2 :y -515480.38 :z -6546573.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.3725 0.0 -0.928 0.1121 0.9926 0.045 0.9212 -0.1208 0.3697) + :load-commands '() + :vis-nick 'sun + :lev0 'sunken + :disp0 'display + :lev1 'sunkenb + :disp1 #f + ) + (new 'static 'continue-point + :name "sunken2" + :level 'sunken + :trans + (new 'static 'vector :x 3133625.5 :y -569343.56 :z -6909587.5 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9512 :w 0.3083) + :camera-trans + (new 'static 'vector :x 3170833.2 :y -548244.25 :z -6874378.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.6872 0.0 0.7263 -0.0878 0.9926 -0.0831 -0.721 -0.1209 -0.6822) + :load-commands '() + :vis-nick 'sun + :lev0 'sunken + :disp0 'display + :lev1 'sunkenb + :disp1 #f + ) + (new 'static 'continue-point + :name "sunken-tube1" + :level 'sunken + :trans + (new 'static 'vector :x 2649601.8 :y -569343.56 :z -7132970.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9936 :w 0.1124) + :camera-trans + (new 'static 'vector :x 2636150.2 :y -555656.4 :z -7114732.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.8024 0.0 -0.5967 0.1721 0.9574 -0.2315 0.5713 -0.2885 -0.7683) + :load-commands '() + :vis-nick 'sun + :lev0 'sunken + :disp0 'display + :lev1 'sunkenb + :disp1 #f + ) ) - ) - :tasks '((the binteger 36) (the binteger 37) (the binteger 38) (the binteger 39) (the binteger 40) (the binteger 41) (the binteger 42) (the binteger 43)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 1986560.0 :z -8417280.0 :w 1003520.0) - :buzzer 43 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 2867200.0 :y -2048000.0 :z -6553600.0 :w 2048000.0) + :buzzer 49 + :bottom-height (meters -500) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol rolling, type level-load-info -(define rolling - (new 'static 'level-load-info - :name 'rolling - :visname 'rolling-vis - :nickname 'rol - :index 12 - :packages '(rolling) - :sound-banks '(rolling) - :music-bank 'rolling - :ambient-sounds '() - :mood '*rolling-mood* - :mood-func 'update-mood-rolling - :ocean 'none - :sky #t - :continues - '((new 'static 'continue-point - :name "rolling-start" - :level 'rolling - :trans (new 'static 'vector :x 432272.6 :y 42821.633 :z -6737529.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.545 :w 0.8383) - :camera-trans (new 'static 'vector :x 494105.8 :y 67237.48 :z -6748524.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.1759 0.0 0.9843 -0.2371 0.9705 0.0423 -0.9553 -0.2409 0.1707) - :load-commands '() - :vis-nick 'rol - :lev0 'rolling - :disp0 'display - :lev1 'village2 - :disp1 'display - ) - ) - :tasks '((the binteger 52) (the binteger 53) (the binteger 54) (the binteger 55) (the binteger 56) (the binteger 57) (the binteger 58) (the binteger 59)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere - (new 'static 'sphere :x -753664.0 :y 131072.0 :z -6569984.0 :w 974848.0) - :buzzer 57 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) +(define + sunkenb + (new 'static 'level-load-info + :index 10 + :name 'sunkenb + :visname 'sunkenb-vis + :nickname 'sub + :packages '() + :sound-banks '(sunken) + :music-bank 'sunken + :ambient-sounds '() + :mood '*sunkenb-mood* + :mood-func 'update-mood-sunken + :ocean '*ocean-map-sunken* + :sky #t + :continues + '((new 'static 'continue-point + :name "sunkenb-start" + :level 'sunkenb + :trans + (new 'static 'vector :x 2229231.2 :y -1019912.2 :z -6788748.5 :w 1.0) + :quat + (new 'static 'quaternion :y 0.895 :w 0.446) + :camera-trans + (new 'static 'vector :x 2187840.0 :y -998915.7 :z -6759328.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.5786 0.0 -0.8155 0.0992 0.9925 -0.0704 0.8094 -0.1217 -0.5743) + :load-commands '((alive "exit-chamber-1")) + :vis-nick 'sub + :lev0 'sunken + :disp0 'display + :lev1 'sunkenb + :disp1 'display + ) + (new 'static 'continue-point + :name "sunkenb-helix" + :level 'sunkenb + :trans + (new 'static 'vector :x 2466572.8 :y -1838989.2 :z -7299582.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.8841 :w 0.4672) + :camera-trans + (new 'static 'vector :x 2515616.2 :y -1817888.4 :z -7284843.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.2889 0.0 0.9573 -0.1163 0.9925 -0.0351 -0.9502 -0.1214 -0.2867) + :load-commands '() + :vis-nick 'sub + :lev0 'sunken + :disp0 'display + :lev1 'sunkenb + :disp1 'display + ) + ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 2867200.0 :y -2048000.0 :z -6553600.0 :w 2048000.0) + :buzzer 49 + :bottom-height (meters -500) + :run-packages '("common" "sunken") + :wait-for-load #f + ) ) -;; definition for symbol ogre, type level-load-info -(define ogre +(define + swamp (new 'static 'level-load-info - :name 'ogre - :visname 'ogre-vis - :nickname 'ogr - :index 13 - :packages '(ogre) - :sound-banks '(ogre) - :music-bank 'ogre - :ambient-sounds '() - :mood '*ogre-mood* - :mood-func 'update-mood-ogre - :ocean 'none - :sky #t - :continues - '((new 'static 'continue-point - :name "ogre-start" - :level 'ogre - :trans (new 'static 'vector :x 849775.8 :y 163962.88 :z -7301166.5 :w 1.0) - :quat (new 'static 'quaternion :y -0.9931 :w 0.1166) - :camera-trans (new 'static 'vector :x 848906.25 :y 185056.88 :z -7249962.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9998 0.0 -0.0159 0.0019 0.9925 -0.1215 0.0158 -0.1215 -0.9924) - :load-commands '() - :vis-nick 'ogr - :lev0 'ogre - :disp0 'display - :lev1 'village2 - :disp1 'display - ) - (new 'static 'continue-point - :name "ogre-race" - :level 'ogre - :trans (new 'static 'vector :x 841424.9 :y 163801.1 :z -8205419.5 :w 1.0) - :quat (new 'static 'quaternion :y -0.9857 :w 0.168) - :camera-trans (new 'static 'vector :x 860479.9 :y 183815.38 :z -8162368.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9145 0.0 0.4045 -0.0497 0.9924 -0.1125 -0.4015 -0.123 -0.9075) - :load-commands '() - :vis-nick 'ogr - :lev0 'ogre - :disp0 'display - :lev1 'village2 - :disp1 #f - ) - (new 'static 'continue-point - :name "ogre-end" - :level 'ogre - :trans (new 'static 'vector :x 3971233.5 :y 141227.62 :z -13935735.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.8721 :w 0.4892) - :camera-trans (new 'static 'vector :x 3997892.2 :y 159604.73 :z -13904449.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.7611 0.0 0.6485 -0.0932 0.9896 -0.1094 -0.6417 -0.1438 -0.7532) - :load-commands '() - :vis-nick 'ogr - :lev0 'village3 - :disp0 'display - :lev1 'ogre - :disp1 'display + :index 11 + :name 'swamp + :visname 'swamp-vis + :nickname 'swa + :packages '(swamp) + :sound-banks '(swamp) + :music-bank 'swamp + :ambient-sounds '() + :mood '*swamp-mood* + :mood-func 'update-mood-swamp + :ocean '*ocean-map-village2* + :sky #t + :continues + '((new 'static 'continue-point + :name "swamp-start" + :level 'swamp + :trans + (new 'static 'vector :x 1842537.2 :y 21027.227 :z -7333297.5 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9933 :w 0.1153) + :camera-trans + (new 'static 'vector :x 1862529.9 :y 44371.56 :z -7277995.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9403 0.0 0.3402 -0.0814 0.9708 -0.2252 -0.3303 -0.2394 -0.9129) + :load-commands + '((special "swamp-blimp-3" #t) + (special "precursor-arm-3" #t) + (special "swamp-tetherrock-13" #t) + (special "swamp-tetherrock-14" #t) + (special "swamp-tetherrock-15" #t) + (special "swamp-tetherrock-16" #t) + ) + :vis-nick 'swa + :lev0 'swamp + :disp0 'display + :lev1 'village2 + :disp1 'display + ) + (new 'static 'continue-point + :name "swamp-dock1" + :level 'swamp + :trans + (new 'static 'vector :x 1360386.9 :y 5823.693 :z -8218890.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.585 :w -0.811) + :camera-trans + (new 'static 'vector :x 1314475.6 :y 26164.838 :z -8234152.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.3154 0.0 -0.9489 0.1134 0.9928 0.0376 0.9421 -0.1195 0.3131) + :load-commands + '((special "swamp-blimp-3" #t) + (special "precursor-arm-3" #t) + (special "swamp-tetherrock-13" #t) + (special "swamp-tetherrock-14" #t) + (special "swamp-tetherrock-15" #t) + (special "swamp-tetherrock-16" #t) + ) + :vis-nick 'swa + :lev0 'swamp + :disp0 'display + :lev1 'village2 + :disp1 'special-vis + ) + (new 'static 'continue-point + :name "swamp-cave1" + :level 'swamp + :trans + (new 'static 'vector :x 1553700.5 :y 1835.4176 :z -8258429.5 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9871 :w -0.1599) + :camera-trans + (new 'static 'vector :x 1556873.2 :y 22715.598 :z -8208106.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9982 0.0 0.0596 -0.0072 0.9926 -0.1209 -0.0592 -0.1211 -0.9908) + :load-commands + '((special "swamp-blimp-3" #t) + (special "precursor-arm-3" #t) + (special "swamp-tetherrock-13" #t) + (special "swamp-tetherrock-14" #t) + (special "swamp-tetherrock-15" #t) + (special "swamp-tetherrock-16" #t) + ) + :vis-nick 'swa + :lev0 'swamp + :disp0 'display + :lev1 'village2 + :disp1 'special-vis + ) + (new 'static 'continue-point + :name "swamp-dock2" + :level 'swamp + :trans + (new 'static 'vector :x 1645872.4 :y 36495.77 :z -8427323.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.8294 :w -0.5586) + :camera-trans + (new 'static 'vector :x 1599338.9 :y 57590.168 :z -8405954.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.418 0.0 -0.9084 0.1106 0.9925 -0.0509 0.9016 -0.1218 -0.4149) + :load-commands + '((special "swamp-blimp-3" #t) + (special "precursor-arm-3" #t) + (special "swamp-tetherrock-13" #t) + (special "swamp-tetherrock-14" #t) + (special "swamp-tetherrock-15" #t) + (special "swamp-tetherrock-16" #t) + ) + :vis-nick 'swa + :lev0 'swamp + :disp0 'display + :lev1 'village2 + :disp1 'special-vis + ) + (new 'static 'continue-point + :name "swamp-cave2" + :level 'swamp + :trans + (new 'static 'vector :x 2037539.2 :y 1103.872 :z -8560013.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.0559 :w 0.9984) + :camera-trans + (new 'static 'vector :x 1995208.2 :y 21832.908 :z -8586304.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.5516 0.0 -0.834 0.097 0.9932 0.0641 0.8283 -0.1163 0.5479) + :load-commands + '((special "swamp-blimp-3" #t) + (special "precursor-arm-3" #t) + (special "swamp-tetherrock-13" #t) + (special "swamp-tetherrock-14" #t) + (special "swamp-tetherrock-15" #t) + (special "swamp-tetherrock-16" #t) + ) + :vis-nick 'swa + :lev0 'swamp + :disp0 'display + :lev1 'village2 + :disp1 'special-vis + ) + (new 'static 'continue-point + :name "swamp-game" + :level 'swamp + :trans + (new 'static 'vector :x 2612289.2 :y -2047.5905 :z -8315907.5 :w 1.0) + :quat + (new 'static 'quaternion :y -0.6975 :w 0.7165) + :camera-trans + (new 'static 'vector :x 2661940.5 :y 20693.81 :z -8317980.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.0406 0.0 0.9991 -0.1452 0.9893 0.0059 -0.9885 -0.1453 0.0402) + :load-commands + '((special "swamp-blimp-3" #t) + (special "precursor-arm-3" #t) + (special "swamp-tetherrock-13" #t) + (special "swamp-tetherrock-14" #t) + (special "swamp-tetherrock-15" #t) + (special "swamp-tetherrock-16" #t) + ) + :vis-nick 'swa + :lev0 'swamp + :disp0 'display + :lev1 'village2 + :disp1 'special-vis + ) + (new 'static 'continue-point + :name "swamp-cave3" + :level 'swamp + :trans + (new 'static 'vector :x 2011811.4 :y 3711.7952 :z -7923027.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.5269 :w 0.8499) + :camera-trans + (new 'static 'vector :x 2053120.4 :y 22242.51 :z -7927784.5 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.1145 0.0 0.9934 -0.1412 0.9898 0.0162 -0.9833 -0.1422 0.1134) + :load-commands + '((special "swamp-blimp-3" #t) + (special "precursor-arm-3" #t) + (special "swamp-tetherrock-13" #t) + (special "swamp-tetherrock-14" #t) + (special "swamp-tetherrock-15" #t) + (special "swamp-tetherrock-16" #t) + ) + :vis-nick 'swa + :lev0 'swamp + :disp0 'display + :lev1 'village2 + :disp1 'special-vis + ) ) - ) - :tasks '((the binteger 86) (the binteger 87) (the binteger 110) (the binteger 88)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 2334720.0 :y 180224.0 :z -10653696.0 :w 3653632.0) - :buzzer 88 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #t - ) + :tasks '(36 37 38 39 40 41 42 43) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 1986560.0 :z -8417280.0 :w 1003520.0) + :buzzer 43 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol village3, type level-load-info -(define village3 +(define + rolling (new 'static 'level-load-info - :name 'village3 - :visname 'village3-vis - :nickname 'vi3 - :index 14 - :packages '(village3) - :sound-banks '(village3) - :music-bank 'village3 - :ambient-sounds '() - :mood '*village3-mood* - :mood-func 'update-mood-village3 - :ocean #f - :sky #t - :continues - '((new 'static 'continue-point - :name "village3-start" - :level 'village3 - :trans (new 'static 'vector :x 4468021.5 :y 186608.03 :z -14054268.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.9999 :w 0.005) - :camera-trans (new 'static 'vector :x 4469439.5 :y 207701.2 :z -14003077.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.9996 0.0 0.0268 -0.0032 0.9925 -0.1216 -0.0266 -0.1216 -0.9922) - :load-commands '() - :vis-nick 'vi3 - :lev0 'village3 - :disp0 'display - :lev1 'ogre - :disp1 #f - ) - (new 'static 'continue-point - :name "village3-warp" - :level 'village3 - :flags #x4 - :trans (new 'static 'vector :x 4549776.0 :y 215375.88 :z -14285922.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.681 :w 0.7322) - :camera-trans (new 'static 'vector :x 4543255.0 :y 226776.67 :z -14313317.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.8563 0.0 -0.2763 0.0456 0.8875 0.1413 0.2725 -0.1485 0.8446) - :load-commands '() - :vis-nick 'vi3 - :lev0 'village3 - :disp0 'display - :lev1 'ogre - :disp1 #f - ) - (new 'static 'continue-point - :name "village3-farside" - :level 'village3 - :trans (new 'static 'vector :x 4423744.0 :y 198723.58 :z -14530641.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.6611 :w 0.7502) - :camera-trans (new 'static 'vector :x 4381844.0 :y 218599.83 :z -14551361.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.442 0.0 -0.8969 0.1099 0.9924 0.0541 0.8902 -0.1225 0.4387) - :load-commands '() - :vis-nick 'vi3 - :lev0 'village3 - :disp0 'display - :lev1 'snow - :disp1 #f + :index 12 + :name 'rolling + :visname 'rolling-vis + :nickname 'rol + :packages '(rolling) + :sound-banks '(rolling) + :music-bank 'rolling + :ambient-sounds '() + :mood '*rolling-mood* + :mood-func 'update-mood-rolling + :ocean 'none + :sky #t + :continues + '((new 'static 'continue-point + :name "rolling-start" + :level 'rolling + :trans + (new 'static 'vector :x 432272.6 :y 42821.633 :z -6737529.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.545 :w 0.8383) + :camera-trans + (new 'static 'vector :x 494105.8 :y 67237.48 :z -6748524.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.1759 0.0 0.9843 -0.2371 0.9705 0.0423 -0.9553 -0.2409 0.1707) + :load-commands '() + :vis-nick 'rol + :lev0 'rolling + :disp0 'display + :lev1 'village2 + :disp1 'display + ) ) - ) - :tasks '((the binteger 96) (the binteger 97) (the binteger 98) (the binteger 99) (the binteger 100) (the binteger 101) (the binteger 74) (the binteger 77)) - :priority #xc8 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere - (new 'static 'sphere :x 4571136.0 :y 389120.0 :z -14323712.0 :w 409600.0) - :buzzer 77 - :bottom-height (meters -20.0) - :run-packages '("common") - :wait-for-load #f - ) + :tasks '(52 53 54 55 56 57 58 59) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x -753664.0 :y 131072.0 :z -6569984.0 :w 974848.0) + :buzzer 57 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol snow, type level-load-info -(define snow +(define + ogre (new 'static 'level-load-info - :name 'snow - :visname 'snow-vis - :nickname 'sno - :index 15 - :packages '(snow) - :sound-banks '(snow) - :music-bank 'snow - :ambient-sounds '() - :mood '*snow-mood* - :mood-func 'update-mood-snow - :ocean #f - :sky #t - :sun-fade 0.5 - :continues - '((new 'static 'continue-point - :name "snow-start" - :level 'snow - :trans (new 'static 'vector :x 4256260.0 :y 983713.8 :z -14182752.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.7906 :w -0.6122) - :camera-trans (new 'static 'vector :x 4303859.5 :y 1012363.7 :z -14156672.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.4804 0.0 0.877 -0.2049 0.9723 -0.1122 -0.8527 -0.2336 -0.4671) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-fort" - :level 'snow - :trans (new 'static 'vector :x 3430875.2 :y 897149.3 :z -13397581.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.0968 :w 0.9952) - :camera-trans (new 'static 'vector :x 3428789.8 :y 918241.25 :z -13448724.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.9991 0.0 -0.0419 0.0051 0.9925 0.1216 0.0415 -0.1217 0.9916) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-flut-flut" - :level 'snow - :trans (new 'static 'vector :x 2481850.0 :y 1054709.4 :z -13922438.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.8628 :w -0.5055) - :camera-trans (new 'static 'vector :x 2497063.0 :y 1069339.9 :z -13900353.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.8224 0.0 0.5688 -0.135 0.9713 -0.1953 -0.5525 -0.2374 -0.7989) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-pass-to-fort" - :level 'snow - :trans (new 'static 'vector :x 3751044.8 :y 917612.1 :z -13828696.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.3387 :w -0.9408) - :camera-trans (new 'static 'vector :x 3779776.0 :y 933972.8 :z -13845825.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.6061 0.0 0.7953 -0.1493 0.9822 0.1138 -0.7812 -0.1878 0.5953) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-by-ice-lake" - :level 'snow - :trans (new 'static 'vector :x 3151164.5 :y 1049638.1 :z -14246464.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.6226 :w 0.7824) - :camera-trans (new 'static 'vector :x 3203905.2 :y 1080037.8 :z -14270850.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.4189 0.0 0.9079 -0.2169 0.971 0.1001 -0.8816 -0.2389 0.4068) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-by-ice-lake-alt" - :level 'snow - :trans (new 'static 'vector :x 3053335.0 :y 1048927.9 :z -14058945.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.9997 :w 0.022) - :camera-trans (new 'static 'vector :x 3045845.5 :y 1068868.0 :z -14012568.0 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.987 0.0 -0.1601 0.0195 0.9924 -0.1207 0.1589 -0.1223 -0.9796) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-outside-fort" - :level 'snow - :trans (new 'static 'vector :x 3431014.0 :y 901474.7 :z -13600187.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.0954 :w -0.9954) - :camera-trans (new 'static 'vector :x 3429969.0 :y 922565.44 :z -13651353.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.9998 0.0 -0.0196 0.0023 0.9926 0.1213 0.0195 -0.1213 0.9924) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-outside-cave" - :level 'snow - :trans (new 'static 'vector :x 3200864.2 :y 907400.4 :z -13676660.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.5867 :w -0.8097) - :camera-trans (new 'static 'vector :x 3247600.8 :y 928464.06 :z -13697606.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.4062 0.0 0.9137 -0.1107 0.9926 0.0492 -0.907 -0.1211 0.4032) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "snow-across-from-flut" - :level 'snow - :trans (new 'static 'vector :x 2721898.5 :y 1049845.0 :z -13743428.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.7688 :w -0.6394) - :camera-trans (new 'static 'vector :x 2712702.5 :y 1070288.5 :z -13791593.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.9554 0.0 -0.2951 0.0343 0.9932 0.1111 0.2931 -0.1163 0.9489) - :load-commands '() - :vis-nick 'sno - :lev0 'snow - :disp0 'display - :lev1 'village3 - :disp1 'display + :index 13 + :name 'ogre + :visname 'ogre-vis + :nickname 'ogr + :packages '(ogre) + :sound-banks '(ogre) + :music-bank 'ogre + :ambient-sounds '() + :mood '*ogre-mood* + :mood-func 'update-mood-ogre + :ocean 'none + :sky #t + :continues + '((new 'static 'continue-point + :name "ogre-start" + :level 'ogre + :trans + (new 'static 'vector :x 849775.8 :y 163962.88 :z -7301166.5 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9931 :w 0.1166) + :camera-trans + (new 'static 'vector :x 848906.25 :y 185056.88 :z -7249962.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9998 0.0 -0.0159 0.0019 0.9925 -0.1215 0.0158 -0.1215 -0.9924) + :load-commands '() + :vis-nick 'ogr + :lev0 'ogre + :disp0 'display + :lev1 'village2 + :disp1 'display + ) + (new 'static 'continue-point + :name "ogre-race" + :level 'ogre + :trans + (new 'static 'vector :x 841424.9 :y 163801.1 :z -8205419.5 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9857 :w 0.168) + :camera-trans + (new 'static 'vector :x 860479.9 :y 183815.38 :z -8162368.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9145 0.0 0.4045 -0.0497 0.9924 -0.1125 -0.4015 -0.123 -0.9075) + :load-commands '() + :vis-nick 'ogr + :lev0 'ogre + :disp0 'display + :lev1 'village2 + :disp1 #f + ) + (new 'static 'continue-point + :name "ogre-end" + :level 'ogre + :trans + (new 'static 'vector :x 3971233.5 :y 141227.62 :z -13935735.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.8721 :w 0.4892) + :camera-trans + (new 'static 'vector :x 3997892.2 :y 159604.73 :z -13904449.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.7611 0.0 0.6485 -0.0932 0.9896 -0.1094 -0.6417 -0.1438 -0.7532) + :load-commands '() + :vis-nick 'ogr + :lev0 'village3 + :disp0 'display + :lev1 'ogre + :disp1 'display + ) ) - ) - :tasks '((the binteger 60) (the binteger 61) (the binteger 62) (the binteger 63) (the binteger 64) (the binteger 66) (the binteger 67) (the binteger 65)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 3072000.0 :y 1142784.0 :z -14028800.0 :w 1290240.0) - :buzzer 65 - :bottom-height (meters 128.0) - :run-packages '("common") - :wait-for-load #f - ) + :tasks '(86 87 110 88) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 2334720.0 :y 180224.0 :z -10653696.0 :w 3653632.0) + :buzzer 88 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol maincave, type level-load-info -(define maincave +(define + village3 (new 'static 'level-load-info - :name 'maincave - :visname 'maincave-vis - :nickname 'mai - :index 16 - :packages '(maincave) - :sound-banks '(maincave) - :music-bank 'maincave - :ambient-sounds '() - :mood '*maincave-mood* - :mood-func 'update-mood-maincave - :ocean #f - :sky #f - :continues - '((new 'static 'continue-point - :name "maincave-start" - :level 'maincave - :trans (new 'static 'vector :x 4420967.0 :y 33006.387 :z -13154230.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.0174 :w -0.9998) - :camera-trans (new 'static 'vector :x 4428164.5 :y 54074.164 :z -13204933.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.99 0.0 0.1405 -0.0169 0.9927 0.1192 -0.1395 -0.1204 0.9828) - :load-commands '() - :vis-nick 'mai - :lev0 'maincave - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "maincave-to-darkcave" - :level 'maincave - :trans (new 'static 'vector :x 4172175.8 :y 154223.83 :z -12445165.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.2093 :w 0.9778) - :camera-trans (new 'static 'vector :x 4193893.2 :y 175317.81 :z -12491520.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.9052 0.0 0.4248 -0.0514 0.9926 0.1096 -0.4217 -0.1211 0.8986) - :load-commands '() - :vis-nick 'mai - :lev0 'maincave - :disp0 'display - :lev1 'darkcave - :disp1 #f - ) - (new 'static 'continue-point - :name "maincave-to-robocave" - :level 'maincave - :trans (new 'static 'vector :x 4760896.5 :y 44221.234 :z -12409880.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.548 :w 0.8364) - :camera-trans (new 'static 'vector :x 4745230.0 :y 57869.926 :z -12426885.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.7343 0.0 -0.6788 0.1872 0.9611 0.2026 0.6524 -0.2759 0.7058) - :load-commands '() - :vis-nick 'mai - :lev0 'maincave - :disp0 'display - :lev1 'robocave - :disp1 #f + :index 14 + :name 'village3 + :visname 'village3-vis + :nickname 'vi3 + :packages '(village3) + :sound-banks '(village3) + :music-bank 'village3 + :ambient-sounds '() + :mood '*village3-mood* + :mood-func 'update-mood-village3 + :ocean #f + :sky #t + :continues + '((new 'static 'continue-point + :name "village3-start" + :level 'village3 + :trans + (new 'static 'vector :x 4468021.5 :y 186608.03 :z -14054268.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9999 :w 0.005) + :camera-trans + (new 'static 'vector :x 4469439.5 :y 207701.2 :z -14003077.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9996 0.0 0.0268 -0.0032 0.9925 -0.1216 -0.0266 -0.1216 -0.9922) + :load-commands '() + :vis-nick 'vi3 + :lev0 'village3 + :disp0 'display + :lev1 'ogre + :disp1 #f + ) + (new 'static 'continue-point + :name "village3-warp" + :level 'village3 + :flags (continue-flags contf02) + :trans + (new 'static 'vector :x 4549776.0 :y 215375.88 :z -14285922.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.681 :w 0.7322) + :camera-trans + (new 'static 'vector :x 4543255.0 :y 226776.67 :z -14313317.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.8563 0.0 -0.2763 0.0456 0.8875 0.1413 0.2725 -0.1485 0.8446) + :load-commands '() + :vis-nick 'vi3 + :lev0 'village3 + :disp0 'display + :lev1 'ogre + :disp1 #f + ) + (new 'static 'continue-point + :name "village3-farside" + :level 'village3 + :trans + (new 'static 'vector :x 4423744.0 :y 198723.58 :z -14530641.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.6611 :w 0.7502) + :camera-trans + (new 'static 'vector :x 4381844.0 :y 218599.83 :z -14551361.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.442 0.0 -0.8969 0.1099 0.9924 0.0541 0.8902 -0.1225 0.4387) + :load-commands '() + :vis-nick 'vi3 + :lev0 'village3 + :disp0 'display + :lev1 'snow + :disp1 #f + ) ) - ) - :tasks '((the binteger 78) (the binteger 79) (the binteger 80) (the binteger 81) (the binteger 82) (the binteger 83) (the binteger 84) (the binteger 85)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 4517888.0 :y 114688.0 :z -12484608.0 :w 655360.0) - :buzzer 85 - :bottom-height (meters -60.0) - :run-packages '("common") - :wait-for-load #f - ) + :tasks '(96 97 98 99 100 101 74 77) + :priority #xc8 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 4571136.0 :y 389120.0 :z -14323712.0 :w 409600.0) + :buzzer 77 + :bottom-height (meters -20) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol darkcave, type level-load-info -(define darkcave - (new 'static 'level-load-info - :name 'darkcave - :visname 'darkcave-vis - :nickname 'dar - :index 17 - :packages '(darkcave) - :sound-banks '(darkcave) - :music-bank 'maincave - :ambient-sounds '() - :mood '*darkcave-mood* - :mood-func 'update-mood-darkcave - :ocean #f - :sky #f - :continues - '((new 'static 'continue-point - :name "darkcave-start" - :level 'darkcave - :trans (new 'static 'vector :x 3813246.2 :y 129487.664 :z -12114304.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.1439 :w 0.9895) - :camera-trans (new 'static 'vector :x 3793301.0 :y 145573.48 :z -12139847.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.7892 0.0 -0.614 0.1178 0.9813 0.1515 0.6026 -0.1919 0.7745) - :load-commands '() - :vis-nick 'dar - :lev0 'maincave - :disp0 'display - :lev1 'darkcave - :disp1 'display - ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 3620864.0 :y 266240.0 :z -11935744.0 :w 368640.0) - :buzzer 85 - :bottom-height (meters -60.0) - :run-packages '("common" "maincave") - :wait-for-load #t - ) +(define + snow + (new 'static 'level-load-info + :index 15 + :name 'snow + :visname 'snow-vis + :nickname 'sno + :packages '(snow) + :sound-banks '(snow) + :music-bank 'snow + :ambient-sounds '() + :mood '*snow-mood* + :mood-func 'update-mood-snow + :ocean #f + :sky #t + :sun-fade 0.5 + :continues + '((new 'static 'continue-point + :name "snow-start" + :level 'snow + :trans + (new 'static 'vector :x 4256260.0 :y 983713.8 :z -14182752.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.7906 :w -0.6122) + :camera-trans + (new 'static 'vector :x 4303859.5 :y 1012363.7 :z -14156672.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.4804 0.0 0.877 -0.2049 0.9723 -0.1122 -0.8527 -0.2336 -0.4671) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-fort" + :level 'snow + :trans + (new 'static 'vector :x 3430875.2 :y 897149.3 :z -13397581.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.0968 :w 0.9952) + :camera-trans + (new 'static 'vector :x 3428789.8 :y 918241.25 :z -13448724.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9991 0.0 -0.0419 0.0051 0.9925 0.1216 0.0415 -0.1217 0.9916) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-flut-flut" + :level 'snow + :trans + (new 'static 'vector :x 2481850.0 :y 1054709.4 :z -13922438.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.8628 :w -0.5055) + :camera-trans + (new 'static 'vector :x 2497063.0 :y 1069339.9 :z -13900353.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.8224 0.0 0.5688 -0.135 0.9713 -0.1953 -0.5525 -0.2374 -0.7989) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-pass-to-fort" + :level 'snow + :trans + (new 'static 'vector :x 3751044.8 :y 917612.1 :z -13828696.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.3387 :w -0.9408) + :camera-trans + (new 'static 'vector :x 3779776.0 :y 933972.8 :z -13845825.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.6061 0.0 0.7953 -0.1493 0.9822 0.1138 -0.7812 -0.1878 0.5953) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-by-ice-lake" + :level 'snow + :trans + (new 'static 'vector :x 3151164.5 :y 1049638.1 :z -14246464.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.6226 :w 0.7824) + :camera-trans + (new 'static 'vector :x 3203905.2 :y 1080037.8 :z -14270850.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.4189 0.0 0.9079 -0.2169 0.971 0.1001 -0.8816 -0.2389 0.4068) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-by-ice-lake-alt" + :level 'snow + :trans + (new 'static 'vector :x 3053335.0 :y 1048927.9 :z -14058945.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9997 :w 0.022) + :camera-trans + (new 'static 'vector :x 3045845.5 :y 1068868.0 :z -14012568.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.987 0.0 -0.1601 0.0195 0.9924 -0.1207 0.1589 -0.1223 -0.9796) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-outside-fort" + :level 'snow + :trans + (new 'static 'vector :x 3431014.0 :y 901474.7 :z -13600187.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.0954 :w -0.9954) + :camera-trans + (new 'static 'vector :x 3429969.0 :y 922565.44 :z -13651353.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9998 0.0 -0.0196 0.0023 0.9926 0.1213 0.0195 -0.1213 0.9924) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-outside-cave" + :level 'snow + :trans + (new 'static 'vector :x 3200864.2 :y 907400.4 :z -13676660.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.5867 :w -0.8097) + :camera-trans + (new 'static 'vector :x 3247600.8 :y 928464.06 :z -13697606.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.4062 0.0 0.9137 -0.1107 0.9926 0.0492 -0.907 -0.1211 0.4032) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "snow-across-from-flut" + :level 'snow + :trans + (new 'static 'vector :x 2721898.5 :y 1049845.0 :z -13743428.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.7688 :w -0.6394) + :camera-trans + (new 'static 'vector :x 2712702.5 :y 1070288.5 :z -13791593.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9554 0.0 -0.2951 0.0343 0.9932 0.1111 0.2931 -0.1163 0.9489) + :load-commands '() + :vis-nick 'sno + :lev0 'snow + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + ) + :tasks '(60 61 62 63 64 66 67 65) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 3072000.0 :y 1142784.0 :z -14028800.0 :w 1290240.0) + :buzzer 65 + :bottom-height (meters 128) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol robocave, type level-load-info -(define robocave - (new 'static 'level-load-info - :name-list - (new 'static 'array symbol 3 'robocave 'robocave-vis 'rob) - :index 18 - :packages '(robocave) - :sound-banks '(robocave) - :music-bank 'maincave - :ambient-sounds '() - :mood '*robocave-mood* - :mood-func 'update-mood-robocave - :ocean #f - :sky #f - :continues - '((new 'static 'continue-point - :name "robocave-start" - :level 'robocave - :trans (new 'static 'vector :x 5208223.5 :y 69697.945 :z -11781496.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.3654 :w -0.9308) - :camera-trans (new 'static 'vector :x 5171715.0 :y 90796.85 :z -11817413.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.7006 0.0 -0.7134 0.0864 0.9926 0.0849 0.7082 -0.1212 0.6954) - :load-commands '() - :vis-nick 'rob - :lev0 'maincave - :disp0 'display - :lev1 'robocave - :disp1 'display - ) - (new 'static 'continue-point - :name "robocave-bottom" - :level 'robocave - :trans (new 'static 'vector :x 5435461.5 :y -97111.24 :z -11588379.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.1086 :w 0.994) - :camera-trans (new 'static 'vector :x 5409966.5 :y -76017.664 :z -11632764.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.8662 0.0 -0.4996 0.0605 0.9926 0.105 0.4959 -0.1212 0.8598) - :load-commands '() - :vis-nick 'rob - :lev0 'maincave - :disp0 'display - :lev1 'robocave - :disp1 'display - ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 5529600.0 :y 81920.0 :z -11468800.0 :w 512000.0) - :buzzer 85 - :bottom-height (meters -60.0) - :run-packages '("common" "maincave") - :wait-for-load #t - ) +(define + maincave + (new 'static 'level-load-info + :index 16 + :name 'maincave + :visname 'maincave-vis + :nickname 'mai + :packages '(maincave) + :sound-banks '(maincave) + :music-bank 'maincave + :ambient-sounds '() + :mood '*maincave-mood* + :mood-func 'update-mood-maincave + :ocean #f + :sky #f + :continues + '((new 'static 'continue-point + :name "maincave-start" + :level 'maincave + :trans + (new 'static 'vector :x 4420967.0 :y 33006.387 :z -13154230.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.0174 :w -0.9998) + :camera-trans + (new 'static 'vector :x 4428164.5 :y 54074.164 :z -13204933.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.99 0.0 0.1405 -0.0169 0.9927 0.1192 -0.1395 -0.1204 0.9828) + :load-commands '() + :vis-nick 'mai + :lev0 'maincave + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "maincave-to-darkcave" + :level 'maincave + :trans + (new 'static 'vector :x 4172175.8 :y 154223.83 :z -12445165.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.2093 :w 0.9778) + :camera-trans + (new 'static 'vector :x 4193893.2 :y 175317.81 :z -12491520.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9052 0.0 0.4248 -0.0514 0.9926 0.1096 -0.4217 -0.1211 0.8986) + :load-commands '() + :vis-nick 'mai + :lev0 'maincave + :disp0 'display + :lev1 'darkcave + :disp1 #f + ) + (new 'static 'continue-point + :name "maincave-to-robocave" + :level 'maincave + :trans + (new 'static 'vector :x 4760896.5 :y 44221.234 :z -12409880.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.548 :w 0.8364) + :camera-trans + (new 'static 'vector :x 4745230.0 :y 57869.926 :z -12426885.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7343 0.0 -0.6788 0.1872 0.9611 0.2026 0.6524 -0.2759 0.7058) + :load-commands '() + :vis-nick 'mai + :lev0 'maincave + :disp0 'display + :lev1 'robocave + :disp1 #f + ) + ) + :tasks '(78 79 80 81 82 83 84 85) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 4517888.0 :y 114688.0 :z -12484608.0 :w 655360.0) + :buzzer 85 + :bottom-height (meters -60) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol lavatube, type level-load-info -(define lavatube - (new 'static 'level-load-info - :name 'lavatube - :visname 'lavatube-vis - :nickname 'lav - :index 19 - :packages '(lavatube) - :sound-banks '(lavatube) - :music-bank 'lavatube - :ambient-sounds '() - :mood '*lavatube-mood* - :mood-func 'update-mood-lavatube - :ocean #f - :sky #f - :continues - '((new 'static 'continue-point - :name "lavatube-start" - :level 'lavatube - :trans (new 'static 'vector :x 5511317.0 :y 159871.8 :z -14621239.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.3753 :w -0.9268) - :camera-trans (new 'static 'vector :x 5510636.5 :y 197720.06 :z -14663128.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.9992 0.0 -0.0386 0.0178 0.8875 0.4603 0.0343 -0.4606 0.8868) - :load-commands '() - :vis-nick 'lav - :lev0 'lavatube - :disp0 'display - :lev1 'village3 - :disp1 'display - ) - (new 'static 'continue-point - :name "lavatube-middle" - :level 'lavatube - :trans (new 'static 'vector :x 9081441.0 :y -3935.8464 :z -14056285.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.7002 :w -0.7139) - :camera-trans (new 'static 'vector :x 9055362.0 :y 10606.592 :z -14050822.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.205 0.0 -0.9787 0.2321 0.9714 -0.0486 0.9508 -0.2371 -0.1991) - :load-commands '() - :vis-nick 'lav - :lev0 'lavatube - :disp0 'display - :lev1 'village3 - :disp1 #f - ) - (new 'static 'continue-point - :name "lavatube-after-ribbon" - :level 'lavatube - :trans (new 'static 'vector :x 9954895.0 :y 390513.06 :z -16548614.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.7485 :w -0.663) - :camera-trans (new 'static 'vector :x 9923721.0 :y 406466.16 :z -16541633.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.2191 0.0 -0.9756 0.1906 0.9807 -0.0428 0.9568 -0.1953 -0.2149) - :load-commands '() - :vis-nick 'lav - :lev0 'lavatube - :disp0 'display - :lev1 'citadel - :disp1 #f - ) - (new 'static 'continue-point - :name "lavatube-end" - :level 'lavatube - :trans (new 'static 'vector :x 11479892.0 :y -163656.5 :z -18266490.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.9589 :w -0.2836) - :camera-trans (new 'static 'vector :x 11526721.0 :y -143482.47 :z -18257412.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.3027 0.0 0.953 -0.1235 0.9915 -0.0392 -0.945 -0.1296 -0.3001) - :load-commands '() - :vis-nick 'lav - :lev0 'lavatube - :disp0 'display - :lev1 'citadel - :disp1 'display - ) - ) - :tasks '((the binteger 89) (the binteger 90)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 8806400.0 :y 131072.0 :z -15564800.0 :w 3174400.0) - :buzzer 90 - :bottom-height (meters -70.0) - :run-packages '("common") - :wait-for-load #t - ) +(define + darkcave + (new 'static 'level-load-info + :index 17 + :name 'darkcave + :visname 'darkcave-vis + :nickname 'dar + :packages '(darkcave) + :sound-banks '(darkcave) + :music-bank 'maincave + :ambient-sounds '() + :mood '*darkcave-mood* + :mood-func 'update-mood-darkcave + :ocean #f + :sky #f + :continues + '((new 'static 'continue-point + :name "darkcave-start" + :level 'darkcave + :trans + (new 'static 'vector :x 3813246.2 :y 129487.664 :z -12114304.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.1439 :w 0.9895) + :camera-trans + (new 'static 'vector :x 3793301.0 :y 145573.48 :z -12139847.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7892 0.0 -0.614 0.1178 0.9813 0.1515 0.6026 -0.1919 0.7745) + :load-commands '() + :vis-nick 'dar + :lev0 'maincave + :disp0 'display + :lev1 'darkcave + :disp1 'display + ) + ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 3620864.0 :y 266240.0 :z -11935744.0 :w 368640.0) + :buzzer 85 + :bottom-height (meters -60) + :run-packages '("common" "maincave") + :wait-for-load #t + ) ) -;; definition for symbol citadel, type level-load-info -(define citadel - (new 'static 'level-load-info - :name 'citadel - :visname 'citadel-vis - :nickname 'cit - :index 20 - :packages '(citadel) - :sound-banks '(citadel) - :music-bank 'citadel - :ambient-sounds '() - :mood '*citadel-mood* - :mood-func 'update-mood-citadel - :ocean #f - :sky #f - :continues - '((new 'static 'continue-point - :name "citadel-start" - :level 'citadel - :trans (new 'static 'vector :x 11442706.0 :y -142755.84 :z -18869044.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.9992 :w 0.0392) - :camera-trans (new 'static 'vector :x 11441183.0 :y -122509.31 :z -18820882.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.9991 0.0 -0.0411 0.005 0.9925 -0.122 0.0408 -0.1221 -0.9916) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'lavatube - :disp1 #f - ) - (new 'static 'continue-point - :name "citadel-entrance" - :level 'citadel - :trans (new 'static 'vector :x 11443969.0 :y -154216.03 :z -18472782.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.9728 :w 0.2314) - :camera-trans (new 'static 'vector :x 11436929.0 :y -134244.36 :z -18426254.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.9898 0.0 -0.1424 0.0173 0.9925 -0.1207 0.1413 -0.1219 -0.9824) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'lavatube - :disp1 'display - ) - (new 'static 'continue-point - :name "citadel-warp" - :level 'citadel - :flags #x4 - :trans (new 'static 'vector :x 11454895.0 :y -161791.6 :z -18204690.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.7511 :w 0.6601) - :camera-trans (new 'static 'vector :x 11406872.0 :y -141278.0 :z -18194638.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.1989 0.0 -0.98 0.1179 0.9927 -0.0239 0.9728 -0.1203 -0.1974) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'lavatube - :disp1 'display - ) - (new 'static 'continue-point - :name "citadel-launch-start" - :level 'citadel - :trans (new 'static 'vector :x 10827551.0 :y -94047.02 :z -18946718.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.8377 :w -0.546) - :camera-trans (new 'static 'vector :x 10862150.0 :y -75343.875 :z -18922316.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.5766 0.0 0.8169 -0.1125 0.9904 -0.0794 -0.8091 -0.1378 -0.5711) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'lavatube - :disp1 #f - ) - (new 'static 'continue-point - :name "citadel-launch-end" - :level 'citadel - :trans (new 'static 'vector :x 11047507.0 :y -81514.086 :z -19495960.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.0292 :w 0.9995) - :camera-trans (new 'static 'vector :x 11033498.0 :y -63027.2 :z -19534916.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.9413 0.0 -0.3373 0.0481 0.9897 0.1343 0.3339 -0.1427 0.9317) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'finalboss - :disp1 #f - ) - (new 'static 'continue-point - :name "citadel-plat-start" - :level 'citadel - :trans (new 'static 'vector :x 11443470.0 :y -120194.664 :z -19845628.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.9907 :w -0.1355) - :camera-trans (new 'static 'vector :x 11443545.0 :y -99100.266 :z -19794374.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.9999 0.0 0.0016 -0.0001 0.9926 -0.1207 -0.0015 -0.1207 -0.9926) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'finalboss - :disp1 #f - ) - (new 'static 'continue-point - :name "citadel-plat-end" - :level 'citadel - :trans (new 'static 'vector :x 11269726.0 :y -12132.352 :z -19614712.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.0419 :w 0.9991) - :camera-trans (new 'static 'vector :x 11264449.0 :y 7920.8447 :z -19661710.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.9938 0.0 -0.1103 0.0134 0.9924 0.1215 0.1095 -0.1223 0.9864) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'finalboss - :disp1 #f - ) - (new 'static 'continue-point - :name "citadel-generator-start" - :level 'citadel - :trans (new 'static 'vector :x 12138031.0 :y -36900.863 :z -18933304.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.7487 :w 0.6628) - :camera-trans (new 'static 'vector :x 12101831.0 :y -19811.123 :z -18933632.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.0093 0.0 -0.9999 0.1678 0.9858 0.0015 0.9857 -0.1678 0.0092) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'finalboss - :disp1 #f - ) - (new 'static 'continue-point - :name "citadel-generator-end" - :level 'citadel - :trans (new 'static 'vector :x 11837483.0 :y -20177.715 :z -19506848.0 :w 1.0) - :quat (new 'static 'quaternion :y -0.3564 :w 0.9342) - :camera-trans (new 'static 'vector :x 11872697.0 :y 887.6032 :z -19544198.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.7296 0.0 0.6838 -0.0851 0.9922 0.0908 -0.6785 -0.1245 0.7239) - :load-commands '() - :vis-nick #f - :lev0 'citadel - :disp0 'display - :lev1 #f - :disp1 #f - ) - (new 'static 'continue-point - :name "citadel-elevator" - :level 'citadel - :trans (new 'static 'vector :x 11447961.0 :y 234055.27 :z -19169000.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.2351 :w 0.9719) - :camera-trans (new 'static 'vector :x 11454465.0 :y 252947.66 :z -19126656.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.9932 0.0 0.1161 -0.017 0.9892 -0.1454 -0.1148 -0.1464 -0.9825) - :load-commands '() - :vis-nick 'cit - :lev0 'citadel - :disp0 'display - :lev1 'finalboss - :disp1 #f - ) - ) - :tasks '((the binteger 70) (the binteger 71) (the binteger 72) (the binteger 73) (the binteger 91)) - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 11436032.0 :y -462848.0 :z -19750912.0 :w 1228800.0) - :buzzer 91 - :bottom-height (meters -114.0) - :run-packages '("common") - :wait-for-load #t - ) +(define + robocave + (new 'static 'level-load-info + :index 18 + :name 'robocave + :visname 'robocave-vis + :nickname 'rob + :packages '(robocave) + :sound-banks '(robocave) + :music-bank 'maincave + :ambient-sounds '() + :mood '*robocave-mood* + :mood-func 'update-mood-robocave + :ocean #f + :sky #f + :continues + '((new 'static 'continue-point + :name "robocave-start" + :level 'robocave + :trans + (new 'static 'vector :x 5208223.5 :y 69697.945 :z -11781496.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.3654 :w -0.9308) + :camera-trans + (new 'static 'vector :x 5171715.0 :y 90796.85 :z -11817413.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7006 0.0 -0.7134 0.0864 0.9926 0.0849 0.7082 -0.1212 0.6954) + :load-commands '() + :vis-nick 'rob + :lev0 'maincave + :disp0 'display + :lev1 'robocave + :disp1 'display + ) + (new 'static 'continue-point + :name "robocave-bottom" + :level 'robocave + :trans + (new 'static 'vector :x 5435461.5 :y -97111.24 :z -11588379.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.1086 :w 0.994) + :camera-trans + (new 'static 'vector :x 5409966.5 :y -76017.664 :z -11632764.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.8662 0.0 -0.4996 0.0605 0.9926 0.105 0.4959 -0.1212 0.8598) + :load-commands '() + :vis-nick 'rob + :lev0 'maincave + :disp0 'display + :lev1 'robocave + :disp1 'display + ) + ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 5529600.0 :y 81920.0 :z -11468800.0 :w 512000.0) + :buzzer 85 + :bottom-height (meters -60) + :run-packages '("common" "maincave") + :wait-for-load #t + ) ) -;; definition for symbol finalboss, type level-load-info -(define finalboss - (new 'static 'level-load-info - :name 'finalboss - :visname 'finalboss-vis - :nickname 'fin - :index 21 - :packages '(finalboss) - :sound-banks '(finalboss) - :music-bank 'finalboss - :ambient-sounds '() - :mood '*finalboss-mood* - :mood-func 'update-mood-finalboss - :ocean #f - :sky #t - :sun-fade 1.0 - :continues - '((new 'static 'continue-point - :name "finalboss-start" - :level 'finalboss - :trans (new 'static 'vector :x 11548456.0 :y 2215872.0 :z -19409498.0 :w 1.0) - :quat (new 'static 'quaternion :y 0.7325 :w 0.6807) - :camera-trans (new 'static 'vector :x 11513311.0 :y 2234999.5 :z -19435708.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 0.5883 0.0 -0.8085 0.1074 0.9911 0.0781 0.8014 -0.1328 0.5831) - :load-commands '((special "citb-exit-plat-4" #t)) - :vis-nick 'fin - :lev0 'finalboss - :disp0 'display - :lev1 'citadel - :disp1 'special - ) - (new 'static 'continue-point - :name "finalboss-fight" - :level 'finalboss - :trans - (new 'static 'vector :x 12288335.0 :y 1970461.9 :z -19848522.0 :w 1.0) - :quat - (new 'static 'quaternion :y -0.5359 :w -0.8442) - :camera-trans - (new 'static 'vector :x 12265366.0 :y 1984228.5 :z -19842574.0 :w 1.0) - :camera-rot - (new 'static 'array float 9 -0.243 0.0 -0.97 0.2594 0.9635 -0.065 0.9346 -0.2675 -0.2341) - :load-commands '((special "citb-exit-plat-4" #t)) - :vis-nick 'fin - :lev0 'finalboss - :disp0 'display - :lev1 'citadel - :disp1 'special - ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x 11837440.0 :y 2129920.0 :z -19578880.0 :w 778240.0) - :buzzer 91 - :bottom-height (meters -114.0) - :run-packages '("common") - :wait-for-load #f - ) +(define + lavatube + (new 'static 'level-load-info + :index 19 + :name 'lavatube + :visname 'lavatube-vis + :nickname 'lav + :packages '(lavatube) + :sound-banks '(lavatube) + :music-bank 'lavatube + :ambient-sounds '() + :mood '*lavatube-mood* + :mood-func 'update-mood-lavatube + :ocean #f + :sky #f + :continues + '((new 'static 'continue-point + :name "lavatube-start" + :level 'lavatube + :trans + (new 'static 'vector :x 5511317.0 :y 159871.8 :z -14621239.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.3753 :w -0.9268) + :camera-trans + (new 'static 'vector :x 5510636.5 :y 197720.06 :z -14663128.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9992 0.0 -0.0386 0.0178 0.8875 0.4603 0.0343 -0.4606 0.8868) + :load-commands '() + :vis-nick 'lav + :lev0 'lavatube + :disp0 'display + :lev1 'village3 + :disp1 'display + ) + (new 'static 'continue-point + :name "lavatube-middle" + :level 'lavatube + :trans + (new 'static 'vector :x 9081441.0 :y -3935.8464 :z -14056285.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.7002 :w -0.7139) + :camera-trans + (new 'static 'vector :x 9055362.0 :y 10606.592 :z -14050822.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.205 0.0 -0.9787 0.2321 0.9714 -0.0486 0.9508 -0.2371 -0.1991) + :load-commands '() + :vis-nick 'lav + :lev0 'lavatube + :disp0 'display + :lev1 'village3 + :disp1 #f + ) + (new 'static 'continue-point + :name "lavatube-after-ribbon" + :level 'lavatube + :trans + (new 'static 'vector :x 9954895.0 :y 390513.06 :z -16548614.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.7485 :w -0.663) + :camera-trans + (new 'static 'vector :x 9923721.0 :y 406466.16 :z -16541633.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.2191 0.0 -0.9756 0.1906 0.9807 -0.0428 0.9568 -0.1953 -0.2149) + :load-commands '() + :vis-nick 'lav + :lev0 'lavatube + :disp0 'display + :lev1 'citadel + :disp1 #f + ) + (new 'static 'continue-point + :name "lavatube-end" + :level 'lavatube + :trans + (new 'static 'vector :x 11479892.0 :y -163656.5 :z -18266490.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9589 :w -0.2836) + :camera-trans + (new 'static 'vector :x 11526721.0 :y -143482.47 :z -18257412.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.3027 0.0 0.953 -0.1235 0.9915 -0.0392 -0.945 -0.1296 -0.3001) + :load-commands '() + :vis-nick 'lav + :lev0 'lavatube + :disp0 'display + :lev1 'citadel + :disp1 'display + ) + ) + :tasks '(89 90) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 8806400.0 :y 131072.0 :z -15564800.0 :w 3174400.0) + :buzzer 90 + :bottom-height (meters -70) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol intro, type level-load-info -(define intro - (new 'static 'level-load-info - :name 'intro - :visname 'intro-vis - :nickname 'int - :index 22 - :packages '(intro) - :sound-banks '() - :music-bank #f - :ambient-sounds '() - :mood '*default-mood* - :mood-func 'update-mood-default - :ocean #f - :sky #f - :continues '() - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere) - :bottom-height (meters -10000000.0) - :run-packages '("common") - :wait-for-load #f - ) +(define + citadel + (new 'static 'level-load-info + :index 20 + :name 'citadel + :visname 'citadel-vis + :nickname 'cit + :packages '(citadel) + :sound-banks '(citadel) + :music-bank 'citadel + :ambient-sounds '() + :mood '*citadel-mood* + :mood-func 'update-mood-citadel + :ocean #f + :sky #f + :continues + '((new 'static 'continue-point + :name "citadel-start" + :level 'citadel + :trans + (new 'static 'vector :x 11442706.0 :y -142755.84 :z -18869044.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.9992 :w 0.0392) + :camera-trans + (new 'static 'vector :x 11441183.0 :y -122509.31 :z -18820882.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9991 0.0 -0.0411 0.005 0.9925 -0.122 0.0408 -0.1221 -0.9916) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'lavatube + :disp1 #f + ) + (new 'static 'continue-point + :name "citadel-entrance" + :level 'citadel + :trans + (new 'static 'vector :x 11443969.0 :y -154216.03 :z -18472782.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9728 :w 0.2314) + :camera-trans + (new 'static 'vector :x 11436929.0 :y -134244.36 :z -18426254.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9898 0.0 -0.1424 0.0173 0.9925 -0.1207 0.1413 -0.1219 -0.9824) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'lavatube + :disp1 'display + ) + (new 'static 'continue-point + :name "citadel-warp" + :level 'citadel + :flags (continue-flags contf02) + :trans + (new 'static 'vector :x 11454895.0 :y -161791.6 :z -18204690.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.7511 :w 0.6601) + :camera-trans + (new 'static 'vector :x 11406872.0 :y -141278.0 :z -18194638.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.1989 0.0 -0.98 0.1179 0.9927 -0.0239 0.9728 -0.1203 -0.1974) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'lavatube + :disp1 'display + ) + (new 'static 'continue-point + :name "citadel-launch-start" + :level 'citadel + :trans + (new 'static 'vector :x 10827551.0 :y -94047.02 :z -18946718.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.8377 :w -0.546) + :camera-trans + (new 'static 'vector :x 10862150.0 :y -75343.875 :z -18922316.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.5766 0.0 0.8169 -0.1125 0.9904 -0.0794 -0.8091 -0.1378 -0.5711) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'lavatube + :disp1 #f + ) + (new 'static 'continue-point + :name "citadel-launch-end" + :level 'citadel + :trans + (new 'static 'vector :x 11047507.0 :y -81514.086 :z -19495960.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.0292 :w 0.9995) + :camera-trans + (new 'static 'vector :x 11033498.0 :y -63027.2 :z -19534916.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9413 0.0 -0.3373 0.0481 0.9897 0.1343 0.3339 -0.1427 0.9317) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'finalboss + :disp1 #f + ) + (new 'static 'continue-point + :name "citadel-plat-start" + :level 'citadel + :trans + (new 'static 'vector :x 11443470.0 :y -120194.664 :z -19845628.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.9907 :w -0.1355) + :camera-trans + (new 'static 'vector :x 11443545.0 :y -99100.266 :z -19794374.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9999 0.0 0.0016 -0.0001 0.9926 -0.1207 -0.0015 -0.1207 -0.9926) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'finalboss + :disp1 #f + ) + (new 'static 'continue-point + :name "citadel-plat-end" + :level 'citadel + :trans + (new 'static 'vector :x 11269726.0 :y -12132.352 :z -19614712.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.0419 :w 0.9991) + :camera-trans + (new 'static 'vector :x 11264449.0 :y 7920.8447 :z -19661710.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.9938 0.0 -0.1103 0.0134 0.9924 0.1215 0.1095 -0.1223 0.9864) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'finalboss + :disp1 #f + ) + (new 'static 'continue-point + :name "citadel-generator-start" + :level 'citadel + :trans + (new 'static 'vector :x 12138031.0 :y -36900.863 :z -18933304.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.7487 :w 0.6628) + :camera-trans + (new 'static 'vector :x 12101831.0 :y -19811.123 :z -18933632.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.0093 0.0 -0.9999 0.1678 0.9858 0.0015 0.9857 -0.1678 0.0092) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'finalboss + :disp1 #f + ) + (new 'static 'continue-point + :name "citadel-generator-end" + :level 'citadel + :trans + (new 'static 'vector :x 11837483.0 :y -20177.715 :z -19506848.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.3564 :w 0.9342) + :camera-trans + (new 'static 'vector :x 11872697.0 :y 887.6032 :z -19544198.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.7296 0.0 0.6838 -0.0851 0.9922 0.0908 -0.6785 -0.1245 0.7239) + :load-commands '() + :vis-nick #f + :lev0 'citadel + :disp0 'display + :lev1 #f + :disp1 #f + ) + (new 'static 'continue-point + :name "citadel-elevator" + :level 'citadel + :trans + (new 'static 'vector :x 11447961.0 :y 234055.27 :z -19169000.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.2351 :w 0.9719) + :camera-trans + (new 'static 'vector :x 11454465.0 :y 252947.66 :z -19126656.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.9932 0.0 0.1161 -0.017 0.9892 -0.1454 -0.1148 -0.1464 -0.9825) + :load-commands '() + :vis-nick 'cit + :lev0 'citadel + :disp0 'display + :lev1 'finalboss + :disp1 #f + ) + ) + :tasks '(70 71 72 73 91) + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 11436032.0 :y -462848.0 :z -19750912.0 :w 1228800.0) + :buzzer 91 + :bottom-height (meters -114) + :run-packages '("common") + :wait-for-load #t + ) ) -;; definition for symbol demo, type level-load-info -(define demo - (new 'static 'level-load-info - :name 'demo - :visname 'demo-vis - :nickname 'dem - :index 23 - :packages '() - :sound-banks '(village1) - :music-bank 'village1 - :ambient-sounds '() - :mood '*default-mood* - :mood-func 'update-mood-default - :ocean #f - :sky #f - :continues - '((new 'static 'continue-point - :name "demo-start" - :level 'demo - :flags #x8 - :trans (new 'static 'vector :x 66396.16 :y 29782.016 :z -919973.5 :w 1.0) - :quat (new 'static 'quaternion :w 1.0) - :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0) - :camera-rot (new 'static 'array float 9 0.8743 0.0 0.4852 -0.2117 0.8997 0.3816 -0.4365 -0.4364 0.7866) - :load-commands '() - :vis-nick 'dem - :lev0 'demo - :disp0 'special - :lev1 #f - :disp1 #f - ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere) - :bottom-height (meters -10000000.0) - :run-packages '("common") - :wait-for-load #f - ) +(define + finalboss + (new 'static 'level-load-info + :index 21 + :name 'finalboss + :visname 'finalboss-vis + :nickname 'fin + :packages '(finalboss) + :sound-banks '(finalboss) + :music-bank 'finalboss + :ambient-sounds '() + :mood '*finalboss-mood* + :mood-func 'update-mood-finalboss + :ocean #f + :sky #t + :sun-fade 1.0 + :continues + '((new 'static 'continue-point + :name "finalboss-start" + :level 'finalboss + :trans + (new 'static 'vector :x 11548456.0 :y 2215872.0 :z -19409498.0 :w 1.0) + :quat + (new 'static 'quaternion :y 0.7325 :w 0.6807) + :camera-trans + (new 'static 'vector :x 11513311.0 :y 2234999.5 :z -19435708.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.5883 0.0 -0.8085 0.1074 0.9911 0.0781 0.8014 -0.1328 0.5831) + :load-commands + '((special "citb-exit-plat-4" #t)) + :vis-nick 'fin + :lev0 'finalboss + :disp0 'display + :lev1 'citadel + :disp1 'special + ) + (new 'static 'continue-point + :name "finalboss-fight" + :level 'finalboss + :trans + (new 'static 'vector :x 12288335.0 :y 1970461.9 :z -19848522.0 :w 1.0) + :quat + (new 'static 'quaternion :y -0.5359 :w -0.8442) + :camera-trans + (new 'static 'vector :x 12265366.0 :y 1984228.5 :z -19842574.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.243 0.0 -0.97 0.2594 0.9635 -0.065 0.9346 -0.2675 -0.2341) + :load-commands + '((special "citb-exit-plat-4" #t)) + :vis-nick 'fin + :lev0 'finalboss + :disp0 'display + :lev1 'citadel + :disp1 'special + ) + ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x 11837440.0 :y 2129920.0 :z -19578880.0 :w 778240.0) + :buzzer 91 + :bottom-height (meters -114) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol title, type level-load-info -(define title - (new 'static 'level-load-info - :name 'title - :visname 'title-vis - :nickname 'tit - :index 24 - :packages '() - :sound-banks '() - :music-bank 'village1 - :ambient-sounds '() - :mood '*village1-mood* - :mood-func 'update-mood-village1 - :ocean #f - :sky #f - :continues - '((new 'static 'continue-point - :name "title-start" - :level 'title - :flags #x80 - :trans (new 'static 'vector :x -635598.9 :y 222551.66 :z 710496.25 :w 1.0) - :quat (new 'static 'quaternion :y -0.3323 :w -0.9431) - :camera-trans (new 'static 'vector :x -665644.25 :y 250803.0 :z 668470.9 :w 1.0) - :camera-rot (new 'static 'array float 9 0.8129 0.0 -0.5823 0.0958 0.9863 0.1337 0.5744 -0.1645 0.8018) - :load-commands '() - :vis-nick 'tit - :lev0 'title - :disp0 'special - :lev1 'village1 - :disp1 #f - ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :x -40960.0 :z 40960.0 :w 1126400.0) - :bottom-height (meters -10000000.0) - :run-packages '("common") - :wait-for-load #f - ) - ) +(define intro (new 'static 'level-load-info + :index 22 + :name 'intro + :visname 'intro-vis + :nickname 'int + :packages '(intro) + :sound-banks '() + :music-bank #f + :ambient-sounds '() + :mood '*default-mood* + :mood-func 'update-mood-default + :ocean #f + :sky #f + :continues '() + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere (new 'static 'sphere) + :bottom-height (meters -10000000) + :run-packages '("common") + :wait-for-load #f + ) + ) -;; definition for symbol halfpipe, type level-load-info -(define halfpipe - (new 'static 'level-load-info - :name-list - (new 'static 'array symbol 3 'halfpipe 'halfpipe-vis 'none) - :index 25 - :packages '() - :sound-banks '() - :music-bank #f - :ambient-sounds '() - :mood '*default-mood* - :mood-func 'update-mood-default - :ocean #f - :sky #t - :sun-fade 1.0 - :continues - '((new 'static 'continue-point - :name "halfpipe" - :level 'halfpipe - :trans (new 'static 'vector :x -1048.9856 :y -172047.97 :z -212555.78 :w 1.0) - :quat (new 'static 'quaternion :y 0.061 :w 0.9981) - :camera-trans (new 'static 'vector :x -9941.401 :y -150049.17 :z -159587.94 :w 1.0) - :camera-rot (new 'static 'array float 9 -0.979 0.0 -0.2037 0.0545 0.9634 -0.2622 0.1963 -0.2678 -0.9432) - :load-commands '() - :vis-nick #f - :lev0 'halfpipe - :disp0 'display - :lev1 #f - :disp1 #f - ) - ) - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :w 167772160000.0) - :bottom-height (meters -10000000.0) - :run-packages '() - :wait-for-load #t - ) +(define + demo + (new 'static 'level-load-info + :index 23 + :name 'demo + :visname 'demo-vis + :nickname 'dem + :packages '() + :sound-banks '(village1) + :music-bank 'village1 + :ambient-sounds '() + :mood '*default-mood* + :mood-func 'update-mood-default + :ocean #f + :sky #f + :continues + '((new 'static 'continue-point + :name "demo-start" + :level 'demo + :flags (continue-flags contf03) + :trans + (new 'static 'vector :x 66396.16 :y 29782.016 :z -919973.5 :w 1.0) + :quat (new 'static 'quaternion :w 1.0) + :camera-trans + (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.8743 0.0 0.4852 -0.2117 0.8997 0.3816 -0.4365 -0.4364 0.7866) + :load-commands '() + :vis-nick 'dem + :lev0 'demo + :disp0 'special + :lev1 #f + :disp1 #f + ) + ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere (new 'static 'sphere) + :bottom-height (meters -10000000) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol default-level, type level-load-info -(define default-level - (new 'static 'level-load-info - :name 'default-level - :visname 'default-level-vis - :nickname 'none - :index 26 - :packages '() - :sound-banks '() - :music-bank #f - :ambient-sounds '() - :mood '*default-mood* - :mood-func 'update-mood-default - :ocean #f - :sky #t - :continues '() - :tasks '() - :priority 100 - :load-commands '() - :alt-load-commands '() - :bsp-mask #xffffffffffffffff - :bsphere (new 'static 'sphere :w 167772160000.0) - :bottom-height (meters -20.0) - :run-packages '() - :wait-for-load #t - ) +(define + title + (new 'static 'level-load-info + :index 24 + :name 'title + :visname 'title-vis + :nickname 'tit + :packages '() + :sound-banks '() + :music-bank 'village1 + :ambient-sounds '() + :mood '*village1-mood* + :mood-func 'update-mood-village1 + :ocean #f + :sky #f + :continues + '((new 'static 'continue-point + :name "title-start" + :level 'title + :flags (continue-flags contf07) + :trans + (new 'static 'vector :x -635598.9 :y 222551.66 :z 710496.25 :w 1.0) + :quat + (new 'static 'quaternion :y -0.3323 :w -0.9431) + :camera-trans + (new 'static 'vector :x -665644.25 :y 250803.0 :z 668470.9 :w 1.0) + :camera-rot + (new 'static 'array float 9 0.8129 0.0 -0.5823 0.0958 0.9863 0.1337 0.5744 -0.1645 0.8018) + :load-commands '() + :vis-nick 'tit + :lev0 'title + :disp0 'special + :lev1 'village1 + :disp1 #f + ) + ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere + (new 'static 'sphere :x -40960.0 :z 40960.0 :w 1126400.0) + :bottom-height (meters -10000000) + :run-packages '("common") + :wait-for-load #f + ) ) -;; definition for symbol *level-load-list*, type pair -(define *level-load-list* - '(training - village1 - beach - jungle - jungleb - misty - firecanyon - village2 - sunken - sunkenb - swamp - rolling - ogre - village3 - snow - maincave - darkcave - robocave - lavatube - citadel - finalboss - intro - demo - title - halfpipe - default-level +(define + halfpipe + (new 'static 'level-load-info + :index 25 + :name 'halfpipe + :visname 'halfpipe-vis + :nickname 'none + :packages '() + :sound-banks '() + :music-bank #f + :ambient-sounds '() + :mood '*default-mood* + :mood-func 'update-mood-default + :ocean #f + :sky #t + :sun-fade 1.0 + :continues + '((new 'static 'continue-point + :name "halfpipe" + :level 'halfpipe + :trans + (new 'static 'vector :x -1048.9856 :y -172047.97 :z -212555.78 :w 1.0) + :quat + (new 'static 'quaternion :y 0.061 :w 0.9981) + :camera-trans + (new 'static 'vector :x -9941.401 :y -150049.17 :z -159587.94 :w 1.0) + :camera-rot + (new 'static 'array float 9 -0.979 0.0 -0.2037 0.0545 0.9634 -0.2622 0.1963 -0.2678 -0.9432) + :load-commands '() + :vis-nick #f + :lev0 'halfpipe + :disp0 'display + :lev1 #f + :disp1 #f + ) ) + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere (new 'static 'sphere :w 167772160000.0) + :bottom-height (meters -10000000) + :run-packages '() + :wait-for-load #t + ) ) + +(define default-level (new 'static 'level-load-info + :index 26 + :name 'default-level + :visname 'default-level-vis + :nickname 'none + :packages '() + :sound-banks '() + :music-bank #f + :ambient-sounds '() + :mood '*default-mood* + :mood-func 'update-mood-default + :ocean #f + :sky #t + :continues '() + :tasks '() + :priority 100 + :load-commands '() + :alt-load-commands '() + :bsp-mask #xffffffffffffffff + :bsphere (new 'static 'sphere :w 167772160000.0) + :bottom-height (meters -20) + :run-packages '() + :wait-for-load #t + ) + ) + +(define *level-load-list* '(training + village1 + beach + jungle + jungleb + misty + firecanyon + village2 + sunken + sunkenb + swamp + rolling + ogre + village3 + snow + maincave + darkcave + robocave + lavatube + citadel + finalboss + intro + demo + title + halfpipe + default-level + ) + ) + + + + diff --git a/goal_src/engine/target/target-death.gc b/goal_src/engine/target/target-death.gc index 80548d12de..37c057bcc3 100644 --- a/goal_src/engine/target/target-death.gc +++ b/goal_src/engine/target/target-death.gc @@ -49,7 +49,7 @@ (set! (-> *load-boundary-target* 1 quad) (-> (target-pos 0) quad)) (set! (-> *load-boundary-target* 2 quad) (-> *load-boundary-target* 0 quad)) (set! (-> *load-boundary-target* 3 quad) (-> *load-boundary-target* 1 quad)) - (when (zero? (logand (-> *game-info* current-continue flags) 176)) + (when (zero? (logand (-> *game-info* current-continue flags) (continue-flags contf04 contf05 contf07))) (set! (-> *level* border?) (-> *level* play?)) (set! (-> *setting-control* default border-mode) (-> *level* play?)) ) @@ -119,7 +119,7 @@ (let ((v1-52 (lookup-level-info (-> arg0 level)))) (if (and v1-52 (= (-> *setting-control* current music) (-> v1-52 music-bank)) - (zero? (logand (-> arg0 flags) 160)) + (zero? (logand (-> arg0 flags) (continue-flags contf05 contf07))) ) (clear-pending-settings-from-process *setting-control* self 'music-volume) ) @@ -196,13 +196,13 @@ (set! (-> *ACTOR-bank* birth-max) 1000) (set-blackout-frames (seconds 0.1)) (cond - ((logtest? (-> arg0 flags) 128) + ((logtest? (-> arg0 flags) (continue-flags contf07)) (go target-title) ) - ((logtest? (-> arg0 flags) 16) + ((logtest? (-> arg0 flags) (continue-flags contf04)) (start-sequence-a) ) - ((logtest? (-> arg0 flags) 32) + ((logtest? (-> arg0 flags) (continue-flags contf05)) (let ((s5-3 (entity-by-name "sage-23"))) (when s5-3 (set-blackout-frames (seconds 100)) @@ -217,7 +217,7 @@ ) ) ) - ((and (logtest? (-> arg0 flags) 2048) + ((and (logtest? (-> arg0 flags) (continue-flags contf11)) (or (= (get-task-status (game-task beach-ecorocks)) (task-status need-hint)) (= (get-task-status (game-task beach-ecorocks)) (task-status need-introduction)) ) @@ -237,10 +237,10 @@ ) ) ) - ((logtest? (-> arg0 flags) 8) + ((logtest? (-> arg0 flags) (continue-flags contf03)) (go target-demo) ) - ((logtest? (-> arg0 flags) 64) + ((logtest? (-> arg0 flags) (continue-flags contf06)) (set-blackout-frames (seconds 1)) (let ((s5-5 (get-process *default-dead-pool* process #x4000))) (when s5-5 @@ -283,7 +283,7 @@ ) ) ) - ((logtest? (-> arg0 flags) 4) + ((logtest? (-> arg0 flags) (continue-flags contf02)) (let ((s5-6 (new 'static 'vector))) (cond ((string= (-> arg0 name) "village1-warp") @@ -322,7 +322,7 @@ (set-continue! *game-info* "village1-hut") ) ((or (string= (-> arg0 name) "training-warp") (string= (-> arg0 name) "game-start")) - (if (logtest? (-> arg0 flags) 1024) + (if (logtest? (-> arg0 flags) (continue-flags contf10)) (close-specific-task! (game-task intro) (task-status need-resolution)) ) (set! (-> s5-6 quad) (-> (entity-by-name "training-part-1") extra trans quad)) diff --git a/test/decompiler/reference/engine/game/game-info-h_REF.gc b/test/decompiler/reference/engine/game/game-info-h_REF.gc index cd4c57a192..66981f7e95 100644 --- a/test/decompiler/reference/engine/game/game-info-h_REF.gc +++ b/test/decompiler/reference/engine/game/game-info-h_REF.gc @@ -114,19 +114,19 @@ ;; definition of type continue-point (deftype continue-point (basic) - ((name string :offset-assert 4) - (level symbol :offset-assert 8) - (flags uint32 :offset-assert 12) - (trans vector :inline :offset-assert 16) - (quat quaternion :inline :offset-assert 32) - (camera-trans vector :inline :offset-assert 48) - (camera-rot float 9 :offset-assert 64) - (load-commands pair :offset-assert 100) - (vis-nick symbol :offset-assert 104) - (lev0 symbol :offset-assert 108) - (disp0 symbol :offset-assert 112) - (lev1 symbol :offset-assert 116) - (disp1 symbol :offset-assert 120) + ((name string :offset-assert 4) + (level symbol :offset-assert 8) + (flags continue-flags :offset-assert 12) + (trans vector :inline :offset-assert 16) + (quat quaternion :inline :offset-assert 32) + (camera-trans vector :inline :offset-assert 48) + (camera-rot float 9 :offset-assert 64) + (load-commands pair :offset-assert 100) + (vis-nick symbol :offset-assert 104) + (lev0 symbol :offset-assert 108) + (disp0 symbol :offset-assert 112) + (lev1 symbol :offset-assert 116) + (disp1 symbol :offset-assert 120) ) :method-count-assert 10 :size-assert #x7c diff --git a/test/decompiler/reference/engine/level/level-info_REF.gc b/test/decompiler/reference/engine/level/level-info_REF.gc index e8de665da4..7ea45eb03d 100644 --- a/test/decompiler/reference/engine/level/level-info_REF.gc +++ b/test/decompiler/reference/engine/level/level-info_REF.gc @@ -51,7 +51,7 @@ (new 'static 'continue-point :name "training-warp" :level 'training - :flags #x4 + :flags (continue-flags contf02) :trans (new 'static 'vector :x -5383524.0 :y 28019.098 :z 4360302.0 :w 1.0) :quat @@ -81,7 +81,7 @@ (new 'static 'continue-point :name "game-start" :level 'training - :flags #x404 + :flags (continue-flags contf02 contf10) :trans (new 'static 'vector :x -5393740.5 :y 28259.533 :z 4360945.5 :w 1.0) :quat @@ -162,7 +162,7 @@ (new 'static 'continue-point :name "village1-intro" :level 'village1 - :flags #x24 + :flags (continue-flags contf02 contf05) :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) :quat @@ -181,7 +181,7 @@ (new 'static 'continue-point :name "village1-warp" :level 'village1 - :flags #x804 + :flags (continue-flags contf02 contf11) :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) :quat @@ -200,7 +200,7 @@ (new 'static 'continue-point :name "village1-demo-convo" :level 'village1 - :flags #x40 + :flags (continue-flags contf06) :trans (new 'static 'vector :x -542529.1 :y 189424.03 :z 847101.94 :w 1.0) :quat @@ -219,7 +219,7 @@ (new 'static 'continue-point :name "intro-start" :level 'village1 - :flags #x10 + :flags (continue-flags contf04) :trans (new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0) :quat @@ -710,7 +710,7 @@ (new 'static 'continue-point :name "village2-warp" :level 'village2 - :flags #x4 + :flags (continue-flags contf02) :trans (new 'static 'vector :x 1592492.9 :y 91648.0 :z -6328677.0 :w 1.0) :quat @@ -1312,7 +1312,7 @@ (new 'static 'continue-point :name "village3-warp" :level 'village3 - :flags #x4 + :flags (continue-flags contf02) :trans (new 'static 'vector :x 4549776.0 :y 215375.88 :z -14285922.0 :w 1.0) :quat @@ -1920,7 +1920,7 @@ (new 'static 'continue-point :name "citadel-warp" :level 'citadel - :flags #x4 + :flags (continue-flags contf02) :trans (new 'static 'vector :x 11454895.0 :y -161791.6 :z -18204690.0 :w 1.0) :quat @@ -2195,7 +2195,7 @@ '((new 'static 'continue-point :name "demo-start" :level 'demo - :flags #x8 + :flags (continue-flags contf03) :trans (new 'static 'vector :x 66396.16 :y 29782.016 :z -919973.5 :w 1.0) :quat (new 'static 'quaternion :w 1.0) @@ -2243,7 +2243,7 @@ '((new 'static 'continue-point :name "title-start" :level 'title - :flags #x80 + :flags (continue-flags contf07) :trans (new 'static 'vector :x -635598.9 :y 222551.66 :z 710496.25 :w 1.0) :quat diff --git a/test/decompiler/reference/engine/target/target-death_REF.gc b/test/decompiler/reference/engine/target/target-death_REF.gc index 585356e4c0..1900b57b0d 100644 --- a/test/decompiler/reference/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/engine/target/target-death_REF.gc @@ -48,7 +48,7 @@ (set! (-> *load-boundary-target* 1 quad) (-> (target-pos 0) quad)) (set! (-> *load-boundary-target* 2 quad) (-> *load-boundary-target* 0 quad)) (set! (-> *load-boundary-target* 3 quad) (-> *load-boundary-target* 1 quad)) - (when (zero? (logand (-> *game-info* current-continue flags) 176)) + (when (zero? (logand (-> *game-info* current-continue flags) (continue-flags contf04 contf05 contf07))) (set! (-> *level* border?) (-> *level* play?)) (set! (-> *setting-control* default border-mode) (-> *level* play?)) ) @@ -118,7 +118,7 @@ (let ((v1-52 (lookup-level-info (-> arg0 level)))) (if (and v1-52 (= (-> *setting-control* current music) (-> v1-52 music-bank)) - (zero? (logand (-> arg0 flags) 160)) + (zero? (logand (-> arg0 flags) (continue-flags contf05 contf07))) ) (clear-pending-settings-from-process *setting-control* self 'music-volume) ) @@ -195,13 +195,13 @@ (set! (-> *ACTOR-bank* birth-max) 1000) (set-blackout-frames (seconds 0.1)) (cond - ((logtest? (-> arg0 flags) 128) + ((logtest? (-> arg0 flags) (continue-flags contf07)) (go target-title) ) - ((logtest? (-> arg0 flags) 16) + ((logtest? (-> arg0 flags) (continue-flags contf04)) (start-sequence-a) ) - ((logtest? (-> arg0 flags) 32) + ((logtest? (-> arg0 flags) (continue-flags contf05)) (let ((s5-3 (entity-by-name "sage-23"))) (when s5-3 (set-blackout-frames (seconds 100)) @@ -216,7 +216,7 @@ ) ) ) - ((and (logtest? (-> arg0 flags) 2048) + ((and (logtest? (-> arg0 flags) (continue-flags contf11)) (or (= (get-task-status (game-task beach-ecorocks)) (task-status need-hint)) (= (get-task-status (game-task beach-ecorocks)) (task-status need-introduction)) ) @@ -236,10 +236,10 @@ ) ) ) - ((logtest? (-> arg0 flags) 8) + ((logtest? (-> arg0 flags) (continue-flags contf03)) (go target-demo) ) - ((logtest? (-> arg0 flags) 64) + ((logtest? (-> arg0 flags) (continue-flags contf06)) (set-blackout-frames (seconds 1)) (let ((s5-5 (get-process *default-dead-pool* process #x4000))) (when s5-5 @@ -282,7 +282,7 @@ ) ) ) - ((logtest? (-> arg0 flags) 4) + ((logtest? (-> arg0 flags) (continue-flags contf02)) (let ((s5-6 (new 'static 'vector))) (cond ((string= (-> arg0 name) "village1-warp") @@ -321,7 +321,7 @@ (set-continue! *game-info* "village1-hut") ) ((or (string= (-> arg0 name) "training-warp") (string= (-> arg0 name) "game-start")) - (if (logtest? (-> arg0 flags) 1024) + (if (logtest? (-> arg0 flags) (continue-flags contf10)) (close-specific-task! (game-task intro) (task-status need-resolution)) ) (set! (-> s5-6 quad) (-> (entity-by-name "training-part-1") extra trans quad)) From 9b5039a7478633fee71695dcec17bab34bcd09e6 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sun, 10 Apr 2022 18:18:50 +0100 Subject: [PATCH 2/6] finish flags --- decompiler/config/all-types.gc | 26 +++++++------------ goal_src/engine/game/game-info-h.gc | 24 ++++++----------- goal_src/engine/level/level-info.gc | 22 ++++++++-------- goal_src/engine/target/target-death.gc | 20 +++++++------- .../reference/engine/level/level-info_REF.gc | 22 ++++++++-------- .../engine/target/target-death_REF.gc | 20 +++++++------- 6 files changed, 59 insertions(+), 75 deletions(-) diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index da5928180a..f26d98d8a7 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -9358,7 +9358,7 @@ ((want level-buffer-state 2 :inline :offset-assert 4) (vis-nick symbol :offset-assert 36) (command-list pair :offset-assert 40) - (object-name symbol 256 :offset-assert 44) + (object-name symbol 256 :offset-assert 44) ;; TODO string (object-status basic 256 :offset-assert 1068) ) :method-count-assert 21 @@ -9386,24 +9386,16 @@ :bitfield #t (contf00) (contf01) - (contf02) - (contf03) - (contf04) - (contf05) - (contf06) - (contf07) + (warp) + (demo) + (intro) + (sage-intro) + (sage-demo-convo) + (title) (contf08) (contf09) - (contf10) - (contf11) - (contf12) - (contf13) - (contf14) - (contf15) - (contf16) - (contf17) - (contf18) - (contf19) + (game-start) + (sage-ecorocks) ) (deftype continue-point (basic) diff --git a/goal_src/engine/game/game-info-h.gc b/goal_src/engine/game/game-info-h.gc index 11adf14a8d..084476ff20 100644 --- a/goal_src/engine/game/game-info-h.gc +++ b/goal_src/engine/game/game-info-h.gc @@ -92,24 +92,16 @@ :bitfield #t (contf00) (contf01) - (contf02) - (contf03) - (contf04) - (contf05) - (contf06) - (contf07) + (warp) + (demo) + (intro) + (sage-intro) + (sage-demo-convo) + (title) (contf08) (contf09) - (contf10) - (contf11) - (contf12) - (contf13) - (contf14) - (contf15) - (contf16) - (contf17) - (contf18) - (contf19) + (game-start) + (sage-ecorocks) ) ;; static data for a continue point diff --git a/goal_src/engine/level/level-info.gc b/goal_src/engine/level/level-info.gc index 663cb76467..ae601f026a 100644 --- a/goal_src/engine/level/level-info.gc +++ b/goal_src/engine/level/level-info.gc @@ -56,7 +56,7 @@ (new 'static 'continue-point :name "training-warp" :level 'training - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x -5383524.0 :y 28019.098 :z 4360302.0 :w 1.0) :quat @@ -86,7 +86,7 @@ (new 'static 'continue-point :name "game-start" :level 'training - :flags (continue-flags contf02 contf10) + :flags (continue-flags warp game-start) :trans (new 'static 'vector :x -5393740.5 :y 28259.533 :z 4360945.5 :w 1.0) :quat @@ -166,7 +166,7 @@ (new 'static 'continue-point :name "village1-intro" :level 'village1 - :flags (continue-flags contf02 contf05) + :flags (continue-flags warp sage-intro) :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) :quat @@ -185,7 +185,7 @@ (new 'static 'continue-point :name "village1-warp" :level 'village1 - :flags (continue-flags contf02 contf11) + :flags (continue-flags warp sage-ecorocks) :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) :quat @@ -204,7 +204,7 @@ (new 'static 'continue-point :name "village1-demo-convo" :level 'village1 - :flags (continue-flags contf06) + :flags (continue-flags sage-demo-convo) :trans (new 'static 'vector :x -542529.1 :y 189424.03 :z 847101.94 :w 1.0) :quat @@ -223,7 +223,7 @@ (new 'static 'continue-point :name "intro-start" :level 'village1 - :flags (continue-flags contf04) + :flags (continue-flags intro) :trans (new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0) :quat @@ -708,7 +708,7 @@ (new 'static 'continue-point :name "village2-warp" :level 'village2 - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x 1592492.9 :y 91648.0 :z -6328677.0 :w 1.0) :quat @@ -1304,7 +1304,7 @@ (new 'static 'continue-point :name "village3-warp" :level 'village3 - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x 4549776.0 :y 215375.88 :z -14285922.0 :w 1.0) :quat @@ -1906,7 +1906,7 @@ (new 'static 'continue-point :name "citadel-warp" :level 'citadel - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x 11454895.0 :y -161791.6 :z -18204690.0 :w 1.0) :quat @@ -2178,7 +2178,7 @@ '((new 'static 'continue-point :name "demo-start" :level 'demo - :flags (continue-flags contf03) + :flags (continue-flags demo) :trans (new 'static 'vector :x 66396.16 :y 29782.016 :z -919973.5 :w 1.0) :quat (new 'static 'quaternion :w 1.0) @@ -2225,7 +2225,7 @@ '((new 'static 'continue-point :name "title-start" :level 'title - :flags (continue-flags contf07) + :flags (continue-flags title) :trans (new 'static 'vector :x -635598.9 :y 222551.66 :z 710496.25 :w 1.0) :quat diff --git a/goal_src/engine/target/target-death.gc b/goal_src/engine/target/target-death.gc index 37c057bcc3..2863fb464e 100644 --- a/goal_src/engine/target/target-death.gc +++ b/goal_src/engine/target/target-death.gc @@ -49,7 +49,7 @@ (set! (-> *load-boundary-target* 1 quad) (-> (target-pos 0) quad)) (set! (-> *load-boundary-target* 2 quad) (-> *load-boundary-target* 0 quad)) (set! (-> *load-boundary-target* 3 quad) (-> *load-boundary-target* 1 quad)) - (when (zero? (logand (-> *game-info* current-continue flags) (continue-flags contf04 contf05 contf07))) + (when (zero? (logand (-> *game-info* current-continue flags) (continue-flags intro sage-intro title))) (set! (-> *level* border?) (-> *level* play?)) (set! (-> *setting-control* default border-mode) (-> *level* play?)) ) @@ -119,7 +119,7 @@ (let ((v1-52 (lookup-level-info (-> arg0 level)))) (if (and v1-52 (= (-> *setting-control* current music) (-> v1-52 music-bank)) - (zero? (logand (-> arg0 flags) (continue-flags contf05 contf07))) + (zero? (logand (-> arg0 flags) (continue-flags sage-intro title))) ) (clear-pending-settings-from-process *setting-control* self 'music-volume) ) @@ -196,13 +196,13 @@ (set! (-> *ACTOR-bank* birth-max) 1000) (set-blackout-frames (seconds 0.1)) (cond - ((logtest? (-> arg0 flags) (continue-flags contf07)) + ((logtest? (-> arg0 flags) (continue-flags title)) (go target-title) ) - ((logtest? (-> arg0 flags) (continue-flags contf04)) + ((logtest? (-> arg0 flags) (continue-flags intro)) (start-sequence-a) ) - ((logtest? (-> arg0 flags) (continue-flags contf05)) + ((logtest? (-> arg0 flags) (continue-flags sage-intro)) (let ((s5-3 (entity-by-name "sage-23"))) (when s5-3 (set-blackout-frames (seconds 100)) @@ -217,7 +217,7 @@ ) ) ) - ((and (logtest? (-> arg0 flags) (continue-flags contf11)) + ((and (logtest? (-> arg0 flags) (continue-flags sage-ecorocks)) (or (= (get-task-status (game-task beach-ecorocks)) (task-status need-hint)) (= (get-task-status (game-task beach-ecorocks)) (task-status need-introduction)) ) @@ -237,10 +237,10 @@ ) ) ) - ((logtest? (-> arg0 flags) (continue-flags contf03)) + ((logtest? (-> arg0 flags) (continue-flags demo)) (go target-demo) ) - ((logtest? (-> arg0 flags) (continue-flags contf06)) + ((logtest? (-> arg0 flags) (continue-flags sage-demo-convo)) (set-blackout-frames (seconds 1)) (let ((s5-5 (get-process *default-dead-pool* process #x4000))) (when s5-5 @@ -283,7 +283,7 @@ ) ) ) - ((logtest? (-> arg0 flags) (continue-flags contf02)) + ((logtest? (-> arg0 flags) (continue-flags warp)) (let ((s5-6 (new 'static 'vector))) (cond ((string= (-> arg0 name) "village1-warp") @@ -322,7 +322,7 @@ (set-continue! *game-info* "village1-hut") ) ((or (string= (-> arg0 name) "training-warp") (string= (-> arg0 name) "game-start")) - (if (logtest? (-> arg0 flags) (continue-flags contf10)) + (if (logtest? (-> arg0 flags) (continue-flags game-start)) (close-specific-task! (game-task intro) (task-status need-resolution)) ) (set! (-> s5-6 quad) (-> (entity-by-name "training-part-1") extra trans quad)) diff --git a/test/decompiler/reference/engine/level/level-info_REF.gc b/test/decompiler/reference/engine/level/level-info_REF.gc index 7ea45eb03d..63b41bcea5 100644 --- a/test/decompiler/reference/engine/level/level-info_REF.gc +++ b/test/decompiler/reference/engine/level/level-info_REF.gc @@ -51,7 +51,7 @@ (new 'static 'continue-point :name "training-warp" :level 'training - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x -5383524.0 :y 28019.098 :z 4360302.0 :w 1.0) :quat @@ -81,7 +81,7 @@ (new 'static 'continue-point :name "game-start" :level 'training - :flags (continue-flags contf02 contf10) + :flags (continue-flags warp game-start) :trans (new 'static 'vector :x -5393740.5 :y 28259.533 :z 4360945.5 :w 1.0) :quat @@ -162,7 +162,7 @@ (new 'static 'continue-point :name "village1-intro" :level 'village1 - :flags (continue-flags contf02 contf05) + :flags (continue-flags warp sage-intro) :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) :quat @@ -181,7 +181,7 @@ (new 'static 'continue-point :name "village1-warp" :level 'village1 - :flags (continue-flags contf02 contf11) + :flags (continue-flags warp sage-ecorocks) :trans (new 'static 'vector :x -518468.8 :y 189424.03 :z 868568.7 :w 1.0) :quat @@ -200,7 +200,7 @@ (new 'static 'continue-point :name "village1-demo-convo" :level 'village1 - :flags (continue-flags contf06) + :flags (continue-flags sage-demo-convo) :trans (new 'static 'vector :x -542529.1 :y 189424.03 :z 847101.94 :w 1.0) :quat @@ -219,7 +219,7 @@ (new 'static 'continue-point :name "intro-start" :level 'village1 - :flags (continue-flags contf04) + :flags (continue-flags intro) :trans (new 'static 'vector :x 164316.78 :y 15128.576 :z 3390588.0 :w 1.0) :quat @@ -710,7 +710,7 @@ (new 'static 'continue-point :name "village2-warp" :level 'village2 - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x 1592492.9 :y 91648.0 :z -6328677.0 :w 1.0) :quat @@ -1312,7 +1312,7 @@ (new 'static 'continue-point :name "village3-warp" :level 'village3 - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x 4549776.0 :y 215375.88 :z -14285922.0 :w 1.0) :quat @@ -1920,7 +1920,7 @@ (new 'static 'continue-point :name "citadel-warp" :level 'citadel - :flags (continue-flags contf02) + :flags (continue-flags warp) :trans (new 'static 'vector :x 11454895.0 :y -161791.6 :z -18204690.0 :w 1.0) :quat @@ -2195,7 +2195,7 @@ '((new 'static 'continue-point :name "demo-start" :level 'demo - :flags (continue-flags contf03) + :flags (continue-flags demo) :trans (new 'static 'vector :x 66396.16 :y 29782.016 :z -919973.5 :w 1.0) :quat (new 'static 'quaternion :w 1.0) @@ -2243,7 +2243,7 @@ '((new 'static 'continue-point :name "title-start" :level 'title - :flags (continue-flags contf07) + :flags (continue-flags title) :trans (new 'static 'vector :x -635598.9 :y 222551.66 :z 710496.25 :w 1.0) :quat diff --git a/test/decompiler/reference/engine/target/target-death_REF.gc b/test/decompiler/reference/engine/target/target-death_REF.gc index 1900b57b0d..d2f223569e 100644 --- a/test/decompiler/reference/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/engine/target/target-death_REF.gc @@ -48,7 +48,7 @@ (set! (-> *load-boundary-target* 1 quad) (-> (target-pos 0) quad)) (set! (-> *load-boundary-target* 2 quad) (-> *load-boundary-target* 0 quad)) (set! (-> *load-boundary-target* 3 quad) (-> *load-boundary-target* 1 quad)) - (when (zero? (logand (-> *game-info* current-continue flags) (continue-flags contf04 contf05 contf07))) + (when (zero? (logand (-> *game-info* current-continue flags) (continue-flags intro sage-intro title))) (set! (-> *level* border?) (-> *level* play?)) (set! (-> *setting-control* default border-mode) (-> *level* play?)) ) @@ -118,7 +118,7 @@ (let ((v1-52 (lookup-level-info (-> arg0 level)))) (if (and v1-52 (= (-> *setting-control* current music) (-> v1-52 music-bank)) - (zero? (logand (-> arg0 flags) (continue-flags contf05 contf07))) + (zero? (logand (-> arg0 flags) (continue-flags sage-intro title))) ) (clear-pending-settings-from-process *setting-control* self 'music-volume) ) @@ -195,13 +195,13 @@ (set! (-> *ACTOR-bank* birth-max) 1000) (set-blackout-frames (seconds 0.1)) (cond - ((logtest? (-> arg0 flags) (continue-flags contf07)) + ((logtest? (-> arg0 flags) (continue-flags title)) (go target-title) ) - ((logtest? (-> arg0 flags) (continue-flags contf04)) + ((logtest? (-> arg0 flags) (continue-flags intro)) (start-sequence-a) ) - ((logtest? (-> arg0 flags) (continue-flags contf05)) + ((logtest? (-> arg0 flags) (continue-flags sage-intro)) (let ((s5-3 (entity-by-name "sage-23"))) (when s5-3 (set-blackout-frames (seconds 100)) @@ -216,7 +216,7 @@ ) ) ) - ((and (logtest? (-> arg0 flags) (continue-flags contf11)) + ((and (logtest? (-> arg0 flags) (continue-flags sage-ecorocks)) (or (= (get-task-status (game-task beach-ecorocks)) (task-status need-hint)) (= (get-task-status (game-task beach-ecorocks)) (task-status need-introduction)) ) @@ -236,10 +236,10 @@ ) ) ) - ((logtest? (-> arg0 flags) (continue-flags contf03)) + ((logtest? (-> arg0 flags) (continue-flags demo)) (go target-demo) ) - ((logtest? (-> arg0 flags) (continue-flags contf06)) + ((logtest? (-> arg0 flags) (continue-flags sage-demo-convo)) (set-blackout-frames (seconds 1)) (let ((s5-5 (get-process *default-dead-pool* process #x4000))) (when s5-5 @@ -282,7 +282,7 @@ ) ) ) - ((logtest? (-> arg0 flags) (continue-flags contf02)) + ((logtest? (-> arg0 flags) (continue-flags warp)) (let ((s5-6 (new 'static 'vector))) (cond ((string= (-> arg0 name) "village1-warp") @@ -321,7 +321,7 @@ (set-continue! *game-info* "village1-hut") ) ((or (string= (-> arg0 name) "training-warp") (string= (-> arg0 name) "game-start")) - (if (logtest? (-> arg0 flags) (continue-flags contf10)) + (if (logtest? (-> arg0 flags) (continue-flags game-start)) (close-specific-task! (game-task intro) (task-status need-resolution)) ) (set! (-> s5-6 quad) (-> (entity-by-name "training-part-1") extra trans quad)) From 16d560ef681480476c80608e70c96137a3639a46 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Mon, 11 Apr 2022 03:06:33 +0100 Subject: [PATCH 3/6] refs --- decompiler/IR2/FormExpressionAnalysis.cpp | 4 +- .../jak1_ntsc_black_label/label_types.jsonc | 100 +++--- .../jak1_ntsc_black_label/type_casts.jsonc | 14 +- .../reference/engine/camera/cam-layout_REF.gc | 239 ++++++------- .../reference/engine/debug/anim-tester_REF.gc | 83 ++--- .../engine/target/target-handler_REF.gc | 4 +- .../reference/engine/target/target2_REF.gc | 2 +- .../levels/finalboss/robotboss_REF.gc | 2 +- .../levels/flut_common/target-flut_REF.gc | 47 +-- .../levels/jungleb/plant-boss_REF.gc | 323 ++++++++---------- .../reference/levels/ogre/ogreboss_REF.gc | 233 +++++-------- 11 files changed, 460 insertions(+), 591 deletions(-) diff --git a/decompiler/IR2/FormExpressionAnalysis.cpp b/decompiler/IR2/FormExpressionAnalysis.cpp index bd6414be69..66a054177e 100644 --- a/decompiler/IR2/FormExpressionAnalysis.cpp +++ b/decompiler/IR2/FormExpressionAnalysis.cpp @@ -742,8 +742,8 @@ void SimpleExpressionElement::update_from_stack_fpr_to_gpr(const Env& env, m_popped = false; update_from_stack(env, pool, stack, result, allow_side_effects); } else { - throw std::runtime_error( - fmt::format("FPR -> GPR applied to a {} in {}", src_type.print(), to_string(env))); + throw std::runtime_error(fmt::format("FPR -> GPR applied to a {} in {} at {}", src_type.print(), + to_string(env), m_my_idx)); } } diff --git a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc index 4f0e23cb28..7c8e7e2404 100644 --- a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc @@ -730,26 +730,26 @@ ["L878", "float", true], ["L879", "float", true], ["L880", "float", true], - ["L881", "(pointer float)", 1], + ["L881", "float", true], ["L882", "float", true], ["L883", "float", true], - ["L884", "(pointer float)", 1], - ["L885", "(pointer float)", 1], + ["L884", "float", true], + ["L885", "float", true], ["L886", "float", true], ["L887", "float", true], - ["L888", "(pointer float)", 1], - ["L889", "(pointer float)", 1], - ["L890", "(pointer float)", 1], - ["L891", "(pointer float)", 1], - ["L892", "(pointer float)", 1], + ["L888", "float", true], + ["L889", "float", true], + ["L890", "float", true], + ["L891", "float", true], + ["L892", "float", true], ["L893", "float", true], ["L894", "float", true], ["L895", "float", true], - ["L896", "(pointer float)", 1], - ["L897", "(pointer float)", 1], - ["L898", "(pointer float)", 1], + ["L896", "float", true], + ["L897", "float", true], + ["L898", "float", true], ["L899", "float", true], - ["L900", "(pointer float)", 1], + ["L900", "float", true], ["L901", "uint64", true], ["L904", "uint64", true], ["L905", "uint64", true], @@ -990,14 +990,14 @@ ["L509", "(inline-array list-field)", 12], ["L523", "vector"], ["L524", "vector"], - ["L649", "(pointer float)", 1], - ["L650", "(pointer float)", 1], - ["L651", "(pointer float)", 1], - ["L652", "(pointer float)", 1], - ["L653", "(pointer float)", 1], - ["L654", "(pointer float)", 1], - ["L655", "(pointer float)", 1], - ["L656", "(pointer float)", 1], + ["L649", "float", true], + ["L650", "float", true], + ["L651", "float", true], + ["L652", "float", true], + ["L653", "float", true], + ["L654", "float", true], + ["L655", "float", true], + ["L656", "float", true], ["L657", "uint64", true], ["L658", "uint64", true], ["L663", "uint64", true], @@ -1108,7 +1108,7 @@ ["L765", "float", true], ["L766", "float", true], ["L767", "float", true], - ["L768", "(pointer float)", 1], + ["L768", "float", true], ["L769", "float", true], ["L770", "float", true], ["L771", "float", true], @@ -1377,7 +1377,7 @@ ["L412", "float", true], ["L413", "float", true], ["L414", "float", true], - ["L415", "(pointer float)", 1], + ["L415", "float", true], ["L416", "float", true], ["L417", "float", true], ["L418", "float", true], @@ -1393,18 +1393,18 @@ ["L428", "float", true], ["L429", "float", true], ["L430", "float", true], - ["L431", "(pointer float)", 1], + ["L431", "float", true], ["L432", "float", true], ["L433", "float", true], ["L434", "float", true], ["L435", "float", true], ["L436", "float", true], ["L437", "float", true], - ["L438", "(pointer float)", 1], + ["L438", "float", true], ["L439", "float", true], ["L440", "float", true], ["L441", "float", true], - ["L442", "(pointer float)", 1], + ["L442", "float", true], ["L443", "float", true], ["L444", "float", true], ["L445", "float", true], @@ -1428,10 +1428,10 @@ ["L463", "float", true], ["L464", "float", true], ["L465", "float", true], - ["L466", "(pointer float)", 1], + ["L466", "float", true], ["L467", "float", true], ["L468", "float", true], - ["L469", "(pointer float)", 1], + ["L469", "float", true], ["L470", "uint64", true], ["L498", "float", true], ["L499", "uint64", true], @@ -1494,11 +1494,11 @@ ["L731", "float", true], ["L732", "float", true], ["L733", "float", true], - ["L734", "(pointer float)", 1], - ["L735", "(pointer float)", 1], - ["L736", "(pointer float)", 1], - ["L737", "(pointer float)", 1], - ["L738", "(pointer float)", 1], + ["L734", "float", true], + ["L735", "float", true], + ["L736", "float", true], + ["L737", "float", true], + ["L738", "float", true], ["L739", "float", true], ["L740", "float", true], ["L741", "float", true], @@ -1510,7 +1510,7 @@ ["L747", "float", true], ["L748", "float", true], ["L749", "float", true], - ["L750", "(pointer float)", 1], + ["L750", "float", true], ["L751", "float", true], ["L752", "float", true], ["L753", "float", true], @@ -1527,7 +1527,7 @@ ["L764", "float", true], ["L765", "float", true], ["L766", "float", true], - ["L767", "(pointer float)", 1], + ["L767", "float", true], ["L768", "float", true], ["L769", "float", true], ["L770", "float", true], @@ -1546,8 +1546,8 @@ ["L783", "float", true], ["L784", "float", true], ["L785", "float", true], - ["L786", "(pointer float)", 1], - ["L787", "(pointer float)", 1], + ["L786", "float", true], + ["L787", "float", true], ["L788", "float", true], ["L789", "float", true], ["L790", "float", true], @@ -1574,7 +1574,7 @@ ["L811", "float", true], ["L812", "float", true], ["L813", "float", true], - ["L814", "(pointer float)", 1], + ["L814", "float", true], ["L815", "uint64", true] ], @@ -1587,7 +1587,7 @@ ["L201", "float", true], ["L202", "float", true], ["L203", "float", true], - ["L204", "(pointer float)", 1], + ["L204", "float", true], ["L205", "uint64", true], ["L206", "uint64", true], ["L207", "uint64", true], @@ -1636,13 +1636,13 @@ ["L367", "attack-info"], ["L370", "attack-info"], ["L371", "attack-info"], - ["L384", "(pointer float)", 1], - ["L384", "(pointer float)", 1], - ["L385", "(pointer float)", 1], - ["L386", "(pointer float)", 1], - ["L387", "(pointer float)", 1], - ["L388", "(pointer float)", 1], - ["L389", "(pointer float)", 1], + ["L384", "float", true], + ["L384", "float", true], + ["L385", "float", true], + ["L386", "float", true], + ["L387", "float", true], + ["L388", "float", true], + ["L389", "float", true], ["L390", "float", true], ["L391", "float", true], ["L392", "float", true], @@ -1713,7 +1713,7 @@ ["L457", "float", true], ["L458", "float", true], ["L459", "float", true], - ["L460", "(pointer float)", 1], + ["L460", "float", true], ["L461", "rgba", true], ["L462", "uint64", true], ["L463", "uint64", true], @@ -1765,8 +1765,8 @@ ["L438", "float", true], ["L439", "float", true], ["L440", "float", true], - ["L441", "(pointer float)", 1], - ["L442", "(pointer float)", 1], + ["L441", "float", true], + ["L442", "float", true], ["L443", "float", true], ["L444", "float", true], ["L445", "float", true], @@ -1781,7 +1781,7 @@ ["L454", "float", true], ["L455", "float", true], ["L456", "float", true], - ["L457", "(pointer float)", 1], + ["L457", "float", true], ["L458", "uint64", true], ["L459", "uint64", true], ["L460", "uint64", true], @@ -1920,7 +1920,7 @@ ["L735", "float", true], ["L736", "float", true], ["L737", "float", true], - ["L738", "(pointer float)", 1], + ["L738", "float", true], ["L739", "float", true], ["L740", "float", true], ["L741", "float", true], diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc index 1f7095f662..461adee26e 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -3606,8 +3606,8 @@ ], "v-slrp!": [ - [19, "v1", "(pointer float)"], - [26, "v1", "(pointer float)"] + [54, "s3", "float"], + [65, "s3", "float"] ], "clmf-pos-rot": [ @@ -4866,7 +4866,10 @@ "(code plant-boss-root-idle)": [[17, "v1", "art-joint-anim"]], - "(code plant-boss-eat)": [[274, "v1", "art-joint-anim"]], + "(code plant-boss-eat)": [ + [22, "v1", "float"], + [274, "v1", "art-joint-anim"] + ], "(code plant-boss-vulnerable)": [ [149, "v1", "art-joint-anim"], @@ -5417,12 +5420,14 @@ ], "target-hit-ground-anim": [ + [55, "v1", "float"], [79, "v1", "art-joint-anim"], [312, "v1", "art-joint-anim"], [389, "v1", "art-joint-anim"], [441, "v1", "art-joint-anim"], [520, "v1", "art-joint-anim"], [578, "v1", "art-joint-anim"], + [660, "v1", "float"], [675, "v1", "art-joint-anim"], [736, "v1", "art-joint-anim"], [846, "v1", "art-joint-anim"] @@ -5435,7 +5440,8 @@ [234, "v1", "art-joint-anim"], [298, "v1", "art-joint-anim"], [389, "v1", "art-joint-anim"], - [503, "v1", "art-joint-anim"] + [503, "v1", "art-joint-anim"], + [626, "v1", "float"] ], "(code target-walk)": [ diff --git a/test/decompiler/reference/engine/camera/cam-layout_REF.gc b/test/decompiler/reference/engine/camera/cam-layout_REF.gc index e0ac1e29d2..45885cb7bf 100644 --- a/test/decompiler/reference/engine/camera/cam-layout_REF.gc +++ b/test/decompiler/reference/engine/camera/cam-layout_REF.gc @@ -362,9 +362,9 @@ (when (!= s1-0 sv-272) (vector-float*! sv-192 (-> s3-0 sv-272) (-> s3-0 sv-272 w)) (vector-cross! sv-208 (-> s3-0 sv-272) (-> s3-0 s1-0)) - (vector-normalize! sv-208 (-> (new 'static 'array float 1 1.0) 0)) + (vector-normalize! sv-208 (the-as float 1.0)) (vector-cross! sv-224 sv-208 (-> s3-0 sv-272)) - (vector-normalize! sv-224 (-> (new 'static 'array float 1 1.0) 0)) + (vector-normalize! sv-224 (the-as float 1.0)) (let ((f0-6 (cam-layout-intersect-dist (-> s3-0 s1-0) sv-192 sv-224))) (when (!= f0-6 409600000.0) (vector+float*! sv-240 sv-192 sv-224 f0-6) @@ -416,7 +416,7 @@ (else (dotimes (v1-87 (the-as int (-> sv-16 elt-count))) (when (and (!= v1-87 s1-0) (!= v1-87 sv-272)) - (if (< (-> (new 'static 'array float 1 4096.0) 0) (- (vector-dot sv-160 (-> s3-0 v1-87)) (-> s3-0 v1-87 w))) + (if (< 4096.0 (- (vector-dot sv-160 (-> s3-0 v1-87)) (-> s3-0 v1-87 w))) (goto cfg-47) ) ) @@ -446,7 +446,7 @@ (set! sv-272 (+ sv-272 1)) ) (when (nonzero? sv-256) - (vector-float*! s0-0 s0-0 (/ (-> (new 'static 'array float 1 1.0) 0) (the float sv-256))) + (vector-float*! s0-0 s0-0 (/ 1.0 (the float sv-256))) (cond ((>= *volume-normal-current* 599) (format 0 "ERROR : camera editing out of volume normals~%") @@ -535,20 +535,20 @@ 0.0 0.0 (cond - ((< (-> (new 'static 'array float 1 1.0) 0) arg3) - (set! arg3 (-> (the-as (pointer float) (new 'static 'array float 1 1.0)) 0)) + ((< 1.0 arg3) + (set! arg3 (the-as float 1.0)) ) ((< arg3 0.0) - (set! arg3 (-> (the-as (pointer float) (new 'static 'array float 1 0.0)) 0)) + (set! arg3 (the-as float 0.0)) ) ) - (vector-normalize-copy! s2-0 arg1 (-> (new 'static 'array float 1 1.0) 0)) - (vector-normalize-copy! s1-0 arg2 (-> (new 'static 'array float 1 1.0) 0)) + (vector-normalize-copy! s2-0 arg1 (the-as float 1.0)) + (vector-normalize-copy! s1-0 arg2 (the-as float 1.0)) (vector-cross! s0-0 s2-0 s1-0) (let* ((f30-0 (vector-length s0-0)) (f28-0 (asin f30-0)) ) - (vector-float*! arg0 arg1 (/ (sin (* (- (-> (new 'static 'array float 1 1.0) 0) arg3) f28-0)) f30-0)) + (vector-float*! arg0 arg1 (/ (sin (* (- 1.0 arg3) f28-0)) f30-0)) (vector+float*! arg0 arg0 arg2 (/ (sin (* arg3 f28-0)) f30-0)) ) ) @@ -586,36 +586,15 @@ (let ((s3-0 (new-stack-vector0)) (gp-0 (new-stack-vector0)) ) - (arg0 - s3-0 - (-> arg1 from) - (-> arg1 to) - (-> (new 'static 'array float 1 0.0) 0) - (-> arg1 axis) - (-> (new 'static 'array float 1 65536.0) 0) - ) + (arg0 s3-0 (-> arg1 from) (-> arg1 to) (the-as float 0.0) (-> arg1 axis) (the-as float 65536.0)) (vector+! s3-0 s3-0 (-> arg1 origin)) (dotimes (s2-0 10) (set! (-> gp-0 quad) (-> s3-0 quad)) - (arg0 - s3-0 - (-> arg1 from) - (-> arg1 to) - (* 0.1 (+ (-> (new 'static 'array float 1 1.0) 0) (the float s2-0))) - (-> arg1 axis) - (-> (new 'static 'array float 1 65536.0) 0) - ) + (arg0 s3-0 (-> arg1 from) (-> arg1 to) (* 0.1 (+ 1.0 (the float s2-0))) (-> arg1 axis) (the-as float 65536.0)) (vector+! s3-0 s3-0 (-> arg1 origin)) (camera-line s3-0 gp-0 (-> arg1 color)) ) - (arg0 - gp-0 - (-> arg1 from) - (-> arg1 to) - (-> *CAM_LAYOUT-bank* debug-t) - (-> arg1 axis) - (-> (new 'static 'array float 1 65536.0) 0) - ) + (arg0 gp-0 (-> arg1 from) (-> arg1 to) (-> *CAM_LAYOUT-bank* debug-t) (-> arg1 axis) (the-as float 65536.0)) (format *stdcon* "~S ~f~%" (-> arg1 disp) (vector-length gp-0)) (vector+! gp-0 gp-0 (-> arg1 origin)) (camera-line (-> arg1 origin) gp-0 (-> arg1 color)) @@ -624,7 +603,7 @@ (new 'static 'vector :z 1024.0) gp-0 (-> arg1 color) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) @@ -635,17 +614,11 @@ (let ((s3-0 (new-stack-vector0)) (gp-0 (new-stack-vector0)) ) - (arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (-> (new 'static 'array float 1 0.0) 0)) + (arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (the-as float 0.0)) (vector+! s3-0 s3-0 (-> arg1 origin)) (dotimes (s2-0 10) (set! (-> gp-0 quad) (-> s3-0 quad)) - (arg0 - s3-0 - (-> arg1 from) - (-> arg1 to) - (-> arg1 axis) - (* 182.04445 (* 18.0 (+ (-> (new 'static 'array float 1 1.0) 0) (the float s2-0)))) - ) + (arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (* 182.04445 (* 18.0 (+ 1.0 (the float s2-0))))) (vector+! s3-0 s3-0 (-> arg1 origin)) (camera-line s3-0 gp-0 (-> arg1 color)) ) @@ -658,7 +631,7 @@ (new 'static 'vector :z 1024.0) gp-0 (-> arg1 color) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) @@ -680,8 +653,8 @@ s5-0 s4-0 (* 0.5 (cam-slave-get-fov arg0)) - (-> (new 'static 'array float 1 0.75) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.75) + (the-as float 1.0) (new 'static 'vector4w :z #xff :w #x80) ) ) @@ -695,7 +668,7 @@ (new 'static 'vector :z 1024.0) s5-1 (new 'static 'vector4w :x #x80 :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) @@ -708,7 +681,7 @@ (new 'static 'vector :z 1024.0) s5-2 (new 'static 'vector4w :y #x80 :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) @@ -721,7 +694,7 @@ (new 'static 'vector :z 1024.0) s5-3 (new 'static 'vector4w :x #x80 :z #x80 :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) @@ -735,7 +708,7 @@ ) (cond ((cam-slave-get-vector-with-offset arg0 s4-1 'pivot) - (curve-get-pos! s5-4 (-> (new 'static 'array float 1 0.0) 0) s3-1) + (curve-get-pos! s5-4 (the-as float 0.0) s3-1) (vector-! s4-1 s4-1 s5-4) ) (else @@ -757,11 +730,11 @@ ) ) ) - (curve-get-pos! s5-4 (-> (new 'static 'array float 1 0.0) 0) s3-1) + (curve-get-pos! s5-4 (the-as float 0.0) s3-1) (vector+! s5-4 s5-4 s4-1) (dotimes (s1-1 8) (set! (-> s2-0 quad) (-> s5-4 quad)) - (curve-get-pos! s5-4 (* (-> (new 'static 'array float 1 0.125) 0) (the float (+ s1-1 1))) s3-1) + (curve-get-pos! s5-4 (* 0.125 (the float (+ s1-1 1))) s3-1) (vector+! s5-4 s5-4 s4-1) (camera-line s2-0 s5-4 (new 'static 'vector4w :x #xff :y #xff :w #x80)) ) @@ -772,7 +745,7 @@ (new 'static 'vector :z 1024.0) s5-4 (new 'static 'vector4w :x #xff :y #xff :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) @@ -787,24 +760,24 @@ ) (cond ((cam-slave-get-vector-with-offset arg0 s4-2 'pivot) - (curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2) + (curve-get-pos! s5-5 (the-as float 1.0) s3-2) (vector-! s4-2 s4-2 s5-5) ) ((get-curve-data! arg0 s1-2 'campath 'campath-k (the-as float -1000000000.0)) - (curve-get-pos! s4-2 (-> (new 'static 'array float 1 0.0) 0) s1-2) - (curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2) + (curve-get-pos! s4-2 (the-as float 0.0) s1-2) + (curve-get-pos! s5-5 (the-as float 1.0) s3-2) (vector-! s4-2 s4-2 s5-5) ) ((cam-slave-get-vector-with-offset arg0 s4-2 'trans) - (curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2) + (curve-get-pos! s5-5 (the-as float 1.0) s3-2) (vector-! s4-2 s4-2 s5-5) ) ) - (curve-get-pos! s5-5 (-> (new 'static 'array float 1 0.0) 0) s3-2) + (curve-get-pos! s5-5 (the-as float 0.0) s3-2) (vector+! s5-5 s5-5 s4-2) (dotimes (s1-3 8) (set! (-> s2-1 quad) (-> s5-5 quad)) - (curve-get-pos! s5-5 (* (-> (new 'static 'array float 1 0.125) 0) (the float (+ s1-3 1))) s3-2) + (curve-get-pos! s5-5 (* 0.125 (the float (+ s1-3 1))) s3-2) (vector+! s5-5 s5-5 s4-2) (camera-line s2-1 s5-5 (new 'static 'vector4w :z #xff :w #x80)) ) @@ -815,20 +788,20 @@ (new 'static 'vector :z 1024.0) s5-5 (new 'static 'vector4w :z #xff :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) - (curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue (-> (new 'static 'array float 1 0.0) 0)) s3-2) + (curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue (the-as float 0.0)) s3-2) (vector+! s5-5 s5-5 s4-2) (camera-cross (new 'static 'vector :y 1024.0) (new 'static 'vector :z 1024.0) s5-5 (new 'static 'vector4w :z #xff :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) - (let ((s2-3 (res-lump-data arg0 'campoints pointer :time (-> (new 'static 'array float 1 1.0) 0))) + (let ((s2-3 (res-lump-data arg0 'campoints pointer :time (the-as float 1.0))) (v1-95 (res-lump-struct arg0 'campoints-offset structure :time (the-as float -1000000000.0))) (s4-3 (new 'stack-no-clear 'vector)) (s3-3 (new 'stack-no-clear 'vector)) @@ -852,11 +825,11 @@ (new 'static 'vector :z 1024.0) s5-6 (new 'static 'vector4w :x #xff :y #xff :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) - (let ((s4-4 (res-lump-data arg0 'focalpull pointer :time (-> (new 'static 'array float 1 1.0) 0))) + (let ((s4-4 (res-lump-data arg0 'focalpull pointer :time (the-as float 1.0))) (s5-7 (new 'static 'vector)) ) (when (and s4-4 (or (!= *camera-layout-blink* 'focalpull) (logtest? (-> *display* real-actual-frame-counter) 8))) @@ -876,7 +849,7 @@ (new 'static 'vector :z 1024.0) s5-7 (new 'static 'vector4w :y #xff :z #xff :w #x80) - (-> (new 'static 'array float 1 4096.0) 0) + (meters 1.0) ) ) ) @@ -892,12 +865,12 @@ (vector-! (-> s5-8 from) (-> s5-8 from) (-> s5-8 origin)) (vector-! (-> s5-8 to) (-> s5-8 to) (-> s5-8 origin)) (vector-cross! s4-5 (-> s5-8 from) (-> s5-8 to)) - (vector-normalize! s4-5 (-> (new 'static 'array float 1 8192.0) 0)) + (vector-normalize! s4-5 (the-as float 8192.0)) (vector+! s4-5 s4-5 (-> s5-8 origin)) (camera-line (-> s5-8 origin) s4-5 (new 'static 'vector4w :x #x80 :y #x80 :z #x80 :w #x80)) (when (not (paused?)) (+! (-> *CAM_LAYOUT-bank* debug-t) (-> *CAM_LAYOUT-bank* debug-step)) - (if (< (-> (new 'static 'array float 1 1.0) 0) (-> *CAM_LAYOUT-bank* debug-t)) + (if (< 1.0 (-> *CAM_LAYOUT-bank* debug-t)) (set! (-> *CAM_LAYOUT-bank* debug-t) 0.0) ) ) @@ -958,10 +931,10 @@ ((cpad-hold? arg2 l3) (set! (-> arg0 z) (- (-> arg0 z) (analog-input (the-as int (-> *cpad-list* cpads arg2 rightx)) - (-> (new 'static 'array float 1 128.0) 0) - (-> (new 'static 'array float 1 48.0) 0) - (-> (new 'static 'array float 1 110.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 128.0) + (the-as float 48.0) + (the-as float 110.0) + (the-as float 1.0) ) ) ) @@ -969,27 +942,27 @@ (else (set! (-> arg0 y) (- (-> arg0 y) (analog-input (the-as int (-> *cpad-list* cpads arg2 rightx)) - (-> (new 'static 'array float 1 128.0) 0) - (-> (new 'static 'array float 1 48.0) 0) - (-> (new 'static 'array float 1 110.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 128.0) + (the-as float 48.0) + (the-as float 110.0) + (the-as float 1.0) ) ) ) (+! (-> arg0 x) (analog-input (the-as int (-> *cpad-list* cpads arg2 righty)) - (-> (new 'static 'array float 1 128.0) 0) - (-> (new 'static 'array float 1 48.0) 0) - (-> (new 'static 'array float 1 110.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 128.0) + (the-as float 48.0) + (the-as float 110.0) + (the-as float 1.0) ) ) (set! (-> arg1 x) (- (-> arg1 x) (analog-input (the-as int (-> *cpad-list* cpads arg2 leftx)) - (-> (new 'static 'array float 1 128.0) 0) - (-> (new 'static 'array float 1 48.0) 0) - (-> (new 'static 'array float 1 110.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 128.0) + (the-as float 48.0) + (the-as float 110.0) + (the-as float 1.0) ) ) ) @@ -998,9 +971,9 @@ (set! (-> arg1 y) (+ 0.5 (analog-input (the-as int (-> *cpad-list* cpads arg2 abutton 9)) - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 32.0) 0) - (-> (new 'static 'array float 1 230.0) 0) + (the-as float 0.0) + (the-as float 32.0) + (the-as float 230.0) (the-as float 0.5) ) (-> arg1 y) @@ -1012,9 +985,9 @@ (if (cpad-hold? arg2 l1) (set! (-> arg1 y) (- (-> arg1 y) (+ 0.5 (analog-input (the-as int (-> *cpad-list* cpads arg2 abutton 8)) - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 32.0) 0) - (-> (new 'static 'array float 1 230.0) 0) + (the-as float 0.0) + (the-as float 32.0) + (the-as float 230.0) (the-as float 0.5) ) ) @@ -1024,10 +997,10 @@ ) (set! (-> arg1 z) (- (-> arg1 z) (analog-input (the-as int (-> *cpad-list* cpads arg2 lefty)) - (-> (new 'static 'array float 1 128.0) 0) - (-> (new 'static 'array float 1 48.0) 0) - (-> (new 'static 'array float 1 110.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 128.0) + (the-as float 48.0) + (the-as float 110.0) + (the-as float 1.0) ) ) ) @@ -1303,11 +1276,13 @@ ) ;; definition for function fov->maya +;; INFO: Return type mismatch number vs float. (defun fov->maya ((arg0 float)) - (if (= arg0 0.0) - (-> (new 'static 'array float 1 0.0) 0) - (/ 12.700255 (tan (* 0.5 arg0))) - ) + (the-as float (if (= arg0 0.0) + 0.0 + (/ 12.700255 (tan (* 0.5 arg0))) + ) + ) ) ;; definition for function cam-layout-save-cam-rot @@ -1548,7 +1523,7 @@ 'fov 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1562,7 +1537,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1601,7 +1576,7 @@ 'focalPull 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1615,7 +1590,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1819,7 +1794,7 @@ 'intro-time 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1833,7 +1808,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1844,7 +1819,7 @@ (if arg0 (format #t "setup intro-time 0.0 (defaults to 1 sec)~%") ) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) ) (arg0 (format #t "setup intro-time ~f~%" f30-0) @@ -1872,7 +1847,7 @@ 'intro-exitValue 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1886,7 +1861,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1920,7 +1895,7 @@ 'interpTime 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -1934,7 +1909,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2002,7 +1977,7 @@ 'spline-follow-dist-offset 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2047,7 +2022,7 @@ 'tiltAdjust 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2061,7 +2036,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2092,7 +2067,7 @@ 'stringMinLength 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2106,7 +2081,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2137,7 +2112,7 @@ 'stringMaxLength 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2151,7 +2126,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2182,7 +2157,7 @@ 'stringMinHeight 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2196,7 +2171,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2227,7 +2202,7 @@ 'stringMaxHeight 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2241,7 +2216,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2272,7 +2247,7 @@ 'stringCliffHeight 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2286,7 +2261,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2317,7 +2292,7 @@ 'maxAngle 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2330,7 +2305,7 @@ (string->symbol *res-key-string*) 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2681,7 +2656,7 @@ arg0 'interp (the-as float -1000000000.0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as (pointer res-tag) #f) *res-static-buf* ) @@ -2689,15 +2664,15 @@ (f0-0 (-> arg1 0)) ) (if (= f0-0 0.0) - (set! f0-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f0-0 1.0) ) (let ((f0-2 (+ f30-0 (analog-input (the-as int (-> *cpad-list* cpads 0 leftx)) - (-> (new 'static 'array float 1 128.0) 0) - (-> (new 'static 'array float 1 48.0) 0) - (-> (new 'static 'array float 1 110.0) 0) + (the-as float 128.0) + (the-as float 48.0) + (the-as float 110.0) f0-0 ) ) @@ -2716,7 +2691,7 @@ ;; definition for function clmf-cam-meters (defbehavior clmf-cam-meters cam-layout ((arg0 meters) (arg1 symbol)) - (let ((f0-0 (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0)))) + (let ((f0-0 (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0)))) (format arg0 ": ~M" f0-0) ) #t @@ -2730,7 +2705,7 @@ ;; definition for function clmf-cam-deg (defbehavior clmf-cam-deg cam-layout ((arg0 degrees) (arg1 symbol)) - (format arg0 ": ~R" (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0))) + (format arg0 ": ~R" (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0))) #t ) @@ -2751,7 +2726,7 @@ ;; definition for function clmf-cam-float (defbehavior clmf-cam-float cam-layout ((arg0 float) (arg1 symbol)) - (format arg0 ": ~f" (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0))) + (format arg0 ": ~f" (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0))) #t ) diff --git a/test/decompiler/reference/engine/debug/anim-tester_REF.gc b/test/decompiler/reference/engine/debug/anim-tester_REF.gc index 4db1852ca4..c4f632bd54 100644 --- a/test/decompiler/reference/engine/debug/anim-tester_REF.gc +++ b/test/decompiler/reference/engine/debug/anim-tester_REF.gc @@ -504,10 +504,10 @@ ;; INFO: Return type mismatch object vs none. (defun anim-tester-num-print ((arg0 basic) (arg1 float)) (cond - ((= arg1 (-> (new 'static 'array float 1 -2.0) 0)) + ((= arg1 -2.0) (format arg0 "max") ) - ((= arg1 (-> (new 'static 'array float 1 -1.0) 0)) + ((= arg1 -1.0) (format arg0 "min") ) (else @@ -700,8 +700,8 @@ (set! (-> (the-as anim-test-seq-item v0-0) privname) arg1) (set! (-> (the-as anim-test-seq-item v0-0) speed) 100) (set! (-> (the-as anim-test-seq-item v0-0) blend) 0) - (set! (-> (the-as anim-test-seq-item v0-0) first-frame) (-> (new 'static 'array float 1 -1.0) 0)) - (set! (-> (the-as anim-test-seq-item v0-0) last-frame) (-> (new 'static 'array float 1 -2.0) 0)) + (set! (-> (the-as anim-test-seq-item v0-0) first-frame) -1.0) + (set! (-> (the-as anim-test-seq-item v0-0) last-frame) -2.0) (the-as anim-test-seq-item v0-0) ) ) @@ -773,7 +773,7 @@ #t " item ~A SP=~f BL=~d FIRST=" (-> s3-0 privname) - (* (-> (new 'static 'array float 1 0.01) 0) (the float (-> s3-0 speed))) + (* 0.01 (the float (-> s3-0 speed))) (-> s3-0 blend) ) (anim-tester-num-print #t (-> s3-0 first-frame)) @@ -812,7 +812,7 @@ ) (format #t "-------------~%") (format #t "current-obj=~A~%" (-> obj current-obj)) - (format #t "speed=~f~%" (* (-> (new 'static 'array float 1 0.01) 0) (the float (-> obj speed)))) + (format #t "speed=~f~%" (* 0.01 (the float (-> obj speed)))) (format #t "--flags:--~%") (the-as anim-tester (format #t " CONNECTED: ~A~%" (if (logtest? (-> obj flags) (anim-tester-flags fanimt0)) "TRUE" @@ -960,10 +960,8 @@ (defbehavior anim-tester-update-anim-info anim-tester ((arg0 anim-test-seq-item)) (set! (-> self anim-first) (-> arg0 first-frame)) (set! (-> self anim-last) (-> arg0 last-frame)) - (set! (-> self anim-gspeed) (* (-> (new 'static 'array float 1 0.01) 0) (the float (-> self speed)))) - (set! (-> self anim-speed) - (* (-> (new 'static 'array float 1 0.01) 0) (-> self anim-gspeed) (the float (-> arg0 speed))) - ) + (set! (-> self anim-gspeed) (* 0.01 (the float (-> self speed)))) + (set! (-> self anim-speed) (* 0.01 (-> self anim-gspeed) (the float (-> arg0 speed)))) (when (< (-> self anim-speed) 0.0) (set! (-> self anim-first) (-> arg0 last-frame)) (set! (-> self anim-last) (-> arg0 first-frame)) @@ -1010,8 +1008,8 @@ (set! (-> self draw sink-group) (-> *level* level-default foreground-sink-group 1)) (set! (-> self draw lod-set lod 0 geo) a1-4) ) - (set! (-> self draw lod-set lod 0 dist) (-> (new 'static 'array float 1 4095996000.0) 0)) - (set! (-> self draw bounds w) (-> (new 'static 'array float 1 40960.0) 0)) + (set! (-> self draw lod-set lod 0 dist) 4095996000.0) + (set! (-> self draw bounds w) 40960.0) (set! (-> self draw data-format) (the-as uint 1)) (let ((v1-16 (-> (new 'static 'vector :x 1.0 :y 1.0 :z 1.0 :w 1.0) quad))) (set! (-> self draw color-mult quad) v1-16) @@ -1048,13 +1046,13 @@ (gp-0 (-> s3-0 base)) ) (cond - ((= arg1 (-> (new 'static 'array float 1 -1.0) 0)) + ((= arg1 -1.0) (let ((s2-1 draw-string-adv)) (format (clear *temp-string*) "~Smin" arg0) (s2-1 *temp-string* s3-0 arg3) ) ) - ((= arg1 (-> (new 'static 'array float 1 -2.0) 0)) + ((= arg1 -2.0) (let ((s2-2 draw-string-adv)) (format (clear *temp-string*) "~Smax" arg0) (s2-2 *temp-string* s3-0 arg3) @@ -1630,36 +1628,37 @@ ) ;; definition for function anim-tester-adjust-frame +;; INFO: Return type mismatch number vs float. (defun anim-tester-adjust-frame ((arg0 float) (arg1 float)) (cond ((cpad-hold? 0 down) (cond - ((= arg0 (-> (new 'static 'array float 1 -2.0) 0)) - (set! arg0 (+ (-> (new 'static 'array float 1 -1.0) 0) arg1)) + ((= arg0 -2.0) + (set! arg0 (+ -1.0 arg1)) ) - ((!= arg0 (-> (new 'static 'array float 1 -1.0) 0)) - (set! arg0 (+ (-> (new 'static 'array float 1 -1.0) 0) arg0)) + ((!= arg0 -1.0) + (set! arg0 (+ -1.0 arg0)) (if (< arg0 0.0) - (set! arg0 (-> (new 'static 'array float 1 -1.0) 0)) + (set! arg0 (the-as float -1.0)) ) ) ) ) ((cpad-hold? 0 up) (cond - ((= arg0 (-> (new 'static 'array float 1 -1.0) 0)) - (set! arg0 (-> (new 'static 'array float 1 0.0) 0)) + ((= arg0 -1.0) + (set! arg0 (the-as float 0.0)) ) - ((!= arg0 (-> (new 'static 'array float 1 -2.0) 0)) - (set! arg0 (+ (-> (new 'static 'array float 1 1.0) 0) arg0)) + ((!= arg0 -2.0) + (set! arg0 (+ 1.0 arg0)) (if (>= arg0 arg1) - (set! arg0 (-> (new 'static 'array float 1 -2.0) 0)) + (set! arg0 (the-as float -2.0)) ) ) ) ) ) - arg0 + (the-as float arg0) ) ;; definition for function anim-tester-pick-item-setup @@ -1751,7 +1750,7 @@ *font-default-matrix* (-> arg1 xpos) (-> arg1 ypos) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as font-color (if (= (-> arg1 the-index) (-> arg1 current-index)) 15 12 @@ -2592,13 +2591,13 @@ (ja-channel-set! 1) ) (cond - ((= (-> self anim-first) (-> (new 'static 'array float 1 -1.0) 0)) + ((= (-> self anim-first) -1.0) (let ((s3-0 (-> self skel root-channel 0))) (joint-control-channel-group-eval! s3-0 s4-1 num-func-identity) (set! (-> s3-0 frame-num) 0.0) ) ) - ((= (-> self anim-first) (-> (new 'static 'array float 1 -2.0) 0)) + ((= (-> self anim-first) -2.0) (let ((s3-1 (-> self skel root-channel 0))) (joint-control-channel-group-eval! s3-1 s4-1 num-func-identity) (set! (-> s3-1 frame-num) (the float (+ (-> s4-1 data 0 length) -1))) @@ -2615,13 +2614,7 @@ (while (and (!= (-> self skel root-channel 0) (-> self skel channel)) (logtest? (-> s5-1 flags) 2)) (when (logtest? (-> self flags) (anim-tester-flags fanimt5)) (TODO-RENAME-9 (-> self align)) - (TODO-RENAME-10 - (-> self align) - 31 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (TODO-RENAME-10 (-> self align) 31 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0)) ) (suspend) ) @@ -2629,21 +2622,15 @@ (until (ja-done? 0) (when (logtest? (-> self flags) (anim-tester-flags fanimt5)) (TODO-RENAME-9 (-> self align)) - (TODO-RENAME-10 - (-> self align) - 31 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (TODO-RENAME-10 (-> self align) 31 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0)) ) (suspend) (anim-tester-update-anim-info s5-1) - (let ((v1-73 (= (-> self anim-last) (-> (new 'static 'array float 1 -2.0) 0)))) + (let ((v1-73 (= (-> self anim-last) -2.0))) (cond ((or v1-73 (>= (-> self anim-last) (-> self anim-first))) (cond - ((= (-> self anim-last) (-> (new 'static 'array float 1 -2.0) 0)) + ((= (-> self anim-last) -2.0) (let ((a0-42 (-> self skel root-channel 0))) (set! (-> a0-42 param 0) (the float (+ (-> a0-42 frame-group data 0 length) -1))) (set! (-> a0-42 param 1) (-> self anim-speed)) @@ -2659,7 +2646,7 @@ ) ) ) - ((= (-> self anim-last) (-> (new 'static 'array float 1 -1.0) 0)) + ((= (-> self anim-last) -1.0) (let ((a0-44 (-> self skel root-channel 0))) (set! (-> a0-44 param 0) 0.0) (set! (-> a0-44 param 1) (-> self anim-speed)) @@ -2719,11 +2706,7 @@ (set! (-> self list-con list-owner) (the-as uint self)) (quaternion-identity! (-> self root quat)) (vector-identity! (-> self root scale)) - (position-in-front-of-camera! - (-> self root trans) - (-> (new 'static 'array float 1 40960.0) 0) - (-> (new 'static 'array float 1 4096.0) 0) - ) + (position-in-front-of-camera! (-> self root trans) (the-as float 40960.0) (the-as float 4096.0)) (set! (-> self event-hook) anim-tester-standard-event-handler) (anim-tester-reset) (go anim-tester-process) diff --git a/test/decompiler/reference/engine/target/target-handler_REF.gc b/test/decompiler/reference/engine/target/target-handler_REF.gc index c4004fb1f1..84aff6e688 100644 --- a/test/decompiler/reference/engine/target/target-handler_REF.gc +++ b/test/decompiler/reference/engine/target/target-handler_REF.gc @@ -42,7 +42,7 @@ (if (!= (pickup-collectable! (-> self fact-info-target) (the-as pickup-type s4-0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as handle #f) ) (pickup-collectable! (-> self fact-info-target) (the-as pickup-type s4-0) f28-0 (process->handle arg0)) @@ -115,7 +115,7 @@ (pickup-collectable! (-> self fact-info-target) (the-as pickup-type (-> arg3 param 1)) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as handle #f) ) ) diff --git a/test/decompiler/reference/engine/target/target2_REF.gc b/test/decompiler/reference/engine/target/target2_REF.gc index 8340ab6c21..aefbbcd743 100644 --- a/test/decompiler/reference/engine/target/target2_REF.gc +++ b/test/decompiler/reference/engine/target/target2_REF.gc @@ -3571,7 +3571,7 @@ ) arg2 arg3 - (-> (new 'static 'array float 1 143360.0) 0) + 143360.0 ) (-> s3-1 ppointer) ) diff --git a/test/decompiler/reference/levels/finalboss/robotboss_REF.gc b/test/decompiler/reference/levels/finalboss/robotboss_REF.gc index 9da1985ff0..bb2cd5bd81 100644 --- a/test/decompiler/reference/levels/finalboss/robotboss_REF.gc +++ b/test/decompiler/reference/levels/finalboss/robotboss_REF.gc @@ -2227,7 +2227,7 @@ (vector-! s5-0 (-> self entity extra trans) s5-0) (dotimes (v1-53 6) (vector+! (the-as vector (-> arg0 info v1-53)) (the-as vector (-> arg0 info v1-53)) s5-0) - (set! (-> arg0 info v1-53 dest y) (+ (-> (new 'static 'array float 1 2048.0) 0) (-> arg0 info v1-53 dest y))) + (set! (-> arg0 info v1-53 dest y) (+ 2048.0 (-> arg0 info v1-53 dest y))) ) ) (none) diff --git a/test/decompiler/reference/levels/flut_common/target-flut_REF.gc b/test/decompiler/reference/levels/flut_common/target-flut_REF.gc index 8257d2c2eb..c1e07e9c52 100644 --- a/test/decompiler/reference/levels/flut_common/target-flut_REF.gc +++ b/test/decompiler/reference/levels/flut_common/target-flut_REF.gc @@ -435,7 +435,7 @@ (('swim) (let* ((gp-1 (-> self control last-known-safe-ground)) (s3-1 (vector-! (new 'stack-no-clear 'vector) gp-1 (-> self control trans))) - (f30-1 (fmax (-> (new 'static 'array float 1 8192.0) 0) (fmin 40960.0 (vector-xz-length s3-1)))) + (f30-1 (fmax 8192.0 (fmin 40960.0 (vector-xz-length s3-1)))) ) (vector-xz-normalize! s3-1 f30-1) (let ((s5-0 (new 'stack-no-clear 'event-message-block))) @@ -445,15 +445,10 @@ (set! (-> s5-0 param 0) (the-as uint #f)) (let ((s4-0 (new 'static 'attack-info :mask #x882))) (set! (-> s4-0 vector quad) (-> s3-1 quad)) - (set! (-> s4-0 shove-up) (+ (lerp-scale - (the-as float 4096.0) - (-> (new 'static 'array float 1 16384.0) 0) - f30-1 - (the-as float 4096.0) - (the-as float 40960.0) - ) - (fmax 0.0 (- (-> gp-1 y) (-> self control trans y))) - ) + (set! (-> s4-0 shove-up) + (+ (lerp-scale (the-as float 4096.0) (the-as float 16384.0) f30-1 (the-as float 4096.0) (the-as float 40960.0)) + (fmax 0.0 (- (-> gp-1 y) (-> self control trans y))) + ) ) (set! (-> s4-0 angle) 'up) (set! (-> s5-0 param 1) (the-as uint s4-0)) @@ -549,7 +544,7 @@ (set! (-> self state-flags) (logand -1025 (-> self state-flags))) (set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max)) (set! (-> self control dynam gravity-length) (-> self control unknown-dynamics00 gravity-length)) - (target-collide-set! 'normal (-> (new 'static 'array float 1 0.0) 0)) + (target-collide-set! 'normal (the-as float 0.0)) (set! (-> self control reaction) target-collision-reaction) (set! (-> self control unknown-vector12 quad) (the-as uint128 0)) (clear-pending-settings-from-process *setting-control* self 'sound-flava) @@ -574,7 +569,7 @@ (set! (-> self flut entity) (-> v1-11 entity)) ) ) - (target-collide-set! 'flut (-> (new 'static 'array float 1 0.0) 0)) + (target-collide-set! 'flut (the-as float 0.0)) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control unknown-float01) 0.0) (logior! (-> self control root-prim prim-core action) (collide-action ca-14)) @@ -634,12 +629,7 @@ ) ) (send-event (ppointer->process (-> self manipy)) 'anim-mode 'loop) - (send-event - (ppointer->process (-> self manipy)) - 'art-joint-anim - "flut-get-on" - (-> (new 'static 'array float 1 0.0) 0) - ) + (send-event (ppointer->process (-> self manipy)) 'art-joint-anim "flut-get-on" 0.0) (send-event (ppointer->process (-> self manipy)) 'blend-shape #t) (send-event (ppointer->process (-> self manipy)) @@ -880,11 +870,11 @@ (the-as float (-> self control unknown-uint20)) (* 4.0 (the-as float (-> self control unknown-uint20))) f30-1 - (-> (new 'static 'array float 1 8192.0) 0) + (the-as float 8192.0) (the-as float 21845.334) ) ) - (if (and (= (-> self control surf name) '*tar-surface*) (< (-> (new 'static 'array float 1 8192.0) 0) f30-1)) + (if (and (= (-> self control surf name) '*tar-surface*) (< 8192.0 f30-1)) (set! (-> self control unknown-surface00 target-speed) (seek (-> self control unknown-surface00 target-speed) (the-as float 4096.0) @@ -990,7 +980,7 @@ (while #t (suspend) (let ((f0-13 (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 1.0) (-> self control unknown-float01) (the-as float 49152.0) @@ -1358,7 +1348,7 @@ ) ) ) - (while (< (-> (new 'static 'array float 1 8192.0) 0) (target-height-above-ground)) + (while (< 8192.0 (target-height-above-ground)) (suspend) (cpad-set-buzz! (-> *cpad-list* cpads 0) 0 3 (seconds 0.1)) (let ((a0-13 (-> self skel root-channel 0))) @@ -1743,12 +1733,7 @@ ) (!= (-> self control unknown-uint31) 1) ) - (target-shoved - (-> (new 'static 'array float 1 8192.0) 0) - (-> *TARGET-bank* smack-surface-height) - (the-as process #f) - target-flut-hit - ) + (target-shoved (meters 2.0) (-> *TARGET-bank* smack-surface-height) (the-as process #f) target-flut-hit) ) (if (and (logtest? (-> self water flags) 512) (zero? (mod (- (-> *display* base-frame-counter) (-> self state-time)) 21)) @@ -1821,7 +1806,7 @@ (the-as uint 12) ) ) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) (set! f30-0 0.0) ) ((ja-done? 0) @@ -2364,7 +2349,7 @@ (logior! (-> self state-flags) #x8000) (set! (-> self neck flex-blend) 0.0) (target-timed-invulnerable-off self) - (push-setting! *setting-control* self 'process-mask 'set (-> (new 'static 'array float 1 0.0) 0) #x14a0000) + (push-setting! *setting-control* self 'process-mask 'set 0.0 #x14a0000) (copy-settings-from-target! *setting-control*) (set! (-> self control transv quad) (the-as uint128 0)) (cond @@ -2579,7 +2564,7 @@ (-> target-flut-start exit) :code (behavior ((arg0 handle)) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) (let ((s5-0 0)) (while (zero? (logand (-> self control status) 1)) (target-flut-falling-anim-trans) diff --git a/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc b/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc index 68233674c9..e81ba3cfe2 100644 --- a/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc +++ b/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc @@ -345,11 +345,11 @@ ) (while #t (let ((a0-3 (-> self skel root-channel 0))) - (set! (-> a0-3 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-3 param 0) 1.0) (joint-control-channel-group-eval! a0-3 (the-as art-joint-anim #f) num-func-loop!) ) (let ((v1-16 (-> self skel root-channel 1))) - (set! (-> v1-16 frame-interp) (- (-> (new 'static 'array float 1 1.0) 0) (-> self parent-override 0 energy))) + (set! (-> v1-16 frame-interp) (- 1.0 (-> self parent-override 0 energy))) ) (suspend) ) @@ -369,7 +369,7 @@ (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 29))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 90.0) 0)) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) 0.0) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 29)) num-func-seek!) ) @@ -377,13 +377,13 @@ (suspend) (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 90.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) ) ) (let ((a0-7 (-> self skel root-channel 0))) (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1))) - (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-7 param 1) 1.0) (joint-control-channel-group! a0-7 (the-as art-joint-anim #f) num-func-seek!) ) (ja-channel-push! 1 75) @@ -392,7 +392,7 @@ (set! (-> gp-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) data 0 length) -1)) ) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (set! (-> gp-2 frame-num) (ja-aframe (the-as float 90.0) 0)) (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 25)) num-func-seek!) ) @@ -400,7 +400,7 @@ (suspend) (let ((a0-11 (-> self skel root-channel 0))) (set! (-> a0-11 param 0) (the float (+ (-> a0-11 frame-group data 0 length) -1))) - (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-11 param 1) 1.0) (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -437,8 +437,7 @@ ) (else (ja-channel-push! 1 75) - (let ((f30-0 (rand-vu-float-range (-> (new 'static 'array float 1 0.8) 0) (-> (new 'static 'array float 1 1.0) 0))) - ) + (let ((f30-0 (rand-vu-float-range (the-as float 0.8) (the-as float 1.0)))) (case (-> self side) ((1) (let ((a0-6 (-> self skel root-channel 0))) @@ -549,7 +548,7 @@ (set! (-> a0-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) data 0 length) -1)) ) - (set! (-> a0-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-0 param 1) 1.0) (set! (-> a0-0 frame-num) 0.0) (joint-control-channel-group! a0-0 (the-as art-joint-anim (-> self draw art-group data 33)) num-func-seek!) ) @@ -557,7 +556,7 @@ (suspend) (let ((a0-1 (-> self skel root-channel 0))) (set! (-> a0-1 param 0) (the float (+ (-> a0-1 frame-group data 0 length) -1))) - (set! (-> a0-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-1 param 1) 1.0) (joint-control-channel-group-eval! a0-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -580,7 +579,7 @@ (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 36))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 45.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (set! (-> gp-1 frame-num) 0.0) (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 36)) num-func-seek!) ) @@ -588,7 +587,7 @@ (suspend) (let ((gp-2 (-> self skel root-channel 0))) (set! (-> gp-2 param 0) (ja-aframe (the-as float 45.0) 0)) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -597,7 +596,7 @@ (let ((gp-3 (-> self skel root-channel 0))) (set! (-> gp-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 35))) (set! (-> gp-3 param 0) (ja-aframe (the-as float 45.0) 0)) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (set! (-> gp-3 frame-num) 0.0) (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -605,7 +604,7 @@ (suspend) (let ((gp-4 (-> self skel root-channel 0))) (set! (-> gp-4 param 0) (ja-aframe (the-as float 45.0) 0)) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -613,7 +612,7 @@ ) (let ((a0-13 (-> self skel root-channel 0))) (set! (-> a0-13 param 0) (the float (+ (-> a0-13 frame-group data 0 length) -1))) - (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-13 param 1) 1.0) (joint-control-channel-group! a0-13 (the-as art-joint-anim #f) num-func-seek!) ) (ja-channel-push! 1 75) @@ -622,7 +621,7 @@ (set! (-> gp-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) data 0 length) -1)) ) - (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-5 param 1) 1.0) (set! (-> gp-5 frame-num) (ja-aframe (the-as float 45.0) 0)) (joint-control-channel-group! gp-5 (the-as art-joint-anim (-> self draw art-group data 33)) num-func-seek!) ) @@ -630,7 +629,7 @@ (suspend) (let ((a0-17 (-> self skel root-channel 0))) (set! (-> a0-17 param 0) (the float (+ (-> a0-17 frame-group data 0 length) -1))) - (set! (-> a0-17 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-17 param 1) 1.0) (joint-control-channel-group-eval! a0-17 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -656,7 +655,7 @@ (set! (-> a0-3 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1)) ) - (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-3 param 1) 1.0) (set! (-> a0-3 frame-num) 0.0) (joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!) ) @@ -665,7 +664,7 @@ (suspend) (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 param 0) (the float (+ (-> a0-4 frame-group data 0 length) -1))) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -743,7 +742,7 @@ (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 52))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 45.0) 0)) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) 0.0) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 52)) num-func-seek!) ) @@ -751,13 +750,13 @@ (suspend) (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 45.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) ) ) (let ((a0-7 (-> self skel root-channel 0))) (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1))) - (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-7 param 1) 1.0) (joint-control-channel-group! a0-7 (the-as art-joint-anim #f) num-func-seek!) ) (ja-channel-push! 1 75) @@ -766,7 +765,7 @@ (set! (-> gp-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 50)) data 0 length) -1)) ) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (set! (-> gp-2 frame-num) (ja-aframe (the-as float 45.0) 0)) (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 50)) num-func-seek!) ) @@ -774,7 +773,7 @@ (suspend) (let ((a0-11 (-> self skel root-channel 0))) (set! (-> a0-11 param 0) (the float (+ (-> a0-11 frame-group data 0 length) -1))) - (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-11 param 1) 1.0) (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -790,12 +789,12 @@ :code (behavior ((arg0 symbol)) (when (not arg0) - (let ((f30-0 (rand-vu-float-range (-> (new 'static 'array float 1 0.0) 0) (-> (new 'static 'array float 1 1.0) 0))) + (let ((f30-0 (rand-vu-float-range (the-as float 0.0) (the-as float 1.0))) (gp-0 (-> *display* base-frame-counter)) ) (until (>= (- (-> *display* base-frame-counter) gp-0) (the int (* 300.0 f30-0))) (let ((a0-2 (-> self skel root-channel 0))) - (set! (-> a0-2 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-2 param 0) 1.0) (joint-control-channel-group-eval! a0-2 (the-as art-joint-anim #f) num-func-loop!) ) (suspend) @@ -807,7 +806,7 @@ (set! (-> a0-6 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 51)) data 0 length) -1)) ) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (set! (-> a0-6 frame-num) 0.0) (joint-control-channel-group! a0-6 (the-as art-joint-anim (-> self draw art-group data 51)) num-func-seek!) ) @@ -816,7 +815,7 @@ (suspend) (let ((a0-7 (-> self skel root-channel 0))) (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1))) - (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-7 param 1) 1.0) (joint-control-channel-group-eval! a0-7 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -985,7 +984,7 @@ (defbehavior plant-boss-vine-init plant-boss-arm ((arg0 vector) (arg1 vector) (arg2 float) (arg3 int)) (stack-size-set! (-> self main-thread) 128) (set! (-> self root-override) (the-as collide-shape (new 'process 'trsqv))) - (set-vector! (-> self root-override scale) arg2 arg2 arg2 (-> (new 'static 'array float 1 1.0) 0)) + (set-vector! (-> self root-override scale) arg2 arg2 arg2 1.0) (set! (-> self root-override trans quad) (-> arg0 quad)) (quaternion-zxy! (-> self root-override quat) arg1) (set! (-> self side) arg3) @@ -1033,7 +1032,7 @@ (set! (-> a0-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 43)) data 0 length) -1)) ) - (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-2 param 1) 1.0) (set! (-> a0-2 frame-num) 0.0) (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 43)) num-func-seek!) ) @@ -1041,7 +1040,7 @@ (suspend) (let ((a0-3 (-> self skel root-channel 0))) (set! (-> a0-3 param 0) (the float (+ (-> a0-3 frame-group data 0 length) -1))) - (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-3 param 1) 1.0) (joint-control-channel-group-eval! a0-3 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1054,7 +1053,7 @@ (set! (-> a0-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 40)) data 0 length) -1)) ) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (set! (-> a0-5 frame-num) 0.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 40)) num-func-seek!) ) @@ -1062,7 +1061,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1094,7 +1093,7 @@ :code (behavior ((arg0 symbol)) (let ((a0-1 (-> self skel root-channel 0))) - (set! (-> a0-1 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-1 param 0) 1.0) (joint-control-channel-group! a0-1 (the-as art-joint-anim #f) num-func-loop!) ) (ja-channel-push! 1 30) @@ -1103,7 +1102,7 @@ (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 44))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 30.0) 0)) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) 0.0) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!) ) @@ -1112,7 +1111,7 @@ (suspend) (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 30.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1122,7 +1121,7 @@ (set! (-> gp-3 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) data 0 length) -1)) ) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (set! (-> gp-3 frame-num) (ja-aframe (the-as float 30.0) 0)) (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!) ) @@ -1130,7 +1129,7 @@ (suspend) (let ((a0-14 (-> self skel root-channel 0))) (set! (-> a0-14 param 0) (the float (+ (-> a0-14 frame-group data 0 length) -1))) - (set! (-> a0-14 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-14 param 1) 1.0) (joint-control-channel-group-eval! a0-14 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1139,7 +1138,7 @@ (let ((gp-4 (-> self skel root-channel 0))) (set! (-> gp-4 frame-group) (the-as art-joint-anim (-> self draw art-group data 41))) (set! (-> gp-4 param 0) (ja-aframe (the-as float 30.0) 0)) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (set! (-> gp-4 frame-num) 0.0) (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 41)) num-func-seek!) ) @@ -1148,7 +1147,7 @@ (suspend) (let ((gp-5 (-> self skel root-channel 0))) (set! (-> gp-5 param 0) (ja-aframe (the-as float 30.0) 0)) - (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-5 param 1) 1.0) (joint-control-channel-group-eval! gp-5 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1158,7 +1157,7 @@ (set! (-> gp-7 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 41)) data 0 length) -1)) ) - (set! (-> gp-7 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-7 param 1) 1.0) (set! (-> gp-7 frame-num) (ja-aframe (the-as float 30.0) 0)) (joint-control-channel-group! gp-7 (the-as art-joint-anim (-> self draw art-group data 41)) num-func-seek!) ) @@ -1166,7 +1165,7 @@ (suspend) (let ((a0-26 (-> self skel root-channel 0))) (set! (-> a0-26 param 0) (the float (+ (-> a0-26 frame-group data 0 length) -1))) - (set! (-> a0-26 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-26 param 1) 1.0) (joint-control-channel-group-eval! a0-26 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1229,7 +1228,7 @@ (until v1-19 (suspend) (let ((a0-16 (-> self skel root-channel 0))) - (set! (-> a0-16 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-16 param 0) 1.0) (joint-control-channel-group-eval! a0-16 (the-as art-joint-anim #f) num-func-loop!) ) (set! v1-19 (and (-> self state-object) (< (-> self state-time-frame) (-> *display* base-frame-counter)))) @@ -1270,7 +1269,7 @@ (set! (-> a0-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 47)) data 0 length) -1)) ) - (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-2 param 1) 1.0) (set! (-> a0-2 frame-num) 0.0) (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 47)) num-func-seek!) ) @@ -1279,7 +1278,7 @@ (suspend) (let ((a0-3 (-> self skel root-channel 0))) (set! (-> a0-3 param 0) (the float (+ (-> a0-3 frame-group data 0 length) -1))) - (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-3 param 1) 1.0) (joint-control-channel-group-eval! a0-3 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1290,7 +1289,7 @@ (set! (-> a0-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 46)) data 0 length) -1)) ) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (set! (-> a0-5 frame-num) 0.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 46)) num-func-seek!) ) @@ -1299,7 +1298,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1332,7 +1331,7 @@ (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 frame-group) (the-as art-joint-anim (-> self draw art-group data 44))) (set! (-> a0-4 param 0) 0.0) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (set! (-> a0-4 frame-num) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) data 0 length) -1)) ) @@ -1342,7 +1341,7 @@ (suspend) (let ((a0-5 (-> self skel root-channel 0))) (set! (-> a0-5 param 0) 0.0) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1352,7 +1351,7 @@ (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 frame-group) (the-as art-joint-anim (-> self draw art-group data 41))) (set! (-> a0-10 param 0) 0.0) - (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 1) 1.0) (set! (-> a0-10 frame-num) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 41)) data 0 length) -1)) ) @@ -1362,7 +1361,7 @@ (suspend) (let ((a0-11 (-> self skel root-channel 0))) (set! (-> a0-11 param 0) 0.0) - (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-11 param 1) 1.0) (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1455,7 +1454,7 @@ (set! (-> a0-6 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) data 0 length) -1)) ) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (set! (-> a0-6 frame-num) 0.0) (joint-control-channel-group! a0-6 (the-as art-joint-anim (-> self draw art-group data 9)) num-func-seek!) ) @@ -1471,7 +1470,7 @@ (suspend) (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1))) - (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 1) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1486,7 +1485,7 @@ (defstate plant-boss-intro (plant-boss) :code (behavior () - (set-setting! *setting-control* self 'music 'danger (-> (new 'static 'array float 1 0.0) 0) 0) + (set-setting! *setting-control* self 'music 'danger (the-as float 0.0) 0) (send-event *target* 'reset-pickup 'eco) (let ((v1-9 (-> self entity extra perm))) (logior! (-> v1-9 status) (entity-perm-status user-set-from-cstage)) @@ -1503,9 +1502,7 @@ ) (b! #t cfg-3 :delay (nop!)) (label cfg-2) - (set! (-> self energy) - (seek (-> self energy) (-> (new 'static 'array float 1 1.0) 0) (* 2.0 (-> *display* seconds-per-frame))) - ) + (set! (-> self energy) (seek (-> self energy) (the-as float 1.0) (* 2.0 (-> *display* seconds-per-frame)))) (suspend) (label cfg-3) (let ((v1-22 (-> self skel channel))) @@ -1573,32 +1570,30 @@ (set-mode! (-> self body) (joint-mod-handler-mode world-look-at)) (set! (-> self body flex-blend) 0.0) (let ((a0-25 (-> self skel root-channel 0))) - (set! (-> a0-25 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-25 param 0) 1.0) (joint-control-channel-group! a0-25 (the-as art-joint-anim #f) num-func-loop!) ) (ja-channel-push! 1 150) (let ((gp-2 (-> self skel root-channel 0))) (set! (-> gp-2 frame-group) (the-as art-joint-anim (-> self draw art-group data 10))) (set! (-> gp-2 param 0) (ja-aframe (the-as float 510.0) 0)) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (set! (-> gp-2 frame-num) 0.0) (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 10)) num-func-seek!) ) (until (ja-done? 0) - (set! (-> self energy) - (seek (-> self energy) (-> (new 'static 'array float 1 1.0) 0) (* 0.2 (-> *display* seconds-per-frame))) - ) + (set! (-> self energy) (seek (-> self energy) (the-as float 1.0) (* 0.2 (-> *display* seconds-per-frame)))) (ja-blend-eval) (suspend) (let ((gp-3 (-> self skel root-channel 0))) (set! (-> gp-3 param 0) (ja-aframe (the-as float 510.0) 0)) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (joint-control-channel-group-eval! gp-3 (the-as art-joint-anim #f) num-func-seek!) ) ) (let ((a0-33 (-> self skel root-channel 0))) (set! (-> a0-33 param 0) (the float (+ (-> a0-33 frame-group data 0 length) -1))) - (set! (-> a0-33 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-33 param 1) 1.0) (joint-control-channel-group! a0-33 (the-as art-joint-anim #f) num-func-seek!) ) (let ((v1-77 (-> self entity extra perm))) @@ -1621,10 +1616,10 @@ plant-boss-default-event-handler :enter (behavior () - (set-setting! *setting-control* self 'music 'danger (-> (new 'static 'array float 1 0.0) 0) 0) + (set-setting! *setting-control* self 'music 'danger (the-as float 0.0) 0) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self body flex-blend) 0.0) - (set! (-> self neck flex-blend) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self neck flex-blend) 1.0) (none) ) :trans @@ -1671,7 +1666,7 @@ (set! (-> gp-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1)) ) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) (ja-aframe (the-as float 60.0) 0)) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!) ) @@ -1680,7 +1675,7 @@ (suspend) (let ((a0-7 (-> self skel root-channel 0))) (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1))) - (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-7 param 1) 1.0) (joint-control-channel-group-eval! a0-7 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1694,7 +1689,7 @@ (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 13))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 75.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (set! (-> gp-1 frame-num) 0.0) (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 13)) num-func-seek!) ) @@ -1703,13 +1698,13 @@ (suspend) (let ((gp-2 (-> self skel root-channel 0))) (set! (-> gp-2 param 0) (ja-aframe (the-as float 75.0) 0)) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!) ) ) (let ((a0-19 (-> self skel root-channel 0))) (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1))) - (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-19 param 1) 1.0) (joint-control-channel-group! a0-19 (the-as art-joint-anim #f) num-func-seek!) ) (ja-channel-push! 1 75) @@ -1718,7 +1713,7 @@ (set! (-> gp-3 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1)) ) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (set! (-> gp-3 frame-num) (ja-aframe (the-as float 75.0) 0)) (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!) ) @@ -1727,7 +1722,7 @@ (suspend) (let ((a0-23 (-> self skel root-channel 0))) (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1))) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1749,7 +1744,7 @@ (set! (-> a0-35 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1)) ) - (set! (-> a0-35 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-35 param 1) 1.0) (set! (-> a0-35 frame-num) 0.0) (joint-control-channel-group! a0-35 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!) ) @@ -1760,7 +1755,7 @@ (set! (-> a0-36 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1)) ) - (set! (-> a0-36 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-36 param 1) 1.0) (set! (-> a0-36 frame-num) 0.0) (joint-control-channel-group! a0-36 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!) ) @@ -1768,7 +1763,7 @@ (suspend) (let ((a0-37 (-> self skel root-channel 0))) (set! (-> a0-37 param 0) (the float (+ (-> a0-37 frame-group data 0 length) -1))) - (set! (-> a0-37 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-37 param 1) 1.0) (joint-control-channel-group-eval! a0-37 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1778,7 +1773,7 @@ (set! (-> a0-43 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1)) ) - (set! (-> a0-43 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-43 param 1) 1.0) (set! (-> a0-43 frame-num) 0.0) (joint-control-channel-group! a0-43 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!) ) @@ -1790,7 +1785,7 @@ (set! (-> a0-45 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) data 0 length) -1)) ) - (set! (-> a0-45 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-45 param 1) 1.0) (set! (-> a0-45 frame-num) 0.0) (joint-control-channel-group! a0-45 (the-as art-joint-anim (-> self draw art-group data 4)) num-func-seek!) ) @@ -1798,7 +1793,7 @@ (suspend) (let ((a0-46 (-> self skel root-channel 0))) (set! (-> a0-46 param 0) (the float (+ (-> a0-46 frame-group data 0 length) -1))) - (set! (-> a0-46 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-46 param 1) 1.0) (joint-control-channel-group-eval! a0-46 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1828,7 +1823,7 @@ (+! (-> self cycle-count) 1) (set! (-> self snap-count) 0) (set! (-> self body flex-blend) 0.0) - (set! (-> self neck flex-blend) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self neck flex-blend) 1.0) (set! (-> self want-aphid-count) (min (- 4 (the int (-> self health))) (cond ((>= (-> self try) 15) 1 @@ -1910,7 +1905,7 @@ (set! (-> a1-2 message) 'shove) (set! (-> a1-2 param 0) (-> arg3 param 0)) (let ((v1-6 (new 'static 'attack-info :mask #xc0))) - (set! (-> v1-6 shove-up) (-> (new 'static 'array float 1 8192.0) 0)) + (set! (-> v1-6 shove-up) 8192.0) (set! (-> v1-6 shove-back) 24576.0) (set! (-> a1-2 param 1) (the-as uint v1-6)) ) @@ -1949,7 +1944,7 @@ (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 11))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 60.0) 0)) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) 0.0) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 11)) num-func-seek!) ) @@ -1958,7 +1953,7 @@ (suspend) (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 60.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1966,7 +1961,7 @@ (let ((gp-2 (-> self skel root-channel 0))) (set! (-> gp-2 frame-group) (the-as art-joint-anim (-> self draw art-group data 11))) (set! (-> gp-2 param 0) (ja-aframe (the-as float 120.0) 0)) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (set! (-> gp-2 frame-num) (ja-aframe (the-as float 60.0) 0)) (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 11)) num-func-seek!) ) @@ -1974,7 +1969,7 @@ (suspend) (let ((gp-3 (-> self skel root-channel 0))) (set! (-> gp-3 param 0) (ja-aframe (the-as float 120.0) 0)) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (joint-control-channel-group-eval! gp-3 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1984,7 +1979,7 @@ (set! (-> gp-4 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) data 0 length) -1)) ) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (set! (-> gp-4 frame-num) (ja-aframe (the-as float 120.0) 0)) (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 11)) num-func-seek!) ) @@ -1992,7 +1987,7 @@ (suspend) (let ((a0-16 (-> self skel root-channel 0))) (set! (-> a0-16 param 0) (the float (+ (-> a0-16 frame-group data 0 length) -1))) - (set! (-> a0-16 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-16 param 1) 1.0) (joint-control-channel-group-eval! a0-16 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2018,7 +2013,7 @@ (set! (-> a0-18 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) data 0 length) -1)) ) - (set! (-> a0-18 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-18 param 1) 1.0) (set! (-> a0-18 frame-num) 0.0) (joint-control-channel-group! a0-18 (the-as art-joint-anim (-> self draw art-group data 12)) num-func-seek!) ) @@ -2026,7 +2021,7 @@ (suspend) (let ((a0-19 (-> self skel root-channel 0))) (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1))) - (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-19 param 1) 1.0) (joint-control-channel-group-eval! a0-19 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2123,8 +2118,8 @@ ) ) (let ((f30-0 (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.0) + (the-as float 1.0) (vector-vector-distance (target-pos 0) (-> self root-override trans)) (the-as float 26624.0) (the-as float 86016.0) @@ -2132,23 +2127,17 @@ ) ) (until (or v1-64 (ja-done? 0)) - (set! (-> self body flex-blend) (seek - (-> self body flex-blend) - (-> (new 'static 'array float 1 1.0) 0) - (* 2.0 (-> *display* seconds-per-frame)) - ) + (set! (-> self body flex-blend) + (seek (-> self body flex-blend) (the-as float 1.0) (* 2.0 (-> *display* seconds-per-frame))) ) - (set! (-> self neck flex-blend) (seek - (-> self neck flex-blend) - (-> (new 'static 'array float 1 0.0) 0) - (* 2.0 (-> *display* seconds-per-frame)) - ) + (set! (-> self neck flex-blend) + (seek (-> self neck flex-blend) (the-as float 0.0) (* 2.0 (-> *display* seconds-per-frame))) ) (set! f30-0 (seek f30-0 (lerp-scale - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 1.0) + (the-as float 0.0) (vector-vector-distance (target-pos 0) (-> self root-override trans)) (the-as float 26624.0) (the-as float 86016.0) @@ -2159,7 +2148,7 @@ (set! (-> self interp) f30-0) (let ((a0-19 (-> self skel root-channel 0))) (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1))) - (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-19 param 1) 1.0) (joint-control-channel-group-eval! a0-19 (the-as art-joint-anim #f) num-func-seek!) ) (let ((a0-20 (-> self skel root-channel 1))) @@ -2194,14 +2183,15 @@ ) :code (behavior () - (let ((f30-1 (if (= (if (> (-> self skel active-channels) 0) - (-> self skel root-channel 0 frame-group) - ) - (-> self draw art-group data 5) - ) - (fmax (-> (new 'static 'array float 1 129.0) 0) (ja-aframe-num 0)) - (-> (new 'static 'array float 1 129.0) 0) - ) + (let ((f30-1 (the-as float (if (= (if (> (-> self skel active-channels) 0) + (-> self skel root-channel 0 frame-group) + ) + (-> self draw art-group data 5) + ) + (fmax 129.0 (ja-aframe-num 0)) + 129.0 + ) + ) ) (gp-0 0) ) @@ -2250,11 +2240,9 @@ (send-event (handle->process (-> self camera)) 'joint "camera2") ) (set! (-> self body flex-blend) - (seek (-> self body flex-blend) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame)) - ) - (set! (-> self interp) - (seek (-> self interp) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame)) + (seek (-> self body flex-blend) (the-as float 0.0) (-> *display* seconds-per-frame)) ) + (set! (-> self interp) (seek (-> self interp) (the-as float 0.0) (-> *display* seconds-per-frame))) (let ((a0-31 (-> self skel root-channel 0))) (set! (-> a0-31 param 0) (the float (+ (-> a0-31 frame-group data 0 length) -1))) (set! (-> a0-31 param 1) 0.66) @@ -2274,7 +2262,7 @@ (set! (-> a0-35 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) data 0 length) -1)) ) - (set! (-> a0-35 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-35 param 1) 1.0) (set! (-> a0-35 frame-num) 0.0) (joint-control-channel-group! a0-35 (the-as art-joint-anim (-> self draw art-group data 20)) num-func-seek!) ) @@ -2283,7 +2271,7 @@ (suspend) (let ((a0-36 (-> self skel root-channel 0))) (set! (-> a0-36 param 0) (the float (+ (-> a0-36 frame-group data 0 length) -1))) - (set! (-> a0-36 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-36 param 1) 1.0) (joint-control-channel-group-eval! a0-36 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2319,24 +2307,24 @@ (let ((s4-0 (-> self skel root-channel 0))) (set! (-> s4-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 7))) (set! (-> s4-0 param 0) (ja-aframe (the-as float 210.0) 0)) - (set! (-> s4-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s4-0 param 1) 1.0) (set! (-> s4-0 frame-num) 0.0) (joint-control-channel-group! s4-0 (the-as art-joint-anim (-> self draw art-group data 7)) num-func-seek!) ) (until (ja-done? 0) (ja-blend-eval) (set! (-> self body flex-blend) - (seek (-> self body flex-blend) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame)) + (seek (-> self body flex-blend) (the-as float 0.0) (-> *display* seconds-per-frame)) ) (if (>= 1 arg0) (set! (-> self neck flex-blend) - (seek (-> self neck flex-blend) (-> (new 'static 'array float 1 1.0) 0) (-> *display* seconds-per-frame)) + (seek (-> self neck flex-blend) (the-as float 1.0) (-> *display* seconds-per-frame)) ) ) (suspend) (let ((s4-1 (-> self skel root-channel 0))) (set! (-> s4-1 param 0) (ja-aframe (the-as float 210.0) 0)) - (set! (-> s4-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s4-1 param 1) 1.0) (joint-control-channel-group-eval! s4-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2346,30 +2334,27 @@ (let ((s5-1 (-> self skel root-channel 0))) (set! (-> s5-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 7))) (set! (-> s5-1 param 0) (ja-aframe (the-as float 240.0) 0)) - (set! (-> s5-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s5-1 param 1) 1.0) (set! (-> s5-1 frame-num) (ja-aframe (the-as float 210.0) 0)) (joint-control-channel-group! s5-1 (the-as art-joint-anim (-> self draw art-group data 7)) num-func-seek!) ) (until (ja-done? 0) (set! (-> self body flex-blend) - (seek (-> self body flex-blend) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame)) + (seek (-> self body flex-blend) (the-as float 0.0) (-> *display* seconds-per-frame)) ) - (set! (-> self neck flex-blend) (seek - (-> self neck flex-blend) - (-> (new 'static 'array float 1 1.0) 0) - (* 2.0 (-> *display* seconds-per-frame)) - ) + (set! (-> self neck flex-blend) + (seek (-> self neck flex-blend) (the-as float 1.0) (* 2.0 (-> *display* seconds-per-frame))) ) (suspend) (let ((s5-2 (-> self skel root-channel 0))) (set! (-> s5-2 param 0) (ja-aframe (the-as float 240.0) 0)) - (set! (-> s5-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s5-2 param 1) 1.0) (joint-control-channel-group-eval! s5-2 (the-as art-joint-anim #f) num-func-seek!) ) ) (let ((a0-23 (-> self skel root-channel 0))) (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1))) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (joint-control-channel-group! a0-23 (the-as art-joint-anim #f) num-func-seek!) ) (if gp-0 @@ -2395,13 +2380,11 @@ (set! s5-0 (-> s5-0 0 brother)) ) ) - (set! (-> self health) - (seek (-> self health) (-> (new 'static 'array float 1 0.0) 0) (-> (new 'static 'array float 1 1.0) 0)) - ) + (set! (-> self health) (seek (-> self health) (the-as float 0.0) (the-as float 1.0))) (send-event (ppointer->process (-> self leaf 1)) 'kill 0) (send-event (ppointer->process (-> self leaf 0)) 'kill 0) (let ((a0-5 (-> self skel root-channel 0))) - (set! (-> a0-5 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 0) 1.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim #f) num-func-loop!) ) (ja-channel-push! 1 60) @@ -2410,7 +2393,7 @@ (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 15))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 20.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (set! (-> gp-1 frame-num) 0.0) (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 15)) num-func-seek!) ) @@ -2419,7 +2402,7 @@ (suspend) (let ((gp-2 (-> self skel root-channel 0))) (set! (-> gp-2 param 0) (ja-aframe (the-as float 20.0) 0)) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2428,7 +2411,7 @@ (let ((gp-3 (-> self skel root-channel 0))) (set! (-> gp-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 16))) (set! (-> gp-3 param 0) (ja-aframe (the-as float 20.0) 0)) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (set! (-> gp-3 frame-num) 0.0) (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 16)) num-func-seek!) ) @@ -2437,7 +2420,7 @@ (suspend) (let ((gp-4 (-> self skel root-channel 0))) (set! (-> gp-4 param 0) (ja-aframe (the-as float 20.0) 0)) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2446,7 +2429,7 @@ (let ((gp-5 (-> self skel root-channel 0))) (set! (-> gp-5 frame-group) (the-as art-joint-anim (-> self draw art-group data 14))) (set! (-> gp-5 param 0) (ja-aframe (the-as float 20.0) 0)) - (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-5 param 1) 1.0) (set! (-> gp-5 frame-num) 0.0) (joint-control-channel-group! gp-5 (the-as art-joint-anim (-> self draw art-group data 14)) num-func-seek!) ) @@ -2455,7 +2438,7 @@ (suspend) (let ((gp-6 (-> self skel root-channel 0))) (set! (-> gp-6 param 0) (ja-aframe (the-as float 20.0) 0)) - (set! (-> gp-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-6 param 1) 1.0) (joint-control-channel-group-eval! gp-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2466,7 +2449,7 @@ ) (let ((a0-23 (-> self skel root-channel 0))) (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1))) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (joint-control-channel-group! a0-23 (the-as art-joint-anim #f) num-func-seek!) ) (while (not (ja-done? 0)) @@ -2525,7 +2508,7 @@ ) (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1))) - (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 1) 1.0) (joint-control-channel-group! a0-10 (the-as art-joint-anim #f) num-func-seek!) ) (ja-channel-push! 1 150) @@ -2534,7 +2517,7 @@ (set! (-> a0-12 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) data 0 length) -1)) ) - (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-12 param 1) 1.0) (set! (-> a0-12 frame-num) 0.0) (joint-control-channel-group! a0-12 (the-as art-joint-anim (-> self draw art-group data 17)) num-func-seek!) ) @@ -2570,7 +2553,7 @@ (suspend) (let ((a0-22 (-> self skel root-channel 0))) (set! (-> a0-22 param 0) (the float (+ (-> a0-22 frame-group data 0 length) -1))) - (set! (-> a0-22 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-22 param 1) 1.0) (joint-control-channel-group-eval! a0-22 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2616,7 +2599,7 @@ (('bonk) (go plant-boss-dead-bounce (lerp-scale (the-as float 0.1) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) (the-as float (-> arg3 param 1)) (the-as float 40960.0) (the-as float 81920.0) @@ -2669,7 +2652,7 @@ (set! (-> self money) (ppointer->handle (birth-pickup-at-point (-> self node-list data 42 bone transform vector 3) (pickup-type money) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) #t self (the-as fact-info #f) @@ -2688,7 +2671,7 @@ (set! (-> s5-0 frame-num) 0.0) ) (let ((s5-1 (-> self skel root-channel 1))) - (set! (-> s5-1 frame-interp) (- (-> (new 'static 'array float 1 1.0) 0) arg0)) + (set! (-> s5-1 frame-interp) (- 1.0 arg0)) (joint-control-channel-group-eval! s5-1 (the-as art-joint-anim (-> self draw art-group data 17)) @@ -2702,11 +2685,11 @@ (suspend) (let ((a0-13 (-> self skel root-channel 0))) (set! (-> a0-13 param 0) (the float (+ (-> a0-13 frame-group data 0 length) -1))) - (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-13 param 1) 1.0) (joint-control-channel-group-eval! a0-13 (the-as art-joint-anim #f) num-func-seek!) ) (let ((v1-39 (-> self skel root-channel 1))) - (set! (-> v1-39 frame-interp) (- (-> (new 'static 'array float 1 1.0) 0) arg0)) + (set! (-> v1-39 frame-interp) (- 1.0 arg0)) (set! (-> v1-39 num-func) num-func-identity) (set! (-> v1-39 frame-num) (the float (+ (-> v1-39 frame-group data 0 length) -1))) ) @@ -2752,7 +2735,7 @@ (set! (-> s2-2 collide-with) (collide-kind target)) (set! (-> s2-2 prim-core offense) (collide-offense no-offense)) (set! (-> s2-2 transform-index) 13) - (set-vector! (-> s2-2 local-sphere) 0.0 (-> (new 'static 'array float 1 8192.0) 0) 0.0 16384.0) + (set-vector! (-> s2-2 local-sphere) 0.0 8192.0 0.0 16384.0) (append-prim s3-0 s2-2) (set! (-> obj attack-prim 0) s2-2) ) @@ -2761,7 +2744,7 @@ (set! (-> s2-3 collide-with) (collide-kind)) (set! (-> s2-3 prim-core offense) (collide-offense no-offense)) (set! (-> s2-3 transform-index) 13) - (set-vector! (-> s2-3 local-sphere) 0.0 (-> (new 'static 'array float 1 8192.0) 0) 0.0 16384.0) + (set-vector! (-> s2-3 local-sphere) 0.0 8192.0 0.0 16384.0) (append-prim s3-0 s2-3) (set! (-> obj death-prim 0) s2-3) ) @@ -2791,7 +2774,7 @@ s5-1 plant-boss-arm-init (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x -24576.0 :z 8192.0 :w 1.0)) - (-> (new 'static 'array float 1 -8192.0) 0) + -8192.0 1 ) (-> s5-1 ppointer) @@ -2806,7 +2789,7 @@ s5-2 plant-boss-arm-init (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x 24576.0 :z 8192.0 :w 1.0)) - (-> (new 'static 'array float 1 8192.0) 0) + 8192.0 0 ) (-> s5-2 ppointer) @@ -2821,7 +2804,7 @@ s5-3 plant-boss-back-arms-init (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :w 1.0)) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 2 ) (-> s5-3 ppointer) @@ -2837,7 +2820,7 @@ plant-boss-vine-init (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x 38912.0 :z 8192.0 :w 1.0)) (new 'static 'vector :y 14563.556) - (-> (new 'static 'array float 1 1.0) 0) + 1.0 3 ) (-> s5-4 ppointer) @@ -2853,7 +2836,7 @@ plant-boss-vine-init (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x -40960.0 :z 8192.0 :w 1.0)) (new 'static 'vector :y -5461.3335) - (-> (new 'static 'array float 1 1.0) 0) + 1.0 3 ) (-> s5-5 ppointer) @@ -2873,7 +2856,7 @@ (new 'static 'vector :x -29491.2 :z -7168.0 :w 1.0) ) (new 'static 'vector :x -1820.4445 :y -11286.756) - (-> (new 'static 'array float 1 0.8) 0) + 0.8 3 ) (-> s5-6 ppointer) @@ -2889,7 +2872,7 @@ plant-boss-vine-init (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x 32768.0 :z -3072.0 :w 1.0)) (new 'static 'vector :x -910.2222 :y 22755.555) - (-> (new 'static 'array float 1 0.8) 0) + 0.8 3 ) (-> s5-7 ppointer) @@ -2955,7 +2938,7 @@ s5-11 plant-boss-leaf-init (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :w 1.0)) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 0 ) (-> s5-11 ppointer) @@ -2979,7 +2962,7 @@ (-> obj root-override trans) (new 'static 'vector :x -13189.12 :y 2838.528 :z 12288.0 :w 1.0) ) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 1 ) (-> s5-12 ppointer) @@ -2994,24 +2977,12 @@ (set! (-> obj money) (the-as handle #f)) (set! (-> obj try-inc) #f) (set! (-> obj neck) (new 'process 'joint-mod (joint-mod-handler-mode flex-blend) obj 13)) - (set-vector! - (-> obj neck twist-max) - 3640.889 - (-> (new 'static 'array float 1 8192.0) 0) - 0.0 - (-> (new 'static 'array float 1 1.0) 0) - ) + (set-vector! (-> obj neck twist-max) 3640.889 8192.0 0.0 1.0) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) (set! (-> obj body) (new 'process 'joint-mod (joint-mod-handler-mode flex-blend) obj 4)) - (set-vector! - (-> obj body twist-max) - 0.0 - (-> (new 'static 'array float 1 8192.0) 0) - 0.0 - (-> (new 'static 'array float 1 1.0) 0) - ) + (set-vector! (-> obj body twist-max) 0.0 8192.0 0.0 1.0) (set! (-> obj body up) (the-as uint 1)) (set! (-> obj body nose) (the-as uint 0)) (set! (-> obj body ear) (the-as uint 2)) diff --git a/test/decompiler/reference/levels/ogre/ogreboss_REF.gc b/test/decompiler/reference/levels/ogre/ogreboss_REF.gc index 6e2358f82a..76f95d9525 100644 --- a/test/decompiler/reference/levels/ogre/ogreboss_REF.gc +++ b/test/decompiler/reference/levels/ogre/ogreboss_REF.gc @@ -213,14 +213,7 @@ (-> gp-1 ppointer) ) ) - (activate! - *camera-smush-control* - (the-as float 819.2) - 37 - 600 - (-> (new 'static 'array float 1 1.0) 0) - (the-as float 0.995) - ) + (activate! *camera-smush-control* (the-as float 819.2) 37 600 (the-as float 1.0) (the-as float 0.995)) (let* ((s4-1 (get-process *default-dead-pool* manipy #x4000)) (gp-2 (when s4-1 (let ((t9-7 (method-of-type manipy activate))) @@ -233,9 +226,9 @@ ) (quaternion-axis-angle! (-> (the-as manipy (-> gp-2 0)) root quat) - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) + (the-as float 1.0) + (the-as float 0.0) (* 65536.0 (rand-vu)) ) (send-event (ppointer->process gp-2) 'anim-mode 'play1) @@ -249,15 +242,9 @@ (defun ogreboss-missile-scale-explosion ((arg0 handle)) (let* ((gp-0 (handle->process arg0)) (f0-0 (-> (the-as process-drawable gp-0) root scale x)) - (f0-2 (seek f0-0 (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame))) + (f0-2 (seek f0-0 (the-as float 0.0) (-> *display* seconds-per-frame))) ) - (set-vector! - (-> (the-as process-drawable gp-0) root scale) - f0-2 - f0-2 - f0-2 - (-> (new 'static 'array float 1 1.0) 0) - ) + (set-vector! (-> (the-as process-drawable gp-0) root scale) f0-2 f0-2 f0-2 1.0) ) 0 (none) @@ -321,7 +308,7 @@ 0.0 (set! (-> s4-1 quad) (-> (the-as target t1-0) control trans quad)) (set! (-> s4-1 y) (+ 4096.0 (-> s4-1 y))) - (set-vector! s3-0 0.0 (- 118784.0 (-> s4-1 y)) 0.0 (-> (new 'static 'array float 1 1.0) 0)) + (set-vector! s3-0 0.0 (- 118784.0 (-> s4-1 y)) 0.0 1.0) (let ((f30-0 (fill-and-probe-using-line-sphere *collide-cache* @@ -340,7 +327,7 @@ (bucket-id debug-draw1) s4-1 s3-0 - (-> (new 'static 'array float 1 1.0) 0) + (meters 0.00024414062) (the-as rgba (new 'static 'rgba :g #xff :a #x80)) ) (when (>= f30-0 0.0) @@ -362,7 +349,7 @@ ) (else (let ((v1-37 (new 'stack-no-clear 'vector))) - (set-vector! v1-37 0.0 -12288000.0 0.0 (-> (new 'static 'array float 1 1.0) 0)) + (set-vector! v1-37 0.0 -12288000.0 0.0 1.0) (send-event arg0 'impulse v1-37) ) ) @@ -496,19 +483,13 @@ (quaternion-axis-angle! (-> self tumble-quat) (cos f30-1) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (sin f30-1) (the-as float 2730.6667) ) ) (set! (-> self part) (create-launch-control (-> *part-group-id-table* 469) self)) - (set-vector! - (-> self draw color-emissive) - (-> (new 'static 'array float 1 0.125) 0) - (-> (new 'static 'array float 1 0.0625) 0) - 0.0 - 0.0 - ) + (set-vector! (-> self draw color-emissive) 0.125 0.0625 0.0 0.0) (go ogreboss-missile-idle) (none) ) @@ -626,7 +607,7 @@ ) ) (('grow-faster) - (let ((f0-2 (-> (new 'static 'array float 1 1.0) 0))) + (let ((f0-2 1.0)) (set! (-> self grow-rate) f0-2) f0-2 ) @@ -658,7 +639,7 @@ (set! (-> gp-0 frame-num) 0.0) ) (set! (-> self joint enable) #t) - (set! (-> self joint blend) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self joint blend) 1.0) (set! (-> self state-time) (-> *display* base-frame-counter)) (while #t (quaternion-vector-angle! @@ -668,17 +649,17 @@ ) (quaternion*! (-> self joint transform quat) (-> self joint transform quat) (-> self tumble-quat)) (+! (-> self size) (* (-> self grow-rate) (-> *display* seconds-per-frame))) - (set! (-> self size) (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self size))) + (set! (-> self size) (fmin 1.0 (-> self size))) (let* ((f0-10 (sqrtf (-> self size))) (f28-0 (* 0.0033333334 (the float (- (-> *display* base-frame-counter) (-> self state-time))))) (f30-0 (* 116508.445 f28-0 (-> self speed))) ) - (set-vector! (-> self joint transform scale) f0-10 f0-10 f0-10 (-> (new 'static 'array float 1 1.0) 0)) + (set-vector! (-> self joint transform scale) f0-10 f0-10 f0-10 1.0) (let ((gp-1 (-> self joint transform))) (set! (-> gp-1 trans x) (* 4096.0 (sin f30-0))) (set! (-> gp-1 trans y) (+ 122880.0 (* 12288.0 (sin (* 98304.0 f28-0))))) (set! (-> gp-1 trans z) (* 4096.0 (cos f30-0))) - (set! (-> gp-1 trans w) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 trans w) 1.0) ) ) (spawn (-> self part) (-> self node-list data 3 bone transform vector 3)) @@ -711,14 +692,7 @@ 1 (the-as symbol (-> self draw origin)) ) - (activate! - *camera-smush-control* - (the-as float 819.2) - 37 - 600 - (-> (new 'static 'array float 1 1.0) 0) - (the-as float 0.995) - ) + (activate! *camera-smush-control* (the-as float 819.2) 37 600 (the-as float 1.0) (the-as float 0.995)) (let ((gp-1 (get-process *default-dead-pool* part-tracker #x4000))) (when gp-1 (let ((t9-4 (method-of-type part-tracker activate))) @@ -742,26 +716,26 @@ (set! (-> a0-3 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 43)) data 0 length) -1)) ) - (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-3 param 1) 1.0) (set! (-> a0-3 frame-num) 0.0) (joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 43)) num-func-seek!) ) (until (ja-done? 0) (set! (-> self joint blend) - (seek (-> self joint blend) (-> (new 'static 'array float 1 0.0) 0) (* 5.0 (-> *display* seconds-per-frame))) + (seek (-> self joint blend) (the-as float 0.0) (* 5.0 (-> *display* seconds-per-frame))) ) (let* ((f1-1 (/ (- (ja-frame-num 0) (ja-aframe (the-as float 54.0) 0)) (- (the float (ja-num-frames 0)) (ja-aframe (the-as float 54.0) 0)) ) ) - (f0-13 (fmax 0.0 (fmin (-> (new 'static 'array float 1 1.0) 0) f1-1))) + (f0-13 (fmax 0.0 (fmin 1.0 f1-1))) ) (vector-lerp! (-> self root-override trans) (-> self src-pos) (-> self orig-pos) f0-13) ) (suspend) (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1))) - (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 1) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -781,19 +755,19 @@ (set! (-> a0-3 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 42)) data 0 length) -1)) ) - (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-3 param 1) 1.0) (set! (-> a0-3 frame-num) 0.0) (joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 42)) num-func-seek!) ) (until (ja-done? 0) (set! (-> self joint blend) - (seek (-> self joint blend) (-> (new 'static 'array float 1 0.0) 0) (* 5.0 (-> *display* seconds-per-frame))) + (seek (-> self joint blend) (the-as float 0.0) (* 5.0 (-> *display* seconds-per-frame))) ) (let* ((f1-1 (/ (- (ja-frame-num 0) (ja-aframe (the-as float 32.0) 0)) (- (the float (ja-num-frames 0)) (ja-aframe (the-as float 32.0) 0)) ) ) - (f0-13 (fmax 0.0 (fmin (-> (new 'static 'array float 1 1.0) 0) f1-1))) + (f0-13 (fmax 0.0 (fmin 1.0 f1-1))) ) (vector-lerp! (-> self root-override trans) (-> self src-pos) (-> self orig-pos) f0-13) ) @@ -801,7 +775,7 @@ (suspend) (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1))) - (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 1) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -859,7 +833,7 @@ (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 44))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 100.0) 0)) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) 0.0) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!) ) @@ -873,7 +847,7 @@ (suspend) (let ((gp-2 (-> self skel root-channel 0))) (set! (-> gp-2 param 0) (ja-aframe (the-as float 100.0) 0)) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -898,7 +872,7 @@ (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 44))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 162.0) 0)) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) (ja-aframe (the-as float 100.0) 0)) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!) ) @@ -906,7 +880,7 @@ (suspend) (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 162.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -958,7 +932,7 @@ (set! (-> gp-4 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) data 0 length) -1)) ) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (set! (-> gp-4 frame-num) (ja-aframe (the-as float 162.0) 0)) (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!) ) @@ -966,7 +940,7 @@ (suspend) (let ((a0-12 (-> self skel root-channel 0))) (set! (-> a0-12 param 0) (the float (+ (-> a0-12 frame-group data 0 length) -1))) - (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-12 param 1) 1.0) (joint-control-channel-group-eval! a0-12 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1046,21 +1020,15 @@ (quaternion-axis-angle! (-> self tumble-quat) (cos f30-1) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (sin f30-1) (the-as float 2730.6667) ) ) (set! (-> self joint) (new 'process 'joint-mod-blend-local self 3 #f)) (set! (-> self part) (create-launch-control (-> *part-group-id-table* 468) self)) - (set-vector! - (-> self draw color-emissive) - (-> (new 'static 'array float 1 0.125) 0) - (-> (new 'static 'array float 1 0.0625) 0) - 0.0 - 0.0 - ) - (set! (-> self speed) (-> (new 'static 'array float 1 1.0) 0)) + (set-vector! (-> self draw color-emissive) 0.125 0.0625 0.0 0.0) + (set! (-> self speed) 1.0) (set! (-> self size) 0.0) (set! (-> self grow-rate) (/ 300.0 arg1)) (set! (-> self sound-id) (new-sound-id)) @@ -1123,7 +1091,7 @@ :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (let ((f30-0 (-> (new 'static 'array float 1 2.0) 0))) + (let ((f30-0 2.0)) (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 40.0) 0)) @@ -1133,9 +1101,7 @@ ) (until (ja-done? 0) (set! (-> self side-pos) - (* (fmin (-> (new 'static 'array float 1 1.0) 0) (/ (ja-frame-num 0) (ja-aframe (the-as float 40.0) 0))) - (-> self dest-pos) - ) + (* (fmin 1.0 (/ (ja-frame-num 0) (ja-aframe (the-as float 40.0) 0))) (-> self dest-pos)) ) (suspend) (let ((gp-1 (-> self skel root-channel 0))) @@ -1156,7 +1122,7 @@ (until (ja-done? 0) (if (>= (ja-frame-num 0) (ja-aframe (the-as float 235.0) 0)) (set! (-> self side-pos) - (seek (-> self side-pos) (-> (new 'static 'array float 1 0.0) 0) (* 20480.0 (-> *display* seconds-per-frame))) + (seek (-> self side-pos) (the-as float 0.0) (* 20480.0 (-> *display* seconds-per-frame))) ) ) (suspend) @@ -1180,7 +1146,7 @@ (the-as float 49152.0) (collide-kind background) (the-as process-drawable #f) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 409600.0) ) (none) @@ -1219,7 +1185,7 @@ (set! (-> self side-pos) 0.0) (set! (-> self dest-pos) (the-as float (cond ((zero? arg0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 ) ((= arg0 1) -20480.0 @@ -1228,7 +1194,7 @@ 20480.0 ) (else - (-> (new 'static 'array float 1 0.0) 0) + 0.0 ) ) ) @@ -1237,13 +1203,7 @@ (initialize-skeleton self *ogreboss-bounce-boulder-sg* '()) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self draw origin-joint-index) (the-as uint 3)) - (set-vector! - (-> self draw color-emissive) - (-> (new 'static 'array float 1 0.125) 0) - (-> (new 'static 'array float 1 0.0625) 0) - 0.0 - 0.0 - ) + (set-vector! (-> self draw color-emissive) 0.125 0.0625 0.0 0.0) (go ogreboss-bounce-boulder-idle) (none) ) @@ -1383,7 +1343,7 @@ (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 2))) (set! (-> gp-0 param 0) (ja-aframe (the-as float 140.0) 0)) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) 0.0) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!) ) @@ -1391,7 +1351,7 @@ (suspend) (let ((gp-1 (-> self skel root-channel 0))) (set! (-> gp-1 param 0) (ja-aframe (the-as float 140.0) 0)) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1403,7 +1363,7 @@ (let ((gp-3 (-> self skel root-channel 0))) (set! (-> gp-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 2))) (set! (-> gp-3 param 0) (ja-aframe (the-as float 168.0) 0)) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (set! (-> gp-3 frame-num) (ja-aframe (the-as float 140.0) 0)) (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!) ) @@ -1411,7 +1371,7 @@ (suspend) (let ((gp-4 (-> self skel root-channel 0))) (set! (-> gp-4 param 0) (ja-aframe (the-as float 168.0) 0)) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1425,7 +1385,7 @@ (set! (-> gp-6 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) data 0 length) -1)) ) - (set! (-> gp-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-6 param 1) 1.0) (set! (-> gp-6 frame-num) (ja-aframe (the-as float 168.0) 0)) (joint-control-channel-group! gp-6 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!) ) @@ -1433,7 +1393,7 @@ (suspend) (let ((a0-15 (-> self skel root-channel 0))) (set! (-> a0-15 param 0) (the float (+ (-> a0-15 frame-group data 0 length) -1))) - (set! (-> a0-15 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-15 param 1) 1.0) (joint-control-channel-group-eval! a0-15 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1444,7 +1404,7 @@ (set! (-> a0-18 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) data 0 length) -1)) ) - (set! (-> a0-18 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-18 param 1) 1.0) (set! (-> a0-18 frame-num) 0.0) (joint-control-channel-group! a0-18 (the-as art-joint-anim (-> self draw art-group data 4)) num-func-seek!) ) @@ -1452,7 +1412,7 @@ (suspend) (let ((a0-19 (-> self skel root-channel 0))) (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1))) - (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-19 param 1) 1.0) (joint-control-channel-group-eval! a0-19 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1464,7 +1424,7 @@ (set! (-> a0-21 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1)) ) - (set! (-> a0-21 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-21 param 1) 1.0) (set! (-> a0-21 frame-num) 0.0) (joint-control-channel-group! a0-21 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!) ) @@ -1472,7 +1432,7 @@ (suspend) (let ((a0-22 (-> self skel root-channel 0))) (set! (-> a0-22 param 0) (the float (+ (-> a0-22 frame-group data 0 length) -1))) - (set! (-> a0-22 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-22 param 1) 1.0) (joint-control-channel-group-eval! a0-22 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1566,7 +1526,7 @@ (set! (-> a0-15 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) data 0 length) -1)) ) - (set! (-> a0-15 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-15 param 1) 1.0) (set! (-> a0-15 frame-num) 0.0) (joint-control-channel-group! a0-15 (the-as art-joint-anim (-> self draw art-group data 24)) num-func-seek!) ) @@ -1574,7 +1534,7 @@ (suspend) (let ((a0-16 (-> self skel root-channel 0))) (set! (-> a0-16 param 0) (the float (+ (-> a0-16 frame-group data 0 length) -1))) - (set! (-> a0-16 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-16 param 1) 1.0) (joint-control-channel-group-eval! a0-16 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1583,7 +1543,7 @@ (send-event *target* 'continue (get-continue-by-name *game-info* "ogre-start")) (ogreboss-inc-try-count) ) - (set-setting! *setting-control* self 'music 'ogreboss (-> (new 'static 'array float 1 0.0) 0) 0) + (set-setting! *setting-control* self 'music 'ogreboss (the-as float 0.0) 0) (go ogreboss-wait-for-player) (none) ) @@ -1664,12 +1624,7 @@ (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 src) (-> self node-list data 52 bone transform vector 3)) (set! (-> gp-0 duration) - (the-as - time-frame - (the int - (* 300.0 (+ 1.25 (* -0.25 (-> self level)) (/ (-> (new 'static 'array float 1 0.5) 0) (-> self difficulty)))) - ) - ) + (the-as time-frame (the int (* 300.0 (+ 1.25 (* -0.25 (-> self level)) (/ 0.5 (-> self difficulty)))))) ) (set! (-> gp-0 pickup-type) (the-as pickup-type arg0)) (set! (-> gp-0 blast-radius) 32768.0) @@ -1963,7 +1918,7 @@ (behavior () (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) (ogreboss-set-stage1-camera) - (ogreboss-move-near (seconds 3) (-> (new 'static 'array float 1 1.0) 0)) + (ogreboss-move-near (seconds 3) (the-as float 1.0)) (cond ((= (if (> (-> self skel active-channels) 0) (-> self skel root-channel 0 frame-group) @@ -1976,7 +1931,7 @@ (set! (-> a0-7 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) data 0 length) -1)) ) - (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-7 param 1) 1.0) (set! (-> a0-7 frame-num) 0.0) (joint-control-channel-group! a0-7 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!) ) @@ -1984,7 +1939,7 @@ (suspend) (let ((a0-8 (-> self skel root-channel 0))) (set! (-> a0-8 param 0) (the float (+ (-> a0-8 frame-group data 0 length) -1))) - (set! (-> a0-8 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-8 param 1) 1.0) (joint-control-channel-group-eval! a0-8 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1996,7 +1951,7 @@ (set! (-> a0-11 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) data 0 length) -1)) ) - (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-11 param 1) 1.0) (set! (-> a0-11 frame-num) 0.0) (joint-control-channel-group! a0-11 (the-as art-joint-anim (-> self draw art-group data 5)) num-func-seek!) ) @@ -2004,14 +1959,14 @@ (suspend) (let ((a0-12 (-> self skel root-channel 0))) (set! (-> a0-12 param 0) (the float (+ (-> a0-12 frame-group data 0 length) -1))) - (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-12 param 1) 1.0) (joint-control-channel-group-eval! a0-12 (the-as art-joint-anim #f) num-func-seek!) ) ) ) ) (let* ((gp-0 (the int (* (-> self difficulty) (+ 8.0 (* 4.0 (-> self level)))))) - (f0-17 (-> (new 'static 'array float 1 1.0) 0)) + (f0-17 1.0) (f1-2 0.15) (f2-2 (-> self difficulty)) (f30-0 (+ f0-17 (* f1-2 (* f2-2 f2-2) (-> self level)))) @@ -2038,10 +1993,10 @@ (let ((s5-0 0)) (let ((f28-0 0.0)) (cond - ((>= (-> (new 'static 'array float 1 1.0) 0) (-> *target* fact-info-target health)) + ((>= 1.0 (-> *target* fact-info-target health)) (set! f28-0 0.1) ) - ((>= (-> (new 'static 'array float 1 2.0) 0) (-> *target* fact-info-target health)) + ((>= 2.0 (-> *target* fact-info-target health)) (set! f28-0 0.05) ) ) @@ -2050,7 +2005,7 @@ (* 0.0 f28-0) ) ((< (-> self try-count) (the-as uint 10)) - (* (-> (new 'static 'array float 1 0.5) 0) f28-0) + (* 0.5 f28-0) ) (else (empty) @@ -2102,14 +2057,14 @@ ) ) ) - (ogreboss-move-far (seconds 2) (-> (new 'static 'array float 1 1.0) 0)) + (ogreboss-move-far (seconds 2) (the-as float 1.0)) (ja-channel-push! 1 30) (let ((a0-28 (-> self skel root-channel 0))) (set! (-> a0-28 frame-group) (the-as art-joint-anim (-> self draw art-group data 16))) (set! (-> a0-28 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) data 0 length) -1)) ) - (set! (-> a0-28 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-28 param 1) 1.0) (set! (-> a0-28 frame-num) 0.0) (joint-control-channel-group! a0-28 (the-as art-joint-anim (-> self draw art-group data 16)) num-func-seek!) ) @@ -2117,7 +2072,7 @@ (suspend) (let ((a0-29 (-> self skel root-channel 0))) (set! (-> a0-29 param 0) (the float (+ (-> a0-29 frame-group data 0 length) -1))) - (set! (-> a0-29 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-29 param 1) 1.0) (joint-control-channel-group-eval! a0-29 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2193,11 +2148,8 @@ ) (let ((f30-0 (the float (- (-> *display* base-frame-counter) (-> self hit-time))))) (when (and (> (-> self hit-count) 0) (>= 45.0 f30-0)) - (set! f0-0 (+ (ja-aframe (-> (new 'static 'array float 1 0.0) 0) 1) - (* 0.022222223 - f30-0 - (- (ja-aframe (the-as float 8.0) 1) (ja-aframe (-> (new 'static 'array float 1 0.0) 0) 1)) - ) + (set! f0-0 (+ (ja-aframe (the-as float 0.0) 1) + (* 0.022222223 f30-0 (- (ja-aframe (the-as float 8.0) 1) (ja-aframe (the-as float 0.0) 1))) ) ) (set! f1-0 (cond @@ -2347,7 +2299,7 @@ :code (behavior () (ogreboss-set-stage2-camera) - (ogreboss-move-far (seconds 0.1) (-> (new 'static 'array float 1 2.0) 0)) + (ogreboss-move-far (seconds 0.1) (the-as float 2.0)) (let ((f30-0 (* 0.75 (-> self difficulty)))) (let ((gp-0 #f)) (ja-channel-push! 1 60) @@ -2473,7 +2425,7 @@ :trans (behavior () (let ((v1-1 (handle->process (-> self boulder)))) - (if (and v1-1 (>= (-> (the-as ogreboss-super-boulder v1-1) size) (-> (new 'static 'array float 1 1.0) 0))) + (if (and v1-1 (>= (-> (the-as ogreboss-super-boulder v1-1) size) 1.0)) (go ogreboss-stage3-throw) ) ) @@ -2489,11 +2441,8 @@ :code (behavior () (set! (-> self shuffle-pos) 0.0) - (let ((f30-0 (+ (-> (new 'static 'array float 1 1.0) 0) - (* (-> (new 'static 'array float 1 0.25) 0) (-> self difficulty) (-> self level)) - ) - ) - (gp-0 (if (rand-vu-percent? (-> (new 'static 'array float 1 0.5) 0)) + (let ((f30-0 (+ 1.0 (* 0.25 (-> self difficulty) (-> self level)))) + (gp-0 (if (rand-vu-percent? (the-as float 0.5)) 0 1 ) @@ -2688,7 +2637,7 @@ (set! (-> a0-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) data 0 length) -1)) ) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (set! (-> a0-5 frame-num) 0.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 9)) num-func-seek!) ) @@ -2696,7 +2645,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2706,7 +2655,7 @@ (set! (-> a0-9 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) data 0 length) -1)) ) - (set! (-> a0-9 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-9 param 1) 1.0) (set! (-> a0-9 frame-num) 0.0) (joint-control-channel-group! a0-9 (the-as art-joint-anim (-> self draw art-group data 16)) num-func-seek!) ) @@ -2714,11 +2663,11 @@ (suspend) (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1))) - (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 1) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!) ) ) - (ogreboss-submerge (seconds 1) (-> (new 'static 'array float 1 1.0) 0)) + (ogreboss-submerge (seconds 1) (the-as float 1.0)) (while (handle->process (-> self boulder)) (suspend) ) @@ -2734,8 +2683,8 @@ (defstate ogreboss-stage3-hit (ogreboss) :code (behavior () - (set! (-> self level) (+ (-> (new 'static 'array float 1 1.0) 0) (-> self level))) - (if (< (-> (new 'static 'array float 1 2.0) 0) (-> self level)) + (set! (-> self level) (+ 1.0 (-> self level))) + (if (< 2.0 (-> self level)) (go ogreboss-die) ) (send-event (handle->process (-> self boulder)) 'go-hit) @@ -2745,7 +2694,7 @@ (set! (-> a0-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) data 0 length) -1)) ) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (set! (-> a0-5 frame-num) 0.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 12)) num-func-seek!) ) @@ -2753,7 +2702,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2808,7 +2757,7 @@ (set! (-> a0-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) data 0 length) -1)) ) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (set! (-> a0-5 frame-num) 0.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 12)) num-func-seek!) ) @@ -2817,7 +2766,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2898,9 +2847,9 @@ ) (set! (-> self target-count) gp-1) ) - (set-vector! (-> self target-offset-array 0) 0.0 16384.0 0.0 (-> (new 'static 'array float 1 1.0) 0)) - (set-vector! (-> self target-offset-array-2) 0.0 16384.0 0.0 (-> (new 'static 'array float 1 1.0) 0)) - (set-vector! (-> self target-offset-array-3) 0.0 16384.0 0.0 (-> (new 'static 'array float 1 1.0) 0)) + (set-vector! (-> self target-offset-array 0) 0.0 16384.0 0.0 1.0) + (set-vector! (-> self target-offset-array-2) 0.0 16384.0 0.0 1.0) + (set-vector! (-> self target-offset-array-3) 0.0 16384.0 0.0 1.0) (set! (-> self target-blast-radius-array 0) 24576.0) (set! (-> self target-blast-radius-array 1) 24576.0) (set! (-> self target-blast-radius-array 2) 24576.0) @@ -2987,7 +2936,7 @@ (set! (-> obj try-count) (-> obj entity extra perm user-uint8 0)) (cond ((< (-> obj try-count) (the-as uint 5)) - (set! (-> obj difficulty) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> obj difficulty) 1.0) ) ((< (-> obj try-count) (the-as uint 10)) (set! (-> obj difficulty) 0.83334) @@ -2996,7 +2945,7 @@ (set! (-> obj difficulty) 0.66667) ) (else - (set! (-> obj difficulty) (-> (new 'static 'array float 1 0.5) 0)) + (set! (-> obj difficulty) 0.5) ) ) (set! (-> obj lava) (entity-actor-lookup (-> obj entity) 'water-actor 0)) @@ -3009,8 +2958,8 @@ (set! (-> obj z-plane w) (- (vector-dot (-> obj z-plane) (-> obj root-override trans)))) (vector-x-quaternion! (-> obj side-dir) (-> obj root-override quat)) (set! (-> obj far-pos quad) (-> obj root-override trans quad)) - (let ((f0-38 (-> (new 'static 'array float 1 1.0) 0))) - (set-vector! (-> obj root-override scale) f0-38 f0-38 f0-38 (-> (new 'static 'array float 1 1.0) 0)) + (let ((f0-38 1.0)) + (set-vector! (-> obj root-override scale) f0-38 f0-38 f0-38 1.0) ) (vector+*! (-> obj near-pos) (-> obj far-pos) (-> obj z-plane) (the-as float 348160.0)) (set! (-> obj at-near-spot) #t) From 2df7d6b995b2e2a7f4cb0f38935b4ae066357960 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Wed, 13 Apr 2022 01:50:05 +0100 Subject: [PATCH 4/6] Update game.gp --- goal_src/game.gp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/goal_src/game.gp b/goal_src/game.gp index 672aed5602..4e3ca1bb3b 100644 --- a/goal_src/game.gp +++ b/goal_src/game.gp @@ -160,12 +160,12 @@ (defmacro copy-sbk-files (&rest files) `(begin ,@(apply (lambda (x) `(set! *all-sbk* (cons (copy-iso-file ,x "SBK/" ".SBK") *all-sbk*))) files))) -;; Files not yet added in here: -;; - DANGER.MUS -;; - TWEAKVAL.MUS (define *all-mus* '()) (defmacro copy-mus-files (&rest files) `(begin ,@(apply (lambda (x) `(set! *all-mus* (cons (copy-iso-file ,x "MUS/" ".MUS") *all-mus*))) files))) +(define *all-vag* '()) +(defmacro copy-vag-files (&rest files) + `(begin ,@(apply (lambda (x) `(set! *all-vag* (cons (copy-iso-file "VAGWAD" "VAG/" (string-append "." ,x)) *all-vag*))) files))) (defmacro group (name &rest stuff) `(defstep :in "" @@ -356,7 +356,6 @@ "out/iso/GAME.CGO" ) - ;;;;;;;;;;;;;;;;;;;;; ;; hub1 Group ;;;;;;;;;;;;;;;;;;;;; @@ -1902,6 +1901,9 @@ "ticky.gc" ) +(copy-mus-files "DANGER") + +(copy-vag-files "ENG" "FRE" "GER" "ITA" "SPA" "JAP") ;;;;;;;;;;;;;;;;;;;;; ;; ISO Group @@ -1912,11 +1914,13 @@ `("out/iso/0COMMON.TXT" "out/iso/0SUBTIT.TXT" "out/iso/TWEAKVAL.MUS" - ,@(reverse *all-cgos*) + "out/iso/VAGDIR.AYB" ,@(reverse *all-vis*) ,@(reverse *all-str*) ,@(reverse *all-sbk*) - ,@(reverse *all-mus*)) + ,@(reverse *all-mus*) + ,@(reverse *all-vag*) + ,@(reverse *all-cgos*)) ) From 3dde17fabd5010337c3b794f0de5f64bfe665f8c Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Thu, 14 Apr 2022 06:12:40 +0100 Subject: [PATCH 5/6] fix target decomp --- .../jak1_ntsc_black_label/type_casts.jsonc | 9 +- .../reference/engine/target/target_REF.gc | 506 ++++++++---------- 2 files changed, 227 insertions(+), 288 deletions(-) diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc index 461adee26e..c88f2bc0bf 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -5446,12 +5446,15 @@ "(code target-walk)": [ [146, "v1", "art-joint-anim"], - [243, "v1", "art-joint-anim"] + [243, "v1", "art-joint-anim"], + [527, "v1", "float"], + [591, "v1", "float"] ], "(code target-slide-down)": [[26, "v1", "art-joint-anim"]], "(code target-jump-forward)": [[13, "v1", "art-joint-anim"]], + "(code target-jump)": [[127, "v1", "float"]], "(code target-double-jump)": [[24, "v1", "art-joint-anim"]], @@ -5470,6 +5473,10 @@ [168, "v1", "art-joint-anim"] ], + "(code target-attack-uppercut)": [ + [39, "v1", "float"] + ], + "mod-var-jump": [ [77, "f0", "float"], [80, "f0", "float"], diff --git a/test/decompiler/reference/engine/target/target_REF.gc b/test/decompiler/reference/engine/target/target_REF.gc index bc685e9c87..079f343240 100644 --- a/test/decompiler/reference/engine/target/target_REF.gc +++ b/test/decompiler/reference/engine/target/target_REF.gc @@ -24,7 +24,7 @@ (set! (-> a0-16 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 50)) data 0 length) -1)) ) - (set! (-> a0-16 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-16 param 1) 1.0) (set! (-> a0-16 frame-num) 0.0) (joint-control-channel-group! a0-16 (the-as art-joint-anim (-> self draw art-group data 50)) num-func-seek!) ) @@ -32,7 +32,7 @@ (suspend) (let ((a0-17 (-> self skel root-channel 0))) (set! (-> a0-17 param 0) (the float (+ (-> a0-17 frame-group data 0 length) -1))) - (set! (-> a0-17 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-17 param 1) 1.0) (joint-control-channel-group-eval! a0-17 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -46,7 +46,7 @@ (suspend) (let ((a0-23 (-> self skel root-channel 0))) (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1))) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -63,14 +63,14 @@ (set! (-> s5-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1)) ) - (set! (-> s5-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s5-0 param 1) 1.0) (set! (-> s5-0 frame-num) (ja-aframe (the-as float 20.0) 0)) (joint-control-channel-group! s5-0 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!) ) (until (ja-done? 0) (let ((a0-33 (-> self skel root-channel 0))) (set! (-> a0-33 param 0) (the float (+ (-> a0-33 frame-group data 0 length) -1))) - (set! (-> a0-33 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-33 param 1) 1.0) (joint-control-channel-group-eval! a0-33 (the-as art-joint-anim #f) num-func-seek!) ) (suspend) @@ -89,7 +89,7 @@ ) (let ((a0-42 (-> self skel root-channel 0))) (set! (-> a0-42 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-42 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-42 param 0) 1.0) (set! (-> a0-42 frame-num) 0.0) (joint-control-channel-group! a0-42 (the-as art-joint-anim (-> self draw art-group data 38)) num-func-loop!) ) @@ -98,7 +98,7 @@ (suspend) (let ((a0-43 (-> self skel root-channel 0))) (set! (-> a0-43 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-43 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-43 param 0) 1.0) (joint-control-channel-group-eval! a0-43 (the-as art-joint-anim (-> self draw art-group data 38)) @@ -150,7 +150,7 @@ (-> self draw art-group data 38) ) (let ((a0-23 (-> self skel root-channel 0))) - (set! (-> a0-23 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 0) 1.0) (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-loop!) ) ) @@ -161,7 +161,7 @@ ) (let ((a0-28 (-> self skel root-channel 0))) (set! (-> a0-28 param 0) (the float (+ (-> a0-28 frame-group data 0 length) -1))) - (set! (-> a0-28 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-28 param 1) 1.0) (joint-control-channel-group-eval! a0-28 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -226,13 +226,14 @@ (= v1-2 (-> self draw art-group data 67)) ) (let ((gp-0 (or (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (< (-> self control unknown-float01) (-> (new 'static 'array float 1 61440.0) 0)) + (< (-> self control unknown-float01) 61440.0) ) ) - (f30-0 (if (= arg0 'swim) - (-> (new 'static 'array float 1 0.4) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (f30-0 (the-as float (if (= arg0 'swim) + 0.4 + 1.0 + ) + ) ) ) (ja-channel-set! 1) @@ -256,7 +257,7 @@ ) ) ) - (let ((f30-1 (seek f30-0 (-> (new 'static 'array float 1 1.0) 0) (* 0.5 (-> *display* seconds-per-frame))))) + (let ((f30-1 (seek f30-0 (the-as float 1.0) (* 0.5 (-> *display* seconds-per-frame))))) (set! (-> s5-0 param 1) f30-1) (set! (-> s5-0 frame-num) 0.0) (joint-control-channel-group! @@ -276,8 +277,8 @@ 2 6 ) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) + (the-as float 1.0) (the-as float 1.5) ) (when (and (>= 25.0 (ja-aframe-num 0)) (and (>= (ja-aframe-num 0) 21.0) @@ -302,7 +303,7 @@ (suspend) (let ((s5-1 (-> self skel root-channel 0))) (set! (-> s5-1 param 0) (the float (+ (-> s5-1 frame-group data 0 length) -1))) - (set! f30-1 (seek f30-1 (-> (new 'static 'array float 1 1.0) 0) (* 0.5 (-> *display* seconds-per-frame)))) + (set! f30-1 (seek f30-1 (the-as float 1.0) (* 0.5 (-> *display* seconds-per-frame)))) (set! (-> s5-1 param 1) f30-1) (joint-control-channel-group-eval! s5-1 (the-as art-joint-anim #f) num-func-seek!) ) @@ -341,7 +342,7 @@ (set! (-> a0-35 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> a0-35 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-35 param 1) 1.0) (set! (-> a0-35 frame-num) 0.0) (joint-control-channel-group! a0-35 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -349,7 +350,7 @@ (suspend) (let ((a0-36 (-> self skel root-channel 0))) (set! (-> a0-36 param 0) (the float (+ (-> a0-36 frame-group data 0 length) -1))) - (set! (-> a0-36 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-36 param 1) 1.0) (joint-control-channel-group-eval! a0-36 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -368,7 +369,7 @@ (set! (-> a0-44 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) data 0 length) -1)) ) - (set! (-> a0-44 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-44 param 1) 1.0) (set! (-> a0-44 frame-num) 0.0) (joint-control-channel-group! a0-44 (the-as art-joint-anim (-> self draw art-group data 39)) num-func-seek!) ) @@ -376,7 +377,7 @@ (suspend) (let ((a0-45 (-> self skel root-channel 0))) (set! (-> a0-45 param 0) (the float (+ (-> a0-45 frame-group data 0 length) -1))) - (set! (-> a0-45 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-45 param 1) 1.0) (joint-control-channel-group-eval! a0-45 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -385,7 +386,7 @@ (set! (-> gp-1 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (set! (-> gp-1 frame-num) (ja-aframe (the-as float 50.0) 0)) (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -393,7 +394,7 @@ (suspend) (let ((a0-49 (-> self skel root-channel 0))) (set! (-> a0-49 param 0) (the float (+ (-> a0-49 frame-group data 0 length) -1))) - (set! (-> a0-49 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-49 param 1) 1.0) (joint-control-channel-group-eval! a0-49 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -412,7 +413,7 @@ (set! (-> gp-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) data 0 length) -1)) ) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (set! (-> gp-2 frame-num) (ja-aframe (the-as float 38.0) 0)) (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 39)) num-func-seek!) ) @@ -420,7 +421,7 @@ (suspend) (let ((a0-61 (-> self skel root-channel 0))) (set! (-> a0-61 param 0) (the float (+ (-> a0-61 frame-group data 0 length) -1))) - (set! (-> a0-61 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-61 param 1) 1.0) (joint-control-channel-group-eval! a0-61 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -429,7 +430,7 @@ (set! (-> gp-3 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (set! (-> gp-3 frame-num) (ja-aframe (the-as float 50.0) 0)) (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -437,7 +438,7 @@ (suspend) (let ((a0-65 (-> self skel root-channel 0))) (set! (-> a0-65 param 0) (the float (+ (-> a0-65 frame-group data 0 length) -1))) - (set! (-> a0-65 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-65 param 1) 1.0) (joint-control-channel-group-eval! a0-65 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -450,14 +451,15 @@ ) (or (= v1-242 (-> self draw art-group data 73)) (= v1-242 (-> self draw art-group data 74))) ) - (let ((f30-2 (if (= (if (> (-> self skel active-channels) 0) - (-> self skel root-channel 0 frame-group) - ) - (-> self draw art-group data 74) - ) - (-> (new 'static 'array float 1 24576.0) 0) - (-> (new 'static 'array float 1 -24576.0) 0) - ) + (let ((f30-2 (the-as float (if (= (if (> (-> self skel active-channels) 0) + (-> self skel root-channel 0 frame-group) + ) + (-> self draw art-group data 74) + ) + 24576.0 + -24576.0 + ) + ) ) ) (ja-channel-push! 1 12) @@ -466,7 +468,7 @@ (set! (-> gp-4 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) data 0 length) -1)) ) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (set! (-> gp-4 frame-num) (ja-aframe (the-as float 38.0) 0)) (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 39)) num-func-seek!) ) @@ -475,7 +477,7 @@ (suspend) (let ((a0-82 (-> self skel root-channel 0))) (set! (-> a0-82 param 0) (the float (+ (-> a0-82 frame-group data 0 length) -1))) - (set! (-> a0-82 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-82 param 1) 1.0) (joint-control-channel-group-eval! a0-82 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -485,7 +487,7 @@ (set! (-> gp-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-5 param 1) 1.0) (set! (-> gp-5 frame-num) (ja-aframe (the-as float 50.0) 0)) (joint-control-channel-group! gp-5 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -493,7 +495,7 @@ (suspend) (let ((a0-86 (-> self skel root-channel 0))) (set! (-> a0-86 param 0) (the float (+ (-> a0-86 frame-group data 0 length) -1))) - (set! (-> a0-86 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-86 param 1) 1.0) (joint-control-channel-group-eval! a0-86 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -519,7 +521,7 @@ (set! (-> gp-6 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-6 param 1) 1.0) (set! (-> gp-6 frame-num) (ja-aframe (the-as float 42.0) 0)) (joint-control-channel-group! gp-6 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -527,7 +529,7 @@ (suspend) (let ((a0-113 (-> self skel root-channel 0))) (set! (-> a0-113 param 0) (the float (+ (-> a0-113 frame-group data 0 length) -1))) - (set! (-> a0-113 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-113 param 1) 1.0) (joint-control-channel-group-eval! a0-113 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -540,7 +542,7 @@ ) (let ((a0-119 (-> self skel root-channel 0))) (set! (-> a0-119 param 0) (the float (+ (-> a0-119 frame-group data 0 length) -1))) - (set! (-> a0-119 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-119 param 1) 1.0) (joint-control-channel-group! a0-119 (the-as art-joint-anim #f) num-func-seek!) ) (while (not (ja-done? 0)) @@ -658,7 +660,7 @@ (set! (-> a0-12 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 72)) data 0 length) -1)) ) - (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-12 param 1) 1.0) (set! (-> a0-12 frame-num) 0.0) (joint-control-channel-group! a0-12 (the-as art-joint-anim (-> self draw art-group data 72)) num-func-seek!) ) @@ -666,7 +668,7 @@ (suspend) (let ((a0-13 (-> self skel root-channel 0))) (set! (-> a0-13 param 0) (the float (+ (-> a0-13 frame-group data 0 length) -1))) - (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-13 param 1) 1.0) (joint-control-channel-group-eval! a0-13 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -683,7 +685,7 @@ (set! (-> a0-20 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 53)) data 0 length) -1)) ) - (set! (-> a0-20 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-20 param 1) 1.0) (set! (-> a0-20 frame-num) 0.0) (joint-control-channel-group! a0-20 (the-as art-joint-anim (-> self draw art-group data 53)) num-func-seek!) ) @@ -691,7 +693,7 @@ (suspend) (let ((a0-21 (-> self skel root-channel 0))) (set! (-> a0-21 param 0) (the float (+ (-> a0-21 frame-group data 0 length) -1))) - (set! (-> a0-21 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-21 param 1) 1.0) (joint-control-channel-group-eval! a0-21 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -702,7 +704,7 @@ (set! (-> a0-23 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 52)) data 0 length) -1)) ) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (set! (-> a0-23 frame-num) 0.0) (joint-control-channel-group! a0-23 (the-as art-joint-anim (-> self draw art-group data 52)) num-func-seek!) ) @@ -710,7 +712,7 @@ (suspend) (let ((a0-24 (-> self skel root-channel 0))) (set! (-> a0-24 param 0) (the float (+ (-> a0-24 frame-group data 0 length) -1))) - (set! (-> a0-24 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-24 param 1) 1.0) (joint-control-channel-group-eval! a0-24 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -727,7 +729,7 @@ (set! (-> a0-30 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 79)) data 0 length) -1)) ) - (set! (-> a0-30 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-30 param 1) 1.0) (set! (-> a0-30 frame-num) 0.0) (joint-control-channel-group! a0-30 (the-as art-joint-anim (-> self draw art-group data 79)) num-func-seek!) ) @@ -735,7 +737,7 @@ (suspend) (let ((a0-31 (-> self skel root-channel 0))) (set! (-> a0-31 param 0) (the float (+ (-> a0-31 frame-group data 0 length) -1))) - (set! (-> a0-31 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-31 param 1) 1.0) (joint-control-channel-group-eval! a0-31 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -750,7 +752,7 @@ (set! (-> a0-37 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 85)) data 0 length) -1)) ) - (set! (-> a0-37 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-37 param 1) 1.0) (set! (-> a0-37 frame-num) 0.0) (joint-control-channel-group! a0-37 (the-as art-joint-anim (-> self draw art-group data 85)) num-func-seek!) ) @@ -758,7 +760,7 @@ (suspend) (let ((a0-38 (-> self skel root-channel 0))) (set! (-> a0-38 param 0) (the float (+ (-> a0-38 frame-group data 0 length) -1))) - (set! (-> a0-38 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-38 param 1) 1.0) (joint-control-channel-group-eval! a0-38 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -791,7 +793,7 @@ ) ) ) - (set! (-> s4-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s4-0 param 1) 1.0) (set! (-> s4-0 frame-num) 0.0) (joint-control-channel-group! s4-0 @@ -805,16 +807,12 @@ ) (until (ja-done? 0) (set! (-> self control unknown-float81) - (seek - (-> self control unknown-float81) - (-> (new 'static 'array float 1 0.0) 0) - (-> *display* seconds-per-frame) - ) + (seek (-> self control unknown-float81) (the-as float 0.0) (-> *display* seconds-per-frame)) ) (suspend) (let ((a0-50 (-> self skel root-channel 0))) (set! (-> a0-50 param 0) (the float (+ (-> a0-50 frame-group data 0 length) -1))) - (set! (-> a0-50 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-50 param 1) 1.0) (joint-control-channel-group-eval! a0-50 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -868,20 +866,21 @@ ) ) ) - (let ((f30-1 (cond - ((= (if (> (-> self skel active-channels) 0) - (-> self skel root-channel 0 frame-group) - ) - (-> self draw art-group data 23) - ) - (let ((f0-57 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) - (- f0-57 (* (the float (the int (/ f0-57 50.0))) 50.0)) - ) - ) - (else - (-> (new 'static 'array float 1 0.0) 0) - ) - ) + (let ((f30-1 (the-as float (cond + ((= (if (> (-> self skel active-channels) 0) + (-> self skel root-channel 0 frame-group) + ) + (-> self draw art-group data 23) + ) + (let ((f0-57 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) + (- f0-57 (* (the float (the int (/ f0-57 50.0))) 50.0)) + ) + ) + (else + 0.0 + ) + ) + ) ) ) (set! s5-0 45) @@ -914,7 +913,7 @@ (suspend) (let ((a0-92 (-> self skel root-channel 0))) (set! (-> a0-92 param 0) (the float (+ (-> a0-92 frame-group data 0 length) -1))) - (set! (-> a0-92 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-92 param 1) 1.0) (joint-control-channel-group-eval! a0-92 (the-as art-joint-anim #f) num-func-seek!) ) (let ((a0-93 (-> self skel root-channel 1))) @@ -945,7 +944,7 @@ (suspend) (let ((a0-99 (-> self skel root-channel 0))) (set! (-> a0-99 param 0) (the float (+ (-> a0-99 frame-group data 0 length) -1))) - (set! (-> a0-99 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-99 param 1) 1.0) (joint-control-channel-group-eval! a0-99 (the-as art-joint-anim #f) num-func-seek!) ) (let ((a0-100 (-> self skel root-channel 1))) @@ -992,7 +991,7 @@ (ground-tween-update gp-0 (-> self control unknown-float61) (-> self control unknown-float62)) (suspend) (let ((a0-115 (-> self skel root-channel 0))) - (set! (-> a0-115 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-115 param 0) 1.0) (joint-control-channel-group-eval! a0-115 (the-as art-joint-anim #f) num-func-loop!) ) (let ((a0-116 (-> self skel root-channel 1))) @@ -1090,7 +1089,7 @@ (set! (-> self control transv quad) (-> self control unknown-vector-array10 (-> self control unknown-int10) quad) ) - (set! (-> self control transv w) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control transv w) 1.0) (go target-turn-around) ) (slide-down-test) @@ -1100,12 +1099,7 @@ :code (behavior () (let ((f28-0 0.0) - (f30-0 (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01))) - ) - ) - ) + (f30-0 (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01)))))) (gp-0 #f) ) (cond @@ -1114,7 +1108,7 @@ ) (-> self draw art-group data 33) ) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (ja-channel-push! 7 15) ) ((= (if (> (-> self skel active-channels) 0) @@ -1123,17 +1117,14 @@ (-> self draw art-group data 69) ) (ja-channel-push! 7 22) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) ) ((= (if (> (-> self skel active-channels) 0) (-> self skel root-channel 0 frame-group) ) (-> self draw art-group data 51) ) - (let ((f30-1 - (fmax 0.8 (fmin (-> (new 'static 'array float 1 1.0) 0) (* 0.000048828126 (-> self control unknown-float01)))) - ) - ) + (let ((f30-1 (fmax 0.8 (fmin 1.0 (* 0.000048828126 (-> self control unknown-float01)))))) (cond ((and (rand-vu-percent? (the-as float 0.3)) (< 20480.0 (-> self control unknown-float01))) (let ((s5-0 (-> self skel root-channel 0))) @@ -1206,7 +1197,7 @@ ) ) (ja-channel-push! 7 15) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (set! f28-0 30.0) ) (else @@ -1217,7 +1208,7 @@ ) (cond ((or (= v1-108 (-> self draw art-group data 59)) (= v1-108 (-> self draw art-group data 60))) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (set! f28-0 30.0) (ja-channel-push! 7 45) ) @@ -1228,7 +1219,7 @@ ) (or (= v1-116 (-> self draw art-group data 84)) (= v1-116 (-> self draw art-group data 85))) ) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (set! f28-0 26.0) (ja-channel-push! 7 30) ) @@ -1297,15 +1288,16 @@ ) ) (cond - ((< (if (= s5-4 (-> self draw art-group data 34)) - (-> (new 'static 'array float 1 77824.0) 0) - (-> (new 'static 'array float 1 102400.0) 0) - ) + ((< (the-as float (if (= s5-4 (-> self draw art-group data 34)) + 77824.0 + 102400.0 + ) + ) f30-2 ) (let ((s5-5 (-> self skel root-channel 0))) (set! (-> s5-5 frame-group) (the-as art-joint-anim (-> self draw art-group data 28))) - (set! (-> s5-5 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-5 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-5 param 1) 1.00001) (set! (-> s5-5 frame-num) 0.0) (joint-control-channel-group! s5-5 (the-as art-joint-anim (-> self draw art-group data 28)) num-func-seek!) @@ -1313,29 +1305,30 @@ (until (ja-done? 0) (suspend) (let ((s5-6 (-> self skel root-channel 0))) - (set! (-> s5-6 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-6 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-6 param 1) 1.00001) (joint-control-channel-group-eval! s5-6 (the-as art-joint-anim #f) num-func-seek!) ) ) ) - ((< (if (= s5-4 (-> self draw art-group data 34)) - (-> (new 'static 'array float 1 61440.0) 0) - (-> (new 'static 'array float 1 102400.0) 0) - ) + ((< (the-as float (if (= s5-4 (-> self draw art-group data 34)) + 61440.0 + 102400.0 + ) + ) f30-2 ) (let ((s5-7 (-> self skel root-channel 0))) (set! (-> s5-7 frame-group) (the-as art-joint-anim (-> self draw art-group data 28))) - (set! (-> s5-7 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-7 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-7 param 1) 1.00001) - (set! (-> s5-7 frame-num) (ja-aframe (-> (new 'static 'array float 1 -1.0) 0) 0)) + (set! (-> s5-7 frame-num) (ja-aframe (the-as float -1.0) 0)) (joint-control-channel-group! s5-7 (the-as art-joint-anim (-> self draw art-group data 28)) num-func-seek!) ) (until (ja-done? 0) (suspend) (let ((s5-8 (-> self skel root-channel 0))) - (set! (-> s5-8 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-8 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-8 param 1) 1.00001) (joint-control-channel-group-eval! s5-8 (the-as art-joint-anim #f) num-func-seek!) ) @@ -1373,7 +1366,7 @@ ) ) (set! f28-0 30.0) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (ja-channel-set! 7) ) ((= (if (> (-> self skel active-channels) 0) @@ -1469,24 +1462,12 @@ (f26-1 0.0) ) (while #t - (let ((f22-0 (fmax - (-> (new 'static 'array float 1 -1.0) 0) - (fmin (-> (new 'static 'array float 1 1.0) 0) (* 2.0 (-> self control unknown-float61))) - ) - ) - (f24-0 (fmax - (-> (new 'static 'array float 1 -1.0) 0) - (fmin (-> (new 'static 'array float 1 1.0) 0) (* 1.6 (-> self control unknown-float62))) - ) - ) + (let ((f22-0 (fmax -1.0 (fmin 1.0 (* 2.0 (-> self control unknown-float61))))) + (f24-0 (fmax -1.0 (fmin 1.0 (* 1.6 (-> self control unknown-float62))))) ) (set! f30-0 (seek f30-0 - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01))))) (* 2.0 (-> *display* seconds-per-frame)) ) ) @@ -1606,13 +1587,13 @@ (behavior () (vector-turn-to (-> self control transv)) (set! (-> self control unknown-surface00) *turn-around-mods*) - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) (none) ) :exit (behavior () (target-state-hook-exit) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) (set! (-> self control unknown-float01) 0.0) (set-quaternion! (-> self control) (-> self control dir-targ)) (set! (-> self control unknown-float81) 0.0) @@ -1667,13 +1648,7 @@ (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!) ) (TODO-RENAME-9 (-> self align)) - (TODO-RENAME-10 - (-> self align) - 16 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (TODO-RENAME-10 (-> self align) 16 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0)) ) (remove-exit) (set! (-> self control unknown-float81) 0.0) @@ -1729,7 +1704,7 @@ (set! (-> a0-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) data 0 length) -1)) ) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (set! (-> a0-5 frame-num) 0.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 31)) num-func-seek!) ) @@ -1737,7 +1712,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1819,8 +1794,8 @@ (local-vars (v0-2 vector)) (let ((f30-0 (* 0.033333335 (the float (- (-> *display* base-frame-counter) (-> self state-time)))))) (cond - ((or (< (-> (new 'static 'array float 1 1.0) 0) f30-0) (< (-> self control unknown-float123) 0.0) (not arg2)) - (set! (-> self control unknown-float123) (-> (new 'static 'array float 1 -1.0) 0)) + ((or (< 1.0 f30-0) (< (-> self control unknown-float123) 0.0) (not arg2)) + (set! (-> self control unknown-float123) -1.0) ) (else (set! (-> self control unknown-float123) f30-0) @@ -1843,8 +1818,8 @@ (the-as float (-> self control unknown-uint20)) (the-as float (-> self control unknown-uint30)) f30-0 - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.0) + (the-as float 1.0) ) (vector-dot (-> self control dynam gravity-normal) s3-1) ) @@ -1912,9 +1887,9 @@ target-standard-event-handler :enter (behavior () - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) (set! (-> self control unknown-surface00) *duck-mods*) - (target-collide-set! 'duck (-> (new 'static 'array float 1 1.0) 0)) + (target-collide-set! 'duck (the-as float 1.0)) (none) ) :exit @@ -1929,7 +1904,7 @@ (target-state-hook-exit) ) (target-exit) - (target-collide-set! 'normal (-> (new 'static 'array float 1 0.0) 0)) + (target-collide-set! 'normal (the-as float 0.0)) (none) ) :trans @@ -1993,7 +1968,7 @@ (set! (-> a0-4 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) data 0 length) -1)) ) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (set! (-> a0-4 frame-num) 0.0) (joint-control-channel-group! a0-4 (the-as art-joint-anim (-> self draw art-group data 70)) num-func-seek!) ) @@ -2001,7 +1976,7 @@ (suspend) (let ((a0-5 (-> self skel root-channel 0))) (set! (-> a0-5 param 0) (the float (+ (-> a0-5 frame-group data 0 length) -1))) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2028,7 +2003,7 @@ (set! (-> a0-19 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) data 0 length) -1)) ) - (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-19 param 1) 1.0) (set! (-> a0-19 frame-num) 0.0) (joint-control-channel-group! a0-19 (the-as art-joint-anim (-> self draw art-group data 30)) num-func-seek!) ) @@ -2036,7 +2011,7 @@ (suspend) (let ((a0-20 (-> self skel root-channel 0))) (set! (-> a0-20 param 0) (the float (+ (-> a0-20 frame-group data 0 length) -1))) - (set! (-> a0-20 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-20 param 1) 1.0) (joint-control-channel-group-eval! a0-20 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2048,7 +2023,7 @@ (set! (-> a0-22 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) data 0 length) -1)) ) - (set! (-> a0-22 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-22 param 1) 1.0) (set! (-> a0-22 frame-num) 0.0) (joint-control-channel-group! a0-22 (the-as art-joint-anim (-> self draw art-group data 31)) num-func-seek!) ) @@ -2056,7 +2031,7 @@ (suspend) (let ((a0-23 (-> self skel root-channel 0))) (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1))) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2073,8 +2048,8 @@ target-standard-event-handler :enter (behavior () - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) - (target-collide-set! 'duck (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) + (target-collide-set! 'duck (the-as float 1.0)) (if (not (= (if (> (-> self skel active-channels) 0) (-> self skel root-channel 0 frame-group) ) @@ -2174,12 +2149,10 @@ ) (let ((a0-18 (-> self skel root-channel 0))) (set! (-> a0-18 param 0) - (fmin - (-> (new 'static 'array float 1 1.0) 0) - (/ (-> self control unknown-float01) - (* 60.0 (/ (-> *TARGET-bank* duck-walk-cycle-dist) (-> *TARGET-bank* run-cycle-length))) - ) - ) + (fmin 1.0 (/ (-> self control unknown-float01) + (* 60.0 (/ (-> *TARGET-bank* duck-walk-cycle-dist) (-> *TARGET-bank* run-cycle-length))) + ) + ) ) (joint-control-channel-group-eval! a0-18 (the-as art-joint-anim #f) num-func-loop!) ) @@ -2255,20 +2228,10 @@ ) (set! (-> self control unknown-surface00) arg2) (set! (-> self control unknown-float123) - (fmax - 0.0 - (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.00004359654 (+ -11468.8 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.00004359654 (+ -11468.8 (-> self control unknown-float01))))) ) (set! (-> self control unknown-float122) - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))))) ) (none) ) @@ -2316,7 +2279,7 @@ (the-as float 65502.96) (the-as float -163840.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -2327,11 +2290,7 @@ (set! (-> self control unknown-float122) (seek (-> self control unknown-float122) - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))))) (-> *display* seconds-per-frame) ) ) @@ -2361,7 +2320,7 @@ (suspend) (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 frame-group) (the-as art-joint-anim (-> self draw art-group data 34))) - (set! (-> a0-4 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 0) 1.0) (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-+!) ) (let ((a0-5 (-> self skel root-channel 1))) @@ -2382,13 +2341,14 @@ ) (set! (-> gp-1 param 0) (the float (+ (-> gp-1 frame-group data 0 length) -1))) (let ((v1-45 (and (< 0.0 f30-0) (< 0.0 f0-8)))) - (set! (-> gp-1 param 1) (if v1-45 - (fmin - (fmin (-> (new 'static 'array float 1 3.0) 0) f0-8) - (/ (* 5.0 f0-8) (the float (time-to-apex f30-0 (the-as float -245760.0)))) - ) - (-> (new 'static 'array float 1 1.0) 0) - ) + (set! (-> gp-1 param 1) + (the-as + float + (if v1-45 + (fmin (fmin 3.0 f0-8) (/ (* 5.0 f0-8) (the float (time-to-apex f30-0 (the-as float -245760.0))))) + 1.0 + ) + ) ) ) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) @@ -2429,8 +2389,8 @@ (set! (-> gp-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1)) ) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) - (set! (-> gp-0 frame-num) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> gp-0 param 1) 1.0) + (set! (-> gp-0 frame-num) (ja-aframe (the-as float 3.0) 0)) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!) ) (until (ja-done? 0) @@ -2438,13 +2398,13 @@ (suspend) (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 param 0) (the float (+ (-> a0-4 frame-group data 0 length) -1))) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!) ) ) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-6 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 0) 1.0) (set! (-> a0-6 frame-num) 0.0) (joint-control-channel-group! a0-6 (the-as art-joint-anim (-> self draw art-group data 38)) num-func-loop!) ) @@ -2452,7 +2412,7 @@ (suspend) (let ((a0-7 (-> self skel root-channel 0))) (set! (-> a0-7 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-7 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-7 param 0) 1.0) (joint-control-channel-group-eval! a0-7 (the-as art-joint-anim (-> self draw art-group data 38)) @@ -2517,7 +2477,7 @@ (the-as float 33775.48) (the-as float -122880.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -2529,11 +2489,7 @@ (set! (-> self control unknown-float122) (seek (-> self control unknown-float122) - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))))) (-> *display* seconds-per-frame) ) ) @@ -2542,13 +2498,13 @@ :code (behavior ((arg0 float) (arg1 float)) (ja-channel-push! 2 15) - (dummy-10 (-> self skel effect) 'jump-double (-> (new 'static 'array float 1 -1.0) 0) -1) + (dummy-10 (-> self skel effect) 'jump-double (the-as float -1.0) -1) (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 34))) (set! (-> gp-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1)) ) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) (ja-aframe (the-as float 5.0) 0)) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!) ) @@ -2565,7 +2521,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) (let ((a0-7 (-> self skel root-channel 1))) @@ -2657,7 +2613,7 @@ (the-as float 33775.48) (the-as float -122880.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -2667,10 +2623,7 @@ (set! (-> self control unknown-float122) (seek (-> self control unknown-float122) - (fmax - 0.0 - (fmin (-> (new 'static 'array float 1 1.0) 0) (* 0.00012207031 (+ -2048.0 (-> self control unknown-float01)))) - ) + (fmax 0.0 (fmin 1.0 (* 0.00012207031 (+ -2048.0 (-> self control unknown-float01))))) (-> *display* seconds-per-frame) ) ) @@ -2712,7 +2665,7 @@ (let ((s3-0 (-> self skel root-channel 0))) (set! (-> s3-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 42))) (set! (-> s3-0 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-0 param 1) 1.0) (set! (-> s3-0 frame-num) 0.0) (joint-control-channel-group! s3-0 (the-as art-joint-anim (-> self draw art-group data 42)) num-func-seek!) ) @@ -2720,7 +2673,7 @@ (suspend) (let ((s3-1 (-> self skel root-channel 0))) (set! (-> s3-1 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-1 param 1) 1.0) (joint-control-channel-group-eval! s3-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2729,7 +2682,7 @@ (let ((s3-2 (-> self skel root-channel 0))) (set! (-> s3-2 frame-group) (the-as art-joint-anim (-> self draw art-group data 41))) (set! (-> s3-2 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-2 param 1) 1.0) (set! (-> s3-2 frame-num) 0.0) (joint-control-channel-group! s3-2 (the-as art-joint-anim (-> self draw art-group data 41)) num-func-seek!) ) @@ -2737,7 +2690,7 @@ (suspend) (let ((s3-3 (-> self skel root-channel 0))) (set! (-> s3-3 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-3 param 1) 1.0) (joint-control-channel-group-eval! s3-3 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2783,16 +2736,12 @@ ) ) ) - (f28-0 (-> (new 'static 'array float 1 1.0) 0)) + (f28-0 1.0) ) (until (ja-done? 0) (let* ((f24-0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) (f26-0 (- f30-0 (ja-aframe-num 0))) - (f22-1 (fmin - (fmin (-> (new 'static 'array float 1 3.0) 0) f26-0) - (/ (* 5.0 f26-0) (the float (time-to-apex f24-0 (the-as float -245760.0)))) - ) - ) + (f22-1 (fmin (fmin 3.0 f26-0) (/ (* 5.0 f26-0) (the float (time-to-apex f24-0 (the-as float -245760.0)))))) (s5-0 (-> self skel root-channel 0)) ) (set! (-> s5-0 param 0) (the float (+ (-> s5-0 frame-group data 0 length) -1))) @@ -2839,7 +2788,7 @@ (else (let ((a0-9 (-> self skel root-channel 0))) (set! (-> a0-9 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-9 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-9 param 0) 1.0) (set! (-> a0-9 frame-num) 0.0) (joint-control-channel-group! a0-9 (the-as art-joint-anim (-> self draw art-group data 38)) num-func-loop!) ) @@ -2847,7 +2796,7 @@ (suspend) (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-10 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 0) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim (-> self draw art-group data 38)) @@ -2913,7 +2862,7 @@ ) (or (= v1-4 (-> self draw art-group data 42)) (= v1-4 (-> self draw art-group data 43))) ) - (dummy-10 (-> self skel effect) 'group-blue-hit-ground-effect (-> (new 'static 'array float 1 0.0) 0) -1) + (dummy-10 (-> self skel effect) 'group-blue-hit-ground-effect (the-as float 0.0) -1) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.3)) ) (else @@ -2939,7 +2888,7 @@ (set! (-> self control unknown-dword31) 0) (set! (-> self control unknown-dword33) 0) (if (>= (-> self control ground-impact-vel) (-> *TARGET-bank* fall-stumble-threshold)) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) ) (if (!= (-> self control ground-pat material) (pat-material ice)) (delete-back-vel) @@ -2948,11 +2897,11 @@ (start-bobbing! (-> self water) (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 4096.0) (-> self control ground-impact-vel) (the-as float 40960.0) - (-> (new 'static 'array float 1 102400.0) 0) + (the-as float 102400.0) ) 600 1500 @@ -3038,7 +2987,7 @@ ) (until (ja-done? 0) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 74) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3141,7 +3090,7 @@ :enter (behavior () (if (or (and (= (-> self fact-info-target eco-type) (pickup-type eco-yellow)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (< (- (-> *display* base-frame-counter) (-> self control unknown-dword82)) (seconds 1.5)) ) @@ -3157,7 +3106,7 @@ (target-start-attack) (target-danger-set! 'punch #f) (if (or (< (fabs (-> self control unknown-float62)) 0.3) (< 0.3 (fabs (-> self control unknown-float61)))) - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) ) (none) ) @@ -3243,7 +3192,7 @@ ) ) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3275,7 +3224,7 @@ (set! (-> self control dynam gravity-max) 368640.0) (set! (-> self control dynam gravity-length) 368640.0) (let ((f28-0 0.0) - (f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (f30-0 1.0) (gp-2 0) ) (until (ja-done? 0) @@ -3313,7 +3262,7 @@ (the-as uint 12) ) ) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) ) ((and (zero? (logand (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) button0-abs 0) (pad-buttons square) @@ -3352,7 +3301,7 @@ (set! (-> *run-attack-mods* turnvv) 0.0) ) (if (< 2 gp-2) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) ) (+! gp-2 1) ) @@ -3501,7 +3450,7 @@ (set! (-> self control dynam gravity-length) (-> self control unknown-dynamics00 gravity-length)) ) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 70) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3523,23 +3472,17 @@ (set! (-> a0-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 56)) data 0 length) -1)) ) - (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-2 param 1) 1.0) (set! (-> a0-2 frame-num) 0.0) (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 56)) num-func-seek!) ) (until (ja-done? 0) (TODO-RENAME-9 (-> self align)) - (TODO-RENAME-10 - (-> self align) - 16 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (TODO-RENAME-10 (-> self align) 16 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0)) (suspend) (let ((a0-5 (-> self skel root-channel 0))) (set! (-> a0-5 param 0) (the float (+ (-> a0-5 frame-group data 0 length) -1))) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -3567,7 +3510,7 @@ ) (suspend) (let ((a0-10 (-> self skel root-channel 0))) - (set! (-> a0-10 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 0) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-loop!) ) (set! f0-8 (target-height-above-ground)) @@ -3579,7 +3522,7 @@ (set! (-> a0-13 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 58)) data 0 length) -1)) ) - (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-13 param 1) 1.0) (set! (-> a0-13 frame-num) 0.0) (joint-control-channel-group! a0-13 (the-as art-joint-anim (-> self draw art-group data 58)) num-func-seek!) ) @@ -3611,7 +3554,7 @@ (suspend) (let ((a0-20 (-> self skel root-channel 0))) (set! (-> a0-20 param 0) (the float (+ (-> a0-20 frame-group data 0 length) -1))) - (set! (-> a0-20 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-20 param 1) 1.0) (joint-control-channel-group-eval! a0-20 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -3649,11 +3592,12 @@ ) (set! (-> s4-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 62))) (set! (-> s4-0 param 0) (ja-aframe (the-as float 7.0) 0)) - (set! (-> s4-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) - (set! (-> s4-0 frame-num) (if s3-0 - (ja-aframe (the-as float 5.0) 0) - (-> (new 'static 'array float 1 0.0) 0) - ) + (set! (-> s4-0 param 1) 1.0) + (set! (-> s4-0 frame-num) (the-as float (if s3-0 + (ja-aframe (the-as float 5.0) 0) + 0.0 + ) + ) ) (joint-control-channel-group! s4-0 (the-as art-joint-anim (-> self draw art-group data 62)) num-func-seek!) ) @@ -3661,7 +3605,7 @@ (suspend) (let ((s4-1 (-> self skel root-channel 0))) (set! (-> s4-1 param 0) (ja-aframe (the-as float 7.0) 0)) - (set! (-> s4-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s4-1 param 1) 1.0) (joint-control-channel-group-eval! s4-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -3715,7 +3659,7 @@ (the-as float 65502.96) (the-as float -163840.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -3734,7 +3678,7 @@ ) (mod-var-jump #t #t (cpad-hold? (-> self control unknown-cpad-info00 number) x) (-> self control transv)) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3774,13 +3718,7 @@ ) ) ) - (s5-0 - gp-0 - a1-2 - (-> (new 'static 'array float 1 1.0) 0) - (the-as float 0.95) - (-> (new 'static 'array float 1 1.0) 0) - ) + (s5-0 gp-0 a1-2 (the-as float 1.0) (the-as float 0.95) (the-as float 1.0)) ) ) (go target-falling #f) @@ -3805,7 +3743,7 @@ ) (cond ((< 6144.0 (target-height-above-ground)) - (dummy-10 (-> self skel effect) 'swim-flop (-> (new 'static 'array float 1 -1.0) 0) -1) + (dummy-10 (-> self skel effect) 'swim-flop (the-as float -1.0) -1) (let ((t9-3 enter-state)) (set! (-> self next-state) target-swim-down) ((the-as (function object :behavior target) t9-3)) @@ -3830,7 +3768,7 @@ :enter (behavior ((arg0 float) (arg1 float) (arg2 float)) (if (and (= (-> self fact-info-target eco-type) (pickup-type eco-yellow)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (go target-yellow-jump-blast) ) @@ -3895,7 +3833,7 @@ (when gp-1 (logior! (-> self control status) 1) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5)) (dummy-10 (-> self skel effect) 'group-red-eco-strike-ground (ja-frame-num 0) 0) @@ -3931,7 +3869,7 @@ ) ) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) @@ -3965,7 +3903,7 @@ (set! (-> a0-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 63)) data 0 length) -1)) ) - (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-2 param 1) 1.0) (set! (-> a0-2 frame-num) 0.0) (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 63)) num-func-seek!) ) @@ -3983,20 +3921,20 @@ (suspend) (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 param 0) (the float (+ (-> a0-4 frame-group data 0 length) -1))) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!) ) (let ((gp-0 (-> self skel root-channel 1))) (set! (-> gp-0 frame-interp) (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.0) + (the-as float 1.0) (-> self control unknown-float01) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 40960.0) ) ) (set! (-> gp-0 param 0) (the float (+ (-> gp-0 frame-group data 0 length) -1))) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (joint-control-channel-group-eval! gp-0 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -4019,7 +3957,7 @@ ) (set! (-> gp-2 frame-num) 0.0) ) - (let ((f30-0 (-> (new 'static 'array float 1 1.0) 0))) + (let ((f30-0 1.0)) (let ((gp-3 (new-stack-vector0))) (let ((f0-18 (vector-dot (-> self control dynam gravity-normal) (-> self control unknown-vector120)))) 0.0 @@ -4060,22 +3998,22 @@ (while #t (+! (-> self control unknown-uint20) 1) (let ((a0-30 (-> self skel root-channel 0))) - (set! (-> a0-30 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-30 param 0) 1.0) (joint-control-channel-group-eval! a0-30 (the-as art-joint-anim #f) num-func-+!) ) (let ((gp-5 (-> self skel root-channel 1))) (set! (-> gp-5 frame-interp) (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.0) + (the-as float 1.0) (-> self control unknown-float01) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 40960.0) ) ) (set! (-> gp-5 param 0) 0.0) (joint-control-channel-group-eval! gp-5 (the-as art-joint-anim #f) num-func-chan) ) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) (let ((gp-6 (new-stack-vector0)) (f28-0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) @@ -4138,7 +4076,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.1)) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self control unknown-uint20) (the-as uint arg0)) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) (set! (-> self control unknown-surface00) *flop-land-mods*) (set! (-> *flop-land-mods* flags) (logand -1025 (-> *flop-land-mods* flags))) (set! (-> self state-flags) (logior #x100000 (-> self state-flags))) @@ -4154,7 +4092,7 @@ ) ) (when (and (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (< (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.25)) ) @@ -4213,7 +4151,7 @@ ) ) (if (or (< (fabs (-> self control unknown-float62)) 0.3) (< 0.3 (fabs (-> self control unknown-float61)))) - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) ) (set! (-> self control unknown-uint20) (the-as uint 0)) (set! (-> self control unknown-int21) 0) @@ -4234,7 +4172,7 @@ (let ((gp-0 0)) 0 (let ((s5-0 0) - (f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (f30-0 1.0) ) (ja-channel-push! 1 12) (let ((s4-0 (-> self skel root-channel 0))) @@ -4275,13 +4213,7 @@ ((nonzero? s5-0) ) (else - (TODO-RENAME-10 - (-> self align) - 4 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - f30-0 - ) + (TODO-RENAME-10 (-> self align) 4 (the-as float 1.0) (the-as float 1.0) f30-0) (let ((s4-1 (new-stack-vector0))) (vector-matrix*! s4-1 (-> self control transv) (-> self control unknown-matrix00)) (set! (-> s4-1 y) 0.0) @@ -4292,10 +4224,10 @@ (suspend) (let ((a0-15 (-> self skel root-channel 0))) (set! (-> a0-15 param 0) (the float (+ (-> a0-15 frame-group data 0 length) -1))) - (set! (-> a0-15 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-15 param 1) 1.0) (joint-control-channel-group-eval! a0-15 (the-as art-joint-anim #f) num-func-seek!) ) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) ) ) (if (and (or (< (- (-> *display* base-frame-counter) (the-as time-frame gp-0)) (-> *TARGET-bank* wheel-jump-pre-window)) @@ -4388,9 +4320,9 @@ ) (set! (-> s4-0 frame-num) 0.0) ) - (let ((f30-0 (-> (new 'static 'array float 1 1.0) 0))) + (let ((f30-0 1.0)) (until (or (ja-max? 0) (and (>= (ja-aframe-num 0) 4.0) (logtest? (-> self control status) 1))) - (when (and (>= (ja-aframe-num 0) (-> (new 'static 'array float 1 3.0) 0)) (not (-> self control unknown-symbol30))) + (when (and (>= (ja-aframe-num 0) 3.0) (not (-> self control unknown-symbol30))) (set! (-> self event-hook) target-dangerous-event-handler) (target-start-attack) (target-danger-set! 'flip #f) @@ -4400,15 +4332,15 @@ (TODO-RENAME-10 (-> self align) 6 - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) (/ arg0 (-> *TARGET-bank* wheel-flip-art-height)) (* f30-0 (/ arg1 (-> *TARGET-bank* wheel-flip-art-dist))) ) (TODO-RENAME-10 (-> self align) 4 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) + (the-as float 1.0) (* f30-0 (/ arg1 (-> *TARGET-bank* wheel-flip-art-dist))) ) ) @@ -4420,10 +4352,10 @@ (suspend) (let ((a0-11 (-> self skel root-channel 0))) (set! (-> a0-11 param 0) (the float (+ (-> a0-11 frame-group data 0 length) -1))) - (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-11 param 1) 1.0) (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!) ) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) ) ) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -4470,7 +4402,7 @@ (-> self draw art-group data 38) ) (let ((a0-35 (-> self skel root-channel 0))) - (set! (-> a0-35 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-35 param 0) 1.0) (joint-control-channel-group-eval! a0-35 (the-as art-joint-anim #f) num-func-loop!) ) ) From 0ca57684c465f39b408e49d9ffa3e999b947483b Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Thu, 14 Apr 2022 06:19:52 +0100 Subject: [PATCH 6/6] Update target.gc --- goal_src/engine/target/target.gc | 506 +++++++++++++------------------ 1 file changed, 219 insertions(+), 287 deletions(-) diff --git a/goal_src/engine/target/target.gc b/goal_src/engine/target/target.gc index ad82066048..11d6d52a4f 100644 --- a/goal_src/engine/target/target.gc +++ b/goal_src/engine/target/target.gc @@ -43,7 +43,7 @@ (set! (-> a0-16 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 50)) data 0 length) -1)) ) - (set! (-> a0-16 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-16 param 1) 1.0) (set! (-> a0-16 frame-num) 0.0) (joint-control-channel-group! a0-16 (the-as art-joint-anim (-> self draw art-group data 50)) num-func-seek!) ) @@ -51,7 +51,7 @@ (suspend) (let ((a0-17 (-> self skel root-channel 0))) (set! (-> a0-17 param 0) (the float (+ (-> a0-17 frame-group data 0 length) -1))) - (set! (-> a0-17 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-17 param 1) 1.0) (joint-control-channel-group-eval! a0-17 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -65,7 +65,7 @@ (suspend) (let ((a0-23 (-> self skel root-channel 0))) (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1))) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -82,14 +82,14 @@ (set! (-> s5-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1)) ) - (set! (-> s5-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s5-0 param 1) 1.0) (set! (-> s5-0 frame-num) (ja-aframe (the-as float 20.0) 0)) (joint-control-channel-group! s5-0 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!) ) (until (ja-done? 0) (let ((a0-33 (-> self skel root-channel 0))) (set! (-> a0-33 param 0) (the float (+ (-> a0-33 frame-group data 0 length) -1))) - (set! (-> a0-33 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-33 param 1) 1.0) (joint-control-channel-group-eval! a0-33 (the-as art-joint-anim #f) num-func-seek!) ) (suspend) @@ -108,7 +108,7 @@ ) (let ((a0-42 (-> self skel root-channel 0))) (set! (-> a0-42 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-42 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-42 param 0) 1.0) (set! (-> a0-42 frame-num) 0.0) (joint-control-channel-group! a0-42 (the-as art-joint-anim (-> self draw art-group data 38)) num-func-loop!) ) @@ -117,7 +117,7 @@ (suspend) (let ((a0-43 (-> self skel root-channel 0))) (set! (-> a0-43 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-43 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-43 param 0) 1.0) (joint-control-channel-group-eval! a0-43 (the-as art-joint-anim (-> self draw art-group data 38)) @@ -165,7 +165,7 @@ (-> self draw art-group data 38) ) (let ((a0-23 (-> self skel root-channel 0))) - (set! (-> a0-23 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 0) 1.0) (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-loop!) ) ) @@ -176,7 +176,7 @@ ) (let ((a0-28 (-> self skel root-channel 0))) (set! (-> a0-28 param 0) (the float (+ (-> a0-28 frame-group data 0 length) -1))) - (set! (-> a0-28 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-28 param 1) 1.0) (joint-control-channel-group-eval! a0-28 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -238,13 +238,14 @@ (= v1-2 (-> self draw art-group data 67)) ) (let ((gp-0 (or (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (< (-> self control unknown-float01) (-> (new 'static 'array float 1 61440.0) 0)) + (< (-> self control unknown-float01) 61440.0) ) ) - (f30-0 (if (= arg0 'swim) - (-> (new 'static 'array float 1 0.4) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (f30-0 (the-as float (if (= arg0 'swim) + 0.4 + 1.0 + ) + ) ) ) (ja-channel-set! 1) @@ -268,7 +269,7 @@ ) ) ) - (let ((f30-1 (seek f30-0 (-> (new 'static 'array float 1 1.0) 0) (* 0.5 (-> *display* seconds-per-frame))))) + (let ((f30-1 (seek f30-0 (the-as float 1.0) (* 0.5 (-> *display* seconds-per-frame))))) (set! (-> s5-0 param 1) f30-1) (set! (-> s5-0 frame-num) 0.0) (joint-control-channel-group! @@ -288,8 +289,8 @@ 2 6 ) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) + (the-as float 1.0) (the-as float 1.5) ) (when (and (>= 25.0 (ja-aframe-num 0)) (and (>= (ja-aframe-num 0) 21.0) @@ -314,7 +315,7 @@ (suspend) (let ((s5-1 (-> self skel root-channel 0))) (set! (-> s5-1 param 0) (the float (+ (-> s5-1 frame-group data 0 length) -1))) - (set! f30-1 (seek f30-1 (-> (new 'static 'array float 1 1.0) 0) (* 0.5 (-> *display* seconds-per-frame)))) + (set! f30-1 (seek f30-1 (the-as float 1.0) (* 0.5 (-> *display* seconds-per-frame)))) (set! (-> s5-1 param 1) f30-1) (joint-control-channel-group-eval! s5-1 (the-as art-joint-anim #f) num-func-seek!) ) @@ -353,7 +354,7 @@ (set! (-> a0-35 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> a0-35 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-35 param 1) 1.0) (set! (-> a0-35 frame-num) 0.0) (joint-control-channel-group! a0-35 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -361,7 +362,7 @@ (suspend) (let ((a0-36 (-> self skel root-channel 0))) (set! (-> a0-36 param 0) (the float (+ (-> a0-36 frame-group data 0 length) -1))) - (set! (-> a0-36 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-36 param 1) 1.0) (joint-control-channel-group-eval! a0-36 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -380,7 +381,7 @@ (set! (-> a0-44 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) data 0 length) -1)) ) - (set! (-> a0-44 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-44 param 1) 1.0) (set! (-> a0-44 frame-num) 0.0) (joint-control-channel-group! a0-44 (the-as art-joint-anim (-> self draw art-group data 39)) num-func-seek!) ) @@ -388,7 +389,7 @@ (suspend) (let ((a0-45 (-> self skel root-channel 0))) (set! (-> a0-45 param 0) (the float (+ (-> a0-45 frame-group data 0 length) -1))) - (set! (-> a0-45 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-45 param 1) 1.0) (joint-control-channel-group-eval! a0-45 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -397,7 +398,7 @@ (set! (-> gp-1 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-1 param 1) 1.0) (set! (-> gp-1 frame-num) (ja-aframe (the-as float 50.0) 0)) (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -405,7 +406,7 @@ (suspend) (let ((a0-49 (-> self skel root-channel 0))) (set! (-> a0-49 param 0) (the float (+ (-> a0-49 frame-group data 0 length) -1))) - (set! (-> a0-49 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-49 param 1) 1.0) (joint-control-channel-group-eval! a0-49 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -424,7 +425,7 @@ (set! (-> gp-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) data 0 length) -1)) ) - (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-2 param 1) 1.0) (set! (-> gp-2 frame-num) (ja-aframe (the-as float 38.0) 0)) (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 39)) num-func-seek!) ) @@ -432,7 +433,7 @@ (suspend) (let ((a0-61 (-> self skel root-channel 0))) (set! (-> a0-61 param 0) (the float (+ (-> a0-61 frame-group data 0 length) -1))) - (set! (-> a0-61 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-61 param 1) 1.0) (joint-control-channel-group-eval! a0-61 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -441,7 +442,7 @@ (set! (-> gp-3 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-3 param 1) 1.0) (set! (-> gp-3 frame-num) (ja-aframe (the-as float 50.0) 0)) (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -449,7 +450,7 @@ (suspend) (let ((a0-65 (-> self skel root-channel 0))) (set! (-> a0-65 param 0) (the float (+ (-> a0-65 frame-group data 0 length) -1))) - (set! (-> a0-65 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-65 param 1) 1.0) (joint-control-channel-group-eval! a0-65 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -462,14 +463,15 @@ ) (or (= v1-242 (-> self draw art-group data 73)) (= v1-242 (-> self draw art-group data 74))) ) - (let ((f30-2 (if (= (if (> (-> self skel active-channels) 0) - (-> self skel root-channel 0 frame-group) - ) - (-> self draw art-group data 74) - ) - (-> (new 'static 'array float 1 24576.0) 0) - (-> (new 'static 'array float 1 -24576.0) 0) - ) + (let ((f30-2 (the-as float (if (= (if (> (-> self skel active-channels) 0) + (-> self skel root-channel 0 frame-group) + ) + (-> self draw art-group data 74) + ) + 24576.0 + -24576.0 + ) + ) ) ) (ja-channel-push! 1 12) @@ -478,7 +480,7 @@ (set! (-> gp-4 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 39)) data 0 length) -1)) ) - (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-4 param 1) 1.0) (set! (-> gp-4 frame-num) (ja-aframe (the-as float 38.0) 0)) (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 39)) num-func-seek!) ) @@ -487,7 +489,7 @@ (suspend) (let ((a0-82 (-> self skel root-channel 0))) (set! (-> a0-82 param 0) (the float (+ (-> a0-82 frame-group data 0 length) -1))) - (set! (-> a0-82 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-82 param 1) 1.0) (joint-control-channel-group-eval! a0-82 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -497,7 +499,7 @@ (set! (-> gp-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-5 param 1) 1.0) (set! (-> gp-5 frame-num) (ja-aframe (the-as float 50.0) 0)) (joint-control-channel-group! gp-5 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -505,7 +507,7 @@ (suspend) (let ((a0-86 (-> self skel root-channel 0))) (set! (-> a0-86 param 0) (the float (+ (-> a0-86 frame-group data 0 length) -1))) - (set! (-> a0-86 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-86 param 1) 1.0) (joint-control-channel-group-eval! a0-86 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -531,7 +533,7 @@ (set! (-> gp-6 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 35)) data 0 length) -1)) ) - (set! (-> gp-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-6 param 1) 1.0) (set! (-> gp-6 frame-num) (ja-aframe (the-as float 42.0) 0)) (joint-control-channel-group! gp-6 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!) ) @@ -539,7 +541,7 @@ (suspend) (let ((a0-113 (-> self skel root-channel 0))) (set! (-> a0-113 param 0) (the float (+ (-> a0-113 frame-group data 0 length) -1))) - (set! (-> a0-113 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-113 param 1) 1.0) (joint-control-channel-group-eval! a0-113 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -552,7 +554,7 @@ ) (let ((a0-119 (-> self skel root-channel 0))) (set! (-> a0-119 param 0) (the float (+ (-> a0-119 frame-group data 0 length) -1))) - (set! (-> a0-119 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-119 param 1) 1.0) (joint-control-channel-group! a0-119 (the-as art-joint-anim #f) num-func-seek!) ) (while (not (ja-done? 0)) @@ -668,7 +670,7 @@ (set! (-> a0-12 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 72)) data 0 length) -1)) ) - (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-12 param 1) 1.0) (set! (-> a0-12 frame-num) 0.0) (joint-control-channel-group! a0-12 (the-as art-joint-anim (-> self draw art-group data 72)) num-func-seek!) ) @@ -676,7 +678,7 @@ (suspend) (let ((a0-13 (-> self skel root-channel 0))) (set! (-> a0-13 param 0) (the float (+ (-> a0-13 frame-group data 0 length) -1))) - (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-13 param 1) 1.0) (joint-control-channel-group-eval! a0-13 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -693,7 +695,7 @@ (set! (-> a0-20 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 53)) data 0 length) -1)) ) - (set! (-> a0-20 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-20 param 1) 1.0) (set! (-> a0-20 frame-num) 0.0) (joint-control-channel-group! a0-20 (the-as art-joint-anim (-> self draw art-group data 53)) num-func-seek!) ) @@ -701,7 +703,7 @@ (suspend) (let ((a0-21 (-> self skel root-channel 0))) (set! (-> a0-21 param 0) (the float (+ (-> a0-21 frame-group data 0 length) -1))) - (set! (-> a0-21 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-21 param 1) 1.0) (joint-control-channel-group-eval! a0-21 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -712,7 +714,7 @@ (set! (-> a0-23 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 52)) data 0 length) -1)) ) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (set! (-> a0-23 frame-num) 0.0) (joint-control-channel-group! a0-23 (the-as art-joint-anim (-> self draw art-group data 52)) num-func-seek!) ) @@ -720,7 +722,7 @@ (suspend) (let ((a0-24 (-> self skel root-channel 0))) (set! (-> a0-24 param 0) (the float (+ (-> a0-24 frame-group data 0 length) -1))) - (set! (-> a0-24 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-24 param 1) 1.0) (joint-control-channel-group-eval! a0-24 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -737,7 +739,7 @@ (set! (-> a0-30 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 79)) data 0 length) -1)) ) - (set! (-> a0-30 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-30 param 1) 1.0) (set! (-> a0-30 frame-num) 0.0) (joint-control-channel-group! a0-30 (the-as art-joint-anim (-> self draw art-group data 79)) num-func-seek!) ) @@ -745,7 +747,7 @@ (suspend) (let ((a0-31 (-> self skel root-channel 0))) (set! (-> a0-31 param 0) (the float (+ (-> a0-31 frame-group data 0 length) -1))) - (set! (-> a0-31 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-31 param 1) 1.0) (joint-control-channel-group-eval! a0-31 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -760,7 +762,7 @@ (set! (-> a0-37 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 85)) data 0 length) -1)) ) - (set! (-> a0-37 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-37 param 1) 1.0) (set! (-> a0-37 frame-num) 0.0) (joint-control-channel-group! a0-37 (the-as art-joint-anim (-> self draw art-group data 85)) num-func-seek!) ) @@ -768,7 +770,7 @@ (suspend) (let ((a0-38 (-> self skel root-channel 0))) (set! (-> a0-38 param 0) (the float (+ (-> a0-38 frame-group data 0 length) -1))) - (set! (-> a0-38 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-38 param 1) 1.0) (joint-control-channel-group-eval! a0-38 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -801,7 +803,7 @@ ) ) ) - (set! (-> s4-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s4-0 param 1) 1.0) (set! (-> s4-0 frame-num) 0.0) (joint-control-channel-group! s4-0 @@ -815,16 +817,12 @@ ) (until (ja-done? 0) (set! (-> self control unknown-float81) - (seek - (-> self control unknown-float81) - (-> (new 'static 'array float 1 0.0) 0) - (-> *display* seconds-per-frame) - ) + (seek (-> self control unknown-float81) (the-as float 0.0) (-> *display* seconds-per-frame)) ) (suspend) (let ((a0-50 (-> self skel root-channel 0))) (set! (-> a0-50 param 0) (the float (+ (-> a0-50 frame-group data 0 length) -1))) - (set! (-> a0-50 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-50 param 1) 1.0) (joint-control-channel-group-eval! a0-50 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -878,20 +876,21 @@ ) ) ) - (let ((f30-1 (cond - ((= (if (> (-> self skel active-channels) 0) - (-> self skel root-channel 0 frame-group) - ) - (-> self draw art-group data 23) - ) - (let ((f0-57 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) - (- f0-57 (* (the float (the int (/ f0-57 50.0))) 50.0)) - ) - ) - (else - (-> (new 'static 'array float 1 0.0) 0) - ) - ) + (let ((f30-1 (the-as float (cond + ((= (if (> (-> self skel active-channels) 0) + (-> self skel root-channel 0 frame-group) + ) + (-> self draw art-group data 23) + ) + (let ((f0-57 (+ 50.0 (* 0.8333333 (+ -25.0 (ja-aframe-num 0)))))) + (- f0-57 (* (the float (the int (/ f0-57 50.0))) 50.0)) + ) + ) + (else + 0.0 + ) + ) + ) ) ) (set! s5-0 45) @@ -924,7 +923,7 @@ (suspend) (let ((a0-92 (-> self skel root-channel 0))) (set! (-> a0-92 param 0) (the float (+ (-> a0-92 frame-group data 0 length) -1))) - (set! (-> a0-92 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-92 param 1) 1.0) (joint-control-channel-group-eval! a0-92 (the-as art-joint-anim #f) num-func-seek!) ) (let ((a0-93 (-> self skel root-channel 1))) @@ -955,7 +954,7 @@ (suspend) (let ((a0-99 (-> self skel root-channel 0))) (set! (-> a0-99 param 0) (the float (+ (-> a0-99 frame-group data 0 length) -1))) - (set! (-> a0-99 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-99 param 1) 1.0) (joint-control-channel-group-eval! a0-99 (the-as art-joint-anim #f) num-func-seek!) ) (let ((a0-100 (-> self skel root-channel 1))) @@ -1002,7 +1001,7 @@ (ground-tween-update gp-0 (-> self control unknown-float61) (-> self control unknown-float62)) (suspend) (let ((a0-115 (-> self skel root-channel 0))) - (set! (-> a0-115 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-115 param 0) 1.0) (joint-control-channel-group-eval! a0-115 (the-as art-joint-anim #f) num-func-loop!) ) (let ((a0-116 (-> self skel root-channel 1))) @@ -1099,7 +1098,7 @@ (set! (-> self control transv quad) (-> self control unknown-vector-array10 (-> self control unknown-int10) quad) ) - (set! (-> self control transv w) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control transv w) 1.0) (go target-turn-around) ) (slide-down-test) @@ -1109,12 +1108,7 @@ :code (behavior () (let ((f28-0 0.0) - (f30-0 (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01))) - ) - ) - ) + (f30-0 (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01)))))) (gp-0 #f) ) (cond @@ -1123,7 +1117,7 @@ ) (-> self draw art-group data 33) ) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (ja-channel-push! 7 15) ) ((= (if (> (-> self skel active-channels) 0) @@ -1132,17 +1126,14 @@ (-> self draw art-group data 69) ) (ja-channel-push! 7 22) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) ) ((= (if (> (-> self skel active-channels) 0) (-> self skel root-channel 0 frame-group) ) (-> self draw art-group data 51) ) - (let ((f30-1 - (fmax 0.8 (fmin (-> (new 'static 'array float 1 1.0) 0) (* 0.000048828126 (-> self control unknown-float01)))) - ) - ) + (let ((f30-1 (fmax 0.8 (fmin 1.0 (* 0.000048828126 (-> self control unknown-float01)))))) (cond ((and (rand-vu-percent? (the-as float 0.3)) (< 20480.0 (-> self control unknown-float01))) (let ((s5-0 (-> self skel root-channel 0))) @@ -1215,7 +1206,7 @@ ) ) (ja-channel-push! 7 15) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (set! f28-0 30.0) ) (else @@ -1226,7 +1217,7 @@ ) (cond ((or (= v1-108 (-> self draw art-group data 59)) (= v1-108 (-> self draw art-group data 60))) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (set! f28-0 30.0) (ja-channel-push! 7 45) ) @@ -1237,7 +1228,7 @@ ) (or (= v1-116 (-> self draw art-group data 84)) (= v1-116 (-> self draw art-group data 85))) ) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (set! f28-0 26.0) (ja-channel-push! 7 30) ) @@ -1306,15 +1297,16 @@ ) ) (cond - ((< (if (= s5-4 (-> self draw art-group data 34)) - (-> (new 'static 'array float 1 77824.0) 0) - (-> (new 'static 'array float 1 102400.0) 0) - ) + ((< (the-as float (if (= s5-4 (-> self draw art-group data 34)) + 77824.0 + 102400.0 + ) + ) f30-2 ) (let ((s5-5 (-> self skel root-channel 0))) (set! (-> s5-5 frame-group) (the-as art-joint-anim (-> self draw art-group data 28))) - (set! (-> s5-5 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-5 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-5 param 1) 1.00001) (set! (-> s5-5 frame-num) 0.0) (joint-control-channel-group! s5-5 (the-as art-joint-anim (-> self draw art-group data 28)) num-func-seek!) @@ -1322,29 +1314,30 @@ (until (ja-done? 0) (suspend) (let ((s5-6 (-> self skel root-channel 0))) - (set! (-> s5-6 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-6 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-6 param 1) 1.00001) (joint-control-channel-group-eval! s5-6 (the-as art-joint-anim #f) num-func-seek!) ) ) ) - ((< (if (= s5-4 (-> self draw art-group data 34)) - (-> (new 'static 'array float 1 61440.0) 0) - (-> (new 'static 'array float 1 102400.0) 0) - ) + ((< (the-as float (if (= s5-4 (-> self draw art-group data 34)) + 61440.0 + 102400.0 + ) + ) f30-2 ) (let ((s5-7 (-> self skel root-channel 0))) (set! (-> s5-7 frame-group) (the-as art-joint-anim (-> self draw art-group data 28))) - (set! (-> s5-7 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-7 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-7 param 1) 1.00001) - (set! (-> s5-7 frame-num) (ja-aframe (-> (new 'static 'array float 1 -1.0) 0) 0)) + (set! (-> s5-7 frame-num) (ja-aframe (the-as float -1.0) 0)) (joint-control-channel-group! s5-7 (the-as art-joint-anim (-> self draw art-group data 28)) num-func-seek!) ) (until (ja-done? 0) (suspend) (let ((s5-8 (-> self skel root-channel 0))) - (set! (-> s5-8 param 0) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> s5-8 param 0) (ja-aframe (the-as float 3.0) 0)) (set! (-> s5-8 param 1) 1.00001) (joint-control-channel-group-eval! s5-8 (the-as art-joint-anim #f) num-func-seek!) ) @@ -1382,7 +1375,7 @@ ) ) (set! f28-0 30.0) - (set! f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (set! f30-0 1.0) (ja-channel-set! 7) ) ((= (if (> (-> self skel active-channels) 0) @@ -1478,24 +1471,12 @@ (f26-1 0.0) ) (while #t - (let ((f22-0 (fmax - (-> (new 'static 'array float 1 -1.0) 0) - (fmin (-> (new 'static 'array float 1 1.0) 0) (* 2.0 (-> self control unknown-float61))) - ) - ) - (f24-0 (fmax - (-> (new 'static 'array float 1 -1.0) 0) - (fmin (-> (new 'static 'array float 1 1.0) 0) (* 1.6 (-> self control unknown-float62))) - ) - ) + (let ((f22-0 (fmax -1.0 (fmin 1.0 (* 2.0 (-> self control unknown-float61))))) + (f24-0 (fmax -1.0 (fmin 1.0 (* 1.6 (-> self control unknown-float62))))) ) (set! f30-0 (seek f30-0 - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -16384.0 (-> self control unknown-float01))))) (* 2.0 (-> *display* seconds-per-frame)) ) ) @@ -1614,13 +1595,13 @@ (behavior () (vector-turn-to (-> self control transv)) (set! (-> self control unknown-surface00) *turn-around-mods*) - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) (none) ) :exit (behavior () (target-state-hook-exit) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) (set! (-> self control unknown-float01) 0.0) (set-quaternion! (-> self control) (-> self control dir-targ)) (set! (-> self control unknown-float81) 0.0) @@ -1675,13 +1656,7 @@ (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!) ) (TODO-RENAME-9 (-> self align)) - (TODO-RENAME-10 - (-> self align) - 16 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (TODO-RENAME-10 (-> self align) 16 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0)) ) (remove-exit) (set! (-> self control unknown-float81) 0.0) @@ -1736,7 +1711,7 @@ (set! (-> a0-5 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) data 0 length) -1)) ) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (set! (-> a0-5 frame-num) 0.0) (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 31)) num-func-seek!) ) @@ -1744,7 +1719,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -1822,8 +1797,8 @@ (local-vars (v0-2 vector)) (let ((f30-0 (* 0.033333335 (the float (- (-> *display* base-frame-counter) (-> self state-time)))))) (cond - ((or (< (-> (new 'static 'array float 1 1.0) 0) f30-0) (< (-> self control unknown-float123) 0.0) (not arg2)) - (set! (-> self control unknown-float123) (-> (new 'static 'array float 1 -1.0) 0)) + ((or (< 1.0 f30-0) (< (-> self control unknown-float123) 0.0) (not arg2)) + (set! (-> self control unknown-float123) -1.0) ) (else (set! (-> self control unknown-float123) f30-0) @@ -1846,8 +1821,8 @@ (the-as float (-> self control unknown-uint20)) (the-as float (-> self control unknown-uint30)) f30-0 - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.0) + (the-as float 1.0) ) (vector-dot (-> self control dynam gravity-normal) s3-1) ) @@ -1914,9 +1889,9 @@ target-standard-event-handler :enter (behavior () - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) (set! (-> self control unknown-surface00) *duck-mods*) - (target-collide-set! 'duck (-> (new 'static 'array float 1 1.0) 0)) + (target-collide-set! 'duck (the-as float 1.0)) (none) ) :exit @@ -1931,7 +1906,7 @@ (target-state-hook-exit) ) (target-exit) - (target-collide-set! 'normal (-> (new 'static 'array float 1 0.0) 0)) + (target-collide-set! 'normal (the-as float 0.0)) (none) ) :trans @@ -1995,7 +1970,7 @@ (set! (-> a0-4 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 70)) data 0 length) -1)) ) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (set! (-> a0-4 frame-num) 0.0) (joint-control-channel-group! a0-4 (the-as art-joint-anim (-> self draw art-group data 70)) num-func-seek!) ) @@ -2003,7 +1978,7 @@ (suspend) (let ((a0-5 (-> self skel root-channel 0))) (set! (-> a0-5 param 0) (the float (+ (-> a0-5 frame-group data 0 length) -1))) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2030,7 +2005,7 @@ (set! (-> a0-19 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) data 0 length) -1)) ) - (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-19 param 1) 1.0) (set! (-> a0-19 frame-num) 0.0) (joint-control-channel-group! a0-19 (the-as art-joint-anim (-> self draw art-group data 30)) num-func-seek!) ) @@ -2038,7 +2013,7 @@ (suspend) (let ((a0-20 (-> self skel root-channel 0))) (set! (-> a0-20 param 0) (the float (+ (-> a0-20 frame-group data 0 length) -1))) - (set! (-> a0-20 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-20 param 1) 1.0) (joint-control-channel-group-eval! a0-20 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2050,7 +2025,7 @@ (set! (-> a0-22 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) data 0 length) -1)) ) - (set! (-> a0-22 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-22 param 1) 1.0) (set! (-> a0-22 frame-num) 0.0) (joint-control-channel-group! a0-22 (the-as art-joint-anim (-> self draw art-group data 31)) num-func-seek!) ) @@ -2058,7 +2033,7 @@ (suspend) (let ((a0-23 (-> self skel root-channel 0))) (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1))) - (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-23 param 1) 1.0) (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2074,8 +2049,8 @@ target-standard-event-handler :enter (behavior () - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) - (target-collide-set! 'duck (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) + (target-collide-set! 'duck (the-as float 1.0)) (if (not (= (if (> (-> self skel active-channels) 0) (-> self skel root-channel 0 frame-group) ) @@ -2175,12 +2150,10 @@ ) (let ((a0-18 (-> self skel root-channel 0))) (set! (-> a0-18 param 0) - (fmin - (-> (new 'static 'array float 1 1.0) 0) - (/ (-> self control unknown-float01) - (* 60.0 (/ (-> *TARGET-bank* duck-walk-cycle-dist) (-> *TARGET-bank* run-cycle-length))) - ) - ) + (fmin 1.0 (/ (-> self control unknown-float01) + (* 60.0 (/ (-> *TARGET-bank* duck-walk-cycle-dist) (-> *TARGET-bank* run-cycle-length))) + ) + ) ) (joint-control-channel-group-eval! a0-18 (the-as art-joint-anim #f) num-func-loop!) ) @@ -2255,20 +2228,10 @@ ) (set! (-> self control unknown-surface00) arg2) (set! (-> self control unknown-float123) - (fmax - 0.0 - (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.00004359654 (+ -11468.8 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.00004359654 (+ -11468.8 (-> self control unknown-float01))))) ) (set! (-> self control unknown-float122) - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))))) ) (none) ) @@ -2316,7 +2279,7 @@ (the-as float 65502.96) (the-as float -163840.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -2327,11 +2290,7 @@ (set! (-> self control unknown-float122) (seek (-> self control unknown-float122) - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))))) (-> *display* seconds-per-frame) ) ) @@ -2361,7 +2320,7 @@ (suspend) (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 frame-group) (the-as art-joint-anim (-> self draw art-group data 34))) - (set! (-> a0-4 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 0) 1.0) (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-+!) ) (let ((a0-5 (-> self skel root-channel 1))) @@ -2382,13 +2341,14 @@ ) (set! (-> gp-1 param 0) (the float (+ (-> gp-1 frame-group data 0 length) -1))) (let ((v1-45 (and (< 0.0 f30-0) (< 0.0 f0-8)))) - (set! (-> gp-1 param 1) (if v1-45 - (fmin - (fmin (-> (new 'static 'array float 1 3.0) 0) f0-8) - (/ (* 5.0 f0-8) (the float (time-to-apex f30-0 (the-as float -245760.0)))) - ) - (-> (new 'static 'array float 1 1.0) 0) - ) + (set! (-> gp-1 param 1) + (the-as + float + (if v1-45 + (fmin (fmin 3.0 f0-8) (/ (* 5.0 f0-8) (the float (time-to-apex f30-0 (the-as float -245760.0))))) + 1.0 + ) + ) ) ) (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!) @@ -2428,8 +2388,8 @@ (set! (-> gp-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1)) ) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) - (set! (-> gp-0 frame-num) (ja-aframe (-> (new 'static 'array float 1 3.0) 0) 0)) + (set! (-> gp-0 param 1) 1.0) + (set! (-> gp-0 frame-num) (ja-aframe (the-as float 3.0) 0)) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!) ) (until (ja-done? 0) @@ -2437,13 +2397,13 @@ (suspend) (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 param 0) (the float (+ (-> a0-4 frame-group data 0 length) -1))) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!) ) ) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-6 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 0) 1.0) (set! (-> a0-6 frame-num) 0.0) (joint-control-channel-group! a0-6 (the-as art-joint-anim (-> self draw art-group data 38)) num-func-loop!) ) @@ -2451,7 +2411,7 @@ (suspend) (let ((a0-7 (-> self skel root-channel 0))) (set! (-> a0-7 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-7 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-7 param 0) 1.0) (joint-control-channel-group-eval! a0-7 (the-as art-joint-anim (-> self draw art-group data 38)) @@ -2515,7 +2475,7 @@ (the-as float 33775.48) (the-as float -122880.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -2527,11 +2487,7 @@ (set! (-> self control unknown-float122) (seek (-> self control unknown-float122) - (fmax 0.0 (fmin - (-> (new 'static 'array float 1 1.0) 0) - (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))) - ) - ) + (fmax 0.0 (fmin 1.0 (* 0.000048828126 (+ -10240.0 (-> self control unknown-float01))))) (-> *display* seconds-per-frame) ) ) @@ -2540,13 +2496,13 @@ :code (behavior ((arg0 float) (arg1 float)) (ja-channel-push! 2 15) - (dummy-10 (-> self skel effect) 'jump-double (-> (new 'static 'array float 1 -1.0) 0) -1) + (dummy-10 (-> self skel effect) 'jump-double (the-as float -1.0) -1) (let ((gp-0 (-> self skel root-channel 0))) (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 34))) (set! (-> gp-0 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1)) ) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (set! (-> gp-0 frame-num) (ja-aframe (the-as float 5.0) 0)) (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!) ) @@ -2563,7 +2519,7 @@ (suspend) (let ((a0-6 (-> self skel root-channel 0))) (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1))) - (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-6 param 1) 1.0) (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!) ) (let ((a0-7 (-> self skel root-channel 1))) @@ -2654,7 +2610,7 @@ (the-as float 33775.48) (the-as float -122880.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -2664,10 +2620,7 @@ (set! (-> self control unknown-float122) (seek (-> self control unknown-float122) - (fmax - 0.0 - (fmin (-> (new 'static 'array float 1 1.0) 0) (* 0.00012207031 (+ -2048.0 (-> self control unknown-float01)))) - ) + (fmax 0.0 (fmin 1.0 (* 0.00012207031 (+ -2048.0 (-> self control unknown-float01))))) (-> *display* seconds-per-frame) ) ) @@ -2708,7 +2661,7 @@ (let ((s3-0 (-> self skel root-channel 0))) (set! (-> s3-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 42))) (set! (-> s3-0 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-0 param 1) 1.0) (set! (-> s3-0 frame-num) 0.0) (joint-control-channel-group! s3-0 (the-as art-joint-anim (-> self draw art-group data 42)) num-func-seek!) ) @@ -2716,7 +2669,7 @@ (suspend) (let ((s3-1 (-> self skel root-channel 0))) (set! (-> s3-1 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-1 param 1) 1.0) (joint-control-channel-group-eval! s3-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2725,7 +2678,7 @@ (let ((s3-2 (-> self skel root-channel 0))) (set! (-> s3-2 frame-group) (the-as art-joint-anim (-> self draw art-group data 41))) (set! (-> s3-2 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-2 param 1) 1.0) (set! (-> s3-2 frame-num) 0.0) (joint-control-channel-group! s3-2 (the-as art-joint-anim (-> self draw art-group data 41)) num-func-seek!) ) @@ -2733,7 +2686,7 @@ (suspend) (let ((s3-3 (-> self skel root-channel 0))) (set! (-> s3-3 param 0) (ja-aframe (the-as float 16.0) 0)) - (set! (-> s3-3 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s3-3 param 1) 1.0) (joint-control-channel-group-eval! s3-3 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -2778,16 +2731,12 @@ ) ) ) - (f28-0 (-> (new 'static 'array float 1 1.0) 0)) + (f28-0 1.0) ) (until (ja-done? 0) (let* ((f24-0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) (f26-0 (- f30-0 (ja-aframe-num 0))) - (f22-1 (fmin - (fmin (-> (new 'static 'array float 1 3.0) 0) f26-0) - (/ (* 5.0 f26-0) (the float (time-to-apex f24-0 (the-as float -245760.0)))) - ) - ) + (f22-1 (fmin (fmin 3.0 f26-0) (/ (* 5.0 f26-0) (the float (time-to-apex f24-0 (the-as float -245760.0)))))) (s5-0 (-> self skel root-channel 0)) ) (set! (-> s5-0 param 0) (the float (+ (-> s5-0 frame-group data 0 length) -1))) @@ -2834,7 +2783,7 @@ (else (let ((a0-9 (-> self skel root-channel 0))) (set! (-> a0-9 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-9 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-9 param 0) 1.0) (set! (-> a0-9 frame-num) 0.0) (joint-control-channel-group! a0-9 (the-as art-joint-anim (-> self draw art-group data 38)) num-func-loop!) ) @@ -2842,7 +2791,7 @@ (suspend) (let ((a0-10 (-> self skel root-channel 0))) (set! (-> a0-10 frame-group) (the-as art-joint-anim (-> self draw art-group data 38))) - (set! (-> a0-10 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 0) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim (-> self draw art-group data 38)) @@ -2906,7 +2855,7 @@ ) (or (= v1-4 (-> self draw art-group data 42)) (= v1-4 (-> self draw art-group data 43))) ) - (dummy-10 (-> self skel effect) 'group-blue-hit-ground-effect (-> (new 'static 'array float 1 0.0) 0) -1) + (dummy-10 (-> self skel effect) 'group-blue-hit-ground-effect (the-as float 0.0) -1) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.3)) ) (else @@ -2932,7 +2881,7 @@ (set! (-> self control unknown-dword31) 0) (set! (-> self control unknown-dword33) 0) (if (>= (-> self control ground-impact-vel) (-> *TARGET-bank* fall-stumble-threshold)) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) ) (if (!= (-> self control ground-pat material) (pat-material ice)) (delete-back-vel) @@ -2941,11 +2890,11 @@ (start-bobbing! (-> self water) (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 4096.0) (-> self control ground-impact-vel) (the-as float 40960.0) - (-> (new 'static 'array float 1 102400.0) 0) + (the-as float 102400.0) ) 600 1500 @@ -3030,7 +2979,7 @@ ) (until (ja-done? 0) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 74) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3132,7 +3081,7 @@ :enter (behavior () (if (or (and (= (-> self fact-info-target eco-type) (pickup-type eco-yellow)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (< (- (-> *display* base-frame-counter) (-> self control unknown-dword82)) (seconds 1.5)) ) @@ -3148,7 +3097,7 @@ (target-start-attack) (target-danger-set! 'punch #f) (if (or (< (fabs (-> self control unknown-float62)) 0.3) (< 0.3 (fabs (-> self control unknown-float61)))) - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) ) (none) ) @@ -3234,7 +3183,7 @@ ) ) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3266,7 +3215,7 @@ (set! (-> self control dynam gravity-max) 368640.0) (set! (-> self control dynam gravity-length) 368640.0) (let ((f28-0 0.0) - (f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (f30-0 1.0) (gp-2 0) ) (until (ja-done? 0) @@ -3304,7 +3253,7 @@ (the-as uint 12) ) ) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) ) ((and (zero? (logand (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) button0-abs 0) (pad-buttons square) @@ -3343,7 +3292,7 @@ (set! (-> *run-attack-mods* turnvv) 0.0) ) (if (< 2 gp-2) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) ) (+! gp-2 1) ) @@ -3491,7 +3440,7 @@ (set! (-> self control dynam gravity-length) (-> self control unknown-dynamics00 gravity-length)) ) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 70) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3513,23 +3462,17 @@ (set! (-> a0-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 56)) data 0 length) -1)) ) - (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-2 param 1) 1.0) (set! (-> a0-2 frame-num) 0.0) (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 56)) num-func-seek!) ) (until (ja-done? 0) (TODO-RENAME-9 (-> self align)) - (TODO-RENAME-10 - (-> self align) - 16 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - ) + (TODO-RENAME-10 (-> self align) 16 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0)) (suspend) (let ((a0-5 (-> self skel root-channel 0))) (set! (-> a0-5 param 0) (the float (+ (-> a0-5 frame-group data 0 length) -1))) - (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-5 param 1) 1.0) (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -3557,7 +3500,7 @@ ) (suspend) (let ((a0-10 (-> self skel root-channel 0))) - (set! (-> a0-10 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-10 param 0) 1.0) (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-loop!) ) (set! f0-8 (target-height-above-ground)) @@ -3569,7 +3512,7 @@ (set! (-> a0-13 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 58)) data 0 length) -1)) ) - (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-13 param 1) 1.0) (set! (-> a0-13 frame-num) 0.0) (joint-control-channel-group! a0-13 (the-as art-joint-anim (-> self draw art-group data 58)) num-func-seek!) ) @@ -3601,7 +3544,7 @@ (suspend) (let ((a0-20 (-> self skel root-channel 0))) (set! (-> a0-20 param 0) (the float (+ (-> a0-20 frame-group data 0 length) -1))) - (set! (-> a0-20 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-20 param 1) 1.0) (joint-control-channel-group-eval! a0-20 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -3638,11 +3581,12 @@ ) (set! (-> s4-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 62))) (set! (-> s4-0 param 0) (ja-aframe (the-as float 7.0) 0)) - (set! (-> s4-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) - (set! (-> s4-0 frame-num) (if s3-0 - (ja-aframe (the-as float 5.0) 0) - (-> (new 'static 'array float 1 0.0) 0) - ) + (set! (-> s4-0 param 1) 1.0) + (set! (-> s4-0 frame-num) (the-as float (if s3-0 + (ja-aframe (the-as float 5.0) 0) + 0.0 + ) + ) ) (joint-control-channel-group! s4-0 (the-as art-joint-anim (-> self draw art-group data 62)) num-func-seek!) ) @@ -3650,7 +3594,7 @@ (suspend) (let ((s4-1 (-> self skel root-channel 0))) (set! (-> s4-1 param 0) (ja-aframe (the-as float 7.0) 0)) - (set! (-> s4-1 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> s4-1 param 1) 1.0) (joint-control-channel-group-eval! s4-1 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -3703,7 +3647,7 @@ (the-as float 65502.96) (the-as float -163840.0) (the-as float (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (-> (new 'static 'array float 1 0.0) 0) + 0.0 68812.8 ) ) @@ -3722,7 +3666,7 @@ ) (mod-var-jump #t #t (cpad-hold? (-> self control unknown-cpad-info00 number) x) (-> self control transv)) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) @@ -3762,13 +3706,7 @@ ) ) ) - (s5-0 - gp-0 - a1-2 - (-> (new 'static 'array float 1 1.0) 0) - (the-as float 0.95) - (-> (new 'static 'array float 1 1.0) 0) - ) + (s5-0 gp-0 a1-2 (the-as float 1.0) (the-as float 0.95) (the-as float 1.0)) ) ) (go target-falling #f) @@ -3792,7 +3730,7 @@ ) (cond ((< 6144.0 (target-height-above-ground)) - (dummy-10 (-> self skel effect) 'swim-flop (-> (new 'static 'array float 1 -1.0) 0) -1) + (dummy-10 (-> self skel effect) 'swim-flop (the-as float -1.0) -1) (let ((t9-3 enter-state)) (set! (-> self next-state) target-swim-down) ((the-as (function object :behavior target) t9-3)) @@ -3817,7 +3755,7 @@ :enter (behavior ((arg0 float) (arg1 float) (arg2 float)) (if (and (= (-> self fact-info-target eco-type) (pickup-type eco-yellow)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (go target-yellow-jump-blast) ) @@ -3882,7 +3820,7 @@ (when gp-1 (logior! (-> self control status) 1) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5)) (dummy-10 (-> self skel effect) 'group-red-eco-strike-ground (ja-frame-num 0) 0) @@ -3918,7 +3856,7 @@ ) ) (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (dummy-10 (-> self skel effect) @@ -3952,7 +3890,7 @@ (set! (-> a0-2 param 0) (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 63)) data 0 length) -1)) ) - (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-2 param 1) 1.0) (set! (-> a0-2 frame-num) 0.0) (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 63)) num-func-seek!) ) @@ -3970,20 +3908,20 @@ (suspend) (let ((a0-4 (-> self skel root-channel 0))) (set! (-> a0-4 param 0) (the float (+ (-> a0-4 frame-group data 0 length) -1))) - (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-4 param 1) 1.0) (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!) ) (let ((gp-0 (-> self skel root-channel 1))) (set! (-> gp-0 frame-interp) (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.0) + (the-as float 1.0) (-> self control unknown-float01) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 40960.0) ) ) (set! (-> gp-0 param 0) (the float (+ (-> gp-0 frame-group data 0 length) -1))) - (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> gp-0 param 1) 1.0) (joint-control-channel-group-eval! gp-0 (the-as art-joint-anim #f) num-func-seek!) ) ) @@ -4006,7 +3944,7 @@ ) (set! (-> gp-2 frame-num) 0.0) ) - (let ((f30-0 (-> (new 'static 'array float 1 1.0) 0))) + (let ((f30-0 1.0)) (let ((gp-3 (new-stack-vector0))) (let ((f0-18 (vector-dot (-> self control dynam gravity-normal) (-> self control unknown-vector120)))) 0.0 @@ -4047,22 +3985,22 @@ (while #t (+! (-> self control unknown-uint20) 1) (let ((a0-30 (-> self skel root-channel 0))) - (set! (-> a0-30 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-30 param 0) 1.0) (joint-control-channel-group-eval! a0-30 (the-as art-joint-anim #f) num-func-+!) ) (let ((gp-5 (-> self skel root-channel 1))) (set! (-> gp-5 frame-interp) (lerp-scale - (-> (new 'static 'array float 1 0.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 0.0) + (the-as float 1.0) (-> self control unknown-float01) - (-> (new 'static 'array float 1 0.0) 0) + (the-as float 0.0) (the-as float 40960.0) ) ) (set! (-> gp-5 param 0) 0.0) (joint-control-channel-group-eval! gp-5 (the-as art-joint-anim #f) num-func-chan) ) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) (let ((gp-6 (new-stack-vector0)) (f28-0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) @@ -4124,7 +4062,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.1)) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self control unknown-uint20) (the-as uint arg0)) - (set-forward-vel (-> (new 'static 'array float 1 0.0) 0)) + (set-forward-vel (the-as float 0.0)) (set! (-> self control unknown-surface00) *flop-land-mods*) (set! (-> *flop-land-mods* flags) (logand -1025 (-> *flop-land-mods* flags))) (set! (-> self state-flags) (logior #x100000 (-> self state-flags))) @@ -4140,7 +4078,7 @@ ) ) (when (and (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) - (>= (-> self fact-info-target eco-level) (-> (new 'static 'array float 1 1.0) 0)) + (>= (-> self fact-info-target eco-level) 1.0) ) (< (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.25)) ) @@ -4198,7 +4136,7 @@ ) ) (if (or (< (fabs (-> self control unknown-float62)) 0.3) (< 0.3 (fabs (-> self control unknown-float61)))) - (set! (-> self control unknown-float81) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> self control unknown-float81) 1.0) ) (set! (-> self control unknown-uint20) (the-as uint 0)) (set! (-> self control unknown-int21) 0) @@ -4219,7 +4157,7 @@ (let ((gp-0 0)) 0 (let ((s5-0 0) - (f30-0 (-> (new 'static 'array float 1 1.0) 0)) + (f30-0 1.0) ) (ja-channel-push! 1 12) (let ((s4-0 (-> self skel root-channel 0))) @@ -4260,13 +4198,7 @@ ((nonzero? s5-0) ) (else - (TODO-RENAME-10 - (-> self align) - 4 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) - f30-0 - ) + (TODO-RENAME-10 (-> self align) 4 (the-as float 1.0) (the-as float 1.0) f30-0) (let ((s4-1 (new-stack-vector0))) (vector-matrix*! s4-1 (-> self control transv) (-> self control unknown-matrix00)) (set! (-> s4-1 y) 0.0) @@ -4277,10 +4209,10 @@ (suspend) (let ((a0-15 (-> self skel root-channel 0))) (set! (-> a0-15 param 0) (the float (+ (-> a0-15 frame-group data 0 length) -1))) - (set! (-> a0-15 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-15 param 1) 1.0) (joint-control-channel-group-eval! a0-15 (the-as art-joint-anim #f) num-func-seek!) ) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) ) ) (if (and (or (< (- (-> *display* base-frame-counter) (the-as time-frame gp-0)) (-> *TARGET-bank* wheel-jump-pre-window)) @@ -4372,9 +4304,9 @@ ) (set! (-> s4-0 frame-num) 0.0) ) - (let ((f30-0 (-> (new 'static 'array float 1 1.0) 0))) + (let ((f30-0 1.0)) (until (or (ja-max? 0) (and (>= (ja-aframe-num 0) 4.0) (logtest? (-> self control status) 1))) - (when (and (>= (ja-aframe-num 0) (-> (new 'static 'array float 1 3.0) 0)) (not (-> self control unknown-symbol30))) + (when (and (>= (ja-aframe-num 0) 3.0) (not (-> self control unknown-symbol30))) (set! (-> self event-hook) target-dangerous-event-handler) (target-start-attack) (target-danger-set! 'flip #f) @@ -4384,15 +4316,15 @@ (TODO-RENAME-10 (-> self align) 6 - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) (/ arg0 (-> *TARGET-bank* wheel-flip-art-height)) (* f30-0 (/ arg1 (-> *TARGET-bank* wheel-flip-art-dist))) ) (TODO-RENAME-10 (-> self align) 4 - (-> (new 'static 'array float 1 1.0) 0) - (-> (new 'static 'array float 1 1.0) 0) + (the-as float 1.0) + (the-as float 1.0) (* f30-0 (/ arg1 (-> *TARGET-bank* wheel-flip-art-dist))) ) ) @@ -4404,10 +4336,10 @@ (suspend) (let ((a0-11 (-> self skel root-channel 0))) (set! (-> a0-11 param 0) (the float (+ (-> a0-11 frame-group data 0 length) -1))) - (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-11 param 1) 1.0) (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!) ) - (set! f30-0 (* f30-0 (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self control unknown-float140)))) + (set! f30-0 (* f30-0 (fmin 1.0 (-> self control unknown-float140)))) ) ) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -4454,7 +4386,7 @@ (-> self draw art-group data 38) ) (let ((a0-35 (-> self skel root-channel 0))) - (set! (-> a0-35 param 0) (-> (new 'static 'array float 1 1.0) 0)) + (set! (-> a0-35 param 0) 1.0) (joint-control-channel-group-eval! a0-35 (the-as art-joint-anim #f) num-func-loop!) ) )