diff --git a/decompiler/IR2/Form.cpp b/decompiler/IR2/Form.cpp index 047f39e331..97b89c3e50 100644 --- a/decompiler/IR2/Form.cpp +++ b/decompiler/IR2/Form.cpp @@ -3210,8 +3210,8 @@ goos::Object DefpartgroupElement::to_form_internal(const Env& env) const { if (m_static_info.rot != 0) { forms.push_back(pretty_print::to_symbol(fmt::format( ":rotate ((degrees {}) (degrees {}) (degrees {}))", - meters_to_string(m_static_info.rot.x()), meters_to_string(m_static_info.rot.y()), - meters_to_string(m_static_info.rot.z())))); + degrees_to_string(m_static_info.rot.x()), degrees_to_string(m_static_info.rot.y()), + degrees_to_string(m_static_info.rot.z())))); } if (m_static_info.scale != 1) { forms.push_back(pretty_print::to_symbol(fmt::format( diff --git a/game/graphics/opengl_renderer/DirectRenderer.cpp b/game/graphics/opengl_renderer/DirectRenderer.cpp index 90e8f81e63..81e9f98600 100644 --- a/game/graphics/opengl_renderer/DirectRenderer.cpp +++ b/game/graphics/opengl_renderer/DirectRenderer.cpp @@ -329,7 +329,8 @@ void DirectRenderer::update_gl_texture(SharedRenderState* render_state, int unit lg::warn("Failed to find texture at {}, using random (eye zone)", state.texture_base_ptr); tex = render_state->texture_pool->get_placeholder_texture(); } else { - lg::warn("Failed to find texture at {}, using random", state.texture_base_ptr); + lg::warn("Failed to find texture at {}, using random (direct: {})", state.texture_base_ptr, + name_and_id()); tex = render_state->texture_pool->get_placeholder_texture(); } } diff --git a/game/graphics/opengl_renderer/DirectRenderer2.cpp b/game/graphics/opengl_renderer/DirectRenderer2.cpp index 5d092dca28..03fc046f89 100644 --- a/game/graphics/opengl_renderer/DirectRenderer2.cpp +++ b/game/graphics/opengl_renderer/DirectRenderer2.cpp @@ -357,7 +357,7 @@ void DirectRenderer2::setup_opengl_tex(u16 unit, lg::warn("Failed to find texture at {}, using random (eye zone)", tbp_to_lookup); tex = render_state->texture_pool->get_placeholder_texture(); } else { - lg::warn("Failed to find texture at {}, using random", tbp_to_lookup); + lg::warn("Failed to find texture at {}, using random (direct2: {})", tbp_to_lookup, m_name); tex = render_state->texture_pool->get_placeholder_texture(); } } diff --git a/game/graphics/opengl_renderer/EyeRenderer.cpp b/game/graphics/opengl_renderer/EyeRenderer.cpp index d1f2089443..678486a1a2 100644 --- a/game/graphics/opengl_renderer/EyeRenderer.cpp +++ b/game/graphics/opengl_renderer/EyeRenderer.cpp @@ -23,7 +23,8 @@ void EyeRenderer::init_textures(TexturePool& texture_pool, GameVersion version) tbp += EYE_BASE_BLOCK_JAK1; break; case GameVersion::Jak2: - tbp += EYE_BASE_BLOCK_JAK2; + // NOTE: using jak 1's address because jak 2's breaks some ocean stuff. + tbp += EYE_BASE_BLOCK_JAK1; break; default: ASSERT_NOT_REACHED(); diff --git a/game/graphics/opengl_renderer/foreground/Generic2_OpenGL.cpp b/game/graphics/opengl_renderer/foreground/Generic2_OpenGL.cpp index c165c1d26c..b1bf087422 100644 --- a/game/graphics/opengl_renderer/foreground/Generic2_OpenGL.cpp +++ b/game/graphics/opengl_renderer/foreground/Generic2_OpenGL.cpp @@ -228,7 +228,8 @@ void Generic2::setup_opengl_tex(u16 unit, lg::warn("Failed to find texture at {}, using random (eye zone)", tbp_to_lookup); tex = render_state->texture_pool->get_placeholder_texture(); } else { - lg::warn("Failed to find texture at {}, using random", tbp_to_lookup); + lg::warn("Failed to find texture at {}, using random (generic2: {})", tbp_to_lookup, + name_and_id()); tex = render_state->texture_pool->get_placeholder_texture(); } } diff --git a/goal_src/jak2/engine/common_objs/voicebox.gc b/goal_src/jak2/engine/common_objs/voicebox.gc index 255a71a67e..6e22434fea 100644 --- a/goal_src/jak2/engine/common_objs/voicebox.gc +++ b/goal_src/jak2/engine/common_objs/voicebox.gc @@ -11,7 +11,7 @@ :id 77 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 265 :flags (is-3d bit6 bit7) :period 130 :length 30) (sp-item 265 :flags (is-3d bit6 bit7) :period 150 :length 35 :offset 5) (sp-item 265 :flags (is-3d bit6 bit7) :period 330 :length 25 :offset 35) diff --git a/goal_src/jak2/engine/debug/part-tester.gc b/goal_src/jak2/engine/debug/part-tester.gc index 8aef7abbbc..e4a5be52d0 100644 --- a/goal_src/jak2/engine/debug/part-tester.gc +++ b/goal_src/jak2/engine/debug/part-tester.gc @@ -20,7 +20,7 @@ :id 127 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 640) - :rotate ((degrees 2) (degrees 0) (degrees 0)) + :rotate ((degrees 45) (degrees 0) (degrees 0)) :parts ((sp-item 209)) ) diff --git a/goal_src/jak2/engine/target/board/board-part.gc b/goal_src/jak2/engine/target/board/board-part.gc index 37f56d67e7..3973f05177 100644 --- a/goal_src/jak2/engine/target/board/board-part.gc +++ b/goal_src/jak2/engine/target/board/board-part.gc @@ -149,7 +149,7 @@ :duration (seconds 50) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 8) (degrees 4)) + :rotate ((degrees 90) (degrees 180) (degrees 90)) :parts ((sp-item 436 :flags (is-3d launch-asap bit6 bit7)) (sp-item 437 :flags (is-3d launch-asap bit6 bit7)) (sp-item 438 :flags (launch-asap bit6)) diff --git a/goal_src/jak2/levels/atoll/atoll-scenes.gc b/goal_src/jak2/levels/atoll/atoll-scenes.gc index 871ef22696..ff40193c5b 100644 --- a/goal_src/jak2/levels/atoll/atoll-scenes.gc +++ b/goal_src/jak2/levels/atoll/atoll-scenes.gc @@ -63,7 +63,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 32) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1414 :flags (bit7)) (sp-item 1415 :flags (bit7))) ) diff --git a/goal_src/jak2/levels/castle/boss/casboss-part.gc b/goal_src/jak2/levels/castle/boss/casboss-part.gc index 000ecc9d97..e24e0c0587 100644 --- a/goal_src/jak2/levels/castle/boss/casboss-part.gc +++ b/goal_src/jak2/levels/castle/boss/casboss-part.gc @@ -113,7 +113,7 @@ :id 1215 :flags (unk-4 unk-6 unk-7) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :scale (0.0 -16384.0 0.0) :parts ((sp-item 5203 :fade-after (meters 300) :falloff-to (meters 300) :flags (bit7))) ) diff --git a/goal_src/jak2/levels/city/common/ctywide-obs.gc b/goal_src/jak2/levels/city/common/ctywide-obs.gc index 4d482d0bb8..b0054ce130 100644 --- a/goal_src/jak2/levels/city/common/ctywide-obs.gc +++ b/goal_src/jak2/levels/city/common/ctywide-obs.gc @@ -753,7 +753,7 @@ This commonly includes things such as: :id 185 :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 6) - :rotate ((degrees 1.3333334) (degrees 0) (degrees 0)) + :rotate ((degrees 30) (degrees 0) (degrees 0)) :parts ((sp-item 856 :flags (launch-asap bit7)) (sp-item 857 :flags (launch-asap bit7)) (sp-item 858 :flags (launch-asap bit7)) @@ -3111,17 +3111,9 @@ This commonly includes things such as: (or (= (-> gp-0 action) (game-task-action show)) (= (-> gp-0 action) (game-task-action menu))) (and (burning-bush-method-32 self) (can-display-query? self (the-as string #f) -99.0)) ) - (let ((s5-1 (new - 'stack - 'font-context - *font-default-matrix* - 32 - 280 - 0.0 - (font-color default) - (font-flags shadow kerning) - ) - ) + (let ((s5-1 + (new 'stack 'font-context *font-default-matrix* 32 280 0.0 (font-color default) (font-flags shadow kerning)) + ) ) (set! (-> s5-1 flags) (font-flags shadow kerning large)) (let ((v1-37 s5-1)) diff --git a/goal_src/jak2/levels/city/common/ctywide-part.gc b/goal_src/jak2/levels/city/common/ctywide-part.gc index 9a108fe107..2b18ad045b 100644 --- a/goal_src/jak2/levels/city/common/ctywide-part.gc +++ b/goal_src/jak2/levels/city/common/ctywide-part.gc @@ -984,7 +984,7 @@ :id 182 :flags (unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 4)) + :rotate ((degrees 90) (degrees 0) (degrees 90)) :parts ((sp-item 844) (sp-item 845) (sp-item 846 :flags (bit7))) ) diff --git a/goal_src/jak2/levels/city/common/ctywide-scenes.gc b/goal_src/jak2/levels/city/common/ctywide-scenes.gc index 8501eb7d79..9105dc73b6 100644 --- a/goal_src/jak2/levels/city/common/ctywide-scenes.gc +++ b/goal_src/jak2/levels/city/common/ctywide-scenes.gc @@ -429,7 +429,7 @@ :id 191 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 899 :flags (is-3d bit6 bit7) :period 130 :length 30) (sp-item 899 :flags (is-3d bit6 bit7) :period 150 :length 35 :offset 5) (sp-item 899 :flags (is-3d bit6 bit7) :period 330 :length 25 :offset 35) @@ -465,8 +465,8 @@ :init-specs ((sp-flt spt-fade-a -0.32)) ) -(defskelgroup skel-seal-of-mar-top seal-of-mar-top 0 -1 - ((1 (meters 999999))) +(defskelgroup skel-seal-of-mar-top seal-of-mar-top seal-of-mar-top-lod0-jg -1 + ((seal-of-mar-top-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) diff --git a/goal_src/jak2/levels/city/common/vehicle-part.gc b/goal_src/jak2/levels/city/common/vehicle-part.gc index bf886b2893..2281ad2226 100644 --- a/goal_src/jak2/levels/city/common/vehicle-part.gc +++ b/goal_src/jak2/levels/city/common/vehicle-part.gc @@ -316,7 +316,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 784 :flags (bit6) :period 900 :length 5) (sp-item 785 :flags (bit6) :period 900 :length 5) (sp-item 786 :period 900 :length 15) @@ -617,7 +617,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 801 :flags (bit7) :period 300 :length 5) (sp-item 802 :flags (bit7) :period 300 :length 160) (sp-item 802 :flags (bit7) :period 300 :length 100) diff --git a/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc b/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc index be8904a26c..06eb92843f 100644 --- a/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc +++ b/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc @@ -12,7 +12,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4462 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4463 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4464 :fade-after (meters 40) :falloff-to (meters 60) :flags (bit7) :period 1200 :length 15) @@ -234,7 +234,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4470 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4471 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) (sp-item 4472 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) @@ -314,7 +314,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4476 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4477 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4478 :fade-after (meters 40) :falloff-to (meters 60) :flags (bit7) :period 1200 :length 15) @@ -493,7 +493,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4470 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4471 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) (sp-item 4472 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) @@ -613,7 +613,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4482 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4483 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4484 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) diff --git a/goal_src/jak2/levels/city/generic/ctygena-part.gc b/goal_src/jak2/levels/city/generic/ctygena-part.gc index 74a91ec604..1cae8d69f3 100644 --- a/goal_src/jak2/levels/city/generic/ctygena-part.gc +++ b/goal_src/jak2/levels/city/generic/ctygena-part.gc @@ -185,7 +185,7 @@ :id 824 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 128) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 3575 :flags (is-3d bit7)) (sp-item 3576 :fade-after (meters 400) :flags (bit6) :hour-mask #b111111111110000000) ) @@ -278,7 +278,7 @@ :id 826 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3579 :flags (is-3d launch-asap bit7)) (sp-item 3580 :flags (is-3d launch-asap bit7)) (sp-item 3581 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -356,7 +356,7 @@ :id 827 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3582 :flags (is-3d launch-asap bit7)) (sp-item 3583 :flags (is-3d launch-asap bit7)) (sp-item 3584 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -434,7 +434,7 @@ :id 828 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3585 :flags (is-3d launch-asap bit7)) (sp-item 3586 :flags (is-3d launch-asap bit7)) (sp-item 3587 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) diff --git a/goal_src/jak2/levels/city/generic/ctygenb-part.gc b/goal_src/jak2/levels/city/generic/ctygenb-part.gc index eaaa5b29df..eded108dd9 100644 --- a/goal_src/jak2/levels/city/generic/ctygenb-part.gc +++ b/goal_src/jak2/levels/city/generic/ctygenb-part.gc @@ -342,7 +342,7 @@ :id 839 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 3641 :fade-after (meters 200) :falloff-to (meters 250) :flags (bit7))) ) @@ -420,7 +420,7 @@ :id 841 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3644 :flags (is-3d launch-asap bit7)) (sp-item 3645 :flags (is-3d launch-asap bit7)) (sp-item 3646 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -498,7 +498,7 @@ :id 842 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3647 :flags (is-3d launch-asap bit7)) (sp-item 3648 :flags (is-3d launch-asap bit7)) (sp-item 3649 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -576,7 +576,7 @@ :id 843 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3650 :flags (is-3d launch-asap bit7)) (sp-item 3651 :flags (is-3d launch-asap bit7)) (sp-item 3652 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) diff --git a/goal_src/jak2/levels/city/generic/ctygenc-part.gc b/goal_src/jak2/levels/city/generic/ctygenc-part.gc index f1ea7e8f49..1de4f79a3c 100644 --- a/goal_src/jak2/levels/city/generic/ctygenc-part.gc +++ b/goal_src/jak2/levels/city/generic/ctygenc-part.gc @@ -255,7 +255,7 @@ :id 853 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3675 :flags (is-3d launch-asap bit7)) (sp-item 3676 :flags (is-3d launch-asap bit7)) (sp-item 3677 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -333,7 +333,7 @@ :id 854 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3678 :flags (is-3d launch-asap bit7)) (sp-item 3679 :flags (is-3d launch-asap bit7)) (sp-item 3680 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -411,7 +411,7 @@ :id 855 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3681 :flags (is-3d launch-asap bit7)) (sp-item 3682 :flags (is-3d launch-asap bit7)) (sp-item 3683 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -489,7 +489,7 @@ :id 856 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3684 :flags (is-3d launch-asap bit7)) (sp-item 3685 :flags (is-3d launch-asap bit7)) (sp-item 3683 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) diff --git a/goal_src/jak2/levels/city/industrial/ctyinda-part.gc b/goal_src/jak2/levels/city/industrial/ctyinda-part.gc index ebb6ae732b..f0ba623bf2 100644 --- a/goal_src/jak2/levels/city/industrial/ctyinda-part.gc +++ b/goal_src/jak2/levels/city/industrial/ctyinda-part.gc @@ -196,7 +196,7 @@ :id 974 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4287 :flags (is-3d launch-asap bit7)) (sp-item 4288 :flags (is-3d launch-asap bit7)) (sp-item 4289 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -274,7 +274,7 @@ :id 975 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4290 :flags (is-3d launch-asap bit7)) (sp-item 4291 :flags (is-3d launch-asap bit7)) (sp-item 4292 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -351,7 +351,7 @@ :id 976 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4293 :flags (is-3d launch-asap bit7)) (sp-item 4294 :flags (is-3d launch-asap bit7)) (sp-item 4295 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) diff --git a/goal_src/jak2/levels/city/industrial/ctyindb-part.gc b/goal_src/jak2/levels/city/industrial/ctyindb-part.gc index 5bfcb2cd15..45438dfd8a 100644 --- a/goal_src/jak2/levels/city/industrial/ctyindb-part.gc +++ b/goal_src/jak2/levels/city/industrial/ctyindb-part.gc @@ -196,7 +196,7 @@ :id 992 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4325 :flags (is-3d launch-asap bit7)) (sp-item 4326 :flags (is-3d launch-asap bit7)) (sp-item 4327 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -274,7 +274,7 @@ :id 993 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4328 :flags (is-3d launch-asap bit7)) (sp-item 4329 :flags (is-3d launch-asap bit7)) (sp-item 4330 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -351,7 +351,7 @@ :id 994 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4331 :flags (is-3d launch-asap bit7)) (sp-item 4332 :flags (is-3d launch-asap bit7)) (sp-item 4333 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) diff --git a/goal_src/jak2/levels/city/market/ctymark-obs.gc b/goal_src/jak2/levels/city/market/ctymark-obs.gc index 4866cb6065..80a0acf795 100644 --- a/goal_src/jak2/levels/city/market/ctymark-obs.gc +++ b/goal_src/jak2/levels/city/market/ctymark-obs.gc @@ -12,7 +12,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4354 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4355 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4356 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) @@ -166,7 +166,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4360 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4361 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4362 :fade-after (meters 40) :falloff-to (meters 60) :flags (bit7) :period 1200 :length 15) @@ -387,7 +387,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4367 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4368 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4369 :fade-after (meters 60) :falloff-to (meters 90) :flags (bit7) :period 1200 :length 15) @@ -632,7 +632,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4377 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4378 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4379 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) @@ -835,7 +835,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4384 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4385 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) (sp-item 4386 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) diff --git a/goal_src/jak2/levels/city/market/ctymarka-part.gc b/goal_src/jak2/levels/city/market/ctymarka-part.gc index 868821f6c2..fe7c65d8ee 100644 --- a/goal_src/jak2/levels/city/market/ctymarka-part.gc +++ b/goal_src/jak2/levels/city/market/ctymarka-part.gc @@ -181,7 +181,7 @@ :id 1013 :flags (unk-4 unk-6) :bounds (static-bspherem 0 5 0 8) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 4397 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 500) (sp-item 4398 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 600) (sp-item 4399 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 700) diff --git a/goal_src/jak2/levels/city/market/ctymarkb-part.gc b/goal_src/jak2/levels/city/market/ctymarkb-part.gc index fc9d0e34d3..78ae7413a2 100644 --- a/goal_src/jak2/levels/city/market/ctymarkb-part.gc +++ b/goal_src/jak2/levels/city/market/ctymarkb-part.gc @@ -399,7 +399,7 @@ :id 1023 :flags (unk-4 unk-6) :bounds (static-bspherem 0 5 0 8) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 4439 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 500) (sp-item 4440 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 600) (sp-item 4441 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 700) diff --git a/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc b/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc index 7ab8f8e242..c789fea70b 100644 --- a/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc +++ b/goal_src/jak2/levels/city/onin_tent/onintent-scenes.gc @@ -390,7 +390,7 @@ :id 796 :flags (unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 3478 :flags (is-3d bit6 bit7)) (sp-item 3479 :flags (bit6)) (sp-item 3480 :flags (bit7))) ) @@ -398,7 +398,7 @@ :id 797 :flags (unk-6 unk-7) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :scale (16384.0 0.0 0.0) :parts ((sp-item 3478 :flags (is-3d bit6 bit7)) (sp-item 3481 :flags (bit6))) ) diff --git a/goal_src/jak2/levels/city/oracle/oracle-part.gc b/goal_src/jak2/levels/city/oracle/oracle-part.gc index e4d129579c..0e8b475980 100644 --- a/goal_src/jak2/levels/city/oracle/oracle-part.gc +++ b/goal_src/jak2/levels/city/oracle/oracle-part.gc @@ -156,7 +156,7 @@ :id 819 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3554 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 3555 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 3556 :fade-after (meters 60) :flags (bit6 bit7)) diff --git a/goal_src/jak2/levels/city/port/ctyport-part.gc b/goal_src/jak2/levels/city/port/ctyport-part.gc index 41ffe45432..34e05de3c6 100644 --- a/goal_src/jak2/levels/city/port/ctyport-part.gc +++ b/goal_src/jak2/levels/city/port/ctyport-part.gc @@ -545,7 +545,7 @@ :duration (seconds 0.017) :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 -12 0 24) - :rotate ((degrees 0) (degrees 8) (degrees 0)) + :rotate ((degrees 0) (degrees 180) (degrees 0)) :parts ((sp-item 4172 :fade-after (meters 160) :falloff-to (meters 60) :flags (bit7))) ) @@ -898,7 +898,7 @@ :id 952 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4188 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 4189 :fade-after (meters 100) :flags (bit6 bit7)) (sp-item 4190 :fade-after (meters 60) :flags (bit6 bit7)) @@ -1110,7 +1110,7 @@ :id 955 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4198 :flags (is-3d launch-asap bit7)) (sp-item 4199 :flags (is-3d launch-asap bit7)) (sp-item 4200 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -1187,7 +1187,7 @@ :id 956 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4201 :flags (is-3d launch-asap bit7)) (sp-item 4202 :flags (is-3d launch-asap bit7)) (sp-item 4203 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -1264,7 +1264,7 @@ :id 957 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4204 :flags (is-3d launch-asap bit7)) (sp-item 4205 :flags (is-3d launch-asap bit7)) (sp-item 4203 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -1323,7 +1323,7 @@ :id 958 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4206 :flags (is-3d launch-asap bit7)) (sp-item 4207 :flags (is-3d launch-asap bit7)) (sp-item 4200 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -1382,7 +1382,7 @@ :id 959 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4208 :flags (is-3d launch-asap bit7)) (sp-item 4209 :flags (is-3d launch-asap bit7)) (sp-item 4200 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -1441,7 +1441,7 @@ :id 960 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4210 :flags (is-3d launch-asap bit7)) (sp-item 4211 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1519,7 +1519,7 @@ :id 961 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4213 :flags (is-3d launch-asap bit7)) (sp-item 4214 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1578,7 +1578,7 @@ :id 962 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4215 :flags (is-3d launch-asap bit7)) (sp-item 4216 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1637,7 +1637,7 @@ :id 963 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4217 :flags (is-3d launch-asap bit7)) (sp-item 4218 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1696,7 +1696,7 @@ :id 964 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4219 :flags (is-3d launch-asap bit7)) (sp-item 4220 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1970,7 +1970,7 @@ :id 967 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 24) - :rotate ((degrees 0) (degrees -3.942222) (degrees 0)) + :rotate ((degrees 0) (degrees -88.7) (degrees 0)) :parts ((sp-item 4226 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4227 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4228 :flags (is-3d launch-asap bit6 bit7)) @@ -2778,7 +2778,7 @@ :id 968 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 24) - :rotate ((degrees 0) (degrees -3.942222) (degrees 0)) + :rotate ((degrees 0) (degrees -88.7) (degrees 0)) :parts ((sp-item 4251 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4252 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4253 :flags (is-3d launch-asap bit6 bit7)) @@ -3707,7 +3707,7 @@ This commonly includes things such as: :id 969 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 2.2222223) (degrees 0) (degrees 0)) + :rotate ((degrees 50.000004) (degrees 0) (degrees 0)) :parts ((sp-item 4276 :fade-after (meters 400) :flags (is-3d bit6 bit7)) (sp-item 4277 :fade-after (meters 200))) ) diff --git a/goal_src/jak2/levels/city/slums/ctysluma-part.gc b/goal_src/jak2/levels/city/slums/ctysluma-part.gc index f3b61d1565..0311ab49f6 100644 --- a/goal_src/jak2/levels/city/slums/ctysluma-part.gc +++ b/goal_src/jak2/levels/city/slums/ctysluma-part.gc @@ -898,7 +898,7 @@ :id 867 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3728 :flags (is-3d launch-asap bit7)) (sp-item 3729 :flags (is-3d launch-asap bit7)) (sp-item 3730 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -976,7 +976,7 @@ :id 868 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3731 :flags (is-3d launch-asap bit7)) (sp-item 3732 :flags (is-3d launch-asap bit7)) (sp-item 3730 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1035,7 +1035,7 @@ :id 869 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3733 :flags (is-3d launch-asap bit7)) (sp-item 3734 :flags (is-3d launch-asap bit7)) (sp-item 3735 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1112,7 +1112,7 @@ :id 870 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3736 :flags (is-3d launch-asap bit7)) (sp-item 3737 :flags (is-3d launch-asap bit7)) (sp-item 3738 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1189,7 +1189,7 @@ :id 871 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3739 :flags (is-3d launch-asap bit7)) (sp-item 3740 :flags (is-3d launch-asap bit7)) (sp-item 3738 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1248,7 +1248,7 @@ :id 872 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3741 :flags (is-3d launch-asap bit7)) (sp-item 3742 :flags (is-3d launch-asap bit7)) (sp-item 3738 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) diff --git a/goal_src/jak2/levels/city/slums/ctyslumb-part.gc b/goal_src/jak2/levels/city/slums/ctyslumb-part.gc index 0c52f10fca..89e5ffe255 100644 --- a/goal_src/jak2/levels/city/slums/ctyslumb-part.gc +++ b/goal_src/jak2/levels/city/slums/ctyslumb-part.gc @@ -577,7 +577,7 @@ :id 878 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3864 :flags (is-3d launch-asap bit7)) (sp-item 3865 :flags (is-3d launch-asap bit7)) (sp-item 3866 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -655,7 +655,7 @@ :id 879 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3867 :flags (is-3d launch-asap bit7)) (sp-item 3868 :flags (is-3d launch-asap bit7)) (sp-item 3866 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -714,7 +714,7 @@ :id 880 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3869 :flags (is-3d launch-asap bit7)) (sp-item 3870 :flags (is-3d launch-asap bit7)) (sp-item 3871 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -791,7 +791,7 @@ :id 881 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3872 :flags (is-3d launch-asap bit7)) (sp-item 3873 :flags (is-3d launch-asap bit7)) (sp-item 3871 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -850,7 +850,7 @@ :id 882 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3874 :flags (is-3d launch-asap bit7)) (sp-item 3875 :flags (is-3d launch-asap bit7)) (sp-item 3876 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -927,7 +927,7 @@ :id 883 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3877 :flags (is-3d launch-asap bit7)) (sp-item 3878 :flags (is-3d launch-asap bit7)) (sp-item 3876 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -986,7 +986,7 @@ :id 884 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3879 :flags (is-3d launch-asap bit7)) (sp-item 3880 :flags (is-3d launch-asap bit7)) (sp-item 3876 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) diff --git a/goal_src/jak2/levels/city/slums/ctyslumc-part.gc b/goal_src/jak2/levels/city/slums/ctyslumc-part.gc index 65fa3d3f91..6f7bd9c65e 100644 --- a/goal_src/jak2/levels/city/slums/ctyslumc-part.gc +++ b/goal_src/jak2/levels/city/slums/ctyslumc-part.gc @@ -213,7 +213,7 @@ :id 891 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3900 :flags (is-3d launch-asap bit7)) (sp-item 3901 :flags (is-3d launch-asap bit7)) (sp-item 3902 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -290,7 +290,7 @@ :id 892 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3903 :flags (is-3d launch-asap bit7)) (sp-item 3904 :flags (is-3d launch-asap bit7)) (sp-item 3905 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -368,7 +368,7 @@ :id 893 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3906 :flags (is-3d launch-asap bit7)) (sp-item 3907 :flags (is-3d launch-asap bit7)) (sp-item 3908 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) diff --git a/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc b/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc index ada332d281..63d896ad68 100644 --- a/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc +++ b/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc @@ -13,7 +13,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 744 :flags (bit6) :period 900 :length 5) (sp-item 745 :flags (bit6) :period 900 :length 5) @@ -31,7 +31,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 744 :flags (bit6) :period 900 :length 5) (sp-item 745 :flags (bit6) :period 900 :length 5) diff --git a/goal_src/jak2/levels/common/enemy/hover/wasp.gc b/goal_src/jak2/levels/common/enemy/hover/wasp.gc index 35e09028a9..caaceb7335 100644 --- a/goal_src/jak2/levels/common/enemy/hover/wasp.gc +++ b/goal_src/jak2/levels/common/enemy/hover/wasp.gc @@ -13,7 +13,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 726 :flags (bit6) :period 900 :length 5) (sp-item 727 :flags (bit6) :period 900 :length 5) diff --git a/goal_src/jak2/levels/common/warp-gate.gc b/goal_src/jak2/levels/common/warp-gate.gc index 3ace5a67f0..f6ac1405d0 100644 --- a/goal_src/jak2/levels/common/warp-gate.gc +++ b/goal_src/jak2/levels/common/warp-gate.gc @@ -16,7 +16,7 @@ :duration (seconds 0.267) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 586 :flags (is-3d launch-asap bit7)) (sp-item 587 :flags (launch-asap)) (sp-item 588 :flags (bit7))) ) @@ -129,7 +129,7 @@ :linger-duration (seconds 2) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 591 :flags (bit6 bit7)) (sp-item 592 :flags (bit6 bit7)) (sp-item 593 :flags (bit7)) @@ -143,7 +143,7 @@ :linger-duration (seconds 2) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 595 :fade-after (meters 120) :falloff-to (meters 90) :flags (bit7)) (sp-item 596 :fade-after (meters 120) :falloff-to (meters 90) :flags (bit7)) (sp-item 597 :flags (bit6 bit7)) diff --git a/goal_src/jak2/levels/consite/consite-part.gc b/goal_src/jak2/levels/consite/consite-part.gc index de32ceeeea..b74f8829a3 100644 --- a/goal_src/jak2/levels/consite/consite-part.gc +++ b/goal_src/jak2/levels/consite/consite-part.gc @@ -20,7 +20,7 @@ :id 1167 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 5) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5071 :flags (bit6 bit7) :hour-mask #b111111111110000000) (sp-item 5072 :flags (bit6 bit7) :hour-mask #b111111111110000000) ) diff --git a/goal_src/jak2/levels/consite/consiteb-part.gc b/goal_src/jak2/levels/consite/consiteb-part.gc index c9077b1acc..67e9241f0b 100644 --- a/goal_src/jak2/levels/consite/consiteb-part.gc +++ b/goal_src/jak2/levels/consite/consiteb-part.gc @@ -64,7 +64,7 @@ :id 1185 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5114 :fade-after (meters 120) :flags (bit6 bit7) :period 300 :length 5)) ) @@ -90,7 +90,7 @@ :id 1186 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5115 :fade-after (meters 120) :flags (bit6 bit7) :period 150 :length 5)) ) diff --git a/goal_src/jak2/levels/demo/demo-obs.gc b/goal_src/jak2/levels/demo/demo-obs.gc index 8041edc9ef..7720fe548a 100644 --- a/goal_src/jak2/levels/demo/demo-obs.gc +++ b/goal_src/jak2/levels/demo/demo-obs.gc @@ -1145,7 +1145,7 @@ :id 1290 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5474 :flags (is-3d launch-asap bit7)) (sp-item 5475 :flags (is-3d launch-asap bit7)) (sp-item 5476 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1223,7 +1223,7 @@ :id 1291 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5477 :flags (is-3d launch-asap bit7)) (sp-item 5478 :flags (is-3d launch-asap bit7)) (sp-item 5479 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1300,7 +1300,7 @@ :id 1292 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5480 :flags (is-3d launch-asap bit7)) (sp-item 5481 :flags (is-3d launch-asap bit7)) (sp-item 5482 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1377,7 +1377,7 @@ :id 1293 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5483 :flags (is-3d launch-asap bit7)) (sp-item 5484 :flags (is-3d launch-asap bit7))) ) diff --git a/goal_src/jak2/levels/dig/dig-part.gc b/goal_src/jak2/levels/dig/dig-part.gc index a8cde64b96..89db1607ac 100644 --- a/goal_src/jak2/levels/dig/dig-part.gc +++ b/goal_src/jak2/levels/dig/dig-part.gc @@ -721,7 +721,7 @@ :id 1159 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 16) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5038 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) (sp-item 5039 :fade-after (meters 120) :falloff-to (meters 120) :period 40 :length 5 :binding 5030) (sp-item 5030 :flags (start-dead launch-asap bit7)) diff --git a/goal_src/jak2/levels/dig/dig-scenes.gc b/goal_src/jak2/levels/dig/dig-scenes.gc index 55b07a278c..edd7cbe103 100644 --- a/goal_src/jak2/levels/dig/dig-scenes.gc +++ b/goal_src/jak2/levels/dig/dig-scenes.gc @@ -29,7 +29,7 @@ :id 1151 :flags (unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 4989 :flags (is-3d bit6 bit7)) (sp-item 4990 :flags (bit6 bit7)) (sp-item 4991 :flags (bit7))) ) diff --git a/goal_src/jak2/levels/drill_platform/drill-baron.gc b/goal_src/jak2/levels/drill_platform/drill-baron.gc index 6e132acc84..8ead3c9cde 100644 --- a/goal_src/jak2/levels/drill_platform/drill-baron.gc +++ b/goal_src/jak2/levels/drill_platform/drill-baron.gc @@ -22,7 +22,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 2037 :flags (bit7) :period 930 :length 40)) ) @@ -32,7 +32,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 4) (degrees 4) (degrees 0)) + :rotate ((degrees 90) (degrees 90) (degrees 0)) :parts ((sp-item 2037 :flags (bit7) :period 930 :length 40)) ) @@ -128,7 +128,7 @@ :linger-duration (seconds 1.5) :flags (unk-6) :bounds (static-bspherem 0 0 0 6) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 2040 :flags (bit7)) (sp-item 2041 :flags (bit6 bit7))) ) @@ -137,7 +137,7 @@ :linger-duration (seconds 1.5) :flags (unk-6) :bounds (static-bspherem 0 0 0 6) - :rotate ((degrees 4) (degrees 4) (degrees 0)) + :rotate ((degrees 90) (degrees 90) (degrees 0)) :parts ((sp-item 2040 :flags (bit7)) (sp-item 2041 :flags (bit6 bit7))) ) diff --git a/goal_src/jak2/levels/drill_platform/drill-part.gc b/goal_src/jak2/levels/drill_platform/drill-part.gc index debf20d499..736aa1d560 100644 --- a/goal_src/jak2/levels/drill_platform/drill-part.gc +++ b/goal_src/jak2/levels/drill_platform/drill-part.gc @@ -523,7 +523,7 @@ :id 406 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 10) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1690 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1691 :fade-after (meters 200) :flags (bit6)) (sp-item 1692 :fade-after (meters 200) :flags (bit6 bit7)) @@ -1691,7 +1691,7 @@ :id 409 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 16) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1738 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1739 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1740 :fade-after (meters 200) :flags (bit6 bit7)) @@ -1870,7 +1870,7 @@ :id 411 :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 10) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1745 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1746 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1747 :fade-after (meters 200) :flags (bit6 bit7)) @@ -1958,7 +1958,7 @@ :id 412 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 6) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1749 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1750 :fade-after (meters 180) :falloff-to (meters 200) :flags (bit7)) ) @@ -2021,7 +2021,7 @@ :id 413 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 1752 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1753 :fade-after (meters 200) :falloff-to (meters 240) :flags (bit7)) ) @@ -2031,7 +2031,7 @@ :id 414 :flags (unk-4 unk-6 unk-7) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :scale (0.0 -16384.0 0.0) :parts ((sp-item 1752 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1753 :fade-after (meters 200) :falloff-to (meters 240) :flags (bit7)) @@ -2104,7 +2104,7 @@ :id 415 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees 8) (degrees 0)) + :rotate ((degrees 0) (degrees 180) (degrees 0)) :parts ((sp-item 1755 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1756 :fade-after (meters 200) :falloff-to (meters 240) :flags (bit7)) ) @@ -2354,7 +2354,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1765 :fade-after (meters 300) :falloff-to (meters 300) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 1766 :fade-after (meters 200) :falloff-to (meters 200) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 1767 :fade-after (meters 300) :falloff-to (meters 300) :flags (bit7) :period 1200 :length 20) @@ -2876,7 +2876,7 @@ :id 426 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 209)) ) @@ -3483,7 +3483,7 @@ :id 428 :flags (unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1813 :flags (bit6 bit7)) (sp-item 1814 :flags (bit6 bit7)) (sp-item 1815 :flags (bit6 bit7)) @@ -4886,7 +4886,7 @@ :id 442 :flags (unk-6) :bounds (static-bspherem 0 0 0 20) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 1882 :flags (bit7))) ) diff --git a/goal_src/jak2/levels/drill_platform/drill-part2.gc b/goal_src/jak2/levels/drill_platform/drill-part2.gc index 6dc662d100..12f847bfee 100644 --- a/goal_src/jak2/levels/drill_platform/drill-part2.gc +++ b/goal_src/jak2/levels/drill_platform/drill-part2.gc @@ -11,7 +11,7 @@ :id 445 :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 30 15 0 60) - :rotate ((degrees 0) (degrees -2.6666667) (degrees 0)) + :rotate ((degrees 0) (degrees -60) (degrees 0)) :parts ((sp-item 1894 :fade-after (meters 600) :falloff-to (meters 700) :flags (bit7)) (sp-item 1895 :fade-after (meters 300) :flags (bit6)) ) @@ -432,7 +432,7 @@ :id 449 :flags (unk-4 unk-6) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1912 :fade-after (meters 80) :flags (bit6 bit7) :period 200 :length 100) (sp-item 1913 :fade-after (meters 80) :flags (bit6 bit7) :period 250 :length 60) (sp-item 1914 :fade-after (meters 80) :flags (bit6 bit7) :period 315 :length 260) @@ -1210,7 +1210,7 @@ :id 450 :flags (unk-4 unk-6) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1947 :fade-after (meters 80) :flags (bit6 bit7) :period 400 :length 150) (sp-item 1948 :fade-after (meters 80) :flags (bit6 bit7) :period 365 :length 160) (sp-item 1949 :fade-after (meters 80) :flags (bit6 bit7) :period 145 :length 75) diff --git a/goal_src/jak2/levels/forest/forest-part.gc b/goal_src/jak2/levels/forest/forest-part.gc index 43c1cbf3c2..370b779198 100644 --- a/goal_src/jak2/levels/forest/forest-part.gc +++ b/goal_src/jak2/levels/forest/forest-part.gc @@ -146,7 +146,7 @@ :id 478 :flags (unk-6) :bounds (static-bspherem 0 0 0 20) - :rotate ((degrees 0) (degrees 3.5555556) (degrees 0)) + :rotate ((degrees 0) (degrees 80) (degrees 0)) :parts ((sp-item 2113 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2114 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2115 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -250,7 +250,7 @@ :id 479 :flags (unk-6) :bounds (static-bspherem 0 10 0 30) - :rotate ((degrees 0) (degrees 2) (degrees 0)) + :rotate ((degrees 0) (degrees 45) (degrees 0)) :parts ((sp-item 2118 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2119 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2120 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -354,7 +354,7 @@ :id 480 :flags (unk-6) :bounds (static-bspherem 0 10 0 30) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2121 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2122 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2123 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -458,7 +458,7 @@ :id 481 :flags (unk-6) :bounds (static-bspherem 0 15 0 30) - :rotate ((degrees 0) (degrees 2.2222223) (degrees 0)) + :rotate ((degrees 0) (degrees 50.000004) (degrees 0)) :parts ((sp-item 2124 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2125 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2126 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -594,7 +594,7 @@ :id 482 :flags (unk-6) :bounds (static-bspherem 0 15 0 30) - :rotate ((degrees 0) (degrees 2) (degrees 0)) + :rotate ((degrees 0) (degrees 45) (degrees 0)) :parts ((sp-item 2128 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2129 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2130 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -729,7 +729,7 @@ :id 483 :flags (unk-6) :bounds (static-bspherem 0 5 0 10) - :rotate ((degrees 0) (degrees 4.888889) (degrees 0)) + :rotate ((degrees 0) (degrees 110) (degrees 0)) :parts ((sp-item 2132 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2133 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2134 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -831,7 +831,7 @@ :id 484 :flags (unk-6) :bounds (static-bspherem 0 15 0 30) - :rotate ((degrees 0) (degrees 4.4444447) (degrees 0)) + :rotate ((degrees 0) (degrees 100.00001) (degrees 0)) :parts ((sp-item 2135 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2136 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2137 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) diff --git a/goal_src/jak2/levels/forest/forest-scenes.gc b/goal_src/jak2/levels/forest/forest-scenes.gc index 58abdf8404..42ebcd4748 100644 --- a/goal_src/jak2/levels/forest/forest-scenes.gc +++ b/goal_src/jak2/levels/forest/forest-scenes.gc @@ -37,7 +37,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 2173 :flags (bit7)) (sp-item 2174 :flags (bit7)) (sp-item 2175 :flags (bit7)) diff --git a/goal_src/jak2/levels/fortress/ammo_dump/fordumpc-part.gc b/goal_src/jak2/levels/fortress/ammo_dump/fordumpc-part.gc index 3ff9725c2f..0fc42e291f 100644 --- a/goal_src/jak2/levels/fortress/ammo_dump/fordumpc-part.gc +++ b/goal_src/jak2/levels/fortress/ammo_dump/fordumpc-part.gc @@ -1005,7 +1005,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2520 :flags (bit7) :period 1500 :length 25 :offset -10) (sp-item 2521 :fade-after (meters 60) :flags (bit7) :period 1500 :length 30) (sp-item 2522 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7) :period 1500 :length 100) @@ -2517,7 +2517,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2593 :flags (bit7) :period 1500 :length 25 :offset -10) (sp-item 2594 :fade-after (meters 60) :flags (bit7) :period 1500 :length 30) (sp-item 2595 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7) :period 1500 :length 100) diff --git a/goal_src/jak2/levels/fortress/prison/prison-part.gc b/goal_src/jak2/levels/fortress/prison/prison-part.gc index 90b07e435a..bcb20360c2 100644 --- a/goal_src/jak2/levels/fortress/prison/prison-part.gc +++ b/goal_src/jak2/levels/fortress/prison/prison-part.gc @@ -180,7 +180,7 @@ :id 588 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 18) - :rotate ((degrees -1.5555556) (degrees 0) (degrees 0)) + :rotate ((degrees -35) (degrees 0) (degrees 0)) :parts ((sp-item 2620 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7))) ) @@ -217,7 +217,7 @@ :id 589 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 20) - :rotate ((degrees -1.5555556) (degrees 0) (degrees 0)) + :rotate ((degrees -35) (degrees 0) (degrees 0)) :parts ((sp-item 2622 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7))) ) diff --git a/goal_src/jak2/levels/fortress/rescue/forrescb-part.gc b/goal_src/jak2/levels/fortress/rescue/forrescb-part.gc index 736179af1a..11738eff83 100644 --- a/goal_src/jak2/levels/fortress/rescue/forrescb-part.gc +++ b/goal_src/jak2/levels/fortress/rescue/forrescb-part.gc @@ -1342,7 +1342,7 @@ :id 672 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 1.5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2950 :fade-after (meters 80) :flags (bit6)) (sp-item 2951 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7)) ) diff --git a/goal_src/jak2/levels/gungame/gun-dummy.gc b/goal_src/jak2/levels/gungame/gun-dummy.gc index 780016f30b..ac4390d2a7 100644 --- a/goal_src/jak2/levels/gungame/gun-dummy.gc +++ b/goal_src/jak2/levels/gungame/gun-dummy.gc @@ -95,7 +95,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2297 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2298 :flags (is-3d bit7) :period 1200 :length 15) @@ -263,7 +263,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2304 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2305 :flags (is-3d bit7) :period 1200 :length 15) @@ -382,7 +382,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2306 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2307 :flags (is-3d bit7) :period 1200 :length 15) @@ -501,7 +501,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2308 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2309 :flags (is-3d bit7) :period 1200 :length 15) @@ -620,7 +620,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2310 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2311 :flags (is-3d bit7) :period 1200 :length 15) @@ -788,7 +788,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2314 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2315 :flags (is-3d bit7) :period 1200 :length 15) @@ -956,7 +956,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2318 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2319 :flags (is-3d bit7) :period 1200 :length 15) @@ -1208,7 +1208,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2323 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2324 :flags (is-3d bit7) :period 1200 :length 15) @@ -1327,7 +1327,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2325 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2326 :flags (is-3d bit7) :period 1200 :length 15) @@ -1446,7 +1446,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2327 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2328 :flags (is-3d bit7) :period 1200 :length 15) diff --git a/goal_src/jak2/levels/gungame/gungame-part.gc b/goal_src/jak2/levels/gungame/gungame-part.gc index 4e55b713e7..84718f0fd8 100644 --- a/goal_src/jak2/levels/gungame/gungame-part.gc +++ b/goal_src/jak2/levels/gungame/gungame-part.gc @@ -20,7 +20,7 @@ :id 531 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 2332 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7))) ) diff --git a/goal_src/jak2/levels/intro/intro-scenes.gc b/goal_src/jak2/levels/intro/intro-scenes.gc index 6802d29f4b..e1d83660c6 100644 --- a/goal_src/jak2/levels/intro/intro-scenes.gc +++ b/goal_src/jak2/levels/intro/intro-scenes.gc @@ -871,7 +871,7 @@ :linger-duration (seconds 1.5) :flags (unk-6) :bounds (static-bspherem 0 0 0 640) - :rotate ((degrees 4) (degrees 2.2222223) (degrees 0)) + :rotate ((degrees 90) (degrees 50.000004) (degrees 0)) :parts ((sp-item 5343 :flags (is-3d bit6 bit7)) (sp-item 5344 :flags (is-3d bit6 bit7)) (sp-item 5345 :flags (bit7)) @@ -1284,7 +1284,7 @@ :id 1263 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5362 :flags (is-3d bit7) :period 25 :length 5)) ) @@ -1309,7 +1309,7 @@ :id 1264 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5363 :flags (is-3d bit7) :period 25 :length 5)) ) @@ -1336,7 +1336,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 256) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5364 :flags (bit7)) (sp-item 5365 :flags (bit7)) (sp-item 5366 :flags (bit7)) @@ -1551,7 +1551,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5373 :flags (bit6) :period 900 :length 5) (sp-item 5374 :flags (bit6) :period 900 :length 5) (sp-item 5375 :period 900 :length 15) diff --git a/goal_src/jak2/levels/landing_pad/castle-part.gc b/goal_src/jak2/levels/landing_pad/castle-part.gc index f96928539c..51ccdac1df 100644 --- a/goal_src/jak2/levels/landing_pad/castle-part.gc +++ b/goal_src/jak2/levels/landing_pad/castle-part.gc @@ -62,7 +62,7 @@ :id 1188 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5123 :fade-after (meters 200) :flags (bit6 bit7))) ) @@ -282,7 +282,7 @@ :id 1190 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5133 :fade-after (meters 200) :flags (bit6 bit7))) ) @@ -310,7 +310,7 @@ :id 1191 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5134 :fade-after (meters 120) :flags (bit6 bit7) :period 150 :length 5)) ) @@ -318,7 +318,7 @@ :id 1192 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5134 :fade-after (meters 120) :flags (bit6 bit7) :period 115 :length 5 :offset 65)) ) @@ -818,7 +818,7 @@ :linger-duration (seconds 12) :flags (unk-4 unk-6) :bounds (static-bspherem 0 4 0 6) - :rotate ((degrees 4) (degrees 0) (degrees 8)) + :rotate ((degrees 90) (degrees 0) (degrees 180)) :parts ((sp-item 5157 :fade-after (meters 150) :falloff-to (meters 100) :flags (is-3d bit7)) (sp-item 5158 :fade-after (meters 150) :falloff-to (meters 100) :flags (is-3d bit7)) ) @@ -902,7 +902,7 @@ :id 1199 :flags (unk-4 unk-6) :bounds (static-bspherem 0 4 0 6) - :rotate ((degrees 4) (degrees 0) (degrees 8)) + :rotate ((degrees 90) (degrees 0) (degrees 180)) :parts ((sp-item 209)) ) @@ -910,7 +910,7 @@ :id 1200 :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5159 :flags (is-3d launch-asap bit7) :period 300 :length 5) (sp-item 5160 :flags (is-3d bit6 bit7)) (sp-item 5161 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) @@ -976,7 +976,7 @@ :id 1201 :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5164 :flags (is-3d launch-asap bit6 bit7) :period 300 :length 5) (sp-item 5165 :flags (is-3d bit6 bit7)) (sp-item 5166 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) @@ -1042,7 +1042,7 @@ :id 1202 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5167 :flags (is-3d launch-asap bit7) :period 300 :length 5) (sp-item 5168 :flags (is-3d bit6 bit7)) (sp-item 5169 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) @@ -1120,7 +1120,7 @@ :id 1203 :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5170 :flags (is-3d launch-asap bit7) :period 300 :length 5) (sp-item 5171 :flags (is-3d bit6 bit7)) (sp-item 5172 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) diff --git a/goal_src/jak2/levels/mars_tomb/tomb-part.gc b/goal_src/jak2/levels/mars_tomb/tomb-part.gc index 61ed2e7b5b..8d02a37adf 100644 --- a/goal_src/jak2/levels/mars_tomb/tomb-part.gc +++ b/goal_src/jak2/levels/mars_tomb/tomb-part.gc @@ -173,7 +173,7 @@ :id 689 :flags (unk-6 unk-7) :bounds (static-bspherem 0 3 0 16) - :rotate ((degrees 0) (degrees 3.8666666) (degrees 0)) + :rotate ((degrees 0) (degrees 87) (degrees 0)) :scale (0.0 15837.866 0.0) :parts ((sp-item 3069 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) (sp-item 3070 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 115 :length 40) @@ -194,7 +194,7 @@ :id 690 :flags (unk-6 unk-7) :bounds (static-bspherem 0 3 0 16) - :rotate ((degrees 0) (degrees 9.911111) (degrees 0)) + :rotate ((degrees 0) (degrees 223) (degrees 0)) :scale (0.0 40595.91 0.0) :parts ((sp-item 3069 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) (sp-item 3070 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 125 :length 40) @@ -462,7 +462,7 @@ :id 693 :flags (unk-6 unk-7) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 2.8) (degrees 0)) + :rotate ((degrees 0) (degrees 63) (degrees 0)) :scale (0.0 11468.8 0.0) :parts ((sp-item 3083 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 3084 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 90 :length 50) @@ -485,7 +485,7 @@ :id 694 :flags (unk-6 unk-7) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 7.688889) (degrees 0)) + :rotate ((degrees 0) (degrees 173) (degrees 0)) :scale (0.0 31493.69 0.0) :parts ((sp-item 3083 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 3084 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 125 :length 50) diff --git a/goal_src/jak2/levels/mars_tomb/widow-part.gc b/goal_src/jak2/levels/mars_tomb/widow-part.gc index e143899322..fd6055f770 100644 --- a/goal_src/jak2/levels/mars_tomb/widow-part.gc +++ b/goal_src/jak2/levels/mars_tomb/widow-part.gc @@ -728,7 +728,7 @@ :linger-duration (seconds 4.5) :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees -3.2222223) (degrees 0)) + :rotate ((degrees 0) (degrees -72.5) (degrees 0)) :parts ((sp-item 3218 :flags (bit7) :period 1200 :length 20) (sp-item 3219 :flags (bit7) :period 1200 :length 15) (sp-item 3220 :flags (bit6 bit7) :period 1200 :length 50) diff --git a/goal_src/jak2/levels/nest/boss/metalkor-part.gc b/goal_src/jak2/levels/nest/boss/metalkor-part.gc index 64b4fc094a..e5f62fde0f 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-part.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-part.gc @@ -155,7 +155,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 128) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5259 :flags (is-3d bit6 bit7)) (sp-item 5260 :flags (bit7)) (sp-item 5261 :flags (bit6)) diff --git a/goal_src/jak2/levels/outro/outro-scenes.gc b/goal_src/jak2/levels/outro/outro-scenes.gc index 69aa25f142..64bd5db162 100644 --- a/goal_src/jak2/levels/outro/outro-scenes.gc +++ b/goal_src/jak2/levels/outro/outro-scenes.gc @@ -7,7 +7,6 @@ ;; DECOMP BEGINS -;; definition for symbol death-precursor, type death-info (define death-precursor (new 'static 'death-info :vertex-skip #x8 :timer #xe0 :overlap #xff :effect #x1539 :sound 'temp-enemy-die) ) @@ -36,7 +35,6 @@ (none) ) -;; failed to figure out what this is: (defpart 5433 :init-specs ((sp-flt spt-scale-x (meters 0.08)) (sp-copy-from-other spt-scale-y -4) @@ -53,7 +51,6 @@ ) ) -;; failed to figure out what this is: (defpart 5434 :init-specs ((sp-flt spt-r 64.0) (sp-flt spt-g 128.0) @@ -64,7 +61,6 @@ ) ) -;; failed to figure out what this is: (defpartgroup group-outro-precursor-entity :id 1276 :duration (seconds 0.017) @@ -72,7 +68,6 @@ :parts ((sp-item 5435 :flags (bit6))) ) -;; failed to figure out what this is: (defpart 5435 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) (sp-flt spt-num 1.0) @@ -89,56 +84,49 @@ ) ) -;; failed to figure out what this is: (defskelgroup skel-crocadog crocadog 0 -1 ((1 (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :origin-joint-index 3 ) -;; failed to figure out what this is: (defskelgroup skel-brutter-balloon-norift brutter-balloon-norift brutter-balloon-norift-lod0-jg -1 ((brutter-balloon-norift-lod0-mg (meters 999999))) :bounds (static-spherem 0 10 0 23) :origin-joint-index 3 ) -;; failed to figure out what this is: (defskelgroup skel-metalkor-chopped metalkor-chopped metalkor-chopped-lod0-jg metalkor-chopped-idle-ja ((metalkor-chopped-lod0-mg (meters 999999))) :bounds (static-spherem 0 2 2 8) :origin-joint-index 3 ) -;; failed to figure out what this is: (defskelgroup skel-rift-break-ring rift-break-ring rift-break-ring-lod0-jg -1 ((rift-break-ring-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 100) :origin-joint-index 4 ) -;; failed to figure out what this is: (defskelgroup skel-kid-medallion kid-medallion kid-medallion-lod0-jg kid-medallion-idle-ja ((kid-medallion-lod0-mg (meters 200))) :bounds (static-spherem 0 0 0 1) :origin-joint-index 3 ) -;; failed to figure out what this is: (defskelgroup skel-precursor precursor precursor-lod0-jg -1 ((precursor-lod0-mg (meters 999999))) :bounds (static-spherem 0 0 0 3.2) :origin-joint-index 3 ) -;; failed to figure out what this is: (defpartgroup group-outro-rift-ring :id 1277 :duration (seconds 0.017) :linger-duration (seconds 1.5) :flags (unk-6) :bounds (static-bspherem 0 0 0 128) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5436 :flags (is-3d bit6 bit7)) (sp-item 5437 :flags (bit7)) (sp-item 5438 :flags (bit6)) @@ -147,7 +135,6 @@ ) ) -;; failed to figure out what this is: (defpart 5440 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) (sp-rnd-flt spt-num 1.0 1.0 1.0) @@ -175,7 +162,6 @@ ) ) -;; failed to figure out what this is: (defpart 5438 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) (sp-flt spt-num 1.0) @@ -192,7 +178,6 @@ ) ) -;; failed to figure out what this is: (defpart 5439 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) (sp-flt spt-num 1.0) @@ -209,7 +194,6 @@ ) ) -;; failed to figure out what this is: (defpart 5436 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) (sp-rnd-flt spt-num 0.0 0.1 1.0) @@ -229,17 +213,14 @@ ) ) -;; failed to figure out what this is: (defpart 5441 :init-specs ((sp-flt spt-fade-a 0.0) (sp-int spt-next-time 160) (sp-launcher-by-id spt-next-launcher 5442)) ) -;; failed to figure out what this is: (defpart 5442 :init-specs ((sp-flt spt-fade-a -0.8)) ) -;; failed to figure out what this is: (defpart 5437 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) (sp-flt spt-num 16.0) @@ -263,7 +244,6 @@ ) ) -;; failed to figure out what this is: (defpartgroup group-outro-magic-birth :id 1278 :linger-duration (seconds 0.5) @@ -271,7 +251,6 @@ :parts ((sp-item 5443 :flags (launch-asap bit6))) ) -;; failed to figure out what this is: (defpart 5443 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) (sp-flt spt-num 1.0) @@ -295,7 +274,6 @@ ) ) -;; failed to figure out what this is: (defpart 5444 :init-specs ((sp-flt spt-scalevel-x (meters -0.0009090909)) (sp-copy-from-other spt-scalevel-y -4) @@ -303,7 +281,6 @@ ) ) -;; failed to figure out what this is: (defpartgroup group-outro-magic-birth2 :id 1279 :linger-duration (seconds 0.5) @@ -311,7 +288,6 @@ :parts ((sp-item 5445 :flags (launch-asap bit6))) ) -;; failed to figure out what this is: (defpart 5445 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) (sp-flt spt-num 1.0) @@ -335,12 +311,10 @@ ) ) -;; failed to figure out what this is: (defpart 5446 :init-specs ((sp-flt spt-scalevel-x (meters -0.00125)) (sp-copy-from-other spt-scalevel-y -4) (sp-flt spt-fade-a -2.4)) ) -;; failed to figure out what this is: (defpartgroup group-outro-onin-finger-blast :id 1280 :duration (seconds 0.167) @@ -349,7 +323,6 @@ :parts ((sp-item 5447) (sp-item 5448) (sp-item 5449 :flags (launch-asap bit6))) ) -;; failed to figure out what this is: (defpart 5449 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) (sp-flt spt-num 1.0) @@ -369,7 +342,6 @@ ) ) -;; failed to figure out what this is: (defpart 5447 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) (sp-flt spt-num 64.0) @@ -397,7 +369,6 @@ ) ) -;; failed to figure out what this is: (defpart 5448 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x66 :page #x3e6)) (sp-flt spt-num 16.0) @@ -422,7 +393,6 @@ ) ) -;; failed to figure out what this is: (defpartgroup group-outro-onin-finger-effect :id 1281 :duration (seconds 0.15) @@ -430,7 +400,6 @@ :parts ((sp-item 5451 :falloff-to (meters 20)) (sp-item 5452 :falloff-to (meters 20))) ) -;; failed to figure out what this is: (defpart 5451 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) (sp-rnd-flt spt-num 0.0 1.0 1.0) @@ -453,7 +422,6 @@ ) ) -;; failed to figure out what this is: (defpart 5450 :init-specs ((sp-rnd-flt spt-scale-x (meters 0.01) (meters 0.02) 1.0) (sp-copy-from-other spt-scale-y -4) @@ -470,7 +438,6 @@ ) ) -;; failed to figure out what this is: (defpart 5453 :init-specs ((sp-flt spt-r 0.0) (sp-rnd-flt spt-g 64.0 64.0 1.0) @@ -481,7 +448,6 @@ ) ) -;; failed to figure out what this is: (defpart 5452 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x66 :page #x3e6)) (sp-flt spt-num 1.0) @@ -501,14 +467,12 @@ ) ) -;; failed to figure out what this is: (defpartgroup group-outro-precursor-stone-glow :id 1282 :bounds (static-bspherem 0 0 0 3) :parts ((sp-item 5454 :flags (bit6))) ) -;; failed to figure out what this is: (defpart 5454 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) (sp-flt spt-num 1.0) @@ -525,14 +489,12 @@ ) ) -;; failed to figure out what this is: (defpartgroup group-outro-port-feathers-n-fur-impact :id 1283 :bounds (static-bspherem 0 0 0 6) :parts ((sp-item 5455 :flags (bit7)) (sp-item 5456 :flags (bit7))) ) -;; failed to figure out what this is: (defpart 5455 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xdd8)) (sp-func spt-birth-func 'birth-func-pecker-feather-color) @@ -558,7 +520,6 @@ ) ) -;; failed to figure out what this is: (defpart 5456 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) (sp-flt spt-num 25.0) @@ -583,14 +544,12 @@ ) ) -;; failed to figure out what this is: (defpartgroup group-outro-port-feathers-n-fur :id 1284 :bounds (static-bspherem 0 0 0 3) :parts ((sp-item 5457) (sp-item 5458)) ) -;; failed to figure out what this is: (defpart 5457 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xdd8)) (sp-func spt-birth-func 'birth-func-pecker-feather-color) @@ -615,7 +574,6 @@ ) ) -;; failed to figure out what this is: (defpart 5458 :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) (sp-flt spt-num 2.5) @@ -641,13 +599,10 @@ ) ) -;; failed to figure out what this is: (defpart 5459 :init-specs ((sp-flt spt-vel-y (meters 0)) (sp-flt spt-friction 1.0)) ) -;; definition for function birth-func-pecker-feather-color -;; WARN: Return type mismatch int vs none. (defun birth-func-pecker-feather-color ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 sparticle-launchinfo)) (let ((v1-0 (rand-vu-int-count 3))) (cond @@ -672,7 +627,6 @@ (none) ) -;; failed to figure out what this is: (scene-method-16 (new 'static 'scene :name "outro-nest" @@ -1066,7 +1020,6 @@ ) ) -;; failed to figure out what this is: (scene-method-16 (new 'static 'scene :name "outro-palace" :extra #f @@ -1184,7 +1137,6 @@ ) ) -;; failed to figure out what this is: (scene-method-16 (new 'static 'scene :name "outro-hiphog" @@ -1489,7 +1441,6 @@ ) ) -;; failed to figure out what this is: (scene-method-16 (new 'static 'scene :name "outro-port" @@ -1812,6 +1763,3 @@ ) ) - - - diff --git a/goal_src/jak2/levels/palace/explore/palent-part.gc b/goal_src/jak2/levels/palace/explore/palent-part.gc index b8856692bc..b80cd4cb4d 100644 --- a/goal_src/jak2/levels/palace/explore/palent-part.gc +++ b/goal_src/jak2/levels/palace/explore/palent-part.gc @@ -137,7 +137,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4892 :flags (bit6) :period 900 :length 5) (sp-item 4893 :flags (bit6) :period 900 :length 5) (sp-item 4894 :period 900 :length 15) diff --git a/goal_src/jak2/levels/power_station/vinroom-part.gc b/goal_src/jak2/levels/power_station/vinroom-part.gc index 5ec220fc05..02bb23b373 100644 --- a/goal_src/jak2/levels/power_station/vinroom-part.gc +++ b/goal_src/jak2/levels/power_station/vinroom-part.gc @@ -2342,7 +2342,7 @@ :id 272 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 1.5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1212 :fade-after (meters 80) :flags (bit6 bit7))) ) @@ -2369,7 +2369,7 @@ :id 273 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 1.5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1213 :fade-after (meters 60) :flags (bit6 bit7) :period 150 :length 100) (sp-item 1214 :fade-after (meters 60) :flags (bit6 bit7) :period 600 :length 200) (sp-item 1215 :fade-after (meters 60) :flags (bit6 bit7) :period 600 :length 200 :offset 300) diff --git a/goal_src/jak2/levels/power_station/vinroom-scenes.gc b/goal_src/jak2/levels/power_station/vinroom-scenes.gc index 8f8af33610..7ae4bb1ce3 100644 --- a/goal_src/jak2/levels/power_station/vinroom-scenes.gc +++ b/goal_src/jak2/levels/power_station/vinroom-scenes.gc @@ -105,7 +105,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees -2.6666667) (degrees 0) (degrees 0)) + :rotate ((degrees -60) (degrees 0) (degrees 0)) :parts ((sp-item 1233 :flags (bit7))) ) diff --git a/goal_src/jak2/levels/ruins/ruins-scenes.gc b/goal_src/jak2/levels/ruins/ruins-scenes.gc index a06a03f052..8216aecf3e 100644 --- a/goal_src/jak2/levels/ruins/ruins-scenes.gc +++ b/goal_src/jak2/levels/ruins/ruins-scenes.gc @@ -164,7 +164,7 @@ TODO - first arg type?" :id 283 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 1249 :flags (is-3d bit6 bit7))) ) diff --git a/goal_src/jak2/levels/stadium/stadium-part.gc b/goal_src/jak2/levels/stadium/stadium-part.gc index 5d913ed421..adba1eb9f5 100644 --- a/goal_src/jak2/levels/stadium/stadium-part.gc +++ b/goal_src/jak2/levels/stadium/stadium-part.gc @@ -20,7 +20,7 @@ :id 894 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 4) (degrees 4) (degrees 0)) + :rotate ((degrees 90) (degrees 90) (degrees 0)) :parts ((sp-item 3909 :fade-after (meters 80) :flags (bit6)) (sp-item 3910 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 3911 :fade-after (meters 60) :flags (bit6 bit7)) diff --git a/goal_src/jak2/levels/strip/strip-part.gc b/goal_src/jak2/levels/strip/strip-part.gc index c5cf1a549e..eafdb25a7a 100644 --- a/goal_src/jak2/levels/strip/strip-part.gc +++ b/goal_src/jak2/levels/strip/strip-part.gc @@ -3167,7 +3167,7 @@ :id 228 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1088 :fade-after (meters 50) :flags (is-3d bit7) :period 80 :length 5) (sp-item 1089 :fade-after (meters 50) :flags (is-3d bit7)) (sp-item 1090 :fade-after (meters 50) :flags (is-3d bit7) :period 600 :length 5) diff --git a/goal_src/jak2/levels/temple/mountain-part.gc b/goal_src/jak2/levels/temple/mountain-part.gc index dd8455599a..4e10b8a4fb 100644 --- a/goal_src/jak2/levels/temple/mountain-part.gc +++ b/goal_src/jak2/levels/temple/mountain-part.gc @@ -20,7 +20,7 @@ :id 362 :flags (unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 3.5555556) (degrees 0)) + :rotate ((degrees 0) (degrees 80) (degrees 0)) :parts ((sp-item 1530 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1531 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1532 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -463,7 +463,7 @@ :id 363 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1546 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1547 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1548 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -597,7 +597,7 @@ :id 364 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1550 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1551 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1552 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -731,7 +731,7 @@ :id 365 :flags (unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 3.5555556) (degrees 0)) + :rotate ((degrees 0) (degrees 80) (degrees 0)) :parts ((sp-item 1554 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1555 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1556 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -957,7 +957,7 @@ :id 366 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1561 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1562 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1563 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1217,7 +1217,7 @@ :id 367 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1569 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1570 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1571 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1351,7 +1351,7 @@ :id 368 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1573 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1574 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1575 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1611,7 +1611,7 @@ :id 369 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1581 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1582 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1583 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1745,7 +1745,7 @@ :id 370 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1585 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1586 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1755,7 +1755,7 @@ :id 371 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1587 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1588 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1765,7 +1765,7 @@ :id 372 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1585 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1586 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1775,7 +1775,7 @@ :id 373 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1585 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1586 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1785,7 +1785,7 @@ :id 374 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1587 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1588 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1589 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) diff --git a/goal_src/jak2/levels/temple/mountain-scenes.gc b/goal_src/jak2/levels/temple/mountain-scenes.gc index 424f55f52f..8311357d8b 100644 --- a/goal_src/jak2/levels/temple/mountain-scenes.gc +++ b/goal_src/jak2/levels/temple/mountain-scenes.gc @@ -400,7 +400,7 @@ :id 358 :flags (unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 1513 :flags (is-3d bit6 bit7)) (sp-item 1514 :flags (bit6 bit7)) (sp-item 1515 :flags (bit7))) ) diff --git a/goal_src/jak2/levels/title/title-obs.gc b/goal_src/jak2/levels/title/title-obs.gc index 485198e4a7..6fb3038c57 100644 --- a/goal_src/jak2/levels/title/title-obs.gc +++ b/goal_src/jak2/levels/title/title-obs.gc @@ -1060,7 +1060,7 @@ :id 1285 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5460 :flags (is-3d launch-asap bit7)) (sp-item 5461 :flags (is-3d launch-asap bit7)) (sp-item 5462 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1138,7 +1138,7 @@ :id 1286 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5463 :flags (is-3d launch-asap bit7)) (sp-item 5464 :flags (is-3d launch-asap bit7)) (sp-item 5465 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1215,7 +1215,7 @@ :id 1287 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5466 :flags (is-3d launch-asap bit7)) (sp-item 5467 :flags (is-3d launch-asap bit7)) (sp-item 5468 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1292,7 +1292,7 @@ :id 1288 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5469 :flags (is-3d launch-asap bit7)) (sp-item 5470 :flags (is-3d launch-asap bit7))) ) diff --git a/goal_src/jak2/levels/underport/under-part.gc b/goal_src/jak2/levels/underport/under-part.gc index d2b61c7e8c..5c0aadd822 100644 --- a/goal_src/jak2/levels/underport/under-part.gc +++ b/goal_src/jak2/levels/underport/under-part.gc @@ -887,7 +887,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2246 :flags (bit6) :period 900 :length 5) (sp-item 2247 :flags (bit6) :period 900 :length 5) (sp-item 2248 :period 900 :length 15) diff --git a/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc index 8858120f7a..7fe2c5df0d 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc @@ -6,7 +6,7 @@ :id 77 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 265 :flags (is-3d bit6 bit7) :period 130 :length 30) (sp-item 265 :flags (is-3d bit6 bit7) :period 150 :length 35 :offset 5) (sp-item 265 :flags (is-3d bit6 bit7) :period 330 :length 25 :offset 35) diff --git a/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc b/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc index a4056c3b3b..f32859f362 100644 --- a/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/part-tester_REF.gc @@ -9,7 +9,7 @@ :id 127 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 640) - :rotate ((degrees 2) (degrees 0) (degrees 0)) + :rotate ((degrees 45) (degrees 0) (degrees 0)) :parts ((sp-item 209)) ) diff --git a/test/decompiler/reference/jak2/engine/target/board/board-part_REF.gc b/test/decompiler/reference/jak2/engine/target/board/board-part_REF.gc index 627dcdd930..9c794f8ab4 100644 --- a/test/decompiler/reference/jak2/engine/target/board/board-part_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/board-part_REF.gc @@ -152,7 +152,7 @@ :duration (seconds 50) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 8) (degrees 4)) + :rotate ((degrees 90) (degrees 180) (degrees 90)) :parts ((sp-item 436 :flags (is-3d launch-asap bit6 bit7)) (sp-item 437 :flags (is-3d launch-asap bit6 bit7)) (sp-item 438 :flags (launch-asap bit6)) diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc index 0c161ba0ad..ae0db3b56e 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-scenes_REF.gc @@ -62,7 +62,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 32) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1414 :flags (bit7)) (sp-item 1415 :flags (bit7))) ) diff --git a/test/decompiler/reference/jak2/levels/castle/boss/casboss-part_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/casboss-part_REF.gc index 4890254bdf..96ca44daef 100644 --- a/test/decompiler/reference/jak2/levels/castle/boss/casboss-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/boss/casboss-part_REF.gc @@ -140,7 +140,7 @@ :id 1215 :flags (unk-4 unk-6 unk-7) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :scale (0.0 -16384.0 0.0) :parts ((sp-item 5203 :fade-after (meters 300) :falloff-to (meters 300) :flags (bit7))) ) @@ -579,7 +579,3 @@ (sp-flt spt-userdata 411648.0) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/common/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/common/ctywide-obs_REF.gc index 7c219f0d0a..58c6e886ed 100644 --- a/test/decompiler/reference/jak2/levels/city/common/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/ctywide-obs_REF.gc @@ -776,7 +776,7 @@ This commonly includes things such as: :id 185 :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 6) - :rotate ((degrees 1.3333334) (degrees 0) (degrees 0)) + :rotate ((degrees 30) (degrees 0) (degrees 0)) :parts ((sp-item 856 :flags (launch-asap bit7)) (sp-item 857 :flags (launch-asap bit7)) (sp-item 858 :flags (launch-asap bit7)) diff --git a/test/decompiler/reference/jak2/levels/city/common/ctywide-part_REF.gc b/test/decompiler/reference/jak2/levels/city/common/ctywide-part_REF.gc index 2b9e76d33b..364944e55c 100644 --- a/test/decompiler/reference/jak2/levels/city/common/ctywide-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/ctywide-part_REF.gc @@ -1064,7 +1064,7 @@ :id 182 :flags (unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 4)) + :rotate ((degrees 90) (degrees 0) (degrees 90)) :parts ((sp-item 844) (sp-item 845) (sp-item 846 :flags (bit7))) ) @@ -1288,7 +1288,3 @@ (sp-copy-from-other spt-scalevel-y -4) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc b/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc index 48c7991f6c..17f3f2c4ef 100644 --- a/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/ctywide-scenes_REF.gc @@ -446,7 +446,7 @@ :id 191 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 899 :flags (is-3d bit6 bit7) :period 130 :length 30) (sp-item 899 :flags (is-3d bit6 bit7) :period 150 :length 35 :offset 5) (sp-item 899 :flags (is-3d bit6 bit7) :period 330 :length 25 :offset 35) diff --git a/test/decompiler/reference/jak2/levels/city/common/vehicle-part_REF.gc b/test/decompiler/reference/jak2/levels/city/common/vehicle-part_REF.gc index ce337b7fc8..6b6edb3631 100644 --- a/test/decompiler/reference/jak2/levels/city/common/vehicle-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/vehicle-part_REF.gc @@ -326,7 +326,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 784 :flags (bit6) :period 900 :length 5) (sp-item 785 :flags (bit6) :period 900 :length 5) (sp-item 786 :period 900 :length 15) @@ -645,7 +645,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 801 :flags (bit7) :period 300 :length 5) (sp-item 802 :flags (bit7) :period 300 :length 160) (sp-item 802 :flags (bit7) :period 300 :length 100) @@ -779,7 +779,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc index 54024cb041..9deeed5c1c 100644 --- a/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc @@ -7,7 +7,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4462 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4463 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4464 :fade-after (meters 40) :falloff-to (meters 60) :flags (bit7) :period 1200 :length 15) @@ -239,7 +239,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4470 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4471 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) (sp-item 4472 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) @@ -322,7 +322,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4476 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4477 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4478 :fade-after (meters 40) :falloff-to (meters 60) :flags (bit7) :period 1200 :length 15) @@ -508,7 +508,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4470 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4471 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) (sp-item 4472 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) @@ -633,7 +633,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4482 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4483 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4484 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) diff --git a/test/decompiler/reference/jak2/levels/city/generic/ctygena-part_REF.gc b/test/decompiler/reference/jak2/levels/city/generic/ctygena-part_REF.gc index f62766fe2d..385489a3ad 100644 --- a/test/decompiler/reference/jak2/levels/city/generic/ctygena-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/generic/ctygena-part_REF.gc @@ -216,7 +216,7 @@ :id 824 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 128) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 3575 :flags (is-3d bit7)) (sp-item 3576 :fade-after (meters 400) :flags (bit6) :hour-mask #b111111111110000000) ) @@ -315,7 +315,7 @@ :id 826 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3579 :flags (is-3d launch-asap bit7)) (sp-item 3580 :flags (is-3d launch-asap bit7)) (sp-item 3581 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -397,7 +397,7 @@ :id 827 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3582 :flags (is-3d launch-asap bit7)) (sp-item 3583 :flags (is-3d launch-asap bit7)) (sp-item 3584 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -479,7 +479,7 @@ :id 828 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3585 :flags (is-3d launch-asap bit7)) (sp-item 3586 :flags (is-3d launch-asap bit7)) (sp-item 3587 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -723,7 +723,3 @@ (sp-launcher-by-id spt-next-launcher 3595) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/generic/ctygenb-part_REF.gc b/test/decompiler/reference/jak2/levels/city/generic/ctygenb-part_REF.gc index 62df858fad..e423d44138 100644 --- a/test/decompiler/reference/jak2/levels/city/generic/ctygenb-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/generic/ctygenb-part_REF.gc @@ -370,7 +370,7 @@ :id 839 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 3641 :fade-after (meters 200) :falloff-to (meters 250) :flags (bit7))) ) @@ -453,7 +453,7 @@ :id 841 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3644 :flags (is-3d launch-asap bit7)) (sp-item 3645 :flags (is-3d launch-asap bit7)) (sp-item 3646 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -535,7 +535,7 @@ :id 842 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3647 :flags (is-3d launch-asap bit7)) (sp-item 3648 :flags (is-3d launch-asap bit7)) (sp-item 3649 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -617,7 +617,7 @@ :id 843 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3650 :flags (is-3d launch-asap bit7)) (sp-item 3651 :flags (is-3d launch-asap bit7)) (sp-item 3652 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -920,7 +920,3 @@ (sp-flt spt-userdata 2048.0) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/generic/ctygenc-part_REF.gc b/test/decompiler/reference/jak2/levels/city/generic/ctygenc-part_REF.gc index a730fefef1..2bfaee767c 100644 --- a/test/decompiler/reference/jak2/levels/city/generic/ctygenc-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/generic/ctygenc-part_REF.gc @@ -279,7 +279,7 @@ :id 853 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3675 :flags (is-3d launch-asap bit7)) (sp-item 3676 :flags (is-3d launch-asap bit7)) (sp-item 3677 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -361,7 +361,7 @@ :id 854 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3678 :flags (is-3d launch-asap bit7)) (sp-item 3679 :flags (is-3d launch-asap bit7)) (sp-item 3680 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -443,7 +443,7 @@ :id 855 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3681 :flags (is-3d launch-asap bit7)) (sp-item 3682 :flags (is-3d launch-asap bit7)) (sp-item 3683 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -525,7 +525,7 @@ :id 856 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3684 :flags (is-3d launch-asap bit7)) (sp-item 3685 :flags (is-3d launch-asap bit7)) (sp-item 3683 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -706,7 +706,3 @@ (sp-launcher-by-id spt-next-launcher 3691) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/industrial/ctyinda-part_REF.gc b/test/decompiler/reference/jak2/levels/city/industrial/ctyinda-part_REF.gc index 529ceb228a..679d06769f 100644 --- a/test/decompiler/reference/jak2/levels/city/industrial/ctyinda-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/industrial/ctyinda-part_REF.gc @@ -217,7 +217,7 @@ :id 974 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4287 :flags (is-3d launch-asap bit7)) (sp-item 4288 :flags (is-3d launch-asap bit7)) (sp-item 4289 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -299,7 +299,7 @@ :id 975 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4290 :flags (is-3d launch-asap bit7)) (sp-item 4291 :flags (is-3d launch-asap bit7)) (sp-item 4292 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -380,7 +380,7 @@ :id 976 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4293 :flags (is-3d launch-asap bit7)) (sp-item 4294 :flags (is-3d launch-asap bit7)) (sp-item 4295 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -854,7 +854,3 @@ (defpart 4315 :init-specs ((sp-rnd-flt spt-fade-a -0.12 -0.16 1.0)) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/industrial/ctyindb-part_REF.gc b/test/decompiler/reference/jak2/levels/city/industrial/ctyindb-part_REF.gc index 22322998d9..816cb88beb 100644 --- a/test/decompiler/reference/jak2/levels/city/industrial/ctyindb-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/industrial/ctyindb-part_REF.gc @@ -217,7 +217,7 @@ :id 992 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4325 :flags (is-3d launch-asap bit7)) (sp-item 4326 :flags (is-3d launch-asap bit7)) (sp-item 4327 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -299,7 +299,7 @@ :id 993 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4328 :flags (is-3d launch-asap bit7)) (sp-item 4329 :flags (is-3d launch-asap bit7)) (sp-item 4330 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -380,7 +380,7 @@ :id 994 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4331 :flags (is-3d launch-asap bit7)) (sp-item 4332 :flags (is-3d launch-asap bit7)) (sp-item 4333 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -854,7 +854,3 @@ (defpart 4353 :init-specs ((sp-rnd-flt spt-fade-a -0.12 -0.16 1.0)) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc index 65efc06636..7b989bb78e 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc @@ -7,7 +7,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4354 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4355 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4356 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) @@ -167,7 +167,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4360 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4361 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4362 :fade-after (meters 40) :falloff-to (meters 60) :flags (bit7) :period 1200 :length 15) @@ -396,7 +396,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4367 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4368 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4369 :fade-after (meters 60) :falloff-to (meters 90) :flags (bit7) :period 1200 :length 15) @@ -654,7 +654,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4377 :fade-after (meters 40) :falloff-to (meters 80) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 4378 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4379 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) @@ -865,7 +865,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4384 :fade-after (meters 100) :falloff-to (meters 120) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 4385 :fade-after (meters 100) :falloff-to (meters 120) :flags (bit7) :period 1200 :length 30) (sp-item 4386 :fade-after (meters 90) :falloff-to (meters 110) :flags (bit7) :period 1200 :length 40) diff --git a/test/decompiler/reference/jak2/levels/city/market/ctymarka-part_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ctymarka-part_REF.gc index ff0fef5d3e..b26f838f57 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ctymarka-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ctymarka-part_REF.gc @@ -198,7 +198,7 @@ :id 1013 :flags (unk-4 unk-6) :bounds (static-bspherem 0 5 0 8) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 4397 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 500) (sp-item 4398 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 600) (sp-item 4399 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 700) @@ -740,7 +740,3 @@ (sp-flt spt-rotate-y (degrees -90.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/market/ctymarkb-part_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ctymarkb-part_REF.gc index fac2571ffb..945de30630 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ctymarkb-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ctymarkb-part_REF.gc @@ -434,7 +434,7 @@ :id 1023 :flags (unk-4 unk-6) :bounds (static-bspherem 0 5 0 8) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 4439 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 500) (sp-item 4440 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 600) (sp-item 4441 :flags (is-3d bit6 bit7) :period 600 :length 100 :offset 700) @@ -976,7 +976,3 @@ (sp-flt spt-rotate-y (degrees -90.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc b/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc index 43cc7356ca..11420cf8ff 100644 --- a/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/onin_tent/onintent-scenes_REF.gc @@ -407,7 +407,7 @@ :id 796 :flags (unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 3478 :flags (is-3d bit6 bit7)) (sp-item 3479 :flags (bit6)) (sp-item 3480 :flags (bit7))) ) @@ -416,7 +416,7 @@ :id 797 :flags (unk-6 unk-7) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :scale (16384.0 0.0 0.0) :parts ((sp-item 3478 :flags (is-3d bit6 bit7)) (sp-item 3481 :flags (bit6))) ) diff --git a/test/decompiler/reference/jak2/levels/city/oracle/oracle-part_REF.gc b/test/decompiler/reference/jak2/levels/city/oracle/oracle-part_REF.gc index 230d9317b3..2fb8d7b88f 100644 --- a/test/decompiler/reference/jak2/levels/city/oracle/oracle-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/oracle/oracle-part_REF.gc @@ -173,7 +173,7 @@ :id 819 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3554 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 3555 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 3556 :fade-after (meters 60) :flags (bit6 bit7)) @@ -454,7 +454,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc b/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc index 7b5a9fd18d..be34df110c 100644 --- a/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc @@ -585,7 +585,7 @@ :duration (seconds 0.017) :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 -12 0 24) - :rotate ((degrees 0) (degrees 8) (degrees 0)) + :rotate ((degrees 0) (degrees 180) (degrees 0)) :parts ((sp-item 4172 :fade-after (meters 160) :falloff-to (meters 60) :flags (bit7))) ) @@ -971,7 +971,7 @@ :id 952 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4188 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 4189 :fade-after (meters 100) :flags (bit6 bit7)) (sp-item 4190 :fade-after (meters 60) :flags (bit6 bit7)) @@ -1196,7 +1196,7 @@ :id 955 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4198 :flags (is-3d launch-asap bit7)) (sp-item 4199 :flags (is-3d launch-asap bit7)) (sp-item 4200 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -1277,7 +1277,7 @@ :id 956 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4201 :flags (is-3d launch-asap bit7)) (sp-item 4202 :flags (is-3d launch-asap bit7)) (sp-item 4203 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -1358,7 +1358,7 @@ :id 957 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4204 :flags (is-3d launch-asap bit7)) (sp-item 4205 :flags (is-3d launch-asap bit7)) (sp-item 4203 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -1420,7 +1420,7 @@ :id 958 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4206 :flags (is-3d launch-asap bit7)) (sp-item 4207 :flags (is-3d launch-asap bit7)) (sp-item 4200 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -1482,7 +1482,7 @@ :id 959 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4208 :flags (is-3d launch-asap bit7)) (sp-item 4209 :flags (is-3d launch-asap bit7)) (sp-item 4200 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -1544,7 +1544,7 @@ :id 960 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4210 :flags (is-3d launch-asap bit7)) (sp-item 4211 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1626,7 +1626,7 @@ :id 961 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4213 :flags (is-3d launch-asap bit7)) (sp-item 4214 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1688,7 +1688,7 @@ :id 962 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4215 :flags (is-3d launch-asap bit7)) (sp-item 4216 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1750,7 +1750,7 @@ :id 963 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4217 :flags (is-3d launch-asap bit7)) (sp-item 4218 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1812,7 +1812,7 @@ :id 964 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4219 :flags (is-3d launch-asap bit7)) (sp-item 4220 :flags (is-3d launch-asap bit7)) (sp-item 4212 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -2098,7 +2098,7 @@ :id 967 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 24) - :rotate ((degrees 0) (degrees -3.942222) (degrees 0)) + :rotate ((degrees 0) (degrees -88.7) (degrees 0)) :parts ((sp-item 4226 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4227 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4228 :flags (is-3d launch-asap bit6 bit7)) @@ -2932,7 +2932,7 @@ :id 968 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 24) - :rotate ((degrees 0) (degrees -3.942222) (degrees 0)) + :rotate ((degrees 0) (degrees -88.7) (degrees 0)) :parts ((sp-item 4251 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4252 :flags (is-3d launch-asap bit6 bit7)) (sp-item 4253 :flags (is-3d launch-asap bit6 bit7)) @@ -3913,7 +3913,7 @@ This commonly includes things such as: :id 969 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 2.2222223) (degrees 0) (degrees 0)) + :rotate ((degrees 50.000004) (degrees 0) (degrees 0)) :parts ((sp-item 4276 :fade-after (meters 400) :flags (is-3d bit6 bit7)) (sp-item 4277 :fade-after (meters 200))) ) @@ -4054,7 +4054,3 @@ This commonly includes things such as: (go (method-of-object obj idle)) (none) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/slums/ctysluma-part_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/ctysluma-part_REF.gc index c8f2abd9b6..2ef5256243 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/ctysluma-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/ctysluma-part_REF.gc @@ -952,7 +952,7 @@ :id 867 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3728 :flags (is-3d launch-asap bit7)) (sp-item 3729 :flags (is-3d launch-asap bit7)) (sp-item 3730 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1034,7 +1034,7 @@ :id 868 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3731 :flags (is-3d launch-asap bit7)) (sp-item 3732 :flags (is-3d launch-asap bit7)) (sp-item 3730 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1096,7 +1096,7 @@ :id 869 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3733 :flags (is-3d launch-asap bit7)) (sp-item 3734 :flags (is-3d launch-asap bit7)) (sp-item 3735 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1177,7 +1177,7 @@ :id 870 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3736 :flags (is-3d launch-asap bit7)) (sp-item 3737 :flags (is-3d launch-asap bit7)) (sp-item 3738 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1258,7 +1258,7 @@ :id 871 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3739 :flags (is-3d launch-asap bit7)) (sp-item 3740 :flags (is-3d launch-asap bit7)) (sp-item 3738 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1320,7 +1320,7 @@ :id 872 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3741 :flags (is-3d launch-asap bit7)) (sp-item 3742 :flags (is-3d launch-asap bit7)) (sp-item 3738 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1376,7 +1376,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/slums/ctyslumb-part_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/ctyslumb-part_REF.gc index bb709c40b0..f1a0d73ad7 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/ctyslumb-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/ctyslumb-part_REF.gc @@ -612,7 +612,7 @@ :id 878 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3864 :flags (is-3d launch-asap bit7)) (sp-item 3865 :flags (is-3d launch-asap bit7)) (sp-item 3866 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -694,7 +694,7 @@ :id 879 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3867 :flags (is-3d launch-asap bit7)) (sp-item 3868 :flags (is-3d launch-asap bit7)) (sp-item 3866 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -756,7 +756,7 @@ :id 880 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3869 :flags (is-3d launch-asap bit7)) (sp-item 3870 :flags (is-3d launch-asap bit7)) (sp-item 3871 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -837,7 +837,7 @@ :id 881 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3872 :flags (is-3d launch-asap bit7)) (sp-item 3873 :flags (is-3d launch-asap bit7)) (sp-item 3871 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -899,7 +899,7 @@ :id 882 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3874 :flags (is-3d launch-asap bit7)) (sp-item 3875 :flags (is-3d launch-asap bit7)) (sp-item 3876 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -980,7 +980,7 @@ :id 883 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3877 :flags (is-3d launch-asap bit7)) (sp-item 3878 :flags (is-3d launch-asap bit7)) (sp-item 3876 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -1042,7 +1042,7 @@ :id 884 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3879 :flags (is-3d launch-asap bit7)) (sp-item 3880 :flags (is-3d launch-asap bit7)) (sp-item 3876 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -1372,7 +1372,3 @@ (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 360.0) 1.0) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/slums/ctyslumc-part_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/ctyslumc-part_REF.gc index aa641eeaa9..f6af2c7897 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/ctyslumc-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/ctyslumc-part_REF.gc @@ -235,7 +235,7 @@ :id 891 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3900 :flags (is-3d launch-asap bit7)) (sp-item 3901 :flags (is-3d launch-asap bit7)) (sp-item 3902 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111111111100000) @@ -316,7 +316,7 @@ :id 892 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3903 :flags (is-3d launch-asap bit7)) (sp-item 3904 :flags (is-3d launch-asap bit7)) (sp-item 3905 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -398,7 +398,7 @@ :id 893 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 3906 :flags (is-3d launch-asap bit7)) (sp-item 3907 :flags (is-3d launch-asap bit7)) (sp-item 3908 :fade-after (meters 200) :flags (bit6) :hour-mask #b11111111111111000000) @@ -473,7 +473,3 @@ (sp-flt spt-userdata 2048.0) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc index c03a3db7ba..972fcb695f 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc @@ -8,7 +8,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 744 :flags (bit6) :period 900 :length 5) (sp-item 745 :flags (bit6) :period 900 :length 5) @@ -27,7 +27,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 744 :flags (bit6) :period 900 :length 5) (sp-item 745 :flags (bit6) :period 900 :length 5) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc index 11025bc346..cb0a5ee14d 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc @@ -8,7 +8,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 726 :flags (bit6) :period 900 :length 5) (sp-item 727 :flags (bit6) :period 900 :length 5) diff --git a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc index 0f52b32ea2..dad79206e5 100644 --- a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc @@ -12,7 +12,7 @@ :duration (seconds 0.267) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 586 :flags (is-3d launch-asap bit7)) (sp-item 587 :flags (launch-asap)) (sp-item 588 :flags (bit7))) ) @@ -133,7 +133,7 @@ :linger-duration (seconds 2) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 591 :flags (bit6 bit7)) (sp-item 592 :flags (bit6 bit7)) (sp-item 593 :flags (bit7)) @@ -148,7 +148,7 @@ :linger-duration (seconds 2) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 595 :fade-after (meters 120) :falloff-to (meters 90) :flags (bit7)) (sp-item 596 :fade-after (meters 120) :falloff-to (meters 90) :flags (bit7)) (sp-item 597 :flags (bit6 bit7)) diff --git a/test/decompiler/reference/jak2/levels/consite/consite-part_REF.gc b/test/decompiler/reference/jak2/levels/consite/consite-part_REF.gc index eb7f392c77..91a92ce719 100644 --- a/test/decompiler/reference/jak2/levels/consite/consite-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/consite/consite-part_REF.gc @@ -28,7 +28,7 @@ :id 1167 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 5) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5071 :flags (bit6 bit7) :hour-mask #b111111111110000000) (sp-item 5072 :flags (bit6 bit7) :hour-mask #b111111111110000000) ) @@ -433,7 +433,3 @@ (defpart 5087 :init-specs ((sp-rnd-flt spt-fade-a -0.48 -0.48 1.0)) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/consite/consiteb-part_REF.gc b/test/decompiler/reference/jak2/levels/consite/consiteb-part_REF.gc index 8a97f6ac4f..207215d81b 100644 --- a/test/decompiler/reference/jak2/levels/consite/consiteb-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/consite/consiteb-part_REF.gc @@ -75,7 +75,7 @@ :id 1185 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5114 :fade-after (meters 120) :flags (bit6 bit7) :period 300 :length 5)) ) @@ -103,7 +103,7 @@ :id 1186 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5115 :fade-after (meters 120) :flags (bit6 bit7) :period 150 :length 5)) ) @@ -125,7 +125,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc index 2828a37e2a..417b75de33 100644 --- a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc @@ -1178,7 +1178,7 @@ :id 1290 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5474 :flags (is-3d launch-asap bit7)) (sp-item 5475 :flags (is-3d launch-asap bit7)) (sp-item 5476 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1260,7 +1260,7 @@ :id 1291 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5477 :flags (is-3d launch-asap bit7)) (sp-item 5478 :flags (is-3d launch-asap bit7)) (sp-item 5479 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1341,7 +1341,7 @@ :id 1292 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5480 :flags (is-3d launch-asap bit7)) (sp-item 5481 :flags (is-3d launch-asap bit7)) (sp-item 5482 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1422,7 +1422,7 @@ :id 1293 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5483 :flags (is-3d launch-asap bit7)) (sp-item 5484 :flags (is-3d launch-asap bit7))) ) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-part_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-part_REF.gc index 30c4127dec..2311f37f4e 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-part_REF.gc @@ -768,7 +768,7 @@ :id 1159 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 16) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5038 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) (sp-item 5039 :fade-after (meters 120) :falloff-to (meters 120) :period 40 :length 5 :binding 5030) (sp-item 5030 :flags (start-dead launch-asap bit7)) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc index 2caa064e3b..b0c5ff91e0 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-scenes_REF.gc @@ -27,7 +27,7 @@ :id 1151 :flags (unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 4989 :flags (is-3d bit6 bit7)) (sp-item 4990 :flags (bit6 bit7)) (sp-item 4991 :flags (bit7))) ) diff --git a/test/decompiler/reference/jak2/levels/drill_platform/drill-baron_REF.gc b/test/decompiler/reference/jak2/levels/drill_platform/drill-baron_REF.gc new file mode 100644 index 0000000000..a170c6a57e --- /dev/null +++ b/test/decompiler/reference/jak2/levels/drill_platform/drill-baron_REF.gc @@ -0,0 +1,2243 @@ +;;-*-Lisp-*- +(in-package goal) + +;; failed to figure out what this is: +(defpartgroup group-turret-warning + :id 458 + :duration (seconds 0.2) + :linger-duration (seconds 1) + :flags (use-local-clock) + :bounds (static-bspherem 0 0 0 15) + :parts ((sp-item 2037 :flags (bit7) :period 930 :length 40)) + ) + +;; failed to figure out what this is: +(defpartgroup group-turret-warning-down + :id 459 + :duration (seconds 0.2) + :linger-duration (seconds 1) + :flags (use-local-clock unk-6) + :bounds (static-bspherem 0 0 0 15) + :rotate ((degrees 180) (degrees 0) (degrees 0)) + :parts ((sp-item 2037 :flags (bit7) :period 930 :length 40)) + ) + +;; failed to figure out what this is: +(defpartgroup group-turret-warning-side + :id 460 + :duration (seconds 0.2) + :linger-duration (seconds 1) + :flags (use-local-clock unk-6) + :bounds (static-bspherem 0 0 0 15) + :rotate ((degrees 90) (degrees 90) (degrees 0)) + :parts ((sp-item 2037 :flags (bit7) :period 930 :length 40)) + ) + +;; failed to figure out what this is: +(defpart 2037 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-flt spt-num 16.0) + (sp-flt spt-x (meters 4)) + (sp-flt spt-y (meters 1)) + (sp-rnd-flt spt-scale-x (meters 1) (meters 1) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 128.0 128.0 1.0) + (sp-copy-from-other spt-g -1) + (sp-copy-from-other spt-b -1) + (sp-rnd-flt spt-a 32.0 32.0 1.0) + (sp-rnd-flt spt-vel-x (meters 0.026666667) (meters 0.026666667) 1.0) + (sp-rnd-flt spt-vel-y (meters 0.026666667) (meters 0.026666667) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.016666668) (meters 0.016666668) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -0.12) (degrees 0.24) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-rnd-flt spt-accel-y -1.3653333 -1.3653333 1.0) + (sp-flt spt-friction 0.94) + (sp-int spt-timer 450) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-12) + (sp-int-plain-rnd spt-next-time 35 14 1) + (sp-launcher-by-id spt-next-launcher 2038) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 3600.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2038 + :init-specs ((sp-rnd-flt spt-fade-a -0.14222223 -0.42666668 1.0)) + ) + +;; failed to figure out what this is: +(defpartgroup group-barons-ship-light1 + :id 461 + :bounds (static-bspherem 0 0 0 1) + :parts ((sp-item 2039 :flags (bit6) :period 375 :length 5)) + ) + +;; failed to figure out what this is: +(defpartgroup group-barons-ship-light2 + :id 462 + :bounds (static-bspherem 0 0 0 1) + :parts ((sp-item 2039 :flags (bit6) :period 375 :length 5 :offset 75)) + ) + +;; failed to figure out what this is: +(defpartgroup group-barons-ship-light3 + :id 463 + :bounds (static-bspherem 0 0 0 1) + :parts ((sp-item 2039 :flags (bit6) :period 375 :length 5 :offset 150)) + ) + +;; failed to figure out what this is: +(defpartgroup group-barons-ship-light4 + :id 464 + :bounds (static-bspherem 0 0 0 1) + :parts ((sp-item 2039 :flags (bit6) :period 375 :length 5 :offset 225)) + ) + +;; failed to figure out what this is: +(defpartgroup group-barons-ship-light5 + :id 465 + :bounds (static-bspherem 0 0 0 1) + :parts ((sp-item 2039 :flags (bit6) :period 375 :length 5 :offset 300)) + ) + +;; failed to figure out what this is: +(defpart 2039 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbc :page #xc)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-scale-x (meters 3) (meters 0.5) 1.0) + (sp-flt spt-rot-x 1024.0) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-rnd-flt spt-g 0.0 128.0 1.0) + (sp-flt spt-b 0.0) + (sp-rnd-flt spt-a 64.0 32.0 1.0) + (sp-flt spt-omega 4097638.5) + (sp-int spt-timer 75) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 2048.0) + (sp-func spt-func 'sparticle-track-root) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-turret-smoke-trail + :id 466 + :linger-duration (seconds 1.5) + :bounds (static-bspherem 0 0 0 6) + :parts ((sp-item 2040 :flags (bit7)) (sp-item 2041 :flags (bit6 bit7))) + ) + +;; failed to figure out what this is: +(defpartgroup group-turret-smoke-trail-down + :id 467 + :linger-duration (seconds 1.5) + :flags (unk-6) + :bounds (static-bspherem 0 0 0 6) + :rotate ((degrees 180) (degrees 0) (degrees 0)) + :parts ((sp-item 2040 :flags (bit7)) (sp-item 2041 :flags (bit6 bit7))) + ) + +;; failed to figure out what this is: +(defpartgroup group-turret-smoke-trail-side + :id 468 + :linger-duration (seconds 1.5) + :flags (unk-6) + :bounds (static-bspherem 0 0 0 6) + :rotate ((degrees 90) (degrees 90) (degrees 0)) + :parts ((sp-item 2040 :flags (bit7)) (sp-item 2041 :flags (bit6 bit7))) + ) + +;; failed to figure out what this is: +(defpart 2041 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbc :page #xc)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-x (meters 0) (meters 2) 1.0) + (sp-flt spt-y (meters 1)) + (sp-rnd-flt spt-scale-x (meters 12) (meters 3) 1.0) + (sp-flt spt-rot-x 1228.8) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 3600.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-rnd-flt spt-g 64.0 128.0 1.0) + (sp-rnd-flt spt-b 0.0 64.0 1.0) + (sp-rnd-flt spt-a 12.0 4.0 1.0) + (sp-flt spt-omega 822476.8) + (sp-flt spt-fade-a -0.8) + (sp-int spt-timer 20) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 6144.0) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 3600.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2040 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-func spt-birth-func 'birth-func-texture-group) + (sp-flt spt-num 0.5) + (sp-rnd-flt spt-x (meters 0) (meters 4) 1.0) + (sp-rnd-flt spt-scale-x (meters 8) (meters 4) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 246.0) + (sp-flt spt-b 149.0) + (sp-rnd-flt spt-a 32.0 32.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.1) (meters 0.033333335) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.026666667) (meters 0.006666667) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -0.2) (degrees 0.4) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -0.14666666) + (sp-flt spt-fade-g -0.7866667) + (sp-flt spt-fade-b -0.88) + (sp-rnd-flt spt-fade-a -0.053333335 -0.053333335 1.0) + (sp-rnd-flt spt-accel-x 5.4613333 1.3653333 1.0) + (sp-rnd-flt spt-accel-y 0.4096 0.4096 1.0) + (sp-flt spt-friction 0.96) + (sp-int spt-timer 2400) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 use-global-acc) + (new 'static 'sp-field-init-spec + :field (sp-field-id spt-userdata) + :flags (sp-flag plain-v2) + :object (new 'static 'boxed-array :type int32 40 1 0 #xc00000 #xc00000 #xc03300) + ) + (sp-int-plain-rnd spt-next-time 50 24 1) + (sp-launcher-by-id spt-next-launcher 2042) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 3600.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2042 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.013333334) (meters 0.0033333334) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-int-plain-rnd spt-next-time 75 24 1) + (sp-launcher-by-id spt-next-launcher 2043) + ) + ) + +;; failed to figure out what this is: +(defpart 2043 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.006666667) (meters 0.0016666667) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -2.33) + (sp-flt spt-fade-g -1.28) + (sp-flt spt-fade-b -0.17) + (sp-int-plain-rnd spt-next-time 75 24 1) + (sp-launcher-by-id spt-next-launcher 2044) + ) + ) + +;; failed to figure out what this is: +(defpart 2044 + :init-specs ((sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g 0.0) + (sp-flt spt-fade-b 0.0) + (sp-rnd-flt spt-fade-a -0.03 -0.24 1.0) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-drill-barons-ship-explosion + :id 469 + :duration (seconds 3) + :linger-duration (seconds 2) + :flags (use-local-clock) + :bounds (static-bspherem 0 0 0 2) + :parts ((sp-item 2045 :period 9600 :length 25) + (sp-item 2046 :period 9600 :length 10 :offset 10) + (sp-item 2047 :period 9600 :length 50 :offset 25) + (sp-item 2048 :period 9600 :length 35 :offset 10) + (sp-item 2049 :period 9600 :length 50 :offset 15) + (sp-item 2050 :period 9600 :length 5) + (sp-item 2051 :period 9600 :length 50 :offset 15) + (sp-item 2052 :period 9600 :length 5) + (sp-item 2053 :flags (is-3d) :period 9600 :length 5) + ) + ) + +;; failed to figure out what this is: +(defpart 2053 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2c :page #xc)) + (sp-flt spt-num 8.0) + (sp-flt spt-scale-x (meters 16)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-copy-from-other spt-g -1) + (sp-flt spt-b 128.0) + (sp-flt spt-a 136.0) + (sp-flt spt-scalevel-x (meters 2)) + (sp-flt spt-rotvel-y (degrees 0.1)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -1.0625) + (sp-flt spt-fade-g -2.125) + (sp-flt spt-fade-b -2.1333334) + (sp-flt spt-fade-a -3.2) + (sp-int spt-timer 320) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-14) + (sp-int spt-next-time 40) + (sp-launcher-by-id spt-next-launcher 2054) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 3600.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2054 + :init-specs ((sp-flt spt-fade-a -0.06666667)) + ) + +;; failed to figure out what this is: +(defpart 2050 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters -2.5)) + (sp-flt spt-scale-x (meters 32)) + (sp-flt spt-rot-x 8192.0) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 255.0) + (sp-flt spt-a 96.0) + (sp-flt spt-scalevel-x (meters 0.26666668)) + (sp-flt spt-rotvel-z (degrees 0.3)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g -1.28) + (sp-flt spt-fade-b -5.1) + (sp-flt spt-fade-a 0.0) + (sp-int spt-timer 65) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 122880.0) + (sp-int spt-next-time 30) + (sp-launcher-by-id spt-next-launcher 2055) + ) + ) + +;; failed to figure out what this is: +(defpart 2055 + :init-specs ((sp-flt spt-scalevel-x (meters -0.22857143)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g -3.6571429) + (sp-flt spt-fade-b 0.0) + (sp-flt spt-fade-a -2.7428572) + ) + ) + +;; failed to figure out what this is: +(defpart 2052 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-scale-x (meters 120)) + (sp-flt spt-rot-x 8192.0) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 255.0) + (sp-flt spt-a 24.0) + (sp-flt spt-scalevel-x (meters 0.4)) + (sp-flt spt-rotvel-z (degrees 0.3)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g -4.266667) + (sp-flt spt-fade-b -4.266667) + (sp-flt spt-fade-a 0.0) + (sp-int spt-timer 150) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-14 glow) + (sp-flt spt-userdata 409600.0) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 2056) + ) + ) + +;; failed to figure out what this is: +(defpart 2056 + :init-specs ((sp-flt spt-scalevel-x (meters 0)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -0.85333335) + (sp-flt spt-fade-g -1.7066667) + (sp-flt spt-fade-b -1.7066667) + (sp-flt spt-fade-a -0.64) + ) + ) + +;; failed to figure out what this is: +(defpart 2048 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x92 :page #xc)) + (sp-flt spt-num 16.0) + (sp-flt spt-y (meters 0)) + (sp-flt spt-scale-x (meters 2.5)) + (sp-int spt-rot-x 4) + (sp-rnd-flt spt-scale-y (meters 0.2) (meters 0.3) 1.0) + (sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 255.0) + (sp-rnd-flt spt-a 64.0 32.0 1.0) + (sp-flt spt-omega 12.288) + (sp-rnd-flt spt-vel-y (meters 0.53333336) (meters 0.33333334) 1.0) + (sp-flt spt-fade-b -8.0) + (sp-rnd-flt spt-accel-y -13.653334 -6.826667 1.0) + (sp-rnd-flt spt-friction 0.9 0.08 1.0) + (sp-int-plain-rnd spt-timer 450 299 1) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + (sp-func spt-func 'sparticle-motion-blur) + (sp-int spt-next-time 15) + (sp-launcher-by-id spt-next-launcher 2057) + (sp-rnd-flt spt-conerot-x (degrees 0.0) (degrees 3600.0) 1.0) + (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-flt spt-rotate-y (degrees 90.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 2057 + :init-specs ((sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 0.0) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g -2.6133332) + (sp-flt spt-fade-b -1.7066667) + (sp-rnd-flt spt-fade-a -0.096 -0.096 1.0) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 2058) + ) + ) + +;; failed to figure out what this is: +(defpart 2058 + :init-specs ((sp-flt spt-fade-r 0.0) (sp-flt spt-fade-g 0.0) (sp-flt spt-fade-b 0.0)) + ) + +;; failed to figure out what this is: +(defpart 2051 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x34 :page #xc)) + (sp-flt spt-num 5.0) + (sp-flt spt-y (meters -2.5)) + (sp-rnd-flt spt-scale-x (meters 6) (meters 8) 1.0) + (sp-int spt-rot-x 4) + (new 'static 'sp-field-init-spec + :field (sp-field-id spt-rot-z) + :flags (sp-flag spflag7) + :random-rangef 655360.0 + :random-multf 1.0 + ) + (sp-rnd-flt spt-scale-y (meters 20) (meters 8) 1.0) + (sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 255.0) + (sp-rnd-flt spt-a 16.0 16.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.1) (meters 0.4) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.26666668) (meters 0.13333334) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g -0.36) + (sp-flt spt-fade-b -4.24) + (sp-flt spt-fade-a -0.13333334) + (sp-rnd-flt spt-friction 0.92 0.02 1.0) + (sp-int spt-timer 1000) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-func spt-func 'sparticle-motion-blur) + (sp-int spt-next-time 25) + (sp-launcher-by-id spt-next-launcher 2059) + (new 'static 'sp-field-init-spec + :field (sp-field-id spt-conerot-x) + :flags (sp-flag from-pointer) + :func '*sp-temp* + ) + (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-flt spt-rotate-y (degrees 90.0)) + (sp-rnd-flt spt-conerot-radius (meters 0) (meters 2) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2059 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.016666668) (meters 0.016666668) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -0.55) + (sp-flt spt-fade-g -2.95) + (sp-flt spt-fade-b -3.3) + (sp-int-plain-rnd spt-next-time 30 9 1) + (sp-launcher-by-id spt-next-launcher 2060) + ) + ) + +;; failed to figure out what this is: +(defpart 2060 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.008333334) (meters 0.008333334) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -1.2944444) + (sp-flt spt-fade-g -0.7111111) + (sp-flt spt-fade-b -0.2) + (sp-rnd-flt spt-fade-a -0.1 -0.1 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2049 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x33 :page #xc)) + (sp-func spt-birth-func 'birth-func-texture-group) + (sp-rnd-flt spt-num 16.0 10.0 1.0) + (sp-flt spt-y (meters -2.5)) + (sp-rnd-flt spt-scale-x (meters 6) (meters 4) 1.0) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-rnd-flt spt-scale-y (meters 12.8) (meters 2.4) 1.0) + (sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 255.0) + (sp-rnd-flt spt-a 32.0 32.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.06666667) (meters 0.2) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.26666668) (meters 0.2) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -0.3) (degrees 0.6) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g -0.36) + (sp-flt spt-fade-b -4.24) + (sp-flt spt-fade-a -0.32) + (sp-flt spt-friction 0.94) + (sp-int spt-timer 1000) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (new 'static 'sp-field-init-spec + :field (sp-field-id spt-userdata) + :flags (sp-flag plain-v2) + :object (new 'static 'boxed-array :type int32 40 1 0 #xc00000 #xc03300) + ) + (sp-int spt-next-time 25) + (sp-launcher-by-id spt-next-launcher 2061) + (sp-rnd-flt spt-conerot-x (degrees 0.0) (degrees 3600.0) 1.0) + (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-flt spt-rotate-y (degrees 90.0)) + (sp-rnd-flt spt-conerot-radius (meters 0) (meters 8) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2061 + :init-specs ((sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g 0.0) + (sp-flt spt-fade-b 0.0) + (sp-int-plain-rnd spt-next-time 5 19 1) + (sp-launcher-by-id spt-next-launcher 2062) + ) + ) + +;; failed to figure out what this is: +(defpart 2062 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.016666668) (meters 0.016666668) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -0.44) + (sp-flt spt-fade-g -2.36) + (sp-flt spt-fade-b -2.64) + (sp-int-plain-rnd spt-next-time 35 14 1) + (sp-launcher-by-id spt-next-launcher 2063) + ) + ) + +;; failed to figure out what this is: +(defpart 2063 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.008333334) (meters 0.008333334) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -1.2) + (sp-flt spt-fade-g -0.7111111) + (sp-flt spt-fade-b -0.2) + (sp-rnd-flt spt-fade-a -0.06545454 -0.06545454 1.0) + (sp-int-plain-rnd spt-next-time 150 29 1) + (sp-launcher-by-id spt-next-launcher 2064) + ) + ) + +;; failed to figure out what this is: +(defpart 2064 + :init-specs ((sp-flt spt-fade-r 0.0) (sp-flt spt-fade-g 0.0) (sp-flt spt-fade-b 0.0) (sp-flt spt-fade-a -0.1125)) + ) + +;; failed to figure out what this is: +(defpart 2047 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x32 :page #xc)) + (sp-rnd-flt spt-num 16.0 4.0 1.0) + (sp-flt spt-x (meters 0.25)) + (sp-flt spt-y (meters -2.5)) + (sp-rnd-flt spt-scale-x (meters 4) (meters 4) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 255.0) + (sp-rnd-flt spt-a 32.0 48.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.13333334) (meters 0.8) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.02) (meters 0.02) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -0.12) (degrees 0.24) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g -0.18) + (sp-flt spt-fade-b -2.12) + (sp-rnd-flt spt-accel-y -5.4613333 -23.210667 1.0) + (sp-rnd-flt spt-friction 0.84 0.02 1.0) + (sp-int spt-timer 3000) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-int-plain-rnd spt-next-time 35 14 1) + (sp-launcher-by-id spt-next-launcher 2065) + (sp-rnd-flt spt-conerot-x (degrees 0.0) (degrees 3600.0) 1.0) + (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-flt spt-rotate-y (degrees 90.0)) + (sp-rnd-flt spt-conerot-radius (meters 3) (meters 5) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2065 + :init-specs ((sp-flt spt-scalevel-x (meters 0.0016666667)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 0.0) + (sp-flt spt-fade-g 0.02) + (sp-flt spt-fade-b 0.23555556) + (sp-int-plain-rnd spt-next-time 45 14 1) + (sp-launcher-by-id spt-next-launcher 2066) + ) + ) + +;; failed to figure out what this is: +(defpart 2066 + :init-specs ((sp-flt spt-fade-r -0.5543478) + (sp-flt spt-fade-g -0.5543478) + (sp-flt spt-fade-b -0.5543478) + (sp-rnd-flt spt-fade-a -0.13333334 -0.10666667 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2045 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-rnd-flt spt-num 12.0 8.0 1.0) + (sp-flt spt-y (meters -2.5)) + (sp-rnd-flt spt-scale-x (meters 16.5) (meters 16) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 70.0 20.0 1.0) + (sp-rnd-flt spt-g 70.0 20.0 1.0) + (sp-rnd-flt spt-b 70.0 20.0 1.0) + (sp-rnd-flt spt-a 0.0 40.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.06666667) (meters 0.33333334) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.033333335) (meters 0.086666666) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -0.12) (degrees 0.24) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r 3.3) + (sp-flt spt-fade-g 3.12) + (sp-flt spt-fade-b 1.18) + (sp-flt spt-fade-a 1.76) + (sp-flt spt-friction 0.89) + (sp-int spt-timer 710) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + (sp-int-plain-rnd spt-next-time 35 14 1) + (sp-launcher-by-id spt-next-launcher 2067) + (sp-rnd-flt spt-conerot-x (degrees 0.0) (degrees 3600.0) 1.0) + (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-flt spt-rotate-y (degrees 90.0)) + (sp-rnd-flt spt-conerot-radius (meters 0) (meters 16) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 2067 + :init-specs ((sp-flt spt-scalevel-x (meters 0.0033333334)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -0.53333336) + (sp-flt spt-fade-g -1.9666667) + (sp-flt spt-fade-b -2.2) + (sp-flt spt-fade-a -0.41666666) + (sp-int-plain-rnd spt-next-time 45 14 1) + (sp-launcher-by-id spt-next-launcher 2068) + ) + ) + +;; failed to figure out what this is: +(defpart 2068 + :init-specs ((sp-flt spt-scalevel-x (meters 0)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-r -0.38833332) + (sp-flt spt-fade-g -0.21333334) + (sp-flt spt-fade-b -0.028333334) + (sp-flt spt-fade-a -0.38833332) + ) + ) + +;; failed to figure out what this is: +(defpart 2046 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x31 :page #xc)) + (sp-flt spt-num 8.0) + (sp-flt spt-y (meters -2.5)) + (sp-rnd-flt spt-scale-x (meters 16) (meters 16) 1.0) + (sp-int spt-rot-x 4) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-rnd-flt spt-scale-y (meters 1.5) (meters 0.5) 1.0) + (sp-rnd-flt spt-r 128.0 128.0 1.0) + (sp-flt spt-g 96.0) + (sp-flt spt-b 64.0) + (sp-rnd-flt spt-a 64.0 64.0 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.4) (meters 0.4) 1.0) + (sp-flt spt-fade-g 1.6) + (sp-flt spt-fade-b 3.2) + (sp-flt spt-fade-a -0.9142857) + (sp-int spt-timer 90) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + ) + ) + +;; failed to figure out what this is: +(defskelgroup skel-drill-barons-ship drill-barons-ship drill-barons-ship-lod0-jg drill-barons-ship-idle-ja + ((drill-barons-ship-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 110) + ) + +;; failed to figure out what this is: +(defskelgroup skel-drill-barons-ship-explode drill-barons-ship drill-barons-ship-explode-lod0-jg drill-barons-ship-explode-idle-ja + ((drill-barons-ship-explode-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 210) + ) + +;; failed to figure out what this is: +(defskelgroup skel-drill-barons-ship-turret drill-barons-ship drill-barons-ship-turret-lod0-jg drill-barons-ship-turret-idle-ja + ((drill-barons-ship-turret-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 10) + ) + +;; failed to figure out what this is: +(defskelgroup skel-drill-barons-ship-turret-b drill-barons-ship drill-barons-ship-turret-b-lod0-jg drill-barons-ship-turret-b-idle-ja + ((drill-barons-ship-turret-b-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 10) + ) + +;; failed to figure out what this is: +(defskelgroup skel-drill-barons-ship-turret-c drill-barons-ship drill-barons-ship-turret-c-lod0-jg drill-barons-ship-turret-c-idle-ja + ((drill-barons-ship-turret-c-lod0-mg (meters 999999))) + :bounds (static-spherem 0 0 0 10) + ) + +;; definition of type drill-barons-ship +(deftype drill-barons-ship (process-drawable) + ((root-override collide-shape-moving :offset 128) + (init-quat quaternion :inline :offset-assert 208) + (next-to-shoot-idx int32 :offset-assert 224) + (current-y-position float :offset-assert 228) + (from-y float :offset-assert 232) + (inc-y float :offset-assert 236) + (ease-y float :offset-assert 240) + (x-offset-angle float :offset-assert 244) + (pass int32 :offset-assert 248) + (end-of-pass symbol :offset-assert 252) + (rock-angle float :offset-assert 256) + (soundid uint32 :offset-assert 260) + ) + :heap-base #x90 + :method-count-assert 23 + :size-assert #x108 + :flag-assert #x1700900108 + (:methods + (idle () _type_ :state 20) + (hidden () _type_ :state 21) + (drill-barons-ship-method-22 (_type_) none 22) + ) + ) + +;; definition for method 3 of type drill-barons-ship +(defmethod inspect drill-barons-ship ((obj drill-barons-ship)) + (when (not obj) + (set! obj obj) + (goto cfg-4) + ) + (let ((t9-0 (method-of-type process-drawable inspect))) + (t9-0 obj) + ) + (format #t "~2Tinit-quat: #~%" (-> obj init-quat)) + (format #t "~2Tnext-to-shoot-idx: ~D~%" (-> obj next-to-shoot-idx)) + (format #t "~2Tcurrent-y-position: ~f~%" (-> obj current-y-position)) + (format #t "~2Tfrom-y: ~f~%" (-> obj from-y)) + (format #t "~2Tinc-y: ~f~%" (-> obj inc-y)) + (format #t "~2Tease-y: ~f~%" (-> obj ease-y)) + (format #t "~2Tx-offset-angle: ~f~%" (-> obj x-offset-angle)) + (format #t "~2Tpass: ~D~%" (-> obj pass)) + (format #t "~2Tend-of-pass: ~A~%" (-> obj end-of-pass)) + (format #t "~2Trock-angle: ~f~%" (-> obj rock-angle)) + (format #t "~2Tsoundid: ~D~%" (-> obj soundid)) + (label cfg-4) + obj + ) + +;; definition of type drill-barons-ship-explode +(deftype drill-barons-ship-explode (process-drawable) + () + :heap-base #x50 + :method-count-assert 21 + :size-assert #xc8 + :flag-assert #x15005000c8 + (:methods + (idle () _type_ :state 20) + ) + ) + +;; definition for method 3 of type drill-barons-ship-explode +(defmethod inspect drill-barons-ship-explode ((obj drill-barons-ship-explode)) + (when (not obj) + (set! obj obj) + (goto cfg-4) + ) + (let ((t9-0 (method-of-type process-drawable inspect))) + (t9-0 obj) + ) + (label cfg-4) + obj + ) + +;; definition of type barons-ship-turret-info +(deftype barons-ship-turret-info (structure) + ((init-y-angle float :offset-assert 0) + (twist-y-max float :offset-assert 4) + (joint-idx int32 :offset-assert 8) + (mesh int32 :offset-assert 12) + (ship-y-offset float :offset-assert 16) + (alive symbol :offset-assert 20) + (next-to-shoot basic :offset-assert 24) + ) + :method-count-assert 9 + :size-assert #x1c + :flag-assert #x90000001c + ) + +;; definition for method 3 of type barons-ship-turret-info +(defmethod inspect barons-ship-turret-info ((obj barons-ship-turret-info)) + (when (not obj) + (set! obj obj) + (goto cfg-4) + ) + (format #t "[~8x] ~A~%" obj 'barons-ship-turret-info) + (format #t "~1Tinit-y-angle: ~f~%" (-> obj init-y-angle)) + (format #t "~1Ttwist-y-max: ~f~%" (-> obj twist-y-max)) + (format #t "~1Tjoint-idx: ~D~%" (-> obj joint-idx)) + (format #t "~1Tmesh: ~D~%" (-> obj mesh)) + (format #t "~1Tship-y-offset: ~f~%" (-> obj ship-y-offset)) + (format #t "~1Talive: ~A~%" (-> obj alive)) + (format #t "~1Tnext-to-shoot: ~A~%" (-> obj next-to-shoot)) + (label cfg-4) + obj + ) + +;; definition of type drill-barons-ship-turret +(deftype drill-barons-ship-turret (process-drawable) + ((root-override collide-shape-moving :offset 128) + (info barons-ship-turret-info :offset-assert 200) + (shot-timer time-frame :offset-assert 208) + (shot-counter int32 :offset-assert 216) + (jmod joint-mod :offset-assert 220) + (jmod-left joint-mod :offset-assert 224) + (jmod-right joint-mod :offset-assert 228) + (anim-frame float :offset-assert 232) + (error-y-angle float :offset-assert 236) + (error-y-angle-dest float :offset-assert 240) + (hit-count int32 :offset-assert 244) + (soundid sound-id :offset-assert 248) + ) + :heap-base #x80 + :method-count-assert 25 + :size-assert #xfc + :flag-assert #x19008000fc + (:methods + (idle () _type_ :state 20) + (attack () _type_ :state 21) + (dead () _type_ :state 22) + (going-down () _type_ :state 23) + (drill-barons-ship-turret-method-24 (_type_) none 24) + ) + ) + +;; definition for method 3 of type drill-barons-ship-turret +(defmethod inspect drill-barons-ship-turret ((obj drill-barons-ship-turret)) + (when (not obj) + (set! obj obj) + (goto cfg-4) + ) + (let ((t9-0 (method-of-type process-drawable inspect))) + (t9-0 obj) + ) + (format #t "~2Tinfo: #~%" (-> obj info)) + (format #t "~2Tshot-timer: ~D~%" (-> obj shot-timer)) + (format #t "~2Tshot-counter: ~D~%" (-> obj shot-counter)) + (format #t "~2Tjmod: ~A~%" (-> obj jmod)) + (format #t "~2Tjmod-left: ~A~%" (-> obj jmod-left)) + (format #t "~2Tjmod-right: ~A~%" (-> obj jmod-right)) + (format #t "~2Tanim-frame: ~f~%" (-> obj anim-frame)) + (format #t "~2Terror-y-angle: ~f~%" (-> obj error-y-angle)) + (format #t "~2Terror-y-angle-dest: ~f~%" (-> obj error-y-angle-dest)) + (format #t "~2Thit-count: ~D~%" (-> obj hit-count)) + (format #t "~2Tsoundid: ~D~%" (-> obj soundid)) + (label cfg-4) + obj + ) + +;; definition for symbol *ship-turrets-first-pass*, type (array int32) +(define *ship-turrets-first-pass* (new 'static 'boxed-array :type int32 4 16 5 21 6 15 7 13 14 22 17 23)) + +;; definition for symbol *ship-turrets-second-pass*, type (array int32) +(define *ship-turrets-second-pass* (new 'static 'boxed-array :type int32 0 20 1 12 2 11 3 8 19 9 10 18)) + +;; definition for symbol *barons-ship-turrets*, type (array barons-ship-turret-info) +(define *barons-ship-turrets* + (new 'static 'boxed-array :type barons-ship-turret-info + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 13 + :ship-y-offset -40960.0 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 11 + :ship-y-offset -41369.6 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 9 + :ship-y-offset -41779.2 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 16 + :ship-y-offset -42188.8 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 22 + :ship-y-offset -42598.4 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 20 + :ship-y-offset -43008.0 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 18 + :ship-y-offset -43417.6 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 25 + :ship-y-offset -43827.2 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 15 + :mesh 2 + :ship-y-offset 40960.0 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 14 + :mesh 2 + :ship-y-offset 41369.6 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 12 + :mesh 2 + :ship-y-offset 41779.2 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 10 + :mesh 2 + :ship-y-offset 42188.8 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle -16384.0 + :twist-y-max 9102.223 + :joint-idx 17 + :mesh 2 + :ship-y-offset 42598.4 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 24 + :mesh 2 + :ship-y-offset 43008.0 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 23 + :mesh 2 + :ship-y-offset 43417.6 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 21 + :mesh 2 + :ship-y-offset 43827.2 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 19 + :mesh 2 + :ship-y-offset 44236.8 + ) + (new 'static 'barons-ship-turret-info + :init-y-angle 16384.0 + :twist-y-max 9102.223 + :joint-idx 26 + :mesh 2 + :ship-y-offset 44646.4 + ) + (new 'static 'barons-ship-turret-info :init-y-angle -16384.0 :joint-idx 32 :mesh 1 :ship-y-offset 26624.0) + (new 'static 'barons-ship-turret-info :init-y-angle -16384.0 :joint-idx 31 :mesh 1 :ship-y-offset 27033.6) + (new 'static 'barons-ship-turret-info :init-y-angle -16384.0 :joint-idx 30 :mesh 1 :ship-y-offset 27443.2) + (new 'static 'barons-ship-turret-info :init-y-angle 16384.0 :joint-idx 29 :mesh 1 :ship-y-offset 21708.8) + (new 'static 'barons-ship-turret-info :init-y-angle 16384.0 :joint-idx 28 :mesh 1 :ship-y-offset 22118.4) + (new 'static 'barons-ship-turret-info :init-y-angle 16384.0 :joint-idx 27 :mesh 1 :ship-y-offset 22528.0) + ) + ) + +;; definition for function drill-barons-ship-turret-init-by-other +;; INFO: Used lq/sq +;; WARN: Return type mismatch object vs none. +(defbehavior drill-barons-ship-turret-init-by-other drill-barons-ship-turret ((arg0 entity-actor)) + (cond + ((!= (-> arg0 data-top) 1) + (let ((s5-0 (new 'process 'collide-shape self (collide-list-enum usually-hit-by-player)))) + (let ((v1-3 (new 'process 'collide-shape-prim-sphere s5-0 (the-as uint 0)))) + (set! (-> v1-3 prim-core collide-as) (collide-spec obstacle-for-jak)) + (set! (-> v1-3 prim-core action) (collide-action solid)) + (set! (-> v1-3 transform-index) 3) + (set-vector! (-> v1-3 local-sphere) 0.0 0.0 0.0 73728.0) + (set! (-> s5-0 total-prims) (the-as uint 1)) + (set! (-> s5-0 root-prim) v1-3) + ) + (set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w))) + (let ((v1-6 (-> s5-0 root-prim))) + (set! (-> s5-0 backup-collide-as) (-> v1-6 prim-core collide-as)) + (set! (-> s5-0 backup-collide-with) (-> v1-6 prim-core collide-with)) + ) + (set! (-> self root-override) (the-as collide-shape-moving s5-0)) + ) + ) + (else + (let ((s5-1 (new 'process 'collide-shape self (collide-list-enum usually-hit-by-player)))) + (let ((v1-10 (new 'process 'collide-shape-prim-sphere s5-1 (the-as uint 0)))) + (set! (-> v1-10 prim-core collide-as) (collide-spec obstacle-for-jak)) + (set! (-> v1-10 prim-core action) (collide-action solid)) + (set! (-> v1-10 transform-index) 3) + (set-vector! (-> v1-10 local-sphere) 81920.0 0.0 0.0 73728.0) + (set! (-> s5-1 total-prims) (the-as uint 1)) + (set! (-> s5-1 root-prim) v1-10) + ) + (set! (-> s5-1 nav-radius) (* 0.75 (-> s5-1 root-prim local-sphere w))) + (let ((v1-13 (-> s5-1 root-prim))) + (set! (-> s5-1 backup-collide-as) (-> v1-13 prim-core collide-as)) + (set! (-> s5-1 backup-collide-with) (-> v1-13 prim-core collide-with)) + ) + (set! (-> self root-override) (the-as collide-shape-moving s5-1)) + ) + ) + ) + (let ((v1-16 (-> self root-override root-prim))) + (set! (-> self root-override backup-collide-as) (-> v1-16 prim-core collide-as)) + (set! (-> self root-override backup-collide-with) (-> v1-16 prim-core collide-with)) + ) + (let ((v1-19 (-> self root-override root-prim))) + (set! (-> v1-19 prim-core collide-as) (collide-spec)) + (set! (-> v1-19 prim-core collide-with) (collide-spec)) + ) + 0 + (set! (-> self root-override trans quad) + (-> (the-as drill-barons-ship (-> self parent 0)) root-override trans quad) + ) + (quaternion-copy! + (-> self root-override quat) + (-> (the-as drill-barons-ship (-> self parent 0)) root-override quat) + ) + (vector-identity! (-> self root-override scale)) + (logclear! (-> self mask) (process-mask actor-pause)) + (set! (-> self info) (the-as barons-ship-turret-info arg0)) + (set! (-> self info alive) #t) + (set! (-> self info next-to-shoot) #f) + (set! (-> self anim-frame) 0.0) + (set! (-> self error-y-angle) 0.0) + (set! (-> self error-y-angle-dest) 0.0) + (set! (-> self hit-count) 0) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 461) -1 #f #f self 4 :to self) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 462) -1 #f #f self 5 :to self) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 463) -1 #f #f self 6 :to self) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 464) -1 #f #f self 7 :to self) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 465) -1 #f #f self 8 :to self) + (cond + ((= (-> self info mesh) 1) + (initialize-skeleton + self + (the-as + skeleton-group + (art-group-get-by-name *level* "skel-drill-barons-ship-turret-b" (the-as (pointer uint32) #f)) + ) + (the-as pair 0) + ) + (set! (-> self jmod) #f) + (set! (-> self jmod-left) #f) + (set! (-> self jmod-right) #f) + (setup-masks (-> self draw) 3 0) + ) + ((= (-> self info mesh) 2) + (initialize-skeleton + self + (the-as + skeleton-group + (art-group-get-by-name *level* "skel-drill-barons-ship-turret-c" (the-as (pointer uint32) #f)) + ) + (the-as pair 0) + ) + (set! (-> self jmod) (the-as joint-mod (new 'process 'joint-mod-add-local self 6 #f #t #f))) + (set! (-> self jmod twist-min-y) (the-as float #t)) + (quaternion-axis-angle! (the-as quaternion (-> self jmod twist)) 0.0 1.0 0.0 0.0) + (set! (-> self jmod-left) #f) + (set! (-> self jmod-right) #f) + (setup-masks (-> self draw) 3 0) + ) + (else + (initialize-skeleton + self + (the-as + skeleton-group + (art-group-get-by-name *level* "skel-drill-barons-ship-turret" (the-as (pointer uint32) #f)) + ) + (the-as pair 0) + ) + (set! (-> self jmod) (the-as joint-mod (new 'process 'joint-mod-add-local self 10 #f #t #f))) + (set! (-> self jmod twist-min-y) (the-as float #t)) + (set! (-> self jmod-left) (the-as joint-mod (new 'process 'joint-mod-add-local self 11 #f #t #f))) + (set! (-> self jmod-left twist-min-y) (the-as float #t)) + (set! (-> self jmod-right) (the-as joint-mod (new 'process 'joint-mod-add-local self 12 #f #t #f))) + (set! (-> self jmod-right twist-min-y) (the-as float #t)) + (quaternion-axis-angle! (the-as quaternion (-> self jmod twist)) 0.0 1.0 0.0 0.0) + (quaternion-axis-angle! (the-as quaternion (-> self jmod-left twist)) 0.0 0.0 1.0 0.0) + (quaternion-axis-angle! (the-as quaternion (-> self jmod-right twist)) 0.0 0.0 1.0 0.0) + (setup-masks (-> self draw) 3 0) + ) + ) + (go-virtual idle) + (none) + ) + +;; definition for method 7 of type drill-barons-ship-turret +;; WARN: Return type mismatch process-drawable vs drill-barons-ship-turret. +(defmethod relocate drill-barons-ship-turret ((obj drill-barons-ship-turret) (arg0 int)) + (when (-> obj jmod) + (if (nonzero? (-> obj jmod)) + (&+! (-> obj jmod) arg0) + ) + ) + (when (-> obj jmod-left) + (if (nonzero? (-> obj jmod-left)) + (&+! (-> obj jmod-left) arg0) + ) + ) + (when (-> obj jmod-right) + (if (nonzero? (-> obj jmod-right)) + (&+! (-> obj jmod-right) arg0) + ) + ) + (the-as + drill-barons-ship-turret + ((the-as (function process-drawable int process-drawable) (find-parent-method drill-barons-ship-turret 7)) + obj + arg0 + ) + ) + ) + +;; definition for method 11 of type drill-barons-ship +;; WARN: Return type mismatch object vs none. +(defmethod init-from-entity! drill-barons-ship ((obj drill-barons-ship) (arg0 entity-actor)) + "Typically the method that does the initial setup on the process, potentially using the [[entity-actor]] provided as part of that. +This commonly includes things such as: +- stack size +- collision information +- loading the skeleton group / bones +- sounds" + (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) + (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 1) 0))) + (set! (-> s4-0 total-prims) (the-as uint 2)) + (set! (-> s3-0 prim-core collide-as) (collide-spec obstacle)) + (set! (-> s3-0 prim-core collide-with) (collide-spec jak player-list)) + (set! (-> s3-0 prim-core action) (collide-action solid)) + (set! (-> s3-0 transform-index) 0) + (set-vector! (-> s3-0 local-sphere) 0.0 0.0 0.0 450560.0) + (set! (-> s4-0 root-prim) s3-0) + ) + (let ((v1-8 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) + (set! (-> v1-8 prim-core collide-as) (collide-spec obstacle)) + (set! (-> v1-8 prim-core collide-with) (collide-spec jak player-list)) + (set! (-> v1-8 prim-core action) (collide-action solid)) + (set! (-> v1-8 transform-index) 0) + (set-vector! (-> v1-8 local-sphere) 0.0 0.0 0.0 450560.0) + ) + (set! (-> s4-0 nav-radius) (* 0.75 (-> s4-0 root-prim local-sphere w))) + (let ((v1-11 (-> s4-0 root-prim))) + (set! (-> s4-0 backup-collide-as) (-> v1-11 prim-core collide-as)) + (set! (-> s4-0 backup-collide-with) (-> v1-11 prim-core collide-with)) + ) + (set! (-> obj root-override) (the-as collide-shape-moving s4-0)) + ) + (process-drawable-from-entity! obj arg0) + (initialize-skeleton + obj + (the-as skeleton-group (art-group-get-by-name *level* "skel-drill-barons-ship" (the-as (pointer uint32) #f))) + (the-as pair 0) + ) + (logclear! (-> obj mask) (process-mask actor-pause)) + (logior! (-> obj skel status) (joint-control-status sync-math)) + (quaternion-vector-angle! (-> obj root-override quat) *y-vector* -16384.0) + (set-vector! (-> obj root-override trans) 737280.0 -1024000.0 -1433600.0 1.0) + (set! (-> obj next-to-shoot-idx) 0) + (quaternion-copy! (-> obj init-quat) (-> obj root-override quat)) + (set! (-> obj current-y-position) (-> obj root-override trans y)) + (set! (-> obj from-y) (-> obj current-y-position)) + (set! (-> obj inc-y) 1228.8) + (set! (-> obj ease-y) 40960.0) + (set! (-> obj pass) 0) + (set! (-> obj end-of-pass) #f) + (set! (-> obj rock-angle) 0.0) + (let ((a0-21 (-> obj skel root-channel 0))) + (set! (-> a0-21 frame-group) (the-as art-joint-anim (-> obj draw art-group data 2))) + (set! (-> a0-21 frame-num) 0.0) + (joint-control-channel-group! a0-21 (the-as art-joint-anim (-> obj draw art-group data 2)) num-func-identity) + ) + (ja-post) + (dotimes (s5-2 (length *barons-ship-turrets*)) + (process-spawn drill-barons-ship-turret (-> *barons-ship-turrets* s5-2) :to obj) + ) + (set! (-> *barons-ship-turrets* (-> *ship-turrets-first-pass* 3) alive) #f) + (set! (-> *barons-ship-turrets* (-> *ship-turrets-first-pass* 9) alive) #f) + (set! (-> *barons-ship-turrets* (-> *ship-turrets-first-pass* 11) alive) #f) + (set! (-> obj soundid) (the-as uint (sound-play "drl-ship-steady"))) + (go (method-of-object obj hidden)) + (none) + ) + +;; definition for function drill-barons-ship-explode-init-by-other +;; INFO: Used lq/sq +;; WARN: Return type mismatch object vs none. +(defbehavior drill-barons-ship-explode-init-by-other drill-barons-ship-explode ((arg0 entity-actor)) + (set! (-> self root) (new 'process 'trsqv)) + (logclear! (-> self mask) (process-mask actor-pause)) + (process-entity-status! self (entity-perm-status no-kill) #t) + (quaternion-vector-angle! (-> self root quat) *y-vector* -16384.0) + (set! (-> self root trans quad) (-> (the-as process-drawable (-> self parent 0)) root trans quad)) + (initialize-skeleton + self + (the-as + skeleton-group + (art-group-get-by-name *level* "skel-drill-barons-ship-explode" (the-as (pointer uint32) #f)) + ) + (the-as pair 0) + ) + (ja-no-eval :group! (-> self draw art-group data 5) :num! zero) + (ja-post) + (quaternion-rotate-local-y! (-> self root quat) (-> self root quat) 32768.0) + (add-process *gui-control* self (gui-channel background) (gui-action play) "shpxplo2" -99.0 0) + (go-virtual idle) + (none) + ) + +;; definition of type drill-ship-shot +(deftype drill-ship-shot (guard-shot) + () + :heap-base #x170 + :method-count-assert 40 + :size-assert #x1f0 + :flag-assert #x28017001f0 + ) + +;; definition for method 3 of type drill-ship-shot +(defmethod inspect drill-ship-shot ((obj drill-ship-shot)) + (when (not obj) + (set! obj obj) + (goto cfg-4) + ) + (let ((t9-0 (method-of-type guard-shot inspect))) + (t9-0 obj) + ) + (label cfg-4) + obj + ) + +;; definition for method 37 of type drill-ship-shot +(defmethod deal-damage! drill-ship-shot ((obj drill-ship-shot) (arg0 process) (arg1 event-message-block)) + "Constructs an [[attack-info]] according to the projectile's `options`" + (if (not (and (-> (the-as drill-barons-ship (-> obj parent 0)) next-state) + (= (-> (the-as drill-barons-ship (-> obj parent 0)) next-state name) 'hidden) + ) + ) + ((method-of-type guard-shot deal-damage!) obj arg0 arg1) + #f + ) + ) + +;; definition for function drill-ship-shot-move +;; WARN: Return type mismatch int vs none. +(defun drill-ship-shot-move ((arg0 drill-ship-shot)) + (guard-shot-move arg0) + 0 + (none) + ) + +;; definition for method 31 of type drill-ship-shot +;; WARN: Return type mismatch int vs none. +(defmethod init-proj-settings! drill-ship-shot ((obj drill-ship-shot)) + "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" + ((the-as (function guard-shot none) (find-parent-method drill-ship-shot 31)) obj) + (set! (-> obj attack-mode) 'drill-ship-shot) + (set! (-> obj move) guard-shot-move) + (set! (-> obj max-speed) 737280.0) + (set! (-> obj timeout) (seconds 4.167)) + (none) + ) + +;; definition for symbol *drill-ship-turret-speed-event*, type turret-path-event +(define *drill-ship-turret-speed-event* (the-as turret-path-event L183)) + +;; failed to figure out what this is: +(defstate idle (drill-barons-ship-explode) + :virtual #t + :code (behavior () + (ja-no-eval :group! (ja-group) + :num! (seek! (the float (+ (-> (ja-group) frames num-frames) -1))) + :frame-num 0.0 + ) + (until (ja-done? 0) + (suspend) + (ja :num! (seek!)) + ) + (none) + ) + :post (the-as (function none :behavior drill-barons-ship-explode) ja-post) + ) + +;; failed to figure out what this is: +(defstate hidden (drill-barons-ship) + :virtual #t + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type + (('trigger-back) + (set! (-> self pass) 1) + (dotimes (gp-0 (length *ship-turrets-first-pass*)) + (set! (-> *barons-ship-turrets* (-> *ship-turrets-first-pass* gp-0) alive) #f) + ) + (go-virtual idle) + ) + (('trigger) + (go-virtual idle) + ) + (('pass-complete?) + (when (>= (-> self pass) 2) + (task-node-close! (game-task-node drill-ship-resolution)) + (set-continue! *game-info* "drillmid-ship-warp" #f) + (talker-spawn-func (-> *talker-speech* 102) *entity-pool* (target-pos 0) (the-as region #f)) + ) + #t + ) + ) + ) + :enter (behavior () + (set! (-> self from-y) (-> self current-y-position)) + (set! (-> self inc-y) 3276.8) + (set! (-> self ease-y) 40960.0) + (when (> (-> self pass) 0) + (let ((a0-2 (the-as turret (process-by-name + (if (= (-> self pass) 1) + "turret-14" + "turret-15" + ) + *active-pool* + ) + ) + ) + ) + (if a0-2 + (base-turret-method-39 a0-2 *drill-ship-turret-speed-event*) + ) + ) + ) + (none) + ) + :code (behavior () + (cond + ((>= (-> self pass) 2) + (set! (-> self current-y-position) -1024000.0) + (let* ((gp-0 (get-process *default-dead-pool* drill-barons-ship-explode #x4000)) + (v1-3 (when gp-0 + (let ((t9-1 (method-of-type drill-barons-ship-explode activate)) + (a0-1 gp-0) + (a1-1 self) + (a2-3 (symbol->string (-> drill-barons-ship-explode symbol))) + ) + (t9-1 (the-as drill-barons-ship-explode a0-1) a1-1 a2-3 (the-as pointer #x70004000)) + (run-now-in-process gp-0 drill-barons-ship-explode-init-by-other (the-as none a2-3)) + ) + (-> gp-0 ppointer) + ) + ) + ) + (change-parent (-> v1-3 0) *entity-pool*) + ) + (until (task-node-closed? (game-task-node drill-ship-resolution)) + (suspend) + ) + (cleanup-for-death self) + ) + (else + (until #f + (ja :num-func num-func-identity :frame-num 0.0) + (suspend) + ) + #f + ) + ) + (none) + ) + :post (behavior () + (set! (-> self current-y-position) + (seek-ease-in-out + (-> self current-y-position) + (-> self from-y) + -1024000.0 + (* (-> self inc-y) (-> self clock time-adjust-ratio)) + (-> self ease-y) + (-> self ease-y) + (* 0.05 (-> self clock time-adjust-ratio) (-> self inc-y)) + ) + ) + (set! (-> self root-override trans y) + (+ (-> self current-y-position) + (* 4096.0 (* 2.0 (sin (+ 16384.0 (* 45.511112 (the float (-> self clock frame-counter))))))) + ) + ) + (drill-barons-ship-method-22 self) + (transform-post) + (none) + ) + ) + +;; failed to figure out what this is: +(defstate idle (drill-barons-ship) + :virtual #t + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('pass-complete?) + (set! (-> self end-of-pass) #t) + #f + ) + ) + ) + ) + :enter (behavior () + (set-setting! 'music 'danger4 0 0) + (let ((v1-2 2) + (a0-2 (+ (-> self pass) 1)) + ) + (set! (-> self pass) a0-2) + (if (= a0-2 v1-2) + (quaternion-rotate-local-y! (-> self init-quat) (-> self init-quat) 32768.0) + ) + ) + (set! (-> self inc-y) 2048.0) + (set! (-> self ease-y) 40960.0) + (set! (-> self end-of-pass) #f) + (none) + ) + :exit (behavior () + (remove-setting! 'music) + (none) + ) + :code (behavior () + (until #f + (ja :num-func num-func-identity :frame-num 0.0) + (suspend) + ) + #f + (none) + ) + :post (behavior () + (let ((gp-0 (if (= (-> self pass) 1) + *ship-turrets-first-pass* + *ship-turrets-second-pass* + ) + ) + ) + (let* ((s5-0 (-> *barons-ship-turrets* (-> gp-0 (-> self next-to-shoot-idx)))) + (f30-0 (if (= (-> self pass) 1) + 0.0 + 40960.0 + ) + ) + (f28-0 (+ f30-0 (-> s5-0 ship-y-offset))) + ) + (cond + ((and (not (-> s5-0 next-to-shoot)) (= (-> self current-y-position) f28-0)) + (let ((s4-0 1) + (s3-0 (-> self next-to-shoot-idx)) + (s5-1 (-> self next-to-shoot-idx)) + ) + (while (and (not (-> *barons-ship-turrets* (-> gp-0 (mod (+ s3-0 s4-0) (length gp-0))) alive)) + (< s4-0 (+ (length gp-0) 1)) + ) + (+! s4-0 1) + ) + (set! (-> self next-to-shoot-idx) (mod (+ s3-0 s4-0) (length gp-0))) + (let ((v1-35 (-> *barons-ship-turrets* (-> gp-0 (-> self next-to-shoot-idx))))) + (when (-> v1-35 alive) + (cond + ((= s5-1 (-> self next-to-shoot-idx)) + (set! (-> v1-35 next-to-shoot) (the-as basic #t)) + ) + (else + (set! (-> self from-y) (-> self current-y-position)) + (let ((f0-6 (fabs (- (+ f30-0 (-> v1-35 ship-y-offset)) (-> self from-y))))) + (set! (-> self inc-y) (* 0.02 f0-6)) + (set! (-> self ease-y) (* 0.2 f0-6)) + ) + ) + ) + ) + ) + ) + ) + (else + (set! (-> self current-y-position) + (seek-ease-in-out + (-> self current-y-position) + (-> self from-y) + f28-0 + (* (-> self inc-y) (-> self clock time-adjust-ratio)) + (-> self ease-y) + (-> self ease-y) + (* 0.05 (-> self clock time-adjust-ratio) (-> self inc-y)) + ) + ) + (if (and (= (-> self current-y-position) f28-0) (-> s5-0 alive)) + (set! (-> s5-0 next-to-shoot) (the-as basic #t)) + ) + ) + ) + ) + (let ((s5-2 #t)) + (dotimes (s4-2 (length gp-0)) + (if (-> *barons-ship-turrets* (-> gp-0 s4-2) alive) + (set! s5-2 #f) + ) + ) + (if s5-2 + (go-virtual hidden) + ) + ) + ) + (set! (-> self root-override trans y) + (+ (-> self current-y-position) + (* 4096.0 (* 2.0 (sin (+ 16384.0 (* 45.511112 (the float (-> self clock frame-counter))))))) + ) + ) + (drill-barons-ship-method-22 self) + (+! (-> self x-offset-angle) (* 0.7 (-> self clock time-adjust-ratio))) + (transform-post) + (none) + ) + ) + +;; definition for method 22 of type drill-barons-ship +;; WARN: Return type mismatch int vs none. +(defmethod drill-barons-ship-method-22 drill-barons-ship ((obj drill-barons-ship)) + (with-pp + (quaternion-rotate-local-x! + (-> obj root-override quat) + (-> obj init-quat) + (* 182.04445 (sin (* 36.40889 (the float (-> pp clock frame-counter))))) + ) + (let ((f30-2 (* 182.04445 (* 5.0 (sin (* 45.511112 (the float (-> pp clock frame-counter)))))))) + (when (!= (-> obj rock-angle) 0.0) + (+! f30-2 (* 182.04445 (* 20.0 + (if (= (-> obj pass) 1) + 1.0 + -1.0 + ) + (sin (* 182.04445 (-> obj rock-angle))) + ) + ) + ) + (set! (-> obj rock-angle) + (seek-ease + (-> obj rock-angle) + 0.0 + (* 5.0 (-> pp clock time-adjust-ratio)) + 90.0 + (* 0.1 (-> pp clock time-adjust-ratio)) + ) + ) + ) + (quaternion-rotate-local-z! (-> obj root-override quat) (-> obj root-override quat) f30-2) + ) + (set! (-> obj root-override trans z) + (+ (* 4096.0 (* 30.0 (cos (* 45.511112 (the float (-> pp clock frame-counter)))))) (if (= (-> obj pass) 1) + -1433600.0 + -1433600.0 + ) + ) + ) + (if *target* + (set! (-> obj root-override trans x) + (+ (-> *target* control trans x) (* 4096.0 (+ (if (= (-> obj pass) 1) + 15.0 + -35.0 + ) + (* 40.0 (sin (* 182.04445 (-> obj x-offset-angle)))) + ) + ) + ) + ) + ) + 0 + (none) + ) + ) + +;; definition for method 24 of type drill-barons-ship-turret +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. +(defmethod drill-barons-ship-turret-method-24 drill-barons-ship-turret ((obj drill-barons-ship-turret)) + (with-pp + (vector<-cspace! + (-> obj root-override trans) + (-> (the-as drill-barons-ship (-> obj parent 0)) node-list data (-> obj info joint-idx)) + ) + (let ((a2-1 (quaternion-axis-angle! (new 'stack-no-clear 'quaternion) 0.0 1.0 0.0 (-> obj info init-y-angle)))) + (quaternion*! + (-> obj root-override quat) + (-> (the-as drill-barons-ship (-> obj parent 0)) root-override quat) + a2-1 + ) + ) + (when (-> obj jmod) + (let ((s5-1 (vector-! (new 'stack-no-clear 'vector) (target-pos 0) (-> obj root-override trans))) + (s3-0 (quaternion->matrix (new-stack-matrix0) (-> obj root-override quat))) + ) + (vector-normalize! s5-1 1.0) + (let* ((s4-0 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s3-0 vector 1) 1.0)) + (s3-1 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s3-0 vector 2) 1.0)) + (a0-13 (vector-normalize! (vector-flatten! (new 'stack-no-clear 'vector) s5-1 s4-0) 1.0)) + (f30-0 (vector-y-angle a0-13)) + (f0-1 (vector-y-angle s3-1)) + (f0-5 (fmax + (fmin (+ (deg-diff f0-1 f30-0) (* 182.04445 (-> obj error-y-angle))) (-> obj info twist-y-max)) + (- (-> obj info twist-y-max)) + ) + ) + ) + (quaternion-axis-angle! (the-as quaternion (-> obj jmod twist)) 0.0 1.0 0.0 f0-5) + ) + ) + (if (-> obj jmod-left) + (quaternion-axis-angle! + (the-as quaternion (-> obj jmod-left twist)) + 0.0 + 0.0 + 1.0 + (* 182.04445 (* -3.0 (the float (-> pp clock frame-counter)))) + ) + ) + (if (-> obj jmod-right) + (quaternion-axis-angle! + (the-as quaternion (-> obj jmod-right twist)) + 0.0 + 0.0 + 1.0 + (* 182.04445 (* 3.0 (the float (-> pp clock frame-counter)))) + ) + ) + ) + 0 + (none) + ) + ) + +;; failed to figure out what this is: +(defstate dead (drill-barons-ship-turret) + :virtual #t + :enter (behavior () + (let ((v1-1 (-> self root-override root-prim))) + (set! (-> v1-1 prim-core collide-as) (collide-spec)) + (set! (-> v1-1 prim-core collide-with) (collide-spec)) + ) + 0 + (set! (-> self state-time) (-> self clock frame-counter)) + (none) + ) + :trans (behavior () + (vector<-cspace! + (-> self root-override trans) + (-> (the-as drill-barons-ship (-> self parent 0)) node-list data (-> self info joint-idx)) + ) + (let ((a2-1 (quaternion-axis-angle! (new 'stack-no-clear 'quaternion) 0.0 1.0 0.0 (-> self info init-y-angle)))) + (quaternion*! + (-> self root-override quat) + (-> (the-as drill-barons-ship (-> self parent 0)) root-override quat) + a2-1 + ) + ) + (if (and (-> (the-as drill-barons-ship (-> self parent 0)) next-state) + (= (-> (the-as drill-barons-ship (-> self parent 0)) next-state name) 'hidden) + ) + (go-virtual going-down) + ) + (none) + ) + :code (behavior () + (until #f + (ja :num-func num-func-identity :frame-num 0.0) + (suspend) + ) + #f + (none) + ) + :post (behavior () + (transform-post) + (none) + ) + ) + +;; failed to figure out what this is: +(defstate going-down (drill-barons-ship-turret) + :virtual #t + :enter (behavior () + (cond + ((>= (-> (the-as drill-barons-ship (-> self parent 0)) pass) 2) + (when (zero? (-> self info mesh)) + (let ((gp-0 (get-process *default-dead-pool* part-tracker #x4000))) + (when gp-0 + (let ((t9-1 (method-of-type part-tracker activate))) + (t9-1 + (the-as part-tracker gp-0) + *entity-pool* + (symbol->string (-> part-tracker symbol)) + (the-as pointer #x70004000) + ) + ) + (let ((t9-2 run-function-in-process) + (a0-2 gp-0) + (a1-2 part-tracker-init) + (a2-4 (-> *part-group-id-table* 469)) + (a3-1 0) + (t0-0 #f) + (t1-0 #f) + (t2-0 #f) + (t3-0 *launch-matrix*) + ) + (set! (-> t3-0 trans quad) (-> self root-override trans quad)) + ((the-as (function object object object object object object object object none) t9-2) + a0-2 + a1-2 + a2-4 + a3-1 + t0-0 + t1-0 + t2-0 + t3-0 + ) + ) + (-> gp-0 ppointer) + ) + ) + ) + ) + ((zero? (-> self info mesh)) + (process-spawn + part-tracker + :init part-tracker-init + (-> *part-group-id-table* 466) + 0 + #f + #f + self + 3 + :to *entity-pool* + ) + ) + (else + (let ((gp-2 (get-process *default-dead-pool* part-tracker #x4000))) + (when gp-2 + (let ((t9-7 (method-of-type part-tracker activate))) + (t9-7 + (the-as part-tracker gp-2) + *entity-pool* + (symbol->string (-> part-tracker symbol)) + (the-as pointer #x70004000) + ) + ) + (let ((t9-8 run-function-in-process) + (a0-8 gp-2) + (a1-8 part-tracker-init) + (a2-14 (-> *part-group-id-table* 469)) + (a3-5 0) + (t0-2 #f) + (t1-2 #f) + (t2-2 #f) + (t3-2 *launch-matrix*) + ) + (set! (-> t3-2 trans quad) (-> self root-override trans quad)) + ((the-as (function object object object object object object object object none) t9-8) + a0-8 + a1-8 + a2-14 + a3-5 + t0-2 + t1-2 + t2-2 + t3-2 + ) + ) + (-> gp-2 ppointer) + ) + ) + ) + ) + (none) + ) + :trans (behavior () + (vector<-cspace! + (-> self root-override trans) + (-> (the-as drill-barons-ship (-> self parent 0)) node-list data (-> self info joint-idx)) + ) + (if (not (and (-> (the-as drill-barons-ship (-> self parent 0)) next-state) + (= (-> (the-as drill-barons-ship (-> self parent 0)) next-state name) 'hidden) + ) + ) + (go-virtual dead) + ) + (none) + ) + :code (behavior () + (until #f + (ja :num-func num-func-identity :frame-num 0.0) + (suspend) + ) + #f + (none) + ) + :post (behavior () + (transform-post) + (none) + ) + ) + +;; definition for function calculate-ship-projectile-velocity +;; WARN: Return type mismatch int vs none. +(defun calculate-ship-projectile-velocity ((arg0 projectile-init-by-other-params) (arg1 float)) + (let* ((s4-0 *target*) + (a0-2 (if (type? s4-0 process-focusable) + s4-0 + ) + ) + ) + (cond + (a0-2 + (let ((a0-3 (get-trans a0-2 0))) + (set-vector! + (-> arg0 vel) + 0.0 + (+ (- 6144.0 (-> arg0 pos y)) (-> a0-3 y)) + (vector-vector-xz-distance a0-3 (-> arg0 pos)) + 1.0 + ) + ) + (vector-normalize! (-> arg0 vel) 1.0) + ) + (else + (set-vector! (-> arg0 vel) 0.0 0.0 1.0 1.0) + ) + ) + ) + (vector-rotate-y! (-> arg0 vel) (-> arg0 vel) arg1) + (vector-normalize! (-> arg0 vel) 737280.0) + 0 + (none) + ) + +;; failed to figure out what this is: +(defstate attack (drill-barons-ship-turret) + :virtual #t + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type + (('attack) + (when (and (-> self info alive) (= (-> self anim-frame) 1.0)) + (+! (-> self hit-count) 1) + (cond + ((!= (-> self hit-count) 20) + (sound-play "ship-gun-hit") + ) + (else + (set! (-> self info alive) #f) + (set! (-> self info next-to-shoot) #f) + (let ((gp-1 (new 'stack-no-clear 'vector))) + (set! (-> gp-1 quad) (-> self root-override trans quad)) + (set! (-> gp-1 z) (+ 81920.0 (-> gp-1 z))) + (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) + (when s5-1 + (let ((t9-3 (method-of-type part-tracker activate))) + (t9-3 + (the-as part-tracker s5-1) + *entity-pool* + (symbol->string (-> part-tracker symbol)) + (the-as pointer #x70004000) + ) + ) + (let ((t9-4 run-function-in-process) + (a0-7 s5-1) + (a1-4 part-tracker-init) + (a2-6 (-> *part-group-id-table* 469)) + (a3-3 0) + (t0-1 #f) + (t1-1 #f) + (t2-1 #f) + (t3-0 *launch-matrix*) + ) + (set! (-> t3-0 trans quad) (-> gp-1 quad)) + ((the-as (function object object object object object object object object none) t9-4) + a0-7 + a1-4 + a2-6 + a3-3 + t0-1 + t1-1 + t2-1 + t3-0 + ) + ) + (-> s5-1 ppointer) + ) + ) + ) + (sound-play "shp-turret-xplo") + (cond + ((= (-> self info mesh) 1) + (setup-masks (-> self draw) 0 1) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 468) 0 #f #f self 3 :to self) + ) + ((= (-> self info mesh) 2) + (setup-masks (-> self draw) 0 1) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 467) 0 #f #f self 3 :to self) + ) + (else + (setup-masks (-> self draw) 0 1) + (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 466) 0 #f #f self 3 :to self) + ) + ) + (sound-play "ship-veer") + (set! (-> (the-as drill-barons-ship (-> self parent 0)) rock-angle) 180.0) + (go-virtual dead) + ) + ) + ) + ) + ) + ) + :enter (behavior () + (set! (-> self shot-timer) (-> self clock frame-counter)) + (set! (-> self shot-counter) 0) + (set! (-> self error-y-angle) (if (< 25.0 (rand-vu-float-range 0.0 50.0)) + -15.0 + 15.0 + ) + ) + (set! (-> self error-y-angle-dest) (- (-> self error-y-angle))) + (let ((v1-5 (-> self root-override root-prim))) + (set! (-> v1-5 prim-core collide-as) (-> self root-override backup-collide-as)) + (set! (-> v1-5 prim-core collide-with) (-> self root-override backup-collide-with)) + ) + (cond + ((= (-> self info mesh) 1) + (process-spawn + part-tracker + :init part-tracker-init + (-> *part-group-id-table* 460) + 0 + #f + #f + self + 3 + :to *entity-pool* + ) + ) + ((= (-> self info mesh) 2) + (process-spawn + part-tracker + :init part-tracker-init + (-> *part-group-id-table* 459) + 0 + #f + #f + self + 3 + :to *entity-pool* + ) + ) + (else + (process-spawn + part-tracker + :init part-tracker-init + (-> *part-group-id-table* 458) + 0 + #f + #f + self + 3 + :to *entity-pool* + ) + ) + ) + (if (zero? (-> self info mesh)) + (set! (-> self soundid) (sound-play "ship-gun1-chain")) + ) + (none) + ) + :exit (behavior () + (if (zero? (-> self info mesh)) + (sound-stop (-> self soundid)) + ) + (let ((v1-5 (-> self root-override root-prim))) + (set! (-> v1-5 prim-core collide-as) (collide-spec)) + (set! (-> v1-5 prim-core collide-with) (collide-spec)) + ) + 0 + (cond + ((= (-> self info mesh) 1) + (sound-play "ship-gun2-down") + ) + ((= (-> self info mesh) 2) + (sound-play "ship-gun3-close") + ) + (else + (sound-play "ship-gun1-down") + ) + ) + (none) + ) + :code (behavior () + (cond + ((= (-> self info mesh) 1) + (sound-play "ship-gun2-up") + ) + ((= (-> self info mesh) 2) + (sound-play "ship-gun3-open") + ) + (else + (sound-play "ship-gun1-up") + ) + ) + (until #f + (seek! (-> self anim-frame) 1.0 (* 0.01 (-> self clock time-adjust-ratio))) + (let ((v1-12 (-> self skel root-channel 0))) + (set! (-> v1-12 num-func) num-func-identity) + (let ((f0-4 (-> self anim-frame)) + (a0-13 (cond + ((= (-> self info mesh) 1) + 3.0 + ) + ((= (-> self info mesh) 2) + 10.0 + ) + (else + 11.0 + ) + ) + ) + ) + (set! (-> v1-12 frame-num) (* f0-4 a0-13)) + ) + ) + (suspend) + ) + #f + (none) + ) + :post (behavior () + (drill-barons-ship-turret-method-24 self) + (if (and (-> (the-as drill-barons-ship (-> self parent 0)) next-state) + (= (-> (the-as drill-barons-ship (-> self parent 0)) next-state name) 'hidden) + ) + (go-virtual idle) + ) + (when (and (= (-> self anim-frame) 1.0) (>= (- (-> self clock frame-counter) (-> self shot-timer)) (seconds 0.2))) + (let ((gp-0 (new 'stack-no-clear 'projectile-init-by-other-params))) + (cond + ((-> self jmod) + (let* ((a1-1 (quaternion-copy! (new 'stack-no-clear 'quaternion) (the-as quaternion (-> self jmod twist)))) + (v1-23 (quaternion->matrix (new-stack-matrix0) a1-1)) + (f30-0 (vector-y-angle (-> v1-23 vector 2))) + ) + (set! (-> gp-0 ent) #f) + (set! (-> gp-0 charge) 1.0) + (set! (-> gp-0 options) (projectile-options)) + (set! (-> gp-0 notify-handle) (the-as handle #f)) + (set! (-> gp-0 owner-handle) (the-as handle #f)) + (set! (-> gp-0 ignore-handle) (process->handle self)) + (let* ((v1-28 *game-info*) + (a0-11 (+ (-> v1-28 attack-id) 1)) + ) + (set! (-> v1-28 attack-id) a0-11) + (set! (-> gp-0 attack-id) a0-11) + ) + (set! (-> gp-0 timeout) (seconds 4)) + (cond + ((zero? (-> self info mesh)) + (cond + ((not (logtest? (-> self shot-counter) 1)) + (vector<-cspace! (-> gp-0 pos) (-> self node-list data 13)) + (calculate-ship-projectile-velocity gp-0 f30-0) + (spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*) + ) + (else + (vector<-cspace! (-> gp-0 pos) (-> self node-list data 14)) + (calculate-ship-projectile-velocity gp-0 f30-0) + (spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*) + ) + ) + ) + ((not (logtest? (-> self shot-counter) 1)) + (vector<-cspace! (-> gp-0 pos) (-> self node-list data 9)) + (calculate-ship-projectile-velocity gp-0 f30-0) + (spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*) + ) + (else + (vector<-cspace! (-> gp-0 pos) (-> self node-list data 11)) + (calculate-ship-projectile-velocity gp-0 f30-0) + (spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*) + ) + ) + ) + ) + (else + (let ((v1-45 (quaternion->matrix (new-stack-matrix0) (-> self root-override quat))) + (s5-0 (new 'stack-no-clear 'vector)) + ) + (set! (-> s5-0 quad) (-> v1-45 vector 2 quad)) + (vector-normalize! s5-0 1.0) + (vector-normalize-copy! (-> gp-0 vel) s5-0 737280.0) + ) + (set! (-> gp-0 ent) #f) + (set! (-> gp-0 charge) 1.0) + (set! (-> gp-0 options) (projectile-options)) + (set! (-> gp-0 notify-handle) (the-as handle #f)) + (set! (-> gp-0 owner-handle) (the-as handle #f)) + (set! (-> gp-0 ignore-handle) (process->handle self)) + (let* ((v1-52 *game-info*) + (a0-32 (+ (-> v1-52 attack-id) 1)) + ) + (set! (-> v1-52 attack-id) a0-32) + (set! (-> gp-0 attack-id) a0-32) + ) + (set! (-> gp-0 timeout) (seconds 4)) + (cond + ((not (logtest? (-> self shot-counter) 1)) + (vector<-cspace! (-> gp-0 pos) (-> self node-list data 6)) + (calculate-ship-projectile-velocity gp-0 0.0) + (spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*) + ) + (else + (vector<-cspace! (-> gp-0 pos) (-> self node-list data 5)) + (calculate-ship-projectile-velocity gp-0 0.0) + (spawn-projectile drill-ship-shot gp-0 self *default-dead-pool*) + ) + ) + ) + ) + ) + (sound-play "ship-gun1-fire") + (+! (-> self shot-counter) 1) + (set! (-> self shot-timer) (-> self clock frame-counter)) + (seek! (-> self error-y-angle) (-> self error-y-angle-dest) (-> self clock time-adjust-ratio)) + (if (= (-> self error-y-angle) (-> self error-y-angle-dest)) + (set! (-> self info next-to-shoot) #f) + ) + ) + (if (= (-> self error-y-angle) (-> self error-y-angle-dest)) + (go-virtual idle) + ) + (transform-post) + (none) + ) + ) + +;; failed to figure out what this is: +(defstate idle (drill-barons-ship-turret) + :virtual #t + :enter (behavior () + (set! (-> self hit-count) 0) + 0 + (none) + ) + :code (behavior () + (until #f + (seek! (-> self anim-frame) 0.0 (* 0.01 (-> self clock time-adjust-ratio))) + (let ((v1-4 (-> self skel root-channel 0))) + (set! (-> v1-4 num-func) num-func-identity) + (let ((f0-4 (-> self anim-frame)) + (a0-3 (cond + ((= (-> self info mesh) 1) + 3.0 + ) + ((= (-> self info mesh) 2) + 10.0 + ) + (else + 11.0 + ) + ) + ) + ) + (set! (-> v1-4 frame-num) (* f0-4 a0-3)) + ) + ) + (suspend) + ) + #f + (none) + ) + :post (behavior () + (cond + ((-> self info alive) + (drill-barons-ship-turret-method-24 self) + (if (-> self info next-to-shoot) + (go-virtual attack) + ) + ) + (else + (go-virtual dead) + ) + ) + (transform-post) + (none) + ) + ) + + + + diff --git a/test/decompiler/reference/jak2/levels/drill_platform/drill-part2_REF.gc b/test/decompiler/reference/jak2/levels/drill_platform/drill-part2_REF.gc index 3f7ddb9951..b77e9e2fad 100644 --- a/test/decompiler/reference/jak2/levels/drill_platform/drill-part2_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill_platform/drill-part2_REF.gc @@ -6,7 +6,7 @@ :id 445 :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 30 15 0 60) - :rotate ((degrees 0) (degrees -2.6666667) (degrees 0)) + :rotate ((degrees 0) (degrees -60) (degrees 0)) :parts ((sp-item 1894 :fade-after (meters 600) :falloff-to (meters 700) :flags (bit7)) (sp-item 1895 :fade-after (meters 300) :flags (bit6)) ) @@ -451,7 +451,7 @@ :id 449 :flags (unk-4 unk-6) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1912 :fade-after (meters 80) :flags (bit6 bit7) :period 200 :length 100) (sp-item 1913 :fade-after (meters 80) :flags (bit6 bit7) :period 250 :length 60) (sp-item 1914 :fade-after (meters 80) :flags (bit6 bit7) :period 315 :length 260) @@ -1265,7 +1265,7 @@ :id 450 :flags (unk-4 unk-6) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1947 :fade-after (meters 80) :flags (bit6 bit7) :period 400 :length 150) (sp-item 1948 :fade-after (meters 80) :flags (bit6 bit7) :period 365 :length 160) (sp-item 1949 :fade-after (meters 80) :flags (bit6 bit7) :period 145 :length 75) diff --git a/test/decompiler/reference/jak2/levels/drill_platform/drill-part_REF.gc b/test/decompiler/reference/jak2/levels/drill_platform/drill-part_REF.gc index 3968b0a133..d24d1b2254 100644 --- a/test/decompiler/reference/jak2/levels/drill_platform/drill-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill_platform/drill-part_REF.gc @@ -559,7 +559,7 @@ :id 406 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 10) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1690 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1691 :fade-after (meters 200) :flags (bit6)) (sp-item 1692 :fade-after (meters 200) :flags (bit6 bit7)) @@ -1778,7 +1778,7 @@ :id 409 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 16) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1738 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1739 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1740 :fade-after (meters 200) :flags (bit6 bit7)) @@ -1966,7 +1966,7 @@ :id 411 :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 10) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1745 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1746 :fade-after (meters 200) :flags (bit6 bit7)) (sp-item 1747 :fade-after (meters 200) :flags (bit6 bit7)) @@ -2059,7 +2059,7 @@ :id 412 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 6) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1749 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1750 :fade-after (meters 180) :falloff-to (meters 200) :flags (bit7)) ) @@ -2126,7 +2126,7 @@ :id 413 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 1752 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1753 :fade-after (meters 200) :falloff-to (meters 240) :flags (bit7)) ) @@ -2137,7 +2137,7 @@ :id 414 :flags (unk-4 unk-6 unk-7) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :scale (0.0 -16384.0 0.0) :parts ((sp-item 1752 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1753 :fade-after (meters 200) :falloff-to (meters 240) :flags (bit7)) @@ -2214,7 +2214,7 @@ :id 415 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -2 2 6) - :rotate ((degrees 0) (degrees 8) (degrees 0)) + :rotate ((degrees 0) (degrees 180) (degrees 0)) :parts ((sp-item 1755 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 1756 :fade-after (meters 200) :falloff-to (meters 240) :flags (bit7)) ) @@ -2479,7 +2479,7 @@ :duration (seconds 3.335) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1765 :fade-after (meters 300) :falloff-to (meters 300) :flags (is-3d bit7) :period 1200 :length 10) (sp-item 1766 :fade-after (meters 200) :falloff-to (meters 200) :flags (is-3d bit7) :period 1200 :length 15) (sp-item 1767 :fade-after (meters 300) :falloff-to (meters 300) :flags (bit7) :period 1200 :length 20) @@ -3028,7 +3028,7 @@ :id 426 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 209)) ) @@ -3664,7 +3664,7 @@ :id 428 :flags (unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1813 :flags (bit6 bit7)) (sp-item 1814 :flags (bit6 bit7)) (sp-item 1815 :flags (bit6 bit7)) @@ -5150,7 +5150,7 @@ :id 442 :flags (unk-6) :bounds (static-bspherem 0 0 0 20) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 1882 :flags (bit7))) ) @@ -5366,7 +5366,3 @@ (defpart 1893 :init-specs ((sp-flt spt-fade-a -0.85333335)) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/forest/forest-part_REF.gc b/test/decompiler/reference/jak2/levels/forest/forest-part_REF.gc index 16517fca10..f80f1f3624 100644 --- a/test/decompiler/reference/jak2/levels/forest/forest-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/forest-part_REF.gc @@ -159,7 +159,7 @@ :id 478 :flags (unk-6) :bounds (static-bspherem 0 0 0 20) - :rotate ((degrees 0) (degrees 3.5555556) (degrees 0)) + :rotate ((degrees 0) (degrees 80) (degrees 0)) :parts ((sp-item 2113 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2114 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2115 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -267,7 +267,7 @@ :id 479 :flags (unk-6) :bounds (static-bspherem 0 10 0 30) - :rotate ((degrees 0) (degrees 2) (degrees 0)) + :rotate ((degrees 0) (degrees 45) (degrees 0)) :parts ((sp-item 2118 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2119 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2120 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -375,7 +375,7 @@ :id 480 :flags (unk-6) :bounds (static-bspherem 0 10 0 30) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2121 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2122 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2123 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -483,7 +483,7 @@ :id 481 :flags (unk-6) :bounds (static-bspherem 0 15 0 30) - :rotate ((degrees 0) (degrees 2.2222223) (degrees 0)) + :rotate ((degrees 0) (degrees 50.000004) (degrees 0)) :parts ((sp-item 2124 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2125 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2126 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -624,7 +624,7 @@ :id 482 :flags (unk-6) :bounds (static-bspherem 0 15 0 30) - :rotate ((degrees 0) (degrees 2) (degrees 0)) + :rotate ((degrees 0) (degrees 45) (degrees 0)) :parts ((sp-item 2128 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2129 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2130 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -764,7 +764,7 @@ :id 483 :flags (unk-6) :bounds (static-bspherem 0 5 0 10) - :rotate ((degrees 0) (degrees 4.888889) (degrees 0)) + :rotate ((degrees 0) (degrees 110) (degrees 0)) :parts ((sp-item 2132 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2133 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2134 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -870,7 +870,7 @@ :id 484 :flags (unk-6) :bounds (static-bspherem 0 15 0 30) - :rotate ((degrees 0) (degrees 4.4444447) (degrees 0)) + :rotate ((degrees 0) (degrees 100.00001) (degrees 0)) :parts ((sp-item 2135 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2136 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 2137 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1727,7 +1727,3 @@ (defpart 2171 :init-specs ((sp-flt spt-fade-b -0.8192)) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/forest/forest-scenes_REF.gc b/test/decompiler/reference/jak2/levels/forest/forest-scenes_REF.gc index 5c2a178d0e..48bfa92762 100644 --- a/test/decompiler/reference/jak2/levels/forest/forest-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/forest-scenes_REF.gc @@ -34,7 +34,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 12) - :rotate ((degrees 8) (degrees 0) (degrees 0)) + :rotate ((degrees 180) (degrees 0) (degrees 0)) :parts ((sp-item 2173 :flags (bit7)) (sp-item 2174 :flags (bit7)) (sp-item 2175 :flags (bit7)) diff --git a/test/decompiler/reference/jak2/levels/fortress/ammo_dump/fordumpc-part_REF.gc b/test/decompiler/reference/jak2/levels/fortress/ammo_dump/fordumpc-part_REF.gc index 09d5fba442..45e9d57e43 100644 --- a/test/decompiler/reference/jak2/levels/fortress/ammo_dump/fordumpc-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/ammo_dump/fordumpc-part_REF.gc @@ -1066,7 +1066,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2520 :flags (bit7) :period 1500 :length 25 :offset -10) (sp-item 2521 :fade-after (meters 60) :flags (bit7) :period 1500 :length 30) (sp-item 2522 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7) :period 1500 :length 100) @@ -2659,7 +2659,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2593 :flags (bit7) :period 1500 :length 25 :offset -10) (sp-item 2594 :fade-after (meters 60) :flags (bit7) :period 1500 :length 30) (sp-item 2595 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7) :period 1500 :length 100) @@ -3028,7 +3028,3 @@ (defpart 2612 :init-specs ((sp-flt spt-fade-r -0.125) (sp-flt spt-fade-g 0.4) (sp-flt spt-fade-b 0.4)) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/fortress/prison/prison-part_REF.gc b/test/decompiler/reference/jak2/levels/fortress/prison/prison-part_REF.gc index 7b475dd125..9b6436d296 100644 --- a/test/decompiler/reference/jak2/levels/fortress/prison/prison-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/prison/prison-part_REF.gc @@ -199,7 +199,7 @@ :id 588 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 18) - :rotate ((degrees -1.5555556) (degrees 0) (degrees 0)) + :rotate ((degrees -35) (degrees 0) (degrees 0)) :parts ((sp-item 2620 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7))) ) @@ -238,7 +238,7 @@ :id 589 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 20) - :rotate ((degrees -1.5555556) (degrees 0) (degrees 0)) + :rotate ((degrees -35) (degrees 0) (degrees 0)) :parts ((sp-item 2622 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7))) ) @@ -1799,7 +1799,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-part_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-part_REF.gc index 7ddf4584df..50a7e12ab5 100644 --- a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-part_REF.gc @@ -1422,7 +1422,7 @@ :id 672 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 1.5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2950 :fade-after (meters 80) :flags (bit6)) (sp-item 2951 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7)) ) @@ -3776,7 +3776,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc index bce17a5c64..77c29c1eb1 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc @@ -62,7 +62,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2297 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2298 :flags (is-3d bit7) :period 1200 :length 15) @@ -235,7 +235,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2304 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2305 :flags (is-3d bit7) :period 1200 :length 15) @@ -357,7 +357,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2306 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2307 :flags (is-3d bit7) :period 1200 :length 15) @@ -479,7 +479,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2308 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2309 :flags (is-3d bit7) :period 1200 :length 15) @@ -601,7 +601,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2310 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2311 :flags (is-3d bit7) :period 1200 :length 15) @@ -774,7 +774,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2314 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2315 :flags (is-3d bit7) :period 1200 :length 15) @@ -947,7 +947,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2318 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2319 :flags (is-3d bit7) :period 1200 :length 15) @@ -1209,7 +1209,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2323 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2324 :flags (is-3d bit7) :period 1200 :length 15) @@ -1331,7 +1331,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2325 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2326 :flags (is-3d bit7) :period 1200 :length 15) @@ -1453,7 +1453,7 @@ :duration (seconds 8) :flags (use-local-clock unk-6 unk-7) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :scale (0.0 16384.0 0.0) :parts ((sp-item 2327 :flags (is-3d bit7) :period 1200 :length 10) (sp-item 2328 :flags (is-3d bit7) :period 1200 :length 15) diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-part_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-part_REF.gc index 00401497d5..8e8eacf54b 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gungame-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gungame-part_REF.gc @@ -28,7 +28,7 @@ :id 531 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 0) (degrees -4) (degrees 0)) + :rotate ((degrees 0) (degrees -90) (degrees 0)) :parts ((sp-item 2332 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7))) ) @@ -280,7 +280,3 @@ (sp-flt spt-userdata 2048.0) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc b/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc index 1b6a18bbe2..7b54730ed4 100644 --- a/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc @@ -913,7 +913,7 @@ :linger-duration (seconds 1.5) :flags (unk-6) :bounds (static-bspherem 0 0 0 640) - :rotate ((degrees 4) (degrees 2.2222223) (degrees 0)) + :rotate ((degrees 90) (degrees 50.000004) (degrees 0)) :parts ((sp-item 5343 :flags (is-3d bit6 bit7)) (sp-item 5344 :flags (is-3d bit6 bit7)) (sp-item 5345 :flags (bit7)) @@ -1356,7 +1356,7 @@ :id 1263 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5362 :flags (is-3d bit7) :period 25 :length 5)) ) @@ -1383,7 +1383,7 @@ :id 1264 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5363 :flags (is-3d bit7) :period 25 :length 5)) ) @@ -1412,7 +1412,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 256) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5364 :flags (bit7)) (sp-item 5365 :flags (bit7)) (sp-item 5366 :flags (bit7)) @@ -1641,7 +1641,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-5 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5373 :flags (bit6) :period 900 :length 5) (sp-item 5374 :flags (bit6) :period 900 :length 5) (sp-item 5375 :period 900 :length 15) diff --git a/test/decompiler/reference/jak2/levels/landing_pad/castle-part_REF.gc b/test/decompiler/reference/jak2/levels/landing_pad/castle-part_REF.gc new file mode 100644 index 0000000000..4fef290e89 --- /dev/null +++ b/test/decompiler/reference/jak2/levels/landing_pad/castle-part_REF.gc @@ -0,0 +1,1320 @@ +;;-*-Lisp-*- +(in-package goal) + +;; definition of type castle-part +(deftype castle-part (part-spawner) + () + :heap-base #x30 + :method-count-assert 16 + :size-assert #xb0 + :flag-assert #x10003000b0 + ) + +;; definition for method 3 of type castle-part +(defmethod inspect castle-part ((obj castle-part)) + (when (not obj) + (set! obj obj) + (goto cfg-4) + ) + (let ((t9-0 (method-of-type part-spawner inspect))) + (t9-0 obj) + ) + (label cfg-4) + obj + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-hanging-lights + :id 1187 + :bounds (static-bspherem 0 0 0 5) + :parts ((sp-item 5121 :fade-after (meters 120) :flags (bit6))) + ) + +;; failed to figure out what this is: +(defpart 5121 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-scale-x (meters 4.5) (meters 0.1) 1.0) + (sp-flt spt-rot-x 409.6) + (sp-flt spt-rot-z (degrees -17.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 117.0) + (sp-flt spt-g 80.0) + (sp-flt spt-b 54.0) + (sp-flt spt-a 32.0) + (sp-flt spt-omega 494387.2) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 2048.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5122 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-scale-x (meters 4.5) (meters 0.1) 1.0) + (sp-flt spt-rot-x 819.2) + (sp-flt spt-rot-z (degrees -17.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 96.0) + (sp-flt spt-b 62.0) + (sp-flt spt-a 32.0) + (sp-flt spt-omega 494387.2) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 2048.0) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-red-gauge + :id 1188 + :flags (unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5123 :fade-after (meters 200) :flags (bit6 bit7))) + ) + +;; failed to figure out what this is: +(defpart 5123 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters -0.1)) + (sp-flt spt-scale-x (meters 3.5)) + (sp-flt spt-rot-x 409.6) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-flt spt-scale-y (meters 5)) + (sp-flt spt-r 255.0) + (sp-rnd-flt spt-g 0.0 64.0 1.0) + (sp-copy-from-other spt-b -1) + (sp-rnd-flt spt-a 32.0 2.0 1.0) + (sp-flt spt-omega 822067.2) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 glow) + (sp-flt spt-userdata 409.6) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-pipe-green-drip + :id 1189 + :bounds (static-bspherem 0 0 0 6) + :parts ((sp-item 5124 :fade-after (meters 140) :falloff-to (meters 140)) + (sp-item 5125 :fade-after (meters 140) :flags (is-3d)) + ) + ) + +;; failed to figure out what this is: +(defpart 5124 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x21 :page #xc)) + (sp-rnd-flt spt-num 0.0 0.1 1.0) + (sp-int spt-rot-x 4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 196.0) + (sp-flt spt-scalevel-x (meters 0.00044444445)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-int spt-timer 900) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-12 use-global-acc) + (sp-flt spt-userdata 114892.8) + (sp-func spt-func 'check-drop-level-castle-drop-userdata) + (sp-int-plain-rnd spt-next-time 225 224 1) + (sp-launcher-by-id spt-next-launcher 5126) + ) + ) + +;; failed to figure out what this is: +(defpart 5126 + :init-specs ((sp-rnd-flt spt-accel-y -8.192 2.7306666 1.0) + (sp-rnd-flt spt-friction 0.93 0.02 1.0) + (sp-int-plain-rnd spt-next-time 0 224 1) + (sp-launcher-by-id spt-next-launcher 5127) + ) + ) + +;; failed to figure out what this is: +(defpart 5127 + :init-specs ((sp-flt spt-r 255.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 255.0) + (sp-int spt-next-time 5) + (sp-launcher-by-id spt-next-launcher 5128) + ) + ) + +;; failed to figure out what this is: +(defpart 5128 + :init-specs ((sp-flt spt-r 128.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 0.0) + (sp-int-plain-rnd spt-next-time 0 449 1) + (sp-launcher-by-id spt-next-launcher 5127) + ) + ) + +;; definition for function check-drop-level-castle-drop-userdata +;; INFO: Used lq/sq +(defun check-drop-level-castle-drop-userdata ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix)) + (when (< (-> arg2 vector 0 y) (-> arg1 user-float)) + (let ((s3-0 (new 'stack-no-clear 'vector))) + (sp-kill-particle arg0 arg1) + (set-vector! s3-0 (-> arg2 vector 0 x) (-> arg1 user-float) (-> arg2 vector 0 z) 1.0) + (let ((t9-1 sp-launch-particles-var) + (a0-3 *sp-particle-system-2d*) + (a1-2 (-> *part-id-table* 5129)) + (a2-1 *launch-matrix*) + ) + (set! (-> a2-1 trans quad) (-> s3-0 quad)) + (t9-1 a0-3 a1-2 a2-1 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-2 sp-launch-particles-var) + (a0-4 *sp-particle-system-3d*) + (a1-3 (-> *part-id-table* 5130)) + (a2-2 *launch-matrix*) + ) + (set! (-> a2-2 trans quad) (-> s3-0 quad)) + (t9-2 a0-4 a1-3 a2-2 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-3 sp-launch-particles-var) + (a0-5 *sp-particle-system-3d*) + (a1-4 (-> *part-id-table* 5131)) + (a2-3 *launch-matrix*) + ) + (set! (-> a2-3 trans quad) (-> s3-0 quad)) + (t9-3 a0-5 a1-4 a2-3 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-4 sp-launch-particles-var) + (a0-6 *sp-particle-system-3d*) + (a1-5 (-> *part-id-table* 5132)) + (a2-4 *launch-matrix*) + ) + (set! (-> a2-4 trans quad) (-> s3-0 quad)) + (t9-4 a0-6 a1-5 a2-4 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + ) + ) + (sparticle-motion-blur arg0 arg1 (the-as vector arg2)) + (none) + ) + +;; failed to figure out what this is: +(defpart 5129 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x21 :page #xc)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-scale-x (meters 0.1) (meters 0.05) 1.0) + (sp-int spt-rot-x 4) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 0.0) + (sp-rnd-flt spt-a 32.0 32.0 1.0) + (sp-flt spt-omega 8.192) + (sp-rnd-flt spt-vel-y (meters 0.013333334) (meters 0.01) 1.0) + (sp-flt spt-fade-a -0.16) + (sp-rnd-flt spt-accel-y -4.096 -0.68266666 1.0) + (sp-flt spt-friction 0.97) + (sp-int spt-timer 200) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + (sp-func spt-func 'sparticle-motion-blur) + (sp-int-plain-rnd spt-next-time 0 224 1) + (sp-launcher-by-id spt-next-launcher 5127) + (sp-rnd-flt spt-conerot-x (degrees 25.000002) (degrees 30.0) 1.0) + (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 360.0) 1.0) + (sp-flt spt-rotate-y (degrees 180.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5130 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-scale-x (meters 0.5) (meters 0.25) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 0.0) + (sp-rnd-flt spt-a 64.0 32.0 1.0) + (sp-flt spt-omega 0.0) + (sp-rnd-flt spt-scalevel-x (meters 0.006666667) (meters 0.006666667) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a -1.2) + (sp-int spt-timer 300) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-14) + (new 'static 'sp-field-init-spec + :field (sp-field-id spt-userdata) + :flags (sp-flag plain-v2) + :object (new 'static 'boxed-array :type int32 10 0 0 #xc0c900 #xc03300 #xc02c00) + ) + (sp-func spt-func 'sparticle-texture-animate) + ) + ) + +;; failed to figure out what this is: +(defpart 5125 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters -2.375)) + (sp-flt spt-scale-x (meters 4.5)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 32.0) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + ) + ) + +;; failed to figure out what this is: +(defpart 5131 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2c :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-r 128.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 0.0) + (sp-rnd-flt spt-a 64.0 32.0 1.0) + (sp-flt spt-scalevel-x (meters 0.0027777778)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a -0.10666667) + (sp-int spt-timer 900) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + ) + ) + +;; failed to figure out what this is: +(defpart 5132 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2c :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-x (meters 0.05)) + (sp-flt spt-r 128.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 0.0) + (sp-rnd-flt spt-a 32.0 16.0 1.0) + (sp-flt spt-scalevel-x (meters 0.0027777778)) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a -0.10666667) + (sp-int spt-timer 900) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-4) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-console-green-screen + :id 1190 + :flags (unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5133 :fade-after (meters 200) :flags (bit6 bit7))) + ) + +;; failed to figure out what this is: +(defpart 5133 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters -0.1)) + (sp-flt spt-scale-x (meters 3)) + (sp-flt spt-rot-x 409.6) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 0.0) + (sp-flt spt-g 255.0) + (sp-rnd-flt spt-b 0.0 128.0 1.0) + (sp-rnd-flt spt-a 16.0 16.0 1.0) + (sp-flt spt-omega 822067.2) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 glow) + (sp-flt spt-userdata 1024.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-console-flashing-red-light-1 + :id 1191 + :flags (unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5134 :fade-after (meters 120) :flags (bit6 bit7) :period 150 :length 5)) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-console-flashing-red-light-2 + :id 1192 + :flags (unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5134 :fade-after (meters 120) :flags (bit6 bit7) :period 115 :length 5 :offset 65)) + ) + +;; failed to figure out what this is: +(defpart 5134 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters -0.1)) + (sp-flt spt-z (meters 0.05)) + (sp-flt spt-scale-x (meters 1)) + (sp-flt spt-rot-x 409.6) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 8.0) + (sp-flt spt-b 8.0) + (sp-flt spt-a 16.0) + (sp-flt spt-omega 494387.2) + (sp-int spt-timer 75) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 glow) + (sp-flt spt-userdata 1024.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5120 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters -0.15)) + (sp-flt spt-scale-x (meters 3)) + (sp-flt spt-rot-x 409.6) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 64.0) + (sp-flt spt-b 64.0) + (sp-flt spt-a 32.0) + (sp-flt spt-omega 494387.2) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 1024.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5119 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters -0.15)) + (sp-flt spt-scale-x (meters 3)) + (sp-flt spt-rot-x 409.6) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 0.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 255.0) + (sp-flt spt-a 32.0) + (sp-flt spt-omega 494387.2) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 1024.0) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-green-dome-light + :id 1193 + :flags (unk-4) + :bounds (static-bspherem 0 0 0 2) + :parts ((sp-item 5135 :flags (bit6 bit7))) + ) + +;; failed to figure out what this is: +(defpart 5135 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-z (meters -0.25)) + (sp-flt spt-scale-x (meters 4.5)) + (sp-flt spt-rot-x 409.6) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 48.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 48.0) + (sp-flt spt-a 32.0) + (sp-flt spt-omega 822067.2) + (sp-int spt-timer 5) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 1024.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; definition for function castle-green-dome-light-pulsate +(defun castle-green-dome-light-pulsate ((arg0 int) (arg1 sparticle-cpuinfo) (arg2 sparticle-launchinfo)) + (with-pp + (let ((s5-0 lerp-scale) + (s4-0 32.0) + (s3-0 64.0) + (t9-0 sin) + (f0-0 3640.889) + (f1-1 (* 0.0033333334 (the float (-> pp clock frame-counter)))) + ) + (set! (-> arg2 coneradius) + (s5-0 s4-0 s3-0 (t9-0 (* f0-0 (- f1-1 (* (the float (the int (/ f1-1 360.0))) 360.0)))) -1.0 1.0) + ) + ) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-steamvent + :id 1194 + :flags (unk-4) + :bounds (static-bspherem 0 0 0 6) + :parts ((sp-item 5136 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) + (sp-item 5137 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) + ) + ) + +;; failed to figure out what this is: +(defpart 5136 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-rnd-flt spt-num 0.5 1.0 1.0) + (sp-rnd-int-flt spt-x (meters -0.4) 4 819.2) + (sp-rnd-flt spt-y (meters -0.1) (meters 0.3) 1.0) + (sp-rnd-flt spt-z (meters 0.2) (meters 0.2) 1.0) + (sp-rnd-flt spt-scale-x (meters 1.4) (meters 0.25) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 64.0 32.0 1.0) + (sp-rnd-flt spt-g 32.0 16.0 1.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 0.0) + (sp-rnd-flt spt-vel-z (meters 0.006666667) (meters 0.0033333334) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.0016666667) (meters 0.0033333334) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -1.2) (degrees 2.4) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a 0.42666668) + (sp-rnd-flt spt-accel-y 0.54613334 0.54613334 1.0) + (sp-flt spt-friction 0.99) + (sp-int spt-timer 600) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-12) + (sp-int-plain-rnd spt-next-time 100 24 1) + (sp-launcher-by-id spt-next-launcher 5138) + (sp-rnd-flt spt-launchrot-x (degrees -5.0) (degrees 10.0) 1.0) + (sp-rnd-flt spt-launchrot-y (degrees -5.0) (degrees 10.0) 1.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5137 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-rnd-flt spt-num 1.0 1.0 1.0) + (sp-rnd-int-flt spt-x (meters -0.3) 1 0.0) + (sp-rnd-flt spt-y (meters 0) (meters 0.3) 1.0) + (sp-rnd-flt spt-z (meters 0.6) (meters 0.2) 1.0) + (sp-rnd-flt spt-scale-x (meters 0.3) (meters 0.25) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 64.0 32.0 1.0) + (sp-rnd-flt spt-g 32.0 16.0 1.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 0.0) + (sp-rnd-flt spt-vel-z (meters 0.006666667) (meters 0.0033333334) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.0016666667) (meters 0.0033333334) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -1.2) (degrees 2.4) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a 0.42666668) + (sp-rnd-flt spt-accel-y 0.4096 0.4096 1.0) + (sp-flt spt-friction 0.99) + (sp-int spt-timer 600) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-12) + (sp-int-plain-rnd spt-next-time 100 24 1) + (sp-launcher-by-id spt-next-launcher 5138) + (sp-rnd-flt spt-launchrot-x (degrees -5.0) (degrees 10.0) 1.0) + (sp-rnd-flt spt-launchrot-y (degrees -5.0) (degrees 10.0) 1.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5138 + :init-specs ((sp-rnd-flt spt-fade-r 0.64 0.42666668 1.0) + (sp-rnd-flt spt-fade-g 0.85333335 0.42666668 1.0) + (sp-rnd-flt spt-fade-a -0.10666667 -0.10666667 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5139 + :init-specs ((sp-flt spt-r 64.0) + (sp-flt spt-g 64.0) + (sp-flt spt-b 64.0) + (sp-rnd-flt spt-fade-a -0.10666667 -0.10666667 1.0) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-pipe-green-steam + :id 1195 + :flags (unk-4) + :bounds (static-bspherem 0 0 0 6) + :parts ((sp-item 5140 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7)) + (sp-item 5141 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7)) + ) + ) + +;; failed to figure out what this is: +(defpart 5140 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x92 :page #xc)) + (sp-rnd-flt spt-num 0.0 5.0 1.0) + (sp-flt spt-scale-x (meters 0.1)) + (sp-int spt-rot-x 4) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 0.0 64.0 1.0) + (sp-rnd-flt spt-g 64.0 64.0 1.0) + (sp-flt spt-b 64.0) + (sp-rnd-flt spt-a 64.0 32.0 1.0) + (sp-flt spt-omega 4.096) + (sp-rnd-flt spt-vel-z (meters 0.083333336) (meters 0.033333335) 1.0) + (sp-rnd-flt spt-fade-a -0.64 -0.64 1.0) + (sp-rnd-flt spt-friction 0.93 0.025 1.0) + (sp-int spt-timer 150) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-12) + (sp-func spt-func 'sparticle-motion-blur) + (sp-rnd-flt spt-launchrot-x (degrees -7.5) (degrees 15.0) 1.0) + (sp-rnd-flt spt-launchrot-y (degrees -7.5) (degrees 15.0) 1.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5141 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-rnd-flt spt-num 1.0 3.0 1.0) + (sp-rnd-flt spt-scale-x (meters 0.5) (meters 0.25) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 0.0 128.0 1.0) + (sp-rnd-flt spt-g 128.0 32.0 1.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 0.0) + (sp-rnd-flt spt-vel-z (meters 0.05) (meters 0.033333335) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.01) (meters 0.016666668) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -1.2) (degrees 2.4) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a 0.96) + (sp-rnd-flt spt-friction 0.93 0.025 1.0) + (sp-int spt-timer 150) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-12) + (sp-int-plain-rnd spt-next-time 25 24 1) + (sp-launcher-by-id spt-next-launcher 5142) + (sp-rnd-flt spt-launchrot-x (degrees -5.0) (degrees 10.0) 1.0) + (sp-rnd-flt spt-launchrot-y (degrees -5.0) (degrees 10.0) 1.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5142 + :init-specs ((sp-rnd-flt spt-fade-a -0.48 -0.48 1.0)) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-pod-pipe + :id 1196 + :flags (unk-4) + :bounds (static-bspherem 0 0 0 6) + :parts ((sp-item 5143 :fade-after (meters 60) :falloff-to (meters 60) :flags (bit7)) + (sp-item 5144 :fade-after (meters 100) :falloff-to (meters 140) :flags (bit7)) + ) + ) + +;; failed to figure out what this is: +(defpart 5143 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x92 :page #xc)) + (sp-rnd-flt spt-num 0.0 5.0 1.0) + (sp-flt spt-scale-x (meters 0.1)) + (sp-int spt-rot-x 4) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-copy-from-other spt-g -1) + (sp-copy-from-other spt-b -1) + (sp-rnd-flt spt-a 64.0 32.0 1.0) + (sp-flt spt-omega 4.096) + (sp-rnd-flt spt-vel-z (meters 0.083333336) (meters 0.033333335) 1.0) + (sp-rnd-flt spt-fade-a -0.64 -0.64 1.0) + (sp-rnd-flt spt-friction 0.93 0.025 1.0) + (sp-int spt-timer 150) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-12) + (sp-func spt-func 'sparticle-motion-blur) + (sp-rnd-flt spt-launchrot-x (degrees -7.5) (degrees 15.0) 1.0) + (sp-rnd-flt spt-launchrot-y (degrees -7.5) (degrees 15.0) 1.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5144 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-rnd-flt spt-num 1.0 3.0 1.0) + (sp-rnd-flt spt-scale-x (meters 0.5) (meters 0.25) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 64.0 128.0 1.0) + (sp-copy-from-other spt-g -1) + (sp-copy-from-other spt-b -1) + (sp-flt spt-a 0.0) + (sp-rnd-flt spt-vel-z (meters 0.083333336) (meters 0.033333335) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.01) (meters 0.016666668) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -1.2) (degrees 2.4) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a 0.96) + (sp-rnd-flt spt-friction 0.93 0.025 1.0) + (sp-int spt-timer 150) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-12) + (sp-int-plain-rnd spt-next-time 25 24 1) + (sp-launcher-by-id spt-next-launcher 5145) + (sp-rnd-flt spt-launchrot-x (degrees -5.0) (degrees 10.0) 1.0) + (sp-rnd-flt spt-launchrot-y (degrees -5.0) (degrees 10.0) 1.0) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5145 + :init-specs ((sp-rnd-flt spt-fade-a -0.48 -0.48 1.0)) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-green-slime + :id 1197 + :bounds (static-bspherem 0 0 0 2) + :parts ((sp-item 5146 :fade-after (meters 150) :falloff-to (meters 85) :period 300 :length 5) + (sp-item 5147 :fade-after (meters 150) :falloff-to (meters 100)) + ) + ) + +;; failed to figure out what this is: +(defpart 5146 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2 :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-x (meters -3) (meters 6) 1.0) + (sp-rnd-flt spt-z (meters -3) (meters 6) 1.0) + (sp-flt spt-scale-x (meters 0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 32.0) + (sp-flt spt-g 196.0) + (sp-flt spt-b 48.0) + (sp-flt spt-a 196.0) + (sp-int spt-timer 900) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + (sp-int-plain-rnd spt-next-time 0 599 1) + (sp-launcher-by-id spt-next-launcher 5148) + ) + ) + +;; failed to figure out what this is: +(defpart 5148 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.002) (meters 0.002) 1.0) + (sp-rnd-flt spt-scalevel-y (meters 0.001) (meters 0.001) 1.0) + (sp-int spt-timer 300) + (sp-int-plain-rnd spt-next-time 150 149 1) + (sp-launcher-by-id spt-next-launcher 5149) + ) + ) + +;; failed to figure out what this is: +(defpart 5149 + :init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.00066666666) (meters 0.00066666666) 1.0) + (sp-rnd-flt spt-scalevel-y (meters 0.00033333333) (meters 0.00033333333) 1.0) + (sp-int spt-timer 600) + (sp-int-plain-rnd spt-next-time 150 449 1) + (sp-launcher-by-id spt-next-launcher 5150) + ) + ) + +;; failed to figure out what this is: +(defpart 5150 + :init-specs ((sp-func spt-func 'castle-green-slime-popper)) + ) + +;; definition for function castle-green-slime-popper +;; INFO: Used lq/sq +(defun castle-green-slime-popper ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix)) + (set! (-> arg1 sp-func) (the-as (function sparticle-system sparticle-cpuinfo sprite-vec-data-3d uint none) 0)) + (let ((gp-0 (new 'stack-no-clear 'vector))) + (sp-kill-particle arg0 arg1) + (set-vector! gp-0 (-> arg2 vector 0 x) (-> arg2 vector 0 y) (-> arg2 vector 0 z) 1.0) + (let ((t9-1 sp-launch-particles-var) + (a0-2 *sp-particle-system-2d*) + (a1-1 (-> *part-id-table* 5151)) + (a2-1 *launch-matrix*) + ) + (set! (-> a2-1 trans quad) (-> gp-0 quad)) + (t9-1 a0-2 a1-1 a2-1 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-2 sp-launch-particles-var) + (a0-3 *sp-particle-system-2d*) + (a1-2 (-> *part-id-table* 5152)) + (a2-2 *launch-matrix*) + ) + (set! (-> a2-2 trans quad) (-> gp-0 quad)) + (t9-2 a0-3 a1-2 a2-2 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (let ((t9-3 sp-launch-particles-var) + (a0-4 *sp-particle-system-3d*) + (a1-3 (-> *part-id-table* 5153)) + (a2-3 *launch-matrix*) + ) + (set! (-> a2-3 trans quad) (-> gp-0 quad)) + (t9-3 a0-4 a1-3 a2-3 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + ) + (none) + ) + +;; failed to figure out what this is: +(defpart 5153 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x33 :page #xc)) + (sp-flt spt-num 3.0) + (sp-flt spt-y (meters 0)) + (sp-rnd-flt spt-scale-x (meters 0.25) (meters 0.1) 1.0) + (sp-rnd-flt spt-rot-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 0.0 128.0 1.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 255.0) + (sp-rnd-flt spt-scalevel-x (meters 0.0375) (meters 0.0375) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-rnd-flt spt-fade-a -3.1875 -3.1875 1.0) + (sp-int spt-timer 80) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 sp-cpuinfo-flag-12) + ) + ) + +;; failed to figure out what this is: +(defpart 5152 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc)) + (sp-flt spt-num 1.0) + (sp-rnd-flt spt-scale-x (meters 2) (meters 0.1) 1.0) + (sp-flt spt-rot-x 409.6) + (sp-flt spt-rot-z (degrees -17.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 64.0 196.0 1.0) + (sp-flt spt-g 255.0) + (sp-rnd-flt spt-b 0.0 64.0 1.0) + (sp-flt spt-a 22.0) + (sp-flt spt-omega 494387.2) + (sp-flt spt-fade-a -0.8) + (sp-int spt-timer 15) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3 glow) + (sp-flt spt-userdata 2048.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5151 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x21 :page #xc)) + (sp-rnd-flt spt-num 8.0 8.0 1.0) + (sp-rnd-flt spt-x (meters 0) (meters 0.3) 1.0) + (sp-rnd-flt spt-scale-x (meters 0.2) (meters 0.1) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 3600.0) 1.0) + (sp-rnd-flt spt-scale-y (meters 0.2) (meters 0.1) 1.0) + (sp-rnd-flt spt-r 0.0 128.0 1.0) + (sp-flt spt-g 255.0) + (sp-flt spt-b 0.0) + (sp-rnd-flt spt-a 64.0 64.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.026666667) (meters 0.013333334) 1.0) + (sp-rnd-flt spt-scalevel-x (meters -0.0013333333) (meters 0.00033333333) 1.0) + (sp-rnd-flt spt-rotvel-z (degrees -1.2) (degrees 2.4) 1.0) + (sp-rnd-flt spt-scalevel-y (meters -0.0013333333) (meters 0.00033333333) 1.0) + (sp-rnd-flt spt-fade-a -0.21333334 -0.21333334 1.0) + (sp-rnd-flt spt-accel-y -4.096 -2.7306666 1.0) + (sp-rnd-flt spt-friction 0.93 0.02 1.0) + (sp-int spt-timer 300) + (sp-cpuinfo-flags sp-cpuinfo-flag-0 sp-cpuinfo-flag-3 use-global-acc) + (sp-rnd-flt spt-conerot-x (degrees 0.0) (degrees 60.0) 1.0) + (sp-rnd-flt spt-conerot-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 3600.0) 1.0) + (sp-rnd-flt spt-conerot-radius (meters 0) (meters -0.2) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5147 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xc)) + (sp-rnd-flt spt-num 0.0 0.05 1.0) + (sp-rnd-flt spt-x (meters 0) (meters 5) 1.0) + (sp-flt spt-y (meters 1)) + (sp-rnd-flt spt-scale-x (meters 4) (meters 2) 1.0) + (sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 0.0 128.0 1.0) + (sp-rnd-flt spt-g 128.0 128.0 1.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 0.0) + (sp-rnd-flt spt-vel-y (meters 0.006666667) (meters 0.006666667) 1.0) + (sp-flt spt-scalevel-x (meters 0.0033333334)) + (sp-rnd-flt spt-rotvel-z (degrees -0.2) (degrees 0.4) 1.0) + (sp-copy-from-other spt-scalevel-y -4) + (sp-flt spt-fade-a 0.21333334) + (sp-rnd-flt spt-friction 0.92 0.01 1.0) + (sp-int spt-timer 1200) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + (sp-int-plain-rnd spt-next-time 75 74 1) + (sp-launcher-by-id spt-next-launcher 5154) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 3600.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5154 + :init-specs ((sp-flt spt-fade-a 0.0) (sp-int spt-next-time 150) (sp-launcher-by-id spt-next-launcher 5155)) + ) + +;; failed to figure out what this is: +(defpart 5155 + :init-specs ((sp-flt spt-fade-g -0.42666668) (sp-int spt-next-time 150) (sp-launcher-by-id spt-next-launcher 5156)) + ) + +;; failed to figure out what this is: +(defpart 5156 + :init-specs ((sp-flt spt-fade-r 0.0) (sp-flt spt-fade-g 0.0) (sp-flt spt-fade-a -0.10666667)) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-green-slime-tube + :id 1198 + :linger-duration (seconds 12) + :flags (unk-4 unk-6) + :bounds (static-bspherem 0 4 0 6) + :rotate ((degrees 90) (degrees 0) (degrees 180)) + :parts ((sp-item 5157 :fade-after (meters 150) :falloff-to (meters 100) :flags (is-3d bit7)) + (sp-item 5158 :fade-after (meters 150) :falloff-to (meters 100) :flags (is-3d bit7)) + ) + ) + +;; failed to figure out what this is: +(defpart 5157 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x14 :page #xc)) + (sp-func spt-birth-func 'birth-func-castle-green-slime-tube) + (sp-rnd-flt spt-num 0.008 0.002 1.0) + (sp-rnd-flt spt-x (meters -0.25) (meters 0.5) 1.0) + (sp-rnd-flt spt-y (meters -0.5) (meters -1) 1.0) + (sp-rnd-flt spt-scale-x (meters 3) (meters 2) 1.0) + (sp-flt spt-rot-x 16384.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 16.0 8.0 1.0) + (sp-rnd-flt spt-g 64.0 64.0 1.0) + (sp-rnd-flt spt-b 16.0 8.0 1.0) + (sp-rnd-flt spt-a 32.0 32.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.0033333334) (meters 0.0044444446) 1.0) + (sp-rnd-flt spt-scalevel-x (meters -0.00083333335) (meters -0.00083333335) 1.0) + (sp-rnd-flt spt-rotvel-y (degrees -0.2) (degrees 0.2) 1.0) + (sp-rnd-flt spt-scalevel-y (meters -0.00055555557) (meters -0.00083333335) 1.0) + (sp-flt spt-friction 0.9995) + (sp-int spt-timer 3600) + (sp-cpuinfo-flags sp-cpuinfo-flag-0 sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + (sp-flt spt-userdata 34816.0) + (sp-func spt-func 'castle-green-slime-tube-check-delta) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5158 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x14 :page #xc)) + (sp-func spt-birth-func 'birth-func-castle-green-slime-tube) + (sp-rnd-flt spt-num 0.008 0.002 1.0) + (sp-rnd-flt spt-x (meters -0.25) (meters 0.5) 1.0) + (sp-rnd-flt spt-y (meters -0.8) (meters -1) 1.0) + (sp-rnd-flt spt-scale-x (meters 0.5) (meters 1.5) 1.0) + (sp-flt spt-rot-x 16384.0) + (sp-copy-from-other spt-scale-y -4) + (sp-rnd-flt spt-r 32.0 8.0 1.0) + (sp-rnd-flt spt-g 64.0 64.0 1.0) + (sp-rnd-flt spt-b 32.0 8.0 1.0) + (sp-rnd-flt spt-a 48.0 16.0 1.0) + (sp-rnd-flt spt-vel-y (meters 0.0033333334) (meters 0.0044444446) 1.0) + (sp-rnd-flt spt-scalevel-x (meters 0.0016666667) (meters 0.00055555557) 1.0) + (sp-rnd-flt spt-rotvel-y (degrees -0.2) (degrees 0.2) 1.0) + (sp-rnd-flt spt-scalevel-y (meters 0.0011111111) (meters 0.00055555557) 1.0) + (sp-flt spt-friction 0.9995) + (sp-int spt-timer 3600) + (sp-cpuinfo-flags sp-cpuinfo-flag-0 sp-cpuinfo-flag-2 sp-cpuinfo-flag-3) + (sp-flt spt-userdata 34816.0) + (sp-func spt-func 'castle-green-slime-tube-check-delta) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; definition for function birth-func-castle-green-slime-tube +;; WARN: Return type mismatch int vs none. +(defun birth-func-castle-green-slime-tube ((arg0 int) (arg1 sparticle-cpuinfo) (arg2 sparticle-launchinfo)) + (set! (-> arg1 omega) (-> arg2 launchrot y)) + 0 + (none) + ) + +;; definition for function castle-green-slime-tube-check-delta +;; WARN: Return type mismatch int vs none. +(defun castle-green-slime-tube-check-delta ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix)) + (let ((f1-1 (- (-> arg2 vector 0 y) (-> arg1 omega)))) + (set! (-> arg1 user-float) (- (-> arg1 user-float) (fabs f1-1))) + ) + (set! (-> arg1 omega) (-> arg2 vector 0 y)) + (when (< (-> arg1 user-float) 8192.0) + (let ((f0-7 (fabs (/ (-> arg1 user-float) (-> arg1 vel-sxvel y))))) + (/ (- (-> arg2 vector 1 w)) f0-7) + (set! (-> arg1 fade w) (/ (- (-> arg2 vector 2 w)) f0-7)) + ) + (set! (-> arg1 sp-func) (the-as (function sparticle-system sparticle-cpuinfo sprite-vec-data-3d uint none) 0)) + 0 + ) + (none) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-pod-green-slime-tube + :id 1199 + :flags (unk-4 unk-6) + :bounds (static-bspherem 0 4 0 6) + :rotate ((degrees 90) (degrees 0) (degrees 180)) + :parts ((sp-item 209)) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-pod-dial-small + :id 1200 + :flags (use-local-clock unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5159 :flags (is-3d launch-asap bit7) :period 300 :length 5) + (sp-item 5160 :flags (is-3d bit6 bit7)) + (sp-item 5161 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) + ) + ) + +;; failed to figure out what this is: +(defpart 5160 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-scale-x (meters 0.9)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 1) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 aux-list) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5159 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x1 :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.05)) + (sp-flt spt-scale-x (meters 0.158)) + (sp-flt spt-scale-y (meters 0.8)) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 80.0) + (sp-rnd-flt spt-rotvel-y (degrees -1.2) (degrees 2.4) 1.0) + (sp-int spt-timer 1200) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-4 aux-list left-multiply-quat) + (sp-int-plain-rnd spt-next-time 25 599 1) + (sp-launcher-by-id spt-next-launcher 5162) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 360.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5161 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.025)) + (sp-flt spt-z (meters 0.35)) + (sp-flt spt-scale-x (meters 0.15)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 0.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 155) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 5163) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-pod-dial-large + :id 1201 + :flags (use-local-clock unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5164 :flags (is-3d launch-asap bit6 bit7) :period 300 :length 5) + (sp-item 5165 :flags (is-3d bit6 bit7)) + (sp-item 5166 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) + ) + ) + +;; failed to figure out what this is: +(defpart 5165 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-scale-x (meters 1.45)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 1) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 aux-list) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5164 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x1 :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.05)) + (sp-flt spt-scale-x (meters 0.225)) + (sp-flt spt-scale-y (meters 1.4)) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 80.0) + (sp-rnd-flt spt-rotvel-y (degrees -1.2) (degrees 2.4) 1.0) + (sp-int spt-timer 1200) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-4 aux-list left-multiply-quat) + (sp-int-plain-rnd spt-next-time 25 599 1) + (sp-launcher-by-id spt-next-launcher 5162) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 360.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5166 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.025)) + (sp-flt spt-z (meters 0.5)) + (sp-flt spt-scale-x (meters 0.15)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 0.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 155) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 5163) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-dial-small + :id 1202 + :flags (unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5167 :flags (is-3d launch-asap bit7) :period 300 :length 5) + (sp-item 5168 :flags (is-3d bit6 bit7)) + (sp-item 5169 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) + ) + ) + +;; failed to figure out what this is: +(defpart 5168 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-scale-x (meters 1.7)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 1) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 aux-list) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5167 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x1 :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.05)) + (sp-flt spt-scale-x (meters 0.225)) + (sp-flt spt-scale-y (meters 1.5)) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 80.0) + (sp-rnd-flt spt-rotvel-y (degrees -1.2) (degrees 2.4) 1.0) + (sp-int spt-timer 1200) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-4 aux-list left-multiply-quat) + (sp-int-plain-rnd spt-next-time 25 599 1) + (sp-launcher-by-id spt-next-launcher 5162) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 360.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5162 + :init-specs ((sp-rnd-flt spt-rotvel-y (degrees -1.2) (degrees 2.4) 1.0) + (sp-int spt-timer 1200) + (sp-int-plain-rnd spt-next-time 25 599 1) + (sp-launcher-by-id spt-next-launcher 5162) + ) + ) + +;; failed to figure out what this is: +(defpart 5169 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.025)) + (sp-flt spt-z (meters 0.6)) + (sp-flt spt-scale-x (meters 0.2)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 0.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 155) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 5163) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5163 + :init-specs ((sp-flt spt-r 64.0) (sp-flt spt-g 0.0) (sp-flt spt-b 0.0) (sp-flt spt-a 128.0)) + ) + +;; failed to figure out what this is: +(defpartgroup group-castle-dial-large + :id 1203 + :flags (use-local-clock unk-4 unk-6) + :bounds (static-bspherem 0 0 0 2) + :rotate ((degrees 90) (degrees 0) (degrees 0)) + :parts ((sp-item 5170 :flags (is-3d launch-asap bit7) :period 300 :length 5) + (sp-item 5171 :flags (is-3d bit6 bit7)) + (sp-item 5172 :fade-after (meters 100) :flags (bit7) :period 150 :length 5) + (sp-item 5173 :fade-after (meters 100) :flags (bit7) :period 150 :length 5 :offset 65) + (sp-item 5174 :fade-after (meters 100) :flags (bit7) :period 150 :length 5 :offset 35) + ) + ) + +;; failed to figure out what this is: +(defpart 5171 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-scale-x (meters 2.3)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 1) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 aux-list) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5170 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x1 :page #xb9a)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.05)) + (sp-flt spt-scale-x (meters 0.345)) + (sp-flt spt-scale-y (meters 2.2)) + (sp-flt spt-r 128.0) + (sp-flt spt-g 128.0) + (sp-flt spt-b 128.0) + (sp-flt spt-a 80.0) + (sp-rnd-flt spt-rotvel-y (degrees -1.2) (degrees 2.4) 1.0) + (sp-int spt-timer 1200) + (sp-cpuinfo-flags sp-cpuinfo-flag-2 sp-cpuinfo-flag-4 aux-list left-multiply-quat) + (sp-int-plain-rnd spt-next-time 25 599 1) + (sp-launcher-by-id spt-next-launcher 5162) + (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 360.0) 1.0) + ) + ) + +;; failed to figure out what this is: +(defpart 5172 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-y (meters 0.025)) + (sp-flt spt-z (meters 0.8)) + (sp-flt spt-scale-x (meters 0.25)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 0.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 155) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 5163) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5173 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-x (meters 0.3)) + (sp-flt spt-y (meters 0.025)) + (sp-flt spt-z (meters 0.8)) + (sp-flt spt-scale-x (meters 0.25)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 0.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 155) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 5163) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + +;; failed to figure out what this is: +(defpart 5174 + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xc9 :page #xc)) + (sp-flt spt-num 1.0) + (sp-flt spt-x (meters -0.3)) + (sp-flt spt-y (meters 0.025)) + (sp-flt spt-z (meters 0.8)) + (sp-flt spt-scale-x (meters 0.25)) + (sp-flt spt-rot-z (degrees 0.0)) + (sp-copy-from-other spt-scale-y -4) + (sp-flt spt-r 255.0) + (sp-flt spt-g 0.0) + (sp-flt spt-b 0.0) + (sp-flt spt-a 128.0) + (sp-int spt-timer 155) + (sp-cpuinfo-flags sp-cpuinfo-flag-2) + (sp-int spt-next-time 75) + (sp-launcher-by-id spt-next-launcher 5163) + (sp-flt spt-rotate-y (degrees 0.0)) + ) + ) + + + + diff --git a/test/decompiler/reference/jak2/levels/mars_tomb/tomb-part_REF.gc b/test/decompiler/reference/jak2/levels/mars_tomb/tomb-part_REF.gc index b12f9b922b..d2cdef0aeb 100644 --- a/test/decompiler/reference/jak2/levels/mars_tomb/tomb-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/mars_tomb/tomb-part_REF.gc @@ -189,7 +189,7 @@ :id 689 :flags (unk-6 unk-7) :bounds (static-bspherem 0 3 0 16) - :rotate ((degrees 0) (degrees 3.8666666) (degrees 0)) + :rotate ((degrees 0) (degrees 87) (degrees 0)) :scale (0.0 15837.866 0.0) :parts ((sp-item 3069 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) (sp-item 3070 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 115 :length 40) @@ -211,7 +211,7 @@ :id 690 :flags (unk-6 unk-7) :bounds (static-bspherem 0 3 0 16) - :rotate ((degrees 0) (degrees 9.911111) (degrees 0)) + :rotate ((degrees 0) (degrees 223) (degrees 0)) :scale (0.0 40595.91 0.0) :parts ((sp-item 3069 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) (sp-item 3070 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 125 :length 40) @@ -491,7 +491,7 @@ :id 693 :flags (unk-6 unk-7) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 2.8) (degrees 0)) + :rotate ((degrees 0) (degrees 63) (degrees 0)) :scale (0.0 11468.8 0.0) :parts ((sp-item 3083 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 3084 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 90 :length 50) @@ -515,7 +515,7 @@ :id 694 :flags (unk-6 unk-7) :bounds (static-bspherem 0 2 0 6) - :rotate ((degrees 0) (degrees 7.688889) (degrees 0)) + :rotate ((degrees 0) (degrees 173) (degrees 0)) :scale (0.0 31493.69 0.0) :parts ((sp-item 3083 :fade-after (meters 100) :falloff-to (meters 100) :flags (bit7)) (sp-item 3084 :fade-after (meters 250) :falloff-to (meters 250) :flags (bit7) :period 125 :length 50) @@ -2244,7 +2244,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/mars_tomb/widow-part_REF.gc b/test/decompiler/reference/jak2/levels/mars_tomb/widow-part_REF.gc index 2fe88806d2..b6ec70dde2 100644 --- a/test/decompiler/reference/jak2/levels/mars_tomb/widow-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/mars_tomb/widow-part_REF.gc @@ -760,7 +760,7 @@ :linger-duration (seconds 4.5) :flags (use-local-clock unk-4 unk-6) :bounds (static-bspherem 0 0 0 15) - :rotate ((degrees 0) (degrees -3.2222223) (degrees 0)) + :rotate ((degrees 0) (degrees -72.5) (degrees 0)) :parts ((sp-item 3218 :flags (bit7) :period 1200 :length 20) (sp-item 3219 :flags (bit7) :period 1200 :length 15) (sp-item 3220 :flags (bit6 bit7) :period 1200 :length 50) @@ -2588,7 +2588,3 @@ (sp-rnd-flt spt-conerot-y (degrees 90.0) (degrees 180.0) 1.0) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-part_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-part_REF.gc index 3e9b1f6a74..f010809b90 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-part_REF.gc @@ -162,7 +162,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 128) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5259 :flags (is-3d bit6 bit7)) (sp-item 5260 :flags (bit7)) (sp-item 5261 :flags (bit6)) @@ -746,7 +746,3 @@ (sp-cpuinfo-flags sp-cpuinfo-flag-2) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/outro/outro-scenes_REF.gc b/test/decompiler/reference/jak2/levels/outro/outro-scenes_REF.gc index 4a9db24a2b..5fbaee5a5f 100644 --- a/test/decompiler/reference/jak2/levels/outro/outro-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/outro/outro-scenes_REF.gc @@ -134,7 +134,7 @@ :linger-duration (seconds 1.5) :flags (unk-6) :bounds (static-bspherem 0 0 0 128) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 5436 :flags (is-3d bit6 bit7)) (sp-item 5437 :flags (bit7)) (sp-item 5438 :flags (bit6)) diff --git a/test/decompiler/reference/jak2/levels/palace/explore/palent-part_REF.gc b/test/decompiler/reference/jak2/levels/palace/explore/palent-part_REF.gc index c799a84f68..d18e423ca4 100644 --- a/test/decompiler/reference/jak2/levels/palace/explore/palent-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/explore/palent-part_REF.gc @@ -153,7 +153,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 4892 :flags (bit6) :period 900 :length 5) (sp-item 4893 :flags (bit6) :period 900 :length 5) (sp-item 4894 :period 900 :length 15) diff --git a/test/decompiler/reference/jak2/levels/power_station/vinroom-part_REF.gc b/test/decompiler/reference/jak2/levels/power_station/vinroom-part_REF.gc index 5677220eeb..19cf6daa7f 100644 --- a/test/decompiler/reference/jak2/levels/power_station/vinroom-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/power_station/vinroom-part_REF.gc @@ -2466,7 +2466,7 @@ :id 272 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 1.5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1212 :fade-after (meters 80) :flags (bit6 bit7))) ) @@ -2495,7 +2495,7 @@ :id 273 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 1.5) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1213 :fade-after (meters 60) :flags (bit6 bit7) :period 150 :length 100) (sp-item 1214 :fade-after (meters 60) :flags (bit6 bit7) :period 600 :length 200) (sp-item 1215 :fade-after (meters 60) :flags (bit6 bit7) :period 600 :length 200 :offset 300) @@ -2824,7 +2824,3 @@ (sp-flt spt-rotate-y (degrees 0.0)) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc b/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc index f77a9e87c0..577c549ac5 100644 --- a/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/power_station/vinroom-scenes_REF.gc @@ -122,7 +122,7 @@ :linger-duration (seconds 1.5) :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees -2.6666667) (degrees 0) (degrees 0)) + :rotate ((degrees -60) (degrees 0) (degrees 0)) :parts ((sp-item 1233 :flags (bit7))) ) diff --git a/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc b/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc index db8f84322b..9e1baac641 100644 --- a/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/ruins-scenes_REF.gc @@ -179,7 +179,7 @@ TODO - first arg type?" :id 283 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 1249 :flags (is-3d bit6 bit7))) ) diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-part_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-part_REF.gc index f4ab1f10fc..343f33a528 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-part_REF.gc @@ -28,7 +28,7 @@ :id 894 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 4) (degrees 4) (degrees 0)) + :rotate ((degrees 90) (degrees 90) (degrees 0)) :parts ((sp-item 3909 :fade-after (meters 80) :flags (bit6)) (sp-item 3910 :fade-after (meters 60) :flags (bit6 bit7)) (sp-item 3911 :fade-after (meters 60) :flags (bit6 bit7)) diff --git a/test/decompiler/reference/jak2/levels/strip/strip-part_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-part_REF.gc index 4a73139130..22de186a27 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-part_REF.gc @@ -3333,7 +3333,7 @@ :id 228 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1088 :fade-after (meters 50) :flags (is-3d bit7) :period 80 :length 5) (sp-item 1089 :fade-after (meters 50) :flags (is-3d bit7)) (sp-item 1090 :fade-after (meters 50) :flags (is-3d bit7) :period 600 :length 5) @@ -3971,7 +3971,3 @@ (sp-flt spt-userdata 0.0) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/temple/mountain-part_REF.gc b/test/decompiler/reference/jak2/levels/temple/mountain-part_REF.gc index 7ec1b16ccc..c169aee565 100644 --- a/test/decompiler/reference/jak2/levels/temple/mountain-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/temple/mountain-part_REF.gc @@ -28,7 +28,7 @@ :id 362 :flags (unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 3.5555556) (degrees 0)) + :rotate ((degrees 0) (degrees 80) (degrees 0)) :parts ((sp-item 1530 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1531 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1532 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -486,7 +486,7 @@ :id 363 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1546 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1547 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1548 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -625,7 +625,7 @@ :id 364 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1550 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1551 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1552 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -764,7 +764,7 @@ :id 365 :flags (unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 3.5555556) (degrees 0)) + :rotate ((degrees 0) (degrees 80) (degrees 0)) :parts ((sp-item 1554 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1555 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1556 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) @@ -998,7 +998,7 @@ :id 366 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1561 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1562 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1563 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1267,7 +1267,7 @@ :id 367 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1569 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1570 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1571 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1406,7 +1406,7 @@ :id 368 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1573 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1574 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1575 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1675,7 +1675,7 @@ :id 369 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1581 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1582 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1583 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) @@ -1814,7 +1814,7 @@ :id 370 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1585 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1586 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1825,7 +1825,7 @@ :id 371 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1587 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1588 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1836,7 +1836,7 @@ :id 372 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1585 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1586 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1847,7 +1847,7 @@ :id 373 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1585 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1586 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) ) @@ -1858,7 +1858,7 @@ :id 374 :flags (unk-4 unk-6) :bounds (static-bspherem 0 -10 0 20) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 1587 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1588 :fade-after (meters 160) :falloff-to (meters 160) :flags (bit7)) (sp-item 1589 :fade-after (meters 200) :falloff-to (meters 200) :flags (bit7)) diff --git a/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc b/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc index 8920e5a015..12037048ee 100644 --- a/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/temple/mountain-scenes_REF.gc @@ -420,7 +420,7 @@ :id 358 :flags (unk-6) :bounds (static-bspherem 0 0 0 2) - :rotate ((degrees 4) (degrees 0) (degrees 0)) + :rotate ((degrees 90) (degrees 0) (degrees 0)) :parts ((sp-item 1513 :flags (is-3d bit6 bit7)) (sp-item 1514 :flags (bit6 bit7)) (sp-item 1515 :flags (bit7))) ) diff --git a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc index 8f601b9ce9..e39e8757e2 100644 --- a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc @@ -1102,7 +1102,7 @@ :id 1285 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5460 :flags (is-3d launch-asap bit7)) (sp-item 5461 :flags (is-3d launch-asap bit7)) (sp-item 5462 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1184,7 +1184,7 @@ :id 1286 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5463 :flags (is-3d launch-asap bit7)) (sp-item 5464 :flags (is-3d launch-asap bit7)) (sp-item 5465 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1265,7 +1265,7 @@ :id 1287 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5466 :flags (is-3d launch-asap bit7)) (sp-item 5467 :flags (is-3d launch-asap bit7)) (sp-item 5468 :fade-after (meters 200) :flags (bit6) :hour-mask #b111111111110000000) @@ -1346,7 +1346,7 @@ :id 1288 :flags (unk-4 unk-6) :bounds (static-bspherem 0 0 0 4) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 5469 :flags (is-3d launch-asap bit7)) (sp-item 5470 :flags (is-3d launch-asap bit7))) ) diff --git a/test/decompiler/reference/jak2/levels/underport/under-part_REF.gc b/test/decompiler/reference/jak2/levels/underport/under-part_REF.gc index 4f21c4c53d..a29e8a5b0d 100644 --- a/test/decompiler/reference/jak2/levels/underport/under-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/underport/under-part_REF.gc @@ -940,7 +940,7 @@ :linger-duration (seconds 1) :flags (use-local-clock unk-6) :bounds (static-bspherem 0 0 0 8) - :rotate ((degrees 0) (degrees 4) (degrees 0)) + :rotate ((degrees 0) (degrees 90) (degrees 0)) :parts ((sp-item 2246 :flags (bit6) :period 900 :length 5) (sp-item 2247 :flags (bit6) :period 900 :length 5) (sp-item 2248 :period 900 :length 15) @@ -1586,7 +1586,3 @@ (defpart 2268 :init-specs ((sp-flt spt-fade-r -21.845333) (sp-flt spt-fade-g -19.114666) (sp-flt spt-fade-b -16.930132)) ) - - - - diff --git a/test/offline/config/jak2/config.jsonc b/test/offline/config/jak2/config.jsonc index 2c350d00a3..cc34859a7c 100644 --- a/test/offline/config/jak2/config.jsonc +++ b/test/offline/config/jak2/config.jsonc @@ -87,7 +87,8 @@ ], "skip_compile_files": [ - "ctywide-obs" + "ctywide-obs", + "drill-baron" ], "skip_compile_functions": [